diff --git a/src/MNH/version.f90 b/src/MNH/version.f90 index 59a19abbd885b636cfc29fe775dfcdc32283df53..3fc34e77293e4ba6683bdb73382effb661c8bed3 100644 --- a/src/MNH/version.f90 +++ b/src/MNH/version.f90 @@ -43,7 +43,7 @@ USE MODD_CONF, ONLY : NMASDEV,NBUGFIX,CBIBUSER IMPLICIT NONE ! NMASDEV=51 -NBUGFIX=0 +NBUGFIX=2 CBIBUSER='' ! END SUBROUTINE VERSION diff --git a/src/configure b/src/configure index 029254581e220e9e16d31d0f4a2c4bdff47f654e..2ff5971c3a73ccb129aade6f09dc29324046407e 100755 --- a/src/configure +++ b/src/configure @@ -11,7 +11,7 @@ then export VERSION_MASTER=${VERSION_MASTER:-MNH-V5-1} export VERSION_BUG=${VERSION_BUG:-2} export VERSION_XYZ=${VERSION_XYZ:-${VERSION_MASTER}-${VERSION_BUG}} -export VERSION_DATE=${VERSION_DATE:-"11/12/2013"} +export VERSION_DATE=${VERSION_DATE:-"29/04/2014"} 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 8c5c2b1a48b7b1680d11980ba4f993d3a7ac82c4..4c5430b846056730b04446ce5d70318039c15258 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-0-MPIAUTO-O2 +. ../conf/profile_mesonh-BGI4-MNH-V5-1-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 7b37b38c9c6b4287aa8d78164207cc07ebca4d95..3a44a305827cfdc8ea9dbe47a4e87a7433708168 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-0-MPIAUTO-O2NAN +. ../conf/profile_mesonh-BGQI4-MNH-V5-1-2-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 847469da78484c95ccae063a3ce5eca7680a76b4..0d2b8c87083992d4efbe7ac6c056924ceb782339 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-0-MPIINTEL-O3 +. ../conf/profile_mesonh-LXifortI4-MNH-V5-1-2-MPIINTEL-O3 export MONORUN="mpirun -np 1 " export MPIRUN="mpirun -np 2 " export POSTRUN="time " diff --git a/src/job_make_examples_IBM_ada b/src/job_make_examples_IBM_ada index 19526a0f45ac568f2ca58c9057ee58e2172c917a..97e3e689b7ae8c7ab55fe79bae7100eb231d7f88 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-0-MPIINTEL-O2 +. ../conf/profile_mesonh-LXifortI4-MNH-V5-1-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 c1858aea089e548a69c0c1076fadc458c5d17c78..68cc94e8b738f015c1c8ecd91cb51b265dfa52c3 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-0-MPIAUTO-O2 +. ../conf/profile_mesonh-AIX64-MNH-V5-1-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 fef9d3eaf7a8a663e3566e68997fc3de413ce935..650dd94b89abf34f1bb673d4a8a57da4ea2034cc 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-0-MPIAUTO-O4 +. ../conf/profile_mesonh-SX8I4-MNH-V5-1-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 48bed97f98f8241c7a826168a97703545ca05bbd..b4a82a654bc56e1159cc54cc09d9d3c232e37361 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-0-MPIAUTO-O2 +. ../conf/profile_mesonh-SX8I4-MNH-V5-1-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 6fd29bf111ab0292a1ff73172545a8769f16b399..e8ab2ef609224f632f5ad42547cdedfbca4ebe10 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-0-MPIAUTO-O2 +. ../conf/profile_mesonh-AIX64I4-MNH-V5-1-2-MPIAUTO-O2 ulimit -c 0 # pas de core diff --git a/src/job_make_mesonh_BG b/src/job_make_mesonh_BG index e2353ba58a368eca0a55b808459876e58427c283..531dab03fa370ba945eda216b15ff98d2a40d094 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-0-MPIAUTO-O2 +. ../conf/profile_mesonh-BGI4-MNH-V5-1-2-MPIAUTO-O2 #time gmake time gmake -r -j8 diff --git a/src/job_make_mesonh_BGQ b/src/job_make_mesonh_BGQ index 5848fea47367a502d51ad511d13d5431e0d48507..6a3729707bba83108a75680e9e8e4564c82c6796 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-0-MPIAUTO-O2NAN +. ../conf/profile_mesonh-BGQI4-MNH-V5-1-2-MPIAUTO-O2NAN case $LOADL_STEP_NAME in diff --git a/src/job_make_mesonh_BullX b/src/job_make_mesonh_BullX index 13337776e805e094dfd710d82a83d00ed6883557..b010777e80fb80ea547a8e596b06b89a5a1a81b4 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-0-MPIINTEL-O3 +. ../conf/profile_mesonh-LXifortI4-MNH-V5-1-2-MPIINTEL-O3 time gmake -j 4 time gmake -j 1 installmaster diff --git a/src/job_make_mesonh_IBM_ada b/src/job_make_mesonh_IBM_ada index e205fdbc22c731a598310c95edfbf521da70ad18..9988db6aeb82b4e60ddca0bef617ecfa71d338d0 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-0-MPIINTEL-O2 +. ../conf/profile_mesonh-LXifortI4-MNH-V5-1-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 2e9771cb52dcee37cab9d2a9f08b58036e161631..bf47949d5219b2019721df3025a5d7de9fd5c106 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-0-MPIAUTO-O2 +. ../conf/profile_mesonh-AIX64I4-MNH-V5-1-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 32c01f6921e10ae39baf542236dbf2a958296a0e..9d048e1a3ea7d4eb41dc00af8df28829056ef22a 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-0-MPIAUTO-O4 +. ../conf/profile_mesonh-SX8I4-MNH-V5-1-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 e40722c91096e5377c6dec9b7eea0164f71132a5..0dbb30fcca5aa1d05c652688a55851523f91a8b8 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-0-MPIAUTO-O4 +. ../conf/profile_mesonh-SX8I4-MNH-V5-1-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 ba6a4881c7f3bddf3c5f6c5faa49b3320d59700a..6b22c4e6b14dfe86003dab9418e7761e49d7ba7e 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-0-MPIAUTO-O2 +. ../conf/profile_mesonh-AIX64I4-MNH-V5-1-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 b068d7bc71f88c2cd4178d7efd65f685fb4fdf39..757dbcaf8fc7e2a11937fbad643cffb43964c728 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-0-${VER_USER}-MPIINTEL-O3 +. ../conf/profile_mesonh-LXifortI4-MNH-V5-1-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 d6e56918399e9f3da6e525ef981869ca267c4a76..6ba85423dfe97065e96550b7586cc84953477388 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-0-${VER_USER}-MPIAUTO-O4 +. ../conf/profile_mesonh-SX8I4-MNH-V5-1-2-${VER_USER}-MPIAUTO-O4 time gmake user time gmake -j 1 installuser