[cig-commits] [commit] devel: Modifications in Benchmark DSM-SPECFEM3D example directory (b12ff9e)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Fri Nov 28 08:20:50 PST 2014
Repository : https://github.com/geodynamics/specfem3d
On branch : devel
Link : https://github.com/geodynamics/specfem3d/compare/b2e6274976c364b76f2990b3c8ce2d19dd18c938...9a84d06c76e869f5276019e4f84affce23830a4d
>---------------------------------------------------------------
commit b12ff9eb391f35887a4fe4f376a166bd7ff124dd
Author: Clément Durochat <c.durochat at gmail.com>
Date: Fri Nov 28 17:11:59 2014 +0100
Modifications in Benchmark DSM-SPECFEM3D example directory
>---------------------------------------------------------------
b12ff9eb391f35887a4fe4f376a166bd7ff124dd
...n_benchmark_all_process.sh_Traction_preparation | 0
...tch_run_benchmark_all_process_only_SPECFEM3D.sh | 0
.../{ => Other_scripts}/batch_run_movie.sh | 0
.../{ => Other_scripts}/load_data.m | 0
.../{ => Other_scripts}/movie.tar.bz2 | Bin
...EFORE_RUNNING--HOWTO_USE_THIS_BENCHMARK_EXAMPLE | 103 +++++++++++++++++++++
.../README_BEFORE_RUN_THIS_BENCHMARK | 63 -------------
.../example_simple_small/README_NEW_CHANGE | 34 -------
.../batch_run_benchmark_all_process.sh | 6 +-
.../example_simple_small/clean_this_example_dir | 5 +-
10 files changed, 108 insertions(+), 103 deletions(-)
diff --git a/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/batch_run_benchmark_all_process.sh_Traction_preparation b/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/Other_scripts/batch_run_benchmark_all_process.sh_Traction_preparation
similarity index 100%
rename from EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/batch_run_benchmark_all_process.sh_Traction_preparation
rename to EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/Other_scripts/batch_run_benchmark_all_process.sh_Traction_preparation
diff --git a/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/batch_run_benchmark_all_process_only_SPECFEM3D.sh b/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/Other_scripts/batch_run_benchmark_all_process_only_SPECFEM3D.sh
similarity index 100%
rename from EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/batch_run_benchmark_all_process_only_SPECFEM3D.sh
rename to EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/Other_scripts/batch_run_benchmark_all_process_only_SPECFEM3D.sh
diff --git a/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/batch_run_movie.sh b/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/Other_scripts/batch_run_movie.sh
similarity index 100%
rename from EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/batch_run_movie.sh
rename to EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/Other_scripts/batch_run_movie.sh
diff --git a/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/load_data.m b/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/Other_scripts/load_data.m
similarity index 100%
rename from EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/load_data.m
rename to EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/Other_scripts/load_data.m
diff --git a/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/movie.tar.bz2 b/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/Other_scripts/movie.tar.bz2
similarity index 100%
rename from EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/movie.tar.bz2
rename to EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/Other_scripts/movie.tar.bz2
diff --git a/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/README_BEFORE_RUNNING--HOWTO_USE_THIS_BENCHMARK_EXAMPLE b/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/README_BEFORE_RUNNING--HOWTO_USE_THIS_BENCHMARK_EXAMPLE
new file mode 100644
index 0000000..527edb0
--- /dev/null
+++ b/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/README_BEFORE_RUNNING--HOWTO_USE_THIS_BENCHMARK_EXAMPLE
@@ -0,0 +1,103 @@
+=============================================================================================================================
+
+To run this benchmark, you need to :
+
+
+=============================================================================================================================
+1. --------------------------------------------------------------------------------------------------------------------------
+=============================================================================================================================
+
+* Compile SpecFEM3D in your specfem3d home directory
+* Install DSM from the directory specfem3d/utils/DSM_FOR_SPECFEM3D ==> type : ./install.sh
+
+
+=============================================================================================================================
+2. --------------------------------------------------------------------------------------------------------------------------
+=============================================================================================================================
+
+* Define the variable HOME_SPECFEM3D, i.e. the path of your specfem3d home, in ./batch_run_benchmark_all_process.sh, l.90
+
+All the other paths in the different scripts depends on the variable HOME_SPECFEM3D
+
+At this moment, the path of specfem3d home is defined as:
+HOME_SPECFEM3D=/ccc/scratch/cont003/gen7165/durochtc/Codes/SPECFEM3Ds/specfem3d
+
+
+=============================================================================================================================
+3. --------------------------------------------------------------------------------------------------------------------------
+=============================================================================================================================
+
+You can change different parameter settings:
+
+* The computation parameter settings are in file: ./batch_run_benchmark_all_process.sh
+
+All the option for launch this benchmark are in the head of this file. This script have 6 steps : the step 6 is about making
+movies with results, this step isn't executed (commented in the batch) for the moment due to a problem that will be fixed soon
+
+* The basic parameter settings for the source and receiver are in file: ./parfile_for_benchmark
+
+* The DSM computation settings and input model are contained in:
+./input_dsm/Double_para.txt
+./input_dsm/FrqsMpi.txt
+./input_dsm/iasp91
+./input_dsm/iasp91_dsm
+./input_dsm/st
+
+* The SpecFEM3D computation parameters settings are in file:
+./DATA/Par_file
+./DATA/STATIONS
+./DATA/CMTSOLUTION
+
+* The script called during the 6 steps (controlling the hybrid computation) are in the directory:
+specfem3d/utils/DSM_FOR_SPECFEM3D/shells/
+
+
+=============================================================================================================================
+4. --------------------------------------------------------------------------------------------------------------------------
+=============================================================================================================================
+
+This benchmark was tested and works on Curie TGCC supercomputer, for 32 procs (2 nodes of Curie)
+
+To change the number of procs for the job, you need to check/change :
+
+* Change #MSUB -n (the number of procs) and #MSUB -N (the number of nodes) in ./batch_run_benchmark_all_process.sh (l. 7-8)
+
+* Search and check "#MSUB -n" and "#MSUB -N" in every scripts called by this benchmark
+ (in the whole DSM_FOR_SPECFEM directory) and change if necessary (normally not)
+
+* Change NPROC in ./DATA/Par_file (l. 15)
+
+* Change MPI_CPUS in ./parfile_for_benchmark (l.85)
+
+* Change NRPOC and CPUS in ./batch_run_benchmark_all_process.sh (l. 73-74)
+
+* Search and check "NPROC=" and "CPUS=" in every scripts called by this benchmark
+ (in the whole DSM_FOR_SPECFEM directory) and change if necessary
+
+
+=============================================================================================================================
+5. --------------------------------------------------------------------------------------------------------------------------
+=============================================================================================================================
+
+* The command to launch the job is :
+
+ccc_msub -q standard ./batch_run_benchmark_all_process.sh
+
+
+=============================================================================================================================
+6. --------------------------------------------------------------------------------------------------------------------------
+=============================================================================================================================
+
+* You can change the wavefield computation type:
+If you want to choose the computation include SH(only) / PSV(only) / FULL(SH+PSV) wavefields,
+please change the CHOICE variable to 1/2/3 separately in script: ./batch_run_benchmark_all_process.sh
+
+
+=============================================================================================================================
+7. --------------------------------------------------------------------------------------------------------------------------
+=============================================================================================================================
+
+After running, you can clean the directory, erasing all the generated files ==> type: ./clean_this_example_dir
+
+
+=============================================================================================================================
diff --git a/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/README_BEFORE_RUN_THIS_BENCHMARK b/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/README_BEFORE_RUN_THIS_BENCHMARK
deleted file mode 100644
index 04db7ab..0000000
--- a/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/README_BEFORE_RUN_THIS_BENCHMARK
+++ /dev/null
@@ -1,63 +0,0 @@
-To run this benchmark, you need to :
-
-=============================================================================================================================
-1. --------------------------------------------------------------------------------------------------------------------------
-=============================================================================================================================
-
-Read the file README_NEW_CHANGE
-
-=============================================================================================================================
-2. --------------------------------------------------------------------------------------------------------------------------
-=============================================================================================================================
-
-This benchmark was tested and works on Curie TGCC supercomputer
-
-All the option for launch this benchmark are in the head of ./batch_run_benchmark_all_process.sh
-
-=============================================================================================================================
-3. --------------------------------------------------------------------------------------------------------------------------
-=============================================================================================================================
-
-Configure in ./parfile_for_benchmark, l. 2, the path of your specfem3d home, for example :
-
-HOME_SPECFEM3D = /ccc/scratch/cont003/gen7165/durochtc/Codes/SPECFEM3Ds/specfem3d
-
-All the other paths in the different scripts depends on the variable HOME_SPECFEM3D.
-
-=============================================================================================================================
-4. --------------------------------------------------------------------------------------------------------------------------
-=============================================================================================================================
-
-This benchmark was tested and works for 32 procs (2 nodes of Curie)
-
-To change the number of procs for the job, you need to check/change :
-
-- Change #MSUB -n (the number of procs) and #MSUB -N (the number of nodes) in ./batch_run_benchmark_all_process.sh (l. 7-8)
-
-- Search and check "#MSUB -n" and "#MSUB -N" in every scripts called by this benchmark
- (in the whole DSM_FOR_SPECFEM directory) and change if necessary (normally not)
-
-- Change NPROC in ./DATA/Par_file (l. 15)
-
-- Change MPI_CPUS in ./parfile_for_benchmark (l.85)
-
-- Change NRPOC and CPUS in ./batch_run_benchmark_all_process.sh (l. 73-74)
-
-- Search and check "NPROC=" and "CPUS=" in every scripts called by this benchmark
- (in the whole DSM_FOR_SPECFEM directory) and change if necessary
-
-=============================================================================================================================
-5. --------------------------------------------------------------------------------------------------------------------------
-=============================================================================================================================
-
-The command to launch the job is :
-
-ccc_msub -q standard ./batch_run_benchmark_all_process.sh
-
-=============================================================================================================================
-6. --------------------------------------------------------------------------------------------------------------------------
-=============================================================================================================================
-
-Remark : the batch_run_benchmark_all_process.sh have 6 steps. The step 6 is about making movies with results, this step
-isn't executed (commented in the batch) for the moment due to a problem that will be fixed soon
-
diff --git a/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/README_NEW_CHANGE b/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/README_NEW_CHANGE
deleted file mode 100644
index bbdb76c..0000000
--- a/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/README_NEW_CHANGE
+++ /dev/null
@@ -1,34 +0,0 @@
-0.Firstly, you should compile the Specfem3D codes in ../SEMH directory
- Secondly, run the install.sh scripts in ../ directory to generate the DSM routinues.
-
-######################################################################################
-
-1.The basic parameter settings for the source and receiver are in file :parfile_for_benchmark
-
-2.The computation parameter settings are in file : batch_run_benchmark_all_process.sh
-
-3.The path settings for saving database and middle computation results by DSM/SEM3D hybrid method are in file:
-- params.in
-- parfile_for_benchmark
-- batch_run_benchmark_all_process.sh
-
-4.The DSM computation settings and input model are contained in:
-./input_dsm/Double_para.txt
-./input_dsm/FrqsMpi.txt
-./input_dsm/iasp91
-./input_dsm/iasp91_dsm
-./input_dsm/st
-
-5.The SEM3D computation parameters and path settings are in file:
-./DATA/Par_file
-./DATA/STATIONS
-./DATA/CMTSOLUTION
-
-6.The scripts control the Hybirid computaion is in ../shells/ directory.
-
-Please do the modifications as the remarks state in the file/script above.
-
-################NEW CHANGE FOR DIFFERENT WAVEFIELD COMPUATION TYPE#####################
-7.If you want to choose the computation include SH(only) / PSV(only) / FULL(SH+PSV) wavefields, please change the CHOICE variable to 1/2/3 separately in script: batch_run_benchmark_all_process.sh.
-
-
diff --git a/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/batch_run_benchmark_all_process.sh b/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/batch_run_benchmark_all_process.sh
index 6570dee..7a3acec 100755
--- a/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/batch_run_benchmark_all_process.sh
+++ b/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/batch_run_benchmark_all_process.sh
@@ -41,7 +41,7 @@ cd ${BRIDGE_MSUB_PWD}
# -- CMTSOLUTION
#
#
-# the script runs :
+# The script runs :
#
# 1/ MESHER
# 2/ DSM to compute tractions on the chunk boundary
@@ -51,7 +51,6 @@ cd ${BRIDGE_MSUB_PWD}
# 6/ MAKE MOVIE
#
#
-#
# Vadim Monteiller April 2013.
#
# reference :
@@ -61,9 +60,6 @@ cd ${BRIDGE_MSUB_PWD}
#
#####################################################################################################################
#
-### ----- First thing to do : the home of SPECFEM3D is in parmans.in ---------
-##source params.in
-
## ------------------ INPUTS -----------------------------
# NBPROC is declared as integer (important do not change)
diff --git a/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/clean_this_example_dir b/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/clean_this_example_dir
index d14b46c..2f1bd68 100755
--- a/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/clean_this_example_dir
+++ b/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/clean_this_example_dir
@@ -1,3 +1,6 @@
#!/bin/bash
-rm -rf *~ Tract/ OUTPUT_FILES/ DSM_tractions/ MESH/* xmin_gll_for_dsm_0000* *.out fort.* DATA/DSM_tractions_for_specfem3D/
+mv MESH/model_1D.in .
+rm -rf MESH/.recdepth MESH/*
+mv model_1D.in MESH/
+rm -rf *~ Tract/ OUTPUT_FILES/ DSM_tractions/ xmin_gll_for_dsm_0000* *.out fort.* DATA/DSM_tractions_for_specfem3D/
More information about the CIG-COMMITS
mailing list