diff --git a/A-INSTALL b/A-INSTALL
index 2e143449fb6696328a587eb0584f1b56804b6e55..fd58dab6f265e5ed95c672869c60329b468d940b 100644
--- a/A-INSTALL
+++ b/A-INSTALL
@@ -1,8 +1,8 @@
#
# Version of PACKAGE MESONH "Open distribution"
-# PACK-MNH-V5-6-2
-# DATE : 28/11/2023
-# VERSION : MESONH MASDEV5_6 + BUG-2
+# PACK-MNH-V5-7-0
+# DATE : 08/01/2024
+# VERSION : MESONH MASDEV5_7 + BUG-0
#
# MAP
#
diff --git a/bin/Mpirun b/bin/Mpirun
index a17fb8255685db0979e45334e0c91aad8f75197b..f1da14a45e8d8206d8a0cd3de833608aadabc4d0 100755
--- a/bin/Mpirun
+++ b/bin/Mpirun
@@ -3,7 +3,7 @@
#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.
-set -x
+#set -x
NARGS=$#
let "N_1=${NARGS} - 1"
export N_1
diff --git a/bin/spll b/bin/spll
index 50592120d248d940c2c797d4fc52f8de2ce64595..58dd5438bb435dbcdaee6390b05005b7dc3e2b83 100755
--- a/bin/spll
+++ b/bin/spll
@@ -4,6 +4,7 @@
#MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
#MNH_LIC for details. version 1.
#set -x
+export LC_ALL=C
if [ $# -ne 2 ]
then
echo ERROR USAGE :: spll NSOURCE file
diff --git a/bin/spll_lst b/bin/spll_lst
index 96bd5b15f838cb28c8c77a1904954b55e29d68e1..c86fcf06be5706aa9c20437845dd1cbcd49ffa75 100755
--- a/bin/spll_lst
+++ b/bin/spll_lst
@@ -4,6 +4,7 @@
#MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
#MNH_LIC for details. version 1.
#set -x
+export LC_ALL=C
if [ $# -ne 2 ]
then
echo ERROR USAGE :: spll NSOURCE file
@@ -33,7 +34,8 @@ turb.f90|shallow_mf.f90|rain_ice.f90|lima.f90|\
lima_adjust_split.f90|lima_precip_scavenging.f90|ini_tiwmx.f90|\
ini_snow.f90|ini_rain_ice.f90|ini_neb.f90|ini_cst.f90|\
ice_adjust.f90|gradient_u.f90|gradient_v.f90|gradient_w.f90|\
-gamma.f90|gamma_inc.f90|general_gamma.f90|condensation.f90"
+gamma.f90|gamma_inc.f90|general_gamma.f90|condensation.f90|\
+minpack.f90"
#
if [ "$SUF" = "f" ]
diff --git a/bin/spll_new b/bin/spll_new
index e469e63c968f77d6598723f4be06c74ae52876eb..2f450ebdaa82eab9bcda1311761a910654798941 100755
--- a/bin/spll_new
+++ b/bin/spll_new
@@ -4,6 +4,7 @@
#MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
#MNH_LIC for details. version 1.
#set -x
+export LC_ALL=C
if [ $# -ne 2 ]
then
echo ERROR USAGE :: spll NSOURCE file
diff --git a/src/ARCH_SRC/surfex/dummy_topd.F90 b/src/ARCH_SRC/surfex/dummy_topd.F90
index 2f35ab71a5b0ea22bf2066595c087cfe6f84f4c6..0fdc837507609a3d745a782e55e704102e579e39 100644
--- a/src/ARCH_SRC/surfex/dummy_topd.F90
+++ b/src/ARCH_SRC/surfex/dummy_topd.F90
@@ -4,6 +4,7 @@ END MODULE MODD_BUDGET_COUPL_ROUT
! ######################
! ######################
MODULE MODD_COUPLING_TOPD
+LOGICAL :: LPERT_PARAM
END MODULE MODD_COUPLING_TOPD
! ######################
! ######################
diff --git a/src/Makefile b/src/Makefile
index d903b69fdec9669451f95961dc7fafd4030c6d96..092383fcbb6516383b8f9e0d5c25011435253f9b 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -352,7 +352,7 @@ $(CDF_MOD) :
cd ${DIR_HDF} && ./configure --enable-fortran --disable-shared --prefix=${CDF_PATH} --libdir=${CDF_PATH}/lib64 --with-szlib=${CDF_PATH}/include,${CDF_PATH}/lib64 \
CC="$(CC)" CFLAGS="$(HDF_OPT)" ${HDF_CONF} FC="$(FC)" FCFLAGS="$(NETCDF_OPT)" LDFLAGS="-L${CDF_PATH}/lib64" LIBS="-lsz -laec -lz" && \
$(MAKE) && $(MAKE) install && $(MAKE) clean
- cd ${DIR_CDFC} && ./configure --disable-shared --prefix=${CDF_PATH} --libdir=${CDF_PATH}/lib64 --disable-dap --disable-byterange \
+ cd ${DIR_CDFC} && ./configure --disable-shared --disable-libxml2 --prefix=${CDF_PATH} --libdir=${CDF_PATH}/lib64 --disable-dap --disable-byterange \
CC="$(CC)" CFLAGS="$(NETCDF_OPT)" CPPFLAGS="${INC_NETCDF}" ${CDF_CONF} LDFLAGS="-L${CDF_PATH}/lib64" LIBS="-lhdf5_hl -lhdf5 -lsz -laec -lz -ldl " && \
$(MAKE) && $(MAKE) install && $(MAKE) clean
ifdef MNH_FOREFIRE
@@ -520,7 +520,7 @@ ARFLAGS=r
#
# GENERATION OF DEPENDANCE FILES : *.D
#
-SPLL ?= spll
+SPLL ?= spll_new
%.D:%.F90
$(CPP) $(INC) $(CPPFLAGS) $< > $(OBJDIR)/$(*F).f90
$(SPLL) $(NSOURCE) $(OBJDIR)/$(*F).f90
diff --git a/src/SURFEX/av_pgd.F90 b/src/SURFEX/av_pgd.F90
index 7d88e48f0b9a1c521e3bc04d466e4ee7b2f58398..e8b7b380720aa4b1508450cf514f8923301398c6 100644
--- a/src/SURFEX/av_pgd.F90
+++ b/src/SURFEX/av_pgd.F90
@@ -1677,6 +1677,7 @@ USE MODE_AV_PGD
!
USE YOMHOOK ,ONLY : LHOOK, DR_HOOK
USE PARKIND1 ,ONLY : JPRB
+USE MODI_ABOR1_SFX
!
IMPLICIT NONE
!
diff --git a/src/SURFEX/av_pgd_1p.F90 b/src/SURFEX/av_pgd_1p.F90
index 663f88a82a73ca29d4892cdc6a2edf5a877757e1..d0e662401499866fcb78d57f98aa6d2e9d4f96e7 100644
--- a/src/SURFEX/av_pgd_1p.F90
+++ b/src/SURFEX/av_pgd_1p.F90
@@ -785,6 +785,7 @@ USE MODE_AV_PGD
!
USE YOMHOOK ,ONLY : LHOOK, DR_HOOK
USE PARKIND1 ,ONLY : JPRB
+USE MODI_ABOR1_SFX
!
IMPLICIT NONE
!
diff --git a/src/SURFEX/bem.F90 b/src/SURFEX/bem.F90
index cefa2915c9b2b3867047181055a754697fb3f235..5de544ed2fde728532b3e78b25b96c90a5dda4f3 100644
--- a/src/SURFEX/bem.F90
+++ b/src/SURFEX/bem.F90
@@ -174,6 +174,8 @@ USE MODE_CONV_DOE
!
USE YOMHOOK ,ONLY : LHOOK, DR_HOOK
USE PARKIND1 ,ONLY : JPRB
+USE MODI_ABOR1_SFX
+USE MODI_GET_LUOUT
!
IMPLICIT NONE
!
diff --git a/src/SURFEX/bld_occ_calendar.F90 b/src/SURFEX/bld_occ_calendar.F90
index a24e47b8e5ed337172ed597c88f8fc90414203f8..4a1a96777b3c242f73e1a90583d78402da966980 100644
--- a/src/SURFEX/bld_occ_calendar.F90
+++ b/src/SURFEX/bld_occ_calendar.F90
@@ -28,6 +28,8 @@ USE MODI_DAY_OF_WEEK
!
USE YOMHOOK ,ONLY : LHOOK, DR_HOOK
USE PARKIND1 ,ONLY : JPRB
+USE MODI_ABOR1_SFX
+USE MODI_GET_LUOUT
!
IMPLICIT NONE
!
diff --git a/src/SURFEX/bldsoil_layer_e_budget.F90 b/src/SURFEX/bldsoil_layer_e_budget.F90
index 10f249c54d28593444c6a1a3dec09d556582afae..595330e45834baa5e3e44607542b49ef26c4474a 100644
--- a/src/SURFEX/bldsoil_layer_e_budget.F90
+++ b/src/SURFEX/bldsoil_layer_e_budget.F90
@@ -90,6 +90,8 @@ USE MODI_LAYER_E_BUDGET_GET_COEF
!
USE YOMHOOK ,ONLY : LHOOK, DR_HOOK
USE PARKIND1 ,ONLY : JPRB
+USE MODI_ABOR1_SFX
+USE MODI_GET_LUOUT
!
IMPLICIT NONE
!
diff --git a/src/SURFEX/convert_patch_isba.F90 b/src/SURFEX/convert_patch_isba.F90
index 077479d44e07e0135022afc7e9742430c0472b78..d1484ea336a6d6c09385c3e25551f69919da22ea 100644
--- a/src/SURFEX/convert_patch_isba.F90
+++ b/src/SURFEX/convert_patch_isba.F90
@@ -106,6 +106,7 @@ USE MODI_VEGTYPE_TO_PATCH_IRRIG
!
USE YOMHOOK ,ONLY : LHOOK, DR_HOOK
USE PARKIND1 ,ONLY : JPRB
+USE MODI_ABOR1_SFX
!
IMPLICIT NONE
!
diff --git a/src/SURFEX/floor_layer_e_budget.F90 b/src/SURFEX/floor_layer_e_budget.F90
index bd5fbb4db721e63b1510ea1a16181dd19ee6d34f..31b7907b3f5b803fe2b98148d22ea9f229762571 100644
--- a/src/SURFEX/floor_layer_e_budget.F90
+++ b/src/SURFEX/floor_layer_e_budget.F90
@@ -84,6 +84,8 @@ USE MODE_CONV_DOE
!
USE YOMHOOK ,ONLY : LHOOK, DR_HOOK
USE PARKIND1 ,ONLY : JPRB
+USE MODI_ABOR1_SFX
+USE MODI_GET_LUOUT
!
IMPLICIT NONE
!
diff --git a/src/SURFEX/hvac_autosize.F90 b/src/SURFEX/hvac_autosize.F90
index 6e73993978a1f2b3695c6bac180d4851a167f332..c96e4613476f9f391d34537d074de345de79af28 100644
--- a/src/SURFEX/hvac_autosize.F90
+++ b/src/SURFEX/hvac_autosize.F90
@@ -64,6 +64,7 @@ USE MODI_DIAG_MISC_TEB_INIT_n
USE MODI_ALLOC_LW_COEF
USE MODI_DEALLOC_LW_COEF
USE MODI_EXPLICIT_LONGWAVE
+USE MODI_ABOR1_SFX
!
USE YOMHOOK ,ONLY : LHOOK, DR_HOOK
USE PARKIND1 ,ONLY : JPRB
diff --git a/src/SURFEX/ini_data_param_teb.F90 b/src/SURFEX/ini_data_param_teb.F90
index 6e45707b41b70202d050a61546c5e843c63018ff..5c33b1a7c72fcbdc58147d0837e2eca1a4c6d707 100644
--- a/src/SURFEX/ini_data_param_teb.F90
+++ b/src/SURFEX/ini_data_param_teb.F90
@@ -61,6 +61,7 @@ USE MODD_DATA_TEB_n, ONLY : DATA_TEB_t
USE MODD_CSTS, ONLY : XSURF_EPSILON
!
USE MODI_ABOR1_SFX
+USE MODI_GET_LUOUT
!
USE YOMHOOK ,ONLY : LHOOK, DR_HOOK
USE PARKIND1 ,ONLY : JPRB
diff --git a/src/SURFEX/init_teb_soil_grid.F90 b/src/SURFEX/init_teb_soil_grid.F90
index f7bb60294797e0960c6d00ff629e8c7e67ecdbb3..e16f8fb86471b7426aaaca39c1e0de6a0432079f 100644
--- a/src/SURFEX/init_teb_soil_grid.F90
+++ b/src/SURFEX/init_teb_soil_grid.F90
@@ -40,6 +40,8 @@ USE MODI_AV_PGD
!
USE YOMHOOK ,ONLY : LHOOK, DR_HOOK
USE PARKIND1 ,ONLY : JPRB
+USE MODI_ABOR1_SFX
+USE MODI_GET_LUOUT
!
IMPLICIT NONE
!
diff --git a/src/SURFEX/mass_layer_e_budget.F90 b/src/SURFEX/mass_layer_e_budget.F90
index febb0b57102830cf6d490c5b02ffb3ea92245059..32d1dfcc1e53da43bfb9d9c051bb8c1dbe29e541 100644
--- a/src/SURFEX/mass_layer_e_budget.F90
+++ b/src/SURFEX/mass_layer_e_budget.F90
@@ -79,6 +79,7 @@ USE MODI_GET_LUOUT
!
USE YOMHOOK ,ONLY : LHOOK, DR_HOOK
USE PARKIND1 ,ONLY : JPRB
+USE MODI_ABOR1_SFX
!
IMPLICIT NONE
!
diff --git a/src/SURFEX/modd_coupling_topd.F90 b/src/SURFEX/modd_coupling_topd.F90
deleted file mode 100644
index aea8813e80efb5523ec2d37a73d55b66b19a45ac..0000000000000000000000000000000000000000
--- a/src/SURFEX/modd_coupling_topd.F90
+++ /dev/null
@@ -1,144 +0,0 @@
-!SFX_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
-!SFX_LIC This is part of the SURFEX software governed by the CeCILL-C licence
-!SFX_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
-!SFX_LIC for details. version 1.
-! ###########################
- MODULE MODD_COUPLING_TOPD
-! ###########################
-!
-!!**** *MODD_COUPLING_TOPD - declaration of exchanged variables from Topodyn to ISBA
-!!
-!! PURPOSE
-!! -------
-!
-!!
-!!** IMPLICIT ARGUMENTS
-!! ------------------
-!! None
-!!
-!! REFERENCE
-!! ---------
-!!
-!! AUTHOR
-!! ------
-!! F. Habets and K. Chancibault
-!!
-!! MODIFICATIONS
-!! -------------
-!! Original 29/09/03
-!! 03/2014 (B. Vincendon) new variable to create a mask for N patches
-!! 07/2017 (B. Vincendon) changing name of variable to ditinguish between
-!! packed and full grid variables + new variables
-!! for runoff management
-!
-!* 0. DECLARATIONS
-! ------------
-USE MODD_TOPD_PAR, ONLY : JPCAT
-!
-IMPLICIT NONE
-!
-!-------------------------------------------------------------------------------
-!
-LOGICAL :: LCOUPL_TOPD !if T, performs coupling with Topmodel
-LOGICAL :: LBUDGET_TOPD !if T, computes budget
-LOGICAL :: LTOPD_STEP
-LOGICAL :: LPERT_PARAM
-LOGICAL :: LPERT_INIT
-!
-INTEGER :: NTOPD_STEP
-INTEGER :: NFREQ_MAPS_WG !frequency of output WG maps
-INTEGER :: NFREQ_MAPS_ASAT !frequency of output ASAT maps
-INTEGER :: NFREQ_MAPS_RUNOFF !frequency of output RUNOFF maps
-!
-INTEGER :: NNB_TOPD ! Ratio between Time steps of Topmodel and ISBA
-!
-INTEGER :: NIMAX ! number of ISBA grid points on
- ! abscissa axis
-INTEGER :: NJMAX ! number of ISBA grid points on ordinate
- ! axis
-REAL, ALLOCATABLE, DIMENSION(:) :: XXI ! Extended Lambert II coordinates of Isba
-REAL, ALLOCATABLE, DIMENSION(:) :: XYI ! nodes
-!
-INTEGER, ALLOCATABLE, DIMENSION(:) :: NNPIX ! Number of Topmodel pixels in an ISBA mesh
-INTEGER, ALLOCATABLE, DIMENSION(:,:,:) :: NMASKI ! pixel number of each catchment in each isba mesh
-INTEGER, ALLOCATABLE, DIMENSION(:,:) :: NMASKT ! mask
-INTEGER, ALLOCATABLE, DIMENSION(:) :: NMASKT_PATCH ! mask
-!
-REAL, ALLOCATABLE, DIMENSION(:) :: XAS_NATURE ! Packed contributive area fraction on Nature grid
-REAL, ALLOCATABLE, DIMENSION(:,:) :: XAS_IBV_P ! Packed contributive area fraction on Nature grid by catchment
-REAL, ALLOCATABLE, DIMENSION(:,:) :: XAIBV_F ! Unpacked area fraction of each catchment on Full grid
-REAL, ALLOCATABLE, DIMENSION(:) :: XATOP ! Unpacked area fraction of all cacthments on Full grid
-REAL, ALLOCATABLE, DIMENSION(:) :: XATOP_NATURE ! Packed area fraction of all cacthments on Nature grid
-!
-INTEGER, ALLOCATABLE, DIMENSION(:,:) :: NNBV_IN_MESH ! Number of pixel of a partical cathment in an ISBA mesh
-REAL, ALLOCATABLE, DIMENSION(:,:) :: XBV_IN_MESH ! Area of the ISBA meshes covered by a partical cathment
-REAL, ALLOCATABLE, DIMENSION(:) :: XTOTBV_IN_MESH ! Area of the ISBA meshes covered by all cathments
-!
-REAL, ALLOCATABLE, DIMENSION(:) :: XDTOPI ! depth of the soil for lateral
- ! distribution on ISBA grid (m)
-REAL, ALLOCATABLE, DIMENSION(:,:) :: XDTOPT ! depth of the Isba soil on TOP-LAT
- ! grid (m)
-!
-REAL, ALLOCATABLE, DIMENSION(:) :: XWG_FULL ! Water content from Isba on the full domain
-REAL, ALLOCATABLE, DIMENSION(:,:) :: XWGT ! ISBA water content
-!
-REAL, ALLOCATABLE, DIMENSION(:) :: XWSTOPI ! total water content at saturation (m3/m3)
- ! on XDTOPI on ISBA grid
-REAL, ALLOCATABLE, DIMENSION(:,:) :: XWSTOPT ! total water content at saturation (m3/m3)
- ! on XDTOPT on TOP-LAT grid
-REAL, ALLOCATABLE, DIMENSION(:) :: XWFCTOPI ! total field capacity on XDTOPI (m3/m3)
-REAL, ALLOCATABLE, DIMENSION(:,:) :: XWFCTOPT ! total field capacity on XDTOPT (m3/m3)
-REAL, ALLOCATABLE, DIMENSION(:) :: XWWTOPI ! hydraulic conductivity at saturation on
- ! Isba grid, on XDTOPI
-REAL, ALLOCATABLE, DIMENSION(:,:) :: XWWTOPT
-REAL, ALLOCATABLE, DIMENSION(:,:) :: XWTOPT ! water storage on TOP-LAT grid, after
- ! lateral distribution
-REAL, ALLOCATABLE, DIMENSION(:,:) :: XRUNOFF_IBV_P! Runoff by mesh and catchment on isba grid
-REAL, ALLOCATABLE, DIMENSION(:) :: XWOVSATI_P ! Volume of water above saturation buy mesh on isba grid
-!
-! * pour bilans
-REAL, ALLOCATABLE, DIMENSION(:) :: XAVG_RUNOFFCM !cumulated runoff (kg/m2) at t-dt
-REAL, ALLOCATABLE, DIMENSION(:) :: XAVG_DRAINCM ! cumulated drainage calculated from Isba (kg/m2) at t-dt
-REAL, ALLOCATABLE, DIMENSION(:) :: XRAINFALLCM ! cumulated rainfall calculated from Isba (kg/m2) at t-dt
-REAL, ALLOCATABLE, DIMENSION(:) :: XAVG_HORTCM ! cumulated Horton calculated from Isba (kg/m2) at t-dt
-!
-REAL, ALLOCATABLE, DIMENSION(:,:) :: XKA_PRE ! Hydrological indexes at the previous time step
-REAL, ALLOCATABLE, DIMENSION(:) :: XKAC_PRE ! Hydrological index at saturation at the previous time step
-!
-REAL, ALLOCATABLE, DIMENSION(:,:) :: XDMAXFC ! Deficit at the field capacity level
-!
-REAL, ALLOCATABLE, DIMENSION(:) :: XDRAIN_TOP ! Value of drainage on TOPMODEL grid
-!
-REAL, ALLOCATABLE, DIMENSION(:) :: XFRAC_D2 ! fraction of the second layer concerned with lateral transferts
-REAL, ALLOCATABLE, DIMENSION(:) :: XFRAC_D3 ! fraction of the third layer concerned with lateral transferts
-!
-REAL, ALLOCATABLE, DIMENSION(:) :: XWGI_FULL ! soil ice content
-!
-REAL, ALLOCATABLE, DIMENSION(:,:) :: XRUN_TOROUT,XDR_TOROUT
-!
-LOGICAL :: LSTOCK_TOPD ! true to stock runoff and drainage values (for another simulation)
-!
-INTEGER :: NNB_STP_RESTART ! number of time step to restart from a previous simulation
-INTEGER :: NNB_STP_STOCK ! number of time step to write for the next simulation
-!
-INTEGER, DIMENSION(:), ALLOCATABLE :: NYEAR ! Year of the beginning of the simulation.
-INTEGER, DIMENSION(:), ALLOCATABLE :: NMONTH ! Month of the beginning of the simulation.
-INTEGER, DIMENSION(:), ALLOCATABLE :: NDAY ! Date of the beginning of the simulation.
-INTEGER, DIMENSION(:), ALLOCATABLE :: NH ! Hour of the bFginning of the simulation.
-INTEGER, DIMENSION(:), ALLOCATABLE :: NM ! Minutes of the beginning of the simulation.
-!
-! **** For special f, dc exponential profile
-REAL, DIMENSION(:), ALLOCATABLE :: XF_PARAM
-REAL, DIMENSION(:), ALLOCATABLE :: XC_DEPTH_RATIO
-!
-! **** For sub-catchments
-LOGICAL :: LDUMMY_SUBCAT !if T, dummy sub-catchments defined
-LOGICAL :: LSUBCAT !if T, sub-catchments will be computed
-INTEGER, DIMENSION(JPCAT) :: NSUBCAT
-REAL, DIMENSION(JPCAT,JPCAT) :: XLX,XLY
-REAL, DIMENSION(JPCAT,JPCAT) :: XQ2,XQ10,XQ50
-CHARACTER(LEN=15), DIMENSION(JPCAT,JPCAT):: CSUBCAT ! Names of catchments
-CHARACTER(LEN=15), DIMENSION(JPCAT):: CFILE_SUBCAT ! File containing Sub cat information
-LOGICAL :: LWRITE_SEVERITY_MAPS !if T, severity maps will be computed
-!
-END MODULE MODD_COUPLING_TOPD
diff --git a/src/SURFEX/mode_coherence_frac.F90 b/src/SURFEX/mode_coherence_frac.F90
index 9599d81b85f3bcdef5bb29875033d417b6c25955..d68bb4a99a61161133b59aaaa4b5493ca9042d16 100644
--- a/src/SURFEX/mode_coherence_frac.F90
+++ b/src/SURFEX/mode_coherence_frac.F90
@@ -53,6 +53,8 @@ SUBROUTINE COHERENCE_FRAC(HPROGRAM,PFRAC_VALUE, CD_NAME, L_SUM_CHECK)
USE MODD_CSTS ,ONLY : XSURF_EPSILON
USE YOMHOOK ,ONLY : LHOOK, DR_HOOK
USE PARKIND1 ,ONLY : JPRB
+USE MODI_ABOR1_SFX
+USE MODI_GET_LUOUT
!
IMPLICIT NONE
!
@@ -147,6 +149,7 @@ USE MODD_DATA_BEM_n, ONLY : DATA_BEM_t
!
USE YOMHOOK ,ONLY : LHOOK, DR_HOOK
USE PARKIND1 ,ONLY : JPRB
+USE MODI_GET_LUOUT
!
IMPLICIT NONE
!
diff --git a/src/SURFEX/mode_psychro.F90 b/src/SURFEX/mode_psychro.F90
index 1d85dd332a80903f827e2a94005300745b1f08b2..42d795ff1952e15720600f649f8e224ff5f474d3 100644
--- a/src/SURFEX/mode_psychro.F90
+++ b/src/SURFEX/mode_psychro.F90
@@ -262,6 +262,7 @@ function TWB_FROM_TPQ_1D(PT, PP, PQ) RESULT(PTWB)
!
USE MODE_THERMOS
USE MODD_CSTS, ONLY : XTT
+USE MODI_ABOR1_SFX
!
! Robert:
! The original version of this calculation based on an iteration
diff --git a/src/SURFEX/pgd_surf_atm.F90 b/src/SURFEX/pgd_surf_atm.F90
index 9c35c67ef1e712803360f7417fa12c7e009dd4b9..fcafd53f1aeb11853002d05f6cc9d92fef9d3b4a 100644
--- a/src/SURFEX/pgd_surf_atm.F90
+++ b/src/SURFEX/pgd_surf_atm.F90
@@ -80,6 +80,7 @@ USE MODI_PGD_DMS
!
USE YOMHOOK ,ONLY : LHOOK, DR_HOOK
USE PARKIND1 ,ONLY : JPRB
+USE MODI_ABOR1_SFX
!
IMPLICIT NONE
!
diff --git a/src/SURFEX/prep_teb.F90 b/src/SURFEX/prep_teb.F90
index 046dbdcf7de40ca22d02ebb9d3677f3c36c6b880..b777e1e21091580cf5fe0a60967eb742bf4406f0 100644
--- a/src/SURFEX/prep_teb.F90
+++ b/src/SURFEX/prep_teb.F90
@@ -72,6 +72,7 @@ USE YOMHOOK ,ONLY : LHOOK, DR_HOOK
USE PARKIND1 ,ONLY : JPRB
!
USE MODI_CLEAN_PREP_OUTPUT_GRID
+USE MODI_ABOR1_SFX
!
IMPLICIT NONE
!
diff --git a/src/SURFEX/roof_layer_e_budget.F90 b/src/SURFEX/roof_layer_e_budget.F90
index 4743ec132f8ec92e6ce9537d91f150105120fa80..b338e4698f5ad058189c434f1dc427d8e1241459 100644
--- a/src/SURFEX/roof_layer_e_budget.F90
+++ b/src/SURFEX/roof_layer_e_budget.F90
@@ -108,6 +108,8 @@ USE MODE_CONV_DOE
!
USE YOMHOOK ,ONLY : LHOOK, DR_HOOK
USE PARKIND1 ,ONLY : JPRB
+USE MODI_ABOR1_SFX
+USE MODI_GET_LUOUT
!
IMPLICIT NONE
!
diff --git a/src/SURFEX/snow_cover_1layer.F90 b/src/SURFEX/snow_cover_1layer.F90
index 7de03b9cc27f8d5a6472cdb1e803b0c6b8eb14ee..afd5d23111ee2f786f833b2695c8dd48953fc064 100644
--- a/src/SURFEX/snow_cover_1layer.F90
+++ b/src/SURFEX/snow_cover_1layer.F90
@@ -74,6 +74,8 @@ USE MODI_SURFACE_AERO_COND
!
USE YOMHOOK ,ONLY : LHOOK, DR_HOOK
USE PARKIND1 ,ONLY : JPRB
+USE MODI_ABOR1_SFX
+USE MODI_GET_LUOUT
!
IMPLICIT NONE
!
diff --git a/src/SURFEX/teb_bld_road.F90 b/src/SURFEX/teb_bld_road.F90
index 308cb79cbbe669341b3549a31dc1470e6e1dc16b..85660b400694c8c60e3fa74ba46431b54bd8e3e3 100644
--- a/src/SURFEX/teb_bld_road.F90
+++ b/src/SURFEX/teb_bld_road.F90
@@ -224,6 +224,8 @@ USE MODI_BLDSOIL_LAYER_E_BUDGET
!
USE YOMHOOK ,ONLY : LHOOK, DR_HOOK
USE PARKIND1 ,ONLY : JPRB
+USE MODI_ABOR1_SFX
+USE MODI_GET_LUOUT
!
IMPLICIT NONE
!
diff --git a/src/SURFEX/urban_solar_abs.F90 b/src/SURFEX/urban_solar_abs.F90
index 1f2e48a58820aff041ed64f68ac2a2b6f51a8dad..5169098678455dc59b95cb799a2c9b01015aef5a 100644
--- a/src/SURFEX/urban_solar_abs.F90
+++ b/src/SURFEX/urban_solar_abs.F90
@@ -196,6 +196,7 @@ USE MODI_WINDOW_SHADING
!
USE YOMHOOK ,ONLY : LHOOK, DR_HOOK
USE PARKIND1 ,ONLY : JPRB
+USE MODI_ABOR1_SFX
!
IMPLICIT NONE
!
diff --git a/src/SURFEX/wall_layer_e_budget.F90 b/src/SURFEX/wall_layer_e_budget.F90
index 8f4801b911a64d3e77512210ba172c73c09e767e..b06cddbe62b5fc167ecc6ed12a5c15c8f50bf9da 100644
--- a/src/SURFEX/wall_layer_e_budget.F90
+++ b/src/SURFEX/wall_layer_e_budget.F90
@@ -117,6 +117,8 @@ USE MODE_CONV_DOE
!
USE YOMHOOK ,ONLY : LHOOK, DR_HOOK
USE PARKIND1 ,ONLY : JPRB
+USE MODI_ABOR1_SFX
+USE MODI_GET_LUOUT
!
IMPLICIT NONE
!
diff --git a/src/SURFEX/write_diag_pgd_grdnn.F90 b/src/SURFEX/write_diag_pgd_grdnn.F90
index fc1cc0805de4e92047151bdc51db3b425c6002f8..c2d5b6f517abe1b84a61ff9166cc6dc5f9fbdf41 100644
--- a/src/SURFEX/write_diag_pgd_grdnn.F90
+++ b/src/SURFEX/write_diag_pgd_grdnn.F90
@@ -58,6 +58,7 @@ USE MODI_END_IO_SURF_n
!
USE YOMHOOK ,ONLY : LHOOK, DR_HOOK
USE PARKIND1 ,ONLY : JPRB
+USE MODI_ABOR1_SFX
!
IMPLICIT NONE
!
diff --git a/src/SURFEX/write_ecoclimap2_data.F90 b/src/SURFEX/write_ecoclimap2_data.F90
index 4304a43b57b3ef5088838e0b86a011bd9b33c644..7bd221f8e3c57e3822685510f4a840941eb19935 100644
--- a/src/SURFEX/write_ecoclimap2_data.F90
+++ b/src/SURFEX/write_ecoclimap2_data.F90
@@ -18,6 +18,7 @@ USE MODD_SURF_PAR, ONLY: LEN_HREC
!
USE YOMHOOK ,ONLY : LHOOK, DR_HOOK
USE PARKIND1 ,ONLY : JPRB
+USE MODI_ABOR1_SFX
!
IMPLICIT NONE
!
diff --git a/src/SURFEX/writesurf_tebn.F90 b/src/SURFEX/writesurf_tebn.F90
index 94a986dd658d741ac3d4f41f3d7d1cba8934ffa2..a519acd7bf111e3080fc569a15420d9fbdb5ae5d 100644
--- a/src/SURFEX/writesurf_tebn.F90
+++ b/src/SURFEX/writesurf_tebn.F90
@@ -63,6 +63,7 @@ USE MODI_WRITESURF_TEB_HYDRO_n
!
USE YOMHOOK ,ONLY : LHOOK, DR_HOOK
USE PARKIND1 ,ONLY : JPRB
+USE MODI_ABOR1_SFX
!
IMPLICIT NONE
!
diff --git a/src/configure b/src/configure
index 0967440809476ee16434683bb5230fb64c54f738..964d56694478e880877a3b701f29a32fecb96158 100755
--- a/src/configure
+++ b/src/configure
@@ -484,11 +484,23 @@ export SPLL=spll_new
export VER_MPI=${VER_MPI:-MPIAUTO}
export OPTLEVEL=${OPTLEVEL:-DEBUG}
export MVWORK=${MVWORK:-NO}
- export VER_CDF=${VER_CDF:-CDFCTI}
export NEED_TOOLS=NO
+ # Ubuntu version
+ case "$(lsb_release -sr)" in
+ 20.04)
+ export VER_CDF=${VER_CDF:-CDFCTI}
+ export MNHENV=${MNHENV:-"
+export SPLL=spll_new
+"}
+ ;;
+ 22.04)
+ export VER_CDF=${VER_CDF:-CDFAUTO}
export MNHENV=${MNHENV:-"
+export PATH=/opt/gcc-9.4.0/bin:\$PATH
export SPLL=spll_new
"}
+ ;;
+ esac
;;
'Linux nuwa'*)
export ARCH=${ARCH:-LXifort}
diff --git a/src/job_make_examples_Atos_HPCF b/src/job_make_examples_Atos_HPCF
index ae66d0d1a980e1b334a84cf3cd053dba33941af0..046caeb86188e49b6ba19a49c0d63521325a19ab 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-2-MPIAUTO-O2
+. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-7-0-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 049c496096b8c5cb22da726fd5cd04fedcf1dfbd..97ee6e4da9cf694bbfa89fb78cfb7854960a36aa 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-2-MPIAUTO-O2
+. ../conf/profile_mesonh-BG-R8I4-MNH-V5-7-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 89fd486027972143994f87b08d0e1b74b09569d4..91d5065a300a0f73016af95dd273835af052be4a 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-2-MPIAUTO-O2NAN
+. ../conf/profile_mesonh-BGQ-R8I4-MNH-V5-7-0-MPIAUTO-O2NAN
set -x
diff --git a/src/job_make_examples_BullX b/src/job_make_examples_BullX
index 1296ec63c27f63f1ca7376039c7fe178fda88af2..5ac5e6d3dbdf38fd246fcc66dfa61361cadcf5ee 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-2-MPIINTEL-O3
+. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-7-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 2086f3017e168dc4809281a5bb25d9d47e0086eb..e7858d9ded6189fa56e0a806d5ac95f64d86b523 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-O2
+. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-7-0-MPIAUTO-O2
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 1b93983b9eb0105fa8e1d5ad4ba0c63bb1d50e99..0a6885406ac9b02a03d91e84104a7d154f2cf852 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-2-MPIAUTO-O2
+. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-7-0-MPIAUTO-O2
set -x
diff --git a/src/job_make_examples_BullX_irene_AMD b/src/job_make_examples_BullX_irene_AMD
index 8951653c51c93ac4dfefc2fcb12f58c7a2a048b2..14d7d2f4d75f2fbbb0a1fd766c9c86dde9f1a97d 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-2-AMD-MPIAUTO-O2
+. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-7-0-AMD-MPIAUTO-O2
set -x
diff --git a/src/job_make_examples_BullX_occigen b/src/job_make_examples_BullX_occigen
index ed5c476d24efe1e0a3b6d41d85edcbef6c6168db..81aa099147577d24721e22f892356db7ac8cbd97 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-2-MPIINTEL-O2
+. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-7-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 72f1be33044e505b65b27b077857edf3dff85c9d..9f9c3d68f575e44a7fbe43e824031a6c292ec808 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-2-MPIINTEL-O2
+. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-7-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 0a5a77910103986878fce1c47af7db7ab8ad3ad2..54ec9adda38de7e0f332ef626f0f23100e69ef49 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-2-MPICRAY-O2
+. ../conf/profile_mesonh-${ARCH}-R8I4-MNH-V5-7-0-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 86a9e5dc6b8fb7114008a75b57af7af6077dd141..2792f2b50c070f32483fa497932efaa005ec0611 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-2-MPICRAY-O2
+. ../conf/profile_mesonh-LXcray-R8I4-MNH-V5-7-0-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 8c37f922dc8e969fa6a3d6b13428ed14abf390a2..54e26e6591126b56cc366bfaf9f582e72b443989 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-2-MPIINTEL-O2
+. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-7-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 5269e3ed36849acc701f1321139fd999df7c22ca..3db69c8a0a1731e82ec7bb78b68bb74200de20c8 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-2-MPIINTEL-O2
+. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-7-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 98e322800d74b5cb9a762d80b90349a1999ea581..49067f0d75d09d3fefa672dab408d2b6da8e1bc9 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-2-MPIAUTO-O2
+. ../conf/profile_mesonh-AIX64-R8I4-MNH-V5-7-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 26589cc95aa3a1590a68d1ba558b009abd0e800a..3952e0d7d4cbccdf9b5bd42ca3f9b050e004cfcd 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-2-MPIAUTO-O4
+. ../conf/profile_mesonh-SX8-R8I4-MNH-V5-7-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 f001453c6e3ca50d16103991f7b8b3a3f3317558..b7b87f7367c1654146d48db033b0ef421867738b 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-2-MPIAUTO-O2
+. ../conf/profile_mesonh-SX8-R8I4-MNH-V5-7-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 492c07550bee2022a46a6ce41ba3e8130fb16ceb..28a849508899931561fc251cc57e8b583c73f78d 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-2-MPIAUTO-O2
+. ../conf/profile_mesonh-AIX64-R8I4-MNH-V5-7-0-MPIAUTO-O2
ulimit -c 0 # pas de core
diff --git a/src/job_make_mesonh_BG b/src/job_make_mesonh_BG
index 0e08b650dc3a7e2aff8572a8e08a1c37f0e25a61..a32ecc21a68ed599c42ef9313bb11763eea10b24 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-2-MPIAUTO-O2
+. ../conf/profile_mesonh-BG-R8I4-MNH-V5-7-0-MPIAUTO-O2
#time gmake
time gmake -r -j8
diff --git a/src/job_make_mesonh_BGQ b/src/job_make_mesonh_BGQ
index dae7ba1ec9fdce5744c122b23d06f521a5e38a43..c983bbea92085cd871fbc253b9627713adb73663 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-2-MPIAUTO-O2NAN
+. ../conf/profile_mesonh-BGQ-R8I4-MNH-V5-7-0-MPIAUTO-O2NAN
time gmake -j8
time gmake -j8
diff --git a/src/job_make_mesonh_BullX b/src/job_make_mesonh_BullX
index 43a95cff8ce714bbd0b629e25bcd905e6ac9e94c..a304b72a566f664cb1923cc621c34b141acce631 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-2-MPIINTEL-O3
+. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-7-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 5f8e7793096f59144740540b03825978c5ed9142..94ce033471423c15b2ec1d8659d70aaf7346ff93 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-O2
+. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-7-0-MPIAUTO-O2
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 e930aaf5ccea3a5c332d9f401f1f04d29a6964f5..207f674e5ae084e1f507e9319961b51f1762dd51 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-2-MPICRAY-O2
+. ../conf/profile_mesonh-${ARCH}-R8I4-MNH-V5-7-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_adastra_genoa b/src/job_make_mesonh_HPE_adastra_genoa
index 3610778312ff94c6ca1a047c5eeeceebe8e84ae4..c61d9e973630b537cd9c85a9b2a99ca54a240ecd 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-2-MPICRAY-O2
+. ../conf/profile_mesonh-LXcray-R8I4-MNH-V5-7-0-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 344266251eb510b472ccd2f0ddbdd11d60132bbe..8126b8d490f590f1b5ce9921967e103fea8baf40 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-2-MPIINTEL-O2
+. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-7-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 928c3d4bdb1d8e5460dc546b35d54fc04fc92d25..3a9fb2ec880e72520cfcb9dbb4a32bc5165c572b 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-2-MPIINTEL-O2
+. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-7-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 9d046b1abcde17a5ed3745142285d6ca6f884370..05070aa8c2d35cd69be29cab32f66d6340de3aba 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-2-MPIAUTO-O2
+. ../conf/profile_mesonh-AIX64-R8I4-MNH-V5-7-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 18af1071971ce0352b4bd5ba03c8847da5bff2be..47b0a5f71d6d28e40cc7e7d710b9156a8ac107bb 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-2-MPIAUTO-O4
+. ../conf/profile_mesonh-SX8-R8I4-MNH-V5-7-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 ce15a0ee577c401801552b0973c3aa38d305a20f..ed9f289203de7e7573436c947cdf14ac93c9be1f 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-2-MPIAUTO-O4
+. ../conf/profile_mesonh-SX8-R8I4-MNH-V5-7-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 f7b78647f7f405a520b766623484477900fa8110..fea9dbbf9476483da297e216b14aef19a00fc4d3 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-2-MPIAUTO-O2
+. ../conf/profile_mesonh-AIX64-R8I4-MNH-V5-7-0-MPIAUTO-O2
time gmake -r -j1
time gmake installmaster
diff --git a/src/job_make_mesonh_dev_pc_ifpen b/src/job_make_mesonh_dev_pc_ifpen
index d735db715dd27d80153515264580b0432e309900..3a3331be8d63ffaf701393056b09e924ef112e8d 100755
--- a/src/job_make_mesonh_dev_pc_ifpen
+++ b/src/job_make_mesonh_dev_pc_ifpen
@@ -9,7 +9,7 @@ pwd
set -x
export ARCH=LXgfortran
-export VERSION_XYZ=MNH-V5-6-1
+export VERSION_XYZ=MNH-V5-7-0
export VER_MPI=MPIAUTO
export OPTLEVEL=DEBUG
diff --git a/src/job_make_mesonh_ener440 b/src/job_make_mesonh_ener440
index 1b2675aecaafe054fdd769bf86ad3681dcb7f9ad..a8153e61664dbc23b8f5e3f739d7ced0cf86a068 100755
--- a/src/job_make_mesonh_ener440
+++ b/src/job_make_mesonh_ener440
@@ -17,7 +17,7 @@
cd ${SLURM_SUBMIT_DIR}
# Chargement du profil (qui contient le source vers l'env ifpen-mesonh)
-. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-1-MPIAUTO-O2
+. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-7-0-MPIAUTO-O2
time gmake -j 10
time gmake -j 1 installmaster
diff --git a/src/job_make_mesonh_pc_ifpen b/src/job_make_mesonh_pc_ifpen
index 559c64dd8550e7fb40e6054635c7ae1cea02d90d..fd5e0cdda78e70eb89e1bc07bb80b4d2cda44e66 100755
--- a/src/job_make_mesonh_pc_ifpen
+++ b/src/job_make_mesonh_pc_ifpen
@@ -8,7 +8,7 @@
pwd
# Chargement du profil (qui contient le source vers l'env ifpen-mesonh)
-. ../conf/profile_mesonh-LXgfortran-R8I4-MNH-V5-6-1-MPIAUTO-O2
+. ../conf/profile_mesonh-LXgfortran-R8I4-MNH-V5-7-0-MPIAUTO-O2
time gmake -j 10
time gmake -j 1 installmaster
diff --git a/src/job_make_mesonh_user_BullX b/src/job_make_mesonh_user_BullX
index ecd10ec5de217c71184db91a04d400d765cf3aeb..83302771c4d166084b324e569af8d2d82a0ce69c 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-2-${VER_USER}-MPIINTEL-O3
+. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-7-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 97961346767835a7d59f67bbf814b2258c8c3adf..7ffdf8f74c26bf08ef0ae75c5c0f607743e60b91 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-O2
+. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-7-0-${VER_USER}-MPIAUTO-O2
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 256aeb224440d4ac3a4d58f5820d77069a120298..d4f48419ff4c5adc8b20d05f8f8af458b1af014b 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-2-${VER_USER}-MPIAUTO-O4
+. ../conf/profile_mesonh-SX8-R8I4-MNH-V5-7-0-${VER_USER}-MPIAUTO-O4
time gmake user
time gmake -j 1 installuser