diff --git a/EXAMPLES/BENCHMARK_CLAERBOUT_ADJOINT/ACOUSTIC/DATA/Par_file b/EXAMPLES/BENCHMARK_CLAERBOUT_ADJOINT/ACOUSTIC/DATA/Par_file index 3c38b7093..ff3b2a58c 100644 --- a/EXAMPLES/BENCHMARK_CLAERBOUT_ADJOINT/ACOUSTIC/DATA/Par_file +++ b/EXAMPLES/BENCHMARK_CLAERBOUT_ADJOINT/ACOUSTIC/DATA/Par_file @@ -234,8 +234,8 @@ SU_FORMAT = .true. # output seismograms in ASDF (requires asdf-library) ASDF_FORMAT = .false. -# decide if master process writes all the seismograms or if all processes do it in parallel -WRITE_SEISMOGRAMS_BY_MASTER = .false. +# decide if main process writes all the seismograms or if all processes do it in parallel +WRITE_SEISMOGRAMS_BY_MAIN = .false. # save all seismograms in one large combined file instead of one file per seismogram # to avoid overloading shared non-local file systems such as LUSTRE or GPFS for instance diff --git a/EXAMPLES/BENCHMARK_CLAERBOUT_ADJOINT/ELASTIC/DATA/Par_file b/EXAMPLES/BENCHMARK_CLAERBOUT_ADJOINT/ELASTIC/DATA/Par_file index e2620674b..487e10ff7 100644 --- a/EXAMPLES/BENCHMARK_CLAERBOUT_ADJOINT/ELASTIC/DATA/Par_file +++ b/EXAMPLES/BENCHMARK_CLAERBOUT_ADJOINT/ELASTIC/DATA/Par_file @@ -234,8 +234,8 @@ SU_FORMAT = .true. # output seismograms in ASDF (requires asdf-library) ASDF_FORMAT = .false. -# decide if master process writes all the seismograms or if all processes do it in parallel -WRITE_SEISMOGRAMS_BY_MASTER = .false. +# decide if main process writes all the seismograms or if all processes do it in parallel +WRITE_SEISMOGRAMS_BY_MAIN = .false. # save all seismograms in one large combined file instead of one file per seismogram # to avoid overloading shared non-local file systems such as LUSTRE or GPFS for instance diff --git a/EXAMPLES/CPML_examples/homogeneous_halfspace_HEX8_acoustic_absorbing_CPML_5sides/DATA/Par_file b/EXAMPLES/CPML_examples/homogeneous_halfspace_HEX8_acoustic_absorbing_CPML_5sides/DATA/Par_file index 13295899b..0b00377e4 100644 --- a/EXAMPLES/CPML_examples/homogeneous_halfspace_HEX8_acoustic_absorbing_CPML_5sides/DATA/Par_file +++ b/EXAMPLES/CPML_examples/homogeneous_halfspace_HEX8_acoustic_absorbing_CPML_5sides/DATA/Par_file @@ -234,8 +234,8 @@ SU_FORMAT = .false. # output seismograms in ASDF (requires asdf-library) ASDF_FORMAT = .false. -# decide if master process writes all the seismograms or if all processes do it in parallel -WRITE_SEISMOGRAMS_BY_MASTER = .false. +# decide if main process writes all the seismograms or if all processes do it in parallel +WRITE_SEISMOGRAMS_BY_MAIN = .false. # save all seismograms in one large combined file instead of one file per seismogram # to avoid overloading shared non-local file systems such as LUSTRE or GPFS for instance diff --git a/EXAMPLES/CPML_examples/homogeneous_halfspace_HEX8_acoustic_absorbing_CPML_6sides/DATA/Par_file b/EXAMPLES/CPML_examples/homogeneous_halfspace_HEX8_acoustic_absorbing_CPML_6sides/DATA/Par_file index bcae66125..a6da84a00 100644 --- a/EXAMPLES/CPML_examples/homogeneous_halfspace_HEX8_acoustic_absorbing_CPML_6sides/DATA/Par_file +++ b/EXAMPLES/CPML_examples/homogeneous_halfspace_HEX8_acoustic_absorbing_CPML_6sides/DATA/Par_file @@ -234,8 +234,8 @@ SU_FORMAT = .false. # output seismograms in ASDF (requires asdf-library) ASDF_FORMAT = .false. -# decide if master process writes all the seismograms or if all processes do it in parallel -WRITE_SEISMOGRAMS_BY_MASTER = .false. +# decide if main process writes all the seismograms or if all processes do it in parallel +WRITE_SEISMOGRAMS_BY_MAIN = .false. # save all seismograms in one large combined file instead of one file per seismogram # to avoid overloading shared non-local file systems such as LUSTRE or GPFS for instance diff --git a/EXAMPLES/CPML_examples/homogeneous_halfspace_HEX8_acoustic_elastic_absorbing_CPML_5sides/DATA/Par_file b/EXAMPLES/CPML_examples/homogeneous_halfspace_HEX8_acoustic_elastic_absorbing_CPML_5sides/DATA/Par_file index 6840b50b8..22c8d13fb 100644 --- a/EXAMPLES/CPML_examples/homogeneous_halfspace_HEX8_acoustic_elastic_absorbing_CPML_5sides/DATA/Par_file +++ b/EXAMPLES/CPML_examples/homogeneous_halfspace_HEX8_acoustic_elastic_absorbing_CPML_5sides/DATA/Par_file @@ -234,8 +234,8 @@ SU_FORMAT = .false. # output seismograms in ASDF (requires asdf-library) ASDF_FORMAT = .false. -# decide if master process writes all the seismograms or if all processes do it in parallel -WRITE_SEISMOGRAMS_BY_MASTER = .false. +# decide if main process writes all the seismograms or if all processes do it in parallel +WRITE_SEISMOGRAMS_BY_MAIN = .false. # save all seismograms in one large combined file instead of one file per seismogram # to avoid overloading shared non-local file systems such as LUSTRE or GPFS for instance diff --git a/EXAMPLES/CPML_examples/homogeneous_halfspace_HEX8_acoustic_elastic_absorbing_CPML_6sides/DATA/Par_file b/EXAMPLES/CPML_examples/homogeneous_halfspace_HEX8_acoustic_elastic_absorbing_CPML_6sides/DATA/Par_file index bcae66125..a6da84a00 100644 --- a/EXAMPLES/CPML_examples/homogeneous_halfspace_HEX8_acoustic_elastic_absorbing_CPML_6sides/DATA/Par_file +++ b/EXAMPLES/CPML_examples/homogeneous_halfspace_HEX8_acoustic_elastic_absorbing_CPML_6sides/DATA/Par_file @@ -234,8 +234,8 @@ SU_FORMAT = .false. # output seismograms in ASDF (requires asdf-library) ASDF_FORMAT = .false. -# decide if master process writes all the seismograms or if all processes do it in parallel -WRITE_SEISMOGRAMS_BY_MASTER = .false. +# decide if main process writes all the seismograms or if all processes do it in parallel +WRITE_SEISMOGRAMS_BY_MAIN = .false. # save all seismograms in one large combined file instead of one file per seismogram # to avoid overloading shared non-local file systems such as LUSTRE or GPFS for instance diff --git a/EXAMPLES/CPML_examples/homogeneous_halfspace_HEX8_elastic_absorbing_CPML_5sides/DATA/Par_file b/EXAMPLES/CPML_examples/homogeneous_halfspace_HEX8_elastic_absorbing_CPML_5sides/DATA/Par_file index 6840b50b8..22c8d13fb 100644 --- a/EXAMPLES/CPML_examples/homogeneous_halfspace_HEX8_elastic_absorbing_CPML_5sides/DATA/Par_file +++ b/EXAMPLES/CPML_examples/homogeneous_halfspace_HEX8_elastic_absorbing_CPML_5sides/DATA/Par_file @@ -234,8 +234,8 @@ SU_FORMAT = .false. # output seismograms in ASDF (requires asdf-library) ASDF_FORMAT = .false. -# decide if master process writes all the seismograms or if all processes do it in parallel -WRITE_SEISMOGRAMS_BY_MASTER = .false. +# decide if main process writes all the seismograms or if all processes do it in parallel +WRITE_SEISMOGRAMS_BY_MAIN = .false. # save all seismograms in one large combined file instead of one file per seismogram # to avoid overloading shared non-local file systems such as LUSTRE or GPFS for instance diff --git a/EXAMPLES/CPML_examples/homogeneous_halfspace_HEX8_elastic_absorbing_CPML_6sides/DATA/Par_file b/EXAMPLES/CPML_examples/homogeneous_halfspace_HEX8_elastic_absorbing_CPML_6sides/DATA/Par_file index bcae66125..a6da84a00 100644 --- a/EXAMPLES/CPML_examples/homogeneous_halfspace_HEX8_elastic_absorbing_CPML_6sides/DATA/Par_file +++ b/EXAMPLES/CPML_examples/homogeneous_halfspace_HEX8_elastic_absorbing_CPML_6sides/DATA/Par_file @@ -234,8 +234,8 @@ SU_FORMAT = .false. # output seismograms in ASDF (requires asdf-library) ASDF_FORMAT = .false. -# decide if master process writes all the seismograms or if all processes do it in parallel -WRITE_SEISMOGRAMS_BY_MASTER = .false. +# decide if main process writes all the seismograms or if all processes do it in parallel +WRITE_SEISMOGRAMS_BY_MAIN = .false. # save all seismograms in one large combined file instead of one file per seismogram # to avoid overloading shared non-local file systems such as LUSTRE or GPFS for instance diff --git a/EXAMPLES/Gmsh_simple_box_hex27/DATA/Par_file b/EXAMPLES/Gmsh_simple_box_hex27/DATA/Par_file index 183fd19c9..7d0e3e635 100644 --- a/EXAMPLES/Gmsh_simple_box_hex27/DATA/Par_file +++ b/EXAMPLES/Gmsh_simple_box_hex27/DATA/Par_file @@ -234,8 +234,8 @@ SU_FORMAT = .false. # output seismograms in ASDF (requires asdf-library) ASDF_FORMAT = .false. -# decide if master process writes all the seismograms or if all processes do it in parallel -WRITE_SEISMOGRAMS_BY_MASTER = .false. +# decide if main process writes all the seismograms or if all processes do it in parallel +WRITE_SEISMOGRAMS_BY_MAIN = .false. # save all seismograms in one large combined file instead of one file per seismogram # to avoid overloading shared non-local file systems such as LUSTRE or GPFS for instance diff --git a/EXAMPLES/Gmsh_simple_lddrk/DATA/Par_file b/EXAMPLES/Gmsh_simple_lddrk/DATA/Par_file index 43418d2d1..cb9ba24ec 100644 --- a/EXAMPLES/Gmsh_simple_lddrk/DATA/Par_file +++ b/EXAMPLES/Gmsh_simple_lddrk/DATA/Par_file @@ -234,8 +234,8 @@ SU_FORMAT = .false. # output seismograms in ASDF (requires asdf-library) ASDF_FORMAT = .false. -# decide if master process writes all the seismograms or if all processes do it in parallel -WRITE_SEISMOGRAMS_BY_MASTER = .false. +# decide if main process writes all the seismograms or if all processes do it in parallel +WRITE_SEISMOGRAMS_BY_MAIN = .false. # save all seismograms in one large combined file instead of one file per seismogram # to avoid overloading shared non-local file systems such as LUSTRE or GPFS for instance diff --git a/EXAMPLES/LTS_homogeneous_halfspace_HEX8/DATA/Par_file b/EXAMPLES/LTS_homogeneous_halfspace_HEX8/DATA/Par_file index 5e7331af4..33488a1d2 100644 --- a/EXAMPLES/LTS_homogeneous_halfspace_HEX8/DATA/Par_file +++ b/EXAMPLES/LTS_homogeneous_halfspace_HEX8/DATA/Par_file @@ -234,8 +234,8 @@ SU_FORMAT = .false. # output seismograms in ASDF (requires asdf-library) ASDF_FORMAT = .false. -# decide if master process writes all the seismograms or if all processes do it in parallel -WRITE_SEISMOGRAMS_BY_MASTER = .false. +# decide if main process writes all the seismograms or if all processes do it in parallel +WRITE_SEISMOGRAMS_BY_MAIN = .false. # save all seismograms in one large combined file instead of one file per seismogram # to avoid overloading shared non-local file systems such as LUSTRE or GPFS for instance diff --git a/EXAMPLES/Mount_StHelens/DATA/Par_file b/EXAMPLES/Mount_StHelens/DATA/Par_file index 483d65c44..679bb0df3 100644 --- a/EXAMPLES/Mount_StHelens/DATA/Par_file +++ b/EXAMPLES/Mount_StHelens/DATA/Par_file @@ -234,8 +234,8 @@ SU_FORMAT = .false. # output seismograms in ASDF (requires asdf-library) ASDF_FORMAT = .false. -# decide if master process writes all the seismograms or if all processes do it in parallel -WRITE_SEISMOGRAMS_BY_MASTER = .false. +# decide if main process writes all the seismograms or if all processes do it in parallel +WRITE_SEISMOGRAMS_BY_MAIN = .false. # save all seismograms in one large combined file instead of one file per seismogram # to avoid overloading shared non-local file systems such as LUSTRE or GPFS for instance diff --git a/EXAMPLES/attenuation/viscoelastic/DATA/Par_file b/EXAMPLES/attenuation/viscoelastic/DATA/Par_file index 4263d31f7..668a7beaf 100644 --- a/EXAMPLES/attenuation/viscoelastic/DATA/Par_file +++ b/EXAMPLES/attenuation/viscoelastic/DATA/Par_file @@ -234,8 +234,8 @@ SU_FORMAT = .false. # output seismograms in ASDF (requires asdf-library) ASDF_FORMAT = .false. -# decide if master process writes all the seismograms or if all processes do it in parallel -WRITE_SEISMOGRAMS_BY_MASTER = .false. +# decide if main process writes all the seismograms or if all processes do it in parallel +WRITE_SEISMOGRAMS_BY_MAIN = .false. # save all seismograms in one large combined file instead of one file per seismogram # to avoid overloading shared non-local file systems such as LUSTRE or GPFS for instance diff --git a/EXAMPLES/check_absolute_amplitude_of_force_source_seismograms/DATA/Par_file b/EXAMPLES/check_absolute_amplitude_of_force_source_seismograms/DATA/Par_file index b1e0d5089..de21e2660 100644 --- a/EXAMPLES/check_absolute_amplitude_of_force_source_seismograms/DATA/Par_file +++ b/EXAMPLES/check_absolute_amplitude_of_force_source_seismograms/DATA/Par_file @@ -234,8 +234,8 @@ SU_FORMAT = .false. # output seismograms in ASDF (requires asdf-library) ASDF_FORMAT = .false. -# decide if master process writes all the seismograms or if all processes do it in parallel -WRITE_SEISMOGRAMS_BY_MASTER = .false. +# decide if main process writes all the seismograms or if all processes do it in parallel +WRITE_SEISMOGRAMS_BY_MAIN = .false. # save all seismograms in one large combined file instead of one file per seismogram # to avoid overloading shared non-local file systems such as LUSTRE or GPFS for instance diff --git a/EXAMPLES/coffee_mug_with_fluid_inside/DATA/Par_file b/EXAMPLES/coffee_mug_with_fluid_inside/DATA/Par_file index 5b4d6dd9c..5fc62b3a2 100644 --- a/EXAMPLES/coffee_mug_with_fluid_inside/DATA/Par_file +++ b/EXAMPLES/coffee_mug_with_fluid_inside/DATA/Par_file @@ -234,8 +234,8 @@ SU_FORMAT = .false. # output seismograms in ASDF (requires asdf-library) ASDF_FORMAT = .false. -# decide if master process writes all the seismograms or if all processes do it in parallel -WRITE_SEISMOGRAMS_BY_MASTER = .false. +# decide if main process writes all the seismograms or if all processes do it in parallel +WRITE_SEISMOGRAMS_BY_MAIN = .false. # save all seismograms in one large combined file instead of one file per seismogram # to avoid overloading shared non-local file systems such as LUSTRE or GPFS for instance diff --git a/EXAMPLES/decompose_mesh_MPI/DATA/Par_file b/EXAMPLES/decompose_mesh_MPI/DATA/Par_file index 67e6d1e0d..0a9603cab 100644 --- a/EXAMPLES/decompose_mesh_MPI/DATA/Par_file +++ b/EXAMPLES/decompose_mesh_MPI/DATA/Par_file @@ -234,8 +234,8 @@ SU_FORMAT = .false. # output seismograms in ASDF (requires asdf-library) ASDF_FORMAT = .false. -# decide if master process writes all the seismograms or if all processes do it in parallel -WRITE_SEISMOGRAMS_BY_MASTER = .false. +# decide if main process writes all the seismograms or if all processes do it in parallel +WRITE_SEISMOGRAMS_BY_MAIN = .false. # save all seismograms in one large combined file instead of one file per seismogram # to avoid overloading shared non-local file systems such as LUSTRE or GPFS for instance diff --git a/EXAMPLES/fault_examples/splay_faults/DATA/Par_file b/EXAMPLES/fault_examples/splay_faults/DATA/Par_file index 8953de19d..1ef99e349 100644 --- a/EXAMPLES/fault_examples/splay_faults/DATA/Par_file +++ b/EXAMPLES/fault_examples/splay_faults/DATA/Par_file @@ -234,8 +234,8 @@ SU_FORMAT = .false. # output seismograms in ASDF (requires asdf-library) ASDF_FORMAT = .false. -# decide if master process writes all the seismograms or if all processes do it in parallel -WRITE_SEISMOGRAMS_BY_MASTER = .false. +# decide if main process writes all the seismograms or if all processes do it in parallel +WRITE_SEISMOGRAMS_BY_MAIN = .false. # save all seismograms in one large combined file instead of one file per seismogram # to avoid overloading shared non-local file systems such as LUSTRE or GPFS for instance diff --git a/EXAMPLES/fault_examples/tpv102/DATA/Par_file b/EXAMPLES/fault_examples/tpv102/DATA/Par_file index 45170ed20..758c9cca8 100644 --- a/EXAMPLES/fault_examples/tpv102/DATA/Par_file +++ b/EXAMPLES/fault_examples/tpv102/DATA/Par_file @@ -234,8 +234,8 @@ SU_FORMAT = .false. # output seismograms in ASDF (requires asdf-library) ASDF_FORMAT = .false. -# decide if master process writes all the seismograms or if all processes do it in parallel -WRITE_SEISMOGRAMS_BY_MASTER = .false. +# decide if main process writes all the seismograms or if all processes do it in parallel +WRITE_SEISMOGRAMS_BY_MAIN = .false. # save all seismograms in one large combined file instead of one file per seismogram # to avoid overloading shared non-local file systems such as LUSTRE or GPFS for instance diff --git a/EXAMPLES/fault_examples/tpv103/DATA/Par_file b/EXAMPLES/fault_examples/tpv103/DATA/Par_file index 45170ed20..758c9cca8 100644 --- a/EXAMPLES/fault_examples/tpv103/DATA/Par_file +++ b/EXAMPLES/fault_examples/tpv103/DATA/Par_file @@ -234,8 +234,8 @@ SU_FORMAT = .false. # output seismograms in ASDF (requires asdf-library) ASDF_FORMAT = .false. -# decide if master process writes all the seismograms or if all processes do it in parallel -WRITE_SEISMOGRAMS_BY_MASTER = .false. +# decide if main process writes all the seismograms or if all processes do it in parallel +WRITE_SEISMOGRAMS_BY_MAIN = .false. # save all seismograms in one large combined file instead of one file per seismogram # to avoid overloading shared non-local file systems such as LUSTRE or GPFS for instance diff --git a/EXAMPLES/fault_examples/tpv15/DATA/Par_file b/EXAMPLES/fault_examples/tpv15/DATA/Par_file index 5b6003d5a..8e643dc93 100644 --- a/EXAMPLES/fault_examples/tpv15/DATA/Par_file +++ b/EXAMPLES/fault_examples/tpv15/DATA/Par_file @@ -234,8 +234,8 @@ SU_FORMAT = .false. # output seismograms in ASDF (requires asdf-library) ASDF_FORMAT = .false. -# decide if master process writes all the seismograms or if all processes do it in parallel -WRITE_SEISMOGRAMS_BY_MASTER = .false. +# decide if main process writes all the seismograms or if all processes do it in parallel +WRITE_SEISMOGRAMS_BY_MAIN = .false. # save all seismograms in one large combined file instead of one file per seismogram # to avoid overloading shared non-local file systems such as LUSTRE or GPFS for instance diff --git a/EXAMPLES/fault_examples/tpv16/DATA/Par_file b/EXAMPLES/fault_examples/tpv16/DATA/Par_file index ddceb0d1f..72afc5216 100644 --- a/EXAMPLES/fault_examples/tpv16/DATA/Par_file +++ b/EXAMPLES/fault_examples/tpv16/DATA/Par_file @@ -234,8 +234,8 @@ SU_FORMAT = .false. # output seismograms in ASDF (requires asdf-library) ASDF_FORMAT = .false. -# decide if master process writes all the seismograms or if all processes do it in parallel -WRITE_SEISMOGRAMS_BY_MASTER = .false. +# decide if main process writes all the seismograms or if all processes do it in parallel +WRITE_SEISMOGRAMS_BY_MAIN = .false. # save all seismograms in one large combined file instead of one file per seismogram # to avoid overloading shared non-local file systems such as LUSTRE or GPFS for instance diff --git a/EXAMPLES/fault_examples/tpv5/DATA/Par_file b/EXAMPLES/fault_examples/tpv5/DATA/Par_file index 9e8d0632b..ef5ce0a6c 100644 --- a/EXAMPLES/fault_examples/tpv5/DATA/Par_file +++ b/EXAMPLES/fault_examples/tpv5/DATA/Par_file @@ -234,8 +234,8 @@ SU_FORMAT = .false. # output seismograms in ASDF (requires asdf-library) ASDF_FORMAT = .false. -# decide if master process writes all the seismograms or if all processes do it in parallel -WRITE_SEISMOGRAMS_BY_MASTER = .false. +# decide if main process writes all the seismograms or if all processes do it in parallel +WRITE_SEISMOGRAMS_BY_MAIN = .false. # save all seismograms in one large combined file instead of one file per seismogram # to avoid overloading shared non-local file systems such as LUSTRE or GPFS for instance diff --git a/EXAMPLES/homogeneous_acoustic/DATA/Par_file b/EXAMPLES/homogeneous_acoustic/DATA/Par_file index bb7f7ecb6..a3704676d 100644 --- a/EXAMPLES/homogeneous_acoustic/DATA/Par_file +++ b/EXAMPLES/homogeneous_acoustic/DATA/Par_file @@ -234,8 +234,8 @@ SU_FORMAT = .false. # output seismograms in ASDF (requires asdf-library) ASDF_FORMAT = .false. -# decide if master process writes all the seismograms or if all processes do it in parallel -WRITE_SEISMOGRAMS_BY_MASTER = .false. +# decide if main process writes all the seismograms or if all processes do it in parallel +WRITE_SEISMOGRAMS_BY_MAIN = .false. # save all seismograms in one large combined file instead of one file per seismogram # to avoid overloading shared non-local file systems such as LUSTRE or GPFS for instance diff --git a/EXAMPLES/homogeneous_halfspace_HEX27_elastic_no_absorbing/DATA/Par_file b/EXAMPLES/homogeneous_halfspace_HEX27_elastic_no_absorbing/DATA/Par_file index d268066c4..03e6681c1 100644 --- a/EXAMPLES/homogeneous_halfspace_HEX27_elastic_no_absorbing/DATA/Par_file +++ b/EXAMPLES/homogeneous_halfspace_HEX27_elastic_no_absorbing/DATA/Par_file @@ -234,8 +234,8 @@ SU_FORMAT = .false. # output seismograms in ASDF (requires asdf-library) ASDF_FORMAT = .false. -# decide if master process writes all the seismograms or if all processes do it in parallel -WRITE_SEISMOGRAMS_BY_MASTER = .false. +# decide if main process writes all the seismograms or if all processes do it in parallel +WRITE_SEISMOGRAMS_BY_MAIN = .false. # save all seismograms in one large combined file instead of one file per seismogram # to avoid overloading shared non-local file systems such as LUSTRE or GPFS for instance diff --git a/EXAMPLES/homogeneous_halfspace_HEX8_elastic_absorbing_Stacey_5sides/DATA/Par_file b/EXAMPLES/homogeneous_halfspace_HEX8_elastic_absorbing_Stacey_5sides/DATA/Par_file index 3133af5fc..8512f6ce8 100644 --- a/EXAMPLES/homogeneous_halfspace_HEX8_elastic_absorbing_Stacey_5sides/DATA/Par_file +++ b/EXAMPLES/homogeneous_halfspace_HEX8_elastic_absorbing_Stacey_5sides/DATA/Par_file @@ -234,8 +234,8 @@ SU_FORMAT = .false. # output seismograms in ASDF (requires asdf-library) ASDF_FORMAT = .false. -# decide if master process writes all the seismograms or if all processes do it in parallel -WRITE_SEISMOGRAMS_BY_MASTER = .false. +# decide if main process writes all the seismograms or if all processes do it in parallel +WRITE_SEISMOGRAMS_BY_MAIN = .false. # save all seismograms in one large combined file instead of one file per seismogram # to avoid overloading shared non-local file systems such as LUSTRE or GPFS for instance diff --git a/EXAMPLES/homogeneous_halfspace_HEX8_elastic_no_absorbing/DATA/Par_file b/EXAMPLES/homogeneous_halfspace_HEX8_elastic_no_absorbing/DATA/Par_file index a502b724c..6a457991c 100644 --- a/EXAMPLES/homogeneous_halfspace_HEX8_elastic_no_absorbing/DATA/Par_file +++ b/EXAMPLES/homogeneous_halfspace_HEX8_elastic_no_absorbing/DATA/Par_file @@ -234,8 +234,8 @@ SU_FORMAT = .false. # output seismograms in ASDF (requires asdf-library) ASDF_FORMAT = .false. -# decide if master process writes all the seismograms or if all processes do it in parallel -WRITE_SEISMOGRAMS_BY_MASTER = .true. +# decide if main process writes all the seismograms or if all processes do it in parallel +WRITE_SEISMOGRAMS_BY_MAIN = .true. # save all seismograms in one large combined file instead of one file per seismogram # to avoid overloading shared non-local file systems such as LUSTRE or GPFS for instance diff --git a/EXAMPLES/homogeneous_poroelastic/DATA/Par_file b/EXAMPLES/homogeneous_poroelastic/DATA/Par_file index c705bec1c..6d97f3338 100644 --- a/EXAMPLES/homogeneous_poroelastic/DATA/Par_file +++ b/EXAMPLES/homogeneous_poroelastic/DATA/Par_file @@ -234,8 +234,8 @@ SU_FORMAT = .false. # output seismograms in ASDF (requires asdf-library) ASDF_FORMAT = .false. -# decide if master process writes all the seismograms or if all processes do it in parallel -WRITE_SEISMOGRAMS_BY_MASTER = .false. +# decide if main process writes all the seismograms or if all processes do it in parallel +WRITE_SEISMOGRAMS_BY_MAIN = .false. # save all seismograms in one large combined file instead of one file per seismogram # to avoid overloading shared non-local file systems such as LUSTRE or GPFS for instance diff --git a/EXAMPLES/homogeneous_poroelastic/DATA/Par_file_coarse b/EXAMPLES/homogeneous_poroelastic/DATA/Par_file_coarse index 17c37b350..b6de889ec 100644 --- a/EXAMPLES/homogeneous_poroelastic/DATA/Par_file_coarse +++ b/EXAMPLES/homogeneous_poroelastic/DATA/Par_file_coarse @@ -234,8 +234,8 @@ SU_FORMAT = .false. # output seismograms in ASDF (requires asdf-library) ASDF_FORMAT = .false. -# decide if master process writes all the seismograms or if all processes do it in parallel -WRITE_SEISMOGRAMS_BY_MASTER = .false. +# decide if main process writes all the seismograms or if all processes do it in parallel +WRITE_SEISMOGRAMS_BY_MAIN = .false. # save all seismograms in one large combined file instead of one file per seismogram # to avoid overloading shared non-local file systems such as LUSTRE or GPFS for instance diff --git a/EXAMPLES/layered_halfspace/DATA/Par_file b/EXAMPLES/layered_halfspace/DATA/Par_file index b4bf7f27f..582483641 100644 --- a/EXAMPLES/layered_halfspace/DATA/Par_file +++ b/EXAMPLES/layered_halfspace/DATA/Par_file @@ -234,8 +234,8 @@ SU_FORMAT = .false. # output seismograms in ASDF (requires asdf-library) ASDF_FORMAT = .false. -# decide if master process writes all the seismograms or if all processes do it in parallel -WRITE_SEISMOGRAMS_BY_MASTER = .false. +# decide if main process writes all the seismograms or if all processes do it in parallel +WRITE_SEISMOGRAMS_BY_MAIN = .false. # save all seismograms in one large combined file instead of one file per seismogram # to avoid overloading shared non-local file systems such as LUSTRE or GPFS for instance diff --git a/EXAMPLES/meshfem3D_examples/cavity/DATA/Par_file b/EXAMPLES/meshfem3D_examples/cavity/DATA/Par_file index e6afe00ac..052c09f7c 100644 --- a/EXAMPLES/meshfem3D_examples/cavity/DATA/Par_file +++ b/EXAMPLES/meshfem3D_examples/cavity/DATA/Par_file @@ -234,8 +234,8 @@ SU_FORMAT = .false. # output seismograms in ASDF (requires asdf-library) ASDF_FORMAT = .false. -# decide if master process writes all the seismograms or if all processes do it in parallel -WRITE_SEISMOGRAMS_BY_MASTER = .false. +# decide if main process writes all the seismograms or if all processes do it in parallel +WRITE_SEISMOGRAMS_BY_MAIN = .false. # save all seismograms in one large combined file instead of one file per seismogram # to avoid overloading shared non-local file systems such as LUSTRE or GPFS for instance diff --git a/EXAMPLES/meshfem3D_examples/cavity/DATA/Par_file.96procs b/EXAMPLES/meshfem3D_examples/cavity/DATA/Par_file.96procs index 0f2a266fe..8651e5357 100644 --- a/EXAMPLES/meshfem3D_examples/cavity/DATA/Par_file.96procs +++ b/EXAMPLES/meshfem3D_examples/cavity/DATA/Par_file.96procs @@ -234,8 +234,8 @@ SU_FORMAT = .false. # output seismograms in ASDF (requires asdf-library) ASDF_FORMAT = .false. -# decide if master process writes all the seismograms or if all processes do it in parallel -WRITE_SEISMOGRAMS_BY_MASTER = .false. +# decide if main process writes all the seismograms or if all processes do it in parallel +WRITE_SEISMOGRAMS_BY_MAIN = .false. # save all seismograms in one large combined file instead of one file per seismogram # to avoid overloading shared non-local file systems such as LUSTRE or GPFS for instance diff --git a/EXAMPLES/meshfem3D_examples/many_interfaces/DATA/Par_file b/EXAMPLES/meshfem3D_examples/many_interfaces/DATA/Par_file index c75f989d2..a7655cfea 100644 --- a/EXAMPLES/meshfem3D_examples/many_interfaces/DATA/Par_file +++ b/EXAMPLES/meshfem3D_examples/many_interfaces/DATA/Par_file @@ -234,8 +234,8 @@ SU_FORMAT = .false. # output seismograms in ASDF (requires asdf-library) ASDF_FORMAT = .false. -# decide if master process writes all the seismograms or if all processes do it in parallel -WRITE_SEISMOGRAMS_BY_MASTER = .false. +# decide if main process writes all the seismograms or if all processes do it in parallel +WRITE_SEISMOGRAMS_BY_MAIN = .false. # save all seismograms in one large combined file instead of one file per seismogram # to avoid overloading shared non-local file systems such as LUSTRE or GPFS for instance diff --git a/EXAMPLES/meshfem3D_examples/regular_element_mesh/DATA/Par_file b/EXAMPLES/meshfem3D_examples/regular_element_mesh/DATA/Par_file index 38748f8ef..b32db73a2 100644 --- a/EXAMPLES/meshfem3D_examples/regular_element_mesh/DATA/Par_file +++ b/EXAMPLES/meshfem3D_examples/regular_element_mesh/DATA/Par_file @@ -234,8 +234,8 @@ SU_FORMAT = .false. # output seismograms in ASDF (requires asdf-library) ASDF_FORMAT = .false. -# decide if master process writes all the seismograms or if all processes do it in parallel -WRITE_SEISMOGRAMS_BY_MASTER = .false. +# decide if main process writes all the seismograms or if all processes do it in parallel +WRITE_SEISMOGRAMS_BY_MAIN = .false. # save all seismograms in one large combined file instead of one file per seismogram # to avoid overloading shared non-local file systems such as LUSTRE or GPFS for instance diff --git a/EXAMPLES/meshfem3D_examples/sep_bathymetry/DATA/Par_file b/EXAMPLES/meshfem3D_examples/sep_bathymetry/DATA/Par_file index b91a00a62..734451326 100644 --- a/EXAMPLES/meshfem3D_examples/sep_bathymetry/DATA/Par_file +++ b/EXAMPLES/meshfem3D_examples/sep_bathymetry/DATA/Par_file @@ -234,8 +234,8 @@ SU_FORMAT = .false. # output seismograms in ASDF (requires asdf-library) ASDF_FORMAT = .false. -# decide if master process writes all the seismograms or if all processes do it in parallel -WRITE_SEISMOGRAMS_BY_MASTER = .true. +# decide if main process writes all the seismograms or if all processes do it in parallel +WRITE_SEISMOGRAMS_BY_MAIN = .true. # save all seismograms in one large combined file instead of one file per seismogram # to avoid overloading shared non-local file systems such as LUSTRE or GPFS for instance diff --git a/EXAMPLES/meshfem3D_examples/simple_model/DATA/Par_file b/EXAMPLES/meshfem3D_examples/simple_model/DATA/Par_file index a0fd44124..70097036a 100644 --- a/EXAMPLES/meshfem3D_examples/simple_model/DATA/Par_file +++ b/EXAMPLES/meshfem3D_examples/simple_model/DATA/Par_file @@ -234,8 +234,8 @@ SU_FORMAT = .false. # output seismograms in ASDF (requires asdf-library) ASDF_FORMAT = .false. -# decide if master process writes all the seismograms or if all processes do it in parallel -WRITE_SEISMOGRAMS_BY_MASTER = .false. +# decide if main process writes all the seismograms or if all processes do it in parallel +WRITE_SEISMOGRAMS_BY_MAIN = .false. # save all seismograms in one large combined file instead of one file per seismogram # to avoid overloading shared non-local file systems such as LUSTRE or GPFS for instance diff --git a/EXAMPLES/meshfem3D_examples/socal1D/DATA/Par_file b/EXAMPLES/meshfem3D_examples/socal1D/DATA/Par_file index 071c6e73c..88e9ded14 100644 --- a/EXAMPLES/meshfem3D_examples/socal1D/DATA/Par_file +++ b/EXAMPLES/meshfem3D_examples/socal1D/DATA/Par_file @@ -234,8 +234,8 @@ SU_FORMAT = .false. # output seismograms in ASDF (requires asdf-library) ASDF_FORMAT = .false. -# decide if master process writes all the seismograms or if all processes do it in parallel -WRITE_SEISMOGRAMS_BY_MASTER = .false. +# decide if main process writes all the seismograms or if all processes do it in parallel +WRITE_SEISMOGRAMS_BY_MAIN = .false. # save all seismograms in one large combined file instead of one file per seismogram # to avoid overloading shared non-local file systems such as LUSTRE or GPFS for instance diff --git a/EXAMPLES/meshfem3D_examples/socal1D/example_utm/Par_file_utm b/EXAMPLES/meshfem3D_examples/socal1D/example_utm/Par_file_utm index fe376f14c..4480b363f 100644 --- a/EXAMPLES/meshfem3D_examples/socal1D/example_utm/Par_file_utm +++ b/EXAMPLES/meshfem3D_examples/socal1D/example_utm/Par_file_utm @@ -234,8 +234,8 @@ SU_FORMAT = .false. # output seismograms in ASDF (requires asdf-library) ASDF_FORMAT = .false. -# decide if master process writes all the seismograms or if all processes do it in parallel -WRITE_SEISMOGRAMS_BY_MASTER = .false. +# decide if main process writes all the seismograms or if all processes do it in parallel +WRITE_SEISMOGRAMS_BY_MAIN = .false. # save all seismograms in one large combined file instead of one file per seismogram # to avoid overloading shared non-local file systems such as LUSTRE or GPFS for instance diff --git a/EXAMPLES/noise_tomography/DATA/Par_file_step1 b/EXAMPLES/noise_tomography/DATA/Par_file_step1 index 494ca3369..b4a6813b4 100644 --- a/EXAMPLES/noise_tomography/DATA/Par_file_step1 +++ b/EXAMPLES/noise_tomography/DATA/Par_file_step1 @@ -234,8 +234,8 @@ SU_FORMAT = .false. # output seismograms in ASDF (requires asdf-library) ASDF_FORMAT = .false. -# decide if master process writes all the seismograms or if all processes do it in parallel -WRITE_SEISMOGRAMS_BY_MASTER = .false. +# decide if main process writes all the seismograms or if all processes do it in parallel +WRITE_SEISMOGRAMS_BY_MAIN = .false. # save all seismograms in one large combined file instead of one file per seismogram # to avoid overloading shared non-local file systems such as LUSTRE or GPFS for instance diff --git a/EXAMPLES/noise_tomography/DATA/Par_file_step2 b/EXAMPLES/noise_tomography/DATA/Par_file_step2 index 8062721d6..f92196af0 100644 --- a/EXAMPLES/noise_tomography/DATA/Par_file_step2 +++ b/EXAMPLES/noise_tomography/DATA/Par_file_step2 @@ -234,8 +234,8 @@ SU_FORMAT = .false. # output seismograms in ASDF (requires asdf-library) ASDF_FORMAT = .false. -# decide if master process writes all the seismograms or if all processes do it in parallel -WRITE_SEISMOGRAMS_BY_MASTER = .false. +# decide if main process writes all the seismograms or if all processes do it in parallel +WRITE_SEISMOGRAMS_BY_MAIN = .false. # save all seismograms in one large combined file instead of one file per seismogram # to avoid overloading shared non-local file systems such as LUSTRE or GPFS for instance diff --git a/EXAMPLES/noise_tomography/DATA/Par_file_step3 b/EXAMPLES/noise_tomography/DATA/Par_file_step3 index 17d799534..e80137ec1 100644 --- a/EXAMPLES/noise_tomography/DATA/Par_file_step3 +++ b/EXAMPLES/noise_tomography/DATA/Par_file_step3 @@ -234,8 +234,8 @@ SU_FORMAT = .false. # output seismograms in ASDF (requires asdf-library) ASDF_FORMAT = .false. -# decide if master process writes all the seismograms or if all processes do it in parallel -WRITE_SEISMOGRAMS_BY_MASTER = .false. +# decide if main process writes all the seismograms or if all processes do it in parallel +WRITE_SEISMOGRAMS_BY_MAIN = .false. # save all seismograms in one large combined file instead of one file per seismogram # to avoid overloading shared non-local file systems such as LUSTRE or GPFS for instance diff --git a/EXAMPLES/noise_tomography/NOISE_TOMOGRAPHY.m b/EXAMPLES/noise_tomography/NOISE_TOMOGRAPHY.m index ba5808536..fe5d6306a 100644 --- a/EXAMPLES/noise_tomography/NOISE_TOMOGRAPHY.m +++ b/EXAMPLES/noise_tomography/NOISE_TOMOGRAPHY.m @@ -213,7 +213,7 @@ fprintf('\n preparing source time function S_squared:\n NSTEP = %i / dt = %f \n',NSTEP,dt); % the file S_squared should be put into directory ./NOISE_TOMOGRAPHY/ -% together with other two files: irec_master_noise & nu_master +% together with other two files: irec_main_noise & nu_main S_squared=zeros(NSTEP,2); % first column: time (not used in SPECFEM3D package) % second column: source time function S_squared(:,1)=([1:NSTEP]-N_mid)*dt; diff --git a/EXAMPLES/noise_tomography/README b/EXAMPLES/noise_tomography/README index f2aae7903..a9061cd49 100644 --- a/EXAMPLES/noise_tomography/README +++ b/EXAMPLES/noise_tomography/README @@ -60,10 +60,10 @@ Noise Cross-Correlation Sensitivity Kernels (Tromp et al., 2010, GJI) it can be generated by calling in MATLAB: > NOISE_TOMOGRAPHY(999,0.12,10.,20.,'FLAT') (using a flat noise spectrum, refer to "./NOISE_TOMOGRAPHY.m" for details about the MATLAB scripts) - nu_master --- the component of seismogram at the 'master' receiver, which is used to calculate cross correlations - (the components at 'slave' receivers are components of the simulated seismograms obtained in step 2 of noise simulations) - irec_master_noise_contribution1, irec_master_noise_contribution2 - --- master receiver ID + nu_main --- the component of seismogram at the 'main' receiver, which is used to calculate cross correlations + (the components at 'secondary' receivers are components of the simulated seismograms obtained in step 2 of noise simulations) + irec_main_noise_contribution1, irec_main_noise_contribution2 + --- main receiver ID Other statistics, such as noise direction & noise distribution, are described in "src/specfem3d/noise_tomography.f90" The default assumes vertical noises and a uniform distribution. diff --git a/EXAMPLES/noise_tomography/run_this_example.sh b/EXAMPLES/noise_tomography/run_this_example.sh index a1a57fa30..2c339b476 100755 --- a/EXAMPLES/noise_tomography/run_this_example.sh +++ b/EXAMPLES/noise_tomography/run_this_example.sh @@ -28,7 +28,7 @@ echo #////////////////////////////// SIMULATION IS STARTING //////////////////////////////////////////////////////////// # Note that one noise sensitivity kernel contains two contributions, # both the 1st and the 2nd contributions may be obtained through THREE steps. -# Each contribution requires a distinct 'master' receiver, as shown in Tromp et al., 2010, GJI, +# Each contribution requires a distinct 'main' receiver, as shown in Tromp et al., 2010, GJI, # each step requires slightly different Par_file, as documented in the Manual # # Please see the paper & Manual for more details on noise simulations @@ -41,8 +41,8 @@ echo "*************************************" echo "1. contribution..." echo "*************************************" echo -# the master receiver is receiver 1 -cp -v NOISE_TOMOGRAPHY/irec_master_noise_contribution1 NOISE_TOMOGRAPHY/irec_master_noise +# the main receiver is receiver 1 +cp -v NOISE_TOMOGRAPHY/irec_main_noise_contribution1 NOISE_TOMOGRAPHY/irec_main_noise ## step 1 of noise simulation ./run_single_step.sh 1 @@ -117,8 +117,8 @@ echo "2. contribution..." echo "*************************************" echo -# the master receiver is receiver 2 -cp -v NOISE_TOMOGRAPHY/irec_master_noise_contribution2 NOISE_TOMOGRAPHY/irec_master_noise +# the main receiver is receiver 2 +cp -v NOISE_TOMOGRAPHY/irec_main_noise_contribution2 NOISE_TOMOGRAPHY/irec_main_noise ## step 1 of noise simulation ./run_single_step.sh 1 diff --git a/EXAMPLES/oldstuff/small_example_please_do_not_remove_CURRENTLY_BROKEN_according_to_Vadim/create_data/DATA/Par_file b/EXAMPLES/oldstuff/small_example_please_do_not_remove_CURRENTLY_BROKEN_according_to_Vadim/create_data/DATA/Par_file index 08b73ffda..e15117807 100644 --- a/EXAMPLES/oldstuff/small_example_please_do_not_remove_CURRENTLY_BROKEN_according_to_Vadim/create_data/DATA/Par_file +++ b/EXAMPLES/oldstuff/small_example_please_do_not_remove_CURRENTLY_BROKEN_according_to_Vadim/create_data/DATA/Par_file @@ -234,8 +234,8 @@ SU_FORMAT = .false. # output seismograms in ASDF (requires asdf-library) ASDF_FORMAT = .false. -# decide if master process writes all the seismograms or if all processes do it in parallel -WRITE_SEISMOGRAMS_BY_MASTER = .false. +# decide if main process writes all the seismograms or if all processes do it in parallel +WRITE_SEISMOGRAMS_BY_MAIN = .false. # save all seismograms in one large combined file instead of one file per seismogram # to avoid overloading shared non-local file systems such as LUSTRE or GPFS for instance diff --git a/EXAMPLES/oldstuff/small_example_please_do_not_remove_CURRENTLY_BROKEN_according_to_Vadim/fwi_fk/DATA/Par_file b/EXAMPLES/oldstuff/small_example_please_do_not_remove_CURRENTLY_BROKEN_according_to_Vadim/fwi_fk/DATA/Par_file index bb37b431b..c126fcc63 100644 --- a/EXAMPLES/oldstuff/small_example_please_do_not_remove_CURRENTLY_BROKEN_according_to_Vadim/fwi_fk/DATA/Par_file +++ b/EXAMPLES/oldstuff/small_example_please_do_not_remove_CURRENTLY_BROKEN_according_to_Vadim/fwi_fk/DATA/Par_file @@ -234,8 +234,8 @@ SU_FORMAT = .false. # output seismograms in ASDF (requires asdf-library) ASDF_FORMAT = .false. -# decide if master process writes all the seismograms or if all processes do it in parallel -WRITE_SEISMOGRAMS_BY_MASTER = .false. +# decide if main process writes all the seismograms or if all processes do it in parallel +WRITE_SEISMOGRAMS_BY_MAIN = .false. # save all seismograms in one large combined file instead of one file per seismogram # to avoid overloading shared non-local file systems such as LUSTRE or GPFS for instance diff --git a/EXAMPLES/process_DATA_Par_files_to_update_their_parameters_from_a_master.py b/EXAMPLES/process_DATA_Par_files_to_update_their_parameters_from_a_master.py index d3c64ed0d..641c84bdc 100755 --- a/EXAMPLES/process_DATA_Par_files_to_update_their_parameters_from_a_master.py +++ b/EXAMPLES/process_DATA_Par_files_to_update_their_parameters_from_a_master.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# reads in a Par_file as master (template) and updates parameters and comments in all other Par_files +# reads in a Par_file as main (template) and updates parameters and comments in all other Par_files # in current directory to have a consistent set of Par_files # from __future__ import print_function @@ -22,7 +22,8 @@ ("OCEANS", "APPROXIMATE_OCEAN_LOAD"), \ ("NZ_DOUGLING_1", "NZ_DOUBLING_1"), \ ("NZ_DOUGLING_2", "NZ_DOUBLING_2"), \ - ("EXTERNAL_SOURCE_FILE","USE_EXTERNAL_SOURCE_FILE") \ + ("EXTERNAL_SOURCE_FILE","USE_EXTERNAL_SOURCE_FILE"), + ("WRITE_SEISMOGRAMS_BY_MASTER","WRITE_SEISMOGRAMS_BY_MAIN") \ ] # exclude other possible files with similar name, but with different format @@ -48,9 +49,9 @@ # ordered dictionary: ordering is kept, what is filled in first, will be listed first # # each dictionary entry will have format (value,comment,appendix), use for example: -# (value,comment,appendix) = master_parameters[name] +# (value,comment,appendix) = main_parameters[name] # -master_parameters = collections.OrderedDict() +main_parameters = collections.OrderedDict() # Mesh_Par_file data lines (NMATERIALS and NREGIONS sections) mesh_par_file_data_counter = 0 @@ -226,7 +227,7 @@ def read_Par_file_sections(parameters,file,verbose=False): print("") print(" got %d parameters" % nsections) print("") - #print("master file sections") + #print("main file sections") #print("") #print(parameters) @@ -360,36 +361,36 @@ def get_files_in_subdirectories(dir,files,basename): #---------------------------------------------------------------------------- # -def compare_and_replace_file(master_file,temp_file,verbose=False,replace=False): +def compare_and_replace_file(main_file,temp_file,verbose=False,replace=False): """ - notifies user if template is different than master + notifies user if template is different than main e.g. by different indentation or white space) """ # diff files - command = "diff " + master_file + " " + temp_file + command = "diff " + main_file + " " + temp_file #print command ret = os.system(command) if ret > 0: # got some differences - # replaces master with new file format + # replaces main with new file format print("") - print("replacing master with new parameter file format:") + print("replacing main with new parameter file format:") print("") # copy over if replace: - command = "cp -v " + temp_file + " " + master_file + command = "cp -v " + temp_file + " " + main_file #command = "echo hello" #print command ret = os.system(command) if ret != 0: - print("Error replacing file with new format",master_file) + print("Error replacing file with new format",main_file) sys.tracebacklimit=0 - raise Exception('file can not be updated: %s' % master_file) + raise Exception('file can not be updated: %s' % main_file) else: if verbose: print(" no differences") - print(" master file format is okay") + print(" main file format is okay") print("") @@ -398,7 +399,7 @@ def check_and_update_Par_file(my_parameters,file): updates parameter entries """ global DEPRECATED_RENAMED_PARAMETERS - global master_parameters + global main_parameters global is_Mesh_Par_file # checks for old, deprecated parameters @@ -407,7 +408,7 @@ def check_and_update_Par_file(my_parameters,file): my_parameters_new = my_parameters.copy() for name in my_parameters.keys(): - if not name in master_parameters.keys(): + if not name in main_parameters.keys(): if (not "MESH_PAR_FILE_DATA" in name) and (not "NZ_DOUBLING" in name): print(" deprecated parameter: ",name) nold_parameters += 1 @@ -446,32 +447,32 @@ def check_and_update_Par_file(my_parameters,file): if my_parameters_new != my_parameters: my_parameters = my_parameters_new.copy() #print(my_parameters.keys()) - # add missing master parameters and replaces comment lines to compare sections + # add missing main parameters and replaces comment lines to compare sections nmissing_parameters = 0 #print(" searching missing parameters...") - for name in master_parameters.keys(): + for name in main_parameters.keys(): if (not "MESH_PAR_FILE_DATA" in name): # checks if missing if not name in my_parameters.keys(): print(" misses parameter: ",name) nmissing_parameters += 1 - # adds from master template record - (val,comment,appendix) = master_parameters[name] + # adds from main template record + (val,comment,appendix) = main_parameters[name] my_parameters[name] = (val,comment,appendix) # updates comments nold_comments = 0 - for name in master_parameters.keys(): + for name in main_parameters.keys(): if (not "MESH_PAR_FILE_DATA" in name): # checks we have this parameter if not name in my_parameters.keys(): - print("Error comparing master with current file format parameter",name) + print("Error comparing main with current file format parameter",name) sys.tracebacklimit=0 raise Exception('parameter list invalid: %s' % file) # compares and replaces comments and appendix (val_orig,comment_orig,appendix_orig) = my_parameters[name] - (val,comment,appendix) = master_parameters[name] + (val,comment,appendix) = main_parameters[name] if comment_orig != comment or appendix != appendix_orig: nold_comments += 1 # replace with new comment/appendix and only keep original value @@ -482,7 +483,7 @@ def check_and_update_Par_file(my_parameters,file): iorder_new = 0 num_material_entries = 0 num_region_entries = 0 - for name in master_parameters.keys(): + for name in main_parameters.keys(): if not is_Mesh_Par_file: # regular Par_file must have a one-to-one match # checks that name is available @@ -600,11 +601,11 @@ def check_and_update_Par_file(my_parameters,file): # user info print(" updating parameter file...") - # opens temporary file with master info + # opens temporary file with main info tmp_file = "_____temp09_____" write_template_file(ordered_parameters,tmp_file) - # notifies user if template is different than master + # notifies user if template is different than main # (e.g. by different indentation or white space) compare_and_replace_file(file,tmp_file,verbose=True,replace=replace) @@ -635,41 +636,41 @@ def check_parameter_file_type(file): #---------------------------------------------------------------------------- # -def update_Par_files(master_file,replace=False): +def update_Par_files(main_file,replace=False): """ - uses a master to update other parameter files + uses a main to update other parameter files """ - global master_parameters + global main_parameters global is_Mesh_Par_file # user info print("") - print("master file: ",master_file) + print("main file: ",main_file) print("") # determines file type - check_parameter_file_type(master_file) + check_parameter_file_type(main_file) # reads in parameters - read_Par_file_sections(master_parameters,master_file,verbose=True) + read_Par_file_sections(main_parameters,main_file,verbose=True) - # opens temporary file with master info + # opens temporary file with main info tmp_file = "_____temp01_____" - write_template_file(master_parameters,tmp_file,verbose=True) + write_template_file(main_parameters,tmp_file,verbose=True) - # notifies user if template is different than master + # notifies user if template is different than main # (e.g. by different indentation or white space) - print("checking differences between new format and master:") + print("checking differences between new format and main:") print(" (different formatting or whitespace can lead to differences)") print("") - compare_and_replace_file(master_file,tmp_file,verbose=True,replace=replace) + compare_and_replace_file(main_file,tmp_file,verbose=True,replace=replace) # clean up temporary file command = "rm -f " + tmp_file os.system(command) # finds all Par_files - basename = os.path.basename(master_file) + basename = os.path.basename(main_file) current_dir = os.getcwd() # user info @@ -724,9 +725,9 @@ def update_Par_files(master_file,replace=False): def usage(): print("usage:") - print(" ./process_DATA_Par_files_to_update_their_parameters_from_a_master.py Master-Par-file replace") + print(" ./process_DATA_Par_files_to_update_their_parameters_from_a_main.py Main-Par-file replace") print(" with") - print(" Master-Par_file - Par_file which serves as master template (e.g. DATA/Par_file)") + print(" Main-Par_file - Par_file which serves as main template (e.g. DATA/Par_file)") print(" replace = flag to force replacing of file [0==check-only/1==replace]") # @@ -739,11 +740,11 @@ def usage(): usage() sys.exit(1) else: - master_file = sys.argv[1] + main_file = sys.argv[1] if int(sys.argv[2]) == 1: replace = True else: replace = False - update_Par_files(master_file,replace=replace) + update_Par_files(main_file,replace=replace) diff --git a/EXAMPLES/small_adjoint_multiple_sources/DATA/Par_file b/EXAMPLES/small_adjoint_multiple_sources/DATA/Par_file index a4b90486a..8124feff8 100644 --- a/EXAMPLES/small_adjoint_multiple_sources/DATA/Par_file +++ b/EXAMPLES/small_adjoint_multiple_sources/DATA/Par_file @@ -234,8 +234,8 @@ SU_FORMAT = .false. # output seismograms in ASDF (requires asdf-library) ASDF_FORMAT = .false. -# decide if master process writes all the seismograms or if all processes do it in parallel -WRITE_SEISMOGRAMS_BY_MASTER = .false. +# decide if main process writes all the seismograms or if all processes do it in parallel +WRITE_SEISMOGRAMS_BY_MAIN = .false. # save all seismograms in one large combined file instead of one file per seismogram # to avoid overloading shared non-local file systems such as LUSTRE or GPFS for instance diff --git a/EXAMPLES/small_example_coupling_FK_specfem/DATA/Par_file b/EXAMPLES/small_example_coupling_FK_specfem/DATA/Par_file index 45a950b59..52ebec111 100644 --- a/EXAMPLES/small_example_coupling_FK_specfem/DATA/Par_file +++ b/EXAMPLES/small_example_coupling_FK_specfem/DATA/Par_file @@ -234,8 +234,8 @@ SU_FORMAT = .false. # output seismograms in ASDF (requires asdf-library) ASDF_FORMAT = .false. -# decide if master process writes all the seismograms or if all processes do it in parallel -WRITE_SEISMOGRAMS_BY_MASTER = .false. +# decide if main process writes all the seismograms or if all processes do it in parallel +WRITE_SEISMOGRAMS_BY_MAIN = .false. # save all seismograms in one large combined file instead of one file per seismogram # to avoid overloading shared non-local file systems such as LUSTRE or GPFS for instance diff --git a/EXAMPLES/small_example_coupling_axisem_specfem_matlab_gui_CURRENTLY_BROKEN_according_to_Vadim/Param_files/DATA/Par_file b/EXAMPLES/small_example_coupling_axisem_specfem_matlab_gui_CURRENTLY_BROKEN_according_to_Vadim/Param_files/DATA/Par_file index 859c76fa1..0ae60b1d7 100644 --- a/EXAMPLES/small_example_coupling_axisem_specfem_matlab_gui_CURRENTLY_BROKEN_according_to_Vadim/Param_files/DATA/Par_file +++ b/EXAMPLES/small_example_coupling_axisem_specfem_matlab_gui_CURRENTLY_BROKEN_according_to_Vadim/Param_files/DATA/Par_file @@ -234,8 +234,8 @@ SU_FORMAT = .false. # output seismograms in ASDF (requires asdf-library) ASDF_FORMAT = .false. -# decide if master process writes all the seismograms or if all processes do it in parallel -WRITE_SEISMOGRAMS_BY_MASTER = .false. +# decide if main process writes all the seismograms or if all processes do it in parallel +WRITE_SEISMOGRAMS_BY_MAIN = .false. # save all seismograms in one large combined file instead of one file per seismogram # to avoid overloading shared non-local file systems such as LUSTRE or GPFS for instance diff --git a/EXAMPLES/small_example_coupling_axisem_specfem_matlab_gui_CURRENTLY_BROKEN_according_to_Vadim/Param_files/DATA/Par_file_one_proc b/EXAMPLES/small_example_coupling_axisem_specfem_matlab_gui_CURRENTLY_BROKEN_according_to_Vadim/Param_files/DATA/Par_file_one_proc index 32a3443b7..dcd980690 100644 --- a/EXAMPLES/small_example_coupling_axisem_specfem_matlab_gui_CURRENTLY_BROKEN_according_to_Vadim/Param_files/DATA/Par_file_one_proc +++ b/EXAMPLES/small_example_coupling_axisem_specfem_matlab_gui_CURRENTLY_BROKEN_according_to_Vadim/Param_files/DATA/Par_file_one_proc @@ -234,8 +234,8 @@ SU_FORMAT = .false. # output seismograms in ASDF (requires asdf-library) ASDF_FORMAT = .false. -# decide if master process writes all the seismograms or if all processes do it in parallel -WRITE_SEISMOGRAMS_BY_MASTER = .false. +# decide if main process writes all the seismograms or if all processes do it in parallel +WRITE_SEISMOGRAMS_BY_MAIN = .false. # save all seismograms in one large combined file instead of one file per seismogram # to avoid overloading shared non-local file systems such as LUSTRE or GPFS for instance diff --git a/EXAMPLES/small_example_coupling_axisem_specfem_matlab_gui_CURRENTLY_BROKEN_according_to_Vadim/Param_files/DATA/Par_file_several_proc b/EXAMPLES/small_example_coupling_axisem_specfem_matlab_gui_CURRENTLY_BROKEN_according_to_Vadim/Param_files/DATA/Par_file_several_proc index 859c76fa1..0ae60b1d7 100644 --- a/EXAMPLES/small_example_coupling_axisem_specfem_matlab_gui_CURRENTLY_BROKEN_according_to_Vadim/Param_files/DATA/Par_file_several_proc +++ b/EXAMPLES/small_example_coupling_axisem_specfem_matlab_gui_CURRENTLY_BROKEN_according_to_Vadim/Param_files/DATA/Par_file_several_proc @@ -234,8 +234,8 @@ SU_FORMAT = .false. # output seismograms in ASDF (requires asdf-library) ASDF_FORMAT = .false. -# decide if master process writes all the seismograms or if all processes do it in parallel -WRITE_SEISMOGRAMS_BY_MASTER = .false. +# decide if main process writes all the seismograms or if all processes do it in parallel +WRITE_SEISMOGRAMS_BY_MAIN = .false. # save all seismograms in one large combined file instead of one file per seismogram # to avoid overloading shared non-local file systems such as LUSTRE or GPFS for instance diff --git a/EXAMPLES/small_example_coupling_axisem_specfem_script/Param_files/DATA/Par_file b/EXAMPLES/small_example_coupling_axisem_specfem_script/Param_files/DATA/Par_file index f8050ce37..6bb7c2142 100644 --- a/EXAMPLES/small_example_coupling_axisem_specfem_script/Param_files/DATA/Par_file +++ b/EXAMPLES/small_example_coupling_axisem_specfem_script/Param_files/DATA/Par_file @@ -234,8 +234,8 @@ SU_FORMAT = .false. # output seismograms in ASDF (requires asdf-library) ASDF_FORMAT = .false. -# decide if master process writes all the seismograms or if all processes do it in parallel -WRITE_SEISMOGRAMS_BY_MASTER = .false. +# decide if main process writes all the seismograms or if all processes do it in parallel +WRITE_SEISMOGRAMS_BY_MAIN = .false. # save all seismograms in one large combined file instead of one file per seismogram # to avoid overloading shared non-local file systems such as LUSTRE or GPFS for instance diff --git a/EXAMPLES/small_example_coupling_axisem_specfem_script/Param_files/DATA/Par_file_one_proc b/EXAMPLES/small_example_coupling_axisem_specfem_script/Param_files/DATA/Par_file_one_proc index 32a3443b7..dcd980690 100644 --- a/EXAMPLES/small_example_coupling_axisem_specfem_script/Param_files/DATA/Par_file_one_proc +++ b/EXAMPLES/small_example_coupling_axisem_specfem_script/Param_files/DATA/Par_file_one_proc @@ -234,8 +234,8 @@ SU_FORMAT = .false. # output seismograms in ASDF (requires asdf-library) ASDF_FORMAT = .false. -# decide if master process writes all the seismograms or if all processes do it in parallel -WRITE_SEISMOGRAMS_BY_MASTER = .false. +# decide if main process writes all the seismograms or if all processes do it in parallel +WRITE_SEISMOGRAMS_BY_MAIN = .false. # save all seismograms in one large combined file instead of one file per seismogram # to avoid overloading shared non-local file systems such as LUSTRE or GPFS for instance diff --git a/EXAMPLES/small_example_coupling_axisem_specfem_script/Param_files/DATA/Par_file_several_proc b/EXAMPLES/small_example_coupling_axisem_specfem_script/Param_files/DATA/Par_file_several_proc index 859c76fa1..0ae60b1d7 100644 --- a/EXAMPLES/small_example_coupling_axisem_specfem_script/Param_files/DATA/Par_file_several_proc +++ b/EXAMPLES/small_example_coupling_axisem_specfem_script/Param_files/DATA/Par_file_several_proc @@ -234,8 +234,8 @@ SU_FORMAT = .false. # output seismograms in ASDF (requires asdf-library) ASDF_FORMAT = .false. -# decide if master process writes all the seismograms or if all processes do it in parallel -WRITE_SEISMOGRAMS_BY_MASTER = .false. +# decide if main process writes all the seismograms or if all processes do it in parallel +WRITE_SEISMOGRAMS_BY_MAIN = .false. # save all seismograms in one large combined file instead of one file per seismogram # to avoid overloading shared non-local file systems such as LUSTRE or GPFS for instance diff --git a/EXAMPLES/small_example_coupling_axisem_specfem_script/Param_files_for_buried_box/DATA/Par_file b/EXAMPLES/small_example_coupling_axisem_specfem_script/Param_files_for_buried_box/DATA/Par_file index b10e74fb7..e6530c195 100644 --- a/EXAMPLES/small_example_coupling_axisem_specfem_script/Param_files_for_buried_box/DATA/Par_file +++ b/EXAMPLES/small_example_coupling_axisem_specfem_script/Param_files_for_buried_box/DATA/Par_file @@ -234,8 +234,8 @@ SU_FORMAT = .false. # output seismograms in ASDF (requires asdf-library) ASDF_FORMAT = .false. -# decide if master process writes all the seismograms or if all processes do it in parallel -WRITE_SEISMOGRAMS_BY_MASTER = .false. +# decide if main process writes all the seismograms or if all processes do it in parallel +WRITE_SEISMOGRAMS_BY_MAIN = .false. # save all seismograms in one large combined file instead of one file per seismogram # to avoid overloading shared non-local file systems such as LUSTRE or GPFS for instance diff --git a/EXAMPLES/small_example_coupling_axisem_specfem_script/Param_files_for_buried_box/DATA/Par_file_one_proc b/EXAMPLES/small_example_coupling_axisem_specfem_script/Param_files_for_buried_box/DATA/Par_file_one_proc index 3354fbe80..e1288fa72 100644 --- a/EXAMPLES/small_example_coupling_axisem_specfem_script/Param_files_for_buried_box/DATA/Par_file_one_proc +++ b/EXAMPLES/small_example_coupling_axisem_specfem_script/Param_files_for_buried_box/DATA/Par_file_one_proc @@ -234,8 +234,8 @@ SU_FORMAT = .false. # output seismograms in ASDF (requires asdf-library) ASDF_FORMAT = .false. -# decide if master process writes all the seismograms or if all processes do it in parallel -WRITE_SEISMOGRAMS_BY_MASTER = .false. +# decide if main process writes all the seismograms or if all processes do it in parallel +WRITE_SEISMOGRAMS_BY_MAIN = .false. # save all seismograms in one large combined file instead of one file per seismogram # to avoid overloading shared non-local file systems such as LUSTRE or GPFS for instance diff --git a/EXAMPLES/small_example_coupling_axisem_specfem_script/Param_files_for_buried_box/DATA/Par_file_several_proc b/EXAMPLES/small_example_coupling_axisem_specfem_script/Param_files_for_buried_box/DATA/Par_file_several_proc index b10e74fb7..e6530c195 100644 --- a/EXAMPLES/small_example_coupling_axisem_specfem_script/Param_files_for_buried_box/DATA/Par_file_several_proc +++ b/EXAMPLES/small_example_coupling_axisem_specfem_script/Param_files_for_buried_box/DATA/Par_file_several_proc @@ -234,8 +234,8 @@ SU_FORMAT = .false. # output seismograms in ASDF (requires asdf-library) ASDF_FORMAT = .false. -# decide if master process writes all the seismograms or if all processes do it in parallel -WRITE_SEISMOGRAMS_BY_MASTER = .false. +# decide if main process writes all the seismograms or if all processes do it in parallel +WRITE_SEISMOGRAMS_BY_MAIN = .false. # save all seismograms in one large combined file instead of one file per seismogram # to avoid overloading shared non-local file systems such as LUSTRE or GPFS for instance diff --git a/EXAMPLES/tomographic_model/DATA/Par_file b/EXAMPLES/tomographic_model/DATA/Par_file index d1978bd4c..8b2959190 100644 --- a/EXAMPLES/tomographic_model/DATA/Par_file +++ b/EXAMPLES/tomographic_model/DATA/Par_file @@ -234,8 +234,8 @@ SU_FORMAT = .false. # output seismograms in ASDF (requires asdf-library) ASDF_FORMAT = .false. -# decide if master process writes all the seismograms or if all processes do it in parallel -WRITE_SEISMOGRAMS_BY_MASTER = .false. +# decide if main process writes all the seismograms or if all processes do it in parallel +WRITE_SEISMOGRAMS_BY_MAIN = .false. # save all seismograms in one large combined file instead of one file per seismogram # to avoid overloading shared non-local file systems such as LUSTRE or GPFS for instance diff --git a/EXAMPLES/waterlayered_halfspace/DATA/Par_file b/EXAMPLES/waterlayered_halfspace/DATA/Par_file index 3321c68b6..a8140b561 100644 --- a/EXAMPLES/waterlayered_halfspace/DATA/Par_file +++ b/EXAMPLES/waterlayered_halfspace/DATA/Par_file @@ -234,8 +234,8 @@ SU_FORMAT = .false. # output seismograms in ASDF (requires asdf-library) ASDF_FORMAT = .false. -# decide if master process writes all the seismograms or if all processes do it in parallel -WRITE_SEISMOGRAMS_BY_MASTER = .false. +# decide if main process writes all the seismograms or if all processes do it in parallel +WRITE_SEISMOGRAMS_BY_MAIN = .false. # save all seismograms in one large combined file instead of one file per seismogram # to avoid overloading shared non-local file systems such as LUSTRE or GPFS for instance diff --git a/EXAMPLES/waterlayered_poroelastic/DATA/Par_file b/EXAMPLES/waterlayered_poroelastic/DATA/Par_file index 77d58c332..ced9185dd 100644 --- a/EXAMPLES/waterlayered_poroelastic/DATA/Par_file +++ b/EXAMPLES/waterlayered_poroelastic/DATA/Par_file @@ -234,8 +234,8 @@ SU_FORMAT = .false. # output seismograms in ASDF (requires asdf-library) ASDF_FORMAT = .false. -# decide if master process writes all the seismograms or if all processes do it in parallel -WRITE_SEISMOGRAMS_BY_MASTER = .false. +# decide if main process writes all the seismograms or if all processes do it in parallel +WRITE_SEISMOGRAMS_BY_MAIN = .false. # save all seismograms in one large combined file instead of one file per seismogram # to avoid overloading shared non-local file systems such as LUSTRE or GPFS for instance diff --git a/doc/USER_MANUAL/04_creating_databases.tex b/doc/USER_MANUAL/04_creating_databases.tex index 0a249328e..b58d6ddcb 100644 --- a/doc/USER_MANUAL/04_creating_databases.tex +++ b/doc/USER_MANUAL/04_creating_databases.tex @@ -369,7 +369,7 @@ \section{Main parameter file \texttt{Par\_file}}\label{cha:Main-Parameter} (in most cases, should be set to true). TODO / future work to do: currently the \texttt{BROADCAST\_SAME\_MESH\_AND\_MODEL} -option assumes to have the (master) mesh files in \texttt{run0001/DATABASES\_MPI} or +option assumes to have the (main) mesh files in \texttt{run0001/DATABASES\_MPI} or \texttt{run0001/OUTPUT\_FILES/DATABASES\_MPI}. However, for adjoint runs you still need a \texttt{DATABASES\_MPI/} folder in each of the sub-runs directories, e.g. \texttt{run0002/DATABASES\_MPI}, etc. to store the forward wavefields, kernels etc. of each sub-run. diff --git a/doc/USER_MANUAL/09_noise_simulations.tex b/doc/USER_MANUAL/09_noise_simulations.tex index 039f58cd9..1be844a6f 100644 --- a/doc/USER_MANUAL/09_noise_simulations.tex +++ b/doc/USER_MANUAL/09_noise_simulations.tex @@ -30,7 +30,7 @@ \section{Input Parameter Files} \texttt{STATIONS} remains the same as in previous earthquake simulations, except that the order of receivers listed in \texttt{STATIONS} is -now important. The order will be used to determine the `master' receiver, +now important. The order will be used to determine the `main' receiver, i.e., the one that simultaneously cross correlates with the others.\\ @@ -147,26 +147,26 @@ \subsection{Pre-simulation} That's to say, you will have a file \texttt{./NOISE\_TOMOGRAPHY/S\_squared} in the example provided in the SPECFEM3D Cartesian package. -\item Create a file called \texttt{./NOISE\_TOMOGRAPHY/irec\_master\_noise}. +\item Create a file called \texttt{./NOISE\_TOMOGRAPHY/irec\_main\_noise}. Note that this file is located in directory \texttt{./NOISE\_TOMOGRAPHY/} as well. In general, all noise simulation related parameter files -go into that directory. \texttt{irec\_master\_noise} contains only -one integer, which is the ID of the `master' receiver. For example, +go into that directory. \texttt{irec\_main\_noise} contains only +one integer, which is the ID of the `main' receiver. For example, if this file contains 5, it means that the fifth receiver listed in -\texttt{DATA/STATIONS} becomes the `master'. That's why we mentioned +\texttt{DATA/STATIONS} becomes the `main'. That's why we mentioned previously that the order of receivers in \texttt{DATA/STATIONS} is important. Note that in some simulations, the \texttt{DATA/STATIONS} might contain receivers which are outside of our computational domains. -Therefore, the integer in \texttt{irec\_master\_noise} is actually +Therefore, the integer in \texttt{irec\_main\_noise} is actually the ID in \texttt{DATA/STATIONS\_FILTERED} (which is generated by \texttt{bin/xgenerate\_databases}). -\item Create a file called \texttt{./NOISE\_TOMOGRAPHY/nu\_master}. +\item Create a file called \texttt{./NOISE\_TOMOGRAPHY/nu\_main}. This file holds three numbers, forming a (unit) vector. It describes -which component we are cross-correlating at the `master' receiver, +which component we are cross-correlating at the `main' receiver, i.e., ${\hat{{\bf \nu}}}^{\alpha}$ in \citet{trompetal2010}. The three numbers correspond to E/N/Z components respectively. Most often, the vertical component is used, and in those cases the three numbers @@ -250,9 +250,9 @@ \subsection{Post-simulation} simulation (Step 2). Seismograms in \texttt{OUTPUT\_FILES/} are actually the simulated ensemble cross correlations. Collect them immediately after Step 2, or the Step 3 will overwrite them. Note that we have -a `master' receiver specified by \texttt{irec\_master\_noise}, the +a `main' receiver specified by \texttt{irec\_main\_noise}, the seismogram at one station corresponds to the cross correlation between -that station and the `master'. Since the seismograms have three components, +that station and the `main'. Since the seismograms have three components, we may obtain cross correlations for different components as well, not necessarily the cross correlations between vertical components.\\ diff --git a/doc/USER_MANUAL/14_post_processing.tex b/doc/USER_MANUAL/14_post_processing.tex index 425741acf..2239e4e40 100644 --- a/doc/USER_MANUAL/14_post_processing.tex +++ b/doc/USER_MANUAL/14_post_processing.tex @@ -136,9 +136,9 @@ \section{Collect Synthetic Seismograms} \begin{description} \item [{\texttt{SEISMOGRAMS\_BINARY}}] set to \texttt{.true.} to have seismograms written out in binary format. -\item [{\texttt{WRITE\_SEISMOGRAMS\_BY\_MASTER}}] Set to \texttt{.true.} -to have only the master process writing out seismograms. This can -be useful on a cluster, where only the master process node has access +\item [{\texttt{WRITE\_SEISMOGRAMS\_BY\_MAIN}}] Set to \texttt{.true.} +to have only the main process writing out seismograms. This can +be useful on a cluster, where only the main process node has access to the output directory. \item [{\texttt{USE\_OUTPUT\_FILES\_PATH}}] Set to \texttt{.false.} to have the seismograms output to \texttt{LOCAL\_PATH} directory specified diff --git a/doc/USER_MANUAL/A_reference_frame.tex b/doc/USER_MANUAL/A_reference_frame.tex index 48081e562..b8bc302e8 100644 --- a/doc/USER_MANUAL/A_reference_frame.tex +++ b/doc/USER_MANUAL/A_reference_frame.tex @@ -92,9 +92,9 @@ \subsection*{Seismogram outputs} \begin{description} \item [{\texttt{SEISMOGRAMS\_BINARY}}] set to \texttt{.true.} to have seismograms written out in binary format. -\item [{\texttt{WRITE\_SEISMOGRAMS\_BY\_MASTER}}] Set to \texttt{.true.} -to have only the master process writing out seismograms. This can -be useful on a cluster, where only the master process node has access +\item [{\texttt{WRITE\_SEISMOGRAMS\_BY\_MAIN}}] Set to \texttt{.true.} +to have only the main process writing out seismograms. This can +be useful on a cluster, where only the main process node has access to the output directory. \item [{\texttt{USE\_OUTPUT\_FILES\_PATH}}] Set to \texttt{.false.} to have the seismograms output to \texttt{LOCAL\_PATH} directory specified diff --git a/src/cuda/check_fields_cuda.cu b/src/cuda/check_fields_cuda.cu index 7937d08b1..bd7035804 100644 --- a/src/cuda/check_fields_cuda.cu +++ b/src/cuda/check_fields_cuda.cu @@ -67,7 +67,7 @@ void output_free_memory(int myrank, char* info_str) { double free_db,used_db,total_db; int do_output_info; - // by default, only master process outputs device infos to avoid file cluttering + // by default, only main process outputs device infos to avoid file cluttering do_output_info = 0; if (myrank == 0){ do_output_info = 1; diff --git a/src/cuda/compute_add_sources_viscoelastic_cuda.cu b/src/cuda/compute_add_sources_viscoelastic_cuda.cu index 8a5790e88..3f92838fd 100644 --- a/src/cuda/compute_add_sources_viscoelastic_cuda.cu +++ b/src/cuda/compute_add_sources_viscoelastic_cuda.cu @@ -168,14 +168,14 @@ void FC_FUNC_(compute_add_sources_el_s3_cuda, /* ----------------------------------------------------------------------------------------------- */ -__global__ void add_source_master_rec_noise_cuda_kernel(int* d_ibool, - int* ispec_selected_rec, - int irec_master_noise, - realw* accel, - realw* noise_sourcearray, - int it) { +__global__ void add_source_main_rec_noise_cuda_kernel(int* d_ibool, + int* ispec_selected_rec, + int irec_main_noise, + realw* accel, + realw* noise_sourcearray, + int it) { int tx = threadIdx.x; - int iglob = d_ibool[tx + NGLL3_PADDED*(ispec_selected_rec[irec_master_noise-1]-1)]-1; + int iglob = d_ibool[tx + NGLL3_PADDED*(ispec_selected_rec[irec_main_noise-1]-1)]-1; // not sure if we need atomic operations but just in case... // accel[3*iglob] += noise_sourcearray[3*tx + 3*125*it]; @@ -191,31 +191,31 @@ __global__ void add_source_master_rec_noise_cuda_kernel(int* d_ibool, /* ----------------------------------------------------------------------------------------------- */ extern EXTERN_LANG -void FC_FUNC_(add_source_master_rec_noise_cu, - ADD_SOURCE_MASTER_REC_NOISE_CU)(long* Mesh_pointer, - int* it_f, - int* irec_master_noise_f, - int* islice_selected_rec) { +void FC_FUNC_(add_source_main_rec_noise_cu, + ADD_SOURCE_MAIN_REC_NOISE_CU)(long* Mesh_pointer, + int* it_f, + int* irec_main_noise_f, + int* islice_selected_rec) { -TRACE("\tadd_source_master_rec_noise_cu"); +TRACE("\tadd_source_main_rec_noise_cu"); Mesh* mp = (Mesh*)(*Mesh_pointer); //get mesh pointer out of fortran integer container int it = *it_f-1; // -1 for Fortran -> C indexing differences - int irec_master_noise = *irec_master_noise_f; + int irec_main_noise = *irec_main_noise_f; dim3 grid(1,1,1); dim3 threads(NGLL3,1,1); - if (mp->myrank == islice_selected_rec[irec_master_noise-1]) { - add_source_master_rec_noise_cuda_kernel<<compute_stream>>>(mp->d_ibool, - mp->d_ispec_selected_rec, - irec_master_noise, - mp->d_accel, - mp->d_noise_sourcearray, - it); + if (mp->myrank == islice_selected_rec[irec_main_noise-1]) { + add_source_main_rec_noise_cuda_kernel<<compute_stream>>>(mp->d_ibool, + mp->d_ispec_selected_rec, + irec_main_noise, + mp->d_accel, + mp->d_noise_sourcearray, + it); - GPU_ERROR_CHECKING("add_source_master_rec_noise_cuda_kernel"); + GPU_ERROR_CHECKING("add_source_main_rec_noise_cuda_kernel"); } } diff --git a/src/cuda/initialize_cuda.cu b/src/cuda/initialize_cuda.cu index 90efd406a..be2fe90d8 100644 --- a/src/cuda/initialize_cuda.cu +++ b/src/cuda/initialize_cuda.cu @@ -181,7 +181,7 @@ void FC_FUNC_(initialize_cuda_device, FILE* fp; int do_output_info; - // by default, only master process outputs device infos to avoid file cluttering + // by default, only main process outputs device infos to avoid file cluttering do_output_info = 0; if (myrank == 0){ do_output_info = 1; diff --git a/src/cuda/specfem3D_gpu_cuda_method_stubs.c b/src/cuda/specfem3D_gpu_cuda_method_stubs.c index ba6513af9..c5e0ad2af 100644 --- a/src/cuda/specfem3D_gpu_cuda_method_stubs.c +++ b/src/cuda/specfem3D_gpu_cuda_method_stubs.c @@ -195,11 +195,11 @@ void FC_FUNC_(compute_add_sources_el_s3_cuda, double* h_stf_pre_compute, int* h_NSOURCES) {} -void FC_FUNC_(add_source_master_rec_noise_cu, - ADD_SOURCE_MASTER_REC_NOISE_CU)(long* Mesh_pointer, - int* it_f, - int* irec_master_noise_f, - int* islice_selected_rec) {} +void FC_FUNC_(add_source_main_rec_noise_cu, + ADD_SOURCE_MAIN_REC_NOISE_CU)(long* Mesh_pointer, + int* it_f, + int* irec_main_noise_f, + int* islice_selected_rec) {} void FC_FUNC_(add_sources_el_sim_type_2_or_3, ADD_SOURCES_EL_SIM_TYPE_2_OR_3)(long* Mesh_pointer, diff --git a/src/decompose_mesh/program_decompose_mesh_mpi.f90 b/src/decompose_mesh/program_decompose_mesh_mpi.f90 index 61804d23c..11329c7a6 100644 --- a/src/decompose_mesh/program_decompose_mesh_mpi.f90 +++ b/src/decompose_mesh/program_decompose_mesh_mpi.f90 @@ -209,7 +209,7 @@ end subroutine read_tmp_in_arg !------------------------------------------- ! ! -! send partitioned arrays form the master to all other process +! send partitioned arrays form the main to all other process ! ! !-------------------------------------------- @@ -218,7 +218,7 @@ subroutine send_partition_mesh_to_all(myrank, ipart, npart) ! ! this should take a long time because we -! use send from master to each other +! use send from main to each other ! in sequential way ! @@ -474,7 +474,7 @@ end subroutine send_partition_mesh_to_all !------------------------------------------------------ ! ! -! send whole arrays from master to other +! send whole arrays from main to other ! (it is small arrays that do not need to be distributed ! except for elmnts_glob) ! diff --git a/src/generate_databases/create_regions_mesh.f90 b/src/generate_databases/create_regions_mesh.f90 index 1e98961f5..af2394560 100644 --- a/src/generate_databases/create_regions_mesh.f90 +++ b/src/generate_databases/create_regions_mesh.f90 @@ -423,7 +423,7 @@ subroutine crm_ext_allocate_arrays(nspec,LOCAL_PATH, & write(IMAIN,*) ' NGNOD = ',NGNOD write(IMAIN,*) ' NGNOD2D = ',NGNOD2D write(IMAIN,*) - write(IMAIN,*) ' master process setup: ' + write(IMAIN,*) ' main process setup: ' write(IMAIN,*) ' nspec = ',nspec write(IMAIN,*) call flush_IMAIN() diff --git a/src/generate_databases/model_external_values.F90 b/src/generate_databases/model_external_values.F90 index 94acf7d41..da11e54b3 100644 --- a/src/generate_databases/model_external_values.F90 +++ b/src/generate_databases/model_external_values.F90 @@ -93,7 +93,7 @@ subroutine model_external_broadcast() ! the variables read are declared and stored in structure MEXT_V if (myrank == 0) call read_external_model() - ! broadcast the information read on the master to the nodes + ! broadcast the information read on the main to the nodes call bcast_all_dp(MEXT_V%dvs, size(MEXT_V%dvs)) end subroutine model_external_broadcast diff --git a/src/generate_databases/model_salton_trough.f90 b/src/generate_databases/model_salton_trough.f90 index 1459d9b70..865f72e02 100644 --- a/src/generate_databases/model_salton_trough.f90 +++ b/src/generate_databases/model_salton_trough.f90 @@ -70,7 +70,7 @@ subroutine model_salton_trough_broadcast() ! the variables read are declared and stored in structure if (myrank == 0) call read_salton_sea_model() - ! broadcast the information read on the master to the nodes + ! broadcast the information read on the main to the nodes call bcast_all_r(vp_array, size(vp_array)) end subroutine model_salton_trough_broadcast diff --git a/src/generate_databases/model_tomography.f90 b/src/generate_databases/model_tomography.f90 index ffefab76c..c141b0bed 100644 --- a/src/generate_databases/model_tomography.f90 +++ b/src/generate_databases/model_tomography.f90 @@ -102,10 +102,10 @@ subroutine model_tomography_broadcast(myrank) ! otherwise: - ! only master reads in model file + ! only main reads in model file !integer, dimension(1) :: nrecord !if (myrank == 0) call read_model_tomography() - ! broadcast the information read on the master to the nodes, e.g. + ! broadcast the information read on the main to the nodes, e.g. !call bcast_all_i(nrecord,1) !if (myrank /= 0) then diff --git a/src/inverse_problem_for_model/input_output/Teleseismic_IO.f90 b/src/inverse_problem_for_model/input_output/Teleseismic_IO.f90 index 2d527f154..e6953cd7d 100644 --- a/src/inverse_problem_for_model/input_output/Teleseismic_IO.f90 +++ b/src/inverse_problem_for_model/input_output/Teleseismic_IO.f90 @@ -73,7 +73,7 @@ subroutine read_acqui_teleseismic_file(acqui_file, acqui_simu, myrank) endif NEVENT=0 - ! only master reads acqui file + ! only main reads acqui file if (myrank == 0) then !! 1/ read to count the number of events open(666,file=trim(acqui_file),iostat=ier) @@ -270,7 +270,7 @@ subroutine read_acqui_teleseismic_file(acqui_file, acqui_simu, myrank) endif - ! master broadcasts read values + ! main broadcasts read values call mpi_bcast(nevent, 1, mpi_integer, 0, my_local_mpi_comm_world, ier) if (myrank > 0) then allocate(acqui_simu(NEVENT),stat=ier) diff --git a/src/inverse_problem_for_model/input_output/input_output_mod.f90 b/src/inverse_problem_for_model/input_output/input_output_mod.f90 index afa55911a..11ace429e 100644 --- a/src/inverse_problem_for_model/input_output/input_output_mod.f90 +++ b/src/inverse_problem_for_model/input_output/input_output_mod.f90 @@ -500,7 +500,7 @@ end subroutine get_mode_running !%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% !---------------------------------------------------------------- -! master write adjoint sources gather to check +! main write adjoint sources gather to check !---------------------------------------------------------------- subroutine dump_adjoint_sources(iter, ievent, acqui_simu, myrank) @@ -522,7 +522,7 @@ subroutine dump_adjoint_sources(iter, ievent, acqui_simu, myrank) end subroutine dump_adjoint_sources !%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% !---------------------------------------------------------------- -! master write synthetics gather to check +! main write synthetics gather to check !---------------------------------------------------------------- subroutine dump_seismograms(iter, ievent, array_to_write, acqui_simu, myrank) @@ -544,7 +544,7 @@ subroutine dump_seismograms(iter, ievent, array_to_write, acqui_simu, myrank) end subroutine dump_seismograms !%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% !---------------------------------------------------------------- -! master write synthetics gather to check +! main write synthetics gather to check !---------------------------------------------------------------- subroutine dump_filtered_data(iter, ievent, array_to_write, acqui_simu, myrank) @@ -566,7 +566,7 @@ subroutine dump_filtered_data(iter, ievent, array_to_write, acqui_simu, myrank) end subroutine dump_filtered_data !%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% !---------------------------------------------------------------- -! master write waveform synthetic data gather (need to choose between write_bin_sismo_on_disk or write_gather_on_disk) +! main write waveform synthetic data gather (need to choose between write_bin_sismo_on_disk or write_gather_on_disk) !---------------------------------------------------------------- subroutine write_bin_sismo_on_disk(ievent, acqui_simu, array_to_write, name_file_to_write, myrank) @@ -697,7 +697,7 @@ end subroutine write_bin_sismo_on_disk !%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% !---------------------------------------------------------------- -! master read waveform data gather and bcast to MPI slice concerned +! main read waveform data gather and bcast to MPI slice concerned !---------------------------------------------------------------- subroutine read_data_gather(acqui_simu, myrank) @@ -872,7 +872,7 @@ end subroutine read_data_gather !%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% !---------------------------------------------------------------- -! master read waveform data gather and bcast to MPI slice concerned +! main read waveform data gather and bcast to MPI slice concerned !---------------------------------------------------------------- subroutine read_pif_data_gather(acqui_simu, inversion_param, myrank) @@ -1372,7 +1372,7 @@ subroutine read_acqui_file(acqui_file, acqui_simu, myrank) write(INVERSE_LOG_FILE,*) endif - ! only master reads acqui file + ! only main reads acqui file if (myrank == 0) then !! 1/ read to count the number of events @@ -1501,7 +1501,7 @@ subroutine read_acqui_file(acqui_file, acqui_simu, myrank) write(INVERSE_LOG_FILE,*) ' READING acquisition passed ' endif - ! master broadcasts read values + ! main broadcasts read values call MPI_BCAST(NEVENT,1,MPI_INTEGER,0,my_local_mpi_comm_world,ier) if (myrank > 0) then allocate(acqui_simu(NEVENT),stat=ier) @@ -1544,7 +1544,7 @@ subroutine read_inver_file(inver_file, acqui_simu, inversion_param, myrank) character(len=MAX_LEN_STRING) :: line, keyw integer :: ipos0,ipos1,ier - ! only master reads inver_file + ! only main reads inver_file if (myrank == 0) then open(666, file=trim(inver_file)) @@ -1713,7 +1713,7 @@ subroutine read_inver_file(inver_file, acqui_simu, inversion_param, myrank) inversion_param%dump_descent_direction_at_each_iteration=.true. endif - ! master broadcasts read values + ! main broadcasts read values call MPI_BCAST(inversion_param%Niter,1,MPI_INTEGER,0,my_local_mpi_comm_world,ier) call MPI_BCAST(inversion_param%Niter_wolfe,1,MPI_INTEGER,0,my_local_mpi_comm_world,ier) call MPI_BCAST(inversion_param%max_history_bfgs,1,MPI_INTEGER,0,my_local_mpi_comm_world,ier) @@ -2120,7 +2120,7 @@ subroutine get_point_source(acqui_simu) if (USE_FORCE_POINT_SOURCE) then ! point forces if (myrank == 0) then - ! only master process reads in FORCESOLUTION file + ! only main process reads in FORCESOLUTION file call get_force(filename,acqui_simu(ievent)%tshift,acqui_simu(ievent)%hdur, & lat,long,depth,NSOURCES,min_tshift,factor_force_source, & Fx,Fy,Fz,acqui_simu(ievent)%user_source_time_function) @@ -2133,7 +2133,7 @@ subroutine get_point_source(acqui_simu) else ! CMT moment tensors if (myrank == 0) then - ! only master process reads in CMTSOLUTION file + ! only main process reads in CMTSOLUTION file call get_cmt(filename,acqui_simu(ievent)%tshift,acqui_simu(ievent)%hdur,lat,long,depth,moment_tensor, & DT,NSOURCES,min_tshift,acqui_simu(ievent)%user_source_time_function) endif @@ -2141,7 +2141,7 @@ subroutine get_point_source(acqui_simu) call bcast_all_dp(moment_tensor,6*NSOURCES) endif - ! broadcasts general source information read on the master to the nodes + ! broadcasts general source information read on the main to the nodes call bcast_all_dp(acqui_simu(ievent)%tshift,NSOURCES) call bcast_all_dp(acqui_simu(ievent)%hdur,NSOURCES) call bcast_all_dp(lat,NSOURCES) diff --git a/src/inverse_problem_for_source/CMT3D/scripts/plot_socal_events.pl b/src/inverse_problem_for_source/CMT3D/scripts/plot_socal_events.pl index a4260039f..0abe22cda 100755 --- a/src/inverse_problem_for_source/CMT3D/scripts/plot_socal_events.pl +++ b/src/inverse_problem_for_source/CMT3D/scripts/plot_socal_events.pl @@ -2,7 +2,7 @@ # this script plots given station and cmt files on # a southern california topography map. -# Special thanks to Carl's master script and his effort +# Special thanks to Carl's main script and his effort # of putting together the topo-bathymetry grid file for # this region diff --git a/src/inverse_problem_for_source/CMT3D/scripts/process_data_and_syn.pl b/src/inverse_problem_for_source/CMT3D/scripts/process_data_and_syn.pl index 8416fb7b6..4b0c3b780 100755 --- a/src/inverse_problem_for_source/CMT3D/scripts/process_data_and_syn.pl +++ b/src/inverse_problem_for_source/CMT3D/scripts/process_data_and_syn.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl -w -# again this is partly based on Carl's master script +# again this is partly based on Carl's main script use Getopt::Std; use POSIX; use vars qw($opt_0 $opt_1 $opt_2 $opt_3 $opt_t $opt_x); diff --git a/src/meshfem3D/determine_cavity.f90 b/src/meshfem3D/determine_cavity.f90 index 110f43e2b..040693f2b 100644 --- a/src/meshfem3D/determine_cavity.f90 +++ b/src/meshfem3D/determine_cavity.f90 @@ -358,7 +358,7 @@ subroutine cmm_determine_cavity(nglob) !print *,'cavity boundary:',myrank,'array:',cavity_boundary(:,:) - ! collects on master processes + ! collects on main processes if (myrank == 0) then allocate(tmp_all(4,num_cav_total*4),stat=ier) if (ier /= 0) call exit_MPI_without_rank('error allocating array 1329') diff --git a/src/shared/exit_mpi.f90 b/src/shared/exit_mpi.f90 index 182b6ce39..6941bd4e0 100644 --- a/src/shared/exit_mpi.f90 +++ b/src/shared/exit_mpi.f90 @@ -93,7 +93,7 @@ subroutine flush_IMAIN() implicit none - ! only master process writes out to main output file + ! only main process writes out to main output file ! file I/O in Fortran is buffered by default ! ! note: Fortran2003 includes a FLUSH statement diff --git a/src/shared/init_openmp.F90 b/src/shared/init_openmp.F90 index 48c4f7ce0..85e61a300 100644 --- a/src/shared/init_openmp.F90 +++ b/src/shared/init_openmp.F90 @@ -55,7 +55,7 @@ subroutine init_openmp() ! gets total number of threads for this MPI process num_threads = OMP_GET_NUM_THREADS() - ! OpenMP master thread only + ! OpenMP main thread only if (thread_id == 0) then ! gets additional environment info num_procs = OMP_GET_NUM_PROCS() diff --git a/src/shared/parallel.f90 b/src/shared/parallel.f90 index 553d069bb..febfae902 100644 --- a/src/shared/parallel.f90 +++ b/src/shared/parallel.f90 @@ -87,7 +87,7 @@ subroutine init_mpi() ! thus read the parameter file call MPI_COMM_RANK(MPI_COMM_WORLD,myrank,ier) if (myrank == 0) then - call open_parameter_file_from_master_only(ier) + call open_parameter_file_from_main_only(ier) ! we need to make sure that NUMBER_OF_SIMULTANEOUS_RUNS and BROADCAST_SAME_MESH_AND_MODEL are read call read_value_integer(NUMBER_OF_SIMULTANEOUS_RUNS, 'NUMBER_OF_SIMULTANEOUS_RUNS', ier) if (ier /= 0) stop 'Error reading Par_file parameter NUMBER_OF_SIMULTANEOUS_RUNS' @@ -97,7 +97,7 @@ subroutine init_mpi() call close_parameter_file() endif - ! broadcast parameters read from master to all processes + ! broadcast parameters read from main to all processes my_local_mpi_comm_world = MPI_COMM_WORLD call bcast_all_singlei(NUMBER_OF_SIMULTANEOUS_RUNS) call bcast_all_singlel(BROADCAST_SAME_MESH_AND_MODEL) diff --git a/src/shared/read_parameter_file.F90 b/src/shared/read_parameter_file.F90 index 5b9289ee2..7bb159d6e 100644 --- a/src/shared/read_parameter_file.F90 +++ b/src/shared/read_parameter_file.F90 @@ -41,7 +41,7 @@ subroutine read_parameter_file(BROADCAST_AFTER_READ) integer :: ier logical :: some_parameters_missing_from_Par_file - ! read from a single processor (the master) and then use MPI to broadcast to others + ! read from a single processor (the main) and then use MPI to broadcast to others ! to avoid an I/O bottleneck in the case of very large runs if (myrank == 0) then @@ -510,10 +510,10 @@ subroutine read_parameter_file(BROADCAST_AFTER_READ) write(*,*) endif - call read_value_logical(WRITE_SEISMOGRAMS_BY_MASTER, 'WRITE_SEISMOGRAMS_BY_MASTER', ier) + call read_value_logical(WRITE_SEISMOGRAMS_BY_MAIN, 'WRITE_SEISMOGRAMS_BY_MAIN', ier) if (ier /= 0) then some_parameters_missing_from_Par_file = .true. - write(*,'(a)') 'WRITE_SEISMOGRAMS_BY_MASTER = .false.' + write(*,'(a)') 'WRITE_SEISMOGRAMS_BY_MAIN = .false.' write(*,*) endif @@ -788,7 +788,7 @@ subroutine read_parameter_file(BROADCAST_AFTER_READ) endif ! of if (myrank == 0) then - ! read from a single processor (the master) and then use MPI to broadcast to others + ! read from a single processor (the main) and then use MPI to broadcast to others ! to avoid an I/O bottleneck in the case of very large runs if (BROADCAST_AFTER_READ) call broadcast_computed_parameters() @@ -916,7 +916,7 @@ end subroutine check_simulation_parameters subroutine read_compute_parameters() ! computes additional parameters -! (only executed by master process) +! (only executed by main process) use constants use shared_parameters @@ -1099,7 +1099,7 @@ end subroutine read_compute_parameters subroutine get_number_of_sources(sources_filename) ! determines number of sources depending on number of lines in source file -! (only executed by master process) +! (only executed by main process) use constants, only: IIN,IN_DATA_FILES,HUGEVAL,TINYVAL, & NLINES_PER_CMTSOLUTION_SOURCE,NLINES_PER_FORCESOLUTION_SOURCE @@ -1331,7 +1331,7 @@ subroutine broadcast_computed_parameters() call bcast_all_singlel(USE_BINARY_FOR_SEISMOGRAMS) call bcast_all_singlel(SU_FORMAT) call bcast_all_singlel(ASDF_FORMAT) - call bcast_all_singlel(WRITE_SEISMOGRAMS_BY_MASTER) + call bcast_all_singlel(WRITE_SEISMOGRAMS_BY_MAIN) call bcast_all_singlel(SAVE_ALL_SEISMOS_IN_ONE_FILE) call bcast_all_singlel(USE_TRICK_FOR_BETTER_PRESSURE) diff --git a/src/shared/read_value_parameters.f90 b/src/shared/read_value_parameters.f90 index ab89ecc3b..3ef0993fc 100644 --- a/src/shared/read_value_parameters.f90 +++ b/src/shared/read_value_parameters.f90 @@ -99,7 +99,7 @@ end subroutine read_value_string !-------------------- - subroutine open_parameter_file_from_master_only(ier) + subroutine open_parameter_file_from_main_only(ier) use constants, only: MAX_STRING_LEN,IN_DATA_FILES @@ -112,7 +112,7 @@ subroutine open_parameter_file_from_master_only(ier) filename_main = IN_DATA_FILES(1:len_trim(IN_DATA_FILES))//'Par_file' ! also see if we are running several independent runs in parallel -! to do so, add the right directory for that run for the master process only here +! to do so, add the right directory for that run for the main process only here filename_run0001 = 'run0001/'//filename_main(1:len_trim(filename_main)) call param_open(filename_main, len(filename_main), ier) @@ -153,7 +153,7 @@ subroutine open_parameter_file_from_master_only(ier) endif endif - end subroutine open_parameter_file_from_master_only + end subroutine open_parameter_file_from_main_only !-------------------- diff --git a/src/shared/save_header_file.f90 b/src/shared/save_header_file.f90 index 2efbd9a11..a9f300fab 100644 --- a/src/shared/save_header_file.f90 +++ b/src/shared/save_header_file.f90 @@ -79,7 +79,7 @@ subroutine save_header_file(NSPEC_AB,NGLOB_AB,NPROC, & write(IOUT,*) '! min vector length = ',NGLLSQUARE write(IOUT,*) '! min critical vector length = ',NGLLSQUARE * NDIM write(IOUT,*) '!' - write(IOUT,*) '! master process: total points per AB slice = ',NGLOB_AB + write(IOUT,*) '! main process: total points per AB slice = ',NGLOB_AB write(IOUT,*) '! total elements per AB slice = (will be read in external file)' write(IOUT,*) '! total points per AB slice = (will be read in external file)' write(IOUT,*) '!' diff --git a/src/shared/shared_par.F90 b/src/shared/shared_par.F90 index 07498da1b..2943d2641 100644 --- a/src/shared/shared_par.F90 +++ b/src/shared/shared_par.F90 @@ -141,7 +141,7 @@ module shared_input_parameters integer :: NTSTEP_BETWEEN_OUTPUT_SEISMOS,NTSTEP_BETWEEN_READ_ADJSRC logical :: SAVE_SEISMOGRAMS_DISPLACEMENT,SAVE_SEISMOGRAMS_VELOCITY,SAVE_SEISMOGRAMS_ACCELERATION,SAVE_SEISMOGRAMS_PRESSURE logical :: SAVE_SEISMOGRAMS_IN_ADJOINT_RUN - logical :: WRITE_SEISMOGRAMS_BY_MASTER,SAVE_ALL_SEISMOS_IN_ONE_FILE,USE_BINARY_FOR_SEISMOGRAMS,SU_FORMAT + logical :: WRITE_SEISMOGRAMS_BY_MAIN,SAVE_ALL_SEISMOS_IN_ONE_FILE,USE_BINARY_FOR_SEISMOGRAMS,SU_FORMAT logical :: ASDF_FORMAT, READ_ADJSRC_ASDF ! sources diff --git a/src/specfem3D/compute_add_sources_viscoelastic.F90 b/src/specfem3D/compute_add_sources_viscoelastic.F90 index d222784ff..4cdb51ad8 100644 --- a/src/specfem3D/compute_add_sources_viscoelastic.F90 +++ b/src/specfem3D/compute_add_sources_viscoelastic.F90 @@ -43,7 +43,7 @@ subroutine compute_add_sources_viscoelastic() use specfem_par_elastic, only: accel,ispec_is_elastic - use specfem_par_noise, only: noise_sourcearray,irec_master_noise, & + use specfem_par_noise, only: noise_sourcearray,irec_main_noise, & normal_x_noise,normal_y_noise,normal_z_noise,mask_noise,noise_surface_movie use shared_parameters, only: COUPLE_WITH_INJECTION_TECHNIQUE @@ -241,10 +241,10 @@ subroutine compute_add_sources_viscoelastic() ! hence, instead of a moment tensor 'sourcearrays', a 'noise_sourcearray' for a point force is needed. ! furthermore, the CMTSOLUTION needs to be zero, i.e., no earthquakes. ! now this must be manually set in DATA/CMTSOLUTION, by USERS. - call add_source_master_rec_noise(nrec,NSTEP,accel,noise_sourcearray, & - ibool,islice_selected_rec,ispec_selected_rec, & - it,irec_master_noise, & - NSPEC_AB,NGLOB_AB) + call add_source_main_rec_noise(nrec,NSTEP,accel,noise_sourcearray, & + ibool,islice_selected_rec,ispec_selected_rec, & + it,irec_main_noise, & + NSPEC_AB,NGLOB_AB) else if (NOISE_TOMOGRAPHY == 2) then ! second step of noise tomography, i.e., read the surface movie saved at every timestep ! use the movie to drive the ensemble forward wavefield @@ -455,7 +455,7 @@ subroutine compute_add_sources_viscoelastic_GPU() source_adjoint,nadj_rec_local,number_adjsources_global, & INVERSE_FWI_FULL_PROBLEM,GPU_MODE - use specfem_par_noise, only: irec_master_noise,noise_surface_movie + use specfem_par_noise, only: irec_main_noise,noise_surface_movie use shared_parameters, only: COUPLE_WITH_INJECTION_TECHNIQUE @@ -646,7 +646,7 @@ subroutine compute_add_sources_viscoelastic_GPU() ! hence, instead of a moment tensor 'sourcearrays', a 'noise_sourcearray' for a point force is needed. ! furthermore, the CMTSOLUTION needs to be zero, i.e., no earthquakes. ! now this must be manually set in DATA/CMTSOLUTION, by USERS. - call add_source_master_rec_noise_cu(Mesh_pointer,it,irec_master_noise,islice_selected_rec) + call add_source_main_rec_noise_cu(Mesh_pointer,it,irec_main_noise,islice_selected_rec) else if (NOISE_TOMOGRAPHY == 2) then ! second step of noise tomography, i.e., read the surface movie saved at every timestep ! use the movie to drive the ensemble forward wavefield diff --git a/src/specfem3D/compute_energy.f90 b/src/specfem3D/compute_energy.f90 index 22fad13a9..69fe972aa 100644 --- a/src/specfem3D/compute_energy.f90 +++ b/src/specfem3D/compute_energy.f90 @@ -451,7 +451,7 @@ subroutine compute_energy_generic_slow() call sum_all_dp(potential_energy,potential_energy_glob) total_energy_glob = kinetic_energy_glob + potential_energy_glob -! write the total to disk from the master +! write the total to disk from the main if (myrank == 0) write(IOUT_ENERGY,*) it,sngl(kinetic_energy_glob),sngl(potential_energy_glob),sngl(total_energy_glob) end subroutine compute_energy_generic_slow @@ -857,7 +857,7 @@ subroutine compute_energy_fast_Deville() call sum_all_dp(potential_energy,potential_energy_glob) total_energy_glob = kinetic_energy_glob + potential_energy_glob -! write the total to disk from the master +! write the total to disk from the main if (myrank == 0) write(IOUT_ENERGY,*) it,sngl(kinetic_energy_glob),sngl(potential_energy_glob),sngl(total_energy_glob) contains diff --git a/src/specfem3D/couple_with_injection.f90 b/src/specfem3D/couple_with_injection.f90 index 9e8727889..f576e16f1 100644 --- a/src/specfem3D/couple_with_injection.f90 +++ b/src/specfem3D/couple_with_injection.f90 @@ -1379,7 +1379,7 @@ subroutine ReadFKModelInput(Xmin_box, Xmax_box, Ymin_box, Ymax_box, Zmin_box) ! TIME_WINDOW tmax_fk !!---------------------------------------------------------------- - ! only master process reads + ! only main process reads if (myrank /= 0) return !! set default values diff --git a/src/specfem3D/create_color_image.f90 b/src/specfem3D/create_color_image.f90 index 4c6b4a559..e3226c026 100644 --- a/src/specfem3D/create_color_image.f90 +++ b/src/specfem3D/create_color_image.f90 @@ -475,7 +475,7 @@ subroutine write_PNM_vp_background() ! MPI assembling array image_color_vp_display on process zero for color output if (NPROC > 1) then - ! master collects + ! main collects if (myrank == 0) then do iproc = 1, NPROC-1 if (nb_pixel_per_proc(iproc) > 0) then @@ -490,7 +490,7 @@ subroutine write_PNM_vp_background() enddo else if (nb_pixel_loc > 0) then - ! slave processes send + ! secondary processes send call sendv_cr(data_pixel_send,nb_pixel_loc,0,43) endif endif @@ -574,13 +574,13 @@ subroutine write_PNM_create_image() enddo else if (nb_pixel_loc > 0) then - ! slave processes send + ! secondary processes send call sendv_cr(data_pixel_send(1),nb_pixel_loc,0,43) endif endif endif - ! master process writes out file + ! main process writes out file if (myrank == 0) then ! writes output file call write_PNM_data(image_color_data,iglob_image_color, & diff --git a/src/specfem3D/fault_solver_dynamic.f90 b/src/specfem3D/fault_solver_dynamic.f90 index e05316b05..33d8f5f19 100644 --- a/src/specfem3D/fault_solver_dynamic.f90 +++ b/src/specfem3D/fault_solver_dynamic.f90 @@ -1499,7 +1499,7 @@ subroutine init_dataXZ(dataXZ,bc) bc%dataXZ_all%npoin = npoin_all - ! only master ranks needs to allocate gathering arrays **_all + ! only main ranks needs to allocate gathering arrays **_all if (myrank == 0) then allocate(bc%dataXZ_all%xcoord(npoin_all),stat=ier) if (ier /= 0) call exit_MPI_without_rank('error allocating array 1404') diff --git a/src/specfem3D/get_elevation.f90 b/src/specfem3D/get_elevation.f90 index e8ce4f029..ac39997e2 100644 --- a/src/specfem3D/get_elevation.f90 +++ b/src/specfem3D/get_elevation.f90 @@ -85,7 +85,7 @@ subroutine get_elevation_and_z_coordinate_all(npoints,plon,plat,pbur,utm_x,utm_y if (ier /= 0) stop 'Error allocating elevation arrays' if (myrank == 0) then - ! only master gathers all + ! only main gathers all allocate(elevation_all(npoints,0:NPROC-1),stat=ier) if (ier /= 0) call exit_MPI_without_rank('error allocating array 2185') allocate(elevation_distmin_all(npoints,0:NPROC-1),stat=ier) @@ -117,7 +117,7 @@ subroutine get_elevation_and_z_coordinate_all(npoints,plon,plat,pbur,utm_x,utm_y call gather_all_dp(elevation,npoints,elevation_all,npoints,NPROC) call gather_all_dp(elevation_distmin,npoints,elevation_distmin_all,npoints,NPROC) - ! master process selects closest + ! main process selects closest if (myrank == 0) then ! loops over all receivers do ipoin = 1,npoints @@ -142,7 +142,7 @@ subroutine get_elevation_and_z_coordinate_all(npoints,plon,plat,pbur,utm_x,utm_y ! free temporary arrays deallocate(elevation_distmin,elevation_all,elevation_distmin_all) - ! master broadcasts to all slices + ! main broadcasts to all slices call bcast_all_dp(z_target,npoints) end subroutine get_elevation_and_z_coordinate_all diff --git a/src/specfem3D/locate_MPI_slice.f90 b/src/specfem3D/locate_MPI_slice.f90 index c6fe359fd..8cf39b3f4 100644 --- a/src/specfem3D/locate_MPI_slice.f90 +++ b/src/specfem3D/locate_MPI_slice.f90 @@ -80,7 +80,7 @@ subroutine locate_MPI_slice(npoints_subset,ipoin_already_done, & z_found_all(:,:) = 0.d0 final_distance_all(:,:) = HUGEVAL - ! gather all (on master process) + ! gather all (on main process) call gather_all_i(ispec_selected_subset,npoints_subset,ispec_selected_all,npoints_subset,NPROC) call gather_all_i(idomain_subset,npoints_subset,idomain_all,npoints_subset,NPROC) diff --git a/src/specfem3D/locate_receivers.f90 b/src/specfem3D/locate_receivers.f90 index f112a9a14..7a7256761 100644 --- a/src/specfem3D/locate_receivers.f90 +++ b/src/specfem3D/locate_receivers.f90 @@ -255,7 +255,7 @@ subroutine locate_receivers(rec_filename,nrec,islice_selected_rec,ispec_selected endif enddo ! loop over subset - ! master process locates best location in all slices + ! main process locates best location in all slices call locate_MPI_slice(nrec_subset_current_size,irec_already_done, & ispec_selected_rec_subset, & x_found_subset, y_found_subset, z_found_subset, & @@ -268,11 +268,11 @@ subroutine locate_receivers(rec_filename,nrec,islice_selected_rec,ispec_selected enddo ! loop over stations - ! bcast from master process + ! bcast from main process call bcast_all_i(islice_selected_rec,nrec) - ! note: in principle, only islice must be updated on all slave processes, the ones containing the best location + ! note: in principle, only islice must be updated on all secondary processes, the ones containing the best location ! could have valid entries in all other arrays set before already. - ! nevertheless, for convenience we broadcast all needed receiver arrays back to the slaves + ! nevertheless, for convenience we broadcast all needed receiver arrays back to the secondarys call bcast_all_i(idomain,nrec) call bcast_all_i(ispec_selected_rec,nrec) @@ -291,7 +291,7 @@ subroutine locate_receivers(rec_filename,nrec,islice_selected_rec,ispec_selected allocate(is_CPML_rec(nrec),stat=ier) if (ier /= 0) call exit_MPI(myrank,'Error allocating is_CPML_rec array') if (myrank == 0) then - ! only master collects + ! only main collects allocate(is_CPML_rec_all(nrec),stat=ier) else ! dummy diff --git a/src/specfem3D/locate_source.F90 b/src/specfem3D/locate_source.F90 index a6c968872..1eb52f896 100644 --- a/src/specfem3D/locate_source.F90 +++ b/src/specfem3D/locate_source.F90 @@ -155,7 +155,7 @@ subroutine locate_source(filename,tshift_src,min_tshift_src_original,utm_x_sourc if (USE_FORCE_POINT_SOURCE) then ! point forces if (myrank == 0) then - ! only master process reads in FORCESOLUTION file + ! only main process reads in FORCESOLUTION file call get_force(filename,tshift_src,hdur,lat,long,depth,NSOURCES,min_tshift_src_original,factor_force_source, & comp_dir_vect_source_E,comp_dir_vect_source_N,comp_dir_vect_source_Z_UP, & user_source_time_function) @@ -168,7 +168,7 @@ subroutine locate_source(filename,tshift_src,min_tshift_src_original,utm_x_sourc else ! CMT moment tensors if (myrank == 0) then - ! only master process reads in CMTSOLUTION file + ! only main process reads in CMTSOLUTION file call get_cmt(filename,tshift_src,hdur,lat,long,depth,moment_tensor, & DT,NSOURCES,min_tshift_src_original,user_source_time_function) endif @@ -176,7 +176,7 @@ subroutine locate_source(filename,tshift_src,min_tshift_src_original,utm_x_sourc call bcast_all_dp(moment_tensor,6*NSOURCES) endif - ! broadcasts general source information read on the master to the nodes + ! broadcasts general source information read on the main to the nodes call bcast_all_dp(tshift_src,NSOURCES) call bcast_all_dp(hdur,NSOURCES) call bcast_all_dp(lat,NSOURCES) @@ -289,7 +289,7 @@ subroutine locate_source(filename,tshift_src,min_tshift_src_original,utm_x_sourc endif enddo ! loop over subset - ! master process locates best location in all slices + ! main process locates best location in all slices call locate_MPI_slice(nsources_subset_current_size,isources_already_done, & ispec_selected_source_subset, & x_found_subset, y_found_subset, z_found_subset, & @@ -302,7 +302,7 @@ subroutine locate_source(filename,tshift_src,min_tshift_src_original,utm_x_sourc enddo ! end of loop on all the sources - ! bcast from master process + ! bcast from main process call bcast_all_i(islice_selected_source,NSOURCES) call bcast_all_i(idomain,NSOURCES) call bcast_all_i(ispec_selected_source,NSOURCES) @@ -322,7 +322,7 @@ subroutine locate_source(filename,tshift_src,min_tshift_src_original,utm_x_sourc allocate(is_CPML_source(NSOURCES),stat=ier) if (ier /= 0) call exit_MPI(myrank,'Error allocating is_CPML_source array') if (myrank == 0) then - ! only master collects + ! only main collects allocate(is_CPML_source_all(NSOURCES),stat=ier) else ! dummy diff --git a/src/specfem3D/noise_tomography.f90 b/src/specfem3D/noise_tomography.f90 index 1d70752ce..80782f2e2 100644 --- a/src/specfem3D/noise_tomography.f90 +++ b/src/specfem3D/noise_tomography.f90 @@ -239,7 +239,7 @@ subroutine read_parameters_noise(nrec,NSTEP,nmovie_points, & noise_sourcearray,xigll,yigll,zigll, & ibool, & xstore,ystore,zstore, & - irec_master_noise,normal_x_noise,normal_y_noise,normal_z_noise,mask_noise, & + irec_main_noise,normal_x_noise,normal_y_noise,normal_z_noise,mask_noise, & nspec,nglob, & num_free_surface_faces,free_surface_ispec,free_surface_ijk, & ispec_is_acoustic) @@ -270,7 +270,7 @@ subroutine read_parameters_noise(nrec,NSTEP,nmovie_points, & logical, dimension(nspec),intent(in) :: ispec_is_acoustic ! output parameters - integer,intent(inout) :: irec_master_noise + integer,intent(inout) :: irec_main_noise real(kind=CUSTOM_REAL),intent(inout) :: noise_sourcearray(NDIM,NGLLX,NGLLY,NGLLZ,NSTEP) real(kind=CUSTOM_REAL), dimension(nmovie_points),intent(inout) :: normal_x_noise,normal_y_noise,normal_z_noise,mask_noise @@ -279,52 +279,52 @@ subroutine read_parameters_noise(nrec,NSTEP,nmovie_points, & real(kind=CUSTOM_REAL) :: normal_x_noise_out,normal_y_noise_out,normal_z_noise_out,mask_noise_out character(len=MAX_STRING_LEN) :: filename - ! read master receiver ID -- the ID in "STATIONS" - filename = trim(OUTPUT_FILES)//'/..//NOISE_TOMOGRAPHY/irec_master_noise' + ! read main receiver ID -- the ID in "STATIONS" + filename = trim(OUTPUT_FILES)//'/..//NOISE_TOMOGRAPHY/irec_main_noise' open(unit=IIN_NOISE,file=trim(filename),status='old',action='read',iostat=ier) if (ier /= 0) & - call exit_MPI(myrank, 'file '//trim(filename)//' does NOT exist! This file contains the ID of the master receiver') + call exit_MPI(myrank, 'file '//trim(filename)//' does NOT exist! This file contains the ID of the main receiver') - read(IIN_NOISE,*,iostat=ier) irec_master_noise - if (ier /= 0) call exit_MPI(myrank,'error reading file irec_master_noise') + read(IIN_NOISE,*,iostat=ier) irec_main_noise + if (ier /= 0) call exit_MPI(myrank,'error reading file irec_main_noise') close(IIN_NOISE) ! user output if (myrank == 0) then - write(IMAIN,*) ' master station: ID = ',irec_master_noise + write(IMAIN,*) ' main station: ID = ',irec_main_noise call flush_IMAIN() endif ! checks value - if (irec_master_noise <= 0 .or. irec_master_noise > nrec) then - print *,'Error: irec_master_noise value:',irec_master_noise,'must be positive and less than ',nrec - call exit_MPI(myrank,'error irec_master_noise value') + if (irec_main_noise <= 0 .or. irec_main_noise > nrec) then + print *,'Error: irec_main_noise value:',irec_main_noise,'must be positive and less than ',nrec + call exit_MPI(myrank,'error irec_main_noise value') endif - ! writes out master as file info + ! writes out main as file info if (myrank == 0) then - open(unit=IOUT_NOISE,file=trim(OUTPUT_FILES)//'/irec_master_noise', & + open(unit=IOUT_NOISE,file=trim(OUTPUT_FILES)//'/irec_main_noise', & status='unknown',action='write',iostat=ier) - if (ier /= 0) call exit_MPI(myrank,'error opening file '//trim(OUTPUT_FILES)//'/irec_master_noise') - write(IOUT_NOISE,*) 'The master receiver is: (RECEIVER ID)', irec_master_noise + if (ier /= 0) call exit_MPI(myrank,'error opening file '//trim(OUTPUT_FILES)//'/irec_main_noise') + write(IOUT_NOISE,*) 'The main receiver is: (RECEIVER ID)', irec_main_noise close(IOUT_NOISE) endif ! user output if (myrank == 0) then - write(IMAIN,*) ' master station: xi/eta/gamma = ', & - sngl(xi_receiver(irec_master_noise)),sngl(eta_receiver(irec_master_noise)),sngl(gamma_receiver(irec_master_noise)) - write(IMAIN,*) ' master station: in slice ',islice_selected_rec(irec_master_noise) + write(IMAIN,*) ' main station: xi/eta/gamma = ', & + sngl(xi_receiver(irec_main_noise)),sngl(eta_receiver(irec_main_noise)),sngl(gamma_receiver(irec_main_noise)) + write(IMAIN,*) ' main station: in slice ',islice_selected_rec(irec_main_noise) call flush_IMAIN() endif ! compute source arrays for "ensemble forward source", which is source of "ensemble forward wavefield" - if (myrank == islice_selected_rec(irec_master_noise) .or. myrank == 0) then ! myrank == 0 is used for output only - call compute_arrays_source_noise(xi_receiver(irec_master_noise), & - eta_receiver(irec_master_noise), & - gamma_receiver(irec_master_noise), & - nu_rec(:,:,irec_master_noise),noise_sourcearray, & + if (myrank == islice_selected_rec(irec_main_noise) .or. myrank == 0) then ! myrank == 0 is used for output only + call compute_arrays_source_noise(xi_receiver(irec_main_noise), & + eta_receiver(irec_main_noise), & + gamma_receiver(irec_main_noise), & + nu_rec(:,:,irec_main_noise),noise_sourcearray, & xigll,yigll,zigll,NSTEP) endif @@ -491,15 +491,15 @@ subroutine compute_arrays_source_noise(xi_noise,eta_noise,gamma_noise, & double precision, dimension(NGLLX) :: xigll double precision, dimension(NGLLY) :: yigll double precision, dimension(NGLLZ) :: zigll - double precision, dimension(NDIM,NDIM) :: nu_single ! rotation matrix at the master receiver + double precision, dimension(NDIM,NDIM) :: nu_single ! rotation matrix at the main receiver ! output parameters real(kind=CUSTOM_REAL) :: noise_sourcearray(NDIM,NGLLX,NGLLY,NGLLZ,NSTEP) ! local parameters integer itime, i, j, k, ier, nlines real(kind=CUSTOM_REAL) :: junk real(kind=CUSTOM_REAL) :: noise_src(NSTEP),noise_src_u(NDIM,NSTEP) - double precision, dimension(NDIM) :: nu_master ! component direction chosen at the master receiver - double precision :: xi_noise, eta_noise, gamma_noise ! master receiver location + double precision, dimension(NDIM) :: nu_main ! component direction chosen at the main receiver + double precision :: xi_noise, eta_noise, gamma_noise ! main receiver location ! receiver Lagrange interpolators double precision,dimension(NGLLX) :: hxir @@ -509,15 +509,15 @@ subroutine compute_arrays_source_noise(xi_noise,eta_noise,gamma_noise, & character(len=MAX_STRING_LEN) :: filename - ! master receiver component direction, \nu_master - filename = trim(OUTPUT_FILES)//'/..//NOISE_TOMOGRAPHY/nu_master' + ! main receiver component direction, \nu_main + filename = trim(OUTPUT_FILES)//'/..//NOISE_TOMOGRAPHY/nu_main' open(unit=IIN_NOISE,file=trim(filename),status='old',action='read',iostat=ier) if (ier /= 0 .and. myrank == 0) & call exit_MPI(myrank, & - 'file '//trim(filename)//' does NOT exist! nu_master is the component direction (ENZ) for master receiver') + 'file '//trim(filename)//' does NOT exist! nu_main is the component direction (ENZ) for main receiver') do itime = 1,3 - read(IIN_NOISE,*,iostat=ier) nu_master(itime) + read(IIN_NOISE,*,iostat=ier) nu_main(itime) if (ier /= 0 .and. myrank == 0) & call exit_MPI(myrank, & 'file '//trim(filename)//' has wrong length, the vector should have three components (ENZ)') @@ -526,14 +526,14 @@ subroutine compute_arrays_source_noise(xi_noise,eta_noise,gamma_noise, & ! user output if (myrank == 0) then - write(IMAIN,*) ' master station: direction vector nu = ',nu_master(:) + write(IMAIN,*) ' main station: direction vector nu = ',nu_main(:) call flush_IMAIN() endif ! outputs to file for checking if (myrank == 0) then - open(unit=IOUT_NOISE,file=trim(OUTPUT_FILES)//'nu_master',status='unknown',action='write') - write(IOUT_NOISE,*) 'The direction (ENZ) of selected component of master receiver is', nu_master + open(unit=IOUT_NOISE,file=trim(OUTPUT_FILES)//'nu_main',status='unknown',action='write') + write(IOUT_NOISE,*) 'The direction (ENZ) of selected component of main receiver is', nu_main close(IOUT_NOISE) endif @@ -587,9 +587,9 @@ subroutine compute_arrays_source_noise(xi_noise,eta_noise,gamma_noise, & ! rotates to Cartesian do itime = 1, NSTEP - noise_src_u(:,itime) = nu_single(1,:) * noise_src(itime) * nu_master(1) & - + nu_single(2,:) * noise_src(itime) * nu_master(2) & - + nu_single(3,:) * noise_src(itime) * nu_master(3) + noise_src_u(:,itime) = nu_single(1,:) * noise_src(itime) * nu_main(1) & + + nu_single(2,:) * noise_src(itime) * nu_main(2) & + + nu_single(3,:) * noise_src(itime) * nu_main(3) enddo ! receiver interpolators @@ -616,10 +616,10 @@ end subroutine compute_arrays_source_noise ! ============================================================================================================= ! step 1: calculate the "ensemble forward source" -! add noise spectrum to the location of master receiver - subroutine add_source_master_rec_noise(nrec,NSTEP,accel,noise_sourcearray, & +! add noise spectrum to the location of main receiver + subroutine add_source_main_rec_noise(nrec,NSTEP,accel,noise_sourcearray, & ibool,islice_selected_rec,ispec_selected_rec, & - it,irec_master_noise, & + it,irec_main_noise, & nspec,nglob) use constants, only: CUSTOM_REAL,NGLLX,NGLLY,NGLLZ,NDIM,myrank @@ -627,7 +627,7 @@ subroutine add_source_master_rec_noise(nrec,NSTEP,accel,noise_sourcearray, & implicit none ! input parameters - integer,intent(in) :: nrec,NSTEP,irec_master_noise + integer,intent(in) :: nrec,NSTEP,irec_main_noise integer,intent(in) :: nspec,nglob integer, dimension(nrec),intent(in) :: islice_selected_rec,ispec_selected_rec integer, dimension(NGLLX,NGLLY,NGLLZ,nspec),intent(in) :: ibool @@ -638,15 +638,15 @@ subroutine add_source_master_rec_noise(nrec,NSTEP,accel,noise_sourcearray, & ! local parameters integer :: i,j,k,iglob,ispec, it - if (irec_master_noise <= 0) then - print *,'Error rank',myrank,'invalid master id ',irec_master_noise - stop 'Error invalid irec_master_noise' + if (irec_main_noise <= 0) then + print *,'Error rank',myrank,'invalid main id ',irec_main_noise + stop 'Error invalid irec_main_noise' endif ! adds noise source (only if this proc carries the noise) - if (myrank == islice_selected_rec(irec_master_noise)) then + if (myrank == islice_selected_rec(irec_main_noise)) then - ispec = ispec_selected_rec(irec_master_noise) + ispec = ispec_selected_rec(irec_main_noise) ! adds nosie source contributions do k = 1,NGLLZ @@ -660,7 +660,7 @@ subroutine add_source_master_rec_noise(nrec,NSTEP,accel,noise_sourcearray, & endif - end subroutine add_source_master_rec_noise + end subroutine add_source_main_rec_noise ! ============================================================================================================= ! ============================================================================================================= diff --git a/src/specfem3D/prepare_noise.f90 b/src/specfem3D/prepare_noise.f90 index caf34b423..f6b7ab34f 100644 --- a/src/specfem3D/prepare_noise.f90 +++ b/src/specfem3D/prepare_noise.f90 @@ -89,13 +89,13 @@ subroutine prepare_noise() mask_noise(:) = 0._CUSTOM_REAL noise_surface_movie(:,:,:) = 0._CUSTOM_REAL - ! sets up noise source for master receiver station + ! sets up noise source for main receiver station call read_parameters_noise(nrec,NSTEP,NGLLSQUARE*num_free_surface_faces, & islice_selected_rec,xi_receiver,eta_receiver,gamma_receiver,nu_rec, & noise_sourcearray,xigll,yigll,zigll, & ibool, & xstore,ystore,zstore, & - irec_master_noise,normal_x_noise,normal_y_noise,normal_z_noise,mask_noise, & + irec_main_noise,normal_x_noise,normal_y_noise,normal_z_noise,mask_noise, & NSPEC_AB,NGLOB_AB, & num_free_surface_faces,free_surface_ispec,free_surface_ijk, & ispec_is_acoustic) diff --git a/src/specfem3D/print_stf_file.f90 b/src/specfem3D/print_stf_file.f90 index b71838144..384104a6d 100644 --- a/src/specfem3D/print_stf_file.f90 +++ b/src/specfem3D/print_stf_file.f90 @@ -133,18 +133,18 @@ subroutine print_stf_file() enddo endif - ! master collects stf (if it does not already have it, i.e. if this source is not on the master) + ! main collects stf (if it does not already have it, i.e. if this source is not on the main) if (islice_selected_source(isource) /= 0) then if (myrank == 0) then - ! master collects + ! main collects call recvv_cr(source_time_function,NSTEP,islice_selected_source(isource),0) else if (myrank == islice_selected_source(isource)) then - ! slave sends to master + ! secondary sends to main call sendv_cr(source_time_function,NSTEP,0,0) endif endif - ! master prints out to file + ! main prints out to file if (myrank == 0) then ! opens source time function file if (NSOURCES == 1) then diff --git a/src/specfem3D/read_stations.f90 b/src/specfem3D/read_stations.f90 index 5f4002cbf..7c1db2952 100644 --- a/src/specfem3D/read_stations.f90 +++ b/src/specfem3D/read_stations.f90 @@ -168,7 +168,7 @@ subroutine read_stations_SU_from_previous_run(nrec,station_name,network_name, & if (SU_station_file_exists) then - ! master reads in available station information + ! main reads in available station information if (myrank == 0) then open(unit=IOUT_SU,file=trim(filename),status='old',action='read',form='unformatted',iostat=ier) if (ier /= 0) call exit_mpi(myrank,'error opening file '//trim(filename)) diff --git a/src/specfem3D/setup_movie_meshes.f90 b/src/specfem3D/setup_movie_meshes.f90 index d87f8f089..47c85d91c 100644 --- a/src/specfem3D/setup_movie_meshes.f90 +++ b/src/specfem3D/setup_movie_meshes.f90 @@ -309,9 +309,9 @@ subroutine setup_movie_meshes() store_val_z(ia) = zstore(iglob) enddo enddo - ! master process collects all info + ! main process collects all info ! collects locations only once - ! master collects all + ! main collects all if (myrank == 0) then call gatherv_all_cr(store_val_x,nfaces_surface_points, & store_val_x_all,nfaces_perproc_surface,faces_surface_offset, & @@ -323,7 +323,7 @@ subroutine setup_movie_meshes() store_val_z_all,nfaces_perproc_surface,faces_surface_offset, & nfaces_surface_glob_points,NPROC) else - ! slaves just send + ! secondarys just send call gatherv_all_cr(store_val_x,nfaces_surface_points, & dummy,nfaces_perproc_surface,faces_surface_offset, & 1,NPROC) diff --git a/src/specfem3D/setup_sources_receivers.f90 b/src/specfem3D/setup_sources_receivers.f90 index a5d2c7e1c..7beba8e52 100644 --- a/src/specfem3D/setup_sources_receivers.f90 +++ b/src/specfem3D/setup_sources_receivers.f90 @@ -1051,7 +1051,7 @@ subroutine setup_sources_precompute_arrays() write(IMAIN,*) ' ',nadj_files_found_tot,' adjoint component trace files found in all slices' call flush_IMAIN() - ! master process checks if any adjoint files found + ! main process checks if any adjoint files found if (nadj_files_found_tot == 0) then print *,'Error no adjoint traces found: ',nadj_files_found_tot print *,'in directory : ',OUTPUT_FILES(1:len_trim(OUTPUT_FILES))//'/../SEM/' @@ -1130,7 +1130,7 @@ subroutine setup_receivers_precompute_intp() ! statistics about allocation memory for seismograms & source_adjoint ! seismograms - ! gather from slaves on master + ! gather from secondarys on main call gather_all_singlei(nrec_local,tmp_rec_local_all,NPROC) ! user output if (myrank == 0) then @@ -1148,8 +1148,8 @@ subroutine setup_receivers_precompute_intp() endif ! outputs info write(IMAIN,*) 'seismograms:' - if (WRITE_SEISMOGRAMS_BY_MASTER) then - write(IMAIN,*) ' seismograms written by master process only' + if (WRITE_SEISMOGRAMS_BY_MAIN) then + write(IMAIN,*) ' seismograms written by main process only' else write(IMAIN,*) ' seismograms written by all processes' endif @@ -1166,7 +1166,7 @@ subroutine setup_receivers_precompute_intp() ! note: nadj_rec_local is the number of "adjoint sources". that is, local receiver locations which will act as adjoint source ! locations. - ! gather from slaves on master + ! gather from secondarys on main call gather_all_singlei(nadj_rec_local,tmp_rec_local_all,NPROC) ! user output if (myrank == 0) then @@ -1533,7 +1533,7 @@ subroutine setup_sources_receivers_VTKfile() call eval_shape3D_element_anchors(xelm,yelm,zelm,ispec,ibool,xstore,ystore,zstore,NSPEC_AB,NGLOB_AB) endif - ! master collects corner locations + ! main collects corner locations if (islice_selected_source(isource) /= 0) then if (myrank == 0) then call recvv_cr(xelm,NGNOD,islice_selected_source(isource),0) @@ -1578,7 +1578,7 @@ subroutine setup_sources_receivers_VTKfile() call eval_shape3D_element_anchors(xelm,yelm,zelm,ispec,ibool,xstore,ystore,zstore,NSPEC_AB,NGLOB_AB) endif - ! master collects corner locations + ! main collects corner locations if (islice_selected_rec(irec) /= 0) then if (myrank == 0) then call recvv_cr(xelm,NGNOD,islice_selected_rec(irec),0) diff --git a/src/specfem3D/specfem3D_par.F90 b/src/specfem3D/specfem3D_par.F90 index c9ccd41ad..899eaf820 100644 --- a/src/specfem3D/specfem3D_par.F90 +++ b/src/specfem3D/specfem3D_par.F90 @@ -709,7 +709,7 @@ module specfem_par_noise ! NOISE_TOMOGRAPHY ! parameter module for noise simulations - integer :: irec_master_noise + integer :: irec_main_noise real(kind=CUSTOM_REAL), dimension(:,:,:,:,:), allocatable :: noise_sourcearray real(kind=CUSTOM_REAL), dimension(:,:,:), allocatable :: noise_surface_movie real(kind=CUSTOM_REAL), dimension(:), allocatable :: normal_x_noise,normal_y_noise,normal_z_noise, mask_noise diff --git a/src/specfem3D/vtk_window.F90 b/src/specfem3D/vtk_window.F90 index f93318f1f..906e55d77 100644 --- a/src/specfem3D/vtk_window.F90 +++ b/src/specfem3D/vtk_window.F90 @@ -39,7 +39,7 @@ module vtk_window_par real,dimension(:),allocatable :: vtkdata logical,dimension(:),allocatable :: vtkmask - ! multi-mpi processes, gather data arrays on master + ! multi-mpi processes, gather data arrays on main real,dimension(:),allocatable :: vtkdata_all integer,dimension(:),allocatable :: vtkdata_points_all integer,dimension(:),allocatable :: vtkdata_offset_all @@ -165,7 +165,7 @@ subroutine vtk_window_prepare_source() call eval_shape3D_element_anchors(xelm,yelm,zelm,ispec,ibool,xstore,ystore,zstore,NSPEC_AB,NGLOB_AB) endif - ! master collects corner locations + ! main collects corner locations if (islice_selected_source(isource) /= 0) then if (myrank == 0) then call recvv_cr(xelm,NGNOD,islice_selected_source(isource),0) @@ -263,7 +263,7 @@ subroutine vtk_window_prepare_receivers() call eval_shape3D_element_anchors(xelm,yelm,zelm,ispec,ibool,xstore,ystore,zstore,NSPEC_AB,NGLOB_AB) endif - ! master collects corner locations + ! main collects corner locations if (islice_selected_rec(irec) /= 0) then if (myrank == 0) then call recvv_cr(xelm,NGNOD,islice_selected_rec(irec),0) @@ -571,7 +571,7 @@ subroutine vtk_window_prepare_freesurface() free_conn_offset_all(i) = sum(free_conn_nspec_all(1:i-1)) enddo - ! global data arrays (only needed on master process) + ! global data arrays (only needed on main process) if (myrank == 0) then ! gather locations allocate(free_x_all(free_np_all),stat=ier) @@ -884,7 +884,7 @@ subroutine vtk_window_prepare_volume() vol_conn_offset_all(i) = sum(vol_conn_nspec_all(1:i-1)) enddo - ! global data arrays (only needed on master process) + ! global data arrays (only needed on main process) if (myrank == 0) then ! point data allocate(vtkdata_all(vtkdata_numpoints_all),stat=ier) diff --git a/src/specfem3D/write_movie_output.F90 b/src/specfem3D/write_movie_output.F90 index 743bc76aa..884b28c1f 100644 --- a/src/specfem3D/write_movie_output.F90 +++ b/src/specfem3D/write_movie_output.F90 @@ -170,7 +170,7 @@ subroutine wmo_movie_surface_output() store_val_uz_all,nfaces_perproc_surface,faces_surface_offset, & nfaces_surface_glob_points,NPROC) else - !slaves + !secondarys call gatherv_all_cr(store_val_ux,nfaces_surface_points, & dummy,nfaces_perproc_surface,faces_surface_offset, & 1,NPROC) @@ -432,7 +432,7 @@ subroutine wmo_save_shakemap() integer :: ier real(kind=CUSTOM_REAL),dimension(1):: dummy - ! master collects + ! main collects if (myrank == 0) then ! shakemaps call gatherv_all_cr(shakemap_ux,nfaces_surface_points, & diff --git a/src/specfem3D/write_output_ASDF.f90 b/src/specfem3D/write_output_ASDF.f90 index 1694ee4df..1b71d9fb3 100644 --- a/src/specfem3D/write_output_ASDF.f90 +++ b/src/specfem3D/write_output_ASDF.f90 @@ -184,7 +184,7 @@ subroutine write_asdf() ! use iso_Fortran_env use specfem_par, only: seismo_offset,DT,NSTEP,nrec_local, & - OUTPUT_FILES,WRITE_SEISMOGRAMS_BY_MASTER + OUTPUT_FILES,WRITE_SEISMOGRAMS_BY_MAIN implicit none @@ -554,12 +554,12 @@ subroutine write_asdf() call synchronize_all() ! Now write waveforms - if (WRITE_SEISMOGRAMS_BY_MASTER) then + if (WRITE_SEISMOGRAMS_BY_MAIN) then - ! only master writes + ! only main writes if (myrank == 0) then ! user output - write(IMAIN,*) 'writing waveforms by master...' + write(IMAIN,*) 'writing waveforms by main...' write(IMAIN,*) call flush_IMAIN() @@ -580,14 +580,14 @@ subroutine write_asdf() current_proc = k - 1 sender=current_proc - receiver=0 ! the master proc does all the writing + receiver=0 ! the main proc does all the writing do j = 1, num_stations_gather(k) ! loop over number of stations on that process l = (j-1)*(NDIM) ! Index of current receiver in asdf_container%records - ! First get the information to the master proc - if (current_proc == 0) then ! current_proc is master proc + ! First get the information to the main proc + if (current_proc == 0) then ! current_proc is main proc !one_seismogram(:,:) = seismograms(:,j,:) if (myrank == 0) then @@ -597,7 +597,7 @@ subroutine write_asdf() enddo endif - else ! current_proc is not master proc + else ! current_proc is not main proc if (myrank == current_proc) then @@ -740,7 +740,7 @@ subroutine write_asdf() call ASDF_finalize_hdf5_f(ier) if (ier /= 0) call exit_MPI(myrank,'Error ASDF parallel finalize hdf5 failed') - endif ! WRITE_SEISMOGRAMS_BY_MASTER + endif ! WRITE_SEISMOGRAMS_BY_MAIN !-------------------------------------------------------- ! Clean up diff --git a/src/specfem3D/write_seismograms.f90 b/src/specfem3D/write_seismograms.f90 index 5ef41c16f..7593e7853 100644 --- a/src/specfem3D/write_seismograms.f90 +++ b/src/specfem3D/write_seismograms.f90 @@ -92,7 +92,7 @@ subroutine write_seismograms() write_time_begin = wtime() ! checks if anything to do - if (nrec_local > 0 .or. (WRITE_SEISMOGRAMS_BY_MASTER .and. myrank == 0) .or. ASDF_FORMAT) then + if (nrec_local > 0 .or. (WRITE_SEISMOGRAMS_BY_MAIN .and. myrank == 0) .or. ASDF_FORMAT) then ! writes out seismogram files select case(SIMULATION_TYPE) @@ -162,8 +162,8 @@ subroutine write_seismograms() ! output write(IMAIN,*) write(IMAIN,*) 'Total number of time steps written: ', it-it_begin+1 - if (WRITE_SEISMOGRAMS_BY_MASTER) then - write(IMAIN,*) 'Writing the seismograms by master proc alone took ',sngl(write_time),' seconds' + if (WRITE_SEISMOGRAMS_BY_MAIN) then + write(IMAIN,*) 'Writing the seismograms by main proc alone took ',sngl(write_time),' seconds' else write(IMAIN,*) 'Writing the seismograms in parallel took ',sngl(write_time),' seconds' endif @@ -194,7 +194,7 @@ subroutine write_seismograms_to_file(seismograms,istore) nrec,nrec_local,islice_selected_rec, & seismo_offset,seismo_current, & NSTEP,NTSTEP_BETWEEN_OUTPUT_SEISMOS,ASDF_FORMAT, & - WRITE_SEISMOGRAMS_BY_MASTER,SAVE_ALL_SEISMOS_IN_ONE_FILE,USE_BINARY_FOR_SEISMOGRAMS + WRITE_SEISMOGRAMS_BY_MAIN,SAVE_ALL_SEISMOS_IN_ONE_FILE,USE_BINARY_FOR_SEISMOGRAMS implicit none @@ -206,7 +206,7 @@ subroutine write_seismograms_to_file(seismograms,istore) character(len=1) component - ! parameters for master collects seismograms + ! parameters for main collects seismograms real(kind=CUSTOM_REAL), dimension(:,:), allocatable :: one_seismogram integer :: nrec_local_received,total_seismos,receiver,sender integer :: iproc,ier,i @@ -233,7 +233,7 @@ subroutine write_seismograms_to_file(seismograms,istore) if (ier /= 0) stop 'error while allocating one temporary seismogram' ! write out seismograms: all processes write their local seismograms themselves - if (.not. WRITE_SEISMOGRAMS_BY_MASTER) then + if (.not. WRITE_SEISMOGRAMS_BY_MAIN) then if (SAVE_ALL_SEISMOS_IN_ONE_FILE) then ! note: saving in a single file while using multiple outputs when NTSTEP_BETWEEN_OUTPUT_SEISMOS is less than NSTEP @@ -284,7 +284,7 @@ subroutine write_seismograms_to_file(seismograms,istore) ! create one large file instead of one small file per station to avoid file system overload if (SAVE_ALL_SEISMOS_IN_ONE_FILE) close(IOUT) - else if (WRITE_SEISMOGRAMS_BY_MASTER .and. ASDF_FORMAT) then + else if (WRITE_SEISMOGRAMS_BY_MAIN .and. ASDF_FORMAT) then ! ASDF format do irec_local = 1, nrec_local @@ -298,13 +298,13 @@ subroutine write_seismograms_to_file(seismograms,istore) call close_asdf_data() else - ! only the master process does the writing of seismograms and + ! only the main process does the writing of seismograms and ! collects the data from all other processes - ! only written out by master process - WRITE_SEISMOGRAMS_BY_MASTER + ! only written out by main process - WRITE_SEISMOGRAMS_BY_MAIN if (myrank == 0) then - ! on the master, gather all the seismograms + ! on the main, gather all the seismograms ! create one large file instead of one small file per station to avoid file system overload if (SAVE_ALL_SEISMOS_IN_ONE_FILE) then @@ -389,7 +389,7 @@ subroutine write_seismograms_to_file(seismograms,istore) if (SAVE_ALL_SEISMOS_IN_ONE_FILE) close(IOUT) else - ! on the nodes, send the seismograms to the master + ! on the nodes, send the seismograms to the main receiver = 0 tmp_nrec_local(1) = nrec_local call send_i(tmp_nrec_local,1,receiver,itag) @@ -409,7 +409,7 @@ subroutine write_seismograms_to_file(seismograms,istore) endif endif ! myrank - endif ! of if (WRITE_SEISMOGRAMS_BY_MASTER) + endif ! of if (WRITE_SEISMOGRAMS_BY_MAIN) deallocate(one_seismogram) diff --git a/src/tomography/compute_kernel_integral.f90 b/src/tomography/compute_kernel_integral.f90 index a89976d9f..86734bfb3 100644 --- a/src/tomography/compute_kernel_integral.f90 +++ b/src/tomography/compute_kernel_integral.f90 @@ -204,7 +204,7 @@ subroutine compute_kernel_integral_iso() enddo ! statistics - ! (note: sum_all_cr() will only return valid results to master process) + ! (note: sum_all_cr() will only return valid results to main process) ! kernel integration: for whole volume call sum_all_cr(kernel_integral_alpha,integral_alpha_sum) call sum_all_cr(kernel_integral_beta,integral_beta_sum) @@ -469,7 +469,7 @@ subroutine compute_kernel_integral_tiso() enddo ! statistics - ! (note: sum_all_cr() will only return valid results to master process) + ! (note: sum_all_cr() will only return valid results to main process) ! kernel integration: for whole volume call sum_all_cr(integral_bulk,integral_bulk_sum) call sum_all_cr(integral_betav,integral_betav_sum) @@ -738,7 +738,7 @@ subroutine compute_kernel_integral_tiso_iso() enddo ! statistics - ! (note: sum_all_cr() will only return valid results to master process) + ! (note: sum_all_cr() will only return valid results to main process) ! kernel integration: for whole volume call sum_all_cr(integral_bulk,integral_bulk_sum) call sum_all_cr(integral_beta,integral_beta_sum) diff --git a/src/tomography/sum_preconditioned_kernels.f90 b/src/tomography/sum_preconditioned_kernels.f90 index db1d17635..6779956f3 100644 --- a/src/tomography/sum_preconditioned_kernels.f90 +++ b/src/tomography/sum_preconditioned_kernels.f90 @@ -406,7 +406,7 @@ subroutine invert_hess( hess_matrix ) ! maximum value of Hessian maxh = maxval( abs(hess_matrix) ) - ! determines maximum from all slices on master + ! determines maximum from all slices on main call max_all_all_cr(maxh, maxh_all) ! user output diff --git a/utils/ADJOINT_TOMOGRAPHY_TOOLS/ADJOINT_TOMOGRAPHY_TOOLKIT/SHARE_FILES/HEADER_FILES/constants.h b/utils/ADJOINT_TOMOGRAPHY_TOOLS/ADJOINT_TOMOGRAPHY_TOOLKIT/SHARE_FILES/HEADER_FILES/constants.h index 396b0990b..15ed21b55 100644 --- a/utils/ADJOINT_TOMOGRAPHY_TOOLS/ADJOINT_TOMOGRAPHY_TOOLKIT/SHARE_FILES/HEADER_FILES/constants.h +++ b/utils/ADJOINT_TOMOGRAPHY_TOOLS/ADJOINT_TOMOGRAPHY_TOOLKIT/SHARE_FILES/HEADER_FILES/constants.h @@ -417,8 +417,8 @@ ! in which case it is 4 integer, parameter :: NUMCORNERS_SHARED = 1 !!!!!! DK DK removed support for one slice only, was 4 -! number of slaves per corner - integer, parameter :: NUMSLAVES = 2 +! number of secondarys per corner + integer, parameter :: NUMSECONDARYS = 2 ! number of layers in PREM integer, parameter :: NR = 640 diff --git a/utils/ADJOINT_TOMOGRAPHY_TOOLS/iterate_adj/cluster/scripts/README b/utils/ADJOINT_TOMOGRAPHY_TOOLS/iterate_adj/cluster/scripts/README index 407e28c20..2aa7535da 100644 --- a/utils/ADJOINT_TOMOGRAPHY_TOOLS/iterate_adj/cluster/scripts/README +++ b/utils/ADJOINT_TOMOGRAPHY_TOOLS/iterate_adj/cluster/scripts/README @@ -10,18 +10,18 @@ setup_kernel_dir.pl copy_kernel_dir.pl copy_SEM_dir.pl -In both cases, they require the directory Master_Dir, which is used to link run directories +In both cases, they require the directory Main_Dir, which is used to link run directories for all the requested event IDs. The organization is as follows: BASIN_KERNEL/ setup_kernel_dir.pl - Master_Dir/ + Main_Dir/ done_dirs/ copy_kernel_dir.pl BASIN_FORWARD/ setup_forward_dir.pl - Master_Dir/ + Main_Dir/ done_dirs/ copy_SEM_dir.pl diff --git a/utils/ADJOINT_TOMOGRAPHY_TOOLS/iterate_adj/cluster/scripts/setup_forward_dir.pl b/utils/ADJOINT_TOMOGRAPHY_TOOLS/iterate_adj/cluster/scripts/setup_forward_dir.pl index ad23881e1..13df70020 100755 --- a/utils/ADJOINT_TOMOGRAPHY_TOOLS/iterate_adj/cluster/scripts/setup_forward_dir.pl +++ b/utils/ADJOINT_TOMOGRAPHY_TOOLS/iterate_adj/cluster/scripts/setup_forward_dir.pl @@ -10,7 +10,7 @@ #----------------------------------- # USER INPUT -$master_dir = "/ibrixfs1/home/carltape/BASIN_FORWARD/Master_Dir"; +$main_dir = "/ibrixfs1/home/carltape/BASIN_FORWARD/Main_Dir"; $scripts_dir = "/ibrixfs1/home/carltape/BASIN_FORWARD/Scripts"; # directory containing CMTSOLUTION files for all events @@ -79,7 +79,7 @@ # copy in a new CMTSOLUTION $cmtfile1 = "$eid/DATA/CMTSOLUTION"; - `${scripts_dir}/copy_basin_sem_dir.bash ${master_dir} $eid`; + `${scripts_dir}/copy_basin_sem_dir.bash ${main_dir} $eid`; `cp $cmtfile $cmtfile1`; # change the half-duration @@ -105,7 +105,7 @@ #-------------------- -#Master_dir=/ibrixfs1/home/carltape/BASIN_FORWARD/Master_Dir +#Main_dir=/ibrixfs1/home/carltape/BASIN_FORWARD/Main_Dir #Scripts_dir=/ibrixfs1/home/carltape/BASIN_FORWARD/Scripts # #for eid in `cat /ibrixfs1/home/carltape/CMT/test_events`; do @@ -114,7 +114,7 @@ # # echo "==== $eid =====" # -# ${Scripts_dir}/copy_basin_sem_dir.bash ${Master_dir} $eid +# ${Scripts_dir}/copy_basin_sem_dir.bash ${Main_dir} $eid # cp /ibrixfs1/home/carltape/CMT/CMT_files/CMTSOLUTION_$eid $eid/DATA/CMTSOLUTION # #done diff --git a/utils/ADJOINT_TOMOGRAPHY_TOOLS/iterate_adj/cluster/scripts/setup_kernel_dir.pl b/utils/ADJOINT_TOMOGRAPHY_TOOLS/iterate_adj/cluster/scripts/setup_kernel_dir.pl index 74f7bdfff..e4963fd0b 100755 --- a/utils/ADJOINT_TOMOGRAPHY_TOOLS/iterate_adj/cluster/scripts/setup_kernel_dir.pl +++ b/utils/ADJOINT_TOMOGRAPHY_TOOLS/iterate_adj/cluster/scripts/setup_kernel_dir.pl @@ -20,7 +20,7 @@ if (@ARGV < 3) {die("Usage: setup_kernel_dir.pl model dir_suffix nstat\n")} ($smodel,$hdur_lab,$nstat) = @ARGV; -$master_dir = "/ibrixfs1/home/carltape/BASIN_KERNEL/Master_Dir"; +$main_dir = "/ibrixfs1/home/carltape/BASIN_KERNEL/Main_Dir"; $scripts_dir = "/ibrixfs1/home/carltape/BASIN_KERNEL/Scripts"; # directory containing SEM-inverted CMTSOLUTION files @@ -111,8 +111,8 @@ #---------------------------- - # replicate the master directory - `${scripts_dir}/copy_basin_sem_dir.bash ${master_dir} $eid`; + # replicate the main directory + `${scripts_dir}/copy_basin_sem_dir.bash ${main_dir} $eid`; # modify the EID label for the post-processing script # eid=9818433 diff --git a/utils/ADJOINT_TOMOGRAPHY_TOOLS/iterate_adj/cluster/smooth_all/SERIAL_RUN/setup_smooth_all.pl b/utils/ADJOINT_TOMOGRAPHY_TOOLS/iterate_adj/cluster/smooth_all/SERIAL_RUN/setup_smooth_all.pl index 4268fe439..70fd4fc1d 100755 --- a/utils/ADJOINT_TOMOGRAPHY_TOOLS/iterate_adj/cluster/smooth_all/SERIAL_RUN/setup_smooth_all.pl +++ b/utils/ADJOINT_TOMOGRAPHY_TOOLS/iterate_adj/cluster/smooth_all/SERIAL_RUN/setup_smooth_all.pl @@ -21,11 +21,11 @@ $edir_smooth = "$basedir/KERNELS_MODELS/event_kernels_smooth/kernel_${smodel}"; $dir_done = "/net/sierra/raid1/carltape/socal/socal_3D/RUNS/SMOOTH_EVENT_KERNELS/$smodel"; -$masterdir = "$basedir/smooth"; +$maindir = "$basedir/smooth"; if(not -e $edir) {die("edir $edir does not exist");} if(not -e $edir_smooth) {`mkdir $edir_smooth`;} -if(not -e $masterdir) {die("masterdir $masterdir does not exist");} +if(not -e $maindir) {die("maindir $maindir does not exist");} if(not -e ${dir_done}) {die("dir_done $dir_done does not exist");} # read in the list of kernels that you want to sum @@ -90,13 +90,13 @@ `ln -s $efiles_in $edir_out`; # copy run scripts and link executable file - `cp $masterdir/run.lsf $edir_copy`; - `cp $masterdir/go.bash $edir_copy`; - `ln -s $masterdir/topo $edir_copy`; - `ln -s $masterdir/smooth_sem_fun $edir_copy`; - `ln -s $masterdir/xcombine_vol_data $edir_copy`; - `ln -s $masterdir/slice_file $edir_copy`; - `ln -s $masterdir/combine.bash $edir_copy`; + `cp $maindir/run.lsf $edir_copy`; + `cp $maindir/go.bash $edir_copy`; + `ln -s $maindir/topo $edir_copy`; + `ln -s $maindir/smooth_sem_fun $edir_copy`; + `ln -s $maindir/xcombine_vol_data $edir_copy`; + `ln -s $maindir/slice_file $edir_copy`; + `ln -s $maindir/combine.bash $edir_copy`; # change the label for the run `sed "/smooth_model/s/smooth_model/${eid}_smooth/" ${edir_copy}/go.bash > ${edir_copy}/run.tmp`; diff --git a/utils/ADJOINT_TOMOGRAPHY_TOOLS/iterate_adj/cluster/smooth_all/setup_smooth_all.pl b/utils/ADJOINT_TOMOGRAPHY_TOOLS/iterate_adj/cluster/smooth_all/setup_smooth_all.pl index 400cb705f..1233b2313 100755 --- a/utils/ADJOINT_TOMOGRAPHY_TOOLS/iterate_adj/cluster/smooth_all/setup_smooth_all.pl +++ b/utils/ADJOINT_TOMOGRAPHY_TOOLS/iterate_adj/cluster/smooth_all/setup_smooth_all.pl @@ -26,9 +26,9 @@ #========================================================== -$masterdir = "$basedir/smooth"; +$maindir = "$basedir/smooth"; if(not -e $edirall) {die("edirall $edirall does not exist");} -if(not -e $masterdir) {die("masterdir $masterdir does not exist");} +if(not -e $maindir) {die("maindir $maindir does not exist");} # read in the list of kernels that you want to sum $kernel_list = "$basedir/KERNELS_MODELS/kernels_run"; @@ -104,13 +104,13 @@ # NOTE: the link leaves the danger of over-writing input files # copy run scripts and link executable file - `cp $masterdir/run* $edir_local`; - `cp $masterdir/go.bash $edir_local`; - `ln -s $masterdir/topo $edir_local`; - `ln -s $masterdir/smooth_sem_fun $edir_local`; - `ln -s $masterdir/xcombine_vol_data $edir_local`; - `ln -s $masterdir/slice_file $edir_local`; - `ln -s $masterdir/combine.bash $edir_local`; + `cp $maindir/run* $edir_local`; + `cp $maindir/go.bash $edir_local`; + `ln -s $maindir/topo $edir_local`; + `ln -s $maindir/smooth_sem_fun $edir_local`; + `ln -s $maindir/xcombine_vol_data $edir_local`; + `ln -s $maindir/slice_file $edir_local`; + `ln -s $maindir/combine.bash $edir_local`; # change the label for the run `sed "/smooth_model/s/smooth_model/${eid}S/" ${edir_local}/go.bash > ${edir_local}/run.tmp`; diff --git a/utils/ADJOINT_TOMOGRAPHY_TOOLS/iterate_adj/matlab/compare_misfit.m b/utils/ADJOINT_TOMOGRAPHY_TOOLS/iterate_adj/matlab/compare_misfit.m index 7c5e810da..02d297fd1 100644 --- a/utils/ADJOINT_TOMOGRAPHY_TOOLS/iterate_adj/matlab/compare_misfit.m +++ b/utils/ADJOINT_TOMOGRAPHY_TOOLS/iterate_adj/matlab/compare_misfit.m @@ -118,10 +118,10 @@ if ~isempty(itemp) ievent_full(ii) = itemp; else - error(['event ' eids{ii} ' is not on the master list']); + error(['event ' eids{ii} ' is not on the main list']); end end -disp('all input EIDs matched to the master list'); +disp('all input EIDs matched to the main list'); %----------------------- % read in stations file (used for synthetics) diff --git a/utils/ADJOINT_TOMOGRAPHY_TOOLS/iterate_adj/matlab/compute_misfit.m b/utils/ADJOINT_TOMOGRAPHY_TOOLS/iterate_adj/matlab/compute_misfit.m index 5d84ac13e..df2678015 100644 --- a/utils/ADJOINT_TOMOGRAPHY_TOOLS/iterate_adj/matlab/compute_misfit.m +++ b/utils/ADJOINT_TOMOGRAPHY_TOOLS/iterate_adj/matlab/compute_misfit.m @@ -117,10 +117,10 @@ if ~isempty(itemp) ievent_full(ii) = itemp; else - error(['event ' eids{ii} ' is not on the master list']); + error(['event ' eids{ii} ' is not on the main list']); end end -disp('all input EIDs matched to the master list'); +disp('all input EIDs matched to the main list'); % if 0==1 % fid = fopen([odir ftag '_window_picks_by_' stks{kk}],'w'); diff --git a/utils/ADJOINT_TOMOGRAPHY_TOOLS/measure_adj/README b/utils/ADJOINT_TOMOGRAPHY_TOOLS/measure_adj/README index 1c3d2539c..2ededa23f 100644 --- a/utils/ADJOINT_TOMOGRAPHY_TOOLS/measure_adj/README +++ b/utils/ADJOINT_TOMOGRAPHY_TOOLS/measure_adj/README @@ -85,7 +85,7 @@ These scripts have been placed in the directory scripts_tomo: prepare_measure_adj.pl -- prepares the directory for running the measurement code WITH PLOTS run_measure_adj.pl -- runs the code and makes output plots run_mt_cc_plot.pl -- runs the code in cross-correlation mode AND multi-taper mode for plots -run_tomo.pl -- master script that calls prepare_measure_adj.pl and run_measure_adj.pl +run_tomo.pl -- main script that calls prepare_measure_adj.pl and run_measure_adj.pl combine_2_adj_src.pl -- combines two sets of adjoint sources and creates a new STATIONS_ADJOINT file combine_2_adj_src_all.pl -- calls combine_2_adj_src.pl repeatedly to make the final set of adjoint sources diff --git a/utils/ADJOINT_TOMOGRAPHY_TOOLS/measure_adj/scripts_tomo/run_tomo.pl b/utils/ADJOINT_TOMOGRAPHY_TOOLS/measure_adj/scripts_tomo/run_tomo.pl index f4c458962..cad9d3817 100755 --- a/utils/ADJOINT_TOMOGRAPHY_TOOLS/measure_adj/scripts_tomo/run_tomo.pl +++ b/utils/ADJOINT_TOMOGRAPHY_TOOLS/measure_adj/scripts_tomo/run_tomo.pl @@ -6,7 +6,7 @@ # Carl Tape # 20-Oct-2009 # -# This is the master program for running the measurement code on all the +# This is the main program for running the measurement code on all the # events for which the windowing code has been run. # # NOTE: The command run_measure_adj.pl below contains additional input parameters. diff --git a/utils/dynamic_rupture/curved_fault_mesh/README b/utils/dynamic_rupture/curved_fault_mesh/README index 2ac9f2376..e01d73f30 100755 --- a/utils/dynamic_rupture/curved_fault_mesh/README +++ b/utils/dynamic_rupture/curved_fault_mesh/README @@ -44,7 +44,7 @@ Thank Jean-Paul Ampuero for his helpful suggestion. Software and package requirements: CUBIT (or Trelis) - GEOCUBIT (a package provided in the Specfem3D code in the directory: specfem3d-master/CUBIT_GEOCUBIT/) + GEOCUBIT (a package provided in the Specfem3D code in the directory: specfem3d/CUBIT_GEOCUBIT/) Python and Python packages: numpy and scipy GMT (No need if both free surface and fault are planar. For GMT 5+ you need to add "gmt" in all the GMT commands in the scripts: ./Surface/create_surface_data.sh and ./Interface/create_interface_data.sh) diff --git a/utils/small_SEM_solvers_in_Fortran_and_C_without_MPI_to_learn/mesher_for_serial/DATA/Par_file b/utils/small_SEM_solvers_in_Fortran_and_C_without_MPI_to_learn/mesher_for_serial/DATA/Par_file index 1bc37051d..84b75a0ba 100644 --- a/utils/small_SEM_solvers_in_Fortran_and_C_without_MPI_to_learn/mesher_for_serial/DATA/Par_file +++ b/utils/small_SEM_solvers_in_Fortran_and_C_without_MPI_to_learn/mesher_for_serial/DATA/Par_file @@ -97,8 +97,8 @@ OUTPUT_SEISMOS_SAC_BINARY = .false. # rotate seismograms to Radial-Transverse-Z or use default North-East-Z reference frame ROTATE_SEISMOGRAMS_RT = .false. -# decide if master process writes all the seismograms or if all processes do it in parallel -WRITE_SEISMOGRAMS_BY_MASTER = .true. +# decide if main process writes all the seismograms or if all processes do it in parallel +WRITE_SEISMOGRAMS_BY_MAIN = .true. # save all seismograms in one large combined file instead of one file per seismogram # to avoid overloading shared non-local file systems such as GPFS for instance diff --git a/utils/small_SEM_solvers_in_Fortran_and_C_without_MPI_to_learn/mesher_for_serial/DATA/Par_file_001GPUs_run_it_in_serial b/utils/small_SEM_solvers_in_Fortran_and_C_without_MPI_to_learn/mesher_for_serial/DATA/Par_file_001GPUs_run_it_in_serial index e0f7b363f..7ac48419f 100644 --- a/utils/small_SEM_solvers_in_Fortran_and_C_without_MPI_to_learn/mesher_for_serial/DATA/Par_file_001GPUs_run_it_in_serial +++ b/utils/small_SEM_solvers_in_Fortran_and_C_without_MPI_to_learn/mesher_for_serial/DATA/Par_file_001GPUs_run_it_in_serial @@ -97,8 +97,8 @@ OUTPUT_SEISMOS_SAC_BINARY = .false. # rotate seismograms to Radial-Transverse-Z or use default North-East-Z reference frame ROTATE_SEISMOGRAMS_RT = .false. -# decide if master process writes all the seismograms or if all processes do it in parallel -WRITE_SEISMOGRAMS_BY_MASTER = .true. +# decide if main process writes all the seismograms or if all processes do it in parallel +WRITE_SEISMOGRAMS_BY_MAIN = .true. # save all seismograms in one large combined file instead of one file per seismogram # to avoid overloading shared non-local file systems such as GPFS for instance diff --git a/utils/small_SEM_solvers_in_Fortran_and_C_without_MPI_to_learn/mesher_for_serial/DATA/Par_file_004GPUs b/utils/small_SEM_solvers_in_Fortran_and_C_without_MPI_to_learn/mesher_for_serial/DATA/Par_file_004GPUs index 25861aab9..9da8152c3 100644 --- a/utils/small_SEM_solvers_in_Fortran_and_C_without_MPI_to_learn/mesher_for_serial/DATA/Par_file_004GPUs +++ b/utils/small_SEM_solvers_in_Fortran_and_C_without_MPI_to_learn/mesher_for_serial/DATA/Par_file_004GPUs @@ -97,8 +97,8 @@ OUTPUT_SEISMOS_SAC_BINARY = .false. # rotate seismograms to Radial-Transverse-Z or use default North-East-Z reference frame ROTATE_SEISMOGRAMS_RT = .false. -# decide if master process writes all the seismograms or if all processes do it in parallel -WRITE_SEISMOGRAMS_BY_MASTER = .true. +# decide if main process writes all the seismograms or if all processes do it in parallel +WRITE_SEISMOGRAMS_BY_MAIN = .true. # save all seismograms in one large combined file instead of one file per seismogram # to avoid overloading shared non-local file systems such as GPFS for instance diff --git a/utils/small_SEM_solvers_in_Fortran_and_C_without_MPI_to_learn/mesher_for_serial/DATA/Par_file_016GPUs b/utils/small_SEM_solvers_in_Fortran_and_C_without_MPI_to_learn/mesher_for_serial/DATA/Par_file_016GPUs index e0f7b363f..7ac48419f 100644 --- a/utils/small_SEM_solvers_in_Fortran_and_C_without_MPI_to_learn/mesher_for_serial/DATA/Par_file_016GPUs +++ b/utils/small_SEM_solvers_in_Fortran_and_C_without_MPI_to_learn/mesher_for_serial/DATA/Par_file_016GPUs @@ -97,8 +97,8 @@ OUTPUT_SEISMOS_SAC_BINARY = .false. # rotate seismograms to Radial-Transverse-Z or use default North-East-Z reference frame ROTATE_SEISMOGRAMS_RT = .false. -# decide if master process writes all the seismograms or if all processes do it in parallel -WRITE_SEISMOGRAMS_BY_MASTER = .true. +# decide if main process writes all the seismograms or if all processes do it in parallel +WRITE_SEISMOGRAMS_BY_MAIN = .true. # save all seismograms in one large combined file instead of one file per seismogram # to avoid overloading shared non-local file systems such as GPFS for instance diff --git a/utils/small_SEM_solvers_in_Fortran_and_C_without_MPI_to_learn/mesher_for_serial/DATA/Par_file_64slices_validation_test_JCP_paper_multiGPU b/utils/small_SEM_solvers_in_Fortran_and_C_without_MPI_to_learn/mesher_for_serial/DATA/Par_file_64slices_validation_test_JCP_paper_multiGPU index cffdb4539..7c78a4a6d 100644 --- a/utils/small_SEM_solvers_in_Fortran_and_C_without_MPI_to_learn/mesher_for_serial/DATA/Par_file_64slices_validation_test_JCP_paper_multiGPU +++ b/utils/small_SEM_solvers_in_Fortran_and_C_without_MPI_to_learn/mesher_for_serial/DATA/Par_file_64slices_validation_test_JCP_paper_multiGPU @@ -97,8 +97,8 @@ OUTPUT_SEISMOS_SAC_BINARY = .false. # rotate seismograms to Radial-Transverse-Z or use default North-East-Z reference frame ROTATE_SEISMOGRAMS_RT = .false. -# decide if master process writes all the seismograms or if all processes do it in parallel -WRITE_SEISMOGRAMS_BY_MASTER = .true. +# decide if main process writes all the seismograms or if all processes do it in parallel +WRITE_SEISMOGRAMS_BY_MAIN = .true. # save all seismograms in one large combined file instead of one file per seismogram # to avoid overloading shared non-local file systems such as GPFS for instance diff --git a/utils/small_SEM_solvers_in_Fortran_and_C_without_MPI_to_learn/mesher_for_serial/DATA/Par_file_OK_192GPUs_90percent_of_4GB b/utils/small_SEM_solvers_in_Fortran_and_C_without_MPI_to_learn/mesher_for_serial/DATA/Par_file_OK_192GPUs_90percent_of_4GB index eaacfb355..10a6927fb 100644 --- a/utils/small_SEM_solvers_in_Fortran_and_C_without_MPI_to_learn/mesher_for_serial/DATA/Par_file_OK_192GPUs_90percent_of_4GB +++ b/utils/small_SEM_solvers_in_Fortran_and_C_without_MPI_to_learn/mesher_for_serial/DATA/Par_file_OK_192GPUs_90percent_of_4GB @@ -97,8 +97,8 @@ OUTPUT_SEISMOS_SAC_BINARY = .false. # rotate seismograms to Radial-Transverse-Z or use default North-East-Z reference frame ROTATE_SEISMOGRAMS_RT = .false. -# decide if master process writes all the seismograms or if all processes do it in parallel -WRITE_SEISMOGRAMS_BY_MASTER = .true. +# decide if main process writes all the seismograms or if all processes do it in parallel +WRITE_SEISMOGRAMS_BY_MAIN = .true. # save all seismograms in one large combined file instead of one file per seismogram # to avoid overloading shared non-local file systems such as GPFS for instance diff --git a/utils/small_SEM_solvers_in_Fortran_and_C_without_MPI_to_learn/mesher_for_serial/combine_AVS_DX.f90 b/utils/small_SEM_solvers_in_Fortran_and_C_without_MPI_to_learn/mesher_for_serial/combine_AVS_DX.f90 index e76b8acdc..bb3dc5f13 100644 --- a/utils/small_SEM_solvers_in_Fortran_and_C_without_MPI_to_learn/mesher_for_serial/combine_AVS_DX.f90 +++ b/utils/small_SEM_solvers_in_Fortran_and_C_without_MPI_to_learn/mesher_for_serial/combine_AVS_DX.f90 @@ -127,7 +127,7 @@ program combine_AVS_DX SAVE_MESH_FILES,ATTENUATION, & ABSORBING_CONDITIONS,INCLUDE_CENTRAL_CUBE,INFLATE_CENTRAL_CUBE,SAVE_FORWARD,CASE_3D, & OUTPUT_SEISMOS_ASCII_TEXT,OUTPUT_SEISMOS_SAC_ALPHANUM,OUTPUT_SEISMOS_SAC_BINARY, & - ROTATE_SEISMOGRAMS_RT,HONOR_1D_SPHERICAL_MOHO,WRITE_SEISMOGRAMS_BY_MASTER, & + ROTATE_SEISMOGRAMS_RT,HONOR_1D_SPHERICAL_MOHO,WRITE_SEISMOGRAMS_BY_MAIN, & SAVE_ALL_SEISMOS_IN_ONE_FILE,USE_BINARY_FOR_LARGE_FILE character(len=150) OUTPUT_FILES,LOCAL_PATH,MODEL @@ -204,7 +204,7 @@ program combine_AVS_DX OUTPUT_SEISMOS_ASCII_TEXT,OUTPUT_SEISMOS_SAC_ALPHANUM,OUTPUT_SEISMOS_SAC_BINARY, & 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.) + WRITE_SEISMOGRAMS_BY_MAIN,SAVE_ALL_SEISMOS_IN_ONE_FILE,USE_BINARY_FOR_LARGE_FILE,.false.) if (.not. SAVE_MESH_FILES) stop 'AVS or DX files were not saved by the mesher' diff --git a/utils/small_SEM_solvers_in_Fortran_and_C_without_MPI_to_learn/mesher_for_serial/constants.h b/utils/small_SEM_solvers_in_Fortran_and_C_without_MPI_to_learn/mesher_for_serial/constants.h index 6bc918498..9f0a25b91 100644 --- a/utils/small_SEM_solvers_in_Fortran_and_C_without_MPI_to_learn/mesher_for_serial/constants.h +++ b/utils/small_SEM_solvers_in_Fortran_and_C_without_MPI_to_learn/mesher_for_serial/constants.h @@ -366,8 +366,8 @@ ! in which case it is 4 integer, parameter :: NUMCORNERS_SHARED = 4 -! number of slaves per corner - integer, parameter :: NUMSLAVES = 2 +! number of secondarys per corner + integer, parameter :: NUMSECONDARYS = 2 ! number of layers in PREM integer, parameter :: NR = 640 diff --git a/utils/small_SEM_solvers_in_Fortran_and_C_without_MPI_to_learn/mesher_for_serial/create_header_file.f90 b/utils/small_SEM_solvers_in_Fortran_and_C_without_MPI_to_learn/mesher_for_serial/create_header_file.f90 index 383a60904..a9020f2f8 100644 --- a/utils/small_SEM_solvers_in_Fortran_and_C_without_MPI_to_learn/mesher_for_serial/create_header_file.f90 +++ b/utils/small_SEM_solvers_in_Fortran_and_C_without_MPI_to_learn/mesher_for_serial/create_header_file.f90 @@ -57,7 +57,7 @@ program xcreate_header_file SAVE_MESH_FILES,ATTENUATION,CASE_3D, & ABSORBING_CONDITIONS,INCLUDE_CENTRAL_CUBE,INFLATE_CENTRAL_CUBE,SAVE_FORWARD, & OUTPUT_SEISMOS_ASCII_TEXT,OUTPUT_SEISMOS_SAC_ALPHANUM,OUTPUT_SEISMOS_SAC_BINARY, & - ROTATE_SEISMOGRAMS_RT,HONOR_1D_SPHERICAL_MOHO,WRITE_SEISMOGRAMS_BY_MASTER, & + ROTATE_SEISMOGRAMS_RT,HONOR_1D_SPHERICAL_MOHO,WRITE_SEISMOGRAMS_BY_MAIN, & SAVE_ALL_SEISMOS_IN_ONE_FILE,USE_BINARY_FOR_LARGE_FILE character(len=150) LOCAL_PATH,MODEL @@ -140,7 +140,7 @@ program xcreate_header_file OUTPUT_SEISMOS_ASCII_TEXT,OUTPUT_SEISMOS_SAC_ALPHANUM,OUTPUT_SEISMOS_SAC_BINARY, & 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.) + WRITE_SEISMOGRAMS_BY_MAIN,SAVE_ALL_SEISMOS_IN_ONE_FILE,USE_BINARY_FOR_LARGE_FILE,.false.) ! count the total number of sources in the CMTSOLUTION file diff --git a/utils/small_SEM_solvers_in_Fortran_and_C_without_MPI_to_learn/mesher_for_serial/meshfem3D.F90 b/utils/small_SEM_solvers_in_Fortran_and_C_without_MPI_to_learn/mesher_for_serial/meshfem3D.F90 index ab22eb232..56ef8513b 100644 --- a/utils/small_SEM_solvers_in_Fortran_and_C_without_MPI_to_learn/mesher_for_serial/meshfem3D.F90 +++ b/utils/small_SEM_solvers_in_Fortran_and_C_without_MPI_to_learn/mesher_for_serial/meshfem3D.F90 @@ -436,7 +436,7 @@ program xmeshfem3D SAVE_MESH_FILES,ATTENUATION, & ABSORBING_CONDITIONS,INCLUDE_CENTRAL_CUBE,INFLATE_CENTRAL_CUBE,SAVE_FORWARD,CASE_3D, & OUTPUT_SEISMOS_ASCII_TEXT,OUTPUT_SEISMOS_SAC_ALPHANUM,OUTPUT_SEISMOS_SAC_BINARY, & - ROTATE_SEISMOGRAMS_RT,HONOR_1D_SPHERICAL_MOHO,WRITE_SEISMOGRAMS_BY_MASTER, & + ROTATE_SEISMOGRAMS_RT,HONOR_1D_SPHERICAL_MOHO,WRITE_SEISMOGRAMS_BY_MAIN, & SAVE_ALL_SEISMOS_IN_ONE_FILE,USE_BINARY_FOR_LARGE_FILE character(len=150) OUTPUT_FILES,LOCAL_PATH,MODEL @@ -611,7 +611,7 @@ program xmeshfem3D OUTPUT_SEISMOS_ASCII_TEXT,OUTPUT_SEISMOS_SAC_ALPHANUM,OUTPUT_SEISMOS_SAC_BINARY, & 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.) + WRITE_SEISMOGRAMS_BY_MAIN,SAVE_ALL_SEISMOS_IN_ONE_FILE,USE_BINARY_FOR_LARGE_FILE,.false.) if (err_occurred() /= 0) then call exit_MPI(myrank,'an error occurred while reading the parameter file') @@ -647,7 +647,7 @@ program xmeshfem3D endif -! broadcast the information read on the master to the nodes +! broadcast the information read on the main to the nodes #ifdef USE_MPI call MPI_BCAST(NSOURCES,1,MPI_INTEGER,0,MPI_COMM_WORLD,ier) @@ -1004,7 +1004,7 @@ program xmeshfem3D if (THREE_D_MODEL == THREE_D_MODEL_S20RTS) then ! the variables read are declared and stored in structure D3MM_V if (myrank == 0) call read_mantle_model(D3MM_V) -! broadcast the information read on the master to the nodes +! broadcast the information read on the main to the nodes #ifdef USE_MPI call MPI_BCAST(D3MM_V%dvs_a,(NK+1)*(NS+1)*(NS+1),MPI_DOUBLE_PRECISION,0,MPI_COMM_WORLD,ier) call MPI_BCAST(D3MM_V%dvs_b,(NK+1)*(NS+1)*(NS+1),MPI_DOUBLE_PRECISION,0,MPI_COMM_WORLD,ier) @@ -1020,7 +1020,7 @@ program xmeshfem3D call read_sea99_s_model(SEA99M_V) call read_iso3d_dpzhao_model(JP3DM_V) endif -! broadcast the information read on the master to the nodes +! broadcast the information read on the main to the nodes ! SEA99M_V #ifdef USE_MPI call MPI_BCAST(SEA99M_V%sea99_ndep,1,MPI_INTEGER,0,MPI_COMM_WORLD,ier) @@ -1092,7 +1092,7 @@ program xmeshfem3D else if (THREE_D_MODEL == THREE_D_MODEL_SEA99) then ! the variables read are declared and stored in structure SEA99M_V if (myrank == 0) call read_sea99_s_model(SEA99M_V) -! broadcast the information read on the master to the nodes +! broadcast the information read on the main to the nodes ! SEA99M_V #ifdef USE_MPI call MPI_BCAST(SEA99M_V%sea99_ndep,1,MPI_INTEGER,0,MPI_COMM_WORLD,ier) @@ -1203,7 +1203,7 @@ program xmeshfem3D if (ANISOTROPIC_3D_MANTLE) then ! the variables read are declared and stored in structure AMM_V if (myrank == 0) call read_aniso_mantle_model(AMM_V) -! broadcast the information read on the master to the nodes +! broadcast the information read on the main to the nodes #ifdef USE_MPI call MPI_BCAST(AMM_V%npar1,1,MPI_INTEGER,0,MPI_COMM_WORLD,ier) call MPI_BCAST(AMM_V%beta,14*34*37*73,MPI_DOUBLE_PRECISION,0,MPI_COMM_WORLD,ier) @@ -1214,7 +1214,7 @@ program xmeshfem3D if (CRUSTAL) then ! the variables read are declared and stored in structure CM_V if (myrank == 0) call read_crustal_model(CM_V) -! broadcast the information read on the master to the nodes +! broadcast the information read on the main to the nodes #ifdef USE_MPI call MPI_BCAST(CM_V%thlr,NKEYS_CRUST*NLAYERS_CRUST,MPI_DOUBLE_PRECISION,0,MPI_COMM_WORLD,ier) call MPI_BCAST(CM_V%velocp,NKEYS_CRUST*NLAYERS_CRUST,MPI_DOUBLE_PRECISION,0,MPI_COMM_WORLD,ier) @@ -1263,7 +1263,7 @@ program xmeshfem3D ! read topography and bathymetry file if (TOPOGRAPHY .or. OCEANS) then if (myrank == 0) call read_topo_bathy_file(ibathy_topo) -! broadcast the information read on the master to the nodes +! broadcast the information read on the main to the nodes #ifdef USE_MPI call MPI_BCAST(ibathy_topo,NX_BATHY*NY_BATHY,MPI_INTEGER,0,MPI_COMM_WORLD,ier) #endif diff --git a/utils/small_SEM_solvers_in_Fortran_and_C_without_MPI_to_learn/mesher_for_serial/read_compute_parameters.F90 b/utils/small_SEM_solvers_in_Fortran_and_C_without_MPI_to_learn/mesher_for_serial/read_compute_parameters.F90 index 7bec53db4..e7aaf0972 100644 --- a/utils/small_SEM_solvers_in_Fortran_and_C_without_MPI_to_learn/mesher_for_serial/read_compute_parameters.F90 +++ b/utils/small_SEM_solvers_in_Fortran_and_C_without_MPI_to_learn/mesher_for_serial/read_compute_parameters.F90 @@ -56,7 +56,7 @@ subroutine read_compute_parameters(MIN_ATTENUATION_PERIOD,MAX_ATTENUATION_PERIOD OUTPUT_SEISMOS_ASCII_TEXT,OUTPUT_SEISMOS_SAC_ALPHANUM,OUTPUT_SEISMOS_SAC_BINARY, & 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,EMULATE_ONLY) + WRITE_SEISMOGRAMS_BY_MAIN,SAVE_ALL_SEISMOS_IN_ONE_FILE,USE_BINARY_FOR_LARGE_FILE,EMULATE_ONLY) implicit none @@ -88,7 +88,7 @@ subroutine read_compute_parameters(MIN_ATTENUATION_PERIOD,MAX_ATTENUATION_PERIOD SAVE_MESH_FILES,ATTENUATION, & ABSORBING_CONDITIONS,INCLUDE_CENTRAL_CUBE,INFLATE_CENTRAL_CUBE,SAVE_FORWARD, & OUTPUT_SEISMOS_ASCII_TEXT,OUTPUT_SEISMOS_SAC_ALPHANUM,OUTPUT_SEISMOS_SAC_BINARY, & - ROTATE_SEISMOGRAMS_RT,WRITE_SEISMOGRAMS_BY_MASTER, & + ROTATE_SEISMOGRAMS_RT,WRITE_SEISMOGRAMS_BY_MAIN, & SAVE_ALL_SEISMOS_IN_ONE_FILE,USE_BINARY_FOR_LARGE_FILE,EMULATE_ONLY character(len=150) OUTPUT_FILES,LOCAL_PATH,MODEL @@ -1076,7 +1076,7 @@ subroutine read_compute_parameters(MIN_ATTENUATION_PERIOD,MAX_ATTENUATION_PERIOD if (err_occurred() /= 0) stop 'an error occurred while reading the parameter file' call read_value_logical(ROTATE_SEISMOGRAMS_RT, 'solver.ROTATE_SEISMOGRAMS_RT') if (err_occurred() /= 0) stop 'an error occurred while reading the parameter file' - call read_value_logical(WRITE_SEISMOGRAMS_BY_MASTER, 'solver.WRITE_SEISMOGRAMS_BY_MASTER') + call read_value_logical(WRITE_SEISMOGRAMS_BY_MAIN, 'solver.WRITE_SEISMOGRAMS_BY_MAIN') if (err_occurred() /= 0) stop 'an error occurred while reading the parameter file' call read_value_logical(SAVE_ALL_SEISMOS_IN_ONE_FILE, 'solver.SAVE_ALL_SEISMOS_IN_ONE_FILE') if (err_occurred() /= 0) stop 'an error occurred while reading the parameter file' diff --git a/utils/unused_routines/model_interface_bedrock.f90 b/utils/unused_routines/model_interface_bedrock.f90 index 67be74fbc..1d3e21528 100644 --- a/utils/unused_routines/model_interface_bedrock.f90 +++ b/utils/unused_routines/model_interface_bedrock.f90 @@ -67,7 +67,7 @@ ! ! write(IMAIN,*) ! endif -! ! broadcast the information read on the master to the nodes +! ! broadcast the information read on the main to the nodes ! ! call MPI_BCAST(ibedrock,NX_TOPO_ANT*NY_TOPO_ANT,MPI_REAL,0,MPI_COMM_WORLD,ier) ! call bcast_all_cr(ibedrock,NX_TOPO_ANT*NY_TOPO_ANT)