fix input, cleanup code

.gitignore

@@ -26,3 +26,4 @@ tests/seteps/build-WFW
 testprograms/NewSeteps/setepsDriver
 testprograms/test_doeels/test_doeels
 tests/seteps/build-f90-new/setepsdriver
+tests/seteps/build-f90-new/epsout

tests/seteps/Makefile

@@ -63,6 +63,7 @@ test: build-f90/setepsdriver build-f90-new/setepsdriver build-f77/setepsdriver b
 		mv build-WFW/epsout results-WFW/epsout$$NUMBER ; \
 		rm build-WFW/eelsin ; \
 	done
+	build-f90-new/setepsdriver
 
 clean: cleanbuild cleanresults
 

tests/seteps/setepsIn/setepsIn01.txt

+50.0 2000.0 1.0          wavenumbers
 1                        layers
-1                        neps
+MnO                      name
+4.95                     epsinf
 1                        nos
 1                        oscType
 269.0 16.0 0.05          osc
-4.95                     epsinf
-50.0 2000.0 1.0          wavenumbers
-MnO                      name

tests/seteps/setepsdriver-f90-new.f90

@@ -16,11 +16,8 @@ program setepsdriver
   integer, allocatable :: tmp_oscType(:)
   
   integer :: i, j, k, l, noPoints
-  character (len = 1) tab
 
   write(*,*) 'setepsdriver-f90-new start'
-  tab = char(9)
-  noPoints = 200
   
   open(unit = 11, file = 'setepsIn/setepsIn01.txt')
   read(11, *) wnmin, wnmax, dwn
@@ -66,9 +63,10 @@ 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, '(30g15.7)') wn,  (eps(j), j = 1, layers)
+    write (12, '(f8.2, 30g16.8)') wn, (eps(j), j = 1, layers)
     wn = wn + dwn
   end do
   close (unit = 12)
 
+  write(*,*) 'setepsdriver-f90-new stop'
 end program setepsdriver