diff --git a/src/configure b/src/configure index 81b84992b98426e7cba50bb6642ca8f84967bc17..10bf5e3116cbcb40057ab9b2e98e7833d7f883cd 100755 --- a/src/configure +++ b/src/configure @@ -8,10 +8,10 @@ if [ "x$XYZ" = "x" ] then # -export VERSION_MASTER=${VERSION_MASTER:-MNH-V5-2} -export VERSION_BUG=${VERSION_BUG:-1} +export VERSION_MASTER=${VERSION_MASTER:-MNH-V5-3} +export VERSION_BUG=${VERSION_BUG:-0} export VERSION_XYZ=${VERSION_XYZ:-${VERSION_MASTER}-${VERSION_BUG}} -export VERSION_DATE=${VERSION_DATE:-"02/05/2016"} +export VERSION_DATE=${VERSION_DATE:-"23/06/2016"} export VERSION_CDF=${VERSION_CDF:-"4.1.3"} export VERSION_HDF=${VERSION_HDF:-"1.8.9"} export VERSION_GRIBAPI=${VERSION_GRIBAPI:-"1.13.1"} diff --git a/src/job_make_examples_BG b/src/job_make_examples_BG index 9ac36da0667c3a5b25aef97d6d209384faae9650..2e9ed9bd10c8bc83e9d7bebb59f65519414b5210 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-3-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 685ebfdf7102fd6ce21edeaf71fc71a15842e03b..f54d4f975d14b42e162b3d0c8071ce1c34aa2efe 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-3-0-MPIAUTO-O2NAN set -x diff --git a/src/job_make_examples_BullX b/src/job_make_examples_BullX index ea6a5341dd500d44590bd605edc593633d7a555a..081edd17b997dc921067c9e7a9f8895de65a5439 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-3-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 dd2ac760b6827a49fe8e43b6601e377d42eda15d..c0a20ddbae56fe6a6c6069f7d90f56f7723030c5 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-2-1-MPIINTEL-O2 +. ../conf/profile_mesonh-LXifortI4-MNH-V5-3-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 7f1842d1853261ac14bd3461fc6a3c587cd5b0b8..923f453fcd9a623bb1634de4c9f393fd4db9aa6b 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-3-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 67746ffdc6428bc24fc97642fa4b569800ed18c9..efe0cc0faa684ec494a80e5cb38909162bd33f2b 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-3-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 59c7b3bee1bc64fa027f32c12fc2b8b055fefa15..00c01b2361b1249d90f14363d1f1abade194b57c 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-3-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 eba96f246aa278f1a753e195a7728d0c9b8dbd3b..9779a0dc908aeb0220cdb058747f71431cad60da 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-3-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 2b4a069b5e679216d4f324c7a55d2d812a088cf2..6898238171464eaf875400f162ab81edf629097b 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-3-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 706d988e5612b3c9d89fad9f5eb6c05269f1fde3..b37498a28e0f571c6d3cdc195161af19c7f20c65 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-3-0-MPIAUTO-O2 ulimit -c 0 # pas de core diff --git a/src/job_make_mesonh_BG b/src/job_make_mesonh_BG index 864461709093ce90dcbf851ab63c0da3c3ba5e59..a3cff93000a45a033b85384136f02c638234b8fc 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-3-0-MPIAUTO-O2 #time gmake time gmake -r -j8 diff --git a/src/job_make_mesonh_BGQ b/src/job_make_mesonh_BGQ index e213ca13109a677750f81abe0b507667a5a3d71b..3e64b821292e56cd68ccc242940b663c5188f3f5 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-3-0-MPIAUTO-O2NAN case $LOADL_STEP_NAME in diff --git a/src/job_make_mesonh_BullX b/src/job_make_mesonh_BullX index fd375e56b060eab908b90b7c155481c700886469..eb5445b67a71a6df1be67ded03c40a4eb2bb9c0d 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-3-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 77af67e2e6eafe0ce689124a0243e6e9cdb5f6e6..a308dc3ddf2a192e3f1e3f2d7464b45fb299e204 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-3-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 118d7dfda148512b570490c8b5f74dd711eecee7..242bfeffec52b5721387a4c76489c398d9297ea0 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-3-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 8c77dbacce57126dbd91a08117d65a6896341f7b..e512f326b2efef15d5c7cf5b37dda9a1d35614ae 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-3-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 f939d6fba4b3dc28f9ce831c382325600884dba4..9714a4a646e10cff7190ff55e00124ab8b23b9a0 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-3-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 e70939fda1275ac37a507e101a47a09242e9e475..2a65c5b62f3a393830ffff89251c2035dc23d3db 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-3-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 1fbebd06a39c004f54db0d5795dc4a4ea31485a1..95b68b849ed8a109345dd9442bd27ded03dfc38e 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-3-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 4ae34bfe45d335110efcac9b7f154d7da76ecdaf..0f7eae055fcdd16d90fd788d3cee2678ccff81bb 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-3-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 bf7c6f37bab64464bf64d6e74b4580cdcd49f374..773599f8fe2e43659179ddf46cd53821e25dd5ef 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-3-0-${VER_USER}-MPIAUTO-O4 time gmake user time gmake -j 1 installuser