diff --git a/src/MNH/spawn_model2.f90 b/src/MNH/spawn_model2.f90 index 2ca1a01710e692cd5fab99da49e282a451f19a18..14512ab9f7dbc6c31762688043d144846d1f5c2f 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