From 53c7b2fe6e2f7ddf4dbbeb4fb002e8149b1eb163 Mon Sep 17 00:00:00 2001
From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr>
Date: Fri, 4 Feb 2022 15:04:02 +0100
Subject: [PATCH] Philippe 04/02/2022: remove CSVNAMES(_A) variables (not used
anymore, replaced by TSVLIST)
---
src/MNH/ini_budget.f90 | 15 ++++++------
src/MNH/ini_nsv.f90 | 49 +---------------------------------------
src/MNH/modd_nsv.f90 | 3 ---
src/MNH/update_nsv.f90 | 16 -------------
src/MNH/write_budget.f90 | 3 +--
5 files changed, 9 insertions(+), 77 deletions(-)
diff --git a/src/MNH/ini_budget.f90 b/src/MNH/ini_budget.f90
index cff4e82db..5f3d85d34 100644
--- a/src/MNH/ini_budget.f90
+++ b/src/MNH/ini_budget.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1995-2021 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1995-2022 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.
@@ -26,7 +26,7 @@ use modd_budget, only: nbudgets, tbudgets,
NBUDGET_U, NBUDGET_V, NBUDGET_W, NBUDGET_TH, NBUDGET_TKE, &
NBUDGET_RV, NBUDGET_RC, NBUDGET_RR, NBUDGET_RI, NBUDGET_RS, &
NBUDGET_RG, NBUDGET_RH, NBUDGET_SV1
-use modd_nsv, only: csvnames, nsv
+use modd_nsv, only: nsv, tsvlist
integer :: ibudget
integer :: jsv
@@ -91,8 +91,8 @@ tbudgets(NBUDGET_RH)%nid = NBUDGET_RH
do jsv = 1, nsv
ibudget = NBUDGET_SV1 - 1 + jsv
- tbudgets(ibudget)%cname = Trim( csvnames(jsv) )
- tbudgets(ibudget)%ccomment = 'Budget for scalar variable ' // Trim( csvnames(jsv) )
+ tbudgets(ibudget)%cname = Trim( tsvlist(jsv)%cmnhname )
+ tbudgets(ibudget)%ccomment = 'Budget for scalar variable ' // Trim( tsvlist(jsv)%cmnhname )
tbudgets(ibudget)%nid = ibudget
end do
@@ -226,8 +226,7 @@ use modd_dyn, only: lcorio, xseglen
use modd_dyn_n, only: xtstep, locean
use modd_elec_descr, only: linductive, lrelax2fw_ion
use modd_field, only: TYPEREAL
-use modd_nsv, only: csvnames, &
- nsv_aerbeg, nsv_aerend, nsv_aerdepbeg, nsv_aerdepend, nsv_c2r2beg, nsv_c2r2end, &
+use modd_nsv, only: nsv_aerbeg, nsv_aerend, nsv_aerdepbeg, nsv_aerdepend, nsv_c2r2beg, nsv_c2r2end, &
nsv_chembeg, nsv_chemend, nsv_chicbeg, nsv_chicend, nsv_csbeg, nsv_csend, &
nsv_dstbeg, nsv_dstend, nsv_dstdepbeg, nsv_dstdepend, nsv_elecbeg, nsv_elecend, &
#ifdef MNH_FOREFIRE
@@ -239,7 +238,7 @@ use modd_nsv, only: csvnames,
nsv_lima_nc, nsv_lima_nr, nsv_lima_ni, nsv_lima_scavmass, nsv_lima_spro, &
nsv_lnoxbeg, nsv_lnoxend, nsv_ppbeg, nsv_ppend, &
nsv_sltbeg, nsv_sltend, nsv_sltdepbeg, nsv_sltdepend, nsv_snwbeg, nsv_snwend, &
- nsv_user
+ nsv_user, tsvlist
use modd_parameters, only: jphext
use modd_param_c2r2, only: ldepoc_c2r2 => ldepoc, lrain_c2r2 => lrain, lsedc_c2r2 => lsedc, lsupsat_c2r2 => lsupsat
use modd_param_ice, only: ladj_after, ladj_before, ldeposc_ice => ldeposc, lred, lsedic_ice => lsedic, lwarm_ice => lwarm
@@ -2887,7 +2886,7 @@ SV_BUDGETS: do jsv = 1, ksv
tbudgets(ibudget)%tsources(:)%ngroup = 0
- tzsource%ccomment = 'Budget of scalar variable ' // csvnames(jsv)
+ tzsource%ccomment = 'Budget of scalar variable ' // tsvlist(jsv)%cmnhname
tzsource%ngrid = 1
tzsource%cunits = '1'
diff --git a/src/MNH/ini_nsv.f90 b/src/MNH/ini_nsv.f90
index b117f3edb..299e9f9bd 100644
--- a/src/MNH/ini_nsv.f90
+++ b/src/MNH/ini_nsv.f90
@@ -67,7 +67,6 @@ END MODULE MODI_INI_NSV
!! Modification 07/2017 (V. Vionnet) Add blowing snow condition
! P. Wautelet 09/03/2021: move some chemistry initializations to ini_nsv
! P. Wautelet 10/03/2021: move scalar variable name initializations to ini_nsv
-! P. Wautelet 10/03/2021: add CSVNAMES and CSVNAMES_A to store the name of all the scalar variables
! P. Wautelet 30/03/2021: move NINDICE_CCN_IMM and NIMM initializations from init_aerosol_properties to ini_nsv
! B. Vie 06/2021: add prognostic supersaturation for LIMA
! P. Wautelet 26/11/2021: initialize TSVLIST_A
@@ -795,10 +794,9 @@ IF ( LBLOWSNOW ) THEN
END IF
END IF
-!Fill CSVNAMES_A for model KMI
+!Fill metadata for model KMI
DO JSV = 1, NSV_USER_A(KMI)
WRITE( YNUM3, '( I3.3 )' ) JSV
- CSVNAMES_A(JSV,KMI) = 'SVUSER'//YNUM3
TSVLIST_A(JSV, KMI) = TFIELDMETADATA( &
CMNHNAME = 'SVUSER' // YNUM3, &
@@ -814,8 +812,6 @@ DO JSV = 1, NSV_USER_A(KMI)
END DO
DO JSV = NSV_C2R2BEG_A(KMI), NSV_C2R2END_A(KMI)
- CSVNAMES_A(JSV,KMI) = TRIM( C2R2NAMES(JSV-NSV_C2R2BEG_A(KMI)+1) )
-
WRITE( YNUM3, '( I3.3 )' ) JSV
TSVLIST_A(JSV, KMI) = TFIELDMETADATA( &
@@ -832,8 +828,6 @@ DO JSV = NSV_C2R2BEG_A(KMI), NSV_C2R2END_A(KMI)
END DO
DO JSV = NSV_C1R3BEG_A(KMI), NSV_C1R3END_A(KMI)
- CSVNAMES_A(JSV,KMI) = TRIM( C1R3NAMES(JSV-NSV_C1R3BEG_A(KMI)+1) )
-
WRITE( YNUM3, '( I3.3 )' ) JSV
TSVLIST_A(JSV, KMI) = TFIELDMETADATA( &
@@ -865,43 +859,32 @@ DO JSV = NSV_LIMA_BEG_A(KMI), NSV_LIMA_END_A(KMI)
LTIMEDEP = .TRUE. )
IF ( JSV == NSV_LIMA_NC_A(KMI) ) THEN
- CSVNAMES_A(JSV,KMI) = TRIM( CLIMA_WARM_NAMES(1) )
TSVLIST_A(JSV, KMI)%CMNHNAME = TRIM( CLIMA_WARM_NAMES(1) )
ELSE IF ( JSV == NSV_LIMA_NR_A(KMI) ) THEN
- CSVNAMES_A(JSV,KMI) = TRIM( CLIMA_WARM_NAMES(2) )
TSVLIST_A(JSV, KMI)%CMNHNAME = TRIM( CLIMA_WARM_NAMES(2) )
ELSE IF ( JSV >= NSV_LIMA_CCN_FREE_A(KMI) .AND. JSV < NSV_LIMA_CCN_ACTI_A(KMI) ) THEN
WRITE( YNUM2, '( I2.2 )' ) JSV - NSV_LIMA_CCN_FREE_A(KMI) + 1
- CSVNAMES_A(JSV,KMI) = TRIM( CLIMA_WARM_NAMES(3) ) // YNUM2
TSVLIST_A(JSV, KMI)%CMNHNAME = TRIM( CLIMA_WARM_NAMES(3) ) // YNUM2
ELSE IF (JSV >= NSV_LIMA_CCN_ACTI_A(KMI) .AND. JSV < ( NSV_LIMA_CCN_ACTI_A(KMI) + NMOD_CCN ) ) THEN
WRITE( YNUM2, '( I2.2 )' ) JSV - NSV_LIMA_CCN_ACTI_A(KMI) + 1
- CSVNAMES_A(JSV,KMI) = TRIM( CLIMA_WARM_NAMES(4) ) // YNUM2
TSVLIST_A(JSV, KMI)%CMNHNAME = TRIM( CLIMA_WARM_NAMES(4) ) // YNUM2
ELSE IF ( JSV == NSV_LIMA_SCAVMASS_A(KMI) ) THEN
- CSVNAMES_A(JSV,KMI) = TRIM( CAERO_MASS(1) )
TSVLIST_A(JSV, KMI)%CMNHNAME = TRIM( CAERO_MASS(1) )
TSVLIST_A(JSV, KMI)%CUNITS = 'kg kg-1'
ELSE IF ( JSV == NSV_LIMA_NI_A(KMI) ) THEN
- CSVNAMES_A(JSV,KMI) = TRIM( CLIMA_COLD_NAMES(1) )
TSVLIST_A(JSV, KMI)%CMNHNAME = TRIM( CLIMA_COLD_NAMES(1) )
ELSE IF ( JSV >= NSV_LIMA_IFN_FREE_A(KMI) .AND. JSV < NSV_LIMA_IFN_NUCL_A(KMI) ) THEN
WRITE( YNUM2, '( I2.2 )' ) JSV - NSV_LIMA_IFN_FREE_A(KMI) + 1
- CSVNAMES_A(JSV,KMI) = TRIM( CLIMA_COLD_NAMES(2) ) // YNUM2
TSVLIST_A(JSV, KMI)%CMNHNAME = TRIM( CLIMA_COLD_NAMES(2) ) // YNUM2
ELSE IF ( JSV >= NSV_LIMA_IFN_NUCL_A(KMI) .AND. JSV < ( NSV_LIMA_IFN_NUCL_A(KMI) + NMOD_IFN ) ) THEN
WRITE( YNUM2, '( I2.2 )' ) JSV - NSV_LIMA_IFN_NUCL_A(KMI) + 1
- CSVNAMES_A(JSV,KMI) = TRIM( CLIMA_COLD_NAMES(3) ) // YNUM2
TSVLIST_A(JSV, KMI)%CMNHNAME = TRIM( CLIMA_COLD_NAMES(3) ) // YNUM2
ELSE IF ( JSV >= NSV_LIMA_IMM_NUCL_A(KMI) .AND. JSV < ( NSV_LIMA_IMM_NUCL_A(KMI) + NMOD_IMM ) ) THEN
WRITE( YNUM2, '( I2.2 )' ) NINDICE_CCN_IMM(JSV-NSV_LIMA_IMM_NUCL_A(KMI)+1)
- CSVNAMES_A(JSV,KMI) = TRIM( CLIMA_COLD_NAMES(4) ) // YNUM2
TSVLIST_A(JSV, KMI)%CMNHNAME = TRIM( CLIMA_COLD_NAMES(4) ) // YNUM2
ELSE IF ( JSV == NSV_LIMA_HOM_HAZE_A(KMI) ) THEN
- CSVNAMES_A(JSV,KMI) = TRIM( CLIMA_COLD_NAMES(5) )
TSVLIST_A(JSV, KMI)%CMNHNAME = TRIM( CLIMA_COLD_NAMES(5) )
ELSE IF ( JSV == NSV_LIMA_SPRO_A(KMI) ) THEN
- CSVNAMES_A(JSV,KMI) = TRIM( CLIMA_WARM_NAMES(5) )
TSVLIST_A(JSV, KMI)%CUNITS = '1'
TSVLIST_A(JSV, KMI)%CMNHNAME = TRIM( CLIMA_WARM_NAMES(5) )
ELSE
@@ -912,8 +895,6 @@ DO JSV = NSV_LIMA_BEG_A(KMI), NSV_LIMA_END_A(KMI)
END DO
DO JSV = NSV_ELECBEG_A(KMI), NSV_ELECEND_A(KMI)
- CSVNAMES_A(JSV,KMI) = TRIM( CELECNAMES(JSV-NSV_ELECBEG_A(KMI)+1) )
-
IF ( JSV > NSV_ELECBEG .AND. JSV < NSV_ELECEND ) THEN
YUNITS = 'C kg-1'
WRITE( YCOMMENT, '( A6, A3, I3.3 )' ) 'X_Y_Z_', 'SVT', JSV
@@ -936,8 +917,6 @@ DO JSV = NSV_ELECBEG_A(KMI), NSV_ELECEND_A(KMI)
END DO
DO JSV = NSV_LGBEG_A(KMI), NSV_LGEND_A(KMI)
- CSVNAMES_A(JSV,KMI) = TRIM( CLGNAMES(JSV-NSV_LGBEG_A(KMI)+1) )
-
WRITE( YNUM3, '( I3.3 )' ) JSV
TSVLIST_A(JSV, KMI) = TFIELDMETADATA( &
@@ -956,8 +935,6 @@ END DO
DO JSV = NSV_PPBEG_A(KMI), NSV_PPEND_A(KMI)
WRITE( YNUM3, '( I3.3 )' ) JSV-NSV_PPBEG_A(KMI)+1
- CSVNAMES_A(JSV,KMI) = 'SVPP'//YNUM3
-
TSVLIST_A(JSV, KMI) = TFIELDMETADATA( &
CMNHNAME = 'SVPP' // YNUM3, &
CSTDNAME = '', &
@@ -975,8 +952,6 @@ END DO
DO JSV = NSV_FFBEG_A(KMI), NSV_FFEND_A(KMI)
WRITE( YNUM3, '( I3.3 )' ) JSV-NSV_FFBEG_A(KMI)+1
- CSVNAMES_A(JSV,KMI) = 'SVFF'//YNUM3
-
TSVLIST_A(JSV, KMI) = TFIELDMETADATA( &
CMNHNAME = 'SVFF' // YNUM3, &
CSTDNAME = '', &
@@ -994,8 +969,6 @@ END DO
DO JSV = NSV_CSBEG_A(KMI), NSV_CSEND_A(KMI)
WRITE( YNUM3, '( I3.3 )' ) JSV-NSV_CSBEG_A(KMI)
- CSVNAMES_A(JSV,KMI) = 'SVCS'//YNUM3
-
TSVLIST_A(JSV, KMI) = TFIELDMETADATA( &
CMNHNAME = 'SVCS' // YNUM3, &
CSTDNAME = '', &
@@ -1010,8 +983,6 @@ DO JSV = NSV_CSBEG_A(KMI), NSV_CSEND_A(KMI)
END DO
DO JSV = NSV_CHEMBEG_A(KMI), NSV_CHEMEND_A(KMI)
- CSVNAMES_A(JSV,KMI) = TRIM( CNAMES(JSV-NSV_CHEMBEG_A(KMI)+1) )
-
ICHIDX = ICHIDX + 1
CSV_CHEM_LIST_A(ICHIDX, KMI) = TRIM( CNAMES(JSV-NSV_CHEMBEG_A(KMI)+1) )
@@ -1031,8 +1002,6 @@ DO JSV = NSV_CHEMBEG_A(KMI), NSV_CHEMEND_A(KMI)
END DO
DO JSV = NSV_CHICBEG_A(KMI), NSV_CHICEND_A(KMI)
- CSVNAMES_A(JSV,KMI) = TRIM( CICNAMES(JSV-NSV_CHICBEG_A(KMI)+1) )
-
ICHIDX = ICHIDX + 1
CSV_CHEM_LIST_A(ICHIDX, KMI) = TRIM( CICNAMES(JSV-NSV_CHICBEG_A(KMI)+1) )
@@ -1052,8 +1021,6 @@ DO JSV = NSV_CHICBEG_A(KMI), NSV_CHICEND_A(KMI)
END DO
DO JSV = NSV_AERBEG_A(KMI), NSV_AEREND_A(KMI)
- CSVNAMES_A(JSV,KMI) = TRIM( CAERONAMES(JSV-NSV_AERBEG_A(KMI)+1) )
-
ICHIDX = ICHIDX + 1
CSV_CHEM_LIST_A(ICHIDX, KMI) = TRIM( CAERONAMES(JSV-NSV_AERBEG_A(KMI)+1) )
@@ -1073,8 +1040,6 @@ DO JSV = NSV_AERBEG_A(KMI), NSV_AEREND_A(KMI)
END DO
DO JSV = NSV_AERDEPBEG_A(KMI), NSV_AERDEPEND_A(KMI)
- CSVNAMES_A(JSV,KMI) = TRIM( CDEAERNAMES(JSV-NSV_AERDEPBEG_A(KMI)+1) )
-
ICHIDX = ICHIDX + 1
CSV_CHEM_LIST_A(ICHIDX, KMI) = TRIM( CDEAERNAMES(JSV-NSV_AERDEPBEG_A(KMI)+1) )
@@ -1094,8 +1059,6 @@ DO JSV = NSV_AERDEPBEG_A(KMI), NSV_AERDEPEND_A(KMI)
END DO
DO JSV = NSV_DSTBEG_A(KMI), NSV_DSTEND_A(KMI)
- CSVNAMES_A(JSV,KMI) = TRIM( CDUSTNAMES(JSV-NSV_DSTBEG_A(KMI)+1) )
-
ICHIDX = ICHIDX + 1
CSV_CHEM_LIST_A(ICHIDX, KMI) = TRIM( CDUSTNAMES(JSV-NSV_DSTBEG_A(KMI)+1) )
@@ -1115,8 +1078,6 @@ DO JSV = NSV_DSTBEG_A(KMI), NSV_DSTEND_A(KMI)
END DO
DO JSV = NSV_DSTDEPBEG_A(KMI), NSV_DSTDEPEND_A(KMI)
- CSVNAMES_A(JSV,KMI) = TRIM( CDEDSTNAMES(JSV-NSV_DSTDEPBEG_A(KMI)+1) )
-
ICHIDX = ICHIDX + 1
CSV_CHEM_LIST_A(ICHIDX, KMI) = TRIM( CDEDSTNAMES(JSV-NSV_DSTDEPBEG_A(KMI)+1) )
@@ -1136,8 +1097,6 @@ DO JSV = NSV_DSTDEPBEG_A(KMI), NSV_DSTDEPEND_A(KMI)
END DO
DO JSV = NSV_SLTBEG_A(KMI), NSV_SLTEND_A(KMI)
- CSVNAMES_A(JSV,KMI) = TRIM( CSALTNAMES(JSV-NSV_SLTBEG_A(KMI)+1) )
-
ICHIDX = ICHIDX + 1
CSV_CHEM_LIST_A(ICHIDX, KMI) = TRIM( CSALTNAMES(JSV-NSV_SLTBEG_A(KMI)+1) )
@@ -1157,8 +1116,6 @@ DO JSV = NSV_SLTBEG_A(KMI), NSV_SLTEND_A(KMI)
END DO
DO JSV = NSV_SLTDEPBEG_A(KMI), NSV_SLTDEPEND_A(KMI)
- CSVNAMES_A(JSV,KMI) = TRIM( CDESLTNAMES(JSV-NSV_SLTDEPBEG_A(KMI)+1) )
-
ICHIDX = ICHIDX + 1
CSV_CHEM_LIST_A(ICHIDX, KMI) = TRIM( CDESLTNAMES(JSV-NSV_SLTDEPBEG_A(KMI)+1) )
@@ -1178,8 +1135,6 @@ DO JSV = NSV_SLTDEPBEG_A(KMI), NSV_SLTDEPEND_A(KMI)
END DO
DO JSV = NSV_SNWBEG_A(KMI), NSV_SNWEND_A(KMI)
- CSVNAMES_A(JSV,KMI) = TRIM( CSNOWNAMES(JSV-NSV_SNWBEG_A(KMI)+1) )
-
WRITE( YNUM3, '( I3.3 )' ) JSV
TSVLIST_A(JSV, KMI) = TFIELDMETADATA( &
@@ -1201,8 +1156,6 @@ IF ( NSV_LNOX_A(KMI) > 1 ) &
CALL Print_msg( NVERB_ERROR, 'GEN', 'INI_NSV', 'NSV_LNOX_A>1: problem with the names of the corresponding scalar variables' )
DO JSV = NSV_LNOXBEG_A(KMI), NSV_LNOXEND_A(KMI)
- CSVNAMES_A(JSV,KMI) = 'LINOX'
-
ICHIDX = ICHIDX + 1
CSV_CHEM_LIST_A(ICHIDX, KMI) = 'LINOX'
diff --git a/src/MNH/modd_nsv.f90 b/src/MNH/modd_nsv.f90
index 03631f3fe..20a50d177 100644
--- a/src/MNH/modd_nsv.f90
+++ b/src/MNH/modd_nsv.f90
@@ -28,7 +28,6 @@
!! Pialat/Tulet 15/02/12 add ForeFire
!! Modification 01/2016 (JP Pinty) Add LIMA
!! V. Vionnet 07/17 add blowing snow
-! P. Wautelet 10/03/2021: add CSVNAMES and CSVNAMES_A to store the name of all the scalar variables
! B. Vie 06/2021: add prognostic supersaturation for LIMA
! P. Wautelet 26/11/2021: add TSVLIST and TSVLIST_A to store the metadata of all the scalar variables
! P. Wautelet 14/01/2022: add CSV_CHEM_LIST(_A) to store the list of all chemical variables
@@ -51,7 +50,6 @@ REAL,DIMENSION(JPSVMAX) :: XSVMIN ! minimum value for SV variables
!
LOGICAL :: LINI_NSV(JPMODELMAX) = .FALSE. ! becomes True when routine INI_NSV is called
!
-CHARACTER(LEN=JPSVNAMELGTMAX), DIMENSION(:,:), ALLOCATABLE, TARGET :: CSVNAMES_A !Names of all the scalar variables
CHARACTER(LEN=NMNHNAMELGTMAX), DIMENSION(:,:), ALLOCATABLE, TARGET :: CSV_CHEM_LIST_A !Names of all the chemical variables
TYPE(tfieldmetadata), DIMENSION(:,:), ALLOCATABLE, TARGET :: TSVLIST_A !Metadata of all the scalar variables
@@ -158,7 +156,6 @@ INTEGER,DIMENSION(JPMODELMAX)::NSV_SNWEND_A = 0 ! NSV_SNWBEG_A...NSV_SNWEND_A
!
! variables updated for the current model
!
-CHARACTER(LEN=JPSVNAMELGTMAX), DIMENSION(:), POINTER :: CSVNAMES !Names of all the scalar variables
CHARACTER(LEN=NMNHNAMELGTMAX), DIMENSION(:), POINTER :: CSV_CHEM_LIST !Names of all the chemical variables
TYPE(tfieldmetadata), DIMENSION(:), POINTER :: TSVLIST !Metadata of all the scalar variables
diff --git a/src/MNH/update_nsv.f90 b/src/MNH/update_nsv.f90
index a8bbe8e7b..0bb972eff 100644
--- a/src/MNH/update_nsv.f90
+++ b/src/MNH/update_nsv.f90
@@ -26,7 +26,6 @@ END MODULE MODI_UPDATE_NSV
!! Modify (Vie) 2016 : add LIMA
!! V. Vionnet 7/2017 : add blowing snow var
! P. Wautelet 10/04/2019: replace ABORT and STOP calls by Print_msg
-! P. Wautelet 10/03/2021: add CSVNAMES and CSVNAMES_A to store the name of all the scalar variables
! P. Wautelet 26/11/2021: add TSVLIST and TSVLIST_A to store the metadata of all the scalar variables
! P. Wautelet 14/01/2022: add CSV_CHEM_LIST(_A) to store the list of all chemical variables
!-------------------------------------------------------------------------------
@@ -56,21 +55,6 @@ END IF
! that have been initialized in ini_nsv.f90 for model KMI
!
-! Allocate/reallocate CSVNAMES_A
-IF ( .NOT. ALLOCATED( CSVNAMES_A ) ) ALLOCATE( CSVNAMES_A( NSV_A(KMI), KMI) )
-!If CSVNAMES_A is too small, enlarge it and transfer data
-IF ( SIZE( CSVNAMES_A, 1 ) < NSV_A(KMI) .OR. SIZE( CSVNAMES_A, 2 ) < KMI ) THEN
- ALLOCATE( YSVNAMES_TMP(NSV_A(KMI), KMI) )
- DO JJ = 1, SIZE( CSVNAMES_A, 2 )
- DO JI = 1, SIZE( CSVNAMES_A, 1 )
- YSVNAMES_TMP(JI, JJ) = CSVNAMES_A(JI, JJ)
- END DO
- END DO
- CALL MOVE_ALLOC( FROM = YSVNAMES_TMP, TO = CSVNAMES_A )
-END IF
-
-CSVNAMES => CSVNAMES_A(:,KMI)
-
! Allocate/reallocate CSV_CHEM_LIST_A
IF ( .NOT. ALLOCATED( CSV_CHEM_LIST_A ) ) ALLOCATE( CSV_CHEM_LIST_A( NSV_CHEM_LIST_A(KMI), KMI) )
!If CSV_CHEM_LIST_A is too small, enlarge it and transfer data
diff --git a/src/MNH/write_budget.f90 b/src/MNH/write_budget.f90
index 3f09ddc78..50dcb283b 100644
--- a/src/MNH/write_budget.f90
+++ b/src/MNH/write_budget.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1995-2021 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1995-2022 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.
@@ -620,7 +620,6 @@ subroutine Store_one_budget( tpdiafile, tpdates, tpbudget, prhodjn, knocompress,
TYPEREAL
use modd_io, only: tfiledata
use modd_lunit_n, only: tluout
- use modd_nsv, only: csvnames
use modd_parameters, only: NBUNAMELGTMAX
use modd_type_date, only: date_time
--
GitLab