From 1fe75a19b96b6cd173881164e2a9ba244274291e Mon Sep 17 00:00:00 2001
From: Juan Escobar <escj@aero.obs-mip.fr>
Date: Mon, 17 Mar 2025 14:24:34 +0100
Subject: [PATCH] Juan 17/03/2025:spawn_model2.f90, BUG CORRECTION: Wrong water
 field written=2, for all hydrometeor  => Correction IDX_RRT = 3,IDX_RIT =
 4,IDX_RST = 5,IDX_RGT = 6,IDX_RHT = 7 & correction of allocation for
 XINPRC/XACPRC

---
 src/MNH/spawn_model2.f90 | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/MNH/spawn_model2.f90 b/src/MNH/spawn_model2.f90
index 2ca1a0171..14512ab9f 100644
--- a/src/MNH/spawn_model2.f90
+++ b/src/MNH/spawn_model2.f90
@@ -292,9 +292,9 @@ USE MODI_GET_SIZEX_LB
 USE MODI_GET_SIZEY_LB
 !
 USE MODD_LIMA_PRECIP_SCAVENGING_n
-USE MODD_PARAM_LIMA,  ONLY : MDEPOC=>LDEPOC, LSCAV
-USE MODD_PARAM_ICE_n, ONLY : LDEPOSC
-USE MODD_PARAM_C2R2,  ONLY : LDEPOC
+USE MODD_PARAM_LIMA,  ONLY : MSEDC=>LSEDC, MDEPOC=>LDEPOC, LSCAV
+USE MODD_PARAM_ICE_n, ONLY : LSEDIC, LDEPOSC
+USE MODD_PARAM_C2R2,  ONLY : LSEDC, LDEPOC
 USE MODD_PASPOL, ONLY : LPASPOL
 !
 USE MODD_MPIF
@@ -618,23 +618,23 @@ IF (NRR>1) THEN
 END IF
 IF (NRR>2) THEN
   LUSERR=.TRUE.
-  IDX_RRT = 2
+  IDX_RRT = 3
 END IF
 IF (NRR>3) THEN
   LUSERI=.TRUE.
-  IDX_RIT = 2
+  IDX_RIT = 4
 END IF
 IF (NRR>4) THEN
   LUSERS=.TRUE.
-  IDX_RST = 2
+  IDX_RST = 5
 END IF
 IF (NRR>5) THEN
   LUSERG=.TRUE.
-  IDX_RGT = 2
+  IDX_RGT = 6
 END IF
 IF (NRR>6) THEN
   LUSERH=.TRUE.
-  IDX_RHT = 2
+  IDX_RHT = 7
 END IF
 !
 !
@@ -892,8 +892,9 @@ ELSE
   ALLOCATE(XACPRR(0,0))
 END IF
 !
-IF (CCLOUD(1:3) == 'ICE' .OR. CCLOUD == 'C2R2'  &
-         .OR. CCLOUD == 'KHKO' .OR. CCLOUD == 'LIMA') THEN
+IF (( CCLOUD(1:3) == 'ICE'                                   .AND.(LSEDIC .OR. LDEPOSC)) .OR. &
+    ((CCLOUD=='C2R2' .OR. CCLOUD=='C3R5' .OR. CCLOUD=='KHKO').AND.(LSEDC .OR. LDEPOC))  .OR. &
+    ( CCLOUD=='LIMA'                                         .AND.(MSEDC .OR. MDEPOC)))  THEN
   ALLOCATE(XINPRC(IIU,IJU))
   ALLOCATE(XACPRC(IIU,IJU))
 ELSE
-- 
GitLab