diff --git a/src/MNH/version.f90 b/src/MNH/version.f90 index 3fc34e77293e4ba6683bdb73382effb661c8bed3..e2a61ef58ba4508516f3dc1dade373858d6686ba 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=2 +NBUGFIX=3 CBIBUSER='' ! END SUBROUTINE VERSION diff --git a/src/configure b/src/configure index 6c058ce86008ab2b42e2c1a6348c0fe41d3dad3d..bddd13801a62983d1abad8164891d24da85ff8f5 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:-3} export VERSION_XYZ=${VERSION_XYZ:-${VERSION_MASTER}-${VERSION_BUG}} -export VERSION_DATE=${VERSION_DATE:-"22/05/2014"} +export VERSION_DATE=${VERSION_DATE:-"20/11/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 4c5430b846056730b04446ce5d70318039c15258..cccadd74930b27575b2c310092c6adda7a2ef86c 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-2-MPIAUTO-O2 +. ../conf/profile_mesonh-BGI4-MNH-V5-1-3-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 3a44a305827cfdc8ea9dbe47a4e87a7433708168..49e55e053d6e216ba5d310037ec60fa51cf71f6e 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-2-MPIAUTO-O2NAN +. ../conf/profile_mesonh-BGQI4-MNH-V5-1-3-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 0d2b8c87083992d4efbe7ac6c056924ceb782339..b8b4914fc0631e86d8e4ab60a6302dc90693e2a1 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-2-MPIINTEL-O3 +. ../conf/profile_mesonh-LXifortI4-MNH-V5-1-3-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 97e3e689b7ae8c7ab55fe79bae7100eb231d7f88..4b9bc0838e999efa97b508195b3b8cd0afd404e4 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-2-MPIINTEL-O2 +. ../conf/profile_mesonh-LXifortI4-MNH-V5-1-3-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 68cc94e8b738f015c1c8ecd91cb51b265dfa52c3..69a2b5b63c19510fc7a8dbe26e126657f83cd6b9 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-2-MPIAUTO-O2 +. ../conf/profile_mesonh-AIX64-MNH-V5-1-3-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 650dd94b89abf34f1bb673d4a8a57da4ea2034cc..82db4412726532468df904ee7c7c806e0d2b7e6a 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-2-MPIAUTO-O4 +. ../conf/profile_mesonh-SX8I4-MNH-V5-1-3-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 b4a82a654bc56e1159cc54cc09d9d3c232e37361..39675242b9283c12f95e6e56b3a92d02f576dcde 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-2-MPIAUTO-O2 +. ../conf/profile_mesonh-SX8I4-MNH-V5-1-3-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 e8ab2ef609224f632f5ad42547cdedfbca4ebe10..69ea510ec78ed802225526102e4486ccd95a1a1d 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-2-MPIAUTO-O2 +. ../conf/profile_mesonh-AIX64I4-MNH-V5-1-3-MPIAUTO-O2 ulimit -c 0 # pas de core diff --git a/src/job_make_mesonh_BG b/src/job_make_mesonh_BG index 531dab03fa370ba945eda216b15ff98d2a40d094..c29c6fd125d03d1e6e8fb94c44d97a0de8897b53 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-2-MPIAUTO-O2 +. ../conf/profile_mesonh-BGI4-MNH-V5-1-3-MPIAUTO-O2 #time gmake time gmake -r -j8 diff --git a/src/job_make_mesonh_BGQ b/src/job_make_mesonh_BGQ index 6a3729707bba83108a75680e9e8e4564c82c6796..f9d5c1570b4c8c79416aa3c132edaa1a457b8f84 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-2-MPIAUTO-O2NAN +. ../conf/profile_mesonh-BGQI4-MNH-V5-1-3-MPIAUTO-O2NAN case $LOADL_STEP_NAME in diff --git a/src/job_make_mesonh_BullX b/src/job_make_mesonh_BullX index b010777e80fb80ea547a8e596b06b89a5a1a81b4..62b67f6111071d927df58a955f03ea96cec76e80 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-2-MPIINTEL-O3 +. ../conf/profile_mesonh-LXifortI4-MNH-V5-1-3-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 9988db6aeb82b4e60ddca0bef617ecfa71d338d0..92e8308891384f6cf0281205e9e8d5cbaf7334c8 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-2-MPIINTEL-O2 +. ../conf/profile_mesonh-LXifortI4-MNH-V5-1-3-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 bf47949d5219b2019721df3025a5d7de9fd5c106..c132d8e4026cb7fb266793e82c704140aeccdb30 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-2-MPIAUTO-O2 +. ../conf/profile_mesonh-AIX64I4-MNH-V5-1-3-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 9d048e1a3ea7d4eb41dc00af8df28829056ef22a..e3ad9d06531d8189ddcc4ddd2eee86b41427711b 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-2-MPIAUTO-O4 +. ../conf/profile_mesonh-SX8I4-MNH-V5-1-3-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 0dbb30fcca5aa1d05c652688a55851523f91a8b8..ae124aaff2206e82c5706f8d43591b8f8d5ad389 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-2-MPIAUTO-O4 +. ../conf/profile_mesonh-SX8I4-MNH-V5-1-3-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 6b22c4e6b14dfe86003dab9418e7761e49d7ba7e..b1676857354c1af72e6a1020b92880ca7f07ac65 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-2-MPIAUTO-O2 +. ../conf/profile_mesonh-AIX64I4-MNH-V5-1-3-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 757dbcaf8fc7e2a11937fbad643cffb43964c728..e81a205d261d42d971b7c935064aedbaff3aa677 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-2-${VER_USER}-MPIINTEL-O3 +. ../conf/profile_mesonh-LXifortI4-MNH-V5-1-3-${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 6ba85423dfe97065e96550b7586cc84953477388..d589fde45d04c544a816f7e6c464f2de5d6c4f22 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-2-${VER_USER}-MPIAUTO-O4 +. ../conf/profile_mesonh-SX8I4-MNH-V5-1-3-${VER_USER}-MPIAUTO-O4 time gmake user time gmake -j 1 installuser