Skip to content
Snippets Groups Projects
Commit ce993800 authored by WAUTELET Philippe's avatar WAUTELET Philippe
Browse files

Merge branch 'MNH-57-branch' into MNH-57X-dev-IO

parents f943a483 e34dc8c3
No related branches found
No related tags found
No related merge requests found
Showing
with 72 additions and 114 deletions
#
# 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
#
......@@ -1022,13 +1022,9 @@ git clone -b 2014.01 https://github.com/forefireAPI/firefront.git
# b) MNH_RTTOV for optional radiative computation
# --------------------------------------
#
# The RTTOV package was not included into the open source version of Meso-NH
# The RTTOV 13.2 package was not included into the open source version of Meso-NH
# because it needs a licence agrement.
#
# ----------------------------------
# OPTION 1: Use version 13.2 of RTTOV
# -----------------------------------
#
# Run the 'configure' script preceded with the setting of the MNH_RTTOV variable:
#
cd MNH.../src/
......@@ -1058,63 +1054,6 @@ make ARCH=ifort # Use Intel "ifort" compiler; other options: gfortran, NA
cd MNH.../src/
make
# ----------------------------------
# OPTION 2: Use version 11.3 of RTTOV
# -----------------------------------
# Download the RTTOV package rttov113.tar.gz by following the instructions given on https://nwpsaf.eu/site/software/rttov/
#
# Install the RTTOV package rttov113.tar.gz
cd MNH.../src/LIB
mkdir RTTOV-11.3
cd RTTOV-11.3
tar xvfz rttov113.tar.gz
cd src
make ARCH=ifort # Use Intel "ifort" compiler; other options: gfortran, NAG, pgf90, IBM
#
# And then for the compilation, run the 'configure' script preceded with the setting of the MNH_RTTOV variable:
#
cd MNH.../src/
export MNH_RTTOV=1
export VER_RTTOV=11.3
./configure
etc ...
# ----------------------------------
# OPTION 3: Use version 8.7 of RTTOV
# ----------------------------------
# For already(old) licencied MesoNH users (MNH-4-X version with research licence see here: http://mesonh.aero.obs-mip.fr/mesonh410/UserInformation)
#
# the package could be reloaded in this way
#
# - With cvs access
#
cd MNH.../src/LIB
cvs up -rPACK-MNH-V4-10-3 -d -P RTTOV
#
# - With WEB access (with WEB login/pass as usually) the RTTOV package could also be retrieve in tarball with wget like this:
#
cd MNH.../src/LIB
wget --http-user=USER --http-password=PASS 'http://mesonh.aero.obs-mip.fr/cgi-bin/mesonh_interne/viewcvs.cgi/MNH-VX-Y-Z/src/LIB/RTTOV/?view=tar&pathrev=PACK-MNH-V4-10-3' -O RTTOV.tar.gz
tar xvfz RTTOV.tar.gz
# /!\ don't forget the ''. Otherwise, this will not work!
#
# And then for the compilation, run the 'configure' script preceded with the setting of the MNH_RTTOV variable:
#
cd MNH.../src/
export MNH_RTTOV=1
export VER_RTTOV=8.7
./configure
etc ...
# c) MNH_ECRAD for optional compilation of new ECRAD radiative library from ECMWF
# --------------------------------------
#
......
......@@ -38,6 +38,7 @@
CTURBDIM = "3DIM",
LTURB_DIAG = F,
LTURB_FLX = F
LTURB_PRECIP = F/
/
&NAM_CH_MNHCn LUSECHEM = F /
......@@ -103,24 +104,28 @@
XIFN_CONC(1)=1000./ ! Concentration du mode 1 d'IFN (/L)
&NAM_BU_RU LBU_RU = T /
&NAM_BU_RU LBU_RU = F /
&NAM_BU_RW LBU_RW = T /
&NAM_BU_RW LBU_RW = F /
&NAM_BU_RTH LBU_RTH = T /
&NAM_BU_RRV LBU_RRV = T /
&NAM_BU_RRV LBU_RRV = F /
&NAM_BU_RRC LBU_RRC = T /
&NAM_BU_RRC LBU_RRC = F /
&NAM_BU_RRR LBU_RRR = T /
&NAM_BU_RRR LBU_RRR = T,
CBULIST_RRR(1) = "ALL"/
&NAM_BU_RRI LBU_RRI = T /
&NAM_BU_RRS LBU_RRS = T /
&NAM_BU_RRS LBU_RRS = T,
CBULIST_RRS(1) = "ALL"/
&NAM_BU_RRG LBU_RRG = T /
&NAM_BU_RRG LBU_RRG = T,
CBULIST_RRG(1) = "ALL"/
&NAM_BU_RSV LBU_RSV = T /
CBULIST_RSV(1) = "ALL"/
&NAM_NEBn LSUBG_COND = F /
&NAM_PARAM_ICEn CSUBG_AUCV_RC = 'NONE'/
......@@ -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
......
......@@ -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" ]
......
......@@ -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" ]
......
......@@ -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" ]
......
......@@ -176,9 +176,7 @@ export VARTTY=\`tty\`
#
[ ! -f \${SRC_MESONH}/conf/conf_\${ARCH} ] || . \${SRC_MESONH}/conf/conf_\${ARCH}
#
# Optional Environnement variable/Module Env
#
${MNHENV}
# Check 'CDFPERSO'
#
if [ \${VER_CDF} = 'CDFPERSO' ] ; then
if [ -z \$NETCDF_CONFIG ] ; then
......@@ -186,6 +184,9 @@ echo 'WARNING : You chose VER_CDF=CDFPERSO, please set NETCDF_CONFIG environment
fi
fi
#
#
# Check 'OASISPERSO'
#
if [ -n "${VER_OASIS}" ] ; then
if [ \${VER_OASIS} = 'OASISPERSO' ] ; then
if [ -z \$OASISDIR ] ; then
......@@ -193,3 +194,7 @@ echo 'WARNING : You chose VER_OASIS=OASISPERSO, please set OASISDIR environment
fi
fi
fi
#
# Optional Environnement variable/Module Env
#
${MNHENV}
......@@ -4,6 +4,7 @@ END MODULE MODD_BUDGET_COUPL_ROUT
! ######################
! ######################
MODULE MODD_COUPLING_TOPD
LOGICAL :: LPERT_PARAM
END MODULE MODD_COUPLING_TOPD
! ######################
! ######################
......
/*
*MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
*MNH_LIC Copyright 1994-2023 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.
......
!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
!MNH_LIC Copyright 1994-2023 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.
......
!MNH_LIC Copyright 1994-2022 CNRS, Meteo-France and Universite Paul Sabatier
!MNH_LIC Copyright 1994-2023 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
!##############################
!##############################
MODULE MODI_COUPLING_FOREFIRE_n
!##############################
......@@ -83,20 +82,20 @@ INTEGER :: JSV
PSFTQ(:, :) = PSFTQ(:, :) + FF_VAPORFLUX(:, :)
DO JSV = 1, NSV_FF
CALL MNH_GET_DOUBLEARRAY(sScalarVariables(JSV), FF_SVFLUXES(:, :, JSV), FF_MATRIXSIZE, 1)
CALL MNH_GET_DOUBLEARRAY(sScalarVariables(JSV), FF_SVFLUXES(:, :, JSV), FF_MATRIXSIZE, 1)
PSFSV(:, :, NSV_FFBEG-1+JSV) = PSFSV(:, :, NSV_FFBEG-1+JSV) + FF_SVFLUXES(:, :, JSV)
END DO
IF ( LFFCHEM ) THEN
DO JSV = 1, NFFCHEMVAR
CALL MNH_GET_DOUBLEARRAY(sChemicalVariables(JSV), FF_CVFLUXES(:, :, JSV), FF_MATRIXSIZE, 1)
CALL MNH_GET_DOUBLEARRAY(sChemicalVariables(JSV), FF_CVFLUXES(:, :, JSV), FF_MATRIXSIZE, 1)
PSFSV(:, :, FF_CHEMINDICES(JSV)) = PSFSV(:, :, FF_CHEMINDICES(JSV)) + FF_CVFLUXES(:, :, JSV)
END DO
ENDIF
END SUBROUTINE COUPLING_FOREFIRE_n
!##############################################
SUBROUTINE SEND_GROUND_WIND_n (U, V, KG, IINFO)
!##############################################
......@@ -139,7 +138,7 @@ TYPE(LIST_ll), POINTER :: FOREFIREFIELD_ll ! list of fields to exc
FFOUTERWINDV(2,JFF) = V(3,JFF,KG)
FFOUTERWINDV(FF_NX-1,JFF) = V(FF_NX-2,JFF,KG)
END DO
VAL1 = INT(U(2,3,KG)*FFMULT+0.5)
VAL2 = INT(U(3,3,KG)*FFMULT+0.5)
VAL3 = INT(U(3,2,KG)*FFMULT+0.5)
......@@ -177,8 +176,8 @@ TYPE(LIST_ll), POINTER :: FOREFIREFIELD_ll ! list of fields to exc
FFOUTERWINDV(FF_NX-1,FF_NY-1) = VAL1*FFMULT*FFMULT*100 + VAL2*FFMULT*10 + VAL3
NULLIFY(FOREFIREFIELD_ll)
CALL ADD2DFIELD_ll( FOREFIREFIELD_ll, FFOUTERWINDU, 'SEND_GROUND_WIND_n::FFOUTERWINDU' )
CALL ADD2DFIELD_ll( FOREFIREFIELD_ll, FFOUTERWINDV, 'SEND_GROUND_WIND_n::FFOUTERWINDV' )
CALL ADD2DFIELD_ll(FOREFIREFIELD_ll,FFOUTERWINDU,'FF2D::OUTERWINDU')
CALL ADD2DFIELD_ll(FOREFIREFIELD_ll,FFOUTERWINDV,'FF2D::OUTERWINDU')
CALL UPDATE_HALO_ll(FOREFIREFIELD_ll,IINFO)
CALL CLEANLIST_ll(FOREFIREFIELD_ll)
CALL MNH_PUT_DOUBLEARRAY(sOutWindU, FF_TIME, FFOUTERWINDU, FF_MATRIXSIZE, 1)
......@@ -186,7 +185,7 @@ TYPE(LIST_ll), POINTER :: FOREFIREFIELD_ll ! list of fields to exc
END SUBROUTINE SEND_GROUND_WIND_n
!#####################################
SUBROUTINE FOREFIRE_RECEIVE_PARAL_n ()
!#####################################
......@@ -209,7 +208,7 @@ IMPLICIT NONE
END SUBROUTINE FOREFIRE_RECEIVE_PARAL_n
!#######################################
SUBROUTINE FOREFIRE_SEND_PARAL_n (IINFO)
!#######################################
......@@ -239,18 +238,18 @@ TYPE(LIST_ll), POINTER :: FOREFIREFIELD_ll ! list of fields to exch
!* Calling the MNH parallel routines for the forefire-related variables
!
NULLIFY(FOREFIREFIELD_ll)
CALL ADD3DFIELD_ll(FOREFIREFIELD_ll, FFNODES_POSX, 'FOREFIRE_SEND_PARAL_n::FFNODES_POSX' )
CALL ADD3DFIELD_ll(FOREFIREFIELD_ll, FFNODES_POSY, 'FOREFIRE_SEND_PARAL_n::FFNODES_POSY' )
CALL ADD3DFIELD_ll(FOREFIREFIELD_ll, FFNODES_VELX, 'FOREFIRE_SEND_PARAL_n::FFNODES_VELX' )
CALL ADD3DFIELD_ll(FOREFIREFIELD_ll, FFNODES_VELY, 'FOREFIRE_SEND_PARAL_n::FFNODES_VELY' )
CALL ADD3DFIELD_ll(FOREFIREFIELD_ll, FFNODES_TIME, 'FOREFIRE_SEND_PARAL_n::FFNODES_TIME' )
CALL ADD3DFIELD_ll(FOREFIREFIELD_ll, FFNODES_ID, 'FOREFIRE_SEND_PARAL_n::FFNODES_ID' )
CALL ADD3DFIELD_ll(FOREFIREFIELD_ll, FFNODES_POSX,'FF3D::NODEPOSX')
CALL ADD3DFIELD_ll(FOREFIREFIELD_ll, FFNODES_POSY,'FF3D::NODEPOSY')
CALL ADD3DFIELD_ll(FOREFIREFIELD_ll, FFNODES_VELX,'FF3D::NODEVELX')
CALL ADD3DFIELD_ll(FOREFIREFIELD_ll, FFNODES_VELY,'FF3D::NODEVELY')
CALL ADD3DFIELD_ll(FOREFIREFIELD_ll, FFNODES_TIME,'FF3D::NODETIME')
CALL ADD3DFIELD_ll(FOREFIREFIELD_ll, FFNODES_ID,'FF3D::NODEID')
CALL UPDATE_HALO_ll(FOREFIREFIELD_ll, IINFO)
CALL CLEANLIST_ll(FOREFIREFIELD_ll)
END SUBROUTINE FOREFIRE_SEND_PARAL_n
!#####################################################
SUBROUTINE FOREFIRE_DUMP_FIELDS_n(U, V, W, MNHSV, TH &
, R, PABS, TKE, NX, NY, NZ)
......@@ -281,7 +280,7 @@ INTEGER :: JSV
FF3DOUT = 1
FFNUMOUT = FFNUMOUT + 1
END IF
IF ( FF3DOUTPUTSFLOW .AND. FF3DOUT.EQ.1 ) THEN
CALL MNH_DUMP_DOUBLEARRAY(FFNMODEL, PROCID, sU, FF_TIME, U, NX*NY*NZ, NX, NY, NZ, 1)
CALL MNH_DUMP_DOUBLEARRAY(FFNMODEL, PROCID, sV, FF_TIME, V, NX*NY*NZ, NX, NY, NZ, 1)
......@@ -291,14 +290,14 @@ INTEGER :: JSV
, FF_TIME, MNHSV(:, :, :, NSV_FFBEG-1+JSV), NX*NY*NZ, NX, NY, NZ, 1)
END DO
END IF
IF ( FF3DOUTPUTSPHYS .AND. FF3DOUT.EQ.1 ) THEN
CALL MNH_DUMP_DOUBLEARRAY(FFNMODEL, PROCID, sT, FF_TIME, TH, NX*NY*NZ, NX, NY, NZ, 1)
CALL MNH_DUMP_DOUBLEARRAY(FFNMODEL, PROCID, sMoist, FF_TIME, R, NX*NY*NZ, NX, NY, NZ, 1)
CALL MNH_DUMP_DOUBLEARRAY(FFNMODEL, PROCID, sP, FF_TIME, PABS, NX*NY*NZ, NX, NY, NZ, 1)
CALL MNH_DUMP_DOUBLEARRAY(FFNMODEL, PROCID, sTKE, FF_TIME, TKE, NX*NY*NZ, NX, NY, NZ, 1)
END IF
IF ( LFFCHEM .AND. FF3DOUTPUTSCHEM .AND. FF3DOUT.EQ.1 ) THEN
DO JSV = 1, NFFCHEMVAR
CALL MNH_DUMP_DOUBLEARRAY(FFNMODEL, PROCID, cast_char_to_c(CNAMES(FF_CHEMINDICES(JSV))) &
......@@ -309,7 +308,7 @@ INTEGER :: JSV
, FF_TIME, MNHSV(:, :, :, FF_CHEMINDOUT(JSV)), NX*NY*NZ, NX, NY, NZ, 1)
END DO
END IF
FF3DOUT = 0
END SUBROUTINE FOREFIRE_DUMP_FIELDS_n
!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
!MNH_LIC Copyright 1994-2023 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.
......@@ -34,6 +34,7 @@
!! -------
!! P. Tulet CNRM
!! X. Pialat SPE
!! J.B.Filippi (SPE)
USE MODD_FOREFIRE
USE MODD_FOREFIRE_n
......
!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
!MNH_LIC Copyright 1994-2023 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.
......@@ -12,6 +12,7 @@
!! ------
! : P. Tulet, LACy / CNRM
!! : X. Pialat, SPE
! J.B.Filippi (SPE)
! Creation : 15.02.2012
!
!-------------------------------------------------------------------------------
......
!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
!MNH_LIC Copyright 1994-2023 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.
......@@ -8,7 +8,7 @@
!! AUTHOR
!! ------
!! P. Tulet *Meteo France*
!!
!!! J.B.Filippi (SPE)
!! MODIFICATIONS
!! -------------
!! Original 07/08
......
!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
!MNH_LIC Copyright 1994-2023 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.
......@@ -11,7 +11,8 @@
!! AUTHOR
!! ------
! : P. Tulet (LACy / CNRM)
!! X. Pialat (SPE)
! X. Pialat (SPE)
! J.B.Filippi (SPE)
! Creation : 09.10.2010
!-------------------------------------------------------------------------------
!
......
No preview for this file type
File added
File added
File added
File added
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