From b81d89eee189e70698a02f6e1573c745b407d84b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Vi=C3=A9?= <benoit.vie@meteo.fr>
Date: Tue, 22 Feb 2022 12:12:49 +0100
Subject: [PATCH] Prepare for ICEFR use with ICE3
---
src/MNH/ini_lesn.f90 | 7 ++-----
src/MNH/lesn.f90 | 9 +++------
src/MNH/write_lesn.f90 | 2 +-
3 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/src/MNH/ini_lesn.f90 b/src/MNH/ini_lesn.f90
index 674ba4bc0..406ee30a2 100644
--- a/src/MNH/ini_lesn.f90
+++ b/src/MNH/ini_lesn.f90
@@ -543,12 +543,9 @@ ELSE
END IF
IF (LUSERI ) THEN
ALLOCATE(XLES_MEAN_Ri (NLES_K,NLES_TIMES,NLES_MASKS))
-ELSE
- ALLOCATE(XLES_MEAN_Ri (0,0,0))
-END IF
-IF (LUSERI .AND. CCLOUD=='LIMA') THEN
ALLOCATE(XLES_MEAN_If (NLES_K,NLES_TIMES,NLES_MASKS))
ELSE
+ ALLOCATE(XLES_MEAN_Ri (0,0,0))
ALLOCATE(XLES_MEAN_If (0,0,0))
END IF
IF (LUSERS ) THEN
@@ -655,7 +652,7 @@ IF (LUSERC ) XLES_MEAN_INDCf = XUNDEF
IF (LUSERC ) XLES_MEAN_INDCf2 = XUNDEF
IF (LUSERR ) XLES_MEAN_Rr = XUNDEF
IF (LUSERI ) XLES_MEAN_Ri = XUNDEF
-IF (LUSERI .AND. CCLOUD=='LIMA') XLES_MEAN_If = XUNDEF
+IF (LUSERI ) XLES_MEAN_If = XUNDEF
IF (LUSERS ) XLES_MEAN_Rs = XUNDEF
IF (LUSERG ) XLES_MEAN_Rg = XUNDEF
IF (LUSERH ) XLES_MEAN_Rh = XUNDEF
diff --git a/src/MNH/lesn.f90 b/src/MNH/lesn.f90
index 09added3a..c23dc91b3 100644
--- a/src/MNH/lesn.f90
+++ b/src/MNH/lesn.f90
@@ -346,13 +346,10 @@ END IF
IF (LUSERI) THEN
ALLOCATE(ZRI_LES (IIU,IJU,NLES_K))
ALLOCATE(ZIWP_LES(IIU,IJU))
+ ALLOCATE(ZICEFR_LES(IIU,IJU,NLES_K))
ELSE
ALLOCATE(ZRI_LES (0,0,0))
ALLOCATE(ZIWP_LES(0,0))
-END IF
-IF (LUSERI .AND. CCLOUD=='LIMA') THEN
- ALLOCATE(ZICEFR_LES(IIU,IJU,NLES_K))
-ELSE
ALLOCATE(ZICEFR_LES(0,0,0))
END IF
IF (LUSERS) THEN
@@ -604,7 +601,7 @@ IF (LUSERI) THEN
END DO
CALL LES_MEAN_ll ( ZIWP_LES, LLES_CURRENT_CART_MASK(:,:,1), &
XLES_IWP(NLES_CURRENT_TCOUNT) )
- IF (CCLOUD=='LIMA') CALL LES_VER_INT( XICEFR(:,:,:) ,ZICEFR_LES )
+ CALL LES_VER_INT( XICEFR(:,:,:) ,ZICEFR_LES )
END IF
IF (LUSERS) THEN
IRR = IRR + 1
@@ -819,7 +816,7 @@ END IF
IF (LUSERI) &
CALL LES_MEAN_ll ( ZRI_LES, LLES_CURRENT_CART_MASK, &
XLES_MEAN_Ri(:,NLES_CURRENT_TCOUNT,1) )
- IF (CCLOUD=='LIMA') CALL LES_MEAN_ll ( ZICEFR_LES, LLES_CURRENT_CART_MASK, &
+ CALL LES_MEAN_ll ( ZICEFR_LES, LLES_CURRENT_CART_MASK, &
XLES_MEAN_If(:,NLES_CURRENT_TCOUNT,1) )
!
IF (LUSERS) &
diff --git a/src/MNH/write_lesn.f90 b/src/MNH/write_lesn.f90
index de2902c05..22005d475 100644
--- a/src/MNH/write_lesn.f90
+++ b/src/MNH/write_lesn.f90
@@ -356,7 +356,7 @@ if ( luserr ) &
call Les_diachro_write( tpdiafile, XLES_MEAN_RF, 'MEAN_RF', 'Mean RF Profile', '1', ymasks )
if ( luseri ) &
call Les_diachro_write( tpdiafile, XLES_MEAN_Ri, 'MEAN_RI', 'Mean Ri Profile', 'kg kg-1', ymasks )
-if ( luseri .and. ccloud=='lima') &
+if ( luseri ) &
call Les_diachro_write( tpdiafile, XLES_MEAN_If, 'MEAN_IF', 'Mean If Profile', '1', ymasks )
if ( lusers ) &
call Les_diachro_write( tpdiafile, XLES_MEAN_Rs, 'MEAN_RS', 'Mean Rs Profile', 'kg kg-1', ymasks )
--
GitLab