diff --git a/src/common/aux/modd_dimphyexn.F90 b/src/common/aux/modd_dimphyexn.F90
index a2767fe04d1d746f47a742200d17f1f97522477d..cac698c823aa8e03727ee9d744341830f5e9ef9a 100644
--- a/src/common/aux/modd_dimphyexn.F90
+++ b/src/common/aux/modd_dimphyexn.F90
@@ -76,6 +76,7 @@ TYPE DIMPHYEX_t
INTEGER :: NIJE ! Last horizontal inner mass point index
!
INTEGER :: NLESMASK ! Number of LES masks
+ INTEGER :: NLES_TIMES ! Number of LES time data storage
!
END TYPE DIMPHYEX_t
!
diff --git a/src/common/aux/mode_argslist_ll_phy.F90 b/src/common/aux/mode_argslist_ll_phy.F90
new file mode 100644
index 0000000000000000000000000000000000000000..ed9b07274ca4b1ff58daa7274324c9b949fd4fdc
--- /dev/null
+++ b/src/common/aux/mode_argslist_ll_phy.F90
@@ -0,0 +1,60 @@
+!MNH_LIC Copyright 2023-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.
+!-----------------------------------------------------------------
+!
+!! #######################
+MODULE MODE_ARGSLIST_ll_PHY
+!
+ USE MODE_ll
+ USE MODD_ARGSLIST_ll, ONLY : LIST_ll
+ USE MODD_DIMPHYEX, ONLY: DIMPHYEX_t
+!
+ CONTAINS
+!
+ SUBROUTINE ADD3DFIELD_ll_PHY(D, TPLIST, PFIELD, HNAME)
+!! ###############################################
+!
+!!**** *ADD3DFIELD_ll_PHY* -
+!
+!! Purpose
+!! -------
+! This routine is used as an interface to ADD3DFIELD_ll for
+! unpacking horizontal dimensions
+!
+!! Reference
+!! ---------
+!
+! see PHYEX documentation
+!
+!! Implicit Arguments
+!! ------------------
+!
+! Module MODD_ARGSLIST :
+! LIST_ll : list of fields
+! DIMPHYEX_t: PHYEX dimensions
+!
+!! Author
+!! ------
+!
+! Q.Rodier
+!
+!! Modifications
+!! -------------
+! Original August, 3, 2023
+!
+!-------------------------------------------------------------------------------
+!
+ IMPLICIT NONE
+!
+ TYPE(DIMPHYEX_t), INTENT(IN) :: D
+ TYPE(LIST_ll), POINTER :: TPLIST ! list of fields
+ REAL, DIMENSION(D%NIT,D%NJT,D%NKT), TARGET :: PFIELD ! field which is unpaked here
+! of fields
+ CHARACTER(LEN=*), INTENT(IN) :: HNAME ! Name of the field to be added
+
+ CALL ADD3DFIELD_ll(TPLIST, PFIELD, HNAME)
+
+ END SUBROUTINE ADD3DFIELD_ll_PHY
+END MODULE MODE_ARGSLIST_ll_PHY
diff --git a/src/common/micro/mode_ice4_budgets.F90 b/src/common/micro/mode_ice4_budgets.F90
index 6011aef21571077ec8ec99016c9eee2a9625579e..64ccbefc4edd50cbe922d1eeaaed8785b2ce297e 100644
--- a/src/common/micro/mode_ice4_budgets.F90
+++ b/src/common/micro/mode_ice4_budgets.F90
@@ -1,9 +1,11 @@
-!MNH_LIC Copyright 1995-2021 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1995-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.
!-----------------------------------------------------------------
-! ######spl
+! Modifications:
+! P. Wautelet 14/04/2023: initialize ZZ_LSFACT and ZZ_LVFACT
+!-----------------------------------------------------------------
MODULE MODE_ICE4_BUDGETS
IMPLICIT NONE
CONTAINS
@@ -72,7 +74,9 @@ IIJE=D%NIJE
ZINV_TSTEP=1./PTSTEP
!
IF (BUCONF%LBUDGET_TH) THEN
- ZZ_DIFF(:,:)=0.
+ ZZ_DIFF(:,:) = 0.
+ ZZ_LSFACT(:,:) = 0.
+ ZZ_LVFACT(:,:) = 0.
DO JK = IKTB, IKTE
DO JIJ = IIJB, IIJE
ZZ_LVFACT(JIJ, JK) = PLVFACT(JIJ, JK) / PEXNREF(JIJ, JK)
diff --git a/src/common/turb/mode_tke_eps_sources.F90 b/src/common/turb/mode_tke_eps_sources.F90
index 95bcf9310340a2316efb8183c2d801584d5616bc..753480ffd48972243143514d4cb290582c467028 100644
--- a/src/common/turb/mode_tke_eps_sources.F90
+++ b/src/common/turb/mode_tke_eps_sources.F90
@@ -1,4 +1,4 @@
-!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 for details. version 1.
@@ -143,6 +143,7 @@ USE MODD_TURB_n, ONLY: TURB_t
USE MODE_BUDGET_PHY, ONLY: BUDGET_STORE_ADD_PHY, BUDGET_STORE_END_PHY, BUDGET_STORE_INIT_PHY
USE MODE_IO_FIELD_WRITE_PHY, ONLY: IO_FIELD_WRITE_PHY
USE MODE_ll
+USE MODE_ARGSLIST_ll_PHY, ONLY: ADD3DFIELD_ll_PHY
!
USE MODI_GET_HALO
USE MODI_LES_MEAN_SUBGRID_PHY
@@ -316,7 +317,7 @@ IF (ODIAG_IN_RUN) THEN
*(PEXPL*PTKEM(IIJB:IIJE,1:IKT) + TURBN%XIMPL*ZRES(IIJB:IIJE,1:IKT))
!$mnh_end_expand_array(JIJ=IIJB:IIJE,JK=1:IKT)
!
- CALL ADD2DFIELD_ll(TZFIELDDISS_ll, PCURRENT_TKE_DISS, 'TKE_EPS_SOURCES::PCURRENT_TKE_DISS' )
+ CALL ADD3DFIELD_ll_PHY(D, TZFIELDDISS_ll, PCURRENT_TKE_DISS, 'TKE_EPS_SOURCES::PCURRENT_TKE_DISS' )
CALL UPDATE_HALO_ll(TZFIELDDISS_ll,IINFO_ll)
CALL CLEANLIST_ll(TZFIELDDISS_ll)
ENDIF
@@ -461,12 +462,12 @@ IF ( TURBN%LTURB_DIAG .AND. TPFILE%LOPENED ) THEN
! stores the dynamic production
!
TZFIELD = TFIELDMETADATA( &
- CMNHNAME = 'DP', &
+ CMNHNAME = 'TKE_DP', &
CSTDNAME = '', &
- CLONGNAME = 'DP', &
+ CLONGNAME = 'Subgrid TKE dynamical production', &
CUNITS = 'm2 s-3', &
CDIR = 'XY', &
- CCOMMENT = 'X_Y_Z_DP', &
+ CCOMMENT = 'Subgrid dynamical production of TKE', &
NGRID = 1, &
NTYPE = TYPEREAL, &
NDIMS = 3, &
@@ -476,12 +477,12 @@ IF ( TURBN%LTURB_DIAG .AND. TPFILE%LOPENED ) THEN
! stores the thermal production
!
TZFIELD = TFIELDMETADATA( &
- CMNHNAME = 'TP', &
+ CMNHNAME = 'TKE_TP', &
CSTDNAME = '', &
- CLONGNAME = 'TP', &
+ CLONGNAME = 'Subgrid TKE thermal production', &
CUNITS = 'm2 s-3', &
CDIR = 'XY', &
- CCOMMENT = 'X_Y_Z_TP', &
+ CCOMMENT = 'Subgrid thermal production of TKE', &
NGRID = 1, &
NTYPE = TYPEREAL, &
NDIMS = 3, &
@@ -491,12 +492,12 @@ IF ( TURBN%LTURB_DIAG .AND. TPFILE%LOPENED ) THEN
! stores the whole turbulent transport
!
TZFIELD = TFIELDMETADATA( &
- CMNHNAME = 'TR', &
+ CMNHNAME = 'TKE_TR', &
CSTDNAME = '', &
- CLONGNAME = 'TR', &
+ CLONGNAME = 'Subgrid TKE turbulent transport', &
CUNITS = 'm2 s-3', &
CDIR = 'XY', &
- CCOMMENT = 'X_Y_Z_TR', &
+ CCOMMENT = 'Subgrid total turbulent transport of TKE', &
NGRID = 1, &
NTYPE = TYPEREAL, &
NDIMS = 3, &
@@ -506,12 +507,12 @@ IF ( TURBN%LTURB_DIAG .AND. TPFILE%LOPENED ) THEN
! stores the dissipation of TKE
!
TZFIELD = TFIELDMETADATA( &
- CMNHNAME = 'DISS', &
+ CMNHNAME = 'TKE_DISS', &
CSTDNAME = '', &
- CLONGNAME = 'DISS', &
+ CLONGNAME = 'Subgrid TKE dissipation', &
CUNITS = 'm2 s-3', &
CDIR = 'XY', &
- CCOMMENT = 'X_Y_Z_DISS', &
+ CCOMMENT = 'Subgrid dissipation of TKE', &
NGRID = 1, &
NTYPE = TYPEREAL, &
NDIMS = 3, &
diff --git a/src/common/turb/mode_turb_ver_sv_flux.F90 b/src/common/turb/mode_turb_ver_sv_flux.F90
index c14c6f9296e6a1060fe2a963bbf24c37e762a441..43a68a644cc30125f815c6084d88e901542575d9 100644
--- a/src/common/turb/mode_turb_ver_sv_flux.F90
+++ b/src/common/turb/mode_turb_ver_sv_flux.F90
@@ -1,4 +1,4 @@
-!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 for details. version 1.
@@ -204,6 +204,7 @@ SUBROUTINE TURB_VER_SV_FLUX(D,CST,CSTURB,TURBN,TLES,ONOMIXLG, &
!! Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
! Wim de Rooy 06/2019: with energycascade, 50MF nog longer necessary
! P. Wautelet 30/11/2022: compute PWSV only when needed
+! P. Wautelet 01/06/2023: fix for PWSV
!!--------------------------------------------------------------------------
!
!* 0. DECLARATIONS
@@ -393,7 +394,7 @@ DO JSV=1,KSV
PRHODJ(IIJB:IIJE,1:IKT)*(ZRES(IIJB:IIJE,1:IKT)-PSVM(IIJB:IIJE,1:IKT,JSV))/PTSTEP
!$mnh_end_expand_array(JIJ=IIJB:IIJE,JK=1:IKT)
!
- IF ( (TURBN%LTURB_FLX .AND. TPFILE%LOPENED) .OR. TLES%LLES_CALL ) THEN
+ IF ( (TURBN%LTURB_FLX .AND. TPFILE%LOPENED) .OR. TLES%LLES_CALL .OR. OFLYER ) THEN
! Diagnostic of the cartesian vertical flux
!
!$mnh_expand_array(JIJ=IIJB:IIJE,JK=1:IKT)
@@ -441,7 +442,7 @@ DO JSV=1,KSV
PWSV(IIJB:IIJE,IKE,JSV)=PWSV(IIJB:IIJE,IKE-IKL,JSV)
!$mnh_end_expand_array(JIJ=IIJB:IIJE)
END IF
- END IF
+ END IF
!
IF (TURBN%LTURB_FLX .AND. TPFILE%LOPENED) THEN
! stores the JSVth vertical flux
@@ -450,7 +451,6 @@ DO JSV=1,KSV
CMNHNAME = TRIM( YMNHNAME ), &
CSTDNAME = '', &
CLONGNAME = TRIM( YMNHNAME ), &
- !PW: TODO: use the correct units of the JSV variable (and multiply it by m s-1)
CUNITS = 'SVUNIT m s-1', &
CDIR = 'XY', &
CCOMMENT = 'X_Y_Z_' // TRIM( YMNHNAME ), &
diff --git a/src/common/turb/th_r_from_thl_rt.func.h b/src/common/turb/th_r_from_thl_rt.func.h
index eec2bdc634a3029c78818e0bd5e8d3ab5f155638..fc5071e3727276956b50b7149f44a1a5ac6b8be6 100644
--- a/src/common/turb/th_r_from_thl_rt.func.h
+++ b/src/common/turb/th_r_from_thl_rt.func.h
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 2006-2022 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2006-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.
@@ -43,6 +43,7 @@
!! we use dQsat/dT to help convergence
!! use of optional PRR, PRS, PRG, PRH
!! S. Riette Nov 2016: support for HFRAC_ICE='S'
+!! P. Wautelet Mar 2023: bugfix: protect operations on optional dummy arguments
!!
!! --------------------------------------------------------------------------
!
@@ -74,8 +75,8 @@ REAL, DIMENSION(KT), INTENT(INOUT):: PRI ! vapor mixing ratio
REAL, DIMENSION(KT), INTENT(OUT) :: PRSATW ! estimated mixing ration at saturation over water
REAL, DIMENSION(KT), INTENT(OUT) :: PRSATI ! estimated mixing ration at saturation over ice
REAL, DIMENSION(KT, 16), INTENT(OUT) :: PBUF ! buffer to replace automatic arrays
-INTEGER, OPTIONAL :: KB !first index to deal with (default is 1)
-INTEGER, OPTIONAL :: KE !last index to deal with (default if KT)
+INTEGER, OPTIONAL, INTENT(IN) :: KB !first index to deal with (default is 1)
+INTEGER, OPTIONAL, INTENT(IN) :: KE !last index to deal with (default if KT)
!
!-------------------------------------------------------------------------------
!
@@ -95,8 +96,18 @@ REAL :: ZVAR1, ZVAR2, ZTPOW2, ZDELT
!
!
!
-IB=MERGE(KB, 1, PRESENT(KB))
-IE=MERGE(KE, KT, PRESENT(KE))
+IF ( PRESENT(KB) ) THEN
+ IB = KB
+ELSE
+ IB = 1
+END IF
+
+IF ( PRESENT(KE) ) THEN
+ IE = KE
+ELSE
+ IE = KT
+END IF
+
!Number of iterations
JITER=2
!
@@ -170,7 +181,7 @@ DO II=1,JITER
!Computation of new PRL, PRI and PRV
!Correction term applied to (PRV(J)-PBUF(J, IRVSAT)) is computed assuming that
- !PBUF(J, ILVOCPEXN), PBUF(J, ILSOCPEXN) and PBUF(J, ICPH) don't vary to much with T. It takes into account
+ !PBUF(J, ILVOCPEXN), PBUF(J, ILSOCPEXN) and PBUF(J, ICPH) don't vary too much with T. It takes into account
!the variation (estimated linear) of Qsat with T
PBUF(J, IRLTEMP)=(PRV(J)-PBUF(J, IRVSAT))/ &
&(1 + PBUF(J, IDRSATODT)*PBUF(J, IEXN)* &
diff --git a/src/mesonh/aux/modd_budget.f90 b/src/mesonh/aux/modd_budget.f90
index 0270f474a0e5b53d71ccc86620c9c9bcafefd866..3b413d569b327ee0666fef3544ba3ac37891174b 100644
--- a/src/mesonh/aux/modd_budget.f90
+++ b/src/mesonh/aux/modd_budget.f90
@@ -124,7 +124,6 @@ type, extends( tfieldmetadata_base ) :: tburhodata
real, dimension(:,:,:), allocatable :: xdata ! Array to store the budget data
end type tburhodata
-!PW: a commenter + renommer???
type :: tbudiachrometadata
character(len=NBUNAMELGTMAX), dimension(NMAXLEVELS) :: clevels = '' !Name of the different groups/levels in the netCDF file
character(len=NCOMMENTLGTMAX), dimension(NMAXLEVELS) :: ccomments ='' !Comments for the different groups/levels in the netCDF file
diff --git a/src/mesonh/aux/mode_fill_dimphyexn.F90 b/src/mesonh/aux/mode_fill_dimphyexn.F90
index 80679f8e1929dfc71b47905a1d88abf6ebffd437..5f965be18b7d6a788d424ab047032aded219485c 100644
--- a/src/mesonh/aux/mode_fill_dimphyexn.F90
+++ b/src/mesonh/aux/mode_fill_dimphyexn.F90
@@ -6,7 +6,7 @@
MODULE MODE_FILL_DIMPHYEX
IMPLICIT NONE
CONTAINS
-SUBROUTINE FILL_DIMPHYEX(YDDIMPHYEX, KIT, KJT, KKT, LTURB)
+SUBROUTINE FILL_DIMPHYEX(YDDIMPHYEX, KIT, KJT, KKT, LTURB,KLES_TIMES)
! #########################
!
!!
@@ -48,6 +48,7 @@ IMPLICIT NONE
!
TYPE(DIMPHYEX_t), INTENT(OUT) :: YDDIMPHYEX ! Structure to fill in
INTEGER, INTENT(IN) :: KIT, KJT, KKT ! Array dimensions
+INTEGER, INTENT(IN), OPTIONAL :: KLES_TIMES ! Number of LES data storage frequency
LOGICAL, INTENT(IN), OPTIONAL :: LTURB ! Flag to replace array dimensions I/JB and I/JE to the full array size
! needed if computation in HALO points (e.g. in turbulence)
LOGICAL :: YTURB
@@ -97,7 +98,11 @@ ELSE
END IF
IF (LHOOK) CALL DR_HOOK('FILL_DIMPHYEX', 1, ZHOOK_HANDLE)
!
-YDDIMPHYEX%NLESMASK = 1
+YDDIMPHYEX%NLESMASK=1
+YDDIMPHYEX%NLES_TIMES=0
+IF (PRESENT(KLES_TIMES)) THEN
+ YDDIMPHYEX%NLES_TIMES = KLES_TIMES
+END IF
IF (LLES_MY_MASK) YDDIMPHYEX%NLESMASK = YDDIMPHYEX%NLESMASK + NLES_MASKS_USER
IF (LLES_NEB_MASK) YDDIMPHYEX%NLESMASK = YDDIMPHYEX%NLESMASK + 2
IF (LLES_CORE_MASK) YDDIMPHYEX%NLESMASK = YDDIMPHYEX%NLESMASK + 2
diff --git a/src/mesonh/ext/phys_paramn.f90 b/src/mesonh/ext/phys_paramn.f90
index aca29a88a0dcf276f1f6a795391d01e9e53ccd3c..d1c53a2defe126e82caf00d1c7efce45c8b37bf0 100644
--- a/src/mesonh/ext/phys_paramn.f90
+++ b/src/mesonh/ext/phys_paramn.f90
@@ -284,6 +284,7 @@ USE MODD_IO, ONLY: TFILEDATA
USE MODD_LATZ_EDFLX
USE MODD_LBC_n
USE MODD_LES
+USE MODD_LES_n, ONLY: NLES_TIMES
USE MODD_LES_BUDGET
USE MODD_LSFIELD_n
USE MODD_LUNIT_n
@@ -491,7 +492,7 @@ IKB = 1 + JPVEXT
IKE = IKU - JPVEXT
!
CALL GET_INDICE_ll (IIB,IJB,IIE,IJE)
-CALL FILL_DIMPHYEX(YLDIMPHYEX, SIZE(XTHT,1), SIZE(XTHT,2), SIZE(XTHT,3),.TRUE.)
+CALL FILL_DIMPHYEX(YLDIMPHYEX, SIZE(XTHT,1), SIZE(XTHT,2), SIZE(XTHT,3),.TRUE., NLES_TIMES)
!
ZTIME1 = 0.0_MNHTIME
ZTIME2 = 0.0_MNHTIME
diff --git a/src/mesonh/micro/rain_ice_warm.f90 b/src/mesonh/micro/rain_ice_warm.f90
index c9471dc0b6d0987a9e95c744efdc1a8584fa25e4..e31659abd784050f458ff6f7fe531a13dcc53a06 100644
--- a/src/mesonh/micro/rain_ice_warm.f90
+++ b/src/mesonh/micro/rain_ice_warm.f90
@@ -72,7 +72,6 @@ REAL, DIMENSION(:), INTENT(INOUT) :: PRVS ! Water vapor m.r. source
REAL, DIMENSION(:), INTENT(INOUT) :: PRCS ! Cloud water m.r. source
REAL, DIMENSION(:), INTENT(INOUT) :: PRRS ! Rain water m.r. source
REAL, DIMENSION(:), INTENT(INOUT) :: PTHS ! Theta source
-!PW: PUSW could be a purely local variable?
REAL, DIMENSION(:), INTENT(INOUT) :: PUSW ! Undersaturation over water
REAL, DIMENSION(:,:,:), INTENT(INOUT) :: PEVAP3D ! Rain evap profile
!
diff --git a/src/mesonh/turb/les_mean_subgrid_phy.f90 b/src/mesonh/turb/les_mean_subgrid_phy.f90
index 10c74dac07382e6b6f1f50860ebdf94a34e66bdc..a8ca991c2ee6406bce503da0484d1e37c31f014b 100644
--- a/src/mesonh/turb/les_mean_subgrid_phy.f90
+++ b/src/mesonh/turb/les_mean_subgrid_phy.f90
@@ -26,7 +26,7 @@ TYPE(DIMPHYEX_t), INTENT(IN) :: D
TYPE(TLES_t), INTENT(IN) :: TLES
REAL, DIMENSION(D%NIJT,D%NKT), INTENT(IN) :: PA
!
-REAL, DIMENSION(D%NKLES,TLES%NLES_CURRENT_TCOUNT,D%NLESMASK), INTENT(INOUT) :: PA_MEAN
+REAL, DIMENSION(D%NKLES,D%NLES_TIMES,D%NLESMASK), INTENT(INOUT) :: PA_MEAN
!
LOGICAL, OPTIONAL, INTENT(IN) :: OSUM
!
@@ -42,7 +42,7 @@ TYPE(DIMPHYEX_t), INTENT(IN) :: D
TYPE(TLES_t), INTENT(IN) :: TLES
REAL, DIMENSION(D%NIJT), INTENT(IN) :: PA
!
-REAL, DIMENSION(TLES%NLES_CURRENT_TCOUNT), INTENT(INOUT) :: PA_MEAN
+REAL, DIMENSION(D%NLES_TIMES), INTENT(INOUT) :: PA_MEAN
!
LOGICAL, OPTIONAL, INTENT(IN) :: OSUM
!
@@ -64,7 +64,7 @@ IMPLICIT NONE
TYPE(DIMPHYEX_t), INTENT(IN) :: D
TYPE(TLES_t), INTENT(IN) :: TLES
REAL, DIMENSION(D%NIJT,D%NKT), INTENT(IN) :: PA
-REAL, DIMENSION(D%NKLES,TLES%NLES_CURRENT_TCOUNT,D%NLESMASK), INTENT(INOUT) :: PA_MEAN
+REAL, DIMENSION(D%NKLES,D%NLES_TIMES,D%NLESMASK), INTENT(INOUT) :: PA_MEAN
LOGICAL, OPTIONAL, INTENT(IN) :: OSUM
!
CALL LES_MEAN_SUBGRID_unpack3D(D,TLES, PA, PA_MEAN, OSUM)
@@ -86,7 +86,7 @@ IMPLICIT NONE
TYPE(DIMPHYEX_t), INTENT(IN) :: D
TYPE(TLES_t), INTENT(IN) :: TLES
REAL, DIMENSION(D%NIJT), INTENT(IN) :: PA
-REAL, DIMENSION(TLES%NLES_CURRENT_TCOUNT), INTENT(INOUT) :: PA_MEAN
+REAL, DIMENSION(D%NLES_TIMES), INTENT(INOUT) :: PA_MEAN
LOGICAL, OPTIONAL, INTENT(IN) :: OSUM
!
CALL LES_MEAN_SUBGRID_unpackSURF(D, TLES, PA, PA_MEAN, OSUM)
@@ -106,7 +106,7 @@ IMPLICIT NONE
TYPE(DIMPHYEX_t), INTENT(IN) :: D
TYPE(TLES_t), INTENT(IN) :: TLES
REAL, DIMENSION(D%NIT,D%NJT,D%NKT), INTENT(IN) :: PA
-REAL, DIMENSION(D%NKLES,TLES%NLES_CURRENT_TCOUNT,D%NLESMASK), INTENT(INOUT) :: PA_MEAN
+REAL, DIMENSION(D%NKLES,D%NLES_TIMES,D%NLESMASK), INTENT(INOUT) :: PA_MEAN
LOGICAL, OPTIONAL, INTENT(IN) :: OSUM
!
CALL LES_MEAN_SUBGRID_3D(PA, PA_MEAN, OSUM)
@@ -129,7 +129,7 @@ IMPLICIT NONE
TYPE(DIMPHYEX_t), INTENT(IN) :: D
TYPE(TLES_t), INTENT(IN) :: TLES
REAL, DIMENSION(D%NIT,D%NJT), INTENT(IN) :: PA
-REAL, DIMENSION(TLES%NLES_CURRENT_TCOUNT), INTENT(INOUT) :: PA_MEAN
+REAL, DIMENSION(D%NLES_TIMES), INTENT(INOUT) :: PA_MEAN
LOGICAL, OPTIONAL, INTENT(IN) :: OSUM
!
CALL LES_MEAN_SUBGRID_SURF(PA, PA_MEAN, OSUM)