[cig-commits] [commit] devel, master: moved ATTENUATION_1D_WITH_3D_STORAGE from the Par_file to setup/constants.h.in (fa9148d)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Thu Nov 6 08:22:41 PST 2014
Repository : https://github.com/geodynamics/specfem3d_globe
On branches: devel,master
Link : https://github.com/geodynamics/specfem3d_globe/compare/bc58e579b3b0838a0968725a076f5904845437ca...be63f20cbb6f462104e949894dbe205d2398cd7f
>---------------------------------------------------------------
commit fa9148dd2e3e5774b6acb65ddfe753f5c2d8c0eb
Author: Dimitri Komatitsch <komatitsch at lma.cnrs-mrs.fr>
Date: Tue Jun 24 01:35:06 2014 +0200
moved ATTENUATION_1D_WITH_3D_STORAGE from the Par_file to setup/constants.h.in
>---------------------------------------------------------------
fa9148dd2e3e5774b6acb65ddfe753f5c2d8c0eb
DATA/Par_file | 1 -
.../Par_file | 1 -
.../SEMD/DATA/Par_file | 1 -
.../SEMD/DATA/Par_file | 1 -
.../SEMD/DATA/Par_file | 1 -
.../global_PREM_kernels/amplitude/DATA/Par_file | 1 -
.../global_PREM_kernels/traveltime/DATA/Par_file | 1 -
EXAMPLES/global_s362ani_shakemovie/DATA/Par_file | 1 -
.../global_long/Par_file_NOISE_1_attenuation | 1 -
.../global_long/Par_file_NOISE_1_noattenuation | 1 -
.../global_long/Par_file_NOISE_2_attenuation | 1 -
.../global_long/Par_file_NOISE_2_noattenuation | 1 -
.../global_long/Par_file_NOISE_3_noattenuation | 1 -
.../global_short/Par_file_NOISE_1_attenuation | 1 -
.../global_short/Par_file_NOISE_1_noattenuation | 1 -
.../global_short/Par_file_NOISE_2_attenuation | 1 -
.../global_short/Par_file_NOISE_2_noattenuation | 1 -
.../global_short/Par_file_NOISE_3_noattenuation | 1 -
.../regional/Par_file_NOISE_1_attenuation | 1 -
.../regional/Par_file_NOISE_1_noattenuation | 1 -
.../regional/Par_file_NOISE_2_attenuation | 1 -
.../regional/Par_file_NOISE_2_noattenuation | 1 -
.../regional/Par_file_NOISE_3_noattenuation | 1 -
EXAMPLES/regional_Greece_noise_small/DATA/Par_file | 1 -
EXAMPLES/regional_Greece_small/DATA/Par_file | 1 -
EXAMPLES/regional_MiddleEast/DATA/Par_file | 1 -
.../Par_file | 1 -
m4 | 2 +-
setup/constants.h.in | 66 +++++++++++++---------
src/gpu/prepare_mesh_constants_gpu.c | 0
src/meshfem3D/meshfem3D_par.f90 | 3 +-
src/shared/broadcast_computed_parameters.f90 | 23 ++++----
src/shared/read_compute_parameters.f90 | 3 +-
src/shared/read_parameter_file.f90 | 8 +--
src/shared/shared_par.f90 | 2 +-
src/specfem3D/prepare_timerun.f90 | 0
36 files changed, 56 insertions(+), 78 deletions(-)
diff --git a/DATA/Par_file b/DATA/Par_file
index 3047934..b8faf8f 100644
--- a/DATA/Par_file
+++ b/DATA/Par_file
@@ -57,7 +57,6 @@ RECORD_LENGTH_IN_MINUTES = 2.5d0
# 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.
-ATTENUATION_1D_WITH_3D_STORAGE = .true.
PARTIAL_PHYS_DISPERSION_ONLY = .true.
UNDO_ATTENUATION = .false.
# How much memory (in GB) is installed on your machine per CPU core (only used for UNDO_ATTENUATION, can be ignored otherwise)
diff --git a/EXAMPLES/benchmarks/attenuation_benchmark_GJI_2002_versus_normal_modes/Par_file b/EXAMPLES/benchmarks/attenuation_benchmark_GJI_2002_versus_normal_modes/Par_file
index c05a6ef..06583f3 100644
--- a/EXAMPLES/benchmarks/attenuation_benchmark_GJI_2002_versus_normal_modes/Par_file
+++ b/EXAMPLES/benchmarks/attenuation_benchmark_GJI_2002_versus_normal_modes/Par_file
@@ -56,7 +56,6 @@ RECORD_LENGTH_IN_MINUTES = 55.0d0
# 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.
-ATTENUATION_1D_WITH_3D_STORAGE = .true.
PARTIAL_PHYS_DISPERSION_ONLY = .false.
UNDO_ATTENUATION = .false.
# How much memory (in GB) is installed on your machine per CPU core (only used for UNDO_ATTENUATION, can be ignored otherwise)
diff --git a/EXAMPLES/benchmarks/prem_ani_noocean_Q_Cowling_Bolivia_9s/SEMD/DATA/Par_file b/EXAMPLES/benchmarks/prem_ani_noocean_Q_Cowling_Bolivia_9s/SEMD/DATA/Par_file
index 34bad74..23f002c 100644
--- a/EXAMPLES/benchmarks/prem_ani_noocean_Q_Cowling_Bolivia_9s/SEMD/DATA/Par_file
+++ b/EXAMPLES/benchmarks/prem_ani_noocean_Q_Cowling_Bolivia_9s/SEMD/DATA/Par_file
@@ -57,7 +57,6 @@ RECORD_LENGTH_IN_MINUTES = 50.0d0
# 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.
-ATTENUATION_1D_WITH_3D_STORAGE = .true.
PARTIAL_PHYS_DISPERSION_ONLY = .false.
UNDO_ATTENUATION = .false.
# How much memory (in GB) is installed on your machine per CPU core (only used for UNDO_ATTENUATION, can be ignored otherwise)
diff --git a/EXAMPLES/benchmarks/prem_ani_noocean_Q_Cowling_Vanuatu/SEMD/DATA/Par_file b/EXAMPLES/benchmarks/prem_ani_noocean_Q_Cowling_Vanuatu/SEMD/DATA/Par_file
index e5ee9f6..cc00bf3 100644
--- a/EXAMPLES/benchmarks/prem_ani_noocean_Q_Cowling_Vanuatu/SEMD/DATA/Par_file
+++ b/EXAMPLES/benchmarks/prem_ani_noocean_Q_Cowling_Vanuatu/SEMD/DATA/Par_file
@@ -57,7 +57,6 @@ RECORD_LENGTH_IN_MINUTES = 100.0d0
# 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.
-ATTENUATION_1D_WITH_3D_STORAGE = .true.
PARTIAL_PHYS_DISPERSION_ONLY = .false.
UNDO_ATTENUATION = .false.
# How much memory (in GB) is installed on your machine per CPU core (only used for UNDO_ATTENUATION, can be ignored otherwise)
diff --git a/EXAMPLES/benchmarks/prem_iso_noocean_Q_Cowling_Vanuatu/SEMD/DATA/Par_file b/EXAMPLES/benchmarks/prem_iso_noocean_Q_Cowling_Vanuatu/SEMD/DATA/Par_file
index b8e3246..e7aaabb 100644
--- a/EXAMPLES/benchmarks/prem_iso_noocean_Q_Cowling_Vanuatu/SEMD/DATA/Par_file
+++ b/EXAMPLES/benchmarks/prem_iso_noocean_Q_Cowling_Vanuatu/SEMD/DATA/Par_file
@@ -57,7 +57,6 @@ RECORD_LENGTH_IN_MINUTES = 100.0d0
# 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.
-ATTENUATION_1D_WITH_3D_STORAGE = .true.
PARTIAL_PHYS_DISPERSION_ONLY = .false.
UNDO_ATTENUATION = .false.
# How much memory (in GB) is installed on your machine per CPU core (only used for UNDO_ATTENUATION, can be ignored otherwise)
diff --git a/EXAMPLES/global_PREM_kernels/amplitude/DATA/Par_file b/EXAMPLES/global_PREM_kernels/amplitude/DATA/Par_file
index 519fe7d..f30ff90 100644
--- a/EXAMPLES/global_PREM_kernels/amplitude/DATA/Par_file
+++ b/EXAMPLES/global_PREM_kernels/amplitude/DATA/Par_file
@@ -57,7 +57,6 @@ RECORD_LENGTH_IN_MINUTES = 30.0d0
# 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.
-ATTENUATION_1D_WITH_3D_STORAGE = .true.
PARTIAL_PHYS_DISPERSION_ONLY = .true.
UNDO_ATTENUATION = .false.
# How much memory (in GB) is installed on your machine per CPU core (only used for UNDO_ATTENUATION, can be ignored otherwise)
diff --git a/EXAMPLES/global_PREM_kernels/traveltime/DATA/Par_file b/EXAMPLES/global_PREM_kernels/traveltime/DATA/Par_file
index 519fe7d..f30ff90 100644
--- a/EXAMPLES/global_PREM_kernels/traveltime/DATA/Par_file
+++ b/EXAMPLES/global_PREM_kernels/traveltime/DATA/Par_file
@@ -57,7 +57,6 @@ RECORD_LENGTH_IN_MINUTES = 30.0d0
# 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.
-ATTENUATION_1D_WITH_3D_STORAGE = .true.
PARTIAL_PHYS_DISPERSION_ONLY = .true.
UNDO_ATTENUATION = .false.
# How much memory (in GB) is installed on your machine per CPU core (only used for UNDO_ATTENUATION, can be ignored otherwise)
diff --git a/EXAMPLES/global_s362ani_shakemovie/DATA/Par_file b/EXAMPLES/global_s362ani_shakemovie/DATA/Par_file
index 10a864f..ea55f0f 100644
--- a/EXAMPLES/global_s362ani_shakemovie/DATA/Par_file
+++ b/EXAMPLES/global_s362ani_shakemovie/DATA/Par_file
@@ -57,7 +57,6 @@ RECORD_LENGTH_IN_MINUTES = 100.0d0
# 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.
-ATTENUATION_1D_WITH_3D_STORAGE = .true.
PARTIAL_PHYS_DISPERSION_ONLY = .true.
UNDO_ATTENUATION = .false.
# How much memory (in GB) is installed on your machine per CPU core (only used for UNDO_ATTENUATION, can be ignored otherwise)
diff --git a/EXAMPLES/noise_examples/global_long/Par_file_NOISE_1_attenuation b/EXAMPLES/noise_examples/global_long/Par_file_NOISE_1_attenuation
index c3b90dd..60996a9 100644
--- a/EXAMPLES/noise_examples/global_long/Par_file_NOISE_1_attenuation
+++ b/EXAMPLES/noise_examples/global_long/Par_file_NOISE_1_attenuation
@@ -57,7 +57,6 @@ RECORD_LENGTH_IN_MINUTES = 205.0d0
# 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.
-ATTENUATION_1D_WITH_3D_STORAGE = .true.
PARTIAL_PHYS_DISPERSION_ONLY = .true.
UNDO_ATTENUATION = .false.
# How much memory (in GB) is installed on your machine per CPU core (only used for UNDO_ATTENUATION, can be ignored otherwise)
diff --git a/EXAMPLES/noise_examples/global_long/Par_file_NOISE_1_noattenuation b/EXAMPLES/noise_examples/global_long/Par_file_NOISE_1_noattenuation
index 602f2d9..f43bbaa 100644
--- a/EXAMPLES/noise_examples/global_long/Par_file_NOISE_1_noattenuation
+++ b/EXAMPLES/noise_examples/global_long/Par_file_NOISE_1_noattenuation
@@ -57,7 +57,6 @@ RECORD_LENGTH_IN_MINUTES = 205.0d0
# 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.
-ATTENUATION_1D_WITH_3D_STORAGE = .true.
PARTIAL_PHYS_DISPERSION_ONLY = .false.
UNDO_ATTENUATION = .false.
# How much memory (in GB) is installed on your machine per CPU core (only used for UNDO_ATTENUATION, can be ignored otherwise)
diff --git a/EXAMPLES/noise_examples/global_long/Par_file_NOISE_2_attenuation b/EXAMPLES/noise_examples/global_long/Par_file_NOISE_2_attenuation
index 0a44c03..5571655 100644
--- a/EXAMPLES/noise_examples/global_long/Par_file_NOISE_2_attenuation
+++ b/EXAMPLES/noise_examples/global_long/Par_file_NOISE_2_attenuation
@@ -57,7 +57,6 @@ RECORD_LENGTH_IN_MINUTES = 205.0d0
# 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.
-ATTENUATION_1D_WITH_3D_STORAGE = .true.
PARTIAL_PHYS_DISPERSION_ONLY = .true.
UNDO_ATTENUATION = .false.
# How much memory (in GB) is installed on your machine per CPU core (only used for UNDO_ATTENUATION, can be ignored otherwise)
diff --git a/EXAMPLES/noise_examples/global_long/Par_file_NOISE_2_noattenuation b/EXAMPLES/noise_examples/global_long/Par_file_NOISE_2_noattenuation
index 8da3d34..2dbea9d 100644
--- a/EXAMPLES/noise_examples/global_long/Par_file_NOISE_2_noattenuation
+++ b/EXAMPLES/noise_examples/global_long/Par_file_NOISE_2_noattenuation
@@ -57,7 +57,6 @@ RECORD_LENGTH_IN_MINUTES = 205.0d0
# 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.
-ATTENUATION_1D_WITH_3D_STORAGE = .true.
PARTIAL_PHYS_DISPERSION_ONLY = .false.
UNDO_ATTENUATION = .false.
# How much memory (in GB) is installed on your machine per CPU core (only used for UNDO_ATTENUATION, can be ignored otherwise)
diff --git a/EXAMPLES/noise_examples/global_long/Par_file_NOISE_3_noattenuation b/EXAMPLES/noise_examples/global_long/Par_file_NOISE_3_noattenuation
index 1d23a83..67d8204 100644
--- a/EXAMPLES/noise_examples/global_long/Par_file_NOISE_3_noattenuation
+++ b/EXAMPLES/noise_examples/global_long/Par_file_NOISE_3_noattenuation
@@ -57,7 +57,6 @@ RECORD_LENGTH_IN_MINUTES = 205.0d0
# 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.
-ATTENUATION_1D_WITH_3D_STORAGE = .true.
PARTIAL_PHYS_DISPERSION_ONLY = .false.
UNDO_ATTENUATION = .false.
# How much memory (in GB) is installed on your machine per CPU core (only used for UNDO_ATTENUATION, can be ignored otherwise)
diff --git a/EXAMPLES/noise_examples/global_short/Par_file_NOISE_1_attenuation b/EXAMPLES/noise_examples/global_short/Par_file_NOISE_1_attenuation
index 024f2b5..b78fb9e 100644
--- a/EXAMPLES/noise_examples/global_short/Par_file_NOISE_1_attenuation
+++ b/EXAMPLES/noise_examples/global_short/Par_file_NOISE_1_attenuation
@@ -57,7 +57,6 @@ RECORD_LENGTH_IN_MINUTES = 50.0d0
# 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.
-ATTENUATION_1D_WITH_3D_STORAGE = .true.
PARTIAL_PHYS_DISPERSION_ONLY = .true.
UNDO_ATTENUATION = .false.
# How much memory (in GB) is installed on your machine per CPU core (only used for UNDO_ATTENUATION, can be ignored otherwise)
diff --git a/EXAMPLES/noise_examples/global_short/Par_file_NOISE_1_noattenuation b/EXAMPLES/noise_examples/global_short/Par_file_NOISE_1_noattenuation
index 3bba6bb..ac87fed 100644
--- a/EXAMPLES/noise_examples/global_short/Par_file_NOISE_1_noattenuation
+++ b/EXAMPLES/noise_examples/global_short/Par_file_NOISE_1_noattenuation
@@ -57,7 +57,6 @@ RECORD_LENGTH_IN_MINUTES = 50.0d0
# 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.
-ATTENUATION_1D_WITH_3D_STORAGE = .true.
PARTIAL_PHYS_DISPERSION_ONLY = .false.
UNDO_ATTENUATION = .false.
# How much memory (in GB) is installed on your machine per CPU core (only used for UNDO_ATTENUATION, can be ignored otherwise)
diff --git a/EXAMPLES/noise_examples/global_short/Par_file_NOISE_2_attenuation b/EXAMPLES/noise_examples/global_short/Par_file_NOISE_2_attenuation
index 5a87120..b95ce0d 100644
--- a/EXAMPLES/noise_examples/global_short/Par_file_NOISE_2_attenuation
+++ b/EXAMPLES/noise_examples/global_short/Par_file_NOISE_2_attenuation
@@ -57,7 +57,6 @@ RECORD_LENGTH_IN_MINUTES = 50.0d0
# 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.
-ATTENUATION_1D_WITH_3D_STORAGE = .true.
PARTIAL_PHYS_DISPERSION_ONLY = .true.
UNDO_ATTENUATION = .false.
# How much memory (in GB) is installed on your machine per CPU core (only used for UNDO_ATTENUATION, can be ignored otherwise)
diff --git a/EXAMPLES/noise_examples/global_short/Par_file_NOISE_2_noattenuation b/EXAMPLES/noise_examples/global_short/Par_file_NOISE_2_noattenuation
index e7be01e..86b212d 100644
--- a/EXAMPLES/noise_examples/global_short/Par_file_NOISE_2_noattenuation
+++ b/EXAMPLES/noise_examples/global_short/Par_file_NOISE_2_noattenuation
@@ -57,7 +57,6 @@ RECORD_LENGTH_IN_MINUTES = 50.0d0
# 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.
-ATTENUATION_1D_WITH_3D_STORAGE = .true.
PARTIAL_PHYS_DISPERSION_ONLY = .false.
UNDO_ATTENUATION = .false.
# How much memory (in GB) is installed on your machine per CPU core (only used for UNDO_ATTENUATION, can be ignored otherwise)
diff --git a/EXAMPLES/noise_examples/global_short/Par_file_NOISE_3_noattenuation b/EXAMPLES/noise_examples/global_short/Par_file_NOISE_3_noattenuation
index e893afa..e718c0d 100644
--- a/EXAMPLES/noise_examples/global_short/Par_file_NOISE_3_noattenuation
+++ b/EXAMPLES/noise_examples/global_short/Par_file_NOISE_3_noattenuation
@@ -57,7 +57,6 @@ RECORD_LENGTH_IN_MINUTES = 50.0d0
# 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.
-ATTENUATION_1D_WITH_3D_STORAGE = .true.
PARTIAL_PHYS_DISPERSION_ONLY = .false.
UNDO_ATTENUATION = .false.
# How much memory (in GB) is installed on your machine per CPU core (only used for UNDO_ATTENUATION, can be ignored otherwise)
diff --git a/EXAMPLES/noise_examples/regional/Par_file_NOISE_1_attenuation b/EXAMPLES/noise_examples/regional/Par_file_NOISE_1_attenuation
index 48f2c28..f94a38c 100644
--- a/EXAMPLES/noise_examples/regional/Par_file_NOISE_1_attenuation
+++ b/EXAMPLES/noise_examples/regional/Par_file_NOISE_1_attenuation
@@ -57,7 +57,6 @@ RECORD_LENGTH_IN_MINUTES = 50.0d0
# 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.
-ATTENUATION_1D_WITH_3D_STORAGE = .true.
PARTIAL_PHYS_DISPERSION_ONLY = .true.
UNDO_ATTENUATION = .false.
# How much memory (in GB) is installed on your machine per CPU core (only used for UNDO_ATTENUATION, can be ignored otherwise)
diff --git a/EXAMPLES/noise_examples/regional/Par_file_NOISE_1_noattenuation b/EXAMPLES/noise_examples/regional/Par_file_NOISE_1_noattenuation
index 1479123..6fe0a9d 100644
--- a/EXAMPLES/noise_examples/regional/Par_file_NOISE_1_noattenuation
+++ b/EXAMPLES/noise_examples/regional/Par_file_NOISE_1_noattenuation
@@ -57,7 +57,6 @@ RECORD_LENGTH_IN_MINUTES = 50.0d0
# 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.
-ATTENUATION_1D_WITH_3D_STORAGE = .true.
PARTIAL_PHYS_DISPERSION_ONLY = .false.
UNDO_ATTENUATION = .false.
# How much memory (in GB) is installed on your machine per CPU core (only used for UNDO_ATTENUATION, can be ignored otherwise)
diff --git a/EXAMPLES/noise_examples/regional/Par_file_NOISE_2_attenuation b/EXAMPLES/noise_examples/regional/Par_file_NOISE_2_attenuation
index c1c7c89..c2f07ae 100644
--- a/EXAMPLES/noise_examples/regional/Par_file_NOISE_2_attenuation
+++ b/EXAMPLES/noise_examples/regional/Par_file_NOISE_2_attenuation
@@ -57,7 +57,6 @@ RECORD_LENGTH_IN_MINUTES = 50.0d0
# 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.
-ATTENUATION_1D_WITH_3D_STORAGE = .true.
PARTIAL_PHYS_DISPERSION_ONLY = .true.
UNDO_ATTENUATION = .false.
# How much memory (in GB) is installed on your machine per CPU core (only used for UNDO_ATTENUATION, can be ignored otherwise)
diff --git a/EXAMPLES/noise_examples/regional/Par_file_NOISE_2_noattenuation b/EXAMPLES/noise_examples/regional/Par_file_NOISE_2_noattenuation
index 80fbfeb..71a07c5 100644
--- a/EXAMPLES/noise_examples/regional/Par_file_NOISE_2_noattenuation
+++ b/EXAMPLES/noise_examples/regional/Par_file_NOISE_2_noattenuation
@@ -57,7 +57,6 @@ RECORD_LENGTH_IN_MINUTES = 50.0d0
# 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.
-ATTENUATION_1D_WITH_3D_STORAGE = .true.
PARTIAL_PHYS_DISPERSION_ONLY = .false.
UNDO_ATTENUATION = .false.
# How much memory (in GB) is installed on your machine per CPU core (only used for UNDO_ATTENUATION, can be ignored otherwise)
diff --git a/EXAMPLES/noise_examples/regional/Par_file_NOISE_3_noattenuation b/EXAMPLES/noise_examples/regional/Par_file_NOISE_3_noattenuation
index 1601c5d..cc25c3f 100644
--- a/EXAMPLES/noise_examples/regional/Par_file_NOISE_3_noattenuation
+++ b/EXAMPLES/noise_examples/regional/Par_file_NOISE_3_noattenuation
@@ -57,7 +57,6 @@ RECORD_LENGTH_IN_MINUTES = 50.0d0
# 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.
-ATTENUATION_1D_WITH_3D_STORAGE = .true.
PARTIAL_PHYS_DISPERSION_ONLY = .false.
UNDO_ATTENUATION = .false.
# How much memory (in GB) is installed on your machine per CPU core (only used for UNDO_ATTENUATION, can be ignored otherwise)
diff --git a/EXAMPLES/regional_Greece_noise_small/DATA/Par_file b/EXAMPLES/regional_Greece_noise_small/DATA/Par_file
index 8935966..419c328 100644
--- a/EXAMPLES/regional_Greece_noise_small/DATA/Par_file
+++ b/EXAMPLES/regional_Greece_noise_small/DATA/Par_file
@@ -57,7 +57,6 @@ RECORD_LENGTH_IN_MINUTES = 0.3d0
# 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.
-ATTENUATION_1D_WITH_3D_STORAGE = .true.
PARTIAL_PHYS_DISPERSION_ONLY = .true.
UNDO_ATTENUATION = .false.
# How much memory (in GB) is installed on your machine per CPU core (only used for UNDO_ATTENUATION, can be ignored otherwise)
diff --git a/EXAMPLES/regional_Greece_small/DATA/Par_file b/EXAMPLES/regional_Greece_small/DATA/Par_file
index ed6519f..2e7883f 100644
--- a/EXAMPLES/regional_Greece_small/DATA/Par_file
+++ b/EXAMPLES/regional_Greece_small/DATA/Par_file
@@ -57,7 +57,6 @@ RECORD_LENGTH_IN_MINUTES = 2.5d0
# 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.
-ATTENUATION_1D_WITH_3D_STORAGE = .true.
PARTIAL_PHYS_DISPERSION_ONLY = .true.
UNDO_ATTENUATION = .false.
# How much memory (in GB) is installed on your machine per CPU core (only used for UNDO_ATTENUATION, can be ignored otherwise)
diff --git a/EXAMPLES/regional_MiddleEast/DATA/Par_file b/EXAMPLES/regional_MiddleEast/DATA/Par_file
index c1c4c95..a3656cc 100644
--- a/EXAMPLES/regional_MiddleEast/DATA/Par_file
+++ b/EXAMPLES/regional_MiddleEast/DATA/Par_file
@@ -57,7 +57,6 @@ RECORD_LENGTH_IN_MINUTES = 15.0d0
# 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.
-ATTENUATION_1D_WITH_3D_STORAGE = .true.
PARTIAL_PHYS_DISPERSION_ONLY = .true.
UNDO_ATTENUATION = .false.
# How much memory (in GB) is installed on your machine per CPU core (only used for UNDO_ATTENUATION, can be ignored otherwise)
diff --git a/EXAMPLES/small_benchmark_run_to_test_very_simple_Earth/Par_file b/EXAMPLES/small_benchmark_run_to_test_very_simple_Earth/Par_file
index bc5eea1..ec50b50 100644
--- a/EXAMPLES/small_benchmark_run_to_test_very_simple_Earth/Par_file
+++ b/EXAMPLES/small_benchmark_run_to_test_very_simple_Earth/Par_file
@@ -57,7 +57,6 @@ RECORD_LENGTH_IN_MINUTES = 35.0d0
# 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.
-ATTENUATION_1D_WITH_3D_STORAGE = .true.
PARTIAL_PHYS_DISPERSION_ONLY = .false.
UNDO_ATTENUATION = .false.
# How much memory (in GB) is installed on your machine per CPU core (only used for UNDO_ATTENUATION, can be ignored otherwise)
diff --git a/m4 b/m4
index b58c6fb..09ca47b 160000
--- a/m4
+++ b/m4
@@ -1 +1 @@
-Subproject commit b58c6fb1cdfc650eeca28274913dc239888a09d4
+Subproject commit 09ca47be4e87a6133563b7e8e32974a6da7c5d58
diff --git a/setup/constants.h.in b/setup/constants.h.in
index b88fd5a..d178771 100644
--- a/setup/constants.h.in
+++ b/setup/constants.h.in
@@ -265,6 +265,17 @@
!!-----------------------------------------------------------
!!
+!! for attenuation
+!!
+!!-----------------------------------------------------------
+
+! in the case of 1D attenuation models, use NGLL^3 storage of the attenuation constants in each GLL spectral element anyway
+! (always safe to leave that to true; in the case of 1D attenuation models, setting it to false can save some memory storage)
+ logical, parameter :: ATTENUATION_1D_WITH_3D_STORAGE = .true.
+
+
+!!-----------------------------------------------------------
+!!
!! mesh optimization
!!
!!-----------------------------------------------------------
@@ -375,37 +386,10 @@
!!-----------------------------------------------------------
!!
-!! debugging flags
-!!
-!!-----------------------------------------------------------
-
-! flags to actually assemble with MPI or not
-! and to actually match fluid and solid regions of the Earth or not
-! should always be set to true except when debugging code
- logical, parameter :: ACTUALLY_ASSEMBLE_MPI_SLICES = .true.
- logical, parameter :: ACTUALLY_ASSEMBLE_MPI_CHUNKS = .true.
- logical, parameter :: ACTUALLY_COUPLE_FLUID_CMB = .true.
- logical, parameter :: ACTUALLY_COUPLE_FLUID_ICB = .true.
-
-! flag to turn off the conversion of geographic to geocentric coordinates for
-! the seismic source and the stations; i.e. assume a perfect sphere, which
-! can be useful for benchmarks of a spherical Earth with fictitious sources and stations
- logical, parameter :: ASSUME_PERFECT_SPHERE = .false.
-
-! flags to do benchmark runs to measure scaling of the code
-! for a limited number of time steps only, setting the initial field to 1
-! to make sure gradual underflow trapping does not slow down the code
- logical, parameter :: DO_BENCHMARK_RUN_ONLY = .false.
- integer, parameter :: NSTEP_FOR_BENCHMARK = 300
- logical, parameter :: SET_INITIAL_FIELD_TO_1_IN_BENCH = .true.
-
-!!-----------------------------------------------------------
-!!
!! for Roland_Sylvain integrals
!!
!!-----------------------------------------------------------
-!! DK DK for Roland_Sylvain
logical, parameter :: ROLAND_SYLVAIN = .false.
! reuse an existing observation surface created in another run and stored to disk,
@@ -457,6 +441,34 @@
! for the FORCE_VECTORIZATION 1D version of some loops
integer, parameter :: NTOTAL_OBSERVATION = NX_OBSERVATION * NY_OBSERVATION * NCHUNKS_MAX
+
+!!-----------------------------------------------------------
+!!
+!! debugging flags
+!!
+!!-----------------------------------------------------------
+
+! flags to actually assemble with MPI or not
+! and to actually match fluid and solid regions of the Earth or not
+! should always be set to true except when debugging code
+ logical, parameter :: ACTUALLY_ASSEMBLE_MPI_SLICES = .true.
+ logical, parameter :: ACTUALLY_ASSEMBLE_MPI_CHUNKS = .true.
+ logical, parameter :: ACTUALLY_COUPLE_FLUID_CMB = .true.
+ logical, parameter :: ACTUALLY_COUPLE_FLUID_ICB = .true.
+
+! flag to turn off the conversion of geographic to geocentric coordinates for
+! the seismic source and the stations; i.e. assume a perfect sphere, which
+! can be useful for benchmarks of a spherical Earth with fictitious sources and stations
+ logical, parameter :: ASSUME_PERFECT_SPHERE = .false.
+
+! flags to do benchmark runs to measure scaling of the code
+! for a limited number of time steps only, setting the initial field to 1
+! to make sure gradual underflow trapping does not slow down the code
+ logical, parameter :: DO_BENCHMARK_RUN_ONLY = .false.
+ integer, parameter :: NSTEP_FOR_BENCHMARK = 300
+ logical, parameter :: SET_INITIAL_FIELD_TO_1_IN_BENCH = .true.
+
+
!------------------------------------------------------
!----------- do not modify anything below -------------
!------------------------------------------------------
diff --git a/src/meshfem3D/meshfem3D_par.f90 b/src/meshfem3D/meshfem3D_par.f90
index 871af3d..0f10edf 100644
--- a/src/meshfem3D/meshfem3D_par.f90
+++ b/src/meshfem3D/meshfem3D_par.f90
@@ -43,8 +43,7 @@
use shared_input_parameters,only: &
ELLIPTICITY,GRAVITY,ROTATION,TOPOGRAPHY,OCEANS, &
- ATTENUATION,ATTENUATION_1D_WITH_3D_STORAGE, &
- USE_FULL_TISO_MANTLE
+ ATTENUATION,USE_FULL_TISO_MANTLE
use shared_compute_parameters, only: &
REFERENCE_1D_MODEL,THREE_D_MODEL, &
diff --git a/src/shared/broadcast_computed_parameters.f90 b/src/shared/broadcast_computed_parameters.f90
index da54635..ddd3ffc 100644
--- a/src/shared/broadcast_computed_parameters.f90
+++ b/src/shared/broadcast_computed_parameters.f90
@@ -39,7 +39,7 @@
integer, parameter :: nparam_i = 44
integer, dimension(nparam_i) :: bcast_integer
- integer, parameter :: nparam_l = 57
+ integer, parameter :: nparam_l = 56
logical, dimension(nparam_l) :: bcast_logical
integer, parameter :: nparam_dp = 34
@@ -94,7 +94,7 @@
USE_LDDRK,INCREASE_CFL_FOR_LDDRK, &
ANISOTROPIC_KL,SAVE_TRANSVERSE_KL_ONLY,APPROXIMATE_HESS_KL, &
USE_FULL_TISO_MANTLE,SAVE_SOURCE_MASK, &
- EXACT_MASS_MATRIX_FOR_ROTATION,ATTENUATION_1D_WITH_3D_STORAGE, &
+ EXACT_MASS_MATRIX_FOR_ROTATION, &
GPU_MODE, &
ADIOS_ENABLED,ADIOS_FOR_FORWARD_ARRAYS, &
ADIOS_FOR_MPI_ARRAYS,ADIOS_FOR_ARRAYS_SOLVER, &
@@ -255,16 +255,15 @@
USE_FULL_TISO_MANTLE = bcast_logical(45)
SAVE_SOURCE_MASK = bcast_logical(46)
EXACT_MASS_MATRIX_FOR_ROTATION = bcast_logical(47)
- ATTENUATION_1D_WITH_3D_STORAGE = bcast_logical(48)
- GPU_MODE = bcast_logical(49)
- ADIOS_ENABLED = bcast_logical(50)
- ADIOS_FOR_FORWARD_ARRAYS = bcast_logical(51)
- ADIOS_FOR_MPI_ARRAYS = bcast_logical(52)
- ADIOS_FOR_ARRAYS_SOLVER = bcast_logical(53)
- ADIOS_FOR_SOLVER_MESHFILES = bcast_logical(54)
- ADIOS_FOR_AVS_DX = bcast_logical(55)
- ADIOS_FOR_KERNELS = bcast_logical(56)
- ADIOS_FOR_MODELS = bcast_logical(57)
+ GPU_MODE = bcast_logical(48)
+ ADIOS_ENABLED = bcast_logical(49)
+ ADIOS_FOR_FORWARD_ARRAYS = bcast_logical(50)
+ ADIOS_FOR_MPI_ARRAYS = bcast_logical(51)
+ ADIOS_FOR_ARRAYS_SOLVER = bcast_logical(52)
+ ADIOS_FOR_SOLVER_MESHFILES = bcast_logical(53)
+ ADIOS_FOR_AVS_DX = bcast_logical(54)
+ ADIOS_FOR_KERNELS = bcast_logical(55)
+ ADIOS_FOR_MODELS = bcast_logical(56)
! double precisions
DT = bcast_double_precision(1)
diff --git a/src/shared/read_compute_parameters.f90 b/src/shared/read_compute_parameters.f90
index 624f044..1ad5e16 100644
--- a/src/shared/read_compute_parameters.f90
+++ b/src/shared/read_compute_parameters.f90
@@ -32,8 +32,7 @@
SUPPRESS_CRUSTAL_MESH,ADD_4TH_DOUBLING, &
DO_BENCHMARK_RUN_ONLY,NSTEP_FOR_BENCHMARK, &
IREGION_CRUST_MANTLE,IREGION_INNER_CORE, &
- NGLLX,NGLLY,NGLLZ
-
+ NGLLX,NGLLY,NGLLZ,ATTENUATION_1D_WITH_3D_STORAGE
use shared_parameters
diff --git a/src/shared/read_parameter_file.f90 b/src/shared/read_parameter_file.f90
index ee27e54..e5ba376 100644
--- a/src/shared/read_parameter_file.f90
+++ b/src/shared/read_parameter_file.f90
@@ -115,8 +115,6 @@
if (ierr /= 0) stop 'an error occurred while reading the parameter file: RECORD_LENGTH_IN_MINUTES'
! attenuation parameters
- call read_value_logical(ATTENUATION_1D_WITH_3D_STORAGE, 'ATTENUATION_1D_WITH_3D_STORAGE', ierr)
- if (ierr /= 0) stop 'an error occurred while reading the parameter file: ATTENUATION_1D_WITH_3D_STORAGE'
call read_value_logical(PARTIAL_PHYS_DISPERSION_ONLY, '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, 'UNDO_ATTENUATION', ierr)
@@ -267,10 +265,8 @@
print*
print*,'**************'
print*,'using globe version 5.1.5 compatible simulation parameters'
- if( .not. ATTENUATION_1D_WITH_3D_STORAGE ) then
- print*,'setting ATTENUATION_1D_WITH_3D_STORAGE to .true. for compatibility with globe version 5.1.5 '
- ATTENUATION_1D_WITH_3D_STORAGE = .true.
- endif
+ if( .not. ATTENUATION_1D_WITH_3D_STORAGE ) &
+ stop 'ATTENUATION_1D_WITH_3D_STORAGE should be set to .true. for compatibility with globe version 5.1.5 '
if( UNDO_ATTENUATION ) then
print*,'setting UNDO_ATTENUATION to .false. for compatibility with globe version 5.1.5 '
UNDO_ATTENUATION = .false.
diff --git a/src/shared/shared_par.f90 b/src/shared/shared_par.f90
index 3ca7e36..390b986 100644
--- a/src/shared/shared_par.f90
+++ b/src/shared/shared_par.f90
@@ -82,7 +82,7 @@
character(len=150) :: OUTPUT_FILES,LOCAL_PATH,LOCAL_TMP_PATH,MODEL
! attenuation parameters
- logical :: UNDO_ATTENUATION,PARTIAL_PHYS_DISPERSION_ONLY,ATTENUATION_1D_WITH_3D_STORAGE
+ logical :: UNDO_ATTENUATION,PARTIAL_PHYS_DISPERSION_ONLY
! exact (full) undoing of attenuation
! How much memory (in GB) is installed on the machine per CPU core (or per GPU card or per INTEL MIC Phi board)
More information about the CIG-COMMITS
mailing list