diff --git a/src/MNH/read_field.f90 b/src/MNH/read_field.f90
index 554c2e6a7588a6774f5e0a529dcdd2eda2435099..cf8b156bf51075f447fce253232fe221c69639f8 100644
--- a/src/MNH/read_field.f90
+++ b/src/MNH/read_field.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.
@@ -241,8 +241,9 @@ END MODULE MODI_READ_FIELD
! P. Wautelet 13/02/2019: removed PPABSM and PTSTEP dummy arguments (bugfix: PPABSM was intent(OUT))
!! Bielli S. 02/2019 Sea salt : significant sea wave height influences salt emission; 5 salt modes
! P. Wautelet 14/03/2019: correct ZWS when variable not present in file
-!! M. Leriche 10/06/2019: in restart case read all immersion modes for LIMA
-!!-------------------------------------------------------------------------------
+! M. Leriche 10/06/2019: in restart case read all immersion modes for LIMA
+! P. Wautelet 11/03/2021: bugfix: correct name for NSV_LIMA_IMM_NUCL
+!-------------------------------------------------------------------------------
!
!* 0. DECLARATIONS
! ------------
@@ -384,7 +385,7 @@ REAL, DIMENSION(:,:,:,:), INTENT(INOUT) :: PRRS_CLD, PRSVS_CLD
!
!* 0.2 declarations of local variables
!
-INTEGER :: I, IID
+INTEGER :: IID
INTEGER :: ILUOUT ! Unit number for prints
INTEGER :: IRESP
INTEGER :: ISV ! total number of scalar variables
@@ -717,11 +718,8 @@ DO JSV = NSV_LIMA_BEG,NSV_LIMA_END
END IF
! N IMM nucl
IF (JSV .GE. NSV_LIMA_IMM_NUCL .AND. JSV .LT. NSV_LIMA_IMM_NUCL + NMOD_IMM) THEN
- DO I= 1, NMOD_IMM ! to be supressed
- WRITE(INDICE,'(I2.2)')(NINDICE_CCN_IMM(I)) ! to be supressed
-! WRITE(INDICE,'(I2.2)')(NINDICE_CCN_IMM(JSV - NSV_LIMA_BEG - NSV_LIMA_IMM_NUCL + 1))
- TZFIELD%CMNHNAME = TRIM(CLIMA_COLD_NAMES(4))//INDICE//'T'
- ENDDO
+ WRITE(INDICE,'(I2.2)')(NINDICE_CCN_IMM(JSV - NSV_LIMA_IMM_NUCL + 1))
+ TZFIELD%CMNHNAME = TRIM(CLIMA_COLD_NAMES(4))//INDICE//'T'
END IF
! Hom. freez. of CCN
IF (JSV .EQ. NSV_LIMA_HOM_HAZE) THEN
diff --git a/src/MNH/spawn_field2.f90 b/src/MNH/spawn_field2.f90
index e167cbfc6fb32f5a1c9703e9a76e62ee36760070..e5fc2c18b42527182dc7a5625af2b5edeb003ee1 100644
--- a/src/MNH/spawn_field2.f90
+++ b/src/MNH/spawn_field2.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1995-2020 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1995-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.
@@ -155,6 +155,7 @@ END MODULE MODI_SPAWN_FIELD2
!! Modification 05/03/2018 (J.Escobar) bypass gridnesting special case KD(X/Y)RATIO == 1 not parallelized
!! Bielli S. 02/2019 Sea salt : significant sea wave height influences salt emission; 5 salt modes
! P. Wautelet 14/03/2019: correct ZWS when variable not present in file
+! P. Wautelet 11/03/2021: bugfix: correct name for NSV_LIMA_IMM_NUCL
!-------------------------------------------------------------------------------
!
!* 0. DECLARATIONS
@@ -277,7 +278,6 @@ LOGICAL :: GUSERV
!
CHARACTER(LEN=15) :: YVAL
CHARACTER(LEN=2) :: INDICE
-INTEGER :: I
TYPE(TFIELDDATA) :: TZFIELD
!
!-------------------------------------------------------------------------------
@@ -926,10 +926,8 @@ IF (PRESENT(TPSONFILE)) THEN
TZFIELD%CMNHNAME = TRIM(CLIMA_COLD_NAMES(3))//INDICE//'T'
END IF
! N IMM nucl
- I = 0
IF (JSV .GE. NSV_LIMA_IMM_NUCL .AND. JSV .LT. NSV_LIMA_IMM_NUCL + NMOD_IMM) THEN
- I = I + 1
- WRITE(INDICE,'(I2.2)')(NINDICE_CCN_IMM(I))
+ WRITE(INDICE,'(I2.2)')(NINDICE_CCN_IMM(JSV - NSV_LIMA_IMM_NUCL + 1))
TZFIELD%CMNHNAME = TRIM(CLIMA_COLD_NAMES(4))//INDICE//'T'
END IF
! Hom. freez. of CCN
diff --git a/src/MNH/write_aircraft_balloon.f90 b/src/MNH/write_aircraft_balloon.f90
index ba125f83c2d990624d67e1e2034a3753a25ee371..2ff4254e6919fef020bc6b40a468b17011e74538 100644
--- a/src/MNH/write_aircraft_balloon.f90
+++ b/src/MNH/write_aircraft_balloon.f90
@@ -70,6 +70,7 @@ END MODULE MODI_WRITE_AIRCRAFT_BALLOON
! P. Wautelet 09/10/2020: Write_diachro: use new datatype tpfields
! P. Wautelet 03/03/2021: budgets: add tbudiachrometadata type (useful to pass more information to Write_diachro)
! P. Wautelet 11/03/2021: budgets: remove ptrajx/y/z optional dummy arguments of Write_diachro
+! P. Wautelet 11/03/2021: bugfix: correct name for NSV_LIMA_IMM_NUCL
! --------------------------------------------------------------------------
!
!* 0. DECLARATIONS
@@ -210,7 +211,6 @@ INTEGER :: JSV ! loop counter
INTEGER :: JPT ! loop counter
INTEGER :: IKU, IK
CHARACTER(LEN=2) :: INDICE
-INTEGER :: I
INTEGER :: JLOOP
type(tbudiachrometadata) :: tzbudiachro
type(tfield_metadata_base), dimension(:), allocatable :: tzfields
@@ -456,10 +456,8 @@ IF (SIZE(TPFLYER%SV,2)>=1) THEN
WRITE(INDICE,'(I2.2)')(JSV - NSV_LIMA_IFN_NUCL + 1)
YTITLE(JPROC)=TRIM(CLIMA_COLD_NAMES(3))//INDICE//'T'
ENDIF
- I = 0
IF (JSV .GE. NSV_LIMA_IMM_NUCL .AND. JSV .LT. NSV_LIMA_IMM_NUCL + NMOD_IMM) THEN
- I = I + 1
- WRITE(INDICE,'(I2.2)')(NINDICE_CCN_IMM(I))
+ WRITE(INDICE,'(I2.2)')(NINDICE_CCN_IMM(JSV - NSV_LIMA_IMM_NUCL + 1))
YTITLE(JPROC)=TRIM(CLIMA_COLD_NAMES(4))//INDICE//'T'
ENDIF
IF (JSV .EQ. NSV_LIMA_HOM_HAZE) YTITLE(JPROC)=TRIM(CLIMA_COLD_NAMES(5))//'T'
diff --git a/src/MNH/write_lfifm1_for_diag.f90 b/src/MNH/write_lfifm1_for_diag.f90
index 98cffb85614a0487cfcca980ac275446ed7660e2..4448d579bf7d4e31da5e0cedbb4c5eb226440a45 100644
--- a/src/MNH/write_lfifm1_for_diag.f90
+++ b/src/MNH/write_lfifm1_for_diag.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.
@@ -145,6 +145,7 @@ END MODULE MODI_WRITE_LFIFM1_FOR_DIAG
! P. Wautelet 08/02/2019: minor bug: compute ZWORK36 only when needed
! S Bielli 02/2019: sea salt: significant sea wave height influences salt emission; 5 salt modes
! P. Wautelet 18/03/2020: remove ICE2 option
+! P. Wautelet 11/03/2021: bugfix: correct name for NSV_LIMA_IMM_NUCL
!-------------------------------------------------------------------------------
!
!* 0. DECLARATIONS
@@ -339,7 +340,7 @@ INTEGER :: ILUOUT0 ! Logical unit number for output-listing
!
CHARACTER(LEN=2) :: INDICE
CHARACTER(LEN=100) :: YMSG
-INTEGER :: I,IID
+INTEGER :: IID
TYPE(TFIELDDATA) :: TZFIELD
TYPE(TFIELDDATA),DIMENSION(2) :: TZFIELD2
!
@@ -1153,11 +1154,8 @@ IF (LLIMA_DIAG) THEN
END IF
! N IMM nucl
IF (JSV .GE. NSV_LIMA_IMM_NUCL .AND. JSV .LT. NSV_LIMA_IMM_NUCL + NMOD_IMM) THEN
- DO I = 1, NMOD_IMM ! to be supressed
-! WRITE(INDICE,'(I2.2)')(NINDICE_CCN_IMM(JSV - NSV_LIMA_BEG - NSV_LIMA_IMM_NUCL + 1))
- WRITE(INDICE,'(I2.2)')(NINDICE_CCN_IMM(I)) ! to be supressed
- TZFIELD%CMNHNAME = TRIM(CLIMA_COLD_CONC(4))//INDICE//'T'
- ENDDO
+ WRITE(INDICE,'(I2.2)')(NINDICE_CCN_IMM(JSV - NSV_LIMA_IMM_NUCL + 1))
+ TZFIELD%CMNHNAME = TRIM(CLIMA_COLD_CONC(4))//INDICE//'T'
END IF
! Hom. freez. of CCN
IF (JSV .EQ. NSV_LIMA_HOM_HAZE) THEN
diff --git a/src/MNH/write_lfin.f90 b/src/MNH/write_lfin.f90
index c84b0606a584d31237b15429d8fa8741e8feebf3..11e3dc1298e5368a6836277ff1586b754886a24a 100644
--- a/src/MNH/write_lfin.f90
+++ b/src/MNH/write_lfin.f90
@@ -174,6 +174,7 @@ END MODULE MODI_WRITE_LFIFM_n
! P. Wautelet 10/04/2019: replace ABORT and STOP calls by Print_msg
! P. Tulet 02/2020: correction for dust and sea salts
! P. Wautelet 10/03/2021: use scalar variable names for dust and salt
+! P. Wautelet 11/03/2021: bugfix: correct name for NSV_LIMA_IMM_NUCL
!-------------------------------------------------------------------------------
!
!* 0. DECLARATIONS
@@ -317,7 +318,7 @@ INTEGER :: JI,JJ,JK ! loop index
INTEGER :: IIU,IJU,IKU,IIB,IJB,IKB,IIE,IJE,IKE ! Arrays bounds
!
CHARACTER(LEN=2) :: INDICE
-INTEGER :: I, IID
+INTEGER :: IID
TYPE(TFIELDDATA) :: TZFIELD
!-------------------------------------------------------------------------------
!
@@ -762,12 +763,8 @@ IF (NSV >=1) THEN
END IF
! N IMM nucl
IF (JSV .GE. NSV_LIMA_IMM_NUCL .AND. JSV .LT. NSV_LIMA_IMM_NUCL + NMOD_IMM) THEN
- DO I = 1, NMOD_IMM ! to be supressed
-! ML start to 1 to get the CCN mode indice acting as IN by immersion
-! WRITE(INDICE,'(I2.2)')(NINDICE_CCN_IMM(JSV - NSV_LIMA_BEG - NSV_LIMA_IMM_NUCL + 1))
- WRITE(INDICE,'(I2.2)')(NINDICE_CCN_IMM(I)) ! to be supresses
+ WRITE(INDICE,'(I2.2)')(NINDICE_CCN_IMM(JSV - NSV_LIMA_IMM_NUCL + 1))
TZFIELD%CMNHNAME = TRIM(CLIMA_COLD_NAMES(4))//INDICE//'T'
- ENDDO
END IF
! Hom. freez. of CCN
IF (JSV .EQ. NSV_LIMA_HOM_HAZE) THEN
diff --git a/src/MNH/write_profilern.f90 b/src/MNH/write_profilern.f90
index 90f3dae767607fea7eab0b8bbaba62f0f8eaaa1e..eba14d51eefe087361d40342f1074f1888ef3ff0 100644
--- a/src/MNH/write_profilern.f90
+++ b/src/MNH/write_profilern.f90
@@ -63,6 +63,7 @@ END MODULE MODI_WRITE_PROFILER_n
! P. Wautelet 13/09/2019: budget: simplify and modernize date/time management
! P. Wautelet 09/10/2020: Write_diachro: use new datatype tpfields
! P. Wautelet 03/03/2021: budgets: add tbudiachrometadata type (useful to pass more information to Write_diachro)
+! P. Wautelet 11/03/2021: bugfix: correct name for NSV_LIMA_IMM_NUCL
! --------------------------------------------------------------------------
!
!* 0. DECLARATIONS
@@ -152,7 +153,6 @@ INTEGER :: JRR ! loop counter
INTEGER :: JSV ! loop counter
INTEGER :: IKU, IK ! loop counter
CHARACTER(LEN=2) :: INDICE
-INTEGER :: I
type(tbudiachrometadata) :: tzbudiachro
type(tfield_metadata_base), dimension(:), allocatable :: tzfields
!
@@ -487,11 +487,9 @@ IF (SIZE(TPROFILER%SV,4)>=1) THEN
WRITE(INDICE,'(I2.2)')(JSV - NSV_LIMA_IFN_NUCL + 1)
YTITLE(JPROC)=TRIM(CLIMA_COLD_NAMES(3))//INDICE//'T'
ENDIF
- I = 0
IF (JSV .GE. NSV_LIMA_IMM_NUCL .AND. JSV .LT. NSV_LIMA_IMM_NUCL + NMOD_IMM) THEN
- I = I + 1
- WRITE(INDICE,'(I2.2)')(NINDICE_CCN_IMM(I))
- YTITLE(JPROC)=TRIM(CLIMA_COLD_NAMES(4))//INDICE//'T'
+ WRITE(INDICE,'(I2.2)')(NINDICE_CCN_IMM(JSV - NSV_LIMA_IMM_NUCL + 1))
+ YTITLE(JPROC)=TRIM(CLIMA_COLD_NAMES(4))//INDICE//'T'
ENDIF
IF (JSV .EQ. NSV_LIMA_HOM_HAZE) YTITLE(JPROC)=TRIM(CLIMA_COLD_NAMES(5))//'T'