From b733f240cd79735d1a9424c31947ab0970028a96 Mon Sep 17 00:00:00 2001 From: Karl-Michael Schindler <karl-michael.schindler@web.de> Date: Fri, 30 Aug 2024 11:37:30 +0200 Subject: [PATCH] Minor Cleanup code --- tests/seteps/setepsdriver-WFW.f90 | 5 +---- tests/seteps/setepsdriver-f77.f90 | 5 +---- tests/seteps/setepsdriver-f90-new-1.f90 | 4 ++-- tests/seteps/setepsdriver-f90.f90 | 5 +---- 4 files changed, 5 insertions(+), 14 deletions(-) diff --git a/tests/seteps/setepsdriver-WFW.f90 b/tests/seteps/setepsdriver-WFW.f90 index 32a3de7..39cb2b9 100644 --- a/tests/seteps/setepsdriver-WFW.f90 +++ b/tests/seteps/setepsdriver-WFW.f90 @@ -16,11 +16,8 @@ program setepsdriver double precision, allocatable :: tmp_osc(:,:) integer :: i, j, k, l, noPoints - character (len = 1) tab write(*,*) 'setepsdriver-WFW start' - tab = char(9) - noPoints = 200 open(unit = 11, file = 'build-WFW/eelsin') read(11, *) @@ -72,7 +69,7 @@ program setepsdriver open(unit = 12, file = 'build-WFW/epsout') do i = 0, noPoints call seteps(nos, osc_size, osc, epsinf, wn, nLayer, eps) - write (12, '(30g15.7)') wn, (eps(j), j = 1, nLayer) + write (12, '(30g15.7)') wn, (eps(j), j = 1, nLayer) wn = wn + dw end do close (unit = 12) diff --git a/tests/seteps/setepsdriver-f77.f90 b/tests/seteps/setepsdriver-f77.f90 index 5a6e30e..3f58355 100644 --- a/tests/seteps/setepsdriver-f77.f90 +++ b/tests/seteps/setepsdriver-f77.f90 @@ -16,13 +16,10 @@ program setepsdriver character (len = 10) contrl, mode integer :: i, j, k, l, noPoints, ioStatus - character (len = 1) tab common /mulayr/ eps, thick, argmin, argmax, epsmac, layers, nper write(*,*) 'setepsdriver-f77 start' - tab = char(9) - noPoints = 200 epsmac = epsilon(1.0d0) / 2 @@ -67,7 +64,7 @@ program setepsdriver open(unit = 12, file = 'build-f77/epsout') do i = 0, noPoints call seteps(neps, nos, osc, jos, epsinf, wn, name) - write (12, '(30g15.7)') wn, (eps(j), j = 1, neps) + write (12, '(30g15.7)') wn, (eps(j), j = 1, neps) wn = wn + dw end do close (unit = 12) diff --git a/tests/seteps/setepsdriver-f90-new-1.f90 b/tests/seteps/setepsdriver-f90-new-1.f90 index add95cc..2f11112 100644 --- a/tests/seteps/setepsdriver-f90-new-1.f90 +++ b/tests/seteps/setepsdriver-f90-new-1.f90 @@ -60,7 +60,7 @@ program setepsdriver else if (j == 1) then old_size = size(osc, 2) allocate(tmp_osc(4, old_size + nos(l))) - tmp_osc(1:3, 1:old_size) = osc + tmp_osc(1:4, 1:old_size) = osc deallocate(osc) call move_alloc(tmp_osc, osc) endif @@ -84,7 +84,7 @@ program setepsdriver open(unit = 12, file = 'build-f90-new/epsout') do i = 0, noPoints call seteps(layers, nos, oscType, osc, epsinf, wn, eps, layers) - write (12, '(f8.2, 30g16.8)') wn, (eps(j), j = 1, layers) + write (12, '(30g15.7)') wn, (eps(j), j = 1, neps) wn = wn + dwn end do close (unit = 12) diff --git a/tests/seteps/setepsdriver-f90.f90 b/tests/seteps/setepsdriver-f90.f90 index 5ab59f2..3eebc2a 100644 --- a/tests/seteps/setepsdriver-f90.f90 +++ b/tests/seteps/setepsdriver-f90.f90 @@ -16,11 +16,8 @@ program setepsdriver double precision, allocatable :: tmp_osc(:,:) integer :: i, j, k, l, noPoints - character (len = 1) tab write(*,*) 'setepsdriver-f90 start' - tab = char(9) - noPoints = 200 open(unit = 11, file = 'build-f90/eelsin') read(11, *) @@ -70,7 +67,7 @@ program setepsdriver open(unit = 12, file = 'build-f90/epsout') do i = 0, noPoints call seteps(neps, nos, osc, epsinf, wn, name, eps, layers, mode) - write (12, '(30g15.7)') wn, (eps(j), j = 1, neps) + write (12, '(30g15.7)') wn, (eps(j), j = 1, neps) wn = wn + dw end do close (unit = 12) -- GitLab