[cig-commits] r22589 - in seismo/3D/SPECFEM3D_GLOBE/trunk: DATA EXAMPLES/small_benchmark_run_to_test_more_complex_Earth EXAMPLES/small_benchmark_run_to_test_very_simple_Earth src/auxiliaries src/compute_optimized_dumping_undo_att src/create_header_file src/meshfem3D src/shared src/specfem3D
dkomati1 at geodynamics.org
dkomati1 at geodynamics.org
Sat Jul 13 15:12:41 PDT 2013
Author: dkomati1
Date: 2013-07-13 15:12:41 -0700 (Sat, 13 Jul 2013)
New Revision: 22589
Modified:
seismo/3D/SPECFEM3D_GLOBE/trunk/DATA/Par_file
seismo/3D/SPECFEM3D_GLOBE/trunk/EXAMPLES/small_benchmark_run_to_test_more_complex_Earth/Par_file_this_example
seismo/3D/SPECFEM3D_GLOBE/trunk/EXAMPLES/small_benchmark_run_to_test_very_simple_Earth/Par_file_this_example
seismo/3D/SPECFEM3D_GLOBE/trunk/src/auxiliaries/check_buffers_1D.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/auxiliaries/check_buffers_2D.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/auxiliaries/check_buffers_corners_chunks.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/auxiliaries/check_buffers_faces_chunks.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/auxiliaries/combine_AVS_DX.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/auxiliaries/create_movie_AVS_DX.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/auxiliaries/create_movie_GMT_global.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/compute_optimized_dumping_undo_att/compute_optimized_dumping_undo_att.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/create_header_file/create_header_file.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/meshfem3D.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/broadcast_computed_parameters.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/read_compute_parameters.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/read_parameter_file.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_forces_crust_mantle_Dev.F90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_forces_crust_mantle_noDev.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_forces_inner_core_Dev.F90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_forces_inner_core_noDev.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_kernels.F90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/initialize_simulation.f90
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/part2_classical.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/part2_undo_att.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/part3_kernel_computation.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/specfem3D.F90
Log:
completely removed flag RECOMPUTE_STRAIN_DO_NOT_STORE, which turned out not to be a good idea
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/DATA/Par_file
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/DATA/Par_file 2013-07-13 21:51:45 UTC (rev 22588)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/DATA/Par_file 2013-07-13 22:12:41 UTC (rev 22589)
@@ -57,7 +57,6 @@
# to undo attenuation for sensitivity kernel calculations or forward runs with SAVE_FORWARD
# use one (and only one) of the two flags below. UNDO_ATTENUATION is much better (it is exact)
# but requires a significant amount of disk space for temporary storage.
-RECOMPUTE_STRAIN_DO_NOT_STORE = .false. # recomputing instead of storing the strain slows down the code but saves memory; set to .false. in most cases
PARTIAL_PHYS_DISPERSION_ONLY = .true.
UNDO_ATTENUATION = .false.
NT_DUMP_ATTENUATION = 100 # how often we dump restart files to undo attenuation, only needed when using UNDO_ATTENUATION
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/EXAMPLES/small_benchmark_run_to_test_more_complex_Earth/Par_file_this_example
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/EXAMPLES/small_benchmark_run_to_test_more_complex_Earth/Par_file_this_example 2013-07-13 21:51:45 UTC (rev 22588)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/EXAMPLES/small_benchmark_run_to_test_more_complex_Earth/Par_file_this_example 2013-07-13 22:12:41 UTC (rev 22589)
@@ -57,7 +57,6 @@
# to undo attenuation for sensitivity kernel calculations or forward runs with SAVE_FORWARD
# use one (and only one) of the two flags below. UNDO_ATTENUATION is much better (it is exact)
# but requires a significant amount of disk space for temporary storage.
-RECOMPUTE_STRAIN_DO_NOT_STORE = .false. # recomputing instead of storing the strain slows down the code but saves memory; set to .false. in most cases
PARTIAL_PHYS_DISPERSION_ONLY = .true.
UNDO_ATTENUATION = .false.
NT_DUMP_ATTENUATION = 77 # how often we dump restart files to undo attenuation, only needed when using UNDO_ATTENUATION
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/EXAMPLES/small_benchmark_run_to_test_very_simple_Earth/Par_file_this_example
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/EXAMPLES/small_benchmark_run_to_test_very_simple_Earth/Par_file_this_example 2013-07-13 21:51:45 UTC (rev 22588)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/EXAMPLES/small_benchmark_run_to_test_very_simple_Earth/Par_file_this_example 2013-07-13 22:12:41 UTC (rev 22589)
@@ -57,7 +57,6 @@
# to undo attenuation for sensitivity kernel calculations or forward runs with SAVE_FORWARD
# use one (and only one) of the two flags below. UNDO_ATTENUATION is much better (it is exact)
# but requires a significant amount of disk space for temporary storage.
-RECOMPUTE_STRAIN_DO_NOT_STORE = .false. # recomputing instead of storing the strain slows down the code but saves memory; set to .false. in most cases
PARTIAL_PHYS_DISPERSION_ONLY = .false.
UNDO_ATTENUATION = .false.
NT_DUMP_ATTENUATION = 77 # how often we dump restart files to undo attenuation, only needed when using UNDO_ATTENUATION
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/auxiliaries/check_buffers_1D.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/auxiliaries/check_buffers_1D.f90 2013-07-13 21:51:45 UTC (rev 22588)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/auxiliaries/check_buffers_1D.f90 2013-07-13 22:12:41 UTC (rev 22589)
@@ -83,7 +83,7 @@
USE_LDDRK,INCREASE_CFL_FOR_LDDRK,ANISOTROPIC_KL,SAVE_TRANSVERSE_KL_ONLY,APPROXIMATE_HESS_KL, &
USE_FULL_TISO_MANTLE,SAVE_SOURCE_MASK,GPU_MODE,ADIOS_ENABLED,ADIOS_FOR_FORWARD_ARRAYS, &
ADIOS_FOR_MPI_ARRAYS,ADIOS_FOR_ARRAYS_SOLVER,ADIOS_FOR_AVS_DX, &
- RECOMPUTE_STRAIN_DO_NOT_STORE,EXACT_MASS_MATRIX_FOR_ROTATION
+ EXACT_MASS_MATRIX_FOR_ROTATION
character(len=150) OUTPUT_FILES,LOCAL_PATH,MODEL
@@ -165,7 +165,7 @@
USE_LDDRK,INCREASE_CFL_FOR_LDDRK,ANISOTROPIC_KL,SAVE_TRANSVERSE_KL_ONLY,APPROXIMATE_HESS_KL, &
USE_FULL_TISO_MANTLE,SAVE_SOURCE_MASK,GPU_MODE,ADIOS_ENABLED,ADIOS_FOR_FORWARD_ARRAYS, &
ADIOS_FOR_MPI_ARRAYS,ADIOS_FOR_ARRAYS_SOLVER,ADIOS_FOR_AVS_DX,RATIO_BY_WHICH_TO_INCREASE_IT, &
- ATT1,ATT2,ATT3,ATT4,ATT5,RECOMPUTE_STRAIN_DO_NOT_STORE,EXACT_MASS_MATRIX_FOR_ROTATION)
+ ATT1,ATT2,ATT3,ATT4,ATT5,EXACT_MASS_MATRIX_FOR_ROTATION)
! get the base pathname for output files
call get_value_string(OUTPUT_FILES, 'OUTPUT_FILES', 'OUTPUT_FILES')
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/auxiliaries/check_buffers_2D.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/auxiliaries/check_buffers_2D.f90 2013-07-13 21:51:45 UTC (rev 22588)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/auxiliaries/check_buffers_2D.f90 2013-07-13 22:12:41 UTC (rev 22589)
@@ -88,7 +88,7 @@
USE_LDDRK,INCREASE_CFL_FOR_LDDRK,ANISOTROPIC_KL,SAVE_TRANSVERSE_KL_ONLY,APPROXIMATE_HESS_KL, &
USE_FULL_TISO_MANTLE,SAVE_SOURCE_MASK,GPU_MODE,ADIOS_ENABLED,ADIOS_FOR_FORWARD_ARRAYS, &
ADIOS_FOR_MPI_ARRAYS,ADIOS_FOR_ARRAYS_SOLVER,ADIOS_FOR_AVS_DX, &
- RECOMPUTE_STRAIN_DO_NOT_STORE,EXACT_MASS_MATRIX_FOR_ROTATION
+ EXACT_MASS_MATRIX_FOR_ROTATION
integer, dimension(MAX_NUMBER_OF_MESH_LAYERS) :: ner,ratio_sampling_array
integer, dimension(MAX_NUMBER_OF_MESH_LAYERS) :: doubling_index
@@ -167,7 +167,7 @@
USE_LDDRK,INCREASE_CFL_FOR_LDDRK,ANISOTROPIC_KL,SAVE_TRANSVERSE_KL_ONLY,APPROXIMATE_HESS_KL, &
USE_FULL_TISO_MANTLE,SAVE_SOURCE_MASK,GPU_MODE,ADIOS_ENABLED,ADIOS_FOR_FORWARD_ARRAYS, &
ADIOS_FOR_MPI_ARRAYS,ADIOS_FOR_ARRAYS_SOLVER,ADIOS_FOR_AVS_DX,RATIO_BY_WHICH_TO_INCREASE_IT, &
- ATT1,ATT2,ATT3,ATT4,ATT5,RECOMPUTE_STRAIN_DO_NOT_STORE,EXACT_MASS_MATRIX_FOR_ROTATION)
+ ATT1,ATT2,ATT3,ATT4,ATT5,EXACT_MASS_MATRIX_FOR_ROTATION)
! get the base pathname for output files
call get_value_string(OUTPUT_FILES, 'OUTPUT_FILES', 'OUTPUT_FILES')
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/auxiliaries/check_buffers_corners_chunks.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/auxiliaries/check_buffers_corners_chunks.f90 2013-07-13 21:51:45 UTC (rev 22588)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/auxiliaries/check_buffers_corners_chunks.f90 2013-07-13 22:12:41 UTC (rev 22589)
@@ -80,7 +80,7 @@
USE_LDDRK,INCREASE_CFL_FOR_LDDRK,ANISOTROPIC_KL,SAVE_TRANSVERSE_KL_ONLY,APPROXIMATE_HESS_KL, &
USE_FULL_TISO_MANTLE,SAVE_SOURCE_MASK,GPU_MODE,ADIOS_ENABLED,ADIOS_FOR_FORWARD_ARRAYS, &
ADIOS_FOR_MPI_ARRAYS,ADIOS_FOR_ARRAYS_SOLVER,ADIOS_FOR_AVS_DX, &
- RECOMPUTE_STRAIN_DO_NOT_STORE,EXACT_MASS_MATRIX_FOR_ROTATION
+ EXACT_MASS_MATRIX_FOR_ROTATION
character(len=150) OUTPUT_FILES,LOCAL_PATH,MODEL
@@ -157,7 +157,7 @@
USE_LDDRK,INCREASE_CFL_FOR_LDDRK,ANISOTROPIC_KL,SAVE_TRANSVERSE_KL_ONLY,APPROXIMATE_HESS_KL, &
USE_FULL_TISO_MANTLE,SAVE_SOURCE_MASK,GPU_MODE,ADIOS_ENABLED,ADIOS_FOR_FORWARD_ARRAYS, &
ADIOS_FOR_MPI_ARRAYS,ADIOS_FOR_ARRAYS_SOLVER,ADIOS_FOR_AVS_DX,RATIO_BY_WHICH_TO_INCREASE_IT, &
- ATT1,ATT2,ATT3,ATT4,ATT5,RECOMPUTE_STRAIN_DO_NOT_STORE,EXACT_MASS_MATRIX_FOR_ROTATION)
+ ATT1,ATT2,ATT3,ATT4,ATT5,EXACT_MASS_MATRIX_FOR_ROTATION)
print *
print *,'There are ',NPROCTOT,' slices numbered from 0 to ',NPROCTOT-1
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/auxiliaries/check_buffers_faces_chunks.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/auxiliaries/check_buffers_faces_chunks.f90 2013-07-13 21:51:45 UTC (rev 22588)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/auxiliaries/check_buffers_faces_chunks.f90 2013-07-13 22:12:41 UTC (rev 22589)
@@ -84,7 +84,7 @@
USE_LDDRK,INCREASE_CFL_FOR_LDDRK,ANISOTROPIC_KL,SAVE_TRANSVERSE_KL_ONLY,APPROXIMATE_HESS_KL, &
USE_FULL_TISO_MANTLE,SAVE_SOURCE_MASK,GPU_MODE,ADIOS_ENABLED,ADIOS_FOR_FORWARD_ARRAYS, &
ADIOS_FOR_MPI_ARRAYS,ADIOS_FOR_ARRAYS_SOLVER,ADIOS_FOR_AVS_DX, &
- RECOMPUTE_STRAIN_DO_NOT_STORE,EXACT_MASS_MATRIX_FOR_ROTATION
+ EXACT_MASS_MATRIX_FOR_ROTATION
character(len=150) OUTPUT_FILES,LOCAL_PATH,MODEL
@@ -157,7 +157,7 @@
USE_LDDRK,INCREASE_CFL_FOR_LDDRK,ANISOTROPIC_KL,SAVE_TRANSVERSE_KL_ONLY,APPROXIMATE_HESS_KL, &
USE_FULL_TISO_MANTLE,SAVE_SOURCE_MASK,GPU_MODE,ADIOS_ENABLED,ADIOS_FOR_FORWARD_ARRAYS, &
ADIOS_FOR_MPI_ARRAYS,ADIOS_FOR_ARRAYS_SOLVER,ADIOS_FOR_AVS_DX,RATIO_BY_WHICH_TO_INCREASE_IT, &
- ATT1,ATT2,ATT3,ATT4,ATT5,RECOMPUTE_STRAIN_DO_NOT_STORE,EXACT_MASS_MATRIX_FOR_ROTATION)
+ ATT1,ATT2,ATT3,ATT4,ATT5,EXACT_MASS_MATRIX_FOR_ROTATION)
! get the base pathname for output files
call get_value_string(OUTPUT_FILES, 'OUTPUT_FILES', 'OUTPUT_FILES')
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/auxiliaries/combine_AVS_DX.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/auxiliaries/combine_AVS_DX.f90 2013-07-13 21:51:45 UTC (rev 22588)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/auxiliaries/combine_AVS_DX.f90 2013-07-13 22:12:41 UTC (rev 22589)
@@ -153,7 +153,7 @@
USE_LDDRK,INCREASE_CFL_FOR_LDDRK,ANISOTROPIC_KL,SAVE_TRANSVERSE_KL_ONLY,APPROXIMATE_HESS_KL, &
USE_FULL_TISO_MANTLE,SAVE_SOURCE_MASK,GPU_MODE,ADIOS_ENABLED,ADIOS_FOR_FORWARD_ARRAYS, &
ADIOS_FOR_MPI_ARRAYS,ADIOS_FOR_ARRAYS_SOLVER,ADIOS_FOR_AVS_DX, &
- RECOMPUTE_STRAIN_DO_NOT_STORE,EXACT_MASS_MATRIX_FOR_ROTATION
+ EXACT_MASS_MATRIX_FOR_ROTATION
character(len=150) OUTPUT_FILES,LOCAL_PATH,MODEL
@@ -238,7 +238,7 @@
USE_LDDRK,INCREASE_CFL_FOR_LDDRK,ANISOTROPIC_KL,SAVE_TRANSVERSE_KL_ONLY,APPROXIMATE_HESS_KL, &
USE_FULL_TISO_MANTLE,SAVE_SOURCE_MASK,GPU_MODE,ADIOS_ENABLED,ADIOS_FOR_FORWARD_ARRAYS, &
ADIOS_FOR_MPI_ARRAYS,ADIOS_FOR_ARRAYS_SOLVER,ADIOS_FOR_AVS_DX,RATIO_BY_WHICH_TO_INCREASE_IT, &
- ATT1,ATT2,ATT3,ATT4,ATT5,RECOMPUTE_STRAIN_DO_NOT_STORE,EXACT_MASS_MATRIX_FOR_ROTATION)
+ ATT1,ATT2,ATT3,ATT4,ATT5,EXACT_MASS_MATRIX_FOR_ROTATION)
if(.not. SAVE_MESH_FILES) stop 'AVS or DX files were not saved by the mesher'
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/auxiliaries/create_movie_AVS_DX.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/auxiliaries/create_movie_AVS_DX.f90 2013-07-13 21:51:45 UTC (rev 22588)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/auxiliaries/create_movie_AVS_DX.f90 2013-07-13 22:12:41 UTC (rev 22589)
@@ -798,7 +798,7 @@
USE_LDDRK,INCREASE_CFL_FOR_LDDRK,ANISOTROPIC_KL,SAVE_TRANSVERSE_KL_ONLY,APPROXIMATE_HESS_KL, &
USE_FULL_TISO_MANTLE,SAVE_SOURCE_MASK,GPU_MODE,ADIOS_ENABLED,ADIOS_FOR_FORWARD_ARRAYS, &
ADIOS_FOR_MPI_ARRAYS,ADIOS_FOR_ARRAYS_SOLVER,ADIOS_FOR_AVS_DX, &
- RECOMPUTE_STRAIN_DO_NOT_STORE,EXACT_MASS_MATRIX_FOR_ROTATION
+ EXACT_MASS_MATRIX_FOR_ROTATION
! parameters deduced from parameters read from file
integer NPROC,NPROCTOT,NEX_PER_PROC_XI,NEX_PER_PROC_ETA,ratio_divide_central_cube
@@ -864,7 +864,7 @@
USE_LDDRK,INCREASE_CFL_FOR_LDDRK,ANISOTROPIC_KL,SAVE_TRANSVERSE_KL_ONLY,APPROXIMATE_HESS_KL, &
USE_FULL_TISO_MANTLE,SAVE_SOURCE_MASK,GPU_MODE,ADIOS_ENABLED,ADIOS_FOR_FORWARD_ARRAYS, &
ADIOS_FOR_MPI_ARRAYS,ADIOS_FOR_ARRAYS_SOLVER,ADIOS_FOR_AVS_DX,RATIO_BY_WHICH_TO_INCREASE_IT, &
- ATT1,ATT2,ATT3,ATT4,ATT5,RECOMPUTE_STRAIN_DO_NOT_STORE,EXACT_MASS_MATRIX_FOR_ROTATION)
+ ATT1,ATT2,ATT3,ATT4,ATT5,EXACT_MASS_MATRIX_FOR_ROTATION)
if(MOVIE_COARSE) stop 'create_movie_AVS_DX does not work with MOVIE_COARSE'
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/auxiliaries/create_movie_GMT_global.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/auxiliaries/create_movie_GMT_global.f90 2013-07-13 21:51:45 UTC (rev 22588)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/auxiliaries/create_movie_GMT_global.f90 2013-07-13 22:12:41 UTC (rev 22589)
@@ -129,7 +129,7 @@
USE_LDDRK,INCREASE_CFL_FOR_LDDRK,ANISOTROPIC_KL,SAVE_TRANSVERSE_KL_ONLY,APPROXIMATE_HESS_KL, &
USE_FULL_TISO_MANTLE,SAVE_SOURCE_MASK,GPU_MODE,ADIOS_ENABLED,ADIOS_FOR_FORWARD_ARRAYS, &
ADIOS_FOR_MPI_ARRAYS,ADIOS_FOR_ARRAYS_SOLVER,ADIOS_FOR_AVS_DX, &
- RECOMPUTE_STRAIN_DO_NOT_STORE,EXACT_MASS_MATRIX_FOR_ROTATION
+ EXACT_MASS_MATRIX_FOR_ROTATION
character(len=150) LOCAL_PATH,MODEL
@@ -216,7 +216,7 @@
USE_LDDRK,INCREASE_CFL_FOR_LDDRK,ANISOTROPIC_KL,SAVE_TRANSVERSE_KL_ONLY,APPROXIMATE_HESS_KL, &
USE_FULL_TISO_MANTLE,SAVE_SOURCE_MASK,GPU_MODE,ADIOS_ENABLED,ADIOS_FOR_FORWARD_ARRAYS, &
ADIOS_FOR_MPI_ARRAYS,ADIOS_FOR_ARRAYS_SOLVER,ADIOS_FOR_AVS_DX,RATIO_BY_WHICH_TO_INCREASE_IT, &
- ATT1,ATT2,ATT3,ATT4,ATT5,RECOMPUTE_STRAIN_DO_NOT_STORE,EXACT_MASS_MATRIX_FOR_ROTATION)
+ ATT1,ATT2,ATT3,ATT4,ATT5,EXACT_MASS_MATRIX_FOR_ROTATION)
if(.not. MOVIE_SURFACE) stop 'movie frames were not saved by the solver'
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/compute_optimized_dumping_undo_att/compute_optimized_dumping_undo_att.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/compute_optimized_dumping_undo_att/compute_optimized_dumping_undo_att.f90 2013-07-13 21:51:45 UTC (rev 22588)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/compute_optimized_dumping_undo_att/compute_optimized_dumping_undo_att.f90 2013-07-13 22:12:41 UTC (rev 22589)
@@ -65,7 +65,7 @@
USE_LDDRK,INCREASE_CFL_FOR_LDDRK,ANISOTROPIC_KL,SAVE_TRANSVERSE_KL_ONLY,APPROXIMATE_HESS_KL, &
USE_FULL_TISO_MANTLE,SAVE_SOURCE_MASK,GPU_MODE,ADIOS_ENABLED,ADIOS_FOR_FORWARD_ARRAYS, &
ADIOS_FOR_MPI_ARRAYS,ADIOS_FOR_ARRAYS_SOLVER,ADIOS_FOR_AVS_DX, &
- RECOMPUTE_STRAIN_DO_NOT_STORE,EXACT_MASS_MATRIX_FOR_ROTATION
+ EXACT_MASS_MATRIX_FOR_ROTATION
character(len=150) LOCAL_PATH,MODEL
@@ -151,7 +151,7 @@
USE_LDDRK,INCREASE_CFL_FOR_LDDRK,ANISOTROPIC_KL,SAVE_TRANSVERSE_KL_ONLY,APPROXIMATE_HESS_KL, &
USE_FULL_TISO_MANTLE,SAVE_SOURCE_MASK,GPU_MODE,ADIOS_ENABLED,ADIOS_FOR_FORWARD_ARRAYS, &
ADIOS_FOR_MPI_ARRAYS,ADIOS_FOR_ARRAYS_SOLVER,ADIOS_FOR_AVS_DX,RATIO_BY_WHICH_TO_INCREASE_IT, &
- ATT1,ATT2,ATT3,ATT4,ATT5,RECOMPUTE_STRAIN_DO_NOT_STORE,EXACT_MASS_MATRIX_FOR_ROTATION)
+ ATT1,ATT2,ATT3,ATT4,ATT5,EXACT_MASS_MATRIX_FOR_ROTATION)
! optimal dumping interval calculation can only be done when SIMULATION_TYPE == 3 in the Par_file,
! thus set it to that value here in this serial code even if it has a different value in the Par_file
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/create_header_file/create_header_file.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/create_header_file/create_header_file.f90 2013-07-13 21:51:45 UTC (rev 22588)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/create_header_file/create_header_file.f90 2013-07-13 22:12:41 UTC (rev 22589)
@@ -64,7 +64,7 @@
USE_LDDRK,INCREASE_CFL_FOR_LDDRK,ANISOTROPIC_KL,SAVE_TRANSVERSE_KL_ONLY,APPROXIMATE_HESS_KL, &
USE_FULL_TISO_MANTLE,SAVE_SOURCE_MASK,GPU_MODE,ADIOS_ENABLED,ADIOS_FOR_FORWARD_ARRAYS, &
ADIOS_FOR_MPI_ARRAYS,ADIOS_FOR_ARRAYS_SOLVER,ADIOS_FOR_AVS_DX, &
- RECOMPUTE_STRAIN_DO_NOT_STORE,EXACT_MASS_MATRIX_FOR_ROTATION
+ EXACT_MASS_MATRIX_FOR_ROTATION
character(len=150) LOCAL_PATH,MODEL
@@ -154,7 +154,7 @@
USE_LDDRK,INCREASE_CFL_FOR_LDDRK,ANISOTROPIC_KL,SAVE_TRANSVERSE_KL_ONLY,APPROXIMATE_HESS_KL, &
USE_FULL_TISO_MANTLE,SAVE_SOURCE_MASK,GPU_MODE,ADIOS_ENABLED,ADIOS_FOR_FORWARD_ARRAYS, &
ADIOS_FOR_MPI_ARRAYS,ADIOS_FOR_ARRAYS_SOLVER,ADIOS_FOR_AVS_DX,RATIO_BY_WHICH_TO_INCREASE_IT, &
- ATT1,ATT2,ATT3,ATT4,ATT5,RECOMPUTE_STRAIN_DO_NOT_STORE,EXACT_MASS_MATRIX_FOR_ROTATION)
+ ATT1,ATT2,ATT3,ATT4,ATT5,EXACT_MASS_MATRIX_FOR_ROTATION)
! count the total number of sources in the CMTSOLUTION file
call count_number_of_sources(NSOURCES)
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/meshfem3D.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/meshfem3D.f90 2013-07-13 21:51:45 UTC (rev 22588)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/meshfem3D.f90 2013-07-13 22:12:41 UTC (rev 22589)
@@ -370,7 +370,7 @@
USE_LDDRK,INCREASE_CFL_FOR_LDDRK,ANISOTROPIC_KL,SAVE_TRANSVERSE_KL_ONLY,APPROXIMATE_HESS_KL, &
USE_FULL_TISO_MANTLE,SAVE_SOURCE_MASK,GPU_MODE,ADIOS_ENABLED,ADIOS_FOR_FORWARD_ARRAYS, &
ADIOS_FOR_MPI_ARRAYS,ADIOS_FOR_ARRAYS_SOLVER,ADIOS_FOR_AVS_DX, &
- RECOMPUTE_STRAIN_DO_NOT_STORE,EXACT_MASS_MATRIX_FOR_ROTATION
+ EXACT_MASS_MATRIX_FOR_ROTATION
character(len=150) OUTPUT_FILES,LOCAL_PATH,MODEL
@@ -553,7 +553,7 @@
USE_LDDRK,INCREASE_CFL_FOR_LDDRK,ANISOTROPIC_KL,SAVE_TRANSVERSE_KL_ONLY,APPROXIMATE_HESS_KL, &
USE_FULL_TISO_MANTLE,SAVE_SOURCE_MASK,GPU_MODE,ADIOS_ENABLED,ADIOS_FOR_FORWARD_ARRAYS, &
ADIOS_FOR_MPI_ARRAYS,ADIOS_FOR_ARRAYS_SOLVER,ADIOS_FOR_AVS_DX,RATIO_BY_WHICH_TO_INCREASE_IT, &
- ATT1,ATT2,ATT3,ATT4,ATT5,RECOMPUTE_STRAIN_DO_NOT_STORE,EXACT_MASS_MATRIX_FOR_ROTATION)
+ ATT1,ATT2,ATT3,ATT4,ATT5,EXACT_MASS_MATRIX_FOR_ROTATION)
endif
! distributes parameters from master to all processes
@@ -593,7 +593,7 @@
USE_LDDRK,INCREASE_CFL_FOR_LDDRK,ANISOTROPIC_KL,SAVE_TRANSVERSE_KL_ONLY,APPROXIMATE_HESS_KL, &
USE_FULL_TISO_MANTLE,SAVE_SOURCE_MASK,GPU_MODE,ADIOS_ENABLED,ADIOS_FOR_FORWARD_ARRAYS, &
ADIOS_FOR_MPI_ARRAYS,ADIOS_FOR_ARRAYS_SOLVER,ADIOS_FOR_AVS_DX,RATIO_BY_WHICH_TO_INCREASE_IT, &
- ATT1,ATT2,ATT3,ATT4,ATT5,RECOMPUTE_STRAIN_DO_NOT_STORE,EXACT_MASS_MATRIX_FOR_ROTATION)
+ ATT1,ATT2,ATT3,ATT4,ATT5,EXACT_MASS_MATRIX_FOR_ROTATION)
! check that the code is running with the requested number of processes
if(sizeprocs /= NPROCTOT) call exit_MPI(myrank,'wrong number of MPI processes')
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/broadcast_computed_parameters.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/broadcast_computed_parameters.f90 2013-07-13 21:51:45 UTC (rev 22588)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/broadcast_computed_parameters.f90 2013-07-13 22:12:41 UTC (rev 22589)
@@ -61,7 +61,7 @@
USE_LDDRK,INCREASE_CFL_FOR_LDDRK,ANISOTROPIC_KL,SAVE_TRANSVERSE_KL_ONLY,APPROXIMATE_HESS_KL, &
USE_FULL_TISO_MANTLE,SAVE_SOURCE_MASK,GPU_MODE,ADIOS_ENABLED,ADIOS_FOR_FORWARD_ARRAYS, &
ADIOS_FOR_MPI_ARRAYS,ADIOS_FOR_ARRAYS_SOLVER,ADIOS_FOR_AVS_DX,RATIO_BY_WHICH_TO_INCREASE_IT, &
- ATT1,ATT2,ATT3,ATT4,ATT5,RECOMPUTE_STRAIN_DO_NOT_STORE,EXACT_MASS_MATRIX_FOR_ROTATION)
+ ATT1,ATT2,ATT3,ATT4,ATT5,EXACT_MASS_MATRIX_FOR_ROTATION)
use mpi
@@ -100,7 +100,7 @@
USE_LDDRK,INCREASE_CFL_FOR_LDDRK,ANISOTROPIC_KL,SAVE_TRANSVERSE_KL_ONLY,APPROXIMATE_HESS_KL, &
USE_FULL_TISO_MANTLE,SAVE_SOURCE_MASK,GPU_MODE,ADIOS_ENABLED,ADIOS_FOR_FORWARD_ARRAYS, &
ADIOS_FOR_MPI_ARRAYS,ADIOS_FOR_ARRAYS_SOLVER,ADIOS_FOR_AVS_DX,&
- RECOMPUTE_STRAIN_DO_NOT_STORE,EXACT_MASS_MATRIX_FOR_ROTATION
+ EXACT_MASS_MATRIX_FOR_ROTATION
character(len=150) LOCAL_PATH,MODEL
@@ -138,7 +138,7 @@
! local parameters
double precision, dimension(32) :: bcast_double_precision
integer, dimension(45) :: bcast_integer
- logical, dimension(53) :: bcast_logical
+ logical, dimension(52) :: bcast_logical
integer ier
! master process prepares broadcasting arrays
@@ -175,7 +175,7 @@
USE_LDDRK,INCREASE_CFL_FOR_LDDRK,ANISOTROPIC_KL,SAVE_TRANSVERSE_KL_ONLY,APPROXIMATE_HESS_KL, &
USE_FULL_TISO_MANTLE,SAVE_SOURCE_MASK,GPU_MODE,ADIOS_ENABLED,ADIOS_FOR_FORWARD_ARRAYS, &
ADIOS_FOR_MPI_ARRAYS,ADIOS_FOR_ARRAYS_SOLVER,ADIOS_FOR_AVS_DX,&
- RECOMPUTE_STRAIN_DO_NOT_STORE,EXACT_MASS_MATRIX_FOR_ROTATION/)
+ EXACT_MASS_MATRIX_FOR_ROTATION/)
bcast_double_precision = (/DT,ANGULAR_WIDTH_XI_IN_DEGREES,ANGULAR_WIDTH_ETA_IN_DEGREES,CENTER_LONGITUDE_IN_DEGREES, &
CENTER_LATITUDE_IN_DEGREES,GAMMA_ROTATION_AZIMUTH,ROCEAN,RMIDDLE_CRUST, &
@@ -188,7 +188,7 @@
! broadcasts the information read on the master to the nodes
call MPI_BCAST(bcast_integer,45,MPI_INTEGER,0,MPI_COMM_WORLD,ier)
call MPI_BCAST(bcast_double_precision,32,MPI_DOUBLE_PRECISION,0,MPI_COMM_WORLD,ier)
- call MPI_BCAST(bcast_logical,53,MPI_LOGICAL,0,MPI_COMM_WORLD,ier)
+ call MPI_BCAST(bcast_logical,52,MPI_LOGICAL,0,MPI_COMM_WORLD,ier)
! broadcasts non-single value parameters
call MPI_BCAST(LOCAL_PATH,150,MPI_CHARACTER,0,MPI_COMM_WORLD,ier)
@@ -218,7 +218,7 @@
call MPI_BCAST(DIFF_NSPEC2D_XI,NB_SQUARE_EDGES_ONEDIR*NB_CUT_CASE,MPI_INTEGER,0,MPI_COMM_WORLD,ier)
! non-master processes set their parameters
- if (myrank /=0) then
+ if (myrank /= 0) then
! please, be careful with ordering and counting here
! integers
@@ -320,8 +320,7 @@
ADIOS_FOR_MPI_ARRAYS = bcast_logical(49)
ADIOS_FOR_ARRAYS_SOLVER = bcast_logical(50)
ADIOS_FOR_AVS_DX = bcast_logical(51)
- RECOMPUTE_STRAIN_DO_NOT_STORE = bcast_logical(52)
- EXACT_MASS_MATRIX_FOR_ROTATION = bcast_logical(53)
+ EXACT_MASS_MATRIX_FOR_ROTATION = bcast_logical(52)
! double precisions
DT = bcast_double_precision(1)
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/read_compute_parameters.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/read_compute_parameters.f90 2013-07-13 21:51:45 UTC (rev 22588)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/read_compute_parameters.f90 2013-07-13 22:12:41 UTC (rev 22589)
@@ -63,7 +63,7 @@
USE_LDDRK,INCREASE_CFL_FOR_LDDRK,ANISOTROPIC_KL,SAVE_TRANSVERSE_KL_ONLY,APPROXIMATE_HESS_KL, &
USE_FULL_TISO_MANTLE,SAVE_SOURCE_MASK,GPU_MODE,ADIOS_ENABLED,ADIOS_FOR_FORWARD_ARRAYS, &
ADIOS_FOR_MPI_ARRAYS,ADIOS_FOR_ARRAYS_SOLVER,ADIOS_FOR_AVS_DX,RATIO_BY_WHICH_TO_INCREASE_IT, &
- ATT1,ATT2,ATT3,ATT4,ATT5,RECOMPUTE_STRAIN_DO_NOT_STORE,EXACT_MASS_MATRIX_FOR_ROTATION)
+ ATT1,ATT2,ATT3,ATT4,ATT5,EXACT_MASS_MATRIX_FOR_ROTATION)
implicit none
@@ -116,7 +116,7 @@
USE_LDDRK,INCREASE_CFL_FOR_LDDRK,ANISOTROPIC_KL,SAVE_TRANSVERSE_KL_ONLY,APPROXIMATE_HESS_KL, &
USE_FULL_TISO_MANTLE,SAVE_SOURCE_MASK,GPU_MODE,ADIOS_ENABLED,ADIOS_FOR_FORWARD_ARRAYS, &
ADIOS_FOR_MPI_ARRAYS,ADIOS_FOR_ARRAYS_SOLVER,ADIOS_FOR_AVS_DX, &
- RECOMPUTE_STRAIN_DO_NOT_STORE,EXACT_MASS_MATRIX_FOR_ROTATION
+ EXACT_MASS_MATRIX_FOR_ROTATION
integer NEX_MAX
@@ -184,7 +184,7 @@
USE_LDDRK,INCREASE_CFL_FOR_LDDRK,ANISOTROPIC_KL,SAVE_TRANSVERSE_KL_ONLY,APPROXIMATE_HESS_KL, &
USE_FULL_TISO_MANTLE,SAVE_SOURCE_MASK,GPU_MODE,ADIOS_ENABLED,ADIOS_FOR_FORWARD_ARRAYS, &
ADIOS_FOR_MPI_ARRAYS,ADIOS_FOR_ARRAYS_SOLVER,ADIOS_FOR_AVS_DX,RATIO_BY_WHICH_TO_INCREASE_IT, &
- RECOMPUTE_STRAIN_DO_NOT_STORE,EXACT_MASS_MATRIX_FOR_ROTATION)
+ EXACT_MASS_MATRIX_FOR_ROTATION)
! converts values to radians
MOVIE_EAST = MOVIE_EAST_DEG * DEGREES_TO_RADIANS
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/read_parameter_file.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/read_parameter_file.f90 2013-07-13 21:51:45 UTC (rev 22588)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/read_parameter_file.f90 2013-07-13 22:12:41 UTC (rev 22589)
@@ -55,7 +55,7 @@
USE_LDDRK,INCREASE_CFL_FOR_LDDRK,ANISOTROPIC_KL,SAVE_TRANSVERSE_KL_ONLY,APPROXIMATE_HESS_KL, &
USE_FULL_TISO_MANTLE,SAVE_SOURCE_MASK,GPU_MODE,ADIOS_ENABLED,ADIOS_FOR_FORWARD_ARRAYS, &
ADIOS_FOR_MPI_ARRAYS,ADIOS_FOR_ARRAYS_SOLVER,ADIOS_FOR_AVS_DX,RATIO_BY_WHICH_TO_INCREASE_IT, &
- RECOMPUTE_STRAIN_DO_NOT_STORE,EXACT_MASS_MATRIX_FOR_ROTATION)
+ EXACT_MASS_MATRIX_FOR_ROTATION)
implicit none
@@ -85,7 +85,7 @@
USE_LDDRK,INCREASE_CFL_FOR_LDDRK,ANISOTROPIC_KL,SAVE_TRANSVERSE_KL_ONLY,APPROXIMATE_HESS_KL, &
USE_FULL_TISO_MANTLE,SAVE_SOURCE_MASK,GPU_MODE,ADIOS_ENABLED,ADIOS_FOR_FORWARD_ARRAYS, &
ADIOS_FOR_MPI_ARRAYS,ADIOS_FOR_ARRAYS_SOLVER,ADIOS_FOR_AVS_DX, &
- RECOMPUTE_STRAIN_DO_NOT_STORE,EXACT_MASS_MATRIX_FOR_ROTATION
+ EXACT_MASS_MATRIX_FOR_ROTATION
character(len=150) OUTPUT_FILES,LOCAL_PATH,MODEL
@@ -146,8 +146,6 @@
if (ierr /= 0) stop 'an error occurred while reading the parameter file: MODEL'
call read_value_double_precision(RECORD_LENGTH_IN_MINUTES, 'solver.RECORD_LENGTH_IN_MINUTES', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: RECORD_LENGTH_IN_MINUTES'
- call read_value_logical(RECOMPUTE_STRAIN_DO_NOT_STORE, 'solver.RECOMPUTE_STRAIN_DO_NOT_STORE', ierr)
- if (ierr /= 0) stop 'an error occurred while reading the parameter file: RECOMPUTE_STRAIN_DO_NOT_STORE'
call read_value_logical(PARTIAL_PHYS_DISPERSION_ONLY, 'solver.PARTIAL_PHYS_DISPERSION_ONLY', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: PARTIAL_PHYS_DISPERSION_ONLY'
call read_value_logical(UNDO_ATTENUATION, 'solver.UNDO_ATTENUATION', ierr)
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_forces_crust_mantle_Dev.F90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_forces_crust_mantle_Dev.F90 2013-07-13 21:51:45 UTC (rev 22588)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_forces_crust_mantle_Dev.F90 2013-07-13 22:12:41 UTC (rev 22589)
@@ -55,7 +55,7 @@
R_memory,one_minus_sum_beta,deltat,veloc_crust_mantle, &
alphaval,betaval,gammaval,factor_common,vnspec,PARTIAL_PHYS_DISPERSION_ONLY,&
istage,R_memory_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
- RECOMPUTE_STRAIN_DO_NOT_STORE,epsilondev,eps_trace_over_3)
+ epsilondev,eps_trace_over_3)
! this routine is optimized for NGLLX = NGLLY = NGLLZ = 5 using the Deville et al. (2002) inlined matrix-matrix products
@@ -103,7 +103,7 @@
! memory variables R_ij are stored at the local rather than global level
! to allow for optimization of cache access by compiler
real(kind=CUSTOM_REAL), dimension(5,N_SLS,NGLLX,NGLLY,NGLLZ,NSPEC_CRUST_MANTLE_ATTENUAT) :: R_memory
- logical :: PARTIAL_PHYS_DISPERSION_ONLY,RECOMPUTE_STRAIN_DO_NOT_STORE
+ logical :: PARTIAL_PHYS_DISPERSION_ONLY
real(kind=CUSTOM_REAL), dimension(5,NGLLX,NGLLY,NGLLZ,NSPEC_CRUST_MANTLE_ATTENUAT) :: epsilondev
real(kind=CUSTOM_REAL), dimension(NGLLX,NGLLY,NGLLZ,NSPEC_CRUST_MANTLE_ATTENUAT) :: eps_trace_over_3
@@ -545,7 +545,7 @@
! we get Q_\alpha = (9 / 4) * Q_\mu = 2.25 * Q_\mu
if(ATTENUATION_VAL .and. ( PARTIAL_PHYS_DISPERSION_ONLY .eqv. .false. ) ) then
- if(COMPUTE_AND_STORE_STRAIN .and. (.not. RECOMPUTE_STRAIN_DO_NOT_STORE))then
+ if(COMPUTE_AND_STORE_STRAIN)then
! updates R_memory
epsilondev_loc_nsub1(1,:,:,:) = epsilondev(1,:,:,:,ispec)
epsilondev_loc_nsub1(2,:,:,:) = epsilondev(2,:,:,:,ispec)
@@ -573,7 +573,7 @@
istage,R_memory_lddrk,tau_sigma_CUSTOM_REAL,deltat,USE_LDDRK)
endif
- if(COMPUTE_AND_STORE_STRAIN .and. (.not. RECOMPUTE_STRAIN_DO_NOT_STORE)) then
+ if(COMPUTE_AND_STORE_STRAIN) then
eps_trace_over_3(:,:,:,ispec) = eps_trace_over_3_loc(:,:,:)
epsilondev(1,:,:,:,ispec) = epsilondev_loc(1,:,:,:)
epsilondev(2,:,:,:,ispec) = epsilondev_loc(2,:,:,:)
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_forces_crust_mantle_noDev.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_forces_crust_mantle_noDev.f90 2013-07-13 21:51:45 UTC (rev 22588)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_forces_crust_mantle_noDev.f90 2013-07-13 22:12:41 UTC (rev 22589)
@@ -55,7 +55,7 @@
R_memory,one_minus_sum_beta,deltat,veloc_crust_mantle, &
alphaval,betaval,gammaval,factor_common,vnspec,PARTIAL_PHYS_DISPERSION_ONLY,&
istage,R_memory_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
- RECOMPUTE_STRAIN_DO_NOT_STORE,epsilondev,eps_trace_over_3)
+ epsilondev,eps_trace_over_3)
implicit none
@@ -84,7 +84,7 @@
! for attenuation
real(kind=CUSTOM_REAL) R_xx_val,R_yy_val
real(kind=CUSTOM_REAL), dimension(5,N_SLS,NGLLX,NGLLY,NGLLZ,NSPEC_CRUST_MANTLE_ATTENUAT) :: R_memory
- logical :: PARTIAL_PHYS_DISPERSION_ONLY,RECOMPUTE_STRAIN_DO_NOT_STORE
+ logical :: PARTIAL_PHYS_DISPERSION_ONLY
real(kind=CUSTOM_REAL), dimension(5,NGLLX,NGLLY,NGLLZ,NSPEC_CRUST_MANTLE_ATTENUAT) :: epsilondev
real(kind=CUSTOM_REAL), dimension(NGLLX,NGLLY,NGLLZ,NSPEC_CRUST_MANTLE_ATTENUAT) :: eps_trace_over_3
@@ -383,9 +383,7 @@
epsilondev_loc(3,i,j,k) = 0.5 * duxdyl_plus_duydxl
epsilondev_loc(4,i,j,k) = 0.5 * duzdxl_plus_duxdzl
epsilondev_loc(5,i,j,k) = 0.5 * duzdyl_plus_duydzl
- if(.not. RECOMPUTE_STRAIN_DO_NOT_STORE)then
- eps_trace_over_3(i,j,k,ispec) = templ
- endif
+ eps_trace_over_3(i,j,k,ispec) = templ
endif
! precompute terms for attenuation if needed
@@ -911,9 +909,9 @@
! therefore Q_\alpha is not zero; for instance for V_p / V_s = sqrt(3)
! we get Q_\alpha = (9 / 4) * Q_\mu = 2.25 * Q_\mu
- if(ATTENUATION_VAL .and. ( PARTIAL_PHYS_DISPERSION_ONLY .eqv. .false. )) then
+ if(ATTENUATION_VAL .and. .not. PARTIAL_PHYS_DISPERSION_ONLY) then
- if(COMPUTE_AND_STORE_STRAIN .and. (.not. RECOMPUTE_STRAIN_DO_NOT_STORE))then
+ if(COMPUTE_AND_STORE_STRAIN)then
epsilondev_loc_nsub1(1,:,:,:) = epsilondev(1,:,:,:,ispec)
epsilondev_loc_nsub1(2,:,:,:) = epsilondev(2,:,:,:,ispec)
epsilondev_loc_nsub1(3,:,:,:) = epsilondev(3,:,:,:,ispec)
@@ -966,7 +964,7 @@
R_memory(i_memory,i_SLS,:,:,:,ispec) = R_memory(i_memory,i_SLS,:,:,:,ispec) + &
BETA_LDDRK(istage) * R_memory_lddrk(i_memory,i_SLS,:,:,:,ispec)
else
- if(COMPUTE_AND_STORE_STRAIN .and. (.not. RECOMPUTE_STRAIN_DO_NOT_STORE))then
+ if(COMPUTE_AND_STORE_STRAIN)then
R_memory(i_memory,i_SLS,:,:,:,ispec) = alphaval(i_SLS) * R_memory(i_memory,i_SLS,:,:,:,ispec) &
+ factor_common_c44_muv(:,:,:) &
* (betaval(i_SLS) * epsilondev_loc_nsub1(i_memory,:,:,:) + gammaval(i_SLS) * epsilondev_loc(i_memory,:,:,:))
@@ -980,7 +978,7 @@
enddo ! i_memory = 1,5
enddo ! i_SLS = 1,N_SLS
- if(COMPUTE_AND_STORE_STRAIN .and. (.not. RECOMPUTE_STRAIN_DO_NOT_STORE))then
+ if(COMPUTE_AND_STORE_STRAIN)then
epsilondev(1,:,:,:,ispec) = epsilondev_loc(1,:,:,:)
epsilondev(2,:,:,:,ispec) = epsilondev_loc(2,:,:,:)
epsilondev(3,:,:,:,ispec) = epsilondev_loc(3,:,:,:)
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_forces_inner_core_Dev.F90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_forces_inner_core_Dev.F90 2013-07-13 21:51:45 UTC (rev 22588)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_forces_inner_core_Dev.F90 2013-07-13 22:12:41 UTC (rev 22589)
@@ -51,7 +51,7 @@
alphaval,betaval,gammaval,factor_common, &
vnspec,PARTIAL_PHYS_DISPERSION_ONLY,&
istage,R_memory_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
- RECOMPUTE_STRAIN_DO_NOT_STORE,epsilondev,eps_trace_over_3)
+ epsilondev,eps_trace_over_3)
! this routine is optimized for NGLLX = NGLLY = NGLLZ = 5 using the Deville et al. (2002) inlined matrix-matrix products
@@ -86,7 +86,7 @@
real(kind=CUSTOM_REAL), dimension(N_SLS) :: alphaval,betaval,gammaval
real(kind=CUSTOM_REAL), dimension(5,N_SLS,NGLLX,NGLLY,NGLLZ,NSPEC_INNER_CORE_ATTENUATION) :: R_memory
- logical :: PARTIAL_PHYS_DISPERSION_ONLY,RECOMPUTE_STRAIN_DO_NOT_STORE
+ logical :: PARTIAL_PHYS_DISPERSION_ONLY
real(kind=CUSTOM_REAL), dimension(5,NGLLX,NGLLY,NGLLZ,NSPEC_INNER_CORE_ATTENUATION) :: epsilondev
real(kind=CUSTOM_REAL), dimension(NGLLX,NGLLY,NGLLZ,NSPEC_INNER_CORE_ATTENUATION) :: eps_trace_over_3
@@ -440,9 +440,7 @@
epsilondev_loc(3,i,j,k) = 0.5 * duxdyl_plus_duydxl
epsilondev_loc(4,i,j,k) = 0.5 * duzdxl_plus_duxdzl
epsilondev_loc(5,i,j,k) = 0.5 * duzdyl_plus_duydzl
- if(.not. RECOMPUTE_STRAIN_DO_NOT_STORE)then
- eps_trace_over_3(i,j,k,ispec) = templ
- endif
+ eps_trace_over_3(i,j,k,ispec) = templ
endif
if(ATTENUATION_3D_VAL) then
@@ -774,9 +772,9 @@
! equation (9.59) page 350): Q_\alpha = Q_\mu * 3 * (V_p/V_s)^2 / 4
! therefore Q_\alpha is not zero; for instance for V_p / V_s = sqrt(3)
! we get Q_\alpha = (9 / 4) * Q_\mu = 2.25 * Q_\mu
- if(ATTENUATION_VAL .and. ( PARTIAL_PHYS_DISPERSION_ONLY .eqv. .false. ) ) then
+ if(ATTENUATION_VAL .and. .not. PARTIAL_PHYS_DISPERSION_ONLY) then
- if(COMPUTE_AND_STORE_STRAIN .and. (.not. RECOMPUTE_STRAIN_DO_NOT_STORE))then
+ if(COMPUTE_AND_STORE_STRAIN)then
! updates R_memory
epsilondev_loc_nsub1(1,:,:,:) = epsilondev(1,:,:,:,ispec)
epsilondev_loc_nsub1(2,:,:,:) = epsilondev(2,:,:,:,ispec)
@@ -804,7 +802,7 @@
istage,R_memory_lddrk,tau_sigma_CUSTOM_REAL,deltat,USE_LDDRK)
endif
- if(COMPUTE_AND_STORE_STRAIN .and. (.not. RECOMPUTE_STRAIN_DO_NOT_STORE)) then
+ if(COMPUTE_AND_STORE_STRAIN) then
epsilondev(1,:,:,:,ispec) = epsilondev_loc(1,:,:,:)
epsilondev(2,:,:,:,ispec) = epsilondev_loc(2,:,:,:)
epsilondev(3,:,:,:,ispec) = epsilondev_loc(3,:,:,:)
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_forces_inner_core_noDev.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_forces_inner_core_noDev.f90 2013-07-13 21:51:45 UTC (rev 22588)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_forces_inner_core_noDev.f90 2013-07-13 22:12:41 UTC (rev 22589)
@@ -52,7 +52,7 @@
alphaval,betaval,gammaval,factor_common, &
vnspec,PARTIAL_PHYS_DISPERSION_ONLY,&
istage,R_memory_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
- RECOMPUTE_STRAIN_DO_NOT_STORE,epsilondev,eps_trace_over_3)
+ epsilondev,eps_trace_over_3)
implicit none
@@ -84,7 +84,7 @@
real(kind=CUSTOM_REAL), dimension(5,N_SLS,NGLLX,NGLLY,NGLLZ,NSPEC_INNER_CORE_ATTENUATION) :: R_memory
real(kind=CUSTOM_REAL), dimension(5,NGLLX,NGLLY,NGLLZ) :: epsilondev_loc,epsilondev_loc_nplus1,epsilondev_loc_nsub1
- logical :: PARTIAL_PHYS_DISPERSION_ONLY,RECOMPUTE_STRAIN_DO_NOT_STORE
+ logical :: PARTIAL_PHYS_DISPERSION_ONLY
real(kind=CUSTOM_REAL), dimension(5,NGLLX,NGLLY,NGLLZ,NSPEC_INNER_CORE_ATTENUATION) :: epsilondev
real(kind=CUSTOM_REAL), dimension(NGLLX,NGLLY,NGLLZ,NSPEC_INNER_CORE_ATTENUATION) :: eps_trace_over_3
@@ -360,9 +360,7 @@
epsilondev_loc(3,i,j,k) = 0.5 * duxdyl_plus_duydxl
epsilondev_loc(4,i,j,k) = 0.5 * duzdxl_plus_duxdzl
epsilondev_loc(5,i,j,k) = 0.5 * duzdyl_plus_duydzl
- if(.not. RECOMPUTE_STRAIN_DO_NOT_STORE)then
- eps_trace_over_3(i,j,k,ispec) = templ
- endif
+ eps_trace_over_3(i,j,k,ispec) = templ
endif
if(ATTENUATION_3D_VAL) then
@@ -666,9 +664,9 @@
! therefore Q_\alpha is not zero; for instance for V_p / V_s = sqrt(3)
! we get Q_\alpha = (9 / 4) * Q_\mu = 2.25 * Q_\mu
- if(ATTENUATION_VAL .and. ( PARTIAL_PHYS_DISPERSION_ONLY .eqv. .false. )) then
+ if(ATTENUATION_VAL .and. .not. PARTIAL_PHYS_DISPERSION_ONLY) then
- if(COMPUTE_AND_STORE_STRAIN .and. (.not. RECOMPUTE_STRAIN_DO_NOT_STORE))then
+ if(COMPUTE_AND_STORE_STRAIN)then
epsilondev_loc_nsub1(1,i,j,k) = epsilondev(1,i,j,k,ispec)
epsilondev_loc_nsub1(2,i,j,k) = epsilondev(2,i,j,k,ispec)
epsilondev_loc_nsub1(3,i,j,k) = epsilondev(3,i,j,k,ispec)
@@ -709,7 +707,7 @@
BETA_LDDRK(istage) * R_memory_lddrk(i_memory,i_SLS,:,:,:,ispec)
enddo
else
- if(COMPUTE_AND_STORE_STRAIN .and. (.not. RECOMPUTE_STRAIN_DO_NOT_STORE))then
+ if(COMPUTE_AND_STORE_STRAIN)then
do i_memory = 1,5
R_memory(i_memory,i_SLS,:,:,:,ispec) = &
alphaval(i_SLS) * &
@@ -732,7 +730,7 @@
enddo !do i_SLS = 1,N_SLS
- if(COMPUTE_AND_STORE_STRAIN .and. (.not. RECOMPUTE_STRAIN_DO_NOT_STORE))then
+ if(COMPUTE_AND_STORE_STRAIN)then
epsilondev(1,:,:,:,ispec) = epsilondev_loc(1,:,:,:)
epsilondev(2,:,:,:,ispec) = epsilondev_loc(2,:,:,:)
epsilondev(3,:,:,:,ispec) = epsilondev_loc(3,:,:,:)
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_kernels.F90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_kernels.F90 2013-07-13 21:51:45 UTC (rev 22588)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_kernels.F90 2013-07-13 22:12:41 UTC (rev 22589)
@@ -31,7 +31,6 @@
accel_crust_mantle,b_displ_crust_mantle, &
deltat,displ_crust_mantle,hprime_xx,hprime_xxT,&
xix,xiy,xiz,etax,etay,etaz,gammax,gammay,gammaz,ANISOTROPIC_KL,&
- RECOMPUTE_STRAIN_DO_NOT_STORE,&
epsilondev_crust_mantle,eps_trace_over_3_crust_mantle)
implicit none
@@ -59,7 +58,6 @@
logical :: ANISOTROPIC_KL
- logical :: RECOMPUTE_STRAIN_DO_NOT_STORE
real(kind=CUSTOM_REAL), dimension(5,NGLLX,NGLLY,NGLLZ,NSPEC_CRUST_MANTLE_ATTENUAT) :: epsilondev_crust_mantle
real(kind=CUSTOM_REAL), dimension(NGLLX,NGLLY,NGLLZ,NSPEC_CRUST_MANTLE_ATTENUAT) :: eps_trace_over_3_crust_mantle
@@ -75,7 +73,7 @@
! crust_mantle
do ispec = 1, NSPEC_CRUST_MANTLE
- if(COMPUTE_AND_STORE_STRAIN .and. RECOMPUTE_STRAIN_DO_NOT_STORE)then
+ if(COMPUTE_AND_STORE_STRAIN)then
eps_trace_over_3_loc_matrix(:,:,:) = eps_trace_over_3_crust_mantle(:,:,:,ispec)
epsilondev_loc_matrix(1,:,:,:) = epsilondev_crust_mantle(1,:,:,:,ispec)
epsilondev_loc_matrix(2,:,:,:) = epsilondev_crust_mantle(2,:,:,:,ispec)
@@ -628,7 +626,6 @@
accel_inner_core,b_displ_inner_core, &
deltat,displ_inner_core,hprime_xx,hprime_xxT,&
xix,xiy,xiz,etax,etay,etaz,gammax,gammay,gammaz,&
- RECOMPUTE_STRAIN_DO_NOT_STORE,&
epsilondev_inner_core,eps_trace_over_3_inner_core)
implicit none
@@ -651,7 +648,6 @@
real(kind=CUSTOM_REAL), dimension(NGLLX,NGLLY,NGLLZ,NSPEC_INNER_CORE) :: &
xix,xiy,xiz,etax,etay,etaz,gammax,gammay,gammaz
- logical :: RECOMPUTE_STRAIN_DO_NOT_STORE
real(kind=CUSTOM_REAL), dimension(5,NGLLX,NGLLY,NGLLZ,NSPEC_INNER_CORE) :: epsilondev_inner_core
real(kind=CUSTOM_REAL), dimension(NGLLX,NGLLY,NGLLZ,NSPEC_INNER_CORE) :: eps_trace_over_3_inner_core
@@ -671,7 +667,7 @@
! inner_core
do ispec = 1, NSPEC_INNER_CORE
- if(COMPUTE_AND_STORE_STRAIN .and. RECOMPUTE_STRAIN_DO_NOT_STORE)then
+ if(COMPUTE_AND_STORE_STRAIN) then
eps_trace_over_3_loc_matrix(:,:,:) = eps_trace_over_3_inner_core(:,:,:,ispec)
epsilondev_loc_matrix(1,:,:,:) = epsilondev_inner_core(1,:,:,:,ispec)
epsilondev_loc_matrix(2,:,:,:) = epsilondev_inner_core(2,:,:,:,ispec)
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/initialize_simulation.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/initialize_simulation.f90 2013-07-13 21:51:45 UTC (rev 22588)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/initialize_simulation.f90 2013-07-13 22:12:41 UTC (rev 22589)
@@ -59,7 +59,7 @@
USE_LDDRK,INCREASE_CFL_FOR_LDDRK,ANISOTROPIC_KL,SAVE_TRANSVERSE_KL_ONLY,APPROXIMATE_HESS_KL, &
USE_FULL_TISO_MANTLE,SAVE_SOURCE_MASK,GPU_MODE,ADIOS_ENABLED,ADIOS_FOR_FORWARD_ARRAYS, &
ADIOS_FOR_MPI_ARRAYS,ADIOS_FOR_ARRAYS_SOLVER,ADIOS_FOR_AVS_DX,RATIO_BY_WHICH_TO_INCREASE_IT, &
- ATT1,ATT2,ATT3,ATT4,ATT5,RECOMPUTE_STRAIN_DO_NOT_STORE,EXACT_MASS_MATRIX_FOR_ROTATION)
+ ATT1,ATT2,ATT3,ATT4,ATT5,EXACT_MASS_MATRIX_FOR_ROTATION)
use mpi
@@ -165,7 +165,7 @@
USE_LDDRK,INCREASE_CFL_FOR_LDDRK,ANISOTROPIC_KL,SAVE_TRANSVERSE_KL_ONLY,APPROXIMATE_HESS_KL, &
USE_FULL_TISO_MANTLE,SAVE_SOURCE_MASK,GPU_MODE,ADIOS_ENABLED,ADIOS_FOR_FORWARD_ARRAYS, &
ADIOS_FOR_MPI_ARRAYS,ADIOS_FOR_ARRAYS_SOLVER,ADIOS_FOR_AVS_DX, &
- RECOMPUTE_STRAIN_DO_NOT_STORE,EXACT_MASS_MATRIX_FOR_ROTATION
+ EXACT_MASS_MATRIX_FOR_ROTATION
character(len=150) :: MODEL,dummystring
@@ -217,7 +217,7 @@
USE_LDDRK,INCREASE_CFL_FOR_LDDRK,ANISOTROPIC_KL,SAVE_TRANSVERSE_KL_ONLY,APPROXIMATE_HESS_KL, &
USE_FULL_TISO_MANTLE,SAVE_SOURCE_MASK,GPU_MODE,ADIOS_ENABLED,ADIOS_FOR_FORWARD_ARRAYS, &
ADIOS_FOR_MPI_ARRAYS,ADIOS_FOR_ARRAYS_SOLVER,ADIOS_FOR_AVS_DX,RATIO_BY_WHICH_TO_INCREASE_IT, &
- ATT1,ATT2,ATT3,ATT4,ATT5,RECOMPUTE_STRAIN_DO_NOT_STORE,EXACT_MASS_MATRIX_FOR_ROTATION)
+ ATT1,ATT2,ATT3,ATT4,ATT5,EXACT_MASS_MATRIX_FOR_ROTATION)
endif
@@ -259,7 +259,7 @@
USE_LDDRK,INCREASE_CFL_FOR_LDDRK,ANISOTROPIC_KL,SAVE_TRANSVERSE_KL_ONLY,APPROXIMATE_HESS_KL, &
USE_FULL_TISO_MANTLE,SAVE_SOURCE_MASK,GPU_MODE,ADIOS_ENABLED,ADIOS_FOR_FORWARD_ARRAYS, &
ADIOS_FOR_MPI_ARRAYS,ADIOS_FOR_ARRAYS_SOLVER,ADIOS_FOR_AVS_DX,RATIO_BY_WHICH_TO_INCREASE_IT, &
- ATT1,ATT2,ATT3,ATT4,ATT5,RECOMPUTE_STRAIN_DO_NOT_STORE,EXACT_MASS_MATRIX_FOR_ROTATION)
+ ATT1,ATT2,ATT3,ATT4,ATT5,EXACT_MASS_MATRIX_FOR_ROTATION)
! get the base pathname for output files
call get_value_string(OUTPUT_FILES, 'OUTPUT_FILES', 'OUTPUT_FILES')
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/part1_classical.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/part1_classical.f90 2013-07-13 21:51:45 UTC (rev 22588)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/part1_classical.f90 2013-07-13 22:12:41 UTC (rev 22589)
@@ -321,7 +321,7 @@
alphaval,betaval,gammaval,factor_common_crust_mantle, &
size(factor_common_crust_mantle,5),PARTIAL_PHYS_DISPERSION_ONLY,&
istage,R_memory_crust_mantle_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
- RECOMPUTE_STRAIN_DO_NOT_STORE,epsilondev_crust_mantle,eps_trace_over_3_crust_mantle)
+ epsilondev_crust_mantle,eps_trace_over_3_crust_mantle)
else
call compute_forces_crust_mantle(minus_gravity_table,density_table,minus_deriv_gravity_table, &
displ_crust_mantle,accel_crust_mantle, &
@@ -362,7 +362,7 @@
alphaval,betaval,gammaval,factor_common_crust_mantle, &
size(factor_common_crust_mantle,5),PARTIAL_PHYS_DISPERSION_ONLY,&
istage,R_memory_crust_mantle_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
- RECOMPUTE_STRAIN_DO_NOT_STORE,epsilondev_crust_mantle,eps_trace_over_3_crust_mantle)
+ epsilondev_crust_mantle,eps_trace_over_3_crust_mantle)
endif
! Deville routine
@@ -399,7 +399,7 @@
factor_common_inner_core, &
size(factor_common_inner_core,5),PARTIAL_PHYS_DISPERSION_ONLY,&
istage,R_memory_inner_core_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
- RECOMPUTE_STRAIN_DO_NOT_STORE,epsilondev_inner_core,eps_trace_over_3_inner_core)
+ epsilondev_inner_core,eps_trace_over_3_inner_core)
else
call compute_forces_inner_core(minus_gravity_table,density_table,minus_deriv_gravity_table, &
displ_inner_core,accel_inner_core, &
@@ -433,7 +433,7 @@
factor_common_inner_core, &
size(factor_common_inner_core,5),PARTIAL_PHYS_DISPERSION_ONLY,&
istage,R_memory_inner_core_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
- RECOMPUTE_STRAIN_DO_NOT_STORE,epsilondev_inner_core,eps_trace_over_3_inner_core)
+ epsilondev_inner_core,eps_trace_over_3_inner_core)
endif
! Stacey
@@ -617,7 +617,7 @@
alphaval,betaval,gammaval,factor_common_crust_mantle, &
size(factor_common_crust_mantle,5),PARTIAL_PHYS_DISPERSION_ONLY,&
istage,R_memory_crust_mantle_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
- RECOMPUTE_STRAIN_DO_NOT_STORE,epsilondev_crust_mantle,eps_trace_over_3_crust_mantle)
+ epsilondev_crust_mantle,eps_trace_over_3_crust_mantle)
else
call compute_forces_crust_mantle(minus_gravity_table,density_table,minus_deriv_gravity_table, &
displ_crust_mantle,accel_crust_mantle, &
@@ -658,7 +658,7 @@
alphaval,betaval,gammaval,factor_common_crust_mantle, &
size(factor_common_crust_mantle,5),PARTIAL_PHYS_DISPERSION_ONLY,&
istage,R_memory_crust_mantle_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
- RECOMPUTE_STRAIN_DO_NOT_STORE,epsilondev_crust_mantle,eps_trace_over_3_crust_mantle)
+ epsilondev_crust_mantle,eps_trace_over_3_crust_mantle)
endif
! Deville routine
@@ -695,7 +695,7 @@
factor_common_inner_core, &
size(factor_common_inner_core,5),PARTIAL_PHYS_DISPERSION_ONLY,&
istage,R_memory_inner_core_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
- RECOMPUTE_STRAIN_DO_NOT_STORE,epsilondev_inner_core,eps_trace_over_3_inner_core)
+ epsilondev_inner_core,eps_trace_over_3_inner_core)
else
call compute_forces_inner_core(minus_gravity_table,density_table,minus_deriv_gravity_table, &
displ_inner_core,accel_inner_core, &
@@ -729,7 +729,7 @@
factor_common_inner_core, &
size(factor_common_inner_core,5),PARTIAL_PHYS_DISPERSION_ONLY,&
istage,R_memory_inner_core_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
- RECOMPUTE_STRAIN_DO_NOT_STORE,epsilondev_inner_core,eps_trace_over_3_inner_core)
+ epsilondev_inner_core,eps_trace_over_3_inner_core)
endif
! assemble all the contributions between slices using MPI
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-13 21:51:45 UTC (rev 22588)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/part1_undo_att.f90 2013-07-13 22:12:41 UTC (rev 22589)
@@ -350,7 +350,7 @@
alphaval,betaval,gammaval,factor_common_crust_mantle, &
size(factor_common_crust_mantle,5),PARTIAL_PHYS_DISPERSION_ONLY,&
istage,R_memory_crust_mantle_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
- RECOMPUTE_STRAIN_DO_NOT_STORE,epsilondev_crust_mantle,eps_trace_over_3_crust_mantle)
+ epsilondev_crust_mantle,eps_trace_over_3_crust_mantle)
else
call compute_forces_crust_mantle(minus_gravity_table,density_table,minus_deriv_gravity_table, &
displ_crust_mantle,accel_crust_mantle, &
@@ -391,7 +391,7 @@
alphaval,betaval,gammaval,factor_common_crust_mantle, &
size(factor_common_crust_mantle,5),PARTIAL_PHYS_DISPERSION_ONLY,&
istage,R_memory_crust_mantle_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
- RECOMPUTE_STRAIN_DO_NOT_STORE,epsilondev_crust_mantle,eps_trace_over_3_crust_mantle)
+ epsilondev_crust_mantle,eps_trace_over_3_crust_mantle)
endif
! Deville routine
@@ -428,7 +428,7 @@
factor_common_inner_core, &
size(factor_common_inner_core,5),PARTIAL_PHYS_DISPERSION_ONLY,&
istage,R_memory_inner_core_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
- RECOMPUTE_STRAIN_DO_NOT_STORE,epsilondev_inner_core,eps_trace_over_3_inner_core)
+ epsilondev_inner_core,eps_trace_over_3_inner_core)
else
call compute_forces_inner_core(minus_gravity_table,density_table,minus_deriv_gravity_table, &
displ_inner_core,accel_inner_core, &
@@ -462,7 +462,7 @@
factor_common_inner_core, &
size(factor_common_inner_core,5),PARTIAL_PHYS_DISPERSION_ONLY,&
istage,R_memory_inner_core_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
- RECOMPUTE_STRAIN_DO_NOT_STORE,epsilondev_inner_core,eps_trace_over_3_inner_core)
+ epsilondev_inner_core,eps_trace_over_3_inner_core)
endif
! Stacey
@@ -642,7 +642,7 @@
alphaval,betaval,gammaval,factor_common_crust_mantle, &
size(factor_common_crust_mantle,5),PARTIAL_PHYS_DISPERSION_ONLY,&
istage,R_memory_crust_mantle_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
- RECOMPUTE_STRAIN_DO_NOT_STORE,epsilondev_crust_mantle,eps_trace_over_3_crust_mantle)
+ epsilondev_crust_mantle,eps_trace_over_3_crust_mantle)
else
call compute_forces_crust_mantle(minus_gravity_table,density_table,minus_deriv_gravity_table, &
displ_crust_mantle,accel_crust_mantle, &
@@ -683,7 +683,7 @@
alphaval,betaval,gammaval,factor_common_crust_mantle, &
size(factor_common_crust_mantle,5),PARTIAL_PHYS_DISPERSION_ONLY,&
istage,R_memory_crust_mantle_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
- RECOMPUTE_STRAIN_DO_NOT_STORE,epsilondev_crust_mantle,eps_trace_over_3_crust_mantle)
+ epsilondev_crust_mantle,eps_trace_over_3_crust_mantle)
endif
! Deville routine
@@ -720,7 +720,7 @@
factor_common_inner_core, &
size(factor_common_inner_core,5),PARTIAL_PHYS_DISPERSION_ONLY,&
istage,R_memory_inner_core_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
- RECOMPUTE_STRAIN_DO_NOT_STORE,epsilondev_inner_core,eps_trace_over_3_inner_core)
+ epsilondev_inner_core,eps_trace_over_3_inner_core)
else
call compute_forces_inner_core(minus_gravity_table,density_table,minus_deriv_gravity_table, &
displ_inner_core,accel_inner_core, &
@@ -754,7 +754,7 @@
factor_common_inner_core, &
size(factor_common_inner_core,5),PARTIAL_PHYS_DISPERSION_ONLY,&
istage,R_memory_inner_core_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
- RECOMPUTE_STRAIN_DO_NOT_STORE,epsilondev_inner_core,eps_trace_over_3_inner_core)
+ epsilondev_inner_core,eps_trace_over_3_inner_core)
endif
! assemble all the contributions between slices using MPI
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/part2_classical.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/part2_classical.f90 2013-07-13 21:51:45 UTC (rev 22588)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/part2_classical.f90 2013-07-13 22:12:41 UTC (rev 22589)
@@ -330,7 +330,7 @@
b_alphaval,b_betaval,b_gammaval,factor_common_crust_mantle, &
size(factor_common_crust_mantle,5),PARTIAL_PHYS_DISPERSION_ONLY,&
istage,R_memory_crust_mantle_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
- RECOMPUTE_STRAIN_DO_NOT_STORE,epsilondev_crust_mantle,eps_trace_over_3_crust_mantle)
+ epsilondev_crust_mantle,eps_trace_over_3_crust_mantle)
else
call compute_forces_crust_mantle(minus_gravity_table,density_table,minus_deriv_gravity_table, &
b_displ_crust_mantle,b_accel_crust_mantle, &
@@ -371,7 +371,7 @@
b_alphaval,b_betaval,b_gammaval,factor_common_crust_mantle, &
size(factor_common_crust_mantle,5),PARTIAL_PHYS_DISPERSION_ONLY,&
istage,R_memory_crust_mantle_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
- RECOMPUTE_STRAIN_DO_NOT_STORE,epsilondev_crust_mantle,eps_trace_over_3_crust_mantle)
+ epsilondev_crust_mantle,eps_trace_over_3_crust_mantle)
endif
endif
@@ -409,7 +409,7 @@
factor_common_inner_core, &
size(factor_common_inner_core,5),PARTIAL_PHYS_DISPERSION_ONLY,&
istage,R_memory_inner_core_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
- RECOMPUTE_STRAIN_DO_NOT_STORE,epsilondev_inner_core,eps_trace_over_3_inner_core)
+ epsilondev_inner_core,eps_trace_over_3_inner_core)
else
call compute_forces_inner_core(minus_gravity_table,density_table,minus_deriv_gravity_table, &
b_displ_inner_core,b_accel_inner_core, &
@@ -443,7 +443,7 @@
factor_common_inner_core, &
size(factor_common_inner_core,5),PARTIAL_PHYS_DISPERSION_ONLY,&
istage,R_memory_inner_core_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
- RECOMPUTE_STRAIN_DO_NOT_STORE,epsilondev_inner_core,eps_trace_over_3_inner_core)
+ epsilondev_inner_core,eps_trace_over_3_inner_core)
endif
endif
@@ -610,7 +610,7 @@
b_alphaval,b_betaval,b_gammaval,factor_common_crust_mantle, &
size(factor_common_crust_mantle,5),PARTIAL_PHYS_DISPERSION_ONLY,&
istage,R_memory_crust_mantle_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
- RECOMPUTE_STRAIN_DO_NOT_STORE,epsilondev_crust_mantle,eps_trace_over_3_crust_mantle)
+ epsilondev_crust_mantle,eps_trace_over_3_crust_mantle)
else
call compute_forces_crust_mantle(minus_gravity_table,density_table,minus_deriv_gravity_table, &
b_displ_crust_mantle,b_accel_crust_mantle, &
@@ -651,7 +651,7 @@
b_alphaval,b_betaval,b_gammaval,factor_common_crust_mantle, &
size(factor_common_crust_mantle,5),PARTIAL_PHYS_DISPERSION_ONLY,&
istage,R_memory_crust_mantle_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
- RECOMPUTE_STRAIN_DO_NOT_STORE,epsilondev_crust_mantle,eps_trace_over_3_crust_mantle)
+ epsilondev_crust_mantle,eps_trace_over_3_crust_mantle)
endif
! Deville routine
@@ -688,7 +688,7 @@
factor_common_inner_core, &
size(factor_common_inner_core,5),PARTIAL_PHYS_DISPERSION_ONLY,&
istage,R_memory_inner_core_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
- RECOMPUTE_STRAIN_DO_NOT_STORE,epsilondev_inner_core,eps_trace_over_3_inner_core)
+ epsilondev_inner_core,eps_trace_over_3_inner_core)
else
call compute_forces_inner_core(minus_gravity_table,density_table,minus_deriv_gravity_table, &
b_displ_inner_core,b_accel_inner_core, &
@@ -722,7 +722,7 @@
factor_common_inner_core, &
size(factor_common_inner_core,5),PARTIAL_PHYS_DISPERSION_ONLY,&
istage,R_memory_inner_core_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
- RECOMPUTE_STRAIN_DO_NOT_STORE,epsilondev_inner_core,eps_trace_over_3_inner_core)
+ epsilondev_inner_core,eps_trace_over_3_inner_core)
endif
! assemble all the contributions between slices using MPI
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/part2_undo_att.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/part2_undo_att.f90 2013-07-13 21:51:45 UTC (rev 22588)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/part2_undo_att.f90 2013-07-13 22:12:41 UTC (rev 22589)
@@ -361,7 +361,7 @@
b_alphaval,b_betaval,b_gammaval,factor_common_crust_mantle, &
size(factor_common_crust_mantle,5),PARTIAL_PHYS_DISPERSION_ONLY,&
istage,R_memory_crust_mantle_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
- RECOMPUTE_STRAIN_DO_NOT_STORE,epsilondev_crust_mantle,eps_trace_over_3_crust_mantle)
+ epsilondev_crust_mantle,eps_trace_over_3_crust_mantle)
else
call compute_forces_crust_mantle(minus_gravity_table,density_table,minus_deriv_gravity_table, &
b_displ_crust_mantle,b_accel_crust_mantle, &
@@ -402,7 +402,7 @@
b_alphaval,b_betaval,b_gammaval,factor_common_crust_mantle, &
size(factor_common_crust_mantle,5),PARTIAL_PHYS_DISPERSION_ONLY,&
istage,R_memory_crust_mantle_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
- RECOMPUTE_STRAIN_DO_NOT_STORE,epsilondev_crust_mantle,eps_trace_over_3_crust_mantle)
+ epsilondev_crust_mantle,eps_trace_over_3_crust_mantle)
endif
endif
@@ -440,7 +440,7 @@
factor_common_inner_core, &
size(factor_common_inner_core,5),PARTIAL_PHYS_DISPERSION_ONLY,&
istage,R_memory_inner_core_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
- RECOMPUTE_STRAIN_DO_NOT_STORE,epsilondev_inner_core,eps_trace_over_3_inner_core)
+ epsilondev_inner_core,eps_trace_over_3_inner_core)
else
call compute_forces_inner_core(minus_gravity_table,density_table,minus_deriv_gravity_table, &
b_displ_inner_core,b_accel_inner_core, &
@@ -474,7 +474,7 @@
factor_common_inner_core, &
size(factor_common_inner_core,5),PARTIAL_PHYS_DISPERSION_ONLY,&
istage,R_memory_inner_core_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
- RECOMPUTE_STRAIN_DO_NOT_STORE,epsilondev_inner_core,eps_trace_over_3_inner_core)
+ epsilondev_inner_core,eps_trace_over_3_inner_core)
endif
endif
@@ -675,7 +675,7 @@
b_alphaval,b_betaval,b_gammaval,factor_common_crust_mantle, &
size(factor_common_crust_mantle,5),PARTIAL_PHYS_DISPERSION_ONLY,&
istage,R_memory_crust_mantle_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
- RECOMPUTE_STRAIN_DO_NOT_STORE,epsilondev_crust_mantle,eps_trace_over_3_crust_mantle)
+ epsilondev_crust_mantle,eps_trace_over_3_crust_mantle)
else
call compute_forces_crust_mantle(minus_gravity_table,density_table,minus_deriv_gravity_table, &
b_displ_crust_mantle,b_accel_crust_mantle, &
@@ -716,7 +716,7 @@
b_alphaval,b_betaval,b_gammaval,factor_common_crust_mantle, &
size(factor_common_crust_mantle,5),PARTIAL_PHYS_DISPERSION_ONLY,&
istage,R_memory_crust_mantle_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
- RECOMPUTE_STRAIN_DO_NOT_STORE,epsilondev_crust_mantle,eps_trace_over_3_crust_mantle)
+ epsilondev_crust_mantle,eps_trace_over_3_crust_mantle)
endif
! Deville routine
@@ -753,7 +753,7 @@
factor_common_inner_core, &
size(factor_common_inner_core,5),PARTIAL_PHYS_DISPERSION_ONLY,&
istage,R_memory_inner_core_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
- RECOMPUTE_STRAIN_DO_NOT_STORE,epsilondev_inner_core,eps_trace_over_3_inner_core)
+ epsilondev_inner_core,eps_trace_over_3_inner_core)
else
call compute_forces_inner_core(minus_gravity_table,density_table,minus_deriv_gravity_table, &
b_displ_inner_core,b_accel_inner_core, &
@@ -787,7 +787,7 @@
factor_common_inner_core, &
size(factor_common_inner_core,5),PARTIAL_PHYS_DISPERSION_ONLY,&
istage,R_memory_inner_core_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
- RECOMPUTE_STRAIN_DO_NOT_STORE,epsilondev_inner_core,eps_trace_over_3_inner_core)
+ epsilondev_inner_core,eps_trace_over_3_inner_core)
endif
! assemble all the contributions between slices using MPI
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/part3_kernel_computation.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/part3_kernel_computation.f90 2013-07-13 21:51:45 UTC (rev 22588)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/part3_kernel_computation.f90 2013-07-13 22:12:41 UTC (rev 22589)
@@ -12,7 +12,6 @@
xix_crust_mantle,xiy_crust_mantle,xiz_crust_mantle,&
etax_crust_mantle,etay_crust_mantle,etaz_crust_mantle,&
gammax_crust_mantle,gammay_crust_mantle,gammaz_crust_mantle,ANISOTROPIC_KL,&
- RECOMPUTE_STRAIN_DO_NOT_STORE,&
epsilondev_crust_mantle,eps_trace_over_3_crust_mantle)
! outer core
@@ -39,7 +38,6 @@
xix_inner_core,xiy_inner_core,xiz_inner_core,&
etax_inner_core,etay_inner_core,etaz_inner_core,&
gammax_inner_core,gammay_inner_core,gammaz_inner_core,&
- RECOMPUTE_STRAIN_DO_NOT_STORE,&
epsilondev_inner_core,eps_trace_over_3_inner_core)
! NOISE TOMOGRAPHY --- source strength kernel
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/specfem3D.F90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/specfem3D.F90 2013-07-13 21:51:45 UTC (rev 22588)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/specfem3D.F90 2013-07-13 22:12:41 UTC (rev 22589)
@@ -933,7 +933,7 @@
USE_LDDRK,INCREASE_CFL_FOR_LDDRK,ANISOTROPIC_KL,SAVE_TRANSVERSE_KL_ONLY,APPROXIMATE_HESS_KL, &
USE_FULL_TISO_MANTLE,SAVE_SOURCE_MASK,GPU_MODE,ADIOS_ENABLED,ADIOS_FOR_FORWARD_ARRAYS, &
ADIOS_FOR_MPI_ARRAYS,ADIOS_FOR_ARRAYS_SOLVER,ADIOS_FOR_AVS_DX, &
- RECOMPUTE_STRAIN_DO_NOT_STORE,EXACT_MASS_MATRIX_FOR_ROTATION
+ EXACT_MASS_MATRIX_FOR_ROTATION
character(len=150) OUTPUT_FILES,LOCAL_PATH,MODEL
@@ -1127,14 +1127,14 @@
USE_LDDRK,INCREASE_CFL_FOR_LDDRK,ANISOTROPIC_KL,SAVE_TRANSVERSE_KL_ONLY,APPROXIMATE_HESS_KL, &
USE_FULL_TISO_MANTLE,SAVE_SOURCE_MASK,GPU_MODE,ADIOS_ENABLED,ADIOS_FOR_FORWARD_ARRAYS, &
ADIOS_FOR_MPI_ARRAYS,ADIOS_FOR_ARRAYS_SOLVER,ADIOS_FOR_AVS_DX,RATIO_BY_WHICH_TO_INCREASE_IT, &
- ATT1,ATT2,ATT3,ATT4,ATT5,RECOMPUTE_STRAIN_DO_NOT_STORE,EXACT_MASS_MATRIX_FOR_ROTATION)
+ ATT1,ATT2,ATT3,ATT4,ATT5,EXACT_MASS_MATRIX_FOR_ROTATION)
! to switch between simulation type 1 mode and simulation type 3 mode
! in exact undoing of attenuation
undo_att_sim_type_3 = .false.
! ZN if we want to storing the strain to acclerate the code but cost more memory then
- if(ATTENUATION_VAL .and. COMPUTE_AND_STORE_STRAIN .and. (.not. RECOMPUTE_STRAIN_DO_NOT_STORE))then
+ if(ATTENUATION_VAL .and. COMPUTE_AND_STORE_STRAIN)then
allocate(epsilondev_crust_mantle(5,NGLLX,NGLLY,NGLLZ,NSPEC_CRUST_MANTLE_ATTENUAT),stat=ier)
if( ier /= 0 ) call exit_MPI(myrank,'error allocating epsilondev_crust_mantle')
allocate(eps_trace_over_3_crust_mantle(NGLLX,NGLLY,NGLLZ,NSPEC_CRUST_MANTLE_ATTENUAT),stat=ier)
@@ -2592,10 +2592,9 @@
it_temp = it
seismo_current_temp = seismo_current
- if(COMPUTE_AND_STORE_STRAIN .and. (.not. RECOMPUTE_STRAIN_DO_NOT_STORE))then
+ if(COMPUTE_AND_STORE_STRAIN) then
if(.not. USE_DEVILLE_PRODUCTS_VAL) &
- call exit_MPI(myrank,'COMPUTE_AND_STORE_STRAIN .and. (.not. RECOMPUTE_STRAIN_DO_NOT_STORE) is .true.'// &
- 'is not implemented without USE_DEVILLE_PRODUCTS_VAL')
+ call exit_MPI(myrank,'COMPUTE_AND_STORE_STRAIN is not implemented without USE_DEVILLE_PRODUCTS_VAL')
do ispec = 1, NSPEC_INNER_CORE
call compute_element_strain_att_Dev(ispec,NGLOB_INNER_CORE,NSPEC_INNER_CORE,b_displ_inner_core,&
b_veloc_inner_core,0._CUSTOM_REAL,ibool_inner_core,hprime_xx,hprime_xxT,&
@@ -2643,10 +2642,9 @@
it = it_temp
seismo_current = seismo_current_temp
- if(COMPUTE_AND_STORE_STRAIN .and. (.not. RECOMPUTE_STRAIN_DO_NOT_STORE))then
+ if(COMPUTE_AND_STORE_STRAIN) then
if(.not. USE_DEVILLE_PRODUCTS_VAL) &
- call exit_MPI(myrank,'COMPUTE_AND_STORE_STRAIN .and. (.not. RECOMPUTE_STRAIN_DO_NOT_STORE) is .true.'// &
- 'is not implemented without USE_DEVILLE_PRODUCTS_VAL')
+ call exit_MPI(myrank,'COMPUTE_AND_STORE_STRAIN is not implemented without USE_DEVILLE_PRODUCTS_VAL')
do ispec = 1, NSPEC_INNER_CORE
call compute_element_strain_att_Dev(ispec,NGLOB_INNER_CORE,NSPEC_INNER_CORE,displ_inner_core,&
veloc_inner_core,0._CUSTOM_REAL,ibool_inner_core,hprime_xx,hprime_xxT,&
More information about the CIG-COMMITS
mailing list