From 85baadd47ae6776f8bd9ca879f09529f0ff9d6c6 Mon Sep 17 00:00:00 2001 From: Quentin Rodier <quentin.rodier@meteo.fr> Date: Thu, 16 Jun 2022 18:05:47 +0200 Subject: [PATCH] Quentin 16/06/2022: bugfix TMO6 instead of TM06 --- src/common/turb/mode_turb_ver.F90 | 4 ++-- src/common/turb/mode_turb_ver_thermo_flux.F90 | 4 ++-- src/common/turb/modi_turb.F90 | 4 ++-- src/common/turb/turb.F90 | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/common/turb/mode_turb_ver.F90 b/src/common/turb/mode_turb_ver.F90 index 2ba6afd53..dc504299c 100644 --- a/src/common/turb/mode_turb_ver.F90 +++ b/src/common/turb/mode_turb_ver.F90 @@ -332,8 +332,8 @@ REAL, DIMENSION(D%NIT,D%NJT,D%NKT), INTENT(IN) :: PFWR ! d(w'2r' )/d REAL, DIMENSION(D%NIT,D%NJT,D%NKT), INTENT(IN) :: PFTH2 ! d(w'th'2 )/dz REAL, DIMENSION(D%NIT,D%NJT,D%NKT), INTENT(IN) :: PFR2 ! d(w'r'2 )/dz REAL, DIMENSION(D%NIT,D%NJT,D%NKT), INTENT(IN) :: PFTHR ! d(w'th'r')/dz -REAL, DIMENSION(MERGE(D%NIT,0,HTOM=='TMO6'),& - MERGE(D%NJT,0,HTOM=='TMO6')),INTENT(INOUT) :: PBL_DEPTH ! BL height for TOMS +REAL, DIMENSION(MERGE(D%NIT,0,HTOM=='TM06'),& + MERGE(D%NJT,0,HTOM=='TM06')),INTENT(INOUT) :: PBL_DEPTH ! BL height for TOMS REAL, DIMENSION(MERGE(D%NIT,0,ORMC01),& MERGE(D%NJT,0,ORMC01)),INTENT(INOUT) :: PSBL_DEPTH ! SBL depth for RMC01 REAL, DIMENSION(D%NIT,D%NJT), INTENT(IN) :: PLMO ! Monin-Obukhov length diff --git a/src/common/turb/mode_turb_ver_thermo_flux.F90 b/src/common/turb/mode_turb_ver_thermo_flux.F90 index 3c239da9d..c8d4304a8 100644 --- a/src/common/turb/mode_turb_ver_thermo_flux.F90 +++ b/src/common/turb/mode_turb_ver_thermo_flux.F90 @@ -347,8 +347,8 @@ REAL, DIMENSION(D%NIT,D%NJT,D%NKT), INTENT(IN) :: PFWR ! d(w'2r' )/d REAL, DIMENSION(D%NIT,D%NJT,D%NKT), INTENT(IN) :: PFTH2 ! d(w'th'2 )/dz (at mass point) REAL, DIMENSION(D%NIT,D%NJT,D%NKT), INTENT(IN) :: PFR2 ! d(w'r'2 )/dz (at mass point) REAL, DIMENSION(D%NIT,D%NJT,D%NKT), INTENT(IN) :: PFTHR ! d(w'th'r')/dz (at mass point) -REAL, DIMENSION(MERGE(D%NIT,0,HTOM=='TMO6'),& - MERGE(D%NJT,0,HTOM=='TMO6')), INTENT(INOUT):: PBL_DEPTH ! BL depth +REAL, DIMENSION(MERGE(D%NIT,0,HTOM=='TM06'),& + MERGE(D%NJT,0,HTOM=='TM06')), INTENT(INOUT):: PBL_DEPTH ! BL depth REAL, DIMENSION(D%NIT,D%NJT,D%NKT), INTENT(OUT) :: PWTHV ! buoyancy flux ! REAL, DIMENSION(D%NIT,D%NJT,D%NKT), INTENT(INOUT) :: PRTHLS ! cumulated source for theta diff --git a/src/common/turb/modi_turb.F90 b/src/common/turb/modi_turb.F90 index 20641b3d5..cdaf8a5d5 100644 --- a/src/common/turb/modi_turb.F90 +++ b/src/common/turb/modi_turb.F90 @@ -103,8 +103,8 @@ REAL, DIMENSION(D%NIT,D%NJT,D%NKT), INTENT(IN) :: PTKET ! TKE REAL, DIMENSION(D%NIT,D%NJT,D%NKT,KSV), INTENT(IN) :: PSVT ! passive scal. var. REAL, DIMENSION(D%NIT,D%NJT,D%NKT), INTENT(IN) :: PSRCT ! Second-order flux ! s'rc'/2Sigma_s2 at time t-1 multiplied by Lambda_3 -REAL, DIMENSION(MERGE(D%NIT,0,HTOM=='TMO6'),& - MERGE(D%NJT,0,HTOM=='TMO6')),INTENT(INOUT) :: PBL_DEPTH ! BL height for TOMS +REAL, DIMENSION(MERGE(D%NIT,0,HTOM=='TM06'),& + MERGE(D%NJT,0,HTOM=='TM06')),INTENT(INOUT) :: PBL_DEPTH ! BL height for TOMS REAL, DIMENSION(MERGE(D%NIT,0,ORMC01),& MERGE(D%NJT,0,ORMC01)),INTENT(INOUT) :: PSBL_DEPTH ! SBL depth for RMC01 ! diff --git a/src/common/turb/turb.F90 b/src/common/turb/turb.F90 index 065e45f21..2490b8562 100644 --- a/src/common/turb/turb.F90 +++ b/src/common/turb/turb.F90 @@ -352,8 +352,8 @@ REAL, DIMENSION(MERGE(D%NIT,0,OCOMPUTE_SRC),& MERGE(D%NJT,0,OCOMPUTE_SRC),& MERGE(D%NKT,0,OCOMPUTE_SRC)), INTENT(IN) :: PSRCT ! Second-order flux ! s'rc'/2Sigma_s2 at time t-1 multiplied by Lambda_3 -REAL, DIMENSION(MERGE(D%NIT,0,HTOM=='TMO6'),& - MERGE(D%NJT,0,HTOM=='TMO6')),INTENT(INOUT) :: PBL_DEPTH ! BL height for TOMS +REAL, DIMENSION(MERGE(D%NIT,0,HTOM=='TM06'),& + MERGE(D%NJT,0,HTOM=='TM06')),INTENT(INOUT) :: PBL_DEPTH ! BL height for TOMS REAL, DIMENSION(MERGE(D%NIT,0,ORMC01),& MERGE(D%NJT,0,ORMC01)),INTENT(INOUT) :: PSBL_DEPTH ! SBL depth for RMC01 ! -- GitLab