[cig-commits] [commit] devel: Couple (30d6bd7)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Fri Aug 1 10:07:35 PDT 2014
Repository : https://github.com/geodynamics/specfem3d
On branch : devel
Link : https://github.com/geodynamics/specfem3d/compare/8a3f14d7d473f70feb7f073639045daa35c587bc...d759e09dd946c593868753fbb4253d77378fb276
>---------------------------------------------------------------
commit 30d6bd70154b568e17be914b01eeb5e261eb78f7
Author: Clément Durochat <c.durochat at gmail.com>
Date: Tue Jul 22 18:29:32 2014 +0200
Couple
>---------------------------------------------------------------
30d6bd70154b568e17be914b01eeb5e261eb78f7
.../example_simple_small/batch_run_benchmark_all_process.sh | 4 ++--
.../batch_run_benchmark_all_process.sh_Traction_preparation | 8 ++++----
.../batch_run_benchmark_all_process_only_SPECFEM3D.sh | 8 ++++----
.../DSM_FOR_SPECFEM3D/example_simple_small/batch_run_movie.sh | 6 +++---
EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/mesh2vtu.pl | 4 ++--
.../shells/idris_ada_run_benchmark_all_process.sh | 2 +-
.../shells/msub_run_benchmark_all_process.sh | 11 ++++++-----
7 files changed, 22 insertions(+), 21 deletions(-)
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 fd598cb..fb0b894 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
@@ -60,8 +60,8 @@
#
#####################################################################################################################
#
-## ----- First thing to do : the home of SPECFEM3D is in parmans.in ---------
-source params.in
+### ----- First thing to do : the home of SPECFEM3D is in parmans.in ---------
+##source params.in
## ------------------ INPUTS -----------------------------
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/batch_run_benchmark_all_process.sh_Traction_preparation
index b3afef9..d8bd437 100755
--- a/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/batch_run_benchmark_all_process.sh_Traction_preparation
+++ b/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/batch_run_benchmark_all_process.sh_Traction_preparation
@@ -4,7 +4,7 @@
# ------------ BACTH AND SPECIFIC CLUSTER DIRECTIVES ------
#MSUB -r run_benchmark
-#MSUB -n 12
+#MSUB -n 24
#MSUB -N 1
#MSUB -x
#MSUB -T 10800
@@ -86,8 +86,8 @@
declare -i NPROC NPROC_MINUS_ONE CPUS CHOICE MIDDLE
# NUMBER OF MPI PROCESSES
-NPROC=40
-CPUS=40
+NPROC=24
+CPUS=24
# Here i set the number of cores for SPEC3D computation is 12 too.
# MPIRUN COMMAND
@@ -117,7 +117,7 @@ OUT_MOVIE=$(pwd)/movie
#------- input files creation
# you must write the absolute path for : xcreate_input
# you must edit and complete : parfile_for_benchmark
-/home/durochat/Codes/SPECFEM3Ds/specfem3d/utils/DSM_FOR_SPECFEM3D/bin/xcreate_inputs_files<<EOF
+$HOME_SPECFEM3D/utils/DSM_FOR_SPECFEM3D/bin/xcreate_inputs_files<<EOF
parfile_for_benchmark
EOF
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/batch_run_benchmark_all_process_only_SPECFEM3D.sh
index 5696515..8e66892 100755
--- a/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/batch_run_benchmark_all_process_only_SPECFEM3D.sh
+++ b/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/batch_run_benchmark_all_process_only_SPECFEM3D.sh
@@ -4,7 +4,7 @@
# ------------ BACTH AND SPECIFIC CLUSTER DIRECTIVES ------
#MSUB -r run_benchmark
-#MSUB -n 12
+#MSUB -n 24
#MSUB -N 1
#MSUB -x
#MSUB -T 10800
@@ -86,8 +86,8 @@
declare -i NPROC NPROC_MINUS_ONE CPUS CHOICE MIDDLE
# NUMBER OF MPI PROCESSES
-NPROC=40
-CPUS=40
+NPROC=24
+CPUS=24
# Here i set the number of cores for SPEC3D computation is 12 too.
# MPIRUN COMMAND
@@ -117,7 +117,7 @@ OUT_MOVIE=$(pwd)/movie
#------- input files creation
# you must write the absolute path for : xcreate_input
# you must edit and complete : parfile_for_benchmark
-/home/durochat/Codes/SPECFEM3Ds/specfem3d/utils/DSM_FOR_SPECFEM3D/bin/xcreate_inputs_files<<EOF
+$HOME_SPECFEM3D/utils/DSM_FOR_SPECFEM3D/bin/xcreate_inputs_files<<EOF
parfile_for_benchmark
EOF
diff --git a/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/batch_run_movie.sh b/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/batch_run_movie.sh
index 1f01b1f..f70c11f 100755
--- a/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/batch_run_movie.sh
+++ b/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/batch_run_movie.sh
@@ -4,7 +4,7 @@
# ------------ BACTH AND SPECIFIC CLUSTER DIRECTIVES ------
#MSUB -r run_benchmark
-#MSUB -n 12
+#MSUB -n 24
#MSUB -N 1
#MSUB -x
#MSUB -T 10800
@@ -86,8 +86,8 @@
declare -i NPROC NPROC_MINUS_ONE CPUS
# NUMBER OF MPI PROCESSES
-NPROC=40
-CPUS=40
+NPROC=24
+CPUS=24
# MPIRUN COMMAND
MPIRUN="mpirun"
diff --git a/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/mesh2vtu.pl b/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/mesh2vtu.pl
index f83b9e8..db6d9f8 100755
--- a/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/mesh2vtu.pl
+++ b/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/mesh2vtu.pl
@@ -6,8 +6,8 @@ use File::Basename;
$progname = basename($0);
### Please modify the following variables according to your own system setting ###
-$mesh2vtu = "/home/durochat/Codes/SPECFEM3Ds/specfem3d/utils/Visualization/Paraview/mesh2vtu/mesh2vtu";
-$REQLIBS = "env LD_LIBRARY_PATH=/usr/lib/vtk-5.2/";
+$mesh2vtu = "$HOME_SPECFEM3D/utils/Visualization/Paraview/mesh2vtu/mesh2vtu";
+$REQLIBS = "env LD_LIBRARY_PATH=/usr/local/VTK/lib/vtk-5.6/";
#################################################################################
sub Usage {
diff --git a/utils/DSM_FOR_SPECFEM3D/shells/idris_ada_run_benchmark_all_process.sh b/utils/DSM_FOR_SPECFEM3D/shells/idris_ada_run_benchmark_all_process.sh
index d4b1910..ff4be59 100755
--- a/utils/DSM_FOR_SPECFEM3D/shells/idris_ada_run_benchmark_all_process.sh
+++ b/utils/DSM_FOR_SPECFEM3D/shells/idris_ada_run_benchmark_all_process.sh
@@ -127,7 +127,7 @@ OUT_MOVIE=$(pwd)/movie
#------- input files creation
# you must write the absolute path for : xcreate_input
# you must edit and complete : parfile_for_benchmark
-/home/durochat/Codes/SPECFEM3Ds/specfem3d/utils/DSM_FOR_SPECFEM3D/bin/xcreate_inputs_files<<EOF
+$HOME_SPECFEM3D/utils/DSM_FOR_SPECFEM3D/bin/xcreate_inputs_files<<EOF
parfile_for_benchmark
EOF
diff --git a/utils/DSM_FOR_SPECFEM3D/shells/msub_run_benchmark_all_process.sh b/utils/DSM_FOR_SPECFEM3D/shells/msub_run_benchmark_all_process.sh
index 6306ca3..87ea052 100755
--- a/utils/DSM_FOR_SPECFEM3D/shells/msub_run_benchmark_all_process.sh
+++ b/utils/DSM_FOR_SPECFEM3D/shells/msub_run_benchmark_all_process.sh
@@ -3,14 +3,15 @@
# ------------ BACTH AND SPECIFIC CLUSTER DIRECTIVES ------
-#MSUB -r run_benchmark
-#MSUB -n 12
+#MSUB -r Benchmark_couple_SPECFEM3D_DSM # Nom du job
+#MSUB -n 24
#MSUB -N 1
#MSUB -x
-#MSUB -T 10800
+#MSUB -T 84000
#MSUB -q standard
-#MSUB -o run_benchmark.o
-#MSUB -e run_benchmark.e
+#MSUB -e Benchmark_couple_run.e
+#MSUB -o Benchmark_couple_run.o
+#MSUB -A gen7165
set -x
cd $BRIDGE_MSUB_PWD
More information about the CIG-COMMITS
mailing list