diff --git a/A-INSTALL b/A-INSTALL index b51c893bc330a00d0906ccdf56e02bc4fd52829b..5e3c3bdc708cb7f598aaaa149e2a54ade7cc3002 100644 --- a/A-INSTALL +++ b/A-INSTALL @@ -1,8 +1,8 @@ # # Version of PACKAGE MESONH "Open distribution" -# PACK-MNH-V5-4-3 -# DATE : 30/03/2020 -# VERSION : MESONH MASDEV5_4 + BUG-3 +# PACK-MNH-V5-4-4 +# DATE : 16/12/2020 +# VERSION : MESONH MASDEV5_4 + BUG-4 # # MAP # @@ -80,14 +80,14 @@ # # or directly # -# http://mesonh.aero.obs-mip.fr/mesonh/dir_open/dir_MESONH/MNH-V5-4-3.tar.gz +# http://mesonh.aero.obs-mip.fr/mesonh/dir_open/dir_MESONH/MNH-V5-4-4.tar.gz # -# Then untar the file "MNH-V5-4-3.tar.gz" where you want to. +# Then untar the file "MNH-V5-4-4.tar.gz" where you want to. # For example, in your home directory: # cd ~ -tar xvfz MNH-V5-4-3.tar.gz +tar xvfz MNH-V5-4-4.tar.gz # # Process now to the chapter to configure the MesoNH package. @@ -167,10 +167,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-54-branch MNH-V5-4-3 +git lfs clone anongit@anongit_mesonh:/gitrepos/MNH-git_open_source-lfs.git -b MNH-54-branch MNH-V5-4-4 # -# that will create the MNH-V5-4-3 directory containing a clone (copy) of the +# that will create the MNH-V5-4-4 directory containing a clone (copy) of the # Meso-NH package on the remote developpement branch MNH-54-branch # # @@ -180,34 +180,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-54-branch development branch ). # -# To create your local branch corresponding to the V5-4-3 version, type: +# To create your local branch corresponding to the V5-4-4 version, type: # -cd MNH-V5-4-3 -git checkout -b MYB-MNH-V5-4-3 PACK-MNH-V5-4-3 +cd MNH-V5-4-4 +git checkout -b MYB-MNH-V5-4-4 PACK-MNH-V5-4-4 # -# MYB-MNH-V5-4-3 is the name of the local branch you created +# MYB-MNH-V5-4-4 is the name of the local branch you created # and -# PACK-MNH-V5-4-3 is the remote/origin tag on which it is based. +# PACK-MNH-V5-4-4 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-4-4", is announced. +# Suppose that a new version, for example "PACK-MNH-V5-4-5", is announced. # # To see the differences with your working copy, do: # git fetch -git diff HEAD PACK-MNH-V5-4-4 +git diff HEAD PACK-MNH-V5-4-5 # # To go to the new version, you can, for example, create a new local branch: # -git checkout -b MYB-MNH-V5-4-4 PACK-MNH-V5-4-4 +git checkout -b MYB-MNH-V5-4-5 PACK-MNH-V5-4-5 # # At any time, you can also check for "uptodate" changes in the Git branch @@ -253,7 +253,7 @@ git clone anongit@anongit_mesonh:/gitrepos/MNH-DOC.git # use the "./configure" script like this # -cd ~/MNH-V5-4-3/src +cd ~/MNH-V5-4-4/src ./configure . ../conf/profile_mesonh @@ -304,7 +304,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-4-3.MPIAUTO.O2 +. ../conf/profile_mesonh.LXifort.MNH-V5-4-4.MPIAUTO.O2 # # REM: @@ -329,7 +329,7 @@ export OPTLEVEL=O2 # Compile in O2, 4 times faster then DEBUG, but less # go to the directory "src" # -cd ~/MNH-V5-4-3/src +cd ~/MNH-V5-4-4/src # # if you have not already configured your MESONH environment @@ -558,7 +558,7 @@ make examples # cd $WORKDIR -cd MNH-V5-4-3/src +cd MNH-V5-4-4/src ./configure @@ -572,8 +572,8 @@ cd MNH-V5-4-3/src # - On JEAN-ZAY ( HPE ) the compilation is only possible in interactive : -cd MNH-V5-4-3/src -. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-4-3-MPIINTEL-O2 +cd MNH-V5-4-4/src +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-4-4-MPIINTEL-O2 make -j16 |& tee error$XYZ make installmaster @@ -604,12 +604,12 @@ sbatch job_make_examples_BullX_occigen # - ssh irene-fr : for Intel SkyLake/KNL processors # On Intel processors the MPI use is OPENMPI/2.0.4 # the configure will generate a -# profile_mesonh-LXifort-R8I4-MNH-V5-4-3-MPIAUTO-O2 +# profile_mesonh-LXifort-R8I4-MNH-V5-4-4-MPIAUTO-O2 # # - ssh irene-amd : for AMD , processors # On AMD processors the MPI use is OPENMPI/4.02 # the configure will generate a -# profile_mesonh-LXifort-R8I4-MNH-V5-4-3-AMD-MPIAUTO-O2 +# profile_mesonh-LXifort-R8I4-MNH-V5-4-4-AMD-MPIAUTO-O2 # # - install the PACKAGE in your $CCCHOME ( default 20Go of quota ) # - Compile in interactive mode ( see IDRIS ) @@ -650,14 +650,14 @@ qsub job_make_examples_CRAY_cca # - At Meteo-France DSI on beaufix (or prolix) # # to install the whole package on your "$HOME" directory -# untar the file "MNH-V5-4-3.tar.gz" from its location : +# untar the file "MNH-V5-4-4.tar.gz" from its location : cd ~ -tar xvf $MESONH/MNH-V5-4-3.tar.gz +tar xvf $MESONH/MNH-V5-4-4.tar.gz # run the "./configure" command : -cd MNH-V5-4-3/src +cd MNH-V5-4-4/src ./configure # @@ -757,7 +757,7 @@ scandollar ## OUTPUT :: -># read default config file :: ---> CONF_DOLLAR=/home/escj/DEV64/PACK-MNH-V5-4-3/conf/post/confdollar_aeropc_default +># read default config file :: ---> CONF_DOLLAR=/home/escj/DEV64/PACK-MNH-V5-4-4/conf/post/confdollar_aeropc_default ># ># read user config file :: ---> CONFIG=confdollar ># @@ -779,7 +779,7 @@ scandollar 0* ## OUTPUT :: ># -># read default config file :: ---> CONF_DOLLAR=/home/escj/DEV64/PACK-MNH-V5-4-3/conf/post/confdollar_aeropc_default +># read default config file :: ---> CONF_DOLLAR=/home/escj/DEV64/PACK-MNH-V5-4-4/conf/post/confdollar_aeropc_default ># ># read user config file :: ---> CONFIG=confdollar ># @@ -853,22 +853,22 @@ cp -R 007_16janvier_scandollar /.../your_directory # # use this "profile_mesonh" : -. /home/rech/mnh/rmnh007/DEV/MNH-V5-4-3/conf/profile_mesonh-SX8-MNH-V5-4-3-MPIAUTO-O4 +. /home/rech/mnh/rmnh007/DEV/MNH-V5-4-4/conf/profile_mesonh-SX8-MNH-V5-4-4-MPIAUTO-O4 # And the examples are here ( link to my $WORKDIR in actually ) -/home/rech/mnh/rmnh007/DEV/MNH-V5-4-3/MY_RUN/KTEST/007_16janvier_scandollar +/home/rech/mnh/rmnh007/DEV/MNH-V5-4-4/MY_RUN/KTEST/007_16janvier_scandollar # # On vargas # --------- # use this "profile_mesonh" : -. /workgpfs/rech/mnh/rmnh007/DEV/MNH-V5-4-3/conf/profile_mesonh-AIX64-MNH-V5-4-3-MPIAUTO-O2 +. /workgpfs/rech/mnh/rmnh007/DEV/MNH-V5-4-4/conf/profile_mesonh-AIX64-MNH-V5-4-4-MPIAUTO-O2 # and examples here : -/workgpfs/rech/mnh/rmnh007/DEV/MNH-V5-4-3/MY_RUN/KTEST/007_16janvier_scandollar +/workgpfs/rech/mnh/rmnh007/DEV/MNH-V5-4-4/MY_RUN/KTEST/007_16janvier_scandollar # # - At CINES on JADE : @@ -876,11 +876,11 @@ cp -R 007_16janvier_scandollar /.../your_directory # # use -. /work/escobar/DEV/MNH-V5-4-3/conf/profile_mesonh-LXifort-MNH-V5-4-3-MPIICE-O2 +. /work/escobar/DEV/MNH-V5-4-4/conf/profile_mesonh-LXifort-MNH-V5-4-4-MPIICE-O2 # and the exemples -/work/escobar/DEV/MNH-V5-4-3/MY_RUN/KTEST/007_16janvier_scandollar +/work/escobar/DEV/MNH-V5-4-4/MY_RUN/KTEST/007_16janvier_scandollar # # - At ECMWF on cxa : @@ -888,11 +888,11 @@ cp -R 007_16janvier_scandollar /.../your_directory # # use -. /c1a/ms_perm/au5/MNH-V5-4-3/conf/profile_mesonh-AIX64-MNH-V5-4-3-MPIAUTO-O2 +. /c1a/ms_perm/au5/MNH-V5-4-4/conf/profile_mesonh-AIX64-MNH-V5-4-4-MPIAUTO-O2 # and the examples -/c1a/ms_perm/au5/MNH-V5-4-3/MY_RUN/KTEST/007_16janvier_scandollar +/c1a/ms_perm/au5/MNH-V5-4-4/MY_RUN/KTEST/007_16janvier_scandollar # diff --git a/src/configure b/src/configure index fd23cb9379dc9c97267141b7343382a4636f6b8d..bb5a6a4acddc89d2ba8b76a16429f9e8723ab979 100755 --- a/src/configure +++ b/src/configure @@ -1,5 +1,5 @@ #!/bin/bash -#MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +#MNH_LIC Copyright 1994-2021 CNRS, Meteo-France and Universite Paul Sabatier #MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence #MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt #MNH_LIC for details. version 1. @@ -9,7 +9,7 @@ if [ "x$XYZ" = "x" ] then # export VERSION_MASTER=${VERSION_MASTER:-MNH-V5-4} -export VERSION_BUG=${VERSION_BUG:-3} +export VERSION_BUG=${VERSION_BUG:-4} export VERSION_XYZ=${VERSION_XYZ:-${VERSION_MASTER}-${VERSION_BUG}${VER_OASIS:+-${VER_OASIS}}} export VERSION_DATE=${VERSION_DATE:-"06/03/2020"} export VERSION_LIBAEC=${VERSION_LIBAEC:-"0.3.2"} diff --git a/src/job_make_examples_BG b/src/job_make_examples_BG index 6da925726b7a56986ee9f49780a0f04e26a6b422..38146598843e829cf2918db6a0f445045b922dd9 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-4-3-MPIAUTO-O2 +. ../conf/profile_mesonh-BG-R8I4-MNH-V5-4-4-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 d79d3f120d1d920c4987242061804a81218701c7..e8609776412ec371817098f0f6f0ad4befdd06bf 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-4-3-MPIAUTO-O2NAN +. ../conf/profile_mesonh-BGQ-R8I4-MNH-V5-4-4-MPIAUTO-O2NAN set -x diff --git a/src/job_make_examples_BullX b/src/job_make_examples_BullX index f7b3df0436b43c8ed7cd83fc45aef6ba36cadeda..ec1726f0ae3924f131397fb613b1879e890b65b1 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-4-3-MPIINTEL-O3 +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-4-4-MPIINTEL-O3 export MONORUN="Mpirun -np 1 " export MPIRUN="Mpirun -np 2 " export POSTRUN="time " diff --git a/src/job_make_examples_BullX_irene b/src/job_make_examples_BullX_irene index 231bdbf7f163f0a2ee974cfac0f67f795cde82e7..95e5349b354e15dd8b7dadbb70acea8fe8b3cd67 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-4-3-MPIAUTO-O2 +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-4-4-MPIAUTO-O2 set -x diff --git a/src/job_make_examples_BullX_irene_AMD b/src/job_make_examples_BullX_irene_AMD index b853b78c6797c042a7f0ffffb5c2809f4b55db3e..cc3c5d60ba2d5a3c9c11c5428770a17e9d3a0c51 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-4-3-AMD-MPIAUTO-O2 +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-4-4-AMD-MPIAUTO-O2 set -x diff --git a/src/job_make_examples_BullX_jeanzay b/src/job_make_examples_BullX_jeanzay index 71ddd1a7653ae74bf3dc4bdc2ee9f7a249ee7a85..4953026810e37d37ddec2d0467f46473ed5be881 100755 --- a/src/job_make_examples_BullX_jeanzay +++ b/src/job_make_examples_BullX_jeanzay @@ -18,7 +18,7 @@ set -x # Nom de la machine hostname -. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-4-3-MPIINTEL-O2 +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-4-4-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_BullX_occigen b/src/job_make_examples_BullX_occigen index 9952bcf9486133b25cd9f5e74d26e14af3fbcfc1..e5217b9426f3616a6b9ad94cb5cfef891fea22bd 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-4-3-MPIINTEL-O2 +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-4-4-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 06c0e0d595416ce2994eed3a9b6d6421b34930a7..7bbb559ee3399cca28445cab49fb056fec7e8e77 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-4-3-MPIINTEL-O2 +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-4-4-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 54c9a164718efb5d59ce26c430c230926730c0f1..a8b617cda3e39baaa161c33787c78916570b06f8 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-4-3-MPICRAY-O2 +. ../conf/profile_mesonh-${ARCH}-R8I4-MNH-V5-4-4-MPICRAY-O2 export MONORUN="aprun -n 1 " diff --git a/src/job_make_examples_IBM_ada b/src/job_make_examples_IBM_ada index 6b7efd0de14094d62506ccc6bef16a61e40efc59..15a3d2e12cfa3a01e25b0818be80cd0ff4e1c722 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-4-3-MPIINTEL-O2 +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-4-4-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 daaf5d3f5f24a5e6a9b02cf1689ea4084eff23d0..436d008c854912cefb77cdacd0872df02173287e 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-4-3-MPIAUTO-O2 +. ../conf/profile_mesonh-AIX64-R8I4-MNH-V5-4-4-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 ec4067cdd7726551bdf4dd7a1a5eace7d37693e0..ed77d09517ba30e753894412a541138d2074d7c2 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-4-3-MPIAUTO-O4 +. ../conf/profile_mesonh-SX8-R8I4-MNH-V5-4-4-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 19893d36c3c7036b8394e135dbaf45954ccdb925..42f2c8e4a8a41313d592044710b0f41a22f31839 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-4-3-MPIAUTO-O2 +. ../conf/profile_mesonh-SX8-R8I4-MNH-V5-4-4-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 53dc47aed3a98c74f3662b6f78c5117f41ff6d11..efd6f0033cee95e6c7033e5b21afb08897be15bb 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-4-3-MPIAUTO-O2 +. ../conf/profile_mesonh-AIX64-R8I4-MNH-V5-4-4-MPIAUTO-O2 ulimit -c 0 # pas de core diff --git a/src/job_make_mesonh_BG b/src/job_make_mesonh_BG index f239dcf20ffb3f4a972e9ec538f75d118ce24f7d..71af86fb07d3dad8d9d32375c9b05d255e337e6f 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-4-3-MPIAUTO-O2 +. ../conf/profile_mesonh-BG-R8I4-MNH-V5-4-4-MPIAUTO-O2 #time gmake time gmake -r -j8 diff --git a/src/job_make_mesonh_BGQ b/src/job_make_mesonh_BGQ index fc3efc0117fe7b30c6ed198c9e17899b26852b87..815ba0c5a17e429d95fb2ee1e1b1f4c6df23fef3 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-BGQ-R8I4-MNH-V5-4-3-MPIAUTO-O2NAN +. ../conf/profile_mesonh-BGQ-R8I4-MNH-V5-4-4-MPIAUTO-O2NAN case $LOADL_STEP_NAME in diff --git a/src/job_make_mesonh_BullX b/src/job_make_mesonh_BullX index 96a3af99022bc50f7e41bc929091bbc9c4726112..10c70674b13a2e331b7f9d78c5a86ad9cef031f6 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-4-3-MPIINTEL-O3 +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-4-4-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 5793ca6dac6d64cdf5cf1cc613f91396004b7f3a..6d634f3c34ff9adae2955efbaab99616ecabfb08 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-4-3-MPIAUTO-O3 +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-4-4-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 44d5a607b2cf6b4e1aac6710f4d6158280dd1a9c..e669181470655a7afa5817c381c520072ea462e4 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-4-3-MPICRAY-O2 +. ../conf/profile_mesonh-${ARCH}-R8I4-MNH-V5-4-4-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 d2eec06db352d72438706c6cbbb03ce6b2d655aa..bb8b9abf42c10de4bdfd6b8e76b515157eeda90f 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-4-3-MPIINTEL-O2 +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-4-4-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 311f8acb189cc30e797cb96cfdf3b959dc874b24..9c26e4641ab7689adf99b61194a91bd747ad0578 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-4-3-MPIAUTO-O2 +. ../conf/profile_mesonh-AIX64-R8I4-MNH-V5-4-4-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 707d71f973c4413086295a439e7e4014d956d36c..faf9365b793332ddba1315ed94ccab988f73ba37 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-4-3-MPIAUTO-O4 +. ../conf/profile_mesonh-SX8-R8I4-MNH-V5-4-4-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 651fe30a7f9fe2a8759254c93a944c9c2a4605ea..9bcb36b1b7758853de16817e61e8bb03d1206fae 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-4-3-MPIAUTO-O4 +. ../conf/profile_mesonh-SX8-R8I4-MNH-V5-4-4-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 88de08f162975a58f3bb0c415e3100f7df5994f3..98d324f50aee8ac00b49fc15a20509522c5c17eb 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-4-3-MPIAUTO-O2 +. ../conf/profile_mesonh-AIX64-R8I4-MNH-V5-4-4-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 3c044c434ea4f265761de5ea0ed052ac22e118f2..8dfcd279ef4f4fb009eb8262f6c825ee6882a233 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-4-3-${VER_USER}-MPIINTEL-O3 +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-4-4-${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 765efb975fc7e479c6435ea100a616f20b8f3726..5d53cdf7649bb9baf1f391eeb431a61055b5c26f 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-4-3-${VER_USER}-MPIAUTO-O3 +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-4-4-${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 2ddfd3f4eb41645c5767fe9860fac592a1400443..0e0ab4c9f22c549a5b710695fa5caa76d869214a 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-4-3-${VER_USER}-MPIAUTO-O4 +. ../conf/profile_mesonh-SX8-R8I4-MNH-V5-4-4-${VER_USER}-MPIAUTO-O4 time gmake user time gmake -j 1 installuser