From 03de73bac96c1fdd06320fb86e32096353544de9 Mon Sep 17 00:00:00 2001 From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr> Date: Mon, 25 Sep 2017 10:26:04 +0200 Subject: [PATCH] Philippe 25/09/2017: change version number + date --- A-INSTALL | 58 ++++++++++++++-------------- src/MNH/version.f90 | 2 +- src/configure | 4 +- src/job_make_examples_BG | 2 +- src/job_make_examples_BGQ | 2 +- src/job_make_examples_BullX | 2 +- src/job_make_examples_BullX_eos | 2 +- src/job_make_examples_CRAY_cca | 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_CRAY_cca | 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_MFSX8 | 2 +- 24 files changed, 53 insertions(+), 53 deletions(-) diff --git a/A-INSTALL b/A-INSTALL index 115e93430..48bfd1505 100644 --- a/A-INSTALL +++ b/A-INSTALL @@ -1,8 +1,8 @@ # # Version of PACKAGE MESONH "Open distribution" -# PACK-MNH-V5-3-0 -# DATE : 12/12/2016 -# VERSION : MESONH MASDEV5_3 + BUG-0 +# PACK-MNH-V5-3-1 +# DATE : 25/09/2017 +# VERSION : MESONH MASDEV5_3 + BUG-1 # # MAP # @@ -78,14 +78,14 @@ # # or directly # -# http://mesonh.aero.obs-mip.fr/mesonh/dir_open/dir_MESONH/MNH-V5-3-0.tar.gz +# http://mesonh.aero.obs-mip.fr/mesonh/dir_open/dir_MESONH/MNH-V5-3-1.tar.gz # -# Then untar the file "PACK-MNH-V5-3-0.tar.gz" where you want to. +# Then untar the file "PACK-MNH-V5-3-1.tar.gz" where you want to. # For example, in your home directory: # cd ~ -tar xvfz PACK-MNH-V5-3-0.tar.gz +tar xvfz PACK-MNH-V5-3-1.tar.gz # # Process now to the chapter to configure the MesoNH package. @@ -165,10 +165,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-53-branch MNH-V5-3-0 +git lfs clone anongit@anongit_mesonh:/gitrepos/MNH-git_open_source-lfs.git -b MNH-53-branch MNH-V5-3-1 # -# that will create the MNH-V5-3-0 directory containing a clone (copy) of the +# that will create the MNH-V5-3-1 directory containing a clone (copy) of the # Meso-NH package on the remote developpement branch MNH-53-branch # # @@ -178,16 +178,16 @@ 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-53-branch development branch ). # -# To create your local branch corresponding to the V5-3-0 version, type: +# To create your local branch corresponding to the V5-3-1 version, type: # -cd MNH-V5-3-0 -git checkout -b MYB-MNH-V5-3-0 PACK-MNH-V5-3-0 +cd MNH-V5-3-1 +git checkout -b MYB-MNH-V5-3-1 PACK-MNH-V5-3-1 # -# MYB-MNH-V5-3-0 is the name of the local branch you created +# MYB-MNH-V5-3-1 is the name of the local branch you created # and -# PACK-MNH-V5-3-0 is the remote/origin tag on which it is based. +# PACK-MNH-V5-3-1 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 @@ -251,7 +251,7 @@ git clone anongit@anongit_mesonh:/gitrepos/MNH-DOC.git # use the "./configure" script like this # -cd ~/MNH-V5-3-0/src +cd ~/MNH-V5-3-1/src ./configure . ../conf/profile_mesonh @@ -296,7 +296,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-3-0.MPIAUTO.O2 +. ../conf/profile_mesonh.LXifort.MNH-V5-3-1.MPIAUTO.O2 # # REM: @@ -321,7 +321,7 @@ export OPTLEVEL=O2 # Compile in O2, 4 times faster then DEBUG, but less # go to the directory "src" # -cd ~/MNH-V5-3-0/src +cd ~/MNH-V5-3-1/src # # if you have not already configured your MESONH environment @@ -548,7 +548,7 @@ make examples # cd $WORKDIR -cd MNH-V5-3-0/src +cd MNH-V5-3-1/src ./configure @@ -609,7 +609,7 @@ export ARCH=LXifort ... -création du fichier --> ../conf/profile_mesonh-LXifortI4-MNH-V5-3-0-MPICRAY-O2 +création du fichier --> ../conf/profile_mesonh-LXifortI4-MNH-V5-3-1-MPICRAY-O2 # And for the compilation & example job , switch the ARCH variable to LXiort : @@ -617,7 +617,7 @@ vi job_make_mesonh_CRAY_cca(job_make_examples_CRAY_cca) ARCH=LXifort #ARCH=LXcray # this is the default one -. ../conf/profile_mesonh-${ARCH}I4-MNH-V5-3-0-MPICRAY-O2 +. ../conf/profile_mesonh-${ARCH}I4-MNH-V5-3-1-MPICRAY-O2 @@ -708,7 +708,7 @@ scandollar ## OUTPUT :: -># read default config file :: ---> CONF_DOLLAR=/home/escj/DEV64/PACK-MNH-V5-3-0/conf/post/confdollar_aeropc_default +># read default config file :: ---> CONF_DOLLAR=/home/escj/DEV64/PACK-MNH-V5-3-1/conf/post/confdollar_aeropc_default ># ># read user config file :: ---> CONFIG=confdollar ># @@ -730,7 +730,7 @@ scandollar 0* ## OUTPUT :: ># -># read default config file :: ---> CONF_DOLLAR=/home/escj/DEV64/PACK-MNH-V5-3-0/conf/post/confdollar_aeropc_default +># read default config file :: ---> CONF_DOLLAR=/home/escj/DEV64/PACK-MNH-V5-3-1/conf/post/confdollar_aeropc_default ># ># read user config file :: ---> CONFIG=confdollar ># @@ -804,22 +804,22 @@ cp -R 007_16janvier_scandollar /.../your_directory # # use this "profile_mesonh" : -. /home/rech/mnh/rmnh007/DEV/MNH-V5-3-0/conf/profile_mesonh-SX8-MNH-V5-3-0-MPIAUTO-O4 +. /home/rech/mnh/rmnh007/DEV/MNH-V5-3-1/conf/profile_mesonh-SX8-MNH-V5-3-1-MPIAUTO-O4 # And the examples are here ( link to my $WORKDIR in actually ) -/home/rech/mnh/rmnh007/DEV/MNH-V5-3-0/MY_RUN/KTEST/007_16janvier_scandollar +/home/rech/mnh/rmnh007/DEV/MNH-V5-3-1/MY_RUN/KTEST/007_16janvier_scandollar # # On vargas # --------- # use this "profile_mesonh" : -. /workgpfs/rech/mnh/rmnh007/DEV/MNH-V5-3-0/conf/profile_mesonh-AIX64-MNH-V5-3-0-MPIAUTO-O2 +. /workgpfs/rech/mnh/rmnh007/DEV/MNH-V5-3-1/conf/profile_mesonh-AIX64-MNH-V5-3-1-MPIAUTO-O2 # and examples here : -/workgpfs/rech/mnh/rmnh007/DEV/MNH-V5-3-0/MY_RUN/KTEST/007_16janvier_scandollar +/workgpfs/rech/mnh/rmnh007/DEV/MNH-V5-3-1/MY_RUN/KTEST/007_16janvier_scandollar # # - At CINES on JADE : @@ -827,11 +827,11 @@ cp -R 007_16janvier_scandollar /.../your_directory # # use -. /work/escobar/DEV/MNH-V5-3-0/conf/profile_mesonh-LXifort-MNH-V5-3-0-MPIICE-O2 +. /work/escobar/DEV/MNH-V5-3-1/conf/profile_mesonh-LXifort-MNH-V5-3-1-MPIICE-O2 # and the exemples -/work/escobar/DEV/MNH-V5-3-0/MY_RUN/KTEST/007_16janvier_scandollar +/work/escobar/DEV/MNH-V5-3-1/MY_RUN/KTEST/007_16janvier_scandollar # # - At ECMWF on cxa : @@ -839,11 +839,11 @@ cp -R 007_16janvier_scandollar /.../your_directory # # use -. /c1a/ms_perm/au5/MNH-V5-3-0/conf/profile_mesonh-AIX64-MNH-V5-3-0-MPIAUTO-O2 +. /c1a/ms_perm/au5/MNH-V5-3-1/conf/profile_mesonh-AIX64-MNH-V5-3-1-MPIAUTO-O2 # and the examples -/c1a/ms_perm/au5/MNH-V5-3-0/MY_RUN/KTEST/007_16janvier_scandollar +/c1a/ms_perm/au5/MNH-V5-3-1/MY_RUN/KTEST/007_16janvier_scandollar # diff --git a/src/MNH/version.f90 b/src/MNH/version.f90 index 0543cfb32..20ec1c317 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=53 -NBUGFIX=0 +NBUGFIX=1 CBIBUSER='' ! END SUBROUTINE VERSION diff --git a/src/configure b/src/configure index cb9feedf7..0a47f9180 100755 --- a/src/configure +++ b/src/configure @@ -9,9 +9,9 @@ if [ "x$XYZ" = "x" ] then # export VERSION_MASTER=${VERSION_MASTER:-MNH-V5-3} -export VERSION_BUG=${VERSION_BUG:-0} +export VERSION_BUG=${VERSION_BUG:-1} export VERSION_XYZ=${VERSION_XYZ:-${VERSION_MASTER}-${VERSION_BUG}${VER_OASIS:+-${VER_OASIS}}} -export VERSION_DATE=${VERSION_DATE:-"15/12/2016"} +export VERSION_DATE=${VERSION_DATE:-"25/09/2017"} 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 2e9ed9bd1..087160994 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-0-MPIAUTO-O2 +. ../conf/profile_mesonh-BGI4-MNH-V5-3-1-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 f54d4f975..b13b19fce 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-0-MPIAUTO-O2NAN +. ../conf/profile_mesonh-BGQI4-MNH-V5-3-1-MPIAUTO-O2NAN set -x diff --git a/src/job_make_examples_BullX b/src/job_make_examples_BullX index 7a127bd23..55ff4e051 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-0-MPIINTEL-O3 +. ../conf/profile_mesonh-LXifortI4-MNH-V5-3-1-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 98e4ca1fb..94048e0a1 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-0-MPIINTEL-O2 +. ../conf/profile_mesonh-LXifortI4-MNH-V5-3-1-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 e4419e392..af720213d 100755 --- a/src/job_make_examples_CRAY_cca +++ b/src/job_make_examples_CRAY_cca @@ -27,7 +27,7 @@ cd ${PBS_O_WORKDIR} ARCH=LXifort #ARCH=LXcray -. ../conf/profile_mesonh-${ARCH}I4-MNH-V5-3-0-MPICRAY-O2 +. ../conf/profile_mesonh-${ARCH}I4-MNH-V5-3-1-MPICRAY-O2 export MONORUN="aprun -n 1 " diff --git a/src/job_make_examples_IBM_ada b/src/job_make_examples_IBM_ada index efe0cc0fa..cf6307fbf 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-0-MPIINTEL-O2 +. ../conf/profile_mesonh-LXifortI4-MNH-V5-3-1-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 00c01b236..68ff3bf5f 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-0-MPIAUTO-O2 +. ../conf/profile_mesonh-AIX64-MNH-V5-3-1-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 9779a0dc9..1d346f595 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-0-MPIAUTO-O4 +. ../conf/profile_mesonh-SX8I4-MNH-V5-3-1-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 689823817..9285303aa 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-0-MPIAUTO-O2 +. ../conf/profile_mesonh-SX8I4-MNH-V5-3-1-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 b37498a28..598e3bb48 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-0-MPIAUTO-O2 +. ../conf/profile_mesonh-AIX64I4-MNH-V5-3-1-MPIAUTO-O2 ulimit -c 0 # pas de core diff --git a/src/job_make_mesonh_BG b/src/job_make_mesonh_BG index a3cff9300..e36de00b4 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-0-MPIAUTO-O2 +. ../conf/profile_mesonh-BGI4-MNH-V5-3-1-MPIAUTO-O2 #time gmake time gmake -r -j8 diff --git a/src/job_make_mesonh_BGQ b/src/job_make_mesonh_BGQ index 3e64b8212..858fcd81f 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-0-MPIAUTO-O2NAN +. ../conf/profile_mesonh-BGQI4-MNH-V5-3-1-MPIAUTO-O2NAN case $LOADL_STEP_NAME in diff --git a/src/job_make_mesonh_BullX b/src/job_make_mesonh_BullX index eb5445b67..ebd24bd43 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-0-MPIINTEL-O3 +. ../conf/profile_mesonh-LXifortI4-MNH-V5-3-1-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 f990b4985..b09164a21 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-0-MPICRAY-O2 +. ../conf/profile_mesonh-${ARCH}I4-MNH-V5-3-1-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 242bfeffe..6877a607f 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-0-MPIINTEL-O2 +. ../conf/profile_mesonh-LXifortI4-MNH-V5-3-1-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 e512f326b..5564f5e7b 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-0-MPIAUTO-O2 +. ../conf/profile_mesonh-AIX64I4-MNH-V5-3-1-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 9714a4a64..3b46451a0 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-0-MPIAUTO-O4 +. ../conf/profile_mesonh-SX8I4-MNH-V5-3-1-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 2a65c5b62..bf37d27e7 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-0-MPIAUTO-O4 +. ../conf/profile_mesonh-SX8I4-MNH-V5-3-1-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 95b68b849..e7ef6e99d 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-0-MPIAUTO-O2 +. ../conf/profile_mesonh-AIX64I4-MNH-V5-3-1-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 0f7eae055..2614c0dfa 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-0-${VER_USER}-MPIINTEL-O3 +. ../conf/profile_mesonh-LXifortI4-MNH-V5-3-1-${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 773599f8f..f1bcda4a7 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-0-${VER_USER}-MPIAUTO-O4 +. ../conf/profile_mesonh-SX8I4-MNH-V5-3-1-${VER_USER}-MPIAUTO-O4 time gmake user time gmake -j 1 installuser -- GitLab