diff --git a/src/configure b/src/configure index 8e7b855c4bb589f0d44f83aa0ff6ac756aaea41c..4d2a43eeb273cc1f94b071cc26e29e944bd35085 100755 --- a/src/configure +++ b/src/configure @@ -9,7 +9,7 @@ if [ "x$XYZ" = "x" ] then # export VERSION_MASTER=${VERSION_MASTER:-MNH-V5-6} -export VERSION_BUG=${VERSION_BUG:-00} +export VERSION_BUG=${VERSION_BUG:-0} export VERSION_XYZ=${VERSION_XYZ:-${VERSION_MASTER}-${VERSION_BUG}${VER_OASIS:+-${VER_OASIS}}} export VERSION_DATE=${VERSION_DATE:-"31/01/2023"} export VERSION_LIBAEC=${VERSION_LIBAEC:-"v1.0.6"} diff --git a/src/job_make_examples_BG b/src/job_make_examples_BG index aaaec9e56bafa748c1bc75dc8519aa4537114d63..e146e90c3e83fb6caff43baba330270c8debbb18 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-BG-R8I4-MNH-V5-5-1-MPIAUTO-O2 +. ../conf/profile_mesonh-BG-R8I4-MNH-V5-6-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 644bd8a961b8e6be89bcba4556425fbf19d450b8..a69dbeaac244de387f435a06c7cf9d6b7ce5a613 100755 --- a/src/job_make_examples_BGQ +++ b/src/job_make_examples_BGQ @@ -18,7 +18,7 @@ cd $LOADL_STEP_INITDIR -. ../conf/profile_mesonh-BGQ-R8I4-MNH-V5-5-1-MPIAUTO-O2NAN +. ../conf/profile_mesonh-BGQ-R8I4-MNH-V5-6-0-MPIAUTO-O2NAN set -x diff --git a/src/job_make_examples_BullX b/src/job_make_examples_BullX index 8297eb5b9142c7353ad0cf22fb9b36bd01bccfcc..80bbd1f7243c19dd2e2f34959bdf5b751ec41143 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-LXifort-R8I4-MNH-V5-5-1-MPIINTEL-O3 +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-0-MPIINTEL-O3 export MONORUN="Mpirun -np 1 " export MPIRUN="Mpirun -np 2 " export POSTRUN="time " diff --git a/src/job_make_examples_BullX_belenos b/src/job_make_examples_BullX_belenos index d27459f20cf6b2e38cc1d910cb9b99a5fb1500a9..ca4ec4a0a30d11a43fad85628bdc469aaf2ebec2 100755 --- a/src/job_make_examples_BullX_belenos +++ b/src/job_make_examples_BullX_belenos @@ -18,7 +18,7 @@ set -e hostname # Echo des commandes -. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-5-1-MPIAUTO-O3 +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-0-MPIAUTO-O3 export MONORUN="Mpirun -np 1 " export MPIRUN="Mpirun -np 2 " export POSTRUN="echo " diff --git a/src/job_make_examples_BullX_irene b/src/job_make_examples_BullX_irene index 852288dec893574c1a5280ca57c41f0d1f72628e..21417e485a30c324c038ffb4fd53401fee148080 100755 --- a/src/job_make_examples_BullX_irene +++ b/src/job_make_examples_BullX_irene @@ -21,7 +21,7 @@ set +x # Nom de la machine hostname -. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-5-1-MPIAUTO-O2 +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-0-MPIAUTO-O2 set -x diff --git a/src/job_make_examples_BullX_irene_AMD b/src/job_make_examples_BullX_irene_AMD index f1afe22f74ef63b55919b251975f95c229161dd1..3f1c97facacc4c1ddcb5592143ce86616a82a878 100755 --- a/src/job_make_examples_BullX_irene_AMD +++ b/src/job_make_examples_BullX_irene_AMD @@ -20,7 +20,7 @@ set +x # Nom de la machine hostname -. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-5-1-AMD-MPIAUTO-O2 +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-0-AMD-MPIAUTO-O2 set -x diff --git a/src/job_make_examples_BullX_occigen b/src/job_make_examples_BullX_occigen index 63aa7239118836bc18772147f73f65b2f5fc2766..2e480800fd0c3c73a3685d9b0504d5fd296cfc2d 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-LXifort-R8I4-MNH-V5-5-1-MPIINTEL-O2 +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-0-MPIINTEL-O2 export MONORUN="Mpirun -prepend-rank -np 1 " export MPIRUN="Mpirun -prepend-rank -np 4 " export POSTRUN="echo " diff --git a/src/job_make_examples_BullX_olympe b/src/job_make_examples_BullX_olympe index ba3fa83fb515d22365976e3b088520c02d7232d8..c11b5a4593bba76312d85058fcada1f604c25c53 100755 --- a/src/job_make_examples_BullX_olympe +++ b/src/job_make_examples_BullX_olympe @@ -17,7 +17,7 @@ set -x # Nom de la machine hostname -. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-5-1-MPIINTEL-O2 +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-0-MPIINTEL-O2 export MONORUN="mpirun -prepend-rank -np 1 " export MPIRUN="mpirun -prepend-rank -np 4 " export POSTRUN="echo " diff --git a/src/job_make_examples_CRAY_cca b/src/job_make_examples_CRAY_cca index 9296c3799e1856c0e2cad8127331efbf5fe377f3..1bec1a26b5b294618cc74f93d3ded1719b73c6be 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}-R8I4-MNH-V5-5-1-MPICRAY-O2 +. ../conf/profile_mesonh-${ARCH}-R8I4-MNH-V5-6-0-MPICRAY-O2 export MONORUN="aprun -n 1 " diff --git a/src/job_make_examples_HPE_jeanzay b/src/job_make_examples_HPE_jeanzay index 1687368fd3b871ff8123d957104070bedf5ef1e5..29b676401d6c260ffedeb655287586055d3b9cbb 100755 --- a/src/job_make_examples_HPE_jeanzay +++ b/src/job_make_examples_HPE_jeanzay @@ -19,7 +19,7 @@ set -x # Nom de la machine hostname -. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-5-1-MPIINTEL-O2 +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-0-MPIINTEL-O2 export MONORUN="Exec srun -l -n 1 --export=ALL numabind_core_slurm" export MPIRUN="Exec srun -l -n 4 --export=ALL numabind_core_slurm" export POSTRUN="echo " diff --git a/src/job_make_examples_IBM_ada b/src/job_make_examples_IBM_ada index 044996e27a3a490d66d3a4d5c5b55a80c64f8237..08f4d0775f19858e16bd0849db5166639427773f 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-LXifort-R8I4-MNH-V5-5-1-MPIINTEL-O2 +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-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 3d087d03d42416d69f26f1db42778e4fe3c12a40..ad1058d3af3bd63c509b2a1bdd8db24271689ecf 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-R8I4-MNH-V5-5-1-MPIAUTO-O2 +. ../conf/profile_mesonh-AIX64-R8I4-MNH-V5-6-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 97abd2caf8716875d30ca6deb9569687cfcb6b85..54502104ac948ddbfcb7c4636fe406156f75148d 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-SX8-R8I4-MNH-V5-5-1-MPIAUTO-O4 +. ../conf/profile_mesonh-SX8-R8I4-MNH-V5-6-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 0dad22c62c62e840b29cbf2508c19cdba11ab613..8d450e8cd86498eed68fc21b72fc3fed0f197760 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-SX8-R8I4-MNH-V5-5-1-MPIAUTO-O2 +. ../conf/profile_mesonh-SX8-R8I4-MNH-V5-6-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 458d780da0a7349845cc1edf7bd74bc4a8ef29da..5a5139286b40e856bcdd6855da152ce0459a2f8e 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-AIX64-R8I4-MNH-V5-5-1-MPIAUTO-O2 +. ../conf/profile_mesonh-AIX64-R8I4-MNH-V5-6-0-MPIAUTO-O2 ulimit -c 0 # pas de core diff --git a/src/job_make_mesonh_BG b/src/job_make_mesonh_BG index a2b996576ae8ae5c912d612f694364b205cf801f..8c324f72f15d2e9428e5525c24fdea54111f8644 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-BG-R8I4-MNH-V5-5-1-MPIAUTO-O2 +. ../conf/profile_mesonh-BG-R8I4-MNH-V5-6-0-MPIAUTO-O2 #time gmake time gmake -r -j8 diff --git a/src/job_make_mesonh_BGQ b/src/job_make_mesonh_BGQ index dd82b6dbae59418381421bfceb994a718e89ee9c..3ce435015a33188483647d301e261be53bc86d5d 100755 --- a/src/job_make_mesonh_BGQ +++ b/src/job_make_mesonh_BGQ @@ -20,7 +20,7 @@ set -x cd $LOADL_STEP_INITDIR -. ../conf/profile_mesonh-BGQ-R8I4-MNH-V5-5-1-MPIAUTO-O2NAN +. ../conf/profile_mesonh-BGQ-R8I4-MNH-V5-6-0-MPIAUTO-O2NAN time gmake -j8 time gmake -j8 diff --git a/src/job_make_mesonh_BullX b/src/job_make_mesonh_BullX index ece2b8a1ed3103115efb4174268153a8d71a68ee..6eda7dd72932d6e476ff0d8278bcee751d08421d 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-LXifort-R8I4-MNH-V5-5-1-MPIINTEL-O3 +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-0-MPIINTEL-O3 time gmake -j 4 time gmake -j 1 installmaster diff --git a/src/job_make_mesonh_BullX_belenos b/src/job_make_mesonh_BullX_belenos index c9cd95a18d19cf125dea392c635a717f39efdaca..b10427e6bba0adce902fa78b54644028fc7a0a11 100755 --- a/src/job_make_mesonh_BullX_belenos +++ b/src/job_make_mesonh_BullX_belenos @@ -16,7 +16,7 @@ set -x # On va lancer la compilation dans le répertoire de lancement du job pwd -. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-5-1-MPIAUTO-O3 +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-0-MPIAUTO-O3 time make -j 16 time make -j 1 installmaster diff --git a/src/job_make_mesonh_CRAY_cca b/src/job_make_mesonh_CRAY_cca index 5951a84069c96d98b124eeb606d0bff9e25f085b..414410ada6b5675f3f221c7acfcd1a62da3c417c 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}-R8I4-MNH-V5-5-1-MPICRAY-O2 +. ../conf/profile_mesonh-${ARCH}-R8I4-MNH-V5-6-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_HPE_jeanzay b/src/job_make_mesonh_HPE_jeanzay index 417802b7da16d50ff373515b5f9a1c706a772f80..1cd771cee0c6d77d1f32e0fb510bbbc3b8f525cc 100755 --- a/src/job_make_mesonh_HPE_jeanzay +++ b/src/job_make_mesonh_HPE_jeanzay @@ -14,7 +14,7 @@ set -x # On va lancer la compilation dans le répertoire de lancement du job pwd -. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-5-1-MPIINTEL-O2 +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-0-MPIINTEL-O2 time gmake -j 16 time gmake -j 1 installmaster diff --git a/src/job_make_mesonh_IBM_ada b/src/job_make_mesonh_IBM_ada index b64aa08d990e865e5005051c78cf95391251c5df..144f618b3d5f79e850888e472afee3cddab0505e 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-LXifort-R8I4-MNH-V5-5-1-MPIINTEL-O2 +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-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 7f01ee8b03a80c8e169cd75e40df81ffaa4ecf9c..2bd3854831e73b8ff722d3dffe559dd00ac734c1 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-AIX64-R8I4-MNH-V5-5-1-MPIAUTO-O2 +. ../conf/profile_mesonh-AIX64-R8I4-MNH-V5-6-0-MPIAUTO-O2 time gmake -r -j8 time gmake installmaster diff --git a/src/job_make_mesonh_MFSX8 b/src/job_make_mesonh_MFSX8 index 326b7b9dda718c6acfc2dcb08479db736bbd2905..85eab09b190a12d377b795751240cae0ed0f7efc 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-SX8-R8I4-MNH-V5-5-1-MPIAUTO-O4 +. ../conf/profile_mesonh-SX8-R8I4-MNH-V5-6-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 9160501349021c3267d15ab219416e9bb3535f8b..87f2c7c9c22a8f35272149f6d8b66f43545cb711 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-SX8-R8I4-MNH-V5-5-1-MPIAUTO-O4 +. ../conf/profile_mesonh-SX8-R8I4-MNH-V5-6-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 f9f3c1c573e52bb9cea9f32b465a2549a01daa85..c91a6b14a9db88a668626406dc38c8a2fd32952b 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-AIX64-R8I4-MNH-V5-5-1-MPIAUTO-O2 +. ../conf/profile_mesonh-AIX64-R8I4-MNH-V5-6-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 3251ac554a66c6e37b31ff2313e08e4474acadad..6aa79f5ab723643878f1ef8207c2c201a8630cba 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-LXifort-R8I4-MNH-V5-5-1-${VER_USER}-MPIINTEL-O3 +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-0-${VER_USER}-MPIINTEL-O3 time gmake user time gmake -j 1 installuser diff --git a/src/job_make_mesonh_user_BullX_belenos b/src/job_make_mesonh_user_BullX_belenos index ad8037af1faa94c6567f53d96d3e044f48519259..84111f57fc88f83d8d4c969d3918c74945dd8652 100755 --- a/src/job_make_mesonh_user_BullX_belenos +++ b/src/job_make_mesonh_user_BullX_belenos @@ -18,7 +18,7 @@ set -x # On va lancer la compilation dans le répertoire de lancement du job pwd -. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-5-1-${VER_USER}-MPIAUTO-O3 +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-0-${VER_USER}-MPIAUTO-O3 time make user -j 2 time make -j 1 installuser diff --git a/src/job_make_mesonh_user_MFSX8 b/src/job_make_mesonh_user_MFSX8 index 0804a1caf9aa323d9bb0112b4c6815c89f52ce9c..b0eb8894b0ec3b3a910c5a6d4a364e53c9fed395 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-SX8-R8I4-MNH-V5-5-1-${VER_USER}-MPIAUTO-O4 +. ../conf/profile_mesonh-SX8-R8I4-MNH-V5-6-0-${VER_USER}-MPIAUTO-O4 time gmake user time gmake -j 1 installuser