diff --git a/A-INSTALL b/A-INSTALL index f2c81c06a51b9400d02b2d5e4580c92ce4d4f097..a4035afcdcd4a879b263565849b16e25ffab7496 100644 --- a/A-INSTALL +++ b/A-INSTALL @@ -1,8 +1,8 @@ # # Version of PACKAGE MESONH "Open distribution" -# PACK-MNH-V5-1-3 -# DATE : 20/11/2014 -# VERSION : MESONH MASDEV5_1 + BUG-3 +# PACK-MNH-V5-1-4 +# DATE : 29/06/2015 +# VERSION : MESONH MASDEV5_1 + BUG-4 # # MAP # diff --git a/src/configure b/src/configure index f9af3ee1062c777e5247493bcbc909ad6b9fe0bd..3221ea81e8d139c6331a11fc150a80ff4b29015f 100755 --- a/src/configure +++ b/src/configure @@ -9,9 +9,9 @@ if [ "x$XYZ" = "x" ] then # export VERSION_MASTER=${VERSION_MASTER:-MNH-V5-1} -export VERSION_BUG=${VERSION_BUG:-3} +export VERSION_BUG=${VERSION_BUG:-4} export VERSION_XYZ=${VERSION_XYZ:-${VERSION_MASTER}-${VERSION_BUG}} -export VERSION_DATE=${VERSION_DATE:-"20/11/2014"} +export VERSION_DATE=${VERSION_DATE:-"29/06/2015"} export VERSION_CDF=${VERSION_CDF-"3.6.3"} export VERSION_GRIBAPI=${VERSION_GRIBAPI-"1.9.9"} export MNH_INT=${MNH_INT-"I4"} diff --git a/src/job_make_examples_BG b/src/job_make_examples_BG index cccadd74930b27575b2c310092c6adda7a2ef86c..359ac6d9afaa0c134d9618bcc9365c3a0e995752 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-3-MPIAUTO-O2 +. ../conf/profile_mesonh-BGI4-MNH-V5-1-4-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 49e55e053d6e216ba5d310037ec60fa51cf71f6e..35c54005f681ec46a647df8eebf176ab04428f27 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-1-3-MPIAUTO-O2NAN +. ../conf/profile_mesonh-BGQI4-MNH-V5-1-4-MPIAUTO-O2NAN #. ../conf/profile_mesonh-BGQI4-MNH-V4-10-1-MPIAUTO-O2 set -x diff --git a/src/job_make_examples_BullX b/src/job_make_examples_BullX index b8b4914fc0631e86d8e4ab60a6302dc90693e2a1..380dd3f6cdeea3383fbb507e35d169d5a8be448c 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-3-MPIINTEL-O3 +. ../conf/profile_mesonh-LXifortI4-MNH-V5-1-4-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 8d47c2f117201319394bfbb5e665b6027760efc7..087efbf430eea99277cb042f0e54aa7504593730 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-3-MPIINTEL-O2 +. ../conf/profile_mesonh-LXifortI4-MNH-V5-1-4-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 ad8fda34169bd1809d8624f400a97a4323ab7ccd..71c274ee5cd1cdbeee9720e5ad404dd8fb9c2e1b 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-3-MPICRAY-O2 +. ../conf/profile_mesonh-${ARCH}I4-MNH-V5-1-4-MPICRAY-O2 export MONORUN="aprun -n 1 " diff --git a/src/job_make_examples_IBM_ada b/src/job_make_examples_IBM_ada index 4b9bc0838e999efa97b508195b3b8cd0afd404e4..ae30bf4c0ca04010c07139e154349fc2dd86186c 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-3-MPIINTEL-O2 +. ../conf/profile_mesonh-LXifortI4-MNH-V5-1-4-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 69a2b5b63c19510fc7a8dbe26e126657f83cd6b9..cc2a0703911adeb174958d5b685655a88bf671c0 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-3-MPIAUTO-O2 +. ../conf/profile_mesonh-AIX64-MNH-V5-1-4-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 82db4412726532468df904ee7c7c806e0d2b7e6a..0ab6654a0e0e8f4969c93aa60044ae8fc8e2ca2b 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-3-MPIAUTO-O4 +. ../conf/profile_mesonh-SX8I4-MNH-V5-1-4-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 39675242b9283c12f95e6e56b3a92d02f576dcde..1b6962ad31394d4de8e70245115e8325b9047584 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-3-MPIAUTO-O2 +. ../conf/profile_mesonh-SX8I4-MNH-V5-1-4-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 69ea510ec78ed802225526102e4486ccd95a1a1d..817689d1dc0ce3809bd0fdb12229f704fd58130c 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-3-MPIAUTO-O2 +. ../conf/profile_mesonh-AIX64I4-MNH-V5-1-4-MPIAUTO-O2 ulimit -c 0 # pas de core diff --git a/src/job_make_mesonh_BG b/src/job_make_mesonh_BG index c29c6fd125d03d1e6e8fb94c44d97a0de8897b53..177a1a5139492c22cee021eeb026728dfcd70723 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-3-MPIAUTO-O2 +. ../conf/profile_mesonh-BGI4-MNH-V5-1-4-MPIAUTO-O2 #time gmake time gmake -r -j8 diff --git a/src/job_make_mesonh_BGQ b/src/job_make_mesonh_BGQ index 3e310f06a2b29b855416790138d4f4726f60cfdf..34f3d56aecefa40a0e31c2fca3d629463a065060 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-3-MPIAUTO-O2NAN +. ../conf/profile_mesonh-BGQI4-MNH-V5-1-4-MPIAUTO-O2NAN case $LOADL_STEP_NAME in diff --git a/src/job_make_mesonh_BullX b/src/job_make_mesonh_BullX index 62b67f6111071d927df58a955f03ea96cec76e80..7923416e77f35fe36370ed0f00ad1aa2a44d72a7 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-3-MPIINTEL-O3 +. ../conf/profile_mesonh-LXifortI4-MNH-V5-1-4-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 3cf2b0769a3133b466696a1dc5e3cceb628bfef2..a1c17faa854c4659c4f17e429e42f23a951536a8 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-3-MPICRAY-O2 +. ../conf/profile_mesonh-${ARCH}I4-MNH-V5-1-4-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 92e8308891384f6cf0281205e9e8d5cbaf7334c8..113a6442828c76284532fa1e5fb34dd271da773d 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-3-MPIINTEL-O2 +. ../conf/profile_mesonh-LXifortI4-MNH-V5-1-4-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 c132d8e4026cb7fb266793e82c704140aeccdb30..a9533fd92c7ffaa4b74434891cd39380a8e261e4 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-3-MPIAUTO-O2 +. ../conf/profile_mesonh-AIX64I4-MNH-V5-1-4-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 e3ad9d06531d8189ddcc4ddd2eee86b41427711b..5bca938b6daf559f50bc43d1236b752de4589a21 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-3-MPIAUTO-O4 +. ../conf/profile_mesonh-SX8I4-MNH-V5-1-4-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 ae124aaff2206e82c5706f8d43591b8f8d5ad389..7fb453b71e7068d8440888d9f9b2dc98bcc01a2f 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-3-MPIAUTO-O4 +. ../conf/profile_mesonh-SX8I4-MNH-V5-1-4-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 b1676857354c1af72e6a1020b92880ca7f07ac65..e6eeca5f15063f57fe96a407452c224ecb186b06 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-3-MPIAUTO-O2 +. ../conf/profile_mesonh-AIX64I4-MNH-V5-1-4-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 e81a205d261d42d971b7c935064aedbaff3aa677..b46512accb5d0cd6cc0409311f38a118aec321a6 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-3-${VER_USER}-MPIINTEL-O3 +. ../conf/profile_mesonh-LXifortI4-MNH-V5-1-4-${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 d589fde45d04c544a816f7e6c464f2de5d6c4f22..eb327fc7a2d0eeb949fe699d09765c283860c605 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-3-${VER_USER}-MPIAUTO-O4 +. ../conf/profile_mesonh-SX8I4-MNH-V5-1-4-${VER_USER}-MPIAUTO-O4 time gmake user time gmake -j 1 installuser