Juan 24/11/2016: job_{} , upgrade to MNH-5-2-2

4a4166cd · Juan Escobar · 532f44d0 · 4a4166cd · 4a4166cd · 4a4166cd
Commit 4a4166cd authored 8 years ago by Juan Escobar
--- a/src/job_make_examples_BG
+++ b/src/job_make_examples_BG
@@ -18,7 +18,7 @@
 set -x
 cd $LOADL_STEP_INITDIR
-.  ../conf/profile_mesonh-BGI4-MNH-V5-2-1-MPIAUTO-O2
+.  ../conf/profile_mesonh-BGI4-MNH-V5-2-2-MPIAUTO-O2
 #001_2Drelief 002_3Drelief 003_KW78 004_Reunion 007_16janvier

--- a/src/job_make_examples_BGQ
+++ b/src/job_make_examples_BGQ
@@ -18,7 +18,7 @@
 cd $LOADL_STEP_INITDIR
-. ../conf/profile_mesonh-BGQI4-MNH-V5-2-1-MPIAUTO-O2NAN
+. ../conf/profile_mesonh-BGQI4-MNH-V5-2-2-MPIAUTO-O2NAN
 set -x

--- a/src/job_make_examples_BullX
+++ b/src/job_make_examples_BullX
@@ -19,7 +19,7 @@ set -e
 # Nom de la machine
 hostname 
-. ../conf/profile_mesonh-LXifortI4-MNH-V5-2-1-MPIINTEL-O3
+. ../conf/profile_mesonh-LXifortI4-MNH-V5-2-2-MPIINTEL-O3
 export MONORUN="mpirun -np 1 "
 export MPIRUN="mpirun -np 2 "
 export POSTRUN="time "

--- a/src/job_make_examples_BullX_eos
+++ b/src/job_make_examples_BullX_eos
 #!/bin/bash
 #SBATCH -J Examples
-#SBATCH -N 1            # nodes number
+#SBATCH -N 2            # nodes number
 #SBATCH -n 4            # CPUs number (on all nodes) 
 #SBATCH --exclusive           
 #SBATCH -o Examples.eo%j   #
 #SBATCH -e Examples.eo%j   #
 #SBATCH -t 01:00:00    # time limit
-##SBATCH --export=NONE
+#SBATCH --export=NONE
 # Echo des commandes
 ulimit -c 0
@@ -17,9 +17,9 @@ set -x
 # Nom de la machine
 hostname 
-. ../conf/profile_mesonh-LXifortI4-MNH-V5-2-1-MPIINTEL-O2
+. ../conf/profile_mesonh-LXifortI4-MNH-V5-2-2-MPIINTEL-O2
-export MONORUN="mpirun -genv I_MPI_PIN_PROCESSOR_LIST=all:map=spread -prepend-rank -np 1 "
+export MONORUN="mpirun -prepend-rank -np 1 "
-export MPIRUN="mpirun -genv I_MPI_PIN_PROCESSOR_LIST=all:map=spread -prepend-rank -np 4 "
+export MPIRUN="mpirun -prepend-rank -np 4 "
 export POSTRUN="time "
 cd $SRC_MESONH/MY_RUN/KTEST/003_KW78 

--- a/src/job_make_examples_CRAY_cca
+++ b/src/job_make_examples_CRAY_cca
@@ -27,7 +27,7 @@ cd ${PBS_O_WORKDIR}
 #ARCH=LXifort
 ARCH=LXcray
-. ../conf/profile_mesonh-${ARCH}I4-MNH-V5-2-1-MPICRAY-O2
+. ../conf/profile_mesonh-${ARCH}I4-MNH-V5-2-2-MPICRAY-O2
 export MONORUN="aprun -n 1 "

--- a/src/job_make_examples_IBM_ada
+++ b/src/job_make_examples_IBM_ada
@@ -19,7 +19,7 @@
 cd $LOADL_STEP_INITDIR
-. ../conf/profile_mesonh-LXifortI4-MNH-V5-2-1-MPIINTEL-O2
+. ../conf/profile_mesonh-LXifortI4-MNH-V5-2-2-MPIINTEL-O2
 # Pour avoir l'echo des commandes
 set -x

--- a/src/job_make_examples_IBM_sp6_vargas
+++ b/src/job_make_examples_IBM_sp6_vargas
@@ -24,7 +24,7 @@
 set -x
 cd $LOADL_STEP_INITDIR
-.  ../conf/profile_mesonh-AIX64-MNH-V5-2-1-MPIAUTO-O2
+.  ../conf/profile_mesonh-AIX64-MNH-V5-2-2-MPIAUTO-O2
 #001_2Drelief 002_3Drelief 003_KW78 004_Reunion 007_16janvier

--- a/src/job_make_examples_NEC_SX8
+++ b/src/job_make_examples_NEC_SX8
@@ -18,7 +18,7 @@ hostname
 [ -d $PBS_O_WORKDIR ] && cd $PBS_O_WORKDIR
 #
-. ../conf/profile_mesonh-SX8I4-MNH-V5-2-1-MPIAUTO-O4
+. ../conf/profile_mesonh-SX8I4-MNH-V5-2-2-MPIAUTO-O4
 export MONORUN="Mpirun -np 1 "
 export MPIRUN="Mpirun -np 2 "

--- a/src/job_make_examples_SX8
+++ b/src/job_make_examples_SX8
@@ -19,7 +19,7 @@ hostname
 [ -d $PBS_O_WORKDIR ] && cd $PBS_O_WORKDIR
 #
-. ../conf/profile_mesonh-SX8I4-MNH-V5-2-1-MPIAUTO-O2
+. ../conf/profile_mesonh-SX8I4-MNH-V5-2-2-MPIAUTO-O2
 export MONORUN="Mpirun -np 1 "
 export MPIRUN="Mpirun -np 2 "

--- a/src/job_make_examples_cxa
+++ b/src/job_make_examples_cxa
@@ -34,7 +34,7 @@ echo SHELL=$SHELL
 cd $LOADL_STEP_INITDIR
-.  ../conf/profile_mesonh-AIX64I4-MNH-V5-2-1-MPIAUTO-O2
+.  ../conf/profile_mesonh-AIX64I4-MNH-V5-2-2-MPIAUTO-O2
 ulimit -c 0 # pas de core

--- a/src/job_make_mesonh_BG
+++ b/src/job_make_mesonh_BG
@@ -18,7 +18,7 @@
 set -x
 cd $LOADL_STEP_INITDIR
-. ../conf/profile_mesonh-BGI4-MNH-V5-2-1-MPIAUTO-O2          
+. ../conf/profile_mesonh-BGI4-MNH-V5-2-2-MPIAUTO-O2          
 #time gmake 
 time gmake -r -j8

--- a/src/job_make_mesonh_BGQ
+++ b/src/job_make_mesonh_BGQ
@@ -34,7 +34,7 @@ set -x
 cd $LOADL_STEP_INITDIR
-. ../conf/profile_mesonh-BGQI4-MNH-V5-2-1-MPIAUTO-O2NAN
+. ../conf/profile_mesonh-BGQI4-MNH-V5-2-2-MPIAUTO-O2NAN
 case $LOADL_STEP_NAME in

--- a/src/job_make_mesonh_BullX
+++ b/src/job_make_mesonh_BullX
@@ -19,7 +19,7 @@ set -x
 # On va lancer la compilation dans le répertoire de lancement du job
 pwd
-. ../conf/profile_mesonh-LXifortI4-MNH-V5-2-1-MPIINTEL-O3
+. ../conf/profile_mesonh-LXifortI4-MNH-V5-2-2-MPIINTEL-O3
 time gmake -j 4
 time gmake -j 1 installmaster

--- a/src/job_make_mesonh_CRAY_cca
+++ b/src/job_make_mesonh_CRAY_cca
@@ -21,7 +21,7 @@ pwd
 #ARCH=LXifort
 ARCH=LXcray
-. ../conf/profile_mesonh-${ARCH}I4-MNH-V5-2-1-MPICRAY-O2
+. ../conf/profile_mesonh-${ARCH}I4-MNH-V5-2-2-MPICRAY-O2
 time gmake -j 4 2>&1 | tee sortie_compile_cray.$$

--- a/src/job_make_mesonh_IBM_ada
+++ b/src/job_make_mesonh_IBM_ada
@@ -16,7 +16,7 @@
 cd $LOADL_STEP_INITDIR
-. ../conf/profile_mesonh-LXifortI4-MNH-V5-2-1-MPIINTEL-O2
+. ../conf/profile_mesonh-LXifortI4-MNH-V5-2-2-MPIINTEL-O2
 # Pour avoir l'echo des commandes
 set -x

--- a/src/job_make_mesonh_IBM_sp6_vargas
+++ b/src/job_make_mesonh_IBM_sp6_vargas
@@ -24,7 +24,7 @@
 set -x
 cd $LOADL_STEP_INITDIR
-. ../conf/profile_mesonh-AIX64I4-MNH-V5-2-1-MPIAUTO-O2
+. ../conf/profile_mesonh-AIX64I4-MNH-V5-2-2-MPIAUTO-O2
 time gmake -j1 gribapi
 time gmake -r -j8

--- a/src/job_make_mesonh_MFSX8
+++ b/src/job_make_mesonh_MFSX8
@@ -12,7 +12,7 @@ set -x
 # On va lancer la compilation dans le répertoire de lancement du job
 [ ${PBS_O_WORKDIR} ] && cd ${PBS_O_WORKDIR}
-. ../conf/profile_mesonh-SX8I4-MNH-V5-2-1-MPIAUTO-O4 
+. ../conf/profile_mesonh-SX8I4-MNH-V5-2-2-MPIAUTO-O4 
 time gmake  -j 4  ########## compile on four processors to speedup the compilation
 time gmake  -j 1 installmaster

--- a/src/job_make_mesonh_NEC_SX8
+++ b/src/job_make_mesonh_NEC_SX8
@@ -11,7 +11,7 @@ set -x
 # On va lancer la compilation dans le répertoire de lancement du job
 [ $PBS_O_WORKDIR ] && cd $PBS_O_WORKDIR
-. ../conf/profile_mesonh-SX8I4-MNH-V5-2-1-MPIAUTO-O4
+. ../conf/profile_mesonh-SX8I4-MNH-V5-2-2-MPIAUTO-O4
 time gmake  -j 4  
 time gmake  -j 4   #  some time problem with first pass in parallel compilation

--- a/src/job_make_mesonh_cxa
+++ b/src/job_make_mesonh_cxa
@@ -27,7 +27,7 @@
 set -x
 cd $LOADL_STEP_INITDIR
-.  ../conf/profile_mesonh-AIX64I4-MNH-V5-2-1-MPIAUTO-O2
+.  ../conf/profile_mesonh-AIX64I4-MNH-V5-2-2-MPIAUTO-O2
 time gmake -r -j1
 time gmake installmaster

--- a/src/job_make_mesonh_user_BullX
+++ b/src/job_make_mesonh_user_BullX
@@ -19,7 +19,7 @@ export VER_USER=                ########## Your own USER Directory
 set -x
 # On va lancer la compilation dans le répertoire de lancement du job
-. ../conf/profile_mesonh-LXifortI4-MNH-V5-2-1-${VER_USER}-MPIINTEL-O3
+. ../conf/profile_mesonh-LXifortI4-MNH-V5-2-2-${VER_USER}-MPIINTEL-O3
 time gmake user
 time gmake -j 1 installuser