[cig-commits] r22330 - in seismo/3D/SPECFEM3D_GLOBE/branches/undo_att: . DATA 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
Sun Jun 16 11:55:47 PDT 2013
Author: dkomati1
Date: 2013-06-16 11:55:47 -0700 (Sun, 16 Jun 2013)
New Revision: 22330
Modified:
seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/DATA/Par_file
seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/part2_undo_att.f90
seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/src/auxiliaries/check_buffers_1D.f90
seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/src/auxiliaries/check_buffers_2D.f90
seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/src/auxiliaries/check_buffers_corners_chunks.f90
seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/src/auxiliaries/check_buffers_faces_chunks.f90
seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/src/auxiliaries/combine_AVS_DX.f90
seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/src/auxiliaries/create_movie_AVS_DX.f90
seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/src/auxiliaries/create_movie_GMT_global.f90
seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/src/compute_optimized_dumping_undo_att/compute_optimized_dumping_undo_att.f90
seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/src/create_header_file/create_header_file.f90
seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/src/meshfem3D/meshfem3D.f90
seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/src/shared/read_compute_parameters.f90
seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/src/shared/read_parameter_file.f90
seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/src/specfem3D/initialize_simulation.f90
seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/src/specfem3D/specfem3D.F90
Log:
changed NT_DUMP to NT_DUMP_ATTENUATION
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/DATA/Par_file
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/DATA/Par_file 2013-06-16 17:55:01 UTC (rev 22329)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/DATA/Par_file 2013-06-16 18:55:47 UTC (rev 22330)
@@ -59,7 +59,7 @@
# but requires a significant amount of disk space for temporary storage.
PARTIAL_PHYS_DISPERSION_ONLY = .false.
UNDO_ATTENUATION = .true.
-NT_DUMP = 100 # how often we dump restart files to undo attenuation, only needed when using UNDO_ATTENUATION
+NT_DUMP_ATTENUATION = 100 # how often we dump restart files to undo attenuation, only needed when using UNDO_ATTENUATION
# save AVS or OpenDX movies
#MOVIE_COARSE saves movie only at corners of elements (SURFACE OR VOLUME)
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-16 17:55:01 UTC (rev 22329)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/part2_undo_att.f90 2013-06-16 18:55:47 UTC (rev 22330)
@@ -60,12 +60,12 @@
if(CUSTOM_REAL == SIZE_REAL) then
time = sngl((dble(NSTEP-it)*DT-t0)*scale_t_inv)
if(UNDO_ATTENUATION)then
- time = sngl((dble(NSTEP-(iteration_on_subset*NT_DUMP-it_of_this_subset+1))*DT-t0)*scale_t_inv)
+ time = sngl((dble(NSTEP-(iteration_on_subset*NT_DUMP_ATTENUATION-it_of_this_subset+1))*DT-t0)*scale_t_inv)
endif
else
time = (dble(NSTEP-it)*DT-t0)*scale_t_inv
if(UNDO_ATTENUATION)then
- time = (dble(NSTEP-(iteration_on_subset*NT_DUMP-it_of_this_subset+1))*DT-t0)*scale_t_inv
+ time = (dble(NSTEP-(iteration_on_subset*NT_DUMP_ATTENUATION-it_of_this_subset+1))*DT-t0)*scale_t_inv
endif
endif
@@ -521,7 +521,7 @@
call compute_add_sources_backward(myrank,NSOURCES,NSTEP, &
b_accel_crust_mantle,sourcearrays, &
DT,t0,tshift_cmt,hdur_gaussian,ibool_crust_mantle, &
- islice_selected_source,ispec_selected_source,iteration_on_subset*NT_DUMP-it_of_this_subset+1, &
+ islice_selected_source,ispec_selected_source,iteration_on_subset*NT_DUMP_ATTENUATION-it_of_this_subset+1, &
hdur,xi_source,eta_source,gamma_source,nu_source)
else
call compute_add_sources_backward(myrank,NSOURCES,NSTEP, &
@@ -908,20 +908,20 @@
! write the current or final seismograms
if(seismo_current == NTSTEP_BETWEEN_OUTPUT_SEISMOS .or. it == it_end) then
if (SIMULATION_TYPE == 1 .or. SIMULATION_TYPE == 3) then
- if(mod(NT_DUMP,2) == 0)then
- do irec_local = 1,nrec_local; do i = 1,seismo_current/NT_DUMP; do j = 1,NT_DUMP/2
+ if(mod(NT_DUMP_ATTENUATION,2) == 0)then
+ do irec_local = 1,nrec_local; do i = 1,seismo_current/NT_DUMP_ATTENUATION; do j = 1,NT_DUMP_ATTENUATION/2
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)
+ seismograms_temp(k) = seismograms(k,irec_local,(i-1)*NT_DUMP_ATTENUATION + j)
+ seismograms(k,irec_local,(i-1)*NT_DUMP_ATTENUATION + j) = seismograms(k,irec_local,(i-1)*NT_DUMP_ATTENUATION + (NT_DUMP_ATTENUATION-j+1))
+ seismograms(k,irec_local,(i-1)*NT_DUMP_ATTENUATION + (NT_DUMP_ATTENUATION-j+1)) = seismograms_temp(k)
enddo
enddo; enddo; enddo
else
- do irec_local = 1,nrec_local; do i = 1,seismo_current/NT_DUMP; do j = 1,(NT_DUMP-1)/2
+ do irec_local = 1,nrec_local; do i = 1,seismo_current/NT_DUMP_ATTENUATION; do j = 1,(NT_DUMP_ATTENUATION-1)/2
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)
+ seismograms_temp(k) = seismograms(k,irec_local,(i-1)*NT_DUMP_ATTENUATION + j)
+ seismograms(k,irec_local,(i-1)*NT_DUMP_ATTENUATION + j) = seismograms(k,irec_local,(i-1)*NT_DUMP_ATTENUATION + (NT_DUMP_ATTENUATION-j+1))
+ seismograms(k,irec_local,(i-1)*NT_DUMP_ATTENUATION + (NT_DUMP_ATTENUATION-j+1)) = seismograms_temp(k)
enddo
enddo; enddo; enddo
endif
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/src/auxiliaries/check_buffers_1D.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/src/auxiliaries/check_buffers_1D.f90 2013-06-16 17:55:01 UTC (rev 22329)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/src/auxiliaries/check_buffers_1D.f90 2013-06-16 18:55:47 UTC (rev 22330)
@@ -112,7 +112,7 @@
integer, dimension(NB_SQUARE_CORNERS) :: NGLOB1D_RADIAL_SPEC_OTHER
logical :: PARTIAL_PHYS_DISPERSION_ONLY,UNDO_ATTENUATION
- integer :: NT_DUMP
+ integer :: NT_DUMP_ATTENUATION
! ************** PROGRAM STARTS HERE **************
@@ -153,7 +153,7 @@
ROTATE_SEISMOGRAMS_RT,ratio_divide_central_cube,HONOR_1D_SPHERICAL_MOHO,CUT_SUPERBRICK_XI,CUT_SUPERBRICK_ETA,&
DIFF_NSPEC1D_RADIAL,DIFF_NSPEC2D_XI,DIFF_NSPEC2D_ETA,&
WRITE_SEISMOGRAMS_BY_MASTER,SAVE_ALL_SEISMOS_IN_ONE_FILE,USE_BINARY_FOR_LARGE_FILE,.false.,NOISE_TOMOGRAPHY,&
- SAVE_REGULAR_KL,PARTIAL_PHYS_DISPERSION_ONLY,UNDO_ATTENUATION,NT_DUMP)
+ SAVE_REGULAR_KL,PARTIAL_PHYS_DISPERSION_ONLY,UNDO_ATTENUATION,NT_DUMP_ATTENUATION)
! get the base pathname for output files
call get_value_string(OUTPUT_FILES, 'OUTPUT_FILES', 'OUTPUT_FILES')
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/src/auxiliaries/check_buffers_2D.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/src/auxiliaries/check_buffers_2D.f90 2013-06-16 17:55:01 UTC (rev 22329)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/src/auxiliaries/check_buffers_2D.f90 2013-06-16 18:55:47 UTC (rev 22330)
@@ -113,7 +113,7 @@
integer, dimension(NB_SQUARE_EDGES_ONEDIR,NB_CUT_CASE) :: DIFF_NSPEC2D_XI,DIFF_NSPEC2D_ETA
logical :: PARTIAL_PHYS_DISPERSION_ONLY,UNDO_ATTENUATION
- integer :: NT_DUMP
+ integer :: NT_DUMP_ATTENUATION
! ************** PROGRAM STARTS HERE **************
@@ -155,7 +155,7 @@
ROTATE_SEISMOGRAMS_RT,ratio_divide_central_cube,HONOR_1D_SPHERICAL_MOHO,CUT_SUPERBRICK_XI,CUT_SUPERBRICK_ETA,&
DIFF_NSPEC1D_RADIAL,DIFF_NSPEC2D_XI,DIFF_NSPEC2D_ETA,&
WRITE_SEISMOGRAMS_BY_MASTER,SAVE_ALL_SEISMOS_IN_ONE_FILE,USE_BINARY_FOR_LARGE_FILE,.false.,NOISE_TOMOGRAPHY,&
- SAVE_REGULAR_KL,PARTIAL_PHYS_DISPERSION_ONLY,UNDO_ATTENUATION,NT_DUMP)
+ SAVE_REGULAR_KL,PARTIAL_PHYS_DISPERSION_ONLY,UNDO_ATTENUATION,NT_DUMP_ATTENUATION)
! get the base pathname for output files
call get_value_string(OUTPUT_FILES, 'OUTPUT_FILES', 'OUTPUT_FILES')
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/src/auxiliaries/check_buffers_corners_chunks.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/src/auxiliaries/check_buffers_corners_chunks.f90 2013-06-16 17:55:01 UTC (rev 22329)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/src/auxiliaries/check_buffers_corners_chunks.f90 2013-06-16 18:55:47 UTC (rev 22330)
@@ -104,7 +104,7 @@
integer, dimension(NB_SQUARE_EDGES_ONEDIR,NB_CUT_CASE) :: DIFF_NSPEC2D_XI,DIFF_NSPEC2D_ETA
logical :: PARTIAL_PHYS_DISPERSION_ONLY,UNDO_ATTENUATION
- integer :: NT_DUMP
+ integer :: NT_DUMP_ATTENUATION
! ************** PROGRAM STARTS HERE **************
@@ -145,7 +145,7 @@
ROTATE_SEISMOGRAMS_RT,ratio_divide_central_cube,HONOR_1D_SPHERICAL_MOHO,CUT_SUPERBRICK_XI,CUT_SUPERBRICK_ETA,&
DIFF_NSPEC1D_RADIAL,DIFF_NSPEC2D_XI,DIFF_NSPEC2D_ETA,&
WRITE_SEISMOGRAMS_BY_MASTER,SAVE_ALL_SEISMOS_IN_ONE_FILE,USE_BINARY_FOR_LARGE_FILE,.false.,NOISE_TOMOGRAPHY,&
- SAVE_REGULAR_KL,PARTIAL_PHYS_DISPERSION_ONLY,UNDO_ATTENUATION,NT_DUMP)
+ SAVE_REGULAR_KL,PARTIAL_PHYS_DISPERSION_ONLY,UNDO_ATTENUATION,NT_DUMP_ATTENUATION)
print *
print *,'There are ',NPROCTOT,' slices numbered from 0 to ',NPROCTOT-1
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/src/auxiliaries/check_buffers_faces_chunks.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/src/auxiliaries/check_buffers_faces_chunks.f90 2013-06-16 17:55:01 UTC (rev 22329)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/src/auxiliaries/check_buffers_faces_chunks.f90 2013-06-16 18:55:47 UTC (rev 22330)
@@ -108,7 +108,7 @@
integer, dimension(NB_SQUARE_EDGES_ONEDIR,NB_CUT_CASE) :: DIFF_NSPEC2D_XI,DIFF_NSPEC2D_ETA
logical :: PARTIAL_PHYS_DISPERSION_ONLY,UNDO_ATTENUATION
- integer :: NT_DUMP
+ integer :: NT_DUMP_ATTENUATION
! ************** PROGRAM STARTS HERE **************
@@ -145,7 +145,7 @@
ROTATE_SEISMOGRAMS_RT,ratio_divide_central_cube,HONOR_1D_SPHERICAL_MOHO,CUT_SUPERBRICK_XI,CUT_SUPERBRICK_ETA,&
DIFF_NSPEC1D_RADIAL,DIFF_NSPEC2D_XI,DIFF_NSPEC2D_ETA,&
WRITE_SEISMOGRAMS_BY_MASTER,SAVE_ALL_SEISMOS_IN_ONE_FILE,USE_BINARY_FOR_LARGE_FILE,.false.,NOISE_TOMOGRAPHY,&
- SAVE_REGULAR_KL,PARTIAL_PHYS_DISPERSION_ONLY,UNDO_ATTENUATION,NT_DUMP)
+ SAVE_REGULAR_KL,PARTIAL_PHYS_DISPERSION_ONLY,UNDO_ATTENUATION,NT_DUMP_ATTENUATION)
! get the base pathname for output files
call get_value_string(OUTPUT_FILES, 'OUTPUT_FILES', 'OUTPUT_FILES')
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/src/auxiliaries/combine_AVS_DX.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/src/auxiliaries/combine_AVS_DX.f90 2013-06-16 17:55:01 UTC (rev 22329)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/src/auxiliaries/combine_AVS_DX.f90 2013-06-16 18:55:47 UTC (rev 22330)
@@ -181,7 +181,7 @@
integer, dimension(NB_SQUARE_EDGES_ONEDIR,NB_CUT_CASE) :: DIFF_NSPEC2D_XI,DIFF_NSPEC2D_ETA
logical :: PARTIAL_PHYS_DISPERSION_ONLY,UNDO_ATTENUATION
- integer :: NT_DUMP
+ integer :: NT_DUMP_ATTENUATION
! ************** PROGRAM STARTS HERE **************
@@ -226,7 +226,7 @@
DIFF_NSPEC1D_RADIAL,DIFF_NSPEC2D_XI,DIFF_NSPEC2D_ETA,&
WRITE_SEISMOGRAMS_BY_MASTER,SAVE_ALL_SEISMOS_IN_ONE_FILE,&
USE_BINARY_FOR_LARGE_FILE,.false.,NOISE_TOMOGRAPHY,&
- SAVE_REGULAR_KL,PARTIAL_PHYS_DISPERSION_ONLY,UNDO_ATTENUATION,NT_DUMP)
+ SAVE_REGULAR_KL,PARTIAL_PHYS_DISPERSION_ONLY,UNDO_ATTENUATION,NT_DUMP_ATTENUATION)
if(.not. SAVE_MESH_FILES) stop 'AVS or DX files were not saved by the mesher'
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/src/auxiliaries/create_movie_AVS_DX.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/src/auxiliaries/create_movie_AVS_DX.f90 2013-06-16 17:55:01 UTC (rev 22329)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/src/auxiliaries/create_movie_AVS_DX.f90 2013-06-16 18:55:47 UTC (rev 22330)
@@ -818,7 +818,7 @@
integer, dimension(NB_SQUARE_EDGES_ONEDIR,NB_CUT_CASE) :: DIFF_NSPEC2D_XI,DIFF_NSPEC2D_ETA
logical :: PARTIAL_PHYS_DISPERSION_ONLY,UNDO_ATTENUATION
- integer :: NT_DUMP
+ integer :: NT_DUMP_ATTENUATION
print *
print *,'reading parameter file'
@@ -853,7 +853,7 @@
ROTATE_SEISMOGRAMS_RT,ratio_divide_central_cube,HONOR_1D_SPHERICAL_MOHO,CUT_SUPERBRICK_XI,CUT_SUPERBRICK_ETA,&
DIFF_NSPEC1D_RADIAL,DIFF_NSPEC2D_XI,DIFF_NSPEC2D_ETA,&
WRITE_SEISMOGRAMS_BY_MASTER,SAVE_ALL_SEISMOS_IN_ONE_FILE,USE_BINARY_FOR_LARGE_FILE,.false.,NOISE_TOMOGRAPHY,&
- SAVE_REGULAR_KL,PARTIAL_PHYS_DISPERSION_ONLY,UNDO_ATTENUATION,NT_DUMP)
+ SAVE_REGULAR_KL,PARTIAL_PHYS_DISPERSION_ONLY,UNDO_ATTENUATION,NT_DUMP_ATTENUATION)
if(MOVIE_COARSE) stop 'create_movie_AVS_DX does not work with MOVIE_COARSE'
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/src/auxiliaries/create_movie_GMT_global.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/src/auxiliaries/create_movie_GMT_global.f90 2013-06-16 17:55:01 UTC (rev 22329)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/src/auxiliaries/create_movie_GMT_global.f90 2013-06-16 18:55:47 UTC (rev 22330)
@@ -160,7 +160,7 @@
integer :: istamp1,istamp2
logical :: PARTIAL_PHYS_DISPERSION_ONLY,UNDO_ATTENUATION
- integer :: NT_DUMP
+ integer :: NT_DUMP_ATTENUATION
! ************** PROGRAM STARTS HERE **************
@@ -204,7 +204,7 @@
DIFF_NSPEC1D_RADIAL,DIFF_NSPEC2D_XI,DIFF_NSPEC2D_ETA,&
WRITE_SEISMOGRAMS_BY_MASTER,SAVE_ALL_SEISMOS_IN_ONE_FILE, &
USE_BINARY_FOR_LARGE_FILE,.false.,NOISE_TOMOGRAPHY,SAVE_REGULAR_KL, &
- PARTIAL_PHYS_DISPERSION_ONLY,UNDO_ATTENUATION,NT_DUMP)
+ PARTIAL_PHYS_DISPERSION_ONLY,UNDO_ATTENUATION,NT_DUMP_ATTENUATION)
if(.not. MOVIE_SURFACE) stop 'movie frames were not saved by the solver'
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/src/compute_optimized_dumping_undo_att/compute_optimized_dumping_undo_att.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/src/compute_optimized_dumping_undo_att/compute_optimized_dumping_undo_att.f90 2013-06-16 17:55:01 UTC (rev 22329)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/src/compute_optimized_dumping_undo_att/compute_optimized_dumping_undo_att.f90 2013-06-16 18:55:47 UTC (rev 22330)
@@ -103,12 +103,12 @@
integer, dimension(MAX_NUM_REGIONS,NB_SQUARE_CORNERS) :: NGLOB1D_RADIAL_CORNER
integer, dimension(MAX_NUM_REGIONS) :: NGLOB1D_RADIAL_TEMP
- integer :: NT_DUMP_optimal_to_use,number_of_dumpings_to_do
+ integer :: NT_DUMP_ATTENUATION_optimal_to_use,number_of_dumpings_to_do
double precision :: gigabytes_avail_per_core,percentage_to_use_per_core,what_we_can_use_in_GB,size_to_store_at_each_time_step, &
disk_size_of_each_dumping
logical :: PARTIAL_PHYS_DISPERSION_ONLY,UNDO_ATTENUATION
- integer :: NT_DUMP
+ integer :: NT_DUMP_ATTENUATION
! ************** PROGRAM STARTS HERE **************
@@ -141,7 +141,7 @@
ROTATE_SEISMOGRAMS_RT,ratio_divide_central_cube,HONOR_1D_SPHERICAL_MOHO,CUT_SUPERBRICK_XI,CUT_SUPERBRICK_ETA,&
DIFF_NSPEC1D_RADIAL,DIFF_NSPEC2D_XI,DIFF_NSPEC2D_ETA,&
WRITE_SEISMOGRAMS_BY_MASTER,SAVE_ALL_SEISMOS_IN_ONE_FILE,USE_BINARY_FOR_LARGE_FILE,.false.,NOISE_TOMOGRAPHY,&
- SAVE_REGULAR_KL,PARTIAL_PHYS_DISPERSION_ONLY,UNDO_ATTENUATION,NT_DUMP)
+ SAVE_REGULAR_KL,PARTIAL_PHYS_DISPERSION_ONLY,UNDO_ATTENUATION,NT_DUMP_ATTENUATION)
! 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
@@ -270,9 +270,9 @@
print *
print *,'*******************************************************************************'
print *,'the optimal value to put in setup/constants.h is thus:'
- NT_DUMP_optimal_to_use = int((what_we_can_use_in_GB - static_memory_size) / size_to_store_at_each_time_step)
+ NT_DUMP_ATTENUATION_optimal_to_use = int((what_we_can_use_in_GB - static_memory_size) / size_to_store_at_each_time_step)
print *
- print *,'NT_DUMP = ',NT_DUMP_optimal_to_use
+ print *,'NT_DUMP_ATTENUATION = ',NT_DUMP_ATTENUATION_optimal_to_use
print *
print *,'thus please edit that file, put this value in it and recompile the whole code'
print *,'with "make clean ; make all"'
@@ -308,7 +308,7 @@
disk_size_of_each_dumping = disk_size_of_each_dumping / 1.d9
!! DK DK this formula could be made more precise here; currently in some cases it can probably be off by +1 or -1
- number_of_dumpings_to_do = nint(NSTEP / dble(NT_DUMP_optimal_to_use))
+ number_of_dumpings_to_do = nint(NSTEP / dble(NT_DUMP_ATTENUATION_optimal_to_use))
print *
print *,'we will need to save a total of ',number_of_dumpings_to_do,' dumpings (restart files) to disk'
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/src/create_header_file/create_header_file.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/src/create_header_file/create_header_file.f90 2013-06-16 17:55:01 UTC (rev 22329)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/src/create_header_file/create_header_file.f90 2013-06-16 18:55:47 UTC (rev 22330)
@@ -104,7 +104,7 @@
integer, dimension(MAX_NUM_REGIONS) :: NGLOB1D_RADIAL_TEMP
logical :: PARTIAL_PHYS_DISPERSION_ONLY,UNDO_ATTENUATION
- integer :: NT_DUMP
+ integer :: NT_DUMP_ATTENUATION
! ************** PROGRAM STARTS HERE **************
@@ -141,7 +141,7 @@
ROTATE_SEISMOGRAMS_RT,ratio_divide_central_cube,HONOR_1D_SPHERICAL_MOHO,CUT_SUPERBRICK_XI,CUT_SUPERBRICK_ETA,&
DIFF_NSPEC1D_RADIAL,DIFF_NSPEC2D_XI,DIFF_NSPEC2D_ETA,&
WRITE_SEISMOGRAMS_BY_MASTER,SAVE_ALL_SEISMOS_IN_ONE_FILE,USE_BINARY_FOR_LARGE_FILE,.false.,NOISE_TOMOGRAPHY,&
- SAVE_REGULAR_KL,PARTIAL_PHYS_DISPERSION_ONLY,UNDO_ATTENUATION,NT_DUMP)
+ SAVE_REGULAR_KL,PARTIAL_PHYS_DISPERSION_ONLY,UNDO_ATTENUATION,NT_DUMP_ATTENUATION)
! count the total number of sources in the CMTSOLUTION file
call count_number_of_sources(NSOURCES)
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/src/meshfem3D/meshfem3D.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/src/meshfem3D/meshfem3D.f90 2013-06-16 17:55:01 UTC (rev 22329)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/src/meshfem3D/meshfem3D.f90 2013-06-16 18:55:47 UTC (rev 22330)
@@ -424,7 +424,7 @@
logical, dimension(:), allocatable :: is_on_a_slice_edge
logical :: PARTIAL_PHYS_DISPERSION_ONLY,UNDO_ATTENUATION
- integer :: NT_DUMP
+ integer :: NT_DUMP_ATTENUATION
! ************** PROGRAM STARTS HERE **************
@@ -546,7 +546,7 @@
DIFF_NSPEC1D_RADIAL,DIFF_NSPEC2D_XI,DIFF_NSPEC2D_ETA,&
WRITE_SEISMOGRAMS_BY_MASTER,SAVE_ALL_SEISMOS_IN_ONE_FILE, &
USE_BINARY_FOR_LARGE_FILE,.false.,NOISE_TOMOGRAPHY,SAVE_REGULAR_KL, &
- PARTIAL_PHYS_DISPERSION_ONLY,UNDO_ATTENUATION,NT_DUMP)
+ PARTIAL_PHYS_DISPERSION_ONLY,UNDO_ATTENUATION,NT_DUMP_ATTENUATION)
endif
! distributes parameters from master to all processes
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/src/shared/read_compute_parameters.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/src/shared/read_compute_parameters.f90 2013-06-16 17:55:01 UTC (rev 22329)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/src/shared/read_compute_parameters.f90 2013-06-16 18:55:47 UTC (rev 22330)
@@ -57,7 +57,7 @@
DIFF_NSPEC1D_RADIAL,DIFF_NSPEC2D_XI,DIFF_NSPEC2D_ETA,&
WRITE_SEISMOGRAMS_BY_MASTER,SAVE_ALL_SEISMOS_IN_ONE_FILE,&
USE_BINARY_FOR_LARGE_FILE,EMULATE_ONLY,NOISE_TOMOGRAPHY,&
- SAVE_REGULAR_KL,PARTIAL_PHYS_DISPERSION_ONLY,UNDO_ATTENUATION,NT_DUMP)
+ SAVE_REGULAR_KL,PARTIAL_PHYS_DISPERSION_ONLY,UNDO_ATTENUATION,NT_DUMP_ATTENUATION)
implicit none
@@ -147,7 +147,7 @@
integer :: tmp_sum_nglob2D_xi, tmp_sum_nglob2D_eta,divider,nglob_edges_h,nglob_edge_v,to_remove
logical :: PARTIAL_PHYS_DISPERSION_ONLY,UNDO_ATTENUATION
- integer :: NT_DUMP
+ integer :: NT_DUMP_ATTENUATION
! reads in Par_file values
call read_parameter_file(OUTPUT_FILES,LOCAL_PATH,MODEL, &
@@ -167,7 +167,7 @@
OUTPUT_SEISMOS_ASCII_TEXT,OUTPUT_SEISMOS_SAC_ALPHANUM,OUTPUT_SEISMOS_SAC_BINARY, &
ROTATE_SEISMOGRAMS_RT,WRITE_SEISMOGRAMS_BY_MASTER,&
SAVE_ALL_SEISMOS_IN_ONE_FILE,USE_BINARY_FOR_LARGE_FILE,NOISE_TOMOGRAPHY,&
- SAVE_REGULAR_KL,PARTIAL_PHYS_DISPERSION_ONLY,UNDO_ATTENUATION,NT_DUMP)
+ SAVE_REGULAR_KL,PARTIAL_PHYS_DISPERSION_ONLY,UNDO_ATTENUATION,NT_DUMP_ATTENUATION)
! converts values to radians
MOVIE_EAST = MOVIE_EAST_DEG * DEGREES_TO_RADIANS
@@ -227,8 +227,8 @@
! compute total number of time steps, rounded to next multiple of 100
NSTEP = 100 * (int(RECORD_LENGTH_IN_MINUTES * 60.d0 / (100.d0*DT)) + 1)
-!! DK DK make sure NSTEP is a multiple of NT_DUMP
- if(UNDO_ATTENUATION .and. mod(NSTEP,NT_DUMP) /= 0) NSTEP = (NSTEP/NT_DUMP + 1)*NT_DUMP
+!! DK DK make sure NSTEP is a multiple of NT_DUMP_ATTENUATION
+ if(UNDO_ATTENUATION .and. mod(NSTEP,NT_DUMP_ATTENUATION) /= 0) NSTEP = (NSTEP/NT_DUMP_ATTENUATION + 1)*NT_DUMP_ATTENUATION
! if doing benchmark runs to measure scaling of the code for a limited number of time steps only
if (DO_BENCHMARK_RUN_ONLY) NSTEP = NSTEP_FOR_BENCHMARK
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/src/shared/read_parameter_file.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/src/shared/read_parameter_file.f90 2013-06-16 17:55:01 UTC (rev 22329)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/src/shared/read_parameter_file.f90 2013-06-16 18:55:47 UTC (rev 22330)
@@ -42,7 +42,7 @@
OUTPUT_SEISMOS_ASCII_TEXT,OUTPUT_SEISMOS_SAC_ALPHANUM,OUTPUT_SEISMOS_SAC_BINARY, &
ROTATE_SEISMOGRAMS_RT,WRITE_SEISMOGRAMS_BY_MASTER,&
SAVE_ALL_SEISMOS_IN_ONE_FILE,USE_BINARY_FOR_LARGE_FILE,NOISE_TOMOGRAPHY,&
- SAVE_REGULAR_KL,PARTIAL_PHYS_DISPERSION_ONLY,UNDO_ATTENUATION,NT_DUMP)
+ SAVE_REGULAR_KL,PARTIAL_PHYS_DISPERSION_ONLY,UNDO_ATTENUATION,NT_DUMP_ATTENUATION)
implicit none
@@ -52,7 +52,7 @@
integer NTSTEP_BETWEEN_OUTPUT_SEISMOS,NTSTEP_BETWEEN_READ_ADJSRC,NTSTEP_BETWEEN_FRAMES, &
NTSTEP_BETWEEN_OUTPUT_INFO,NUMBER_OF_RUNS,NUMBER_OF_THIS_RUN,NCHUNKS,SIMULATION_TYPE, &
MOVIE_VOLUME_TYPE,MOVIE_START,MOVIE_STOP, &
- NEX_XI_read,NEX_ETA_read,NPROC_XI_read,NPROC_ETA_read,NOISE_TOMOGRAPHY,NT_DUMP
+ NEX_XI_read,NEX_ETA_read,NPROC_XI_read,NPROC_ETA_read,NOISE_TOMOGRAPHY,NT_DUMP_ATTENUATION
double precision ANGULAR_WIDTH_XI_IN_DEGREES,ANGULAR_WIDTH_ETA_IN_DEGREES,&
CENTER_LONGITUDE_IN_DEGREES,CENTER_LATITUDE_IN_DEGREES,GAMMA_ROTATION_AZIMUTH,&
@@ -137,8 +137,8 @@
call read_value_logical(UNDO_ATTENUATION, 'solver.UNDO_ATTENUATION', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: UNDO_ATTENUATION'
- call read_value_integer(NT_DUMP, 'solver.NT_DUMP', ierr)
- if (ierr /= 0) stop 'an error occurred while reading the parameter file: NT_DUMP'
+ call read_value_integer(NT_DUMP_ATTENUATION, 'solver.NT_DUMP_ATTENUATION', ierr)
+ if (ierr /= 0) stop 'an error occurred while reading the parameter file: NT_DUMP_ATTENUATION'
call read_value_logical(MOVIE_SURFACE, 'solver.MOVIE_SURFACE', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: MOVIE_SURFACE'
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/src/specfem3D/initialize_simulation.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/src/specfem3D/initialize_simulation.f90 2013-06-16 17:55:01 UTC (rev 22329)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/src/specfem3D/initialize_simulation.f90 2013-06-16 18:55:47 UTC (rev 22330)
@@ -55,7 +55,7 @@
hprimewgll_xx,hprimewgll_yy,hprimewgll_zz,hprimewgll_xxT, &
wgllwgll_xy,wgllwgll_xz,wgllwgll_yz, &
rec_filename,STATIONS,nrec,NOISE_TOMOGRAPHY,SAVE_REGULAR_KL, &
- PARTIAL_PHYS_DISPERSION_ONLY,UNDO_ATTENUATION,NT_DUMP)
+ PARTIAL_PHYS_DISPERSION_ONLY,UNDO_ATTENUATION,NT_DUMP_ATTENUATION)
implicit none
@@ -73,7 +73,7 @@
NTSTEP_BETWEEN_OUTPUT_SEISMOS, &
NTSTEP_BETWEEN_READ_ADJSRC,NSTEP,NSOURCES,NTSTEP_BETWEEN_FRAMES, &
NTSTEP_BETWEEN_OUTPUT_INFO,NUMBER_OF_RUNS,NUMBER_OF_THIS_RUN,SIMULATION_TYPE, &
- MOVIE_VOLUME_TYPE,MOVIE_START,MOVIE_STOP,NOISE_TOMOGRAPHY,NT_DUMP
+ MOVIE_VOLUME_TYPE,MOVIE_START,MOVIE_STOP,NOISE_TOMOGRAPHY,NT_DUMP_ATTENUATION
double precision DT,ROCEAN,RMIDDLE_CRUST, &
RMOHO,R80,R220,R400,R600,R670,R771,RTOPDDOUBLEPRIME,RCMB,RICB, &
@@ -199,7 +199,7 @@
DIFF_NSPEC1D_RADIAL,DIFF_NSPEC2D_XI,DIFF_NSPEC2D_ETA,&
WRITE_SEISMOGRAMS_BY_MASTER,SAVE_ALL_SEISMOS_IN_ONE_FILE, &
USE_BINARY_FOR_LARGE_FILE,.false.,NOISE_TOMOGRAPHY,SAVE_REGULAR_KL, &
- PARTIAL_PHYS_DISPERSION_ONLY,UNDO_ATTENUATION,NT_DUMP)
+ PARTIAL_PHYS_DISPERSION_ONLY,UNDO_ATTENUATION,NT_DUMP_ATTENUATION)
endif
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/src/specfem3D/specfem3D.F90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/src/specfem3D/specfem3D.F90 2013-06-16 17:55:01 UTC (rev 22329)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/undo_att/src/specfem3D/specfem3D.F90 2013-06-16 18:55:47 UTC (rev 22330)
@@ -859,7 +859,7 @@
NTSTEP_BETWEEN_OUTPUT_SEISMOS,&
NTSTEP_BETWEEN_READ_ADJSRC,NSTEP,NSOURCES,NTSTEP_BETWEEN_FRAMES, &
NTSTEP_BETWEEN_OUTPUT_INFO,NUMBER_OF_RUNS,NUMBER_OF_THIS_RUN,SIMULATION_TYPE, &
- MOVIE_VOLUME_TYPE,MOVIE_START,MOVIE_STOP,NOISE_TOMOGRAPHY,NT_DUMP
+ MOVIE_VOLUME_TYPE,MOVIE_START,MOVIE_STOP,NOISE_TOMOGRAPHY,NT_DUMP_ATTENUATION
double precision DT,ROCEAN,RMIDDLE_CRUST, &
RMOHO,R80,R220,R400,R600,R670,R771,RTOPDDOUBLEPRIME,RCMB,RICB, &
@@ -1063,7 +1063,7 @@
hprimewgll_xx,hprimewgll_yy,hprimewgll_zz,hprimewgll_xxT, &
wgllwgll_xy,wgllwgll_xz,wgllwgll_yz, &
rec_filename,STATIONS,nrec,NOISE_TOMOGRAPHY,SAVE_REGULAR_KL, &
- PARTIAL_PHYS_DISPERSION_ONLY,UNDO_ATTENUATION,NT_DUMP)
+ PARTIAL_PHYS_DISPERSION_ONLY,UNDO_ATTENUATION,NT_DUMP_ATTENUATION)
!
!-------------------------------------------------------------------------------------------------
!-------------------------------------------------------------------------------------------------
@@ -2189,7 +2189,7 @@
! New part of ZN
if(SIMULATION_TYPE == 1)then
it = 0
- do iteration_on_subset = 1, NSTEP / NT_DUMP
+ do iteration_on_subset = 1, NSTEP / NT_DUMP_ATTENUATION
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, &
@@ -2199,7 +2199,7 @@
A_array_rotation,B_array_rotation,LOCAL_PATH,iteration_on_subset)
endif
- do it_of_this_subset = 1, NT_DUMP
+ do it_of_this_subset = 1, NT_DUMP_ATTENUATION
it = it + 1
@@ -2216,9 +2216,9 @@
!!add this part
it = 0
- do iteration_on_subset = 1, NSTEP / NT_DUMP
+ do iteration_on_subset = 1, NSTEP / NT_DUMP_ATTENUATION
- do it_of_this_subset = 1, NT_DUMP
+ do it_of_this_subset = 1, NT_DUMP_ATTENUATION
it = it + 1
@@ -2234,30 +2234,30 @@
undo_att_sim_type_3 = .true.
- allocate(b_displ_crust_mantle_store_buffer(NDIM,NGLOB_CRUST_MANTLE,NT_DUMP),stat=ier)
+ allocate(b_displ_crust_mantle_store_buffer(NDIM,NGLOB_CRUST_MANTLE,NT_DUMP_ATTENUATION),stat=ier)
if( ier /= 0 ) call exit_MPI(myrank,'error allocating b_displ_crust_mantle_store_buffer')
- allocate(b_displ_outer_core_store_buffer(NGLOB_OUTER_CORE,NT_DUMP),stat=ier)
+ allocate(b_displ_outer_core_store_buffer(NGLOB_OUTER_CORE,NT_DUMP_ATTENUATION),stat=ier)
if( ier /= 0 ) call exit_MPI(myrank,'error allocating b_displ_outer_core_store_buffer')
- allocate(b_accel_outer_core_store_buffer(NGLOB_OUTER_CORE,NT_DUMP),stat=ier)
+ allocate(b_accel_outer_core_store_buffer(NGLOB_OUTER_CORE,NT_DUMP_ATTENUATION),stat=ier)
if( ier /= 0 ) call exit_MPI(myrank,'error allocating b_displ_outer_core_store_buffer')
- allocate(b_displ_inner_core_store_buffer(NDIM,NGLOB_INNER_CORE,NT_DUMP),stat=ier)
+ allocate(b_displ_inner_core_store_buffer(NDIM,NGLOB_INNER_CORE,NT_DUMP_ATTENUATION),stat=ier)
if( ier /= 0 ) call exit_MPI(myrank,'error allocating b_displ_inner_core_store_buffer')
it = 0
- do iteration_on_subset = 1, NSTEP / NT_DUMP
+ do iteration_on_subset = 1, NSTEP / NT_DUMP_ATTENUATION
call read_forward_arrays_undoatt(myrank, &
b_displ_crust_mantle,b_veloc_crust_mantle,b_accel_crust_mantle, &
b_displ_inner_core,b_veloc_inner_core,b_accel_inner_core, &
b_displ_outer_core,b_veloc_outer_core,b_accel_outer_core, &
b_R_memory_crust_mantle,b_R_memory_inner_core, &
- b_A_array_rotation,b_B_array_rotation,LOCAL_PATH, NSTEP/NT_DUMP-iteration_on_subset+1)
+ b_A_array_rotation,b_B_array_rotation,LOCAL_PATH, NSTEP/NT_DUMP_ATTENUATION-iteration_on_subset+1)
it_temp = it
seismo_current_temp = seismo_current
- do it_of_this_subset = 1, NT_DUMP
+ do it_of_this_subset = 1, NT_DUMP_ATTENUATION
it = it + 1
seismo_current = seismo_current + 1
@@ -2273,21 +2273,21 @@
it = it_temp
seismo_current = seismo_current_temp
- do it_of_this_subset = 1, NT_DUMP
+ do it_of_this_subset = 1, NT_DUMP_ATTENUATION
do i = 1, NDIM
do j =1,NGLOB_CRUST_MANTLE_ADJOINT
- b_displ_crust_mantle(i,j) = b_displ_crust_mantle_store_buffer(i,j,NT_DUMP-it_of_this_subset+1)
+ b_displ_crust_mantle(i,j) = b_displ_crust_mantle_store_buffer(i,j,NT_DUMP_ATTENUATION-it_of_this_subset+1)
enddo
enddo
do j =1,NGLOB_OUTER_CORE_ADJOINT
- b_displ_outer_core(j) = b_displ_outer_core_store_buffer(j,NT_DUMP-it_of_this_subset+1)
- b_accel_outer_core(j) = b_accel_outer_core_store_buffer(j,NT_DUMP-it_of_this_subset+1)
+ b_displ_outer_core(j) = b_displ_outer_core_store_buffer(j,NT_DUMP_ATTENUATION-it_of_this_subset+1)
+ b_accel_outer_core(j) = b_accel_outer_core_store_buffer(j,NT_DUMP_ATTENUATION-it_of_this_subset+1)
enddo
do i = 1, NDIM
do j =1,NGLOB_INNER_CORE_ADJOINT
- b_displ_inner_core(i,j) = b_displ_inner_core_store_buffer(i,j,NT_DUMP-it_of_this_subset+1)
+ b_displ_inner_core(i,j) = b_displ_inner_core_store_buffer(i,j,NT_DUMP_ATTENUATION-it_of_this_subset+1)
enddo
enddo
More information about the CIG-COMMITS
mailing list