[cig-commits] r20573 - in seismo/3D/ADJOINT_TOMO/flexwin: . test_data

[carltape at geodynamics.org]

Author: carltape
Date: 2012-08-15 18:12:08 -0700 (Wed, 15 Aug 2012)
New Revision: 20573

Modified:
   seismo/3D/ADJOINT_TOMO/flexwin/README
   seismo/3D/ADJOINT_TOMO/flexwin/io_subs.f90
   seismo/3D/ADJOINT_TOMO/flexwin/maxima.f90
   seismo/3D/ADJOINT_TOMO/flexwin/seismo_subs.f90
   seismo/3D/ADJOINT_TOMO/flexwin/test_data/PAR_FILE
Log:
tested flexwin and updated README; minor adjustments to avoid compilation warnings; default test will now output a measurement windows file (for measure_adj)


Modified: seismo/3D/ADJOINT_TOMO/flexwin/README
===================================================================
--- seismo/3D/ADJOINT_TOMO/flexwin/README	2012-08-16 00:49:51 UTC (rev 20572)
+++ seismo/3D/ADJOINT_TOMO/flexwin/README	2012-08-16 01:12:08 UTC (rev 20573)
@@ -35,8 +35,10 @@
 make -f make_gfortran
 make -f make_gfortran test
 
-If all goes well, it should pick 7 time windows:
+NOTE 1: the last command will run flexwin in test_data/ and also plot
+NOTE 2: to clean: make clean -f make_gfortran 
 
+If all goes well, it should pick 7 time windows:
  Selected windows, start and end time, CC, Tshift, dlnA  
    1   1054.600  1484.600     0.957    -3.000     0.073
    2   1719.600  2067.600     0.973     0.000     0.172
@@ -47,20 +49,15 @@
    7   3502.600  3937.600     0.833    -9.000    -0.636
  DEBUG : writing output seismos
 
-Test the plotting script:
-
-cd test_data
-./plot_seismos_gmt.sh MEASURE/ABKT.II.LHZ
-
 You should see the file MEASURE/ABKT.II.LHZ.seis.ps,
-which should have serveral time series as well as seven windows.
+which should have several time series as well as seven windows.
 Compare output files with those in MEASURE.orig/, described below.
 Note that the plotting script requires GMT (http://gmt.soest.hawaii.edu/).
 
-Last tested 22-Dec-2011 with the following:
-  linux: 64-bit, opensuse 11.3
+Last tested 15-Aug-2012 with the following:
+  linux: 64-bit, opensuse 12.1
   sac 101.5
-  gfortran 4.5.0
+  gfortran 4.6.2
   GMT 4.5.3 (for plotting)
 
 COMPILATION

Modified: seismo/3D/ADJOINT_TOMO/flexwin/io_subs.f90
===================================================================
--- seismo/3D/ADJOINT_TOMO/flexwin/io_subs.f90	2012-08-16 00:49:51 UTC (rev 20572)
+++ seismo/3D/ADJOINT_TOMO/flexwin/io_subs.f90	2012-08-16 01:12:08 UTC (rev 20573)
@@ -334,7 +334,8 @@
   obs_filt(1:npts) = sngl(obs_lp(1:npts))
   syn_filt(1:npts) = sngl(synt_lp(1:npts))
   do i = 1, npts
-    time(i) = b + (i-1)*dt
+    !time(i) = b + (i-1)*dt       ! compilation warning
+    time(i) = sngl(b + (i-1)*dt)
   enddo
 
   file_obs=trim(basename)//'.obs_lp.sac'

Modified: seismo/3D/ADJOINT_TOMO/flexwin/maxima.f90
===================================================================
--- seismo/3D/ADJOINT_TOMO/flexwin/maxima.f90	2012-08-16 00:49:51 UTC (rev 20572)
+++ seismo/3D/ADJOINT_TOMO/flexwin/maxima.f90	2012-08-16 01:12:08 UTC (rev 20573)
@@ -111,29 +111,28 @@
 
   end subroutine
 
-! given an array and the index of two end points, calculate the 
-! area under the curve by simple trapezium integration
+!!$! given an array and the index of two end points, calculate the 
+!!$! area under the curve by simple trapezium integration
+!!$
+!!$  function area_under_curve(x,dx,i1,i2)
+!!$  double precision, dimension(*) :: x
+!!$  double precision :: dx
+!!$  integer :: i1, i2
+!!$
+!!$  integer :: i
+!!$  double precision :: area
+!!$
+!!$  area=0.0
+!!$
+!!$  do i = i1, i2-1
+!!$    area=area + dx*(x(i)+x(i+1))/2.0
+!!$  enddo
+!!$
+!!$  ! compilation warning for this line, but do we use this?
+!!$  area_under_curve = area
+!!$
+!!$  end function
 
-  function area_under_curve(x,dx,i1,i2)
-  double precision, dimension(*) :: x
-  double precision :: dx
-  integer :: i1, i2
-
-  integer :: i
-  double precision :: area
-
-  area=0
-
-  do i = i1, i2-1
-    area=area+dx*(x(i)+x(i+1))/2
-  enddo
-
-  area_under_curve = area
-
-  end function
-
-
-
   subroutine find_minima(x,nx,minima,nindex,w_level)
   implicit none
 

Modified: seismo/3D/ADJOINT_TOMO/flexwin/seismo_subs.f90
===================================================================
--- seismo/3D/ADJOINT_TOMO/flexwin/seismo_subs.f90	2012-08-16 00:49:51 UTC (rev 20572)
+++ seismo/3D/ADJOINT_TOMO/flexwin/seismo_subs.f90	2012-08-16 01:12:08 UTC (rev 20573)
@@ -599,7 +599,7 @@
 
 ! set pre-extension for synthetic data and allocate extended_syn
 !  n_extend=5*12*WIN_MIN_PERIOD/dt
-  n_extend=1000*WIN_MIN_PERIOD/dt
+  n_extend=1000*int(WIN_MIN_PERIOD/dt)
   allocate(extended_syn(npts+n_extend))
 
 ! set noise level

Modified: seismo/3D/ADJOINT_TOMO/flexwin/test_data/PAR_FILE
===================================================================
--- seismo/3D/ADJOINT_TOMO/flexwin/test_data/PAR_FILE	2012-08-16 00:49:51 UTC (rev 20572)
+++ seismo/3D/ADJOINT_TOMO/flexwin/test_data/PAR_FILE	2012-08-16 01:12:08 UTC (rev 20573)
@@ -15,7 +15,7 @@
 # boolean parameters
 DEBUG                           = .true.
 MAKE_SEISMO_PLOTS               = .true.
-MAKE_WINDOW_FILES               = .false.
+MAKE_WINDOW_FILES               = .true.
 BODY_WAVE_ONLY                  = .false.
 
 # -------------------------------------------------------------