Quentin 20/12/2023: bugfix merge of mesonh_dev_0.6.3 into master

src/common/micro/lima.F90

@@ -132,7 +132,7 @@ REAL, DIMENSION(:,:,:),   INTENT(INOUT) :: PICEFR     ! Cloud fraction
 REAL, DIMENSION(:,:,:),   INTENT(INOUT) :: PPRCFR     ! Cloud fraction
 REAL, DIMENSION(:,:,:,:), INTENT(INOUT) :: PFPR       ! Precipitation fluxes in altitude
 !
-REAL, DIMENSION(:,:,:),             INTENT(IN)    :: PLATHAM_IAGGS  ! Factor for IAGGS modification due to Efield
+REAL, DIMENSION(:,:,:),   OPTIONAL, INTENT(IN)    :: PLATHAM_IAGGS  ! Factor for IAGGS modification due to Efield
 REAL, DIMENSION(:,:,:),   OPTIONAL, INTENT(IN)    :: PEFIELDW   ! Vertical component of the electric field
 REAL, DIMENSION(:,:,:,:), OPTIONAL, INTENT(IN)    :: PSV_ELEC_T ! Charge density at time t
 REAL, DIMENSION(:,:,:,:), OPTIONAL, INTENT(INOUT) :: PSV_ELEC_S ! Charge density sources

src/testprogs/rain_ice_old/main_rain_ice_old.F90

@@ -5,6 +5,7 @@ USE GETDATA_RAIN_ICE_OLD_MOD, ONLY: GETDATA_RAIN_ICE_OLD
 USE COMPUTE_DIFF,    ONLY: DIFF
 USE MODI_RAIN_ICE_OLD
 USE MODD_DIMPHYEX,   ONLY: DIMPHYEX_t
+USE MODD_IO,         ONLY: TFILEDATA
 USE MODD_PHYEX,      ONLY: PHYEX_t
 USE STACK_MOD
 USE OMP_LIB
@@ -56,6 +57,7 @@ INTEGER :: IBL, JLON, JLEV
 
 TYPE(DIMPHYEX_t)         :: D, D0
 TYPE(PHYEX_t)            :: PHYEX
+TYPE(TFILEDATA)          :: TPFILE
 LOGICAL                  :: LLCHECK
 LOGICAL                  :: LLCHECKDIFF
 LOGICAL                  :: LLDIFF
@@ -314,7 +316,6 @@ JBLK2 =      (NGPBLKS * (ITID+1)) / NTID
 
 ENDDO
 
-<<<<<<< HEAD
 IF (LHOOK) CALL DR_HOOK ('MAIN',1,ZHOOK_HANDLE)
 
 TE = OMP_GET_WTIME()
@@ -402,9 +403,10 @@ ZDZMIN=20.
 CMICRO='ICE3'
 CSCONV='NONE'
 CTURB='TKEL'
+TPFILE%NLU=0
 
 !Default values
-CALL INI_PHYEX(CPROGRAM, 0, .TRUE., IULOUT, 0, 1, &
+CALL INI_PHYEX(CPROGRAM, TPFILE, .TRUE., IULOUT, 0, 1, &
               &PTSTEP, ZDZMIN, &
               &CMICRO, CSCONV, CTURB, &
               &LDDEFAULTVAL=.TRUE., LDREADNAM=.FALSE., LDCHECK=.FALSE., KPRINT=0, LDINIT=.FALSE., &
@@ -443,7 +445,7 @@ PHYEX%PARAM_ICEN%LSEDIC=LDSEDIC
 PHYEX%PARAM_ICEN%CSUBG_AUCV_RC=CSUBG_AUCV_RC
 
 !Param initialisation
-CALL INI_PHYEX(CPROGRAM, 0, .TRUE., IULOUT, 0, 1, &
+CALL INI_PHYEX(CPROGRAM, TPFILE, .TRUE., IULOUT, 0, 1, &
               &PTSTEP, ZDZMIN, &
               &CMICRO, CSCONV, CTURB, &
               &LDDEFAULTVAL=.FALSE., LDREADNAM=.FALSE., LDCHECK=.TRUE., KPRINT=2, LDINIT=.TRUE., &