From b10f12f3faa08f61520d44da3c2b9fc186e44582 Mon Sep 17 00:00:00 2001
From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr>
Date: Thu, 18 Mar 2021 09:12:41 +0100
Subject: [PATCH] Philippe 18/03/2021: use JPSVNAMELGTMAX parameter for scalar
variable names
---
src/MNH/modd_elec_descr.f90 | 13 +++++--------
src/MNH/modd_ice_c1r3_descr.f90 | 14 +++++---------
src/MNH/modd_lg.f90 | 14 ++++++--------
src/MNH/modd_param_lima_cold.f90 | 10 ++++++++--
src/MNH/modd_param_lima_warm.f90 | 12 +++++++++---
src/MNH/modd_rain_c2r2_descr.f90 | 12 ++++--------
6 files changed, 37 insertions(+), 38 deletions(-)
diff --git a/src/MNH/modd_elec_descr.f90 b/src/MNH/modd_elec_descr.f90
index 649d0dc14..82d346588 100644
--- a/src/MNH/modd_elec_descr.f90
+++ b/src/MNH/modd_elec_descr.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2002-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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 modd 2006/06/27 13:57:12
-!-----------------------------------------------------------------
! #######################
MODULE MODD_ELEC_DESCR
! #######################
@@ -42,6 +37,8 @@
!* 0. DECLARATIONS
! ------------
!
+USE MODD_PARAMETERS, ONLY: JPSVNAMELGTMAX
+
IMPLICIT NONE
!
! Namelist
@@ -161,7 +158,7 @@ INTEGER :: NNB_CG ! Nb of CG flashes
INTEGER :: NNB_CG_POS ! Nb of positive CG flashes
REAL :: XALT_CG ! Altitude (m) at which CG are detected
!
-CHARACTER(LEN=10), DIMENSION(8) &
+CHARACTER(LEN=JPSVNAMELGTMAX), DIMENSION(8) &
:: CELECNAMES=(/'QNIONP','QCELEC','QRELEC','QIELEC','QSELEC', &
'QGELEC','QHELEC','QNIONN'/)
! QNIONP (QNIONN): Positive (Negative) ion concentration
diff --git a/src/MNH/modd_ice_c1r3_descr.f90 b/src/MNH/modd_ice_c1r3_descr.f90
index 17af3a73f..2a3de68e1 100644
--- a/src/MNH/modd_ice_c1r3_descr.f90
+++ b/src/MNH/modd_ice_c1r3_descr.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2000-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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 modd 2006/05/18 13:07:25
-!-----------------------------------------------------------------
! ##########################
MODULE MODD_ICE_C1R3_DESCR
! ##########################
@@ -53,6 +48,7 @@
!! J.-P. Pinty 29/11/02 add C1R3NAMES
!!
!-------------------------------------------------------------------------------
+USE MODD_PARAMETERS, ONLY: JPSVNAMELGTMAX
!
!* 0. DECLARATIONS
! ------------
@@ -77,8 +73,8 @@ REAL,SAVE :: XLBEXG,XLBG ! Graupel distribution parameters
REAL,SAVE :: XLBDAS_MAX,XLBDAG_MAX ! Max values allowed for the shape
! parameters (snow,graupeln)
!
-CHARACTER(LEN=10),DIMENSION(2),PARAMETER &
- :: C1R3NAMES=(/'CICE ','CIN '/)
+CHARACTER(LEN=JPSVNAMELGTMAX),DIMENSION(2),PARAMETER &
+ :: C1R3NAMES=(/'CICE','CIN '/)
! basenames of the SV articles stored
! in the binary files
!
diff --git a/src/MNH/modd_lg.f90 b/src/MNH/modd_lg.f90
index a2a5d840a..80b567fac 100644
--- a/src/MNH/modd_lg.f90
+++ b/src/MNH/modd_lg.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2001-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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 modd 2006/05/18 13:07:25
-!-----------------------------------------------------------------
! ##############
MODULE MODD_LG
! ##############
@@ -31,11 +26,14 @@
!! -------------
!! Original 27/06/2001
!-------------------------------------------------------------------------------
+USE MODD_PARAMETERS, ONLY: JPSVNAMELGTMAX
+
+IMPLICIT NONE
!
!* 0. DECLARATIONS
! ------------
!
-CHARACTER(LEN=10),DIMENSION(3),PARAMETER :: CLGNAMES=(/'LGX','LGY','LGZ'/)
+CHARACTER(LEN=JPSVNAMELGTMAX),DIMENSION(3),PARAMETER :: CLGNAMES=(/'LGX','LGY','LGZ'/)
! basenames of the lagrangian articles stored
! in the binary files
REAL,PARAMETER :: XLG1MIN=-1.E+9, XLG2MIN=-1.E+9, XLG3MIN=0.
diff --git a/src/MNH/modd_param_lima_cold.f90 b/src/MNH/modd_param_lima_cold.f90
index 2df3032ba..64494219e 100644
--- a/src/MNH/modd_param_lima_cold.f90
+++ b/src/MNH/modd_param_lima_cold.f90
@@ -1,3 +1,8 @@
+!MNH_LIC Copyright 2013-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.
+!-----------------------------------------------------------------
! ###########################
MODULE MODD_PARAM_LIMA_COLD
! ###########################
@@ -16,6 +21,7 @@
!! Original ??/??/13
!!
!-------------------------------------------------------------------------------
+USE MODD_PARAMETERS, ONLY: JPSVNAMELGTMAX
!
IMPLICIT NONE
!
@@ -48,7 +54,7 @@ REAL,SAVE :: XAS,XBS,XCS,XDS,XCCS,XCXS,XF0S,XF1S,XC1S ! Snow/agg. charact.
REAL,SAVE :: XLBDAS_MAX ! Max values allowed for the shape
! parameter of snow
!
-CHARACTER(LEN=8),DIMENSION(5),PARAMETER &
+CHARACTER(LEN=JPSVNAMELGTMAX),DIMENSION(5),PARAMETER &
:: CLIMA_COLD_NAMES=(/'CICE ','CIFNFREE','CIFNNUCL', &
'CCNINIMM','CCCNNUCL'/)
! basenames of the SV articles stored
@@ -57,7 +63,7 @@ CHARACTER(LEN=8),DIMENSION(5),PARAMETER &
! IN:Ice-nuclei Nucleated (activated IFN by Dep/Cond)
! NI:Nuclei Immersed (activated IFN by Imm)
! HF:Homogeneous Freezing
-CHARACTER(LEN=3),DIMENSION(5),PARAMETER &
+CHARACTER(LEN=JPSVNAMELGTMAX),DIMENSION(5),PARAMETER &
:: CLIMA_COLD_CONC=(/'NI ','NIF','NIN','NNI','NNH'/)!for DIAG
!
!-------------------------------------------------------------------------------
diff --git a/src/MNH/modd_param_lima_warm.f90 b/src/MNH/modd_param_lima_warm.f90
index d0688aa72..4d20c9789 100644
--- a/src/MNH/modd_param_lima_warm.f90
+++ b/src/MNH/modd_param_lima_warm.f90
@@ -1,3 +1,8 @@
+!MNH_LIC Copyright 2013-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.
+!-----------------------------------------------------------------
! ###########################
MODULE MODD_PARAM_LIMA_WARM
! ###########################
@@ -16,6 +21,7 @@
!! Original ??/??/13
!!
!-------------------------------------------------------------------------------
+USE MODD_PARAMETERS, ONLY: JPSVNAMELGTMAX
!
IMPLICIT NONE
!
@@ -30,17 +36,17 @@ REAL,SAVE :: XAR,XBR,XCR,XDR,XF0R,XF1R, & ! Raindrop charact.
XAC,XBC,XCC,XDC,XF0C,XF2C,XC1C ! Cloud droplet charact.
!
!
-CHARACTER(LEN=8),DIMENSION(4),PARAMETER &
+CHARACTER(LEN=JPSVNAMELGTMAX),DIMENSION(4),PARAMETER &
:: CLIMA_WARM_NAMES=(/'CCLOUD ','CRAIN ','CCCNFREE','CCCNACTI'/)
! basenames of the SV articles stored
! in the binary files
-CHARACTER(LEN=5),DIMENSION(4),PARAMETER &
+CHARACTER(LEN=JPSVNAMELGTMAX),DIMENSION(4),PARAMETER &
:: CLIMA_WARM_CONC=(/'NC ','NR ','NFREE','NCCN '/)
! ! basenames of the SV articles stored
! ! in the binary files for DIAG
!
!* Special issue for Below-Cloud SCAVenging of Aerosol particles
-CHARACTER(LEN=6),DIMENSION(2) :: CAERO_MASS =(/'MASSAP', 'MAP '/)
+CHARACTER(LEN=JPSVNAMELGTMAX),DIMENSION(2) :: CAERO_MASS =(/'MASSAP', 'MAP '/)
!
!-------------------------------------------------------------------------------
!
diff --git a/src/MNH/modd_rain_c2r2_descr.f90 b/src/MNH/modd_rain_c2r2_descr.f90
index a7d71b551..82146aac4 100644
--- a/src/MNH/modd_rain_c2r2_descr.f90
+++ b/src/MNH/modd_rain_c2r2_descr.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2000-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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 modd 2006/05/18 13:07:25
-!-----------------------------------------------------------------
! ###########################
MODULE MODD_RAIN_C2R2_DESCR
! ###########################
@@ -50,6 +45,7 @@
!! J.-P. Pinty 29/11/02 add cloud doplet fall speed parameters
!!
!-------------------------------------------------------------------------------
+USE MODD_PARAMETERS, ONLY: JPSVNAMELGTMAX
!
!* 0. DECLARATIONS
! ------------
@@ -66,7 +62,7 @@ REAL,DIMENSION(:),SAVE,ALLOCATABLE :: XCTMIN
REAL,SAVE :: XLBC, XLBEXC, & ! shape parameters of the cloud droplets
XLBR, XLBEXR ! shape parameters of the raindrops
!
-CHARACTER(LEN=10),DIMENSION(4),PARAMETER &
+CHARACTER(LEN=JPSVNAMELGTMAX),DIMENSION(4),PARAMETER &
:: C2R2NAMES=(/'CCCN ','CCLOUD','CRAIN ','SUPSAT'/)
! basenames of the SV articles stored
! in the binary files
--
GitLab