[cig-commits] r22611 - seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D

[dkomati1 at geodynamics.org]

Author: dkomati1
Date: 2013-07-15 05:11:08 -0700 (Mon, 15 Jul 2013)
New Revision: 22611

Modified:
   seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/part1_classical.f90
   seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/part1_undo_att.f90
   seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/specfem3D.F90
Log:
added a stop statement for a movie_volume option that is not implemented when UNDO_ATTENUATION is on in order to save memory


Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/part1_classical.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/part1_classical.f90	2013-07-14 23:16:30 UTC (rev 22610)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/part1_classical.f90	2013-07-15 12:11:08 UTC (rev 22611)
@@ -940,7 +940,8 @@
                     mask_3dmovie,nu_3dmovie)
 
       else if (MOVIE_VOLUME_TYPE == 4) then ! output divergence and curl in whole volume
-!!!!! for undo_att this type of MOVIE is not supported
+        stop 'MOVIE_VOLUME_TYPE == 4 is not implemented for UNDO_ATTENUATION in order to save memory'
+!!!!! for UNDO_ATTENUATION this type of MOVIE is not supported
 !!!        call write_movie_volume_divcurl(myrank,it,eps_trace_over_3_crust_mantle,&
 !!!                        div_displ_outer_core, &
 !!!                        accel_outer_core,kappavstore_outer_core,rhostore_outer_core,ibool_outer_core, &
@@ -974,4 +975,3 @@
     endif
   endif ! MOVIE_VOLUME
 
-

Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/part1_undo_att.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/part1_undo_att.f90	2013-07-14 23:16:30 UTC (rev 22610)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/part1_undo_att.f90	2013-07-15 12:11:08 UTC (rev 22611)
@@ -1024,7 +1024,8 @@
                     mask_3dmovie,nu_3dmovie)
 
       else if (MOVIE_VOLUME_TYPE == 4) then ! output divergence and curl in whole volume
-!!!!!! for undo_att this type of MOVIE is not supported
+        stop 'MOVIE_VOLUME_TYPE == 4 is not implemented for UNDO_ATTENUATION in order to save memory'
+!!!!! for UNDO_ATTENUATION this type of MOVIE is not supported
 !!!        call write_movie_volume_divcurl(myrank,it,eps_trace_over_3_crust_mantle,&
 !!!                        div_displ_outer_core, &
 !!!                        accel_outer_core,kappavstore_outer_core,rhostore_outer_core,ibool_outer_core, &

Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/specfem3D.F90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/specfem3D.F90	2013-07-14 23:16:30 UTC (rev 22610)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/specfem3D.F90	2013-07-15 12:11:08 UTC (rev 22611)
@@ -2524,11 +2524,10 @@
 !-------------------------------------------------------------------------------
 !
 
-! New part of ZN
-  if(SIMULATION_TYPE == 1)then
+  if(SIMULATION_TYPE == 1) then
     it = 0
     do iteration_on_subset = 1, NSTEP / NT_DUMP_ATTENUATION
-      if(SAVE_FORWARD)then
+      if(SAVE_FORWARD) then
         call save_forward_arrays_undoatt(myrank,SIMULATION_TYPE,SAVE_FORWARD,NUMBER_OF_RUNS, &
                     displ_crust_mantle,veloc_crust_mantle,accel_crust_mantle, &
                     displ_inner_core,veloc_inner_core,accel_inner_core, &
@@ -2550,8 +2549,7 @@
 
   endif
 
-  if(SIMULATION_TYPE == 2)then
-   !!add this part
+  if(SIMULATION_TYPE == 2) then
 
     it = 0
     do iteration_on_subset = 1, NSTEP / NT_DUMP_ATTENUATION
@@ -2568,7 +2566,7 @@
     enddo
   endif
 
-  if(SIMULATION_TYPE == 3)then
+  if(SIMULATION_TYPE == 3) then
 
 ! to switch between simulation type 1 mode and simulation type 3 mode
 ! in exact undoing of attenuation
@@ -2701,8 +2699,6 @@
 !-------------------------------------------------------------------------------------------------
 !-------------------------------------------------------------------------------------------------
 
-  !ZN need to be removed for undoing att
-
   ! synchronize all processes, waits until all processes have written their seismograms
   call MPI_BARRIER(MPI_COMM_WORLD,ier)
   if( ier /= 0 ) call exit_mpi(myrank,'error synchronize after time loop')
@@ -2758,14 +2754,14 @@
 
     ! frees memory
     deallocate(absorb_xmin_crust_mantle5, &
-              absorb_xmax_crust_mantle5, &
-              absorb_ymin_crust_mantle5, &
-              absorb_ymax_crust_mantle5, &
-              absorb_xmin_outer_core, &
-              absorb_xmax_outer_core, &
-              absorb_ymin_outer_core, &
-              absorb_ymax_outer_core, &
-              absorb_zmin_outer_core)
+               absorb_xmax_crust_mantle5, &
+               absorb_ymin_crust_mantle5, &
+               absorb_ymax_crust_mantle5, &
+               absorb_xmin_outer_core, &
+               absorb_xmax_outer_core, &
+               absorb_ymin_outer_core, &
+               absorb_ymax_outer_core, &
+               absorb_zmin_outer_core)
   endif
 
   ! save/read the surface movie using the same c routine as we do for absorbing boundaries (file ID is 9)
@@ -2773,7 +2769,6 @@
     call close_file_abs(9)
   endif
 
-
   ! synchronize all processes
   call MPI_BARRIER(MPI_COMM_WORLD,ier)
   if( ier /= 0 ) call exit_mpi(myrank,'error synchronize closing snapshots')