[cig-commits] [commit] devel: explicit interface in write_seismograms.f90 to be able to use optional arguments as requested by DK (5b53f58)

Wed Apr 9 08:56:20 PDT 2014

Repository : ssh://geoshell/specfem3d_globe

On branch  : devel
Link       : https://github.com/geodynamics/specfem3d_globe/compare/64e1b38f0c5ebb4056cce0b15d41c0b9f94ab6e5...099a4d330d5b173b21e51ad441f9f429e5d37842

>---------------------------------------------------------------

commit 5b53f5889f617afd6db0b3b568d3f6665d11e262
Author: Matthieu Lefebvre <ml15 at princeton.edu>
Date:   Tue Mar 11 12:02:58 2014 -0400

    explicit interface in write_seismograms.f90 to be able to use optional arguments as requested by DK


>---------------------------------------------------------------

5b53f5889f617afd6db0b3b568d3f6665d11e262
 src/specfem3D/compute_arrays_source.f90 |  1 +
 src/specfem3D/iterate_time.F90          |  1 +
 src/specfem3D/iterate_time_undoatt.F90  |  1 +
 src/specfem3D/locate_receivers.f90      |  1 +
 src/specfem3D/read_adjoint_sources.f90  |  1 +
 src/specfem3D/rules.mk                  |  5 +++--
 src/specfem3D/write_seismograms.f90     | 10 ++++++++--
 7 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/specfem3D/compute_arrays_source.f90 b/src/specfem3D/compute_arrays_source.f90
index f27603a..14c1425 100644
--- a/src/specfem3D/compute_arrays_source.f90
+++ b/src/specfem3D/compute_arrays_source.f90
@@ -133,6 +133,7 @@
                                            NTSTEP_BETWEEN_READ_ADJSRC,DT)
 
   use constants,only: CUSTOM_REAL,SIZE_REAL,NDIM,NGLLX,NGLLY,NGLLZ,IIN_ADJ,R_EARTH
+  use write_seismograms_mod, only: band_instrument_code
 
   implicit none
 
diff --git a/src/specfem3D/iterate_time.F90 b/src/specfem3D/iterate_time.F90
index 3b18542..3cc596c 100644
--- a/src/specfem3D/iterate_time.F90
+++ b/src/specfem3D/iterate_time.F90
@@ -32,6 +32,7 @@
   use specfem_par_innercore
   use specfem_par_outercore
   use specfem_par_movie
+  use write_seismograms_mod, only: write_seismograms
   implicit none
 
   ! timing
diff --git a/src/specfem3D/iterate_time_undoatt.F90 b/src/specfem3D/iterate_time_undoatt.F90
index 883b900..cae9f08 100644
--- a/src/specfem3D/iterate_time_undoatt.F90
+++ b/src/specfem3D/iterate_time_undoatt.F90
@@ -33,6 +33,7 @@
   use specfem_par_innercore
   use specfem_par_outercore
   use specfem_par_movie
+  use write_seismograms_mod, only: write_seismograms
   implicit none
 
   ! local parameters
diff --git a/src/specfem3D/locate_receivers.f90 b/src/specfem3D/locate_receivers.f90
index 52620f1..33acbfb 100644
--- a/src/specfem3D/locate_receivers.f90
+++ b/src/specfem3D/locate_receivers.f90
@@ -52,6 +52,7 @@
     rspl,espl,espl2,nspl,ibathy_topo, &
     TOPOGRAPHY,RECEIVERS_CAN_BE_BURIED
 
+  use write_seismograms_mod, only: band_instrument_code
   implicit none
 
   integer,intent(in) :: nspec,nglob
diff --git a/src/specfem3D/read_adjoint_sources.f90 b/src/specfem3D/read_adjoint_sources.f90
index 2edbec4..484d41f 100644
--- a/src/specfem3D/read_adjoint_sources.f90
+++ b/src/specfem3D/read_adjoint_sources.f90
@@ -199,6 +199,7 @@
   subroutine check_adjoint_sources(irec,nadj_files_found)
 
   use specfem_par
+  use write_seismograms_mod, only: band_instrument_code
 
   implicit none
 
diff --git a/src/specfem3D/rules.mk b/src/specfem3D/rules.mk
index 1f96e18..97cca05 100644
--- a/src/specfem3D/rules.mk
+++ b/src/specfem3D/rules.mk
@@ -37,7 +37,6 @@ specfem3D_OBJECTS = \
 	$O/comp_source_spectrum.solver.o \
 	$O/comp_source_time_function.solver.o \
 	$O/compute_adj_source_frechet.solver.o \
-	$O/compute_arrays_source.solver.o \
 	$O/convert_time.solver.o \
 	$O/define_derivation_matrices.solver.o \
 	$O/file_io_threads.cc.o \
@@ -53,8 +52,10 @@ specfem3D_OBJECTS = \
 specfem3D_OBJECTS += \
 	$O/asdf_data.solverstatic_module.o \
 	$O/specfem3D_par.solverstatic_module.o \
+	$O/write_seismograms.solverstatic_module.o \
 	$O/check_stability.solverstatic.o \
 	$O/compute_add_sources.solverstatic.o \
+	$O/compute_arrays_source.solverstatic.o \
 	$O/compute_boundary_kernel.solverstatic.o \
 	$O/compute_coupling.solverstatic.o \
 	$O/compute_element.solverstatic.o \
@@ -101,7 +102,6 @@ specfem3D_OBJECTS += \
 	$O/write_movie_surface.solverstatic.o \
 	$O/write_output_ASCII.solverstatic.o \
 	$O/write_output_SAC.solverstatic.o \
-	$O/write_seismograms.solverstatic.o \
 	$(EMPTY_MACRO)
 
 specfem3D_MODULES = \
@@ -112,6 +112,7 @@ specfem3D_MODULES = \
 	$(FC_MODDIR)/specfem_par_innercore.$(FC_MODEXT) \
 	$(FC_MODDIR)/specfem_par_outercore.$(FC_MODEXT) \
 	$(FC_MODDIR)/specfem_par_movie.$(FC_MODEXT) \
+	$(FC_MODDIR)/write_seismograms_mod.$(FC_MODEXT) \
 	$(EMPTY_MACRO)
 
 # These files come from the shared directory
diff --git a/src/specfem3D/write_seismograms.f90 b/src/specfem3D/write_seismograms.f90
index 96942be..8bb8117 100644
--- a/src/specfem3D/write_seismograms.f90
+++ b/src/specfem3D/write_seismograms.f90
@@ -25,6 +25,10 @@
 !
 !=====================================================================
 
+module write_seismograms_mod 
+
+contains
+
   subroutine write_seismograms()
 
   use specfem_par
@@ -315,7 +319,7 @@
            ! write this seismogram
 !! DK DK added this temporarily to suppress a warning
 !! DK DK and contacte Matthieu about this           call write_one_seismogram(one_seismogram,irec,irec_local)
-           call write_one_seismogram(one_seismogram,irec,irec_local,asdf_container) !! DK DK last argument is fictitious
+           call write_one_seismogram(one_seismogram,irec,irec_local) !! DK DK last argument is fictitious
 
          enddo
        endif
@@ -401,7 +405,7 @@
   double precision :: phi
   real(kind=CUSTOM_REAL) :: cphi,sphi
   integer :: isample
-  type(asdf_event) :: asdf_container
+  type(asdf_event), optional :: asdf_container
 
   ! initializes
   seismogram_tmp(:,:) = 0.0_CUSTOM_REAL
@@ -639,3 +643,5 @@
   if (DT <= 0.001d0) bic = 'FX'
 
  end subroutine band_instrument_code
+
+end module write_seismograms_mod 

