From 930af251406c34024969cd56676cc919654b758a Mon Sep 17 00:00:00 2001 From: Juan Escobar <juan.escobar@aero.obs-mip.fr> Date: Fri, 10 Jul 2015 15:34:59 +0000 Subject: [PATCH] Juan 10/07/2015: phasage MNH-514 --- src/job_make_examples_BG | 2 +- src/job_make_examples_BGQ | 3 +-- src/job_make_examples_BullX | 2 +- src/job_make_examples_BullX_eos | 2 +- src/job_make_examples_CRAY_cca | 2 +- src/job_make_examples_IBM_ada | 2 +- src/job_make_examples_IBM_sp6_vargas | 2 +- src/job_make_examples_NEC_SX8 | 2 +- src/job_make_examples_SX8 | 2 +- src/job_make_examples_cxa | 2 +- src/job_make_mesonh_BG | 2 +- src/job_make_mesonh_BGQ | 2 +- src/job_make_mesonh_BullX | 2 +- src/job_make_mesonh_CRAY_cca | 2 +- src/job_make_mesonh_IBM_ada | 2 +- src/job_make_mesonh_IBM_sp6_vargas | 2 +- src/job_make_mesonh_MFSX8 | 2 +- src/job_make_mesonh_NEC_SX8 | 2 +- src/job_make_mesonh_cxa | 2 +- src/job_make_mesonh_user_BullX | 2 +- src/job_make_mesonh_user_MFSX8 | 2 +- 21 files changed, 21 insertions(+), 22 deletions(-) diff --git a/src/job_make_examples_BG b/src/job_make_examples_BG index 359ac6d9a..3fd603f0e 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-1-4-MPIAUTO-O2 +. ../conf/profile_mesonh-BGI4-MNH-V5-2-0-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 35c54005f..860a30b77 100755 --- a/src/job_make_examples_BGQ +++ b/src/job_make_examples_BGQ @@ -18,8 +18,7 @@ cd $LOADL_STEP_INITDIR -. ../conf/profile_mesonh-BGQI4-MNH-V5-1-4-MPIAUTO-O2NAN -#. ../conf/profile_mesonh-BGQI4-MNH-V4-10-1-MPIAUTO-O2 +. ../conf/profile_mesonh-BGQI4-MNH-V5-2-0-MPIAUTO-O2NAN set -x diff --git a/src/job_make_examples_BullX b/src/job_make_examples_BullX index 380dd3f6c..d2bdb0f46 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-1-4-MPIINTEL-O3 +. ../conf/profile_mesonh-LXifortI4-MNH-V5-2-0-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 087efbf43..17cb1a86d 100755 --- a/src/job_make_examples_BullX_eos +++ b/src/job_make_examples_BullX_eos @@ -17,7 +17,7 @@ set -x # Nom de la machine hostname -. ../conf/profile_mesonh-LXifortI4-MNH-V5-1-4-MPIINTEL-O2 +. ../conf/profile_mesonh-LXifortI4-MNH-V5-2-0-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 " export POSTRUN="time " diff --git a/src/job_make_examples_CRAY_cca b/src/job_make_examples_CRAY_cca index 71c274ee5..08fe6a6e9 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-1-4-MPICRAY-O2 +. ../conf/profile_mesonh-${ARCH}I4-MNH-V5-2-0-MPICRAY-O2 export MONORUN="aprun -n 1 " diff --git a/src/job_make_examples_IBM_ada b/src/job_make_examples_IBM_ada index ae30bf4c0..8fe79d890 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-1-4-MPIINTEL-O2 +. ../conf/profile_mesonh-LXifortI4-MNH-V5-2-0-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 cc2a07039..faf300089 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-1-4-MPIAUTO-O2 +. ../conf/profile_mesonh-AIX64-MNH-V5-2-0-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 0ab6654a0..d70df4f6d 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-1-4-MPIAUTO-O4 +. ../conf/profile_mesonh-SX8I4-MNH-V5-2-0-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 1b6962ad3..20a2ef89e 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-1-4-MPIAUTO-O2 +. ../conf/profile_mesonh-SX8I4-MNH-V5-2-0-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 817689d1d..a27eedd34 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-1-4-MPIAUTO-O2 +. ../conf/profile_mesonh-AIX64I4-MNH-V5-2-0-MPIAUTO-O2 ulimit -c 0 # pas de core diff --git a/src/job_make_mesonh_BG b/src/job_make_mesonh_BG index 177a1a513..aaf2a7a17 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-1-4-MPIAUTO-O2 +. ../conf/profile_mesonh-BGI4-MNH-V5-2-0-MPIAUTO-O2 #time gmake time gmake -r -j8 diff --git a/src/job_make_mesonh_BGQ b/src/job_make_mesonh_BGQ index 34f3d56ae..f59cec7c1 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-1-4-MPIAUTO-O2NAN +. ../conf/profile_mesonh-BGQI4-MNH-V5-2-0-MPIAUTO-O2NAN case $LOADL_STEP_NAME in diff --git a/src/job_make_mesonh_BullX b/src/job_make_mesonh_BullX index 7923416e7..2abf063a1 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-1-4-MPIINTEL-O3 +. ../conf/profile_mesonh-LXifortI4-MNH-V5-2-0-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 a1c17faa8..b43b9b691 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-1-4-MPICRAY-O2 +. ../conf/profile_mesonh-${ARCH}I4-MNH-V5-2-0-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 113a64428..1dd844dd4 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-1-4-MPIINTEL-O2 +. ../conf/profile_mesonh-LXifortI4-MNH-V5-2-0-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 a9533fd92..1e6d79440 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-1-4-MPIAUTO-O2 +. ../conf/profile_mesonh-AIX64I4-MNH-V5-2-0-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 5bca938b6..fbddf35d6 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-1-4-MPIAUTO-O4 +. ../conf/profile_mesonh-SX8I4-MNH-V5-2-0-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 7fb453b71..be68eaa2d 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-1-4-MPIAUTO-O4 +. ../conf/profile_mesonh-SX8I4-MNH-V5-2-0-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 e6eeca5f1..15cd6c2cf 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-1-4-MPIAUTO-O2 +. ../conf/profile_mesonh-AIX64I4-MNH-V5-2-0-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 b46512acc..4cbf6690d 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-1-4-${VER_USER}-MPIINTEL-O3 +. ../conf/profile_mesonh-LXifortI4-MNH-V5-2-0-${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 eb327fc7a..9c6c5d3b3 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-1-4-${VER_USER}-MPIAUTO-O4 +. ../conf/profile_mesonh-SX8I4-MNH-V5-2-0-${VER_USER}-MPIAUTO-O4 time gmake user time gmake -j 1 installuser -- GitLab