Reduce number of false positives in tests

- still not done, though. - changed name of test dir to tests
seismology · Oct 3, 2015 · 1f9abfd · 1f9abfd
1 parent 46f88be
commit 1f9abfd
Show file tree

Hide file tree

Showing 49 changed files with 41 additions and 29 deletions.
diff --git a/TEMPLATES/Makefile.TEMPLATE b/TEMPLATES/Makefile.TEMPLATE
@@ -10,10 +10,10 @@ clean:
 	cd src; rm -f *.o *.M *.mod *.d *.il core *.gcda *.gcno; cd ..
 	rm bin/mc_kernel
 
-.PHONY: test
-test: $(mc_kernel)
-	cd test; ./runtests.sh ../bin/mc_kernel
-	@tail -n 5 test/mckernel_tests.log
+.PHONY: check
+check: $(mc_kernel)
+	cd tests; ./runtests.sh ../bin/mc_kernel
+	@tail -n 5 tests/mckernel_tests.log
 
 .PHONY: doc
 doc: 

diff --git a/src/filtering.f90 b/src/filtering.f90
@@ -276,7 +276,7 @@ subroutine add_stfs(this, stf_sem_fwd, sem_dt, amplitude_fwd, stf_source, stf_dt
     ! FT STF of Earthquake
     call fft_stf%rfft(taperandzeropad(stf_src, fft_stf%get_ntimes(), ntaper = 5), stf_src_fd)
 
-    if (firstslave) then
+    if (firstslave.or.testing) then
 18     format('stf_spectrum_', A, 2('_', F0.3))
 19     format(5(E16.8))
        write(fnam,18) trim(this%filterclass), this%frequencies(1:2)
@@ -338,7 +338,7 @@ subroutine add_stfs(this, stf_sem_fwd, sem_dt, amplitude_fwd, stf_source, stf_dt
 
     call fft_stf%freeme()
 
-    if (firstslave) then
+    if (firstslave.or.testing) then
 20     format('filterresponse_stf_', A, 2('_', F0.3))
        write(fnam,20) trim(this%filterclass), this%frequencies(1:2)
        open(10, file=trim(fnam), action='write')
@@ -389,7 +389,7 @@ subroutine add_stfs(this, stf_sem_fwd, sem_dt, amplitude_fwd, stf_source, stf_dt
     end if   
 
     if (maxloc(abs(this%transferfunction),1) > 0.5*this%nfreq) then
-       if (firstslave) then
+      if (firstslave.or.testing) then
          print *, 'ERROR: Filter ', trim(this%name), ' is not vanishing fast enough for '
          print *, 'high frequencies.'
          print *, 'Numerical noise from frequencies above mesh limit will be propagated'

diff --git a/src/test_readfields.f90 b/src/test_readfields.f90
@@ -205,6 +205,7 @@ subroutine test_readfields_load_fw_points
    ! Read reference strain trace and point coordinates
    open(newunit=lu_refstrain, file='./read_strain_point1.txt', action='read')
    read(lu_refstrain, *) coordinates(:,1)
+   allocate(straintrace_ref(sem_data%ndumps))
    do i=1, ntimes
      read(lu_refstrain, *) straintrace_ref(i)
    end do

diff --git a/src/test_type_parameter.f90 b/src/test_type_parameter.f90
@@ -48,16 +48,25 @@ subroutine test_parameter_reading
    call parameters%read_filter(nomega=nomega, df=df)
 
    ! Do checks on filters
-   call assert_equal(parameters%nfilter, 2, '2 Filters in input file')
-   call assert_true(parameters%filter(1)%name=='Gabor_40', 'Filter 1, name: Gabor_40')
-   call assert_true(parameters%filter(2)%name=='Gabor_30', 'Filter 2, name: Gabor_30')
+   call assert_equal(parameters%nfilter, 4, '4 Filters in input file')
+   call assert_true(parameters%filter(1)%name=='BW_4_40s', 'Filter 1, name: BW_4_40s')
+   call assert_true(parameters%filter(2)%name=='Identical', 'Filter 2, name:Identical')
+   call assert_true(parameters%filter(3)%name=='Gabor_60', 'Filter 3, name: Gabor_60')
+   call assert_true(parameters%filter(4)%name=='Gabor_80', 'Filter 4, name: Gabor_80')
+
    call assert_comparable(parameters%filter(1)%frequencies, [40.d0, 0.5d0, 0.d0, 0.d0], &
                           1d-10, 'Frequencies of filter 1 correct')
-   call assert_comparable(parameters%filter(2)%frequencies, [30.d0, 0.5d0, 0.d0, 0.d0], &
+   call assert_comparable(parameters%filter(2)%frequencies, [0.d0, 0.0d0, 0.d0, 0.d0], &
                           1d-10, 'Frequencies of filter 2 correct')
-   call assert_true(parameters%filter(1)%filterclass=='Gabor', 'Filter 1, type: Gabor')
-   call assert_true(parameters%filter(2)%filterclass=='Gabor', 'Filter 2, type: Gabor')
-
+   call assert_comparable(parameters%filter(3)%frequencies, [60.d0, 0.5d0, 0.d0, 0.d0], &
+                          1d-10, 'Frequencies of filter 3 correct')
+   call assert_comparable(parameters%filter(4)%frequencies, [80.d0, 0.5d0, 0.d0, 0.d0], &
+                          1d-10, 'Frequencies of filter 4 correct')
+
+   call assert_true(parameters%filter(1)%filterclass=='Butterw_LP_O4', 'Filter 1, type: Gabor')
+   call assert_true(parameters%filter(2)%filterclass=='ident', 'Filter 2, type: Gabor')
+   call assert_true(parameters%filter(3)%filterclass=='Gabor', 'Filter 1, type: Gabor')
+   call assert_true(parameters%filter(4)%filterclass=='Gabor', 'Filter 2, type: Gabor')
 
 
    call parameters%read_kernel(sem_data, parameters%filter)

diff --git a/src/type_parameter.f90 b/src/type_parameter.f90
@@ -517,7 +517,7 @@ subroutine read_kernel(this, sem_data, filter)
    call pbarrier
 
    if (master) then
-       write(6,*)'Reading kernels from file ', trim(this%receiver_file)
+       write(lu_out,*)'Reading kernels from file ', trim(this%receiver_file)
        open(newunit=lu_receiver, file=trim(this%receiver_file), status='old')
        read(lu_receiver,*) 
        read(lu_receiver,*) this%component

diff --git a/test/filters.dat b/test/filters.dat
diff --git a/test/receiver.dat b/test/receiver.dat
diff --git a/test/.gitignore → tests/.gitignore b/test/.gitignore → tests/.gitignore
diff --git a/test/CMTSOLUTION → tests/CMTSOLUTION b/test/CMTSOLUTION → tests/CMTSOLUTION
diff --git a/test/CMTSOLUTION_load_seismogram → tests/CMTSOLUTION_load_seismogram b/test/CMTSOLUTION_load_seismogram → tests/CMTSOLUTION_load_seismogram
diff --git a/test/Makefile.TEMPLATE → tests/Makefile.TEMPLATE b/test/Makefile.TEMPLATE → tests/Makefile.TEMPLATE
diff --git a/test/butterresponse.txt → tests/butterresponse.txt b/test/butterresponse.txt → tests/butterresponse.txt
diff --git a/test/butterresponse_bp.txt → tests/butterresponse_bp.txt b/test/butterresponse_bp.txt → tests/butterresponse_bp.txt
diff --git a/test/butterresponse_hp.txt → tests/butterresponse_hp.txt b/test/butterresponse_hp.txt → tests/butterresponse_hp.txt
diff --git a/test/create_test_seismograms.py → tests/create_test_seismograms.py b/test/create_test_seismograms.py → tests/create_test_seismograms.py
diff --git a/test/facets.TEST → tests/facets.TEST b/test/facets.TEST → tests/facets.TEST
diff --git a/test/facets.tetrahedron → tests/facets.tetrahedron b/test/facets.tetrahedron → tests/facets.tetrahedron
diff --git a/test/filterresponse.txt → tests/filterresponse.txt b/test/filterresponse.txt → tests/filterresponse.txt
diff --git a/tests/filters.dat b/tests/filters.dat
@@ -0,0 +1,5 @@
+4
+BW_4_40s Butterw_LP_O4 40.0 0.5 0.0 0.0  
+Identical ident 0.0 0.0 0.0 0.0
+Gabor_60 Gabor 60.0 0.5 0.0 0.0  
+Gabor_80 Gabor 80.0 0.5 0.0 0.0  
diff --git a/test/filters_load_seismogram.dat → tests/filters_load_seismogram.dat b/test/filters_load_seismogram.dat → tests/filters_load_seismogram.dat
diff --git a/test/gaborinput.txt → tests/gaborinput.txt b/test/gaborinput.txt → tests/gaborinput.txt
diff --git a/test/gaborresponse.txt → tests/gaborresponse.txt b/test/gaborresponse.txt → tests/gaborresponse.txt
diff --git a/test/gabortransferfunction.txt → tests/gabortransferfunction.txt b/test/gabortransferfunction.txt → tests/gabortransferfunction.txt
diff --git a/test/inparam_load_seismogram → tests/inparam_load_seismogram b/test/inparam_load_seismogram → tests/inparam_load_seismogram
diff --git a/test/inparam_load_wavefield → tests/inparam_load_wavefield b/test/inparam_load_wavefield → tests/inparam_load_wavefield
diff --git a/test/inparam_test → tests/inparam_test b/test/inparam_test → tests/inparam_test
diff --git a/test/makemake.pl → tests/makemake.pl b/test/makemake.pl → tests/makemake.pl
diff --git a/test/output/.gitignore → tests/output/.gitignore b/test/output/.gitignore → tests/output/.gitignore
diff --git a/test/read_strain_point1.txt → tests/read_strain_point1.txt b/test/read_strain_point1.txt → tests/read_strain_point1.txt
diff --git a/tests/receiver.dat b/tests/receiver.dat
@@ -0,0 +1,11 @@
+2                               # Nr of receivers
+Z                               # seismogram component
+T001  00.0000   30.0000  3                    # Name, lat, lon, nr of kernels
+P_40s_lam Identical  CC 675.0 735.0  lam         # Kernel name, Filter name, time window begin and end, model parameter
+P_40s_eta Identical CC 675.0 735.0  eta 
+P_40s_mu  Identical CC 675.0 735.0  mu     
+T002  30.0000   00.0000  4 
+P_40s_rho Gabor_60  CC 200.0 260.0  rho   
+P_40s_vp Gabor_60  CC 200.0 260.0  vp 
+P_40s_vs Gabor_60  CC 200.0 260.0  vs   
+P_40s_eta Gabor_60  CC 200.0 260.0  eta
diff --git a/test/receiver_load_seismogram.dat → tests/receiver_load_seismogram.dat b/test/receiver_load_seismogram.dat → tests/receiver_load_seismogram.dat
diff --git a/test/rotate_poly.m → tests/rotate_poly.m b/test/rotate_poly.m → tests/rotate_poly.m
diff --git a/test/runtests.sh → tests/runtests.sh b/test/runtests.sh → tests/runtests.sh
diff --git a/test/savani.rtpv → tests/savani.rtpv b/test/savani.rtpv → tests/savani.rtpv
diff --git a/test/seism_ref_T001_P_BW → tests/seism_ref_T001_P_BW b/test/seism_ref_T001_P_BW → tests/seism_ref_T001_P_BW
diff --git a/test/spectrum.txt → tests/spectrum.txt b/test/spectrum.txt → tests/spectrum.txt
diff --git a/test/spectrum_filtered.txt → tests/spectrum_filtered.txt b/test/spectrum_filtered.txt → tests/spectrum_filtered.txt
diff --git a/test/sphere.inp → tests/sphere.inp b/test/sphere.inp → tests/sphere.inp
diff --git a/test/standard_rupture_fomat_testfile.srf → tests/standard_rupture_fomat_testfile.srf b/test/standard_rupture_fomat_testfile.srf → tests/standard_rupture_fomat_testfile.srf
diff --git a/test/stf_errorf.dat → tests/stf_errorf.dat b/test/stf_errorf.dat → tests/stf_errorf.dat
diff --git a/test/stf_test.dat → tests/stf_test.dat b/test/stf_test.dat → tests/stf_test.dat
diff --git a/test/test_ftnunit.f90 → tests/test_ftnunit.f90 b/test/test_ftnunit.f90 → tests/test_ftnunit.f90
diff --git a/test/test_merge.inp → tests/test_merge.inp b/test/test_merge.inp → tests/test_merge.inp
diff --git a/test/test_stf_fft → tests/test_stf_fft b/test/test_stf_fft → tests/test_stf_fft
diff --git a/test/test_stf_resample → tests/test_stf_resample b/test/test_stf_resample → tests/test_stf_resample
diff --git a/test/tetrahedron.inp → tests/tetrahedron.inp b/test/tetrahedron.inp → tests/tetrahedron.inp
diff --git a/test/transferfunction.txt → tests/transferfunction.txt b/test/transferfunction.txt → tests/transferfunction.txt
diff --git a/test/vertices.TEST → tests/vertices.TEST b/test/vertices.TEST → tests/vertices.TEST
diff --git a/test/vertices.tetrahedron → tests/vertices.tetrahedron b/test/vertices.tetrahedron → tests/vertices.tetrahedron