[cig-commits] r22301 - seismo/3D/SPECFEM3D_GLOBE/branches/undo_att
dkomati1 at geodynamics.org
dkomati1 at geodynamics.org
Fri Jun 14 18:23:00 PDT 2013
Author: dkomati1
Date: 2013-06-14 18:22:59 -0700 (Fri, 14 Jun 2013)
New Revision: 22301
Modified:
seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/part1_undo_att.f90
seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/part2_undo_att.f90
seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/part2_undo_att_changed_from_forward.f90
Log:
cleaned UNDO_ATT flag in the last remaining files
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/part1_undo_att.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/part1_undo_att.f90 2013-06-15 01:08:54 UTC (rev 22300)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/part1_undo_att.f90 2013-06-15 01:22:59 UTC (rev 22301)
@@ -1,10 +1,5 @@
!! DK DK
-!! DK DK this should be written in the future, starting from a copy of part1_classical.f90 once part1_classical.f90 is debugged
-!! DK DK
-
-
-!! DK DK
!! DK DK this first part handles the cases SIMULATION_TYPE == 1 and SIMULATION_TYPE == 2
!! DK DK it also handles the cases NOISE_TOMOGRAPHY == 1 and NOISE_TOMOGRAPHY == 2
!! DK DK
@@ -1640,7 +1635,7 @@
endif ! nrec_local
! write the current or final seismograms
-if(UNDO_ATT_WITH_STORE)then
+if(UNDO_ATT)then
if(seismo_current == NTSTEP_BETWEEN_OUTPUT_SEISMOS .or. it == it_end) then
if (SIMULATION_TYPE == 1) then
call write_seismograms(myrank,seismograms,number_receiver_global,station_name, &
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/part2_undo_att.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/part2_undo_att.f90 2013-06-15 01:08:54 UTC (rev 22300)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/part2_undo_att.f90 2013-06-15 01:22:59 UTC (rev 22301)
@@ -60,12 +60,12 @@
! for reconstructing the rotational contributions
if(CUSTOM_REAL == SIZE_REAL) then
time = sngl((dble(NSTEP-it)*DT-t0)*scale_t_inv)
-if(UNDO_ATT_WITH_STORE)then
+if(UNDO_ATT)then
time = sngl((dble(NSTEP-(iteration_on_subset*NT_DUMP-it_of_this_subset+1))*DT-t0)*scale_t_inv)
endif
else
time = (dble(NSTEP-it)*DT-t0)*scale_t_inv
-if(UNDO_ATT_WITH_STORE)then
+if(UNDO_ATT)then
time = (dble(NSTEP-(iteration_on_subset*NT_DUMP-it_of_this_subset+1))*DT-t0)*scale_t_inv
endif
endif
@@ -122,7 +122,7 @@
! Stacey absorbing boundaries
if(NCHUNKS_VAL /= 6 .and. ABSORBING_CONDITIONS) then
if (SIMULATION_TYPE == 3) then
-if(UNDO_ATT_WITH_STORE)then
+if(UNDO_ATT)then
call compute_stacey_outer_core_forward(ichunk,SAVE_FORWARD, &
it,ibool_outer_core, &
b_veloc_outer_core,b_accel_outer_core, &
@@ -502,7 +502,7 @@
! Stacey
if(NCHUNKS_VAL /= 6 .and. ABSORBING_CONDITIONS) then
if(SIMULATION_TYPE == 3) then
-if(UNDO_ATT_WITH_STORE)then
+if(UNDO_ATT)then
call compute_stacey_crust_mantle_forward(ichunk, &
it,SAVE_FORWARD,ibool_crust_mantle, &
b_veloc_crust_mantle,b_accel_crust_mantle, &
@@ -567,7 +567,7 @@
! add adjoint sources and add sources for backward/reconstructed wavefield
if (SIMULATION_TYPE == 3) then
-if(UNDO_ATT_WITH_STORE)then
+if(UNDO_ATT)then
call compute_add_sources_backward(myrank,NSOURCES,NSTEP, &
b_accel_crust_mantle,sourcearrays, &
DT,t0,tshift_cmt,hdur_gaussian,ibool_crust_mantle, &
@@ -606,7 +606,7 @@
! ! that's to say, the ensemble forward source is kind of a surface force density, not a body force density
! ! therefore, we must add it here, before applying the inverse of mass matrix
! else
-if(.not. UNDO_ATT_WITH_STORE)then
+if(.not. UNDO_ATT)then
if ( NOISE_TOMOGRAPHY == 3 ) then
! third step of noise tomography, i.e., read the surface movie saved at every timestep
! use the movie to reconstruct the ensemble forward wavefield
@@ -957,7 +957,7 @@
! note: this is done here after the Newmark time scheme, otherwise the indexing for sources
! and adjoint sources will become more complicated
! that is, index it for adjoint sources will match index NSTEP - 1 for backward/reconstructed wavefields
-if(.not. UNDO_ATT_WITH_STORE)then
+if(.not. UNDO_ATT)then
if(SIMULATION_TYPE == 3 .and. it == 1) then
call read_forward_arrays(myrank, &
b_displ_crust_mantle,b_veloc_crust_mantle,b_accel_crust_mantle, &
@@ -1018,8 +1018,8 @@
do k = 1,3
seismograms_temp(k) = seismograms(k,irec_local,(i-1)*NT_DUMP + j)
seismograms(k,irec_local,(i-1)*NT_DUMP + j) = seismograms(k,irec_local,(i-1)*NT_DUMP + (NT_DUMP-j+1))
- seismograms(k,irec_local,(i-1)*NT_DUMP + (NT_DUMP-j+1)) = seismograms_temp(k)
- enddo
+ seismograms(k,irec_local,(i-1)*NT_DUMP + (NT_DUMP-j+1)) = seismograms_temp(k)
+ enddo
enddo
enddo
enddo
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/part2_undo_att_changed_from_forward.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/part2_undo_att_changed_from_forward.f90 2013-06-15 01:08:54 UTC (rev 22300)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/part2_undo_att_changed_from_forward.f90 2013-06-15 01:22:59 UTC (rev 22301)
@@ -1,8 +1,4 @@
-!! DK DK
-!! DK DK this should be written in the future, starting from a copy of part1_classical.f90 once part1_classical.f90 is debugged
-!! DK DK
-
! Newmark time scheme update
! mantle
@@ -449,7 +445,7 @@
islice_selected_source,ispec_selected_source,NSTEP-(iteration_on_subset*NT_DUMP-it_of_this_subset), &
hdur,xi_source,eta_source,gamma_source,nu_source)
-if(.not. UNDO_ATT_WITH_STORE)then
+if(.not. UNDO_ATT)then
if ( NOISE_TOMOGRAPHY == 3 ) then
! third step of noise tomography, i.e., read the surface movie saved at every timestep
! use the movie to reconstruct the ensemble forward wavefield
@@ -793,7 +789,7 @@
endif ! nrec_local
! write the current or final seismograms
-if(UNDO_ATT_WITH_STORE)then
+if(UNDO_ATT)then
if(seismo_current == NTSTEP_BETWEEN_OUTPUT_SEISMOS .or. it == it_end) then
do irec_local = 1,nrec_local
do i = 1,seismo_current/NT_DUMP
@@ -801,8 +797,8 @@
do k = 1,3
seismograms_temp(k) = seismograms(k,irec_local,(i-1)*NT_DUMP + j)
seismograms(k,irec_local,(i-1)*NT_DUMP + j) = seismograms(k,irec_local,(i-1)*NT_DUMP + (NT_DUMP-j+1))
- seismograms(k,irec_local,(i-1)*NT_DUMP + (NT_DUMP-j+1)) = seismograms_temp(k)
- enddo
+ seismograms(k,irec_local,(i-1)*NT_DUMP + (NT_DUMP-j+1)) = seismograms_temp(k)
+ enddo
enddo
enddo
enddo
More information about the CIG-COMMITS
mailing list