Skip to content
Snippets Groups Projects
Commit 58715e89 authored by RODIER Quentin's avatar RODIER Quentin
Browse files

Merge branch 'MNH-56-branch' into MNH-57-branch

parents 452b361e 749a3b89
No related branches found
No related tags found
No related merge requests found
Showing
with 79 additions and 62 deletions
#
# Version of PACKAGE MESONH "Open distribution"
# PACK-MNH-V5-6-1
# DATE : 25/09/2023
# VERSION : MESONH MASDEV5_6 + BUG-1
# PACK-MNH-V5-6-2
# DATE : 28/11/2023
# VERSION : MESONH MASDEV5_6 + BUG-2
#
# MAP
#
......@@ -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-3", 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-3
#
# 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-3 PACK-MNH-V5-6-3
#
# 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
#
......
......@@ -70,6 +70,8 @@ USE MODD_DYN , ONLY : XTSTEP_MODEL1
USE MODD_CONDSAMP
USE MODE_ll
USE MODD_CST
USE MODE_MPPDB
USE MODE_REPRO_SUM, ONLY : SUM_DD_R2_ll
!
!* 0. DECLARATIONS
! ------------
......@@ -98,7 +100,9 @@ REAL, DIMENSION(SIZE(XRT,1),SIZE(XRT,2),SIZE(XRT,3)) :: ZRT
REAL, DIMENSION(SIZE(XSVT,1),SIZE(XSVT,2),SIZE(XSVT,3),SIZE(XSVT,4)) :: ZSVT
REAL, DIMENSION(SIZE(XTHT,1),SIZE(XTHT,2),SIZE(XTHT,3)) :: ZSUM,ZTHV
REAL, DIMENSION(:,:,:), ALLOCATABLE :: ZLVOCPEXNM,ZLSOCPEXNM ! Lv/Cp/EXNREF and Ls/Cp/EXNREF at t-1
!
CHARACTER(LEN=3) :: YJSV
INTEGER :: IIMAX_ll,IJMAX_ll
!
!--------------------------------------------------------------------------------------
!
......@@ -111,9 +115,16 @@ IKU = SIZE(XRT,3)
IKB = 1 + JPVEXT
IKE = IKU - JPVEXT
CALL GET_INDICE_ll(IIB,IJB,IIE,IJE)
CALL GET_GLOBALDIMS_ll ( IIMAX_ll,IJMAX_ll)
!
ZSVT(:,:,:,:) = XSVT(:,:,:,:)
!
IF (MPPDB_INITIALIZED) THEN
DO JSV=NSV_CSBEG, NSV_CSEND
WRITE( YJSV, '( I3.3 )' ) JSV
CALL MPPDB_CHECK3D(ZSVT(:,:,:,JSV),"BEG CONDSAMP ZSVT"//YJSV,PRECISION)
END DO
END IF
!
!
!* 1. INITIALIZATION OF CONDITIONAL SAMPLING TRACERS
......@@ -159,10 +170,10 @@ IF ( NSV_CS >= 2 ) THEN
ZTHV(:,:,JK)=XTHT(:,:,JK) * ( 1. + XRV/XRD*XRT(:,:,JK,1) ) &
/ ( 1. + ZSUM(:,:,JK) )
END DO
ZTHVMEAN = SUM(ZTHV(:,:,2))/SIZE(ZTHV(:,:,2))
ZTHVMEAN = SUM_DD_R2_ll(ZTHV(IIB:IIE,IJB:IJE,2))/REAL(IIMAX_ll*IJMAX_ll)
DO JK=3,IKE
IF (ITOP == 0) THEN
ZDT = SUM(ZTHV(:,:,JK))/SIZE(ZTHV(:,:,JK))
ZDT = SUM_DD_R2_ll(ZTHV(IIB:IIE,IJB:IJE,JK))/REAL(IIMAX_ll*IJMAX_ll)
ZTHVMEAN = (1.0/XZHAT(JK+1))* &
(XZHAT(JK)*ZTHVMEAN + (XZHAT(JK+1)-XZHAT(JK))*ZDT)
IF (ZDT > ZTHVMEAN + ZOFFSET ) THEN
......@@ -181,7 +192,7 @@ IF ( NSV_CS >= 2 ) THEN
!
DO JK=1,IKE
! ZDT need to become positive at least once
ZDT = SUM((XTHT(:,:,JK+1)-XTHT(:,:,JK)))/SIZE(XTHT(:,:,JK))
ZDT = SUM_DD_R2_ll(XTHT(IIB:IIE,IJB:IJE,JK+1)-XTHT(IIB:IIE,IJB:IJE,JK))/REAL(IIMAX_ll*IJMAX_ll)
ZDT = ZDT/(XZHAT(JK+1)-XZHAT(JK))
IF ( ZDT > ZMAXZDT ) THEN
ITOP=JK
......@@ -260,6 +271,12 @@ DO JSV=NSV_CSBEG, NSV_CSEND
XRSVS(:,:,:,JSV) = XRSVS(:,:,:,JSV) + &
XRHODJ(:,:,:)*(ZSVT(:,:,:,JSV)-XSVT(:,:,:,JSV))/PTSTEP
END DO
IF (MPPDB_INITIALIZED) THEN
DO JSV=NSV_CSBEG, NSV_CSEND
WRITE( YJSV, '( I3.3 )' ) JSV
CALL MPPDB_CHECK3D(ZSVT(:,:,:,JSV),"END CONDSAMP ZSVT"//YJSV,PRECISION)
END DO
END IF
!-------------------------------------------------------------------------------
!
!-------------------------------------------------------------------------------
......
......@@ -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"}
......
......@@ -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 "
......
......@@ -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
......
......@@ -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
......
......@@ -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 "
......
......@@ -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
......
......@@ -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
......
......@@ -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 "
......
......@@ -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 "
......
......@@ -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 "
......
......@@ -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 "
......
......@@ -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 "
......
......@@ -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
......
......@@ -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
......
......@@ -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 "
......
......@@ -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 "
......
......@@ -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
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment