diff --git a/src/MNH/ini_prog_var.f90 b/src/MNH/ini_prog_var.f90
index ecebea9fc28ff34e0c64fa34e1a089bcf0f3131c..4c3c53a6c72c2837a56a61fa797f004896224b07 100644
--- a/src/MNH/ini_prog_var.f90
+++ b/src/MNH/ini_prog_var.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2020 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-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.
@@ -95,6 +95,7 @@ END MODULE MODI_INI_PROG_VAR
!! Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
! P. Wautelet 07/02/2019: force TYPE to a known value for IO_File_add2list
! P. Wautelet 14/02/2019: remove CLUOUT/CLUOUT0 and associated variables
+! P. Wautelet 09/03/2021: simplify allocation of scalar variable names
!-------------------------------------------------------------------------------
!
!* 0. DECLARATIONS
@@ -321,11 +322,6 @@ IF(PRESENT(HCHEMFILE)) THEN
END DO ! JSV
!
IF (LDEPOS_AER(IMI)) THEN
- IF(.NOT.ALLOCATED(CDEAERNAMES)) THEN
- ALLOCATE(CDEAERNAMES(JPMODE*2))
- CDEAERNAMES(:) = YPDEAER_INI(:)
- ENDIF
- !
TZFIELD%CSTDNAME = ''
TZFIELD%CUNITS = 'ppp'
TZFIELD%CDIR = 'XY'
diff --git a/src/MNH/modd_ch_aerosol.f90 b/src/MNH/modd_ch_aerosol.f90
index 4eb7fed5cc8a2c7f1fbe9a6820d1206842dfa513..defa8f71ac910543930848a11f9c6d01494b0a62 100644
--- a/src/MNH/modd_ch_aerosol.f90
+++ b/src/MNH/modd_ch_aerosol.f90
@@ -1,4 +1,4 @@
-!ORILAM_LIC Copyright 2006-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!ORILAM_LIC Copyright 2006-2021 CNRS, Meteo-France and Universite Paul Sabatier
!ORILAM_LIC This is part of the ORILAM software governed by the CeCILL-C licence
!ORILAM_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!ORILAM_LIC for details.
@@ -30,12 +30,12 @@
!! -------------
!! (30-01-01) P.Tulet (LA) * modifications for secondary biogenics aerosols
!! (25-08-16) M.Leriche (LA) * NM6_AER is now in SAVE and assign in ini_nsv
-! P. Wautelet: 07/06/2019: allocate weights only when needed!!
-!
+! P. Wautelet 07/06/2019: allocate weights only when needed
+! P. Wautelet 09/03/2021: simplify allocation of scalar variable names
!!--------------------------------------------------------------------
!! DECLARATIONS
!! ------------
-USE MODD_PARAMETERS, ONLY: JPMODELMAX
+USE MODD_PARAMETERS, ONLY: JPMODELMAX, JPSVNAMELGTMAX
!
IMPLICIT NONE
!
@@ -46,15 +46,15 @@ LOGICAL :: LINITPM = .TRUE. ! switch to initialize BC
LOGICAL :: LAERINIT = .FALSE. ! switch to initialize aerosols
LOGICAL,DIMENSION(JPMODELMAX) :: LDEPOS_AER = .FALSE. ! switch to AER wet depositon
-
-CHARACTER(LEN=9),DIMENSION(:),ALLOCATABLE :: CDEAERNAMES
-CHARACTER(LEN=9),DIMENSION(4), PARAMETER :: YPDEAER_INI = &
- (/'DEAERM31C','DEAERM32C' &
- ,'DEAERM31R','DEAERM32R' /)
+
! and OC from CO concentration (real_case)
INTEGER, PARAMETER :: JPMODE=2 ! number of modes
INTEGER, PARAMETER :: JPIN=JPMODE*3 ! number of differential equations
INTEGER, SAVE, DIMENSION(JPMODE) :: NM0,NM3,NM6 ! index of the moments in arrays
+
+CHARACTER(LEN=JPSVNAMELGTMAX), DIMENSION(JPMODE*2), PARAMETER :: CDEAERNAMES = &
+ (/'DEAERM31C','DEAERM32C' &
+ ,'DEAERM31R','DEAERM32R' /)
!
!* indices of Aerosol chemical parameters
!
diff --git a/src/MNH/modd_parameters.f90 b/src/MNH/modd_parameters.f90
index 7f5d026d5091d8d4f616e40c39f9f2f32ae777d7..c21c6e70955e1e1ecbe501225f6d3f83dd66a1ec 100644
--- a/src/MNH/modd_parameters.f90
+++ b/src/MNH/modd_parameters.f90
@@ -62,6 +62,7 @@ INTEGER, PARAMETER :: JPCPLFILEMAX = 24 ! Maximum allowed number of CouPLing FIL
INTEGER, PARAMETER :: JPRIMMAX = 6 ! Maximum number of points for the
! horizontal relaxation for the outermost verticals
INTEGER, PARAMETER :: JPSVMAX = 200 ! Maximum number of scalar variables
+INTEGER, PARAMETER :: JPSVNAMELGTMAX = 10 ! Maximum length of a scalar variable name (do not set to less than 10)
!
!
REAL, PARAMETER :: XUNDEF = 999. ! default value for undefined or unused
diff --git a/src/MNH/read_exsegn.f90 b/src/MNH/read_exsegn.f90
index befd38e8c84c8d365e43ce2d4152ca357de387b7..cb7cd3f983de972ecfb1f36e14d828d1d6d1b0d5 100644
--- a/src/MNH/read_exsegn.f90
+++ b/src/MNH/read_exsegn.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2020 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-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.
@@ -295,6 +295,7 @@ END MODULE MODI_READ_EXSEG_n
! P. Wautelet 10/04/2019: replace ABORT and STOP calls by Print_msg
! C. Lac 11/2019: correction in the drag formula and application to building in addition to tree
! Q. Rodier 03/2020: add abort if use of any LHORELAX and cyclic conditions
+! P. Wautelet 09/03/2021: simplify allocation of scalar variable names
!!------------------------------------------------------------------------------
!
!* 0. DECLARATIONS
@@ -1866,13 +1867,6 @@ IF (LORILAM) THEN
CGETSVT(NSV_AERDEPBEG:NSV_AERDEPEND)='INIT'
END IF
END IF
-! Initialization of deposition scheme
- IF (LDEPOS_AER(KMI)) THEN
- IF(.NOT.ALLOCATED(CDEAERNAMES)) THEN
- ALLOCATE(CDEAERNAMES(JPMODE*2))
- CDEAERNAMES(:) = YPDEAER_INI(:)
- ENDIF
- ENDIF
END IF
!
! Lagrangian variables