From 6b996cb048b8d5adc69cb430751506e50a475a84 Mon Sep 17 00:00:00 2001 From: Quentin Rodier <quentin.rodier@meteo.fr> Date: Tue, 28 Nov 2023 14:33:01 +0100 Subject: [PATCH] =?UTF-8?q?Quentin=2028/11/2023:=20update=20bugfix=205.6.2?= =?UTF-8?q?=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- A-INSTALL | 74 ++++++++++++------------- src/MNH/version.f90 | 4 +- src/configure | 4 +- src/job_make_examples_Atos_HPCF | 2 +- src/job_make_examples_BG | 2 +- src/job_make_examples_BGQ | 2 +- src/job_make_examples_BullX | 2 +- src/job_make_examples_BullX_belenos | 2 +- src/job_make_examples_BullX_irene | 2 +- src/job_make_examples_BullX_irene_AMD | 2 +- src/job_make_examples_BullX_occigen | 2 +- src/job_make_examples_BullX_olympe | 2 +- src/job_make_examples_CRAY_cca | 2 +- src/job_make_examples_HPE_adastra_genoa | 2 +- src/job_make_examples_HPE_jeanzay | 2 +- src/job_make_examples_IBM_ada | 2 +- src/job_make_examples_IBM_sp6_vargas | 2 +- src/job_make_examples_NEC_SX8 | 2 +- src/job_make_examples_SX8 | 2 +- src/job_make_examples_cxa | 2 +- src/job_make_mesonh_BG | 2 +- src/job_make_mesonh_BGQ | 2 +- src/job_make_mesonh_BullX | 2 +- src/job_make_mesonh_BullX_belenos | 2 +- src/job_make_mesonh_CRAY_cca | 2 +- src/job_make_mesonh_HPE_adastra_genoa | 2 +- src/job_make_mesonh_HPE_jeanzay | 2 +- src/job_make_mesonh_IBM_ada | 2 +- src/job_make_mesonh_IBM_sp6_vargas | 2 +- src/job_make_mesonh_MFSX8 | 2 +- src/job_make_mesonh_NEC_SX8 | 2 +- src/job_make_mesonh_cxa | 2 +- src/job_make_mesonh_user_BullX | 2 +- src/job_make_mesonh_user_BullX_belenos | 2 +- src/job_make_mesonh_user_MFSX8 | 2 +- 35 files changed, 73 insertions(+), 73 deletions(-) diff --git a/A-INSTALL b/A-INSTALL index 14ef15875..7844f66ac 100644 --- a/A-INSTALL +++ b/A-INSTALL @@ -1,6 +1,6 @@ # # Version of PACKAGE MESONH "Open distribution" -# PACK-MNH-V5-6-1 +# PACK-MNH-V5-6-2 # DATE : 25/09/2023 # VERSION : MESONH MASDEV5_6 + BUG-1 # @@ -84,14 +84,14 @@ # # or directly # -# http://mesonh.aero.obs-mip.fr/mesonh/dir_open/dir_MESONH/MNH-V5-6-1.tar.gz +# http://mesonh.aero.obs-mip.fr/mesonh/dir_open/dir_MESONH/MNH-V5-6-2.tar.gz # -# Then untar the file "MNH-V5-6-1.tar.gz" where you want to. +# Then untar the file "MNH-V5-6-2.tar.gz" where you want to. # For example, in your home directory: # cd ~ -tar xvfz MNH-V5-6-1.tar.gz +tar xvfz MNH-V5-6-2.tar.gz # # Process now to the chapter to configure the MesoNH package. @@ -171,10 +171,10 @@ git config --global http.sslverify false # Finally you can clone the Meso-NH Git repository with the following command: # -git lfs clone anongit@anongit_mesonh:/gitrepos/MNH-git_open_source-lfs.git -b MNH-56-branch MNH-V5-6-1 +git lfs clone anongit@anongit_mesonh:/gitrepos/MNH-git_open_source-lfs.git -b MNH-56-branch MNH-V5-6-2 # -# that will create the MNH-V5-6-1 directory containing a clone (copy) of the +# that will create the MNH-V5-6-2 directory containing a clone (copy) of the # Meso-NH package on the remote developpement branch MNH-56-branch # # @@ -184,34 +184,34 @@ git lfs clone anongit@anongit_mesonh:/gitrepos/MNH-git_open_source-lfs.git -b MN # Once the repository is cloned, it's better for you to checkout your own branch # (by default, you are on HEAD of the MNH-56-branch development branch ). # -# To create your local branch corresponding to the V5-6-1 version, type: +# To create your local branch corresponding to the V5-6-2 version, type: # -cd MNH-V5-6-1 -git checkout -b MYB-MNH-V5-6-1 PACK-MNH-V5-6-1 +cd MNH-V5-6-2 +git checkout -b MYB-MNH-V5-6-2 PACK-MNH-V5-6-2 # -# MYB-MNH-V5-6-1 is the name of the local branch you created +# MYB-MNH-V5-6-2 is the name of the local branch you created # and -# PACK-MNH-V5-6-1 is the remote/origin tag on which it is based. +# PACK-MNH-V5-6-2 is the remote/origin tag on which it is based. # # The advantage of this way of downloading the package is that in the future # you could check/update quickly differences with the new version of the # package without having to download entirely the full package. # -# Suppose that a new version, for example "PACK-MNH-V5-6-1", is announced. +# Suppose that a new version, for example "PACK-MNH-V5-6-2", is announced. # # To see the differences with your working copy, do: # git fetch -git diff HEAD PACK-MNH-V5-6-1 +git diff HEAD PACK-MNH-V5-6-2 # # To go to the new version, you can, for example, create a new local branch: # -git checkout -b MYB-MNH-V5-6-1 PACK-MNH-V5-6-1 +git checkout -b MYB-MNH-V5-6-2 PACK-MNH-V5-6-2 # # At any time, you can also check for "uptodate" changes in the Git branch @@ -257,7 +257,7 @@ git clone anongit@anongit_mesonh:/gitrepos/MNH-DOC.git # use the "./configure" script like this # -cd ~/MNH-V5-6-1/src +cd ~/MNH-V5-6-2/src ./configure . ../conf/profile_mesonh @@ -308,7 +308,7 @@ export OPTLEVEL=O2 # Compile in O2, 4 times faster then DEBUG, but less # and then source/load the new generate file -. ../conf/profile_mesonh.LXifort.MNH-V5-6-1.MPIAUTO.O2 +. ../conf/profile_mesonh.LXifort.MNH-V5-6-2.MPIAUTO.O2 # # REM: @@ -333,7 +333,7 @@ export OPTLEVEL=O2 # Compile in O2, 4 times faster then DEBUG, but less # go to the directory "src" # -cd ~/MNH-V5-6-1/src +cd ~/MNH-V5-6-2/src # # if you have not already configured your MESONH environment @@ -562,7 +562,7 @@ make examples # cd $WORKDIR -cd MNH-V5-6-1/src +cd MNH-V5-6-2/src ./configure @@ -576,8 +576,8 @@ cd MNH-V5-6-1/src # - On JEAN-ZAY ( HPE ) the compilation is in interactive : -cd MNH-V5-6-1/src -. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-1-MPIINTEL-O2 +cd MNH-V5-6-2/src +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-2-MPIINTEL-O2 make -j16 |& tee error$XYZ make installmaster @@ -612,12 +612,12 @@ sbatch job_make_examples_BullX_occigen # - ssh irene-fr : for Intel SkyLake processors # On Intel processors the MPI use is OPENMPI/4.1.4 # the configure will generate a -# profile_mesonh-LXifort-R8I4-MNH-V5-6-1-MPIAUTO-O2 +# profile_mesonh-LXifort-R8I4-MNH-V5-6-2-MPIAUTO-O2 # # - ssh irene-amd : for AMD , processors # On AMD processors the MPI use is OPENMPI/4.1.4 # the configure will generate a -# profile_mesonh-LXifort-R8I4-MNH-V5-6-1-AMD-MPIAUTO-O2 +# profile_mesonh-LXifort-R8I4-MNH-V5-6-2-AMD-MPIAUTO-O2 # # # At TGCC they use 'one login' for multi-project allocation . @@ -647,9 +647,9 @@ echo $CCCHOME # - install the PACKAGE in your ${CCCHOME} ( default 20Go of quota ) # for example on Intel frontal cd ${CCCHOME} -cd MNH-V5-6-1/src +cd MNH-V5-6-2/src ./configure -. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-1-MPIAUTO-O2 +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-2-MPIAUTO-O2 make -j16 |& tee error$XYZ make installmaster @@ -689,14 +689,14 @@ sbatch job_make_examples_Atos_HPCF # - At Meteo-France DSI on belenos # # to install the whole package on your "$HOME" directory -# untar the file "MNH-V5-6-1.tar.gz" from its location : +# untar the file "MNH-V5-6-2.tar.gz" from its location : cd ~ -tar xvf $MESONH/MNH-V5-6-1.tar.gz +tar xvf $MESONH/MNH-V5-6-2.tar.gz # run the "./configure" command : -cd MNH-V5-6-1/src +cd MNH-V5-6-2/src ./configure # @@ -795,7 +795,7 @@ scandollar ## OUTPUT :: -># read default config file :: ---> CONF_DOLLAR=/home/escj/DEV64/PACK-MNH-V5-6-1/conf/post/confdollar_aeropc_default +># read default config file :: ---> CONF_DOLLAR=/home/escj/DEV64/PACK-MNH-V5-6-2/conf/post/confdollar_aeropc_default ># ># read user config file :: ---> CONFIG=confdollar ># @@ -817,7 +817,7 @@ scandollar 0* ## OUTPUT :: ># -># read default config file :: ---> CONF_DOLLAR=/home/escj/DEV64/PACK-MNH-V5-6-1/conf/post/confdollar_aeropc_default +># read default config file :: ---> CONF_DOLLAR=/home/escj/DEV64/PACK-MNH-V5-6-2/conf/post/confdollar_aeropc_default ># ># read user config file :: ---> CONFIG=confdollar ># @@ -891,22 +891,22 @@ cp -R 007_16janvier_scandollar /.../your_directory # # use this "profile_mesonh" : -. /home/rech/mnh/rmnh007/DEV/MNH-V5-6-1/conf/profile_mesonh-SX8-MNH-V5-6-1-MPIAUTO-O4 +. /home/rech/mnh/rmnh007/DEV/MNH-V5-6-2/conf/profile_mesonh-SX8-MNH-V5-6-2-MPIAUTO-O4 # And the examples are here ( link to my $WORKDIR in actually ) -/home/rech/mnh/rmnh007/DEV/MNH-V5-6-1/MY_RUN/KTEST/007_16janvier_scandollar +/home/rech/mnh/rmnh007/DEV/MNH-V5-6-2/MY_RUN/KTEST/007_16janvier_scandollar # # On vargas # --------- # use this "profile_mesonh" : -. /workgpfs/rech/mnh/rmnh007/DEV/MNH-V5-6-1/conf/profile_mesonh-AIX64-MNH-V5-6-1-MPIAUTO-O2 +. /workgpfs/rech/mnh/rmnh007/DEV/MNH-V5-6-2/conf/profile_mesonh-AIX64-MNH-V5-6-2-MPIAUTO-O2 # and examples here : -/workgpfs/rech/mnh/rmnh007/DEV/MNH-V5-6-1/MY_RUN/KTEST/007_16janvier_scandollar +/workgpfs/rech/mnh/rmnh007/DEV/MNH-V5-6-2/MY_RUN/KTEST/007_16janvier_scandollar # # - At CINES on JADE : @@ -914,11 +914,11 @@ cp -R 007_16janvier_scandollar /.../your_directory # # use -. /work/escobar/DEV/MNH-V5-6-1/conf/profile_mesonh-LXifort-MNH-V5-6-1-MPIICE-O2 +. /work/escobar/DEV/MNH-V5-6-2/conf/profile_mesonh-LXifort-MNH-V5-6-2-MPIICE-O2 # and the exemples -/work/escobar/DEV/MNH-V5-6-1/MY_RUN/KTEST/007_16janvier_scandollar +/work/escobar/DEV/MNH-V5-6-2/MY_RUN/KTEST/007_16janvier_scandollar # # - At ECMWF on cxa : @@ -926,11 +926,11 @@ cp -R 007_16janvier_scandollar /.../your_directory # # use -. /c1a/ms_perm/au5/MNH-V5-6-1/conf/profile_mesonh-AIX64-MNH-V5-6-1-MPIAUTO-O2 +. /c1a/ms_perm/au5/MNH-V5-6-2/conf/profile_mesonh-AIX64-MNH-V5-6-2-MPIAUTO-O2 # and the examples -/c1a/ms_perm/au5/MNH-V5-6-1/MY_RUN/KTEST/007_16janvier_scandollar +/c1a/ms_perm/au5/MNH-V5-6-2/MY_RUN/KTEST/007_16janvier_scandollar # diff --git a/src/MNH/version.f90 b/src/MNH/version.f90 index 9451e48ac..b14cdc024 100644 --- a/src/MNH/version.f90 +++ b/src/MNH/version.f90 @@ -44,9 +44,9 @@ IMPLICIT NONE ! NMNHVERSION(1)=5 NMNHVERSION(2)=6 -NMNHVERSION(3)=1 +NMNHVERSION(3)=2 NMASDEV=56 -NBUGFIX=1 +NBUGFIX=2 CBIBUSER='' ! END SUBROUTINE VERSION diff --git a/src/configure b/src/configure index 0d9782126..665e4072c 100755 --- a/src/configure +++ b/src/configure @@ -9,9 +9,9 @@ if [ "x$XYZ" = "x" ] then # export VERSION_MASTER=${VERSION_MASTER:-MNH-V5-6} -export VERSION_BUG=${VERSION_BUG:-1} +export VERSION_BUG=${VERSION_BUG:-2} export VERSION_XYZ=${VERSION_XYZ:-${VERSION_MASTER}-${VERSION_BUG}${VER_OASIS:+-${VER_OASIS}}} -export VERSION_DATE=${VERSION_DATE:-"05/09/2023"} +export VERSION_DATE=${VERSION_DATE:-"28/11/2023"} export VERSION_LIBAEC=${VERSION_LIBAEC:-"v1.0.6"} export VERSION_HDF=${VERSION_HDF:-"1.14.0"} export VERSION_CDFC=${VERSION_CDFC:-"4.9.0"} diff --git a/src/job_make_examples_Atos_HPCF b/src/job_make_examples_Atos_HPCF index 65ba970c3..ae66d0d1a 100755 --- a/src/job_make_examples_Atos_HPCF +++ b/src/job_make_examples_Atos_HPCF @@ -21,7 +21,7 @@ hostname unset MAKEFLAGS -. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-1-MPIAUTO-O2 +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-2-MPIAUTO-O2 export MONORUN="Mpirun -np 1 " export MPIRUN="Mpirun -np 2 " export POSTRUN="echo " diff --git a/src/job_make_examples_BG b/src/job_make_examples_BG index e8f613297..049c49609 100755 --- a/src/job_make_examples_BG +++ b/src/job_make_examples_BG @@ -20,7 +20,7 @@ cd $LOADL_STEP_INITDIR unset MAKEFLAGS -. ../conf/profile_mesonh-BG-R8I4-MNH-V5-6-1-MPIAUTO-O2 +. ../conf/profile_mesonh-BG-R8I4-MNH-V5-6-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 c03278a8d..89fd48602 100755 --- a/src/job_make_examples_BGQ +++ b/src/job_make_examples_BGQ @@ -20,7 +20,7 @@ cd $LOADL_STEP_INITDIR unset MAKEFLAGS -. ../conf/profile_mesonh-BGQ-R8I4-MNH-V5-6-1-MPIAUTO-O2NAN +. ../conf/profile_mesonh-BGQ-R8I4-MNH-V5-6-2-MPIAUTO-O2NAN set -x diff --git a/src/job_make_examples_BullX b/src/job_make_examples_BullX index 0b587f091..1296ec63c 100755 --- a/src/job_make_examples_BullX +++ b/src/job_make_examples_BullX @@ -21,7 +21,7 @@ hostname unset MAKEFLAGS -. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-1-MPIINTEL-O3 +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-2-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 857cbb403..6734993f4 100755 --- a/src/job_make_examples_BullX_belenos +++ b/src/job_make_examples_BullX_belenos @@ -20,7 +20,7 @@ hostname unset MAKEFLAGS -. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-1-MPIAUTO-O3 +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-2-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 06ae65615..1b93983b9 100755 --- a/src/job_make_examples_BullX_irene +++ b/src/job_make_examples_BullX_irene @@ -23,7 +23,7 @@ hostname unset MAKEFLAGS -. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-1-MPIAUTO-O2 +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-2-MPIAUTO-O2 set -x diff --git a/src/job_make_examples_BullX_irene_AMD b/src/job_make_examples_BullX_irene_AMD index be925880c..8951653c5 100755 --- a/src/job_make_examples_BullX_irene_AMD +++ b/src/job_make_examples_BullX_irene_AMD @@ -22,7 +22,7 @@ hostname unset MAKEFLAGS -. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-1-AMD-MPIAUTO-O2 +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-2-AMD-MPIAUTO-O2 set -x diff --git a/src/job_make_examples_BullX_occigen b/src/job_make_examples_BullX_occigen index 6542f508b..ed5c476d2 100755 --- a/src/job_make_examples_BullX_occigen +++ b/src/job_make_examples_BullX_occigen @@ -20,7 +20,7 @@ hostname unset MAKEFLAGS -. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-1-MPIINTEL-O2 +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-2-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 69b879082..72f1be330 100755 --- a/src/job_make_examples_BullX_olympe +++ b/src/job_make_examples_BullX_olympe @@ -19,7 +19,7 @@ hostname unset MAKEFLAGS -. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-1-MPIINTEL-O2 +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-2-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 377799f81..0a5a77910 100755 --- a/src/job_make_examples_CRAY_cca +++ b/src/job_make_examples_CRAY_cca @@ -30,7 +30,7 @@ cd ${PBS_O_WORKDIR} ARCH=LXifort #ARCH=LXcray -. ../conf/profile_mesonh-${ARCH}-R8I4-MNH-V5-6-1-MPICRAY-O2 +. ../conf/profile_mesonh-${ARCH}-R8I4-MNH-V5-6-2-MPICRAY-O2 export MONORUN="aprun -n 1 " diff --git a/src/job_make_examples_HPE_adastra_genoa b/src/job_make_examples_HPE_adastra_genoa index 748fac3e0..86a9e5dc6 100755 --- a/src/job_make_examples_HPE_adastra_genoa +++ b/src/job_make_examples_HPE_adastra_genoa @@ -21,7 +21,7 @@ hostname unset MAKEFLAGS -. ../conf/profile_mesonh-LXcray-R8I4-MNH-V5-6-1-MPICRAY-O2 +. ../conf/profile_mesonh-LXcray-R8I4-MNH-V5-6-2-MPICRAY-O2 export MONORUN="Exec srun -l -n 1 --export=ALL" export MPIRUN="Exec srun -l -n 4 --export=ALL" export POSTRUN="echo " diff --git a/src/job_make_examples_HPE_jeanzay b/src/job_make_examples_HPE_jeanzay index 69cf4ed54..8c37f922d 100755 --- a/src/job_make_examples_HPE_jeanzay +++ b/src/job_make_examples_HPE_jeanzay @@ -21,7 +21,7 @@ hostname unset MAKEFLAGS -. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-1-MPIINTEL-O2 +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-2-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 fab87c7c9..5269e3ed3 100755 --- a/src/job_make_examples_IBM_ada +++ b/src/job_make_examples_IBM_ada @@ -21,7 +21,7 @@ cd $LOADL_STEP_INITDIR unset MAKEFLAGS -. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-1-MPIINTEL-O2 +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-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 a9b0f4527..98e322800 100755 --- a/src/job_make_examples_IBM_sp6_vargas +++ b/src/job_make_examples_IBM_sp6_vargas @@ -26,7 +26,7 @@ cd $LOADL_STEP_INITDIR unset MAKEFLAGS -. ../conf/profile_mesonh-AIX64-R8I4-MNH-V5-6-1-MPIAUTO-O2 +. ../conf/profile_mesonh-AIX64-R8I4-MNH-V5-6-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 c3a8d5b4e..26589cc95 100755 --- a/src/job_make_examples_NEC_SX8 +++ b/src/job_make_examples_NEC_SX8 @@ -20,7 +20,7 @@ unset MAKEFLAGS [ -d $PBS_O_WORKDIR ] && cd $PBS_O_WORKDIR # -. ../conf/profile_mesonh-SX8-R8I4-MNH-V5-6-1-MPIAUTO-O4 +. ../conf/profile_mesonh-SX8-R8I4-MNH-V5-6-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 8b64eb53b..f001453c6 100755 --- a/src/job_make_examples_SX8 +++ b/src/job_make_examples_SX8 @@ -21,7 +21,7 @@ unset MAKEFLAGS [ -d $PBS_O_WORKDIR ] && cd $PBS_O_WORKDIR # -. ../conf/profile_mesonh-SX8-R8I4-MNH-V5-6-1-MPIAUTO-O2 +. ../conf/profile_mesonh-SX8-R8I4-MNH-V5-6-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 e47b714db..492c07550 100755 --- a/src/job_make_examples_cxa +++ b/src/job_make_examples_cxa @@ -36,7 +36,7 @@ cd $LOADL_STEP_INITDIR unset MAKEFLAGS -. ../conf/profile_mesonh-AIX64-R8I4-MNH-V5-6-1-MPIAUTO-O2 +. ../conf/profile_mesonh-AIX64-R8I4-MNH-V5-6-2-MPIAUTO-O2 ulimit -c 0 # pas de core diff --git a/src/job_make_mesonh_BG b/src/job_make_mesonh_BG index b1d7561bf..0e08b650d 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-6-1-MPIAUTO-O2 +. ../conf/profile_mesonh-BG-R8I4-MNH-V5-6-2-MPIAUTO-O2 #time gmake time gmake -r -j8 diff --git a/src/job_make_mesonh_BGQ b/src/job_make_mesonh_BGQ index cf6051a1f..dae7ba1ec 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-6-1-MPIAUTO-O2NAN +. ../conf/profile_mesonh-BGQ-R8I4-MNH-V5-6-2-MPIAUTO-O2NAN time gmake -j8 time gmake -j8 diff --git a/src/job_make_mesonh_BullX b/src/job_make_mesonh_BullX index d25fe2a8f..43a95cff8 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-6-1-MPIINTEL-O3 +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-2-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 ce33a2d80..fdc0855cd 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-6-1-MPIAUTO-O3 +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-2-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 4c6d3a42b..e930aaf5c 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-6-1-MPICRAY-O2 +. ../conf/profile_mesonh-${ARCH}-R8I4-MNH-V5-6-2-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_adastra_genoa b/src/job_make_mesonh_HPE_adastra_genoa index c7816c776..361077831 100755 --- a/src/job_make_mesonh_HPE_adastra_genoa +++ b/src/job_make_mesonh_HPE_adastra_genoa @@ -15,7 +15,7 @@ set -x # On va lancer la compilation dans le répertoire de lancement du job pwd -. ../conf/profile_mesonh-LXcray-R8I4-MNH-V5-6-1-MPICRAY-O2 +. ../conf/profile_mesonh-LXcray-R8I4-MNH-V5-6-2-MPICRAY-O2 time make -j 32 time make -j 1 installmaster diff --git a/src/job_make_mesonh_HPE_jeanzay b/src/job_make_mesonh_HPE_jeanzay index 76fe333e1..344266251 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-6-1-MPIINTEL-O2 +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-2-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 a5cdc87fb..928c3d4bd 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-6-1-MPIINTEL-O2 +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-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 a2aa69838..9d046b1ab 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-6-1-MPIAUTO-O2 +. ../conf/profile_mesonh-AIX64-R8I4-MNH-V5-6-2-MPIAUTO-O2 time gmake -r -j8 time gmake installmaster diff --git a/src/job_make_mesonh_MFSX8 b/src/job_make_mesonh_MFSX8 index 75c2ab68e..18af10719 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-6-1-MPIAUTO-O4 +. ../conf/profile_mesonh-SX8-R8I4-MNH-V5-6-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 9d67f48fb..ce15a0ee5 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-6-1-MPIAUTO-O4 +. ../conf/profile_mesonh-SX8-R8I4-MNH-V5-6-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 3ef0e1c19..f7b78647f 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-6-1-MPIAUTO-O2 +. ../conf/profile_mesonh-AIX64-R8I4-MNH-V5-6-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 39186a408..ecd10ec5d 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-6-1-${VER_USER}-MPIINTEL-O3 +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-2-${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 5f0622b2d..c80414124 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-6-1-${VER_USER}-MPIAUTO-O3 +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-2-${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 1caf983e7..256aeb224 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-6-1-${VER_USER}-MPIAUTO-O4 +. ../conf/profile_mesonh-SX8-R8I4-MNH-V5-6-2-${VER_USER}-MPIAUTO-O4 time gmake user time gmake -j 1 installuser -- GitLab