diff --git a/src/MNH/ini_nsv.f90 b/src/MNH/ini_nsv.f90 index 2b29b251ca2f9349f74051b902db0c45efc5f9b6..968c0d72d67a5d1f68d7a43cb3a151dd3c9657de 100644 --- a/src/MNH/ini_nsv.f90 +++ b/src/MNH/ini_nsv.f90 @@ -469,7 +469,6 @@ ELSE END IF ! aerosol variables IF (LORILAM.AND.(NEQ .GT. 0)) THEN - IF (ALLOCATED(XT_LS)) LAERINIT=.TRUE. NM6_AER = 0 IF (LVARSIGI) NM6_AER = 1 IF (LVARSIGJ) NM6_AER = NM6_AER + 1 diff --git a/src/MNH/prep_real_case.f90 b/src/MNH/prep_real_case.f90 index 385bfd59e8f3ca7eeb04da6b3aada32072f755c4..befaa0e294592229e56d82ad22e7af99e699e768 100644 --- a/src/MNH/prep_real_case.f90 +++ b/src/MNH/prep_real_case.f90 @@ -576,7 +576,7 @@ XANGCONV0, XANGCONV1000, XANGCONV2000, & LSALT, CRGUNITS, NMODE_DST, XINISIG, XINIRADIUS, XN0MIN,& !UPG*PT XINISIG_SLT, XINIRADIUS_SLT, XN0MIN_SLT, NMODE_SLT, & - LDSTCAMS, LSLTCAMS,CACTCCN,CCLOUD, NMOD_IFN, NMOD_CCN + LDSTCAMS, LSLTCAMS,CACTCCN,CCLOUD, NMOD_IFN, NMOD_CCN, LAERINIT !UPG*PT NAMELIST/NAM_CH_CONF/ LUSECHAQ,LUSECHIC,LUSECHEM @@ -592,6 +592,7 @@ REAL, DIMENSION(:,:,:), ALLOCATABLE :: ZLBXRHO, ZLBYRHO REAL, DIMENSION(:,:,:), ALLOCATABLE :: ZLBXZZ, ZLBYZZ REAL, DIMENSION(:,:,:), ALLOCATABLE :: ZLBXPABST, ZLBYPABST INTEGER :: ILBX,ILBY,IIB,IJB,IIE,IJE +LOGICAL :: GAERINIT !UPG*PT !------------------------------------------------------------------------------- @@ -757,6 +758,8 @@ IF (GFOUND) READ(UNIT=IPRE_REAL1,NML=NAM_CONFZ) CALL POSNAM(IPRE_REAL1,'NAM_IBM_LSF' ,GFOUND,ILUOUT0) IF (GFOUND) READ(UNIT=IPRE_REAL1,NML=NAM_IBM_LSF) ! +GAERINIT = LAERINIT + ! Sea salt CALL INIT_SALT ! @@ -784,6 +787,7 @@ ELSE IF (YATMFILETYPE=='GRIBEX') THEN ELSE CALL READ_ALL_DATA_GRIB_CASE('ATM0',TZPRE_REAL1FILE,YATMFILE,TPGDFILE,ZHORI,NVERB,LDUMMY_REAL) END IF +LAERINIT = GAERINIT ! YDAD_NAME=' ' END IF