[cig-commits] [commit] devel: Merge pull request #2 from mpbl/devel (553861c)

[cig_noreply at geodynamics.org]

Repository : ssh://geoshell/specfem3d_globe

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

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

commit 553861c22d5d3e7d4ed390ea4a9a09f87bdbdc37
Merge: 5e338b5 5b53f58
Author: Matthieu Lefebvre <ml15 at princeton.edu>
Date:   Tue Mar 11 14:55:32 2014 -0400

    Merge pull request #2 from mpbl/devel
    
    explicit interface in write_seismograms.f90 to be able to use optional a...



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

553861c22d5d3e7d4ed390ea4a9a09f87bdbdc37
 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     | 13 ++++++++-----
 7 files changed, 16 insertions(+), 7 deletions(-)

diff --cc src/specfem3D/write_seismograms.f90
index 96942be,8bb8117..beeaa90
--- a/src/specfem3D/write_seismograms.f90
+++ b/src/specfem3D/write_seismograms.f90
@@@ -146,7 -150,7 +150,6 @@@ contain
    character(len=256) :: sisname
    ! timing
    double precision, external :: wtime
--  ! todo: only needed for asdf output but I am passing this around
    type(asdf_event) :: asdf_container
  
    ! allocates single station seismogram
@@@ -313,9 -317,9 +316,7 @@@
  
             total_seismos = total_seismos + 1
             ! 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
++           call write_one_seismogram(one_seismogram,irec,irec_local)
  
           enddo
         endif