diff --git a/src/MNH/version.f90 b/src/MNH/version.f90 index e481c29b4c2fdd57c1957fa05b826d62122659c8..1d0e9fd6f84a013b7fccacaa286be61d7858829d 100644 --- a/src/MNH/version.f90 +++ b/src/MNH/version.f90 @@ -43,10 +43,10 @@ USE MODD_CONF, ONLY : NMNHVERSION,NMASDEV,NBUGFIX,CBIBUSER IMPLICIT NONE ! NMNHVERSION(1)=5 -NMNHVERSION(2)=3 +NMNHVERSION(2)=4 NMNHVERSION(3)=0 -NMASDEV=53 -NBUGFIX=1 +NMASDEV=54 +NBUGFIX=0 CBIBUSER='' ! END SUBROUTINE VERSION diff --git a/src/configure b/src/configure index 573a10979dc0166d265356a331fe641f969d203c..651f447c2475e9f13b752721152f984b0fbecad0 100755 --- a/src/configure +++ b/src/configure @@ -8,10 +8,10 @@ if [ "x$XYZ" = "x" ] then # -export VERSION_MASTER=${VERSION_MASTER:-MNH-V5-3} -export VERSION_BUG=${VERSION_BUG:-1} +export VERSION_MASTER=${VERSION_MASTER:-MNH-V5-4} +export VERSION_BUG=${VERSION_BUG:-0} export VERSION_XYZ=${VERSION_XYZ:-${VERSION_MASTER}-${VERSION_BUG}${VER_OASIS:+-${VER_OASIS}}} -export VERSION_DATE=${VERSION_DATE:-"25/09/2017"} +export VERSION_DATE=${VERSION_DATE:-"dd/mm/yyyy"} 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 087160994f454d02bbf50f58c38311cf064a60f4..b1dd036a5ea9b82647943749f7d10d1109c9b3b4 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-3-1-MPIAUTO-O2 +. ../conf/profile_mesonh-BGI4-MNH-V5-4-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 b13b19fce1a278e5ae1e0840241a299062307896..a3fe0a241fc39fd237eb5141e903cfa0b5708e3a 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-3-1-MPIAUTO-O2NAN +. ../conf/profile_mesonh-BGQI4-MNH-V5-4-0-MPIAUTO-O2NAN set -x diff --git a/src/job_make_examples_BullX b/src/job_make_examples_BullX index 55ff4e051a82913e58f4737bec36912f61c05703..020a5202bae30a6dff70dc3f1fb415025a7ac221 100755 --- a/src/job_make_examples_BullX +++ b/src/job_make_examples_BullX @@ -19,7 +19,7 @@ set -e hostname # Echo des commandes -. ../conf/profile_mesonh-LXifortI4-MNH-V5-3-1-MPIINTEL-O3 +. ../conf/profile_mesonh-LXifortI4-MNH-V5-4-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 3245993d4c0008f9055ee2c87b462841870023f3..07b292505f1830f8ea424ee976bb5267b6ba11da 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-3-1-MPIINTEL-O2 +. ../conf/profile_mesonh-LXifortI4-MNH-V5-4-0-MPIINTEL-O2 export MONORUN="mpirun -prepend-rank -np 1 " export MPIRUN="mpirun -prepend-rank -np 4 " export POSTRUN="time " diff --git a/src/job_make_examples_BullX_occigen b/src/job_make_examples_BullX_occigen index 4450321fa4eae7f2e39597e4328393ffb182ed8e..90d743b65fd9ff0499adb22af5bb3208b7c8ae67 100755 --- a/src/job_make_examples_BullX_occigen +++ b/src/job_make_examples_BullX_occigen @@ -18,7 +18,7 @@ set -x # Nom de la machine hostname -. ../conf/profile_mesonh-LXifortI4-MNH-V5-3-1-MPIINTEL-O2 +. ../conf/profile_mesonh-LXifortI4-MNH-V5-4-0-MPIINTEL-O2 export MONORUN="Mpirun -prepend-rank -np 1 " export MPIRUN="Mpirun -prepend-rank -np 4 " export POSTRUN="time " diff --git a/src/job_make_examples_CRAY_cca b/src/job_make_examples_CRAY_cca index e0f0f624a06600123001710f2236587baf324adf..f114d0752c0675b0261edae6c12c2392a54de752 100755 --- a/src/job_make_examples_CRAY_cca +++ b/src/job_make_examples_CRAY_cca @@ -28,7 +28,7 @@ cd ${PBS_O_WORKDIR} ARCH=LXifort #ARCH=LXcray -. ../conf/profile_mesonh-${ARCH}I4-MNH-V5-3-1-MPICRAY-O2 +. ../conf/profile_mesonh-${ARCH}I4-MNH-V5-4-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 cf6307fbfe0b57147c680780940d2003026e8750..c3b055a8437dec48db84b3488443b58f52c67d06 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-3-1-MPIINTEL-O2 +. ../conf/profile_mesonh-LXifortI4-MNH-V5-4-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 68ff3bf5f06beccf89dbd290ae6dd82095dfdd37..5d1a72e841c2e47bdd1965850092c080ff1b6144 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-3-1-MPIAUTO-O2 +. ../conf/profile_mesonh-AIX64-MNH-V5-4-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 1d346f595cd2d3d0b2c94dc662a2f88999eb8277..f64cf52f4af0574ee828a54124a2c056bfb65240 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-3-1-MPIAUTO-O4 +. ../conf/profile_mesonh-SX8I4-MNH-V5-4-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 9285303aa1ea24ca22b6577b2302135f497f0a8f..0e2278a9e50677ab528363243662a7b6095d19cf 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-3-1-MPIAUTO-O2 +. ../conf/profile_mesonh-SX8I4-MNH-V5-4-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 598e3bb48433463bcb3fe10354fc45e0587a9217..9ffbadb559109a6c370b1ba419994cf28a40e968 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-3-1-MPIAUTO-O2 +. ../conf/profile_mesonh-AIX64I4-MNH-V5-4-0-MPIAUTO-O2 ulimit -c 0 # pas de core diff --git a/src/job_make_mesonh_BG b/src/job_make_mesonh_BG index e36de00b41ae96f2da9d00e4b5bf190f5ed8c1d8..bbdcab851ce0a41bbbfc15a1038e4b646e63b2e0 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-3-1-MPIAUTO-O2 +. ../conf/profile_mesonh-BGI4-MNH-V5-4-0-MPIAUTO-O2 #time gmake time gmake -r -j8 diff --git a/src/job_make_mesonh_BGQ b/src/job_make_mesonh_BGQ index 858fcd81fbea06b348716ae131852ad1be34ac36..6738164920500328f7ef8570489d026d4df0cb1b 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-3-1-MPIAUTO-O2NAN +. ../conf/profile_mesonh-BGQI4-MNH-V5-4-0-MPIAUTO-O2NAN case $LOADL_STEP_NAME in diff --git a/src/job_make_mesonh_BullX b/src/job_make_mesonh_BullX index ebd24bd43de60ee858448ae6e3b51bfc0edf981a..dce35637e2064b0cc3ad6880d3db0764a6ed4980 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-3-1-MPIINTEL-O3 +. ../conf/profile_mesonh-LXifortI4-MNH-V5-4-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 b09164a217382a76afe3a899a7b523e6405d0c50..f713d6d328742696a66e8e84fadd661e38013d09 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-3-1-MPICRAY-O2 +. ../conf/profile_mesonh-${ARCH}I4-MNH-V5-4-0-MPICRAY-O2 time gmake -j 4 2>&1 | tee sortie_compile_${ARCH}.$$ time gmake -j 4 2>&1 | tee sortie_compile_${ARCH}2.$$ diff --git a/src/job_make_mesonh_IBM_ada b/src/job_make_mesonh_IBM_ada index 6877a607f6e1a711e51b380fda936a7d934e77e8..3bb178192480987014eae15445c501f0f27e04c2 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-3-1-MPIINTEL-O2 +. ../conf/profile_mesonh-LXifortI4-MNH-V5-4-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 5564f5e7bdf91944866ccf1c18fec5776e615aa0..578a0dd5d02388261a432cd6c69a66dda98d5ec6 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-3-1-MPIAUTO-O2 +. ../conf/profile_mesonh-AIX64I4-MNH-V5-4-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 3b46451a0620acd7cb4e98d538d40dfabb1aed3f..7d218bfa188e35afd392d80d88e5869c61005c31 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-3-1-MPIAUTO-O4 +. ../conf/profile_mesonh-SX8I4-MNH-V5-4-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 bf37d27e7a7fd0458186f04b7fb5c90ee837d068..92dce58f1b362fbdded4115c25cb83a422e82c4c 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-3-1-MPIAUTO-O4 +. ../conf/profile_mesonh-SX8I4-MNH-V5-4-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 e7ef6e99d3b8ba3c01a3f7bc1a9af8818ec70cfe..f23c584510a8c360a56c4042cee12a4d561776fa 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-3-1-MPIAUTO-O2 +. ../conf/profile_mesonh-AIX64I4-MNH-V5-4-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 2614c0dfafea7e93788df05d11ce6933b2a4d048..c029ce2f71ef6cf94e28c86c1cd9d7d0171908cf 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-3-1-${VER_USER}-MPIINTEL-O3 +. ../conf/profile_mesonh-LXifortI4-MNH-V5-4-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 f1bcda4a7f8546a075b5035c19ae32eaa713955e..00186c347a80f7786de3f2e03748b57109d468be 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-3-1-${VER_USER}-MPIAUTO-O4 +. ../conf/profile_mesonh-SX8I4-MNH-V5-4-0-${VER_USER}-MPIAUTO-O4 time gmake user time gmake -j 1 installuser