diff --git a/src/job_make_examples_BG b/src/job_make_examples_BG index 9ac36da0667c3a5b25aef97d6d209384faae9650..9c4c9faeeff5f0a6f659d765437365a95cfea5e0 100755 --- 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 diff --git a/src/job_make_examples_BGQ b/src/job_make_examples_BGQ index 685ebfdf7102fd6ce21edeaf71fc71a15842e03b..786b5a6b1f97f7c4f105a0594e65363aacfa5e27 100755 --- 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 diff --git a/src/job_make_examples_BullX b/src/job_make_examples_BullX index ea6a5341dd500d44590bd605edc593633d7a555a..b81f2d5ebbc20db14ca9a0dba6e440fde7a2ee13 100755 --- 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 " diff --git a/src/job_make_examples_BullX_eos b/src/job_make_examples_BullX_eos index dd2ac760b6827a49fe8e43b6601e377d42eda15d..49d7de2320d9146c1d410b1ae7f239b8f36cef32 100755 --- a/src/job_make_examples_BullX_eos +++ b/src/job_make_examples_BullX_eos @@ -1,12 +1,12 @@ #!/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 -export MONORUN="mpirun -genv I_MPI_PIN_PROCESSOR_LIST=all:map=spread -prepend-rank -np 1 " -export MPIRUN="mpirun -genv I_MPI_PIN_PROCESSOR_LIST=all:map=spread -prepend-rank -np 4 " +. ../conf/profile_mesonh-LXifortI4-MNH-V5-2-2-MPIINTEL-O2 +export MONORUN="mpirun -prepend-rank -np 1 " +export MPIRUN="mpirun -prepend-rank -np 4 " export POSTRUN="time " cd $SRC_MESONH/MY_RUN/KTEST/003_KW78 diff --git a/src/job_make_examples_CRAY_cca b/src/job_make_examples_CRAY_cca index 7f1842d1853261ac14bd3461fc6a3c587cd5b0b8..643008d760f2f5b95cfb8f008c493ae95ab7682f 100755 --- 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 " diff --git a/src/job_make_examples_IBM_ada b/src/job_make_examples_IBM_ada index 67746ffdc6428bc24fc97642fa4b569800ed18c9..658353f2d2349ea88ea68772042b66f6f104c819 100755 --- 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 diff --git a/src/job_make_examples_IBM_sp6_vargas b/src/job_make_examples_IBM_sp6_vargas index 59c7b3bee1bc64fa027f32c12fc2b8b055fefa15..53f28625b48457b94139507e8009327ecf19e61a 100755 --- 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 diff --git a/src/job_make_examples_NEC_SX8 b/src/job_make_examples_NEC_SX8 index eba96f246aa278f1a753e195a7728d0c9b8dbd3b..79d2685e0272f411cbf45ae8b8292c633d622e8e 100755 --- 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 " diff --git a/src/job_make_examples_SX8 b/src/job_make_examples_SX8 index 2b4a069b5e679216d4f324c7a55d2d812a088cf2..270a09450ea5c43c6e1f07e5059239429e173c41 100755 --- 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 " diff --git a/src/job_make_examples_cxa b/src/job_make_examples_cxa index 706d988e5612b3c9d89fad9f5eb6c05269f1fde3..913e2cab0576d6facbc61c8a5e78f620e12cbc9c 100755 --- 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 diff --git a/src/job_make_mesonh_BG b/src/job_make_mesonh_BG index 864461709093ce90dcbf851ab63c0da3c3ba5e59..ae0cb1ec316eb02a52076ca2d94446296dfd21f3 100755 --- 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 diff --git a/src/job_make_mesonh_BGQ b/src/job_make_mesonh_BGQ index e213ca13109a677750f81abe0b507667a5a3d71b..7e16869624083ae42123c3420a0b4c6acf9e0862 100755 --- 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 diff --git a/src/job_make_mesonh_BullX b/src/job_make_mesonh_BullX index fd375e56b060eab908b90b7c155481c700886469..cbd22bab8d860823f9839266cc516efce696c005 100755 --- 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 diff --git a/src/job_make_mesonh_CRAY_cca b/src/job_make_mesonh_CRAY_cca index 77af67e2e6eafe0ce689124a0243e6e9cdb5f6e6..f37bccce1d9a7ed82a6bc6804f15779aa0d45e7b 100755 --- 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.$$ diff --git a/src/job_make_mesonh_IBM_ada b/src/job_make_mesonh_IBM_ada index 118d7dfda148512b570490c8b5f74dd711eecee7..51c678ff9e6c6e4b50cedc074a5ddb21f6b89dd2 100755 --- 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 diff --git a/src/job_make_mesonh_IBM_sp6_vargas b/src/job_make_mesonh_IBM_sp6_vargas index 8c77dbacce57126dbd91a08117d65a6896341f7b..4b7d25ed397658a33d3941f13534a8eaf5c43c18 100755 --- 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 diff --git a/src/job_make_mesonh_MFSX8 b/src/job_make_mesonh_MFSX8 index f939d6fba4b3dc28f9ce831c382325600884dba4..8728a6d5e2c3bfe2b5b4a6b285b23e573578e51a 100644 --- 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 diff --git a/src/job_make_mesonh_NEC_SX8 b/src/job_make_mesonh_NEC_SX8 index e70939fda1275ac37a507e101a47a09242e9e475..72a8dcfb2bce1750d513f86408e7bdc3dea8b4d8 100755 --- 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 diff --git a/src/job_make_mesonh_cxa b/src/job_make_mesonh_cxa index 1fbebd06a39c004f54db0d5795dc4a4ea31485a1..71c545f3f21c2dfc027b1313dd7b963f63d626ec 100755 --- 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 diff --git a/src/job_make_mesonh_user_BullX b/src/job_make_mesonh_user_BullX index 4ae34bfe45d335110efcac9b7f154d7da76ecdaf..903ddaf8c5182252111447bfc6ca0c7d6e0469ab 100755 --- 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 diff --git a/src/job_make_mesonh_user_MFSX8 b/src/job_make_mesonh_user_MFSX8 index bf7c6f37bab64464bf64d6e74b4580cdcd49f374..604d91a1b54a94111f55d0a79c9492c1c061a4b0 100644 --- a/src/job_make_mesonh_user_MFSX8 +++ b/src/job_make_mesonh_user_MFSX8 @@ -14,7 +14,7 @@ set -x [ ${PBS_O_WORKDIR} ] && cd ${PBS_O_WORKDIR} -. ../conf/profile_mesonh-SX8I4-MNH-V5-2-1-${VER_USER}-MPIAUTO-O4 +. ../conf/profile_mesonh-SX8I4-MNH-V5-2-2-${VER_USER}-MPIAUTO-O4 time gmake user time gmake -j 1 installuser