[cig-commits] r18904 - in seismo/2D/SPECFEM2D/trunk: EXAMPLES/BENCHMARK_CLAERBOUT_ADJOINT src/specfem2D

[yangl at geodynamics.org]

Author: yangl
Date: 2011-09-14 11:52:37 -0700 (Wed, 14 Sep 2011)
New Revision: 18904

Modified:
   seismo/2D/SPECFEM2D/trunk/EXAMPLES/BENCHMARK_CLAERBOUT_ADJOINT/DATAs.tar.gz
   seismo/2D/SPECFEM2D/trunk/src/specfem2D/specfem2D.F90
   seismo/2D/SPECFEM2D/trunk/src/specfem2D/write_seismograms.F90
Log:
(SPECFEM2D) warning to equivalence in SU corrected

Modified: seismo/2D/SPECFEM2D/trunk/EXAMPLES/BENCHMARK_CLAERBOUT_ADJOINT/DATAs.tar.gz
===================================================================
(Binary files differ)

Modified: seismo/2D/SPECFEM2D/trunk/src/specfem2D/specfem2D.F90
===================================================================
--- seismo/2D/SPECFEM2D/trunk/src/specfem2D/specfem2D.F90	2011-09-14 15:53:45 UTC (rev 18903)
+++ seismo/2D/SPECFEM2D/trunk/src/specfem2D/specfem2D.F90	2011-09-14 18:52:37 UTC (rev 18904)
@@ -795,9 +795,7 @@
   integer(kind=4) :: r4head(60)
   character(len=512) :: filename
   real(kind=4),dimension(:,:),allocatable :: adj_src_s
-  integer(kind=4) :: header4(1)
   integer(kind=2) :: header2(2)
-  equivalence(header2,header4)
 !>SU_FORMAT
 
 !<NOISE_TOMOGRAPHY
@@ -1817,7 +1815,7 @@
                if (ios /= 0) call exit_MPI(' file '//trim(filename)//' read error')
           read(113,rec=irec,iostat=ios) r4head, adj_src_s(:,3)
                if (ios /= 0) call exit_MPI(' file '//trim(filename)//' read error')
-          header4=r4head(29)
+          header2=r4head(29)
           if (irec==1) print*, r4head(1),r4head(19),r4head(20),r4head(21),r4head(22),header2(2)
           call lagrange_any(xi_receiver(irec),NGLLX,xigll,hxir,hpxir)
           call lagrange_any(gamma_receiver(irec),NGLLZ,zigll,hgammar,hpgammar)

Modified: seismo/2D/SPECFEM2D/trunk/src/specfem2D/write_seismograms.F90
===================================================================
--- seismo/2D/SPECFEM2D/trunk/src/specfem2D/write_seismograms.F90	2011-09-14 15:53:45 UTC (rev 18903)
+++ seismo/2D/SPECFEM2D/trunk/src/specfem2D/write_seismograms.F90	2011-09-14 18:52:37 UTC (rev 18904)
@@ -89,9 +89,7 @@
 
 !<SU_FORMAT
   double precision :: st_zval(nrec),x_source,z_source
-  integer(kind=4) :: header4(1)
   integer(kind=2) :: header2(2)
-  equivalence(header2,header4)
 !>SU_FORMAT
 
 #ifdef USE_MPI
@@ -313,10 +311,10 @@
              if (nrec>1) write(12,rec=(irec-1)*60+(irec-1)*NSTEP+48) SNGL(st_xval(2)-st_xval(1)) ! receiver interval
              header2(1)=0  ! dummy
              header2(2)=NSTEP
-             write(12,rec=(irec-1)*60+(irec-1)*NSTEP+29) header4 ! equivalence(header4(1),header2(2))
+             write(12,rec=(irec-1)*60+(irec-1)*NSTEP+29) header2
              header2(1)=NINT(deltat*1.0d6)  ! deltat (unit: 10^{-6} second)
              header2(2)=0  ! dummy
-             write(12,rec=(irec-1)*60+(irec-1)*NSTEP+30) header4 ! equivalence(header4(1),header2(2))
+             write(12,rec=(irec-1)*60+(irec-1)*NSTEP+30) header2
              if ( seismotype /= 4 .and. seismotype /= 6 .and. p_sv) then
                 ! headers
                 if (seismo_offset==0) then
@@ -329,10 +327,10 @@
                    if(nrec>1) write(14,rec=(irec-1)*60+(irec-1)*NSTEP+48) SNGL(st_xval(2)-st_xval(1))
                    header2(1)=0  ! dummy
                    header2(2)=NSTEP
-                   write(14,rec=(irec-1)*60+(irec-1)*NSTEP+29) header4
+                   write(14,rec=(irec-1)*60+(irec-1)*NSTEP+29) header2
                    header2(1)=NINT(deltat*1.0d6)
                    header2(2)=0  ! dummy
-                   write(14,rec=(irec-1)*60+(irec-1)*NSTEP+30) header4
+                   write(14,rec=(irec-1)*60+(irec-1)*NSTEP+30) header2
                 end if
              endif
           endif