diff --git a/src/mesonh/micro/ice_adjust_elec.f90 b/src/mesonh/micro/ice_adjust_elec.f90 index 82a92b61eb0e4b18d669be0c1166a0297fe0ad25..5c8b704f97fc191e0dee9ec7d03e64b094a127af 100644 --- a/src/mesonh/micro/ice_adjust_elec.f90 +++ b/src/mesonh/micro/ice_adjust_elec.f90 @@ -173,9 +173,9 @@ USE MODD_ELEC_DESCR, ONLY : XRTMIN_ELEC, XQTMIN, XFC, XFI, XECHARGE USE MODD_NSV, ONLY : NSV_ELECBEG, NSV_ELECEND USE MODD_PARAMETERS USE MODD_RAIN_ICE_DESCR, ONLY : XRTMIN, XBI -USE MODD_RAIN_ICE_PARAM, ONLY: RAIN_ICE_PARAM -USE MODD_NEB, ONLY: NEB -USE MODD_TURB_n, ONLY: TURBN +USE MODD_RAIN_ICE_PARAM, ONLY: RAIN_ICE_PARAM +USE MODD_NEB, ONLY: NEB +USE MODD_TURB_n, ONLY: TURBN USE MODD_DIMPHYEX, ONLY: DIMPHYEX_t use mode_budget, only: Budget_store_init, Budget_store_end @@ -385,19 +385,12 @@ DO JITER = 1, ITERMAX ZSIGQSAT2D(:,:)=PSIGQSAT ZW4 = 1. ! PRODREF is not used if HL variables are not present ! - !CALL CONDENSATION( IIU, IJU, IKU, IIB, IIE, IJB, IJE, IKB, IKE,1, & - ! 'T', 'CB02', 'CB', & - ! PPABST, PZZ, ZW4, ZT, ZW3_IN, ZW3, ZW1_IN, ZW1, ZW2_IN, ZW2, & - ! PRRS*PTSTEP, PRSS*PTSTEP, PRGS*PTSTEP, PSIGS, PMFCONV, PCLDFR, & - ! PSRCS, .TRUE., OSIGMAS, .FALSE., .FALSE., & - ! ZDUM, ZDUM, ZDUM, ZDUM, ZDUM, ZSIGQSAT2D, & - ! PLV=ZLV, PLS=ZLS, PCPH=ZCPH ) - CALL CONDENSATION(D, CST, RAIN_ICE_PARAM, NEB, TURBN, & - &'T', 'CB02', 'CB', & - &PPABST, PZZ, ZW4, ZT, ZW3_IN, ZW3, ZW1_IN, ZW1, ZW2_IN, ZW2, & - &PRRS*PTSTEP, PRSS*PTSTEP, PRGS*PTSTEP, PSIGS, .FALSE., PMFCONV, PCLDFR, PSRCS, .FALSE., & - &OSIGMAS, .FALSE., .FALSE., & - &ZDUM, ZDUM, ZDUM, ZDUM, ZDUM, ZSIGQSAT2D, & + CALL CONDENSATION(D, CST, RAIN_ICE_PARAM, NEB, TURBN, & + &'T', 'CB02', 'CB', & + &PPABST, PZZ, ZW4, ZT, ZW3_IN, ZW3, ZW1_IN, ZW1, ZW2_IN, ZW2, & + &PRRS*PTSTEP, PRSS*PTSTEP, PRGS*PTSTEP, PSIGS, .FALSE., PMFCONV, PCLDFR, PSRCS, .FALSE., & + &OSIGMAS, .FALSE., .FALSE., & + &ZDUM, ZDUM, ZDUM, ZDUM, ZDUM, ZSIGQSAT2D, & &ZLV, ZLS, ZCPH) ! !* 3.2 compute the variation of mixing ratio diff --git a/src/mesonh/micro/radtr_satel.f90 b/src/mesonh/micro/radtr_satel.f90 index ca48c31706327bdb11dfb45a3c704d4d3b22cada..5c79550bb3f34b5eb7929616036b6468aa5c01ec 100644 --- a/src/mesonh/micro/radtr_satel.f90 +++ b/src/mesonh/micro/radtr_satel.f90 @@ -111,9 +111,14 @@ END MODULE MODI_RADTR_SATEL USE MODD_CST USE MODD_PARAMETERS USE MODD_GRID_n +USE MODD_RAIN_ICE_PARAM, ONLY: RAIN_ICE_PARAM +USE MODD_NEB, ONLY: NEB +USE MODD_TURB_n, ONLY: TURBN +USE MODD_DIMPHYEX, ONLY: DIMPHYEX_t ! USE MODD_RAD_TRANSF USE MODE_ll +USE MODE_FILL_DIMPHYEX, ONLY: FILL_DIMPHYEX ! USE MODI_INIT_NBMOD USE MODI_DETER_ANGLE @@ -259,6 +264,7 @@ REAL, DIMENSION(:,:,:), ALLOCATABLE :: ZRI_IN, ZRI_OUT ! grid scale r_i (kg/kg) REAL, DIMENSION(:,:,:), ALLOCATABLE :: ZRV_IN, ZRV_OUT ! grid scale r_v (kg/kg) REAL, DIMENSION(:,:,:), ALLOCATABLE :: ZRHO REAL, DIMENSION(SIZE(PPABST,1),SIZE(PPABST,2)) :: ZSIGQSAT2D, ZDUM +TYPE(DIMPHYEX_t) :: D !---------------------------------------------------------------------------- ! !* 1. INITIALIZATION OF CONSTANTS FOR TRANSFERT CODE @@ -280,6 +286,7 @@ IKU = SIZE(PTHT,3) CALL GET_INDICE_ll (IIB,IJB,IIE,IJE) IKB = 1 + JPVEXT IKE = IKU - JPVEXT +CALL FILL_DIMPHYEX(D, IIU, IJU, IKU) ! IKSTAE = SIZE(PSTATM,1) IKUP = IKE-JPVEXT+1 @@ -490,6 +497,12 @@ IF( SIZE(PRT(:,:,:,:),4) >= 2 ) THEN ! PRT(:,:,:,2), PRT(:,:,:,5), PRT(:,:,:,6), PSIGS, PMFCONV, ZNCLD, & ! ZSIGRC, OUSERI, OSIGMAS, .FALSE., .FALSE., & ! ZDUM, ZDUM, ZDUM, ZDUM, ZDUM, ZSIGQSAT2D ) + CALL CONDENSATION(D, CST, RAIN_ICE_PARAM, NEB, TURBN, & + &'T', 'CB02', 'CB', & + &PPABST, PZZ, ZRHO, ZTEMP, ZRV_IN, ZRV_OUT, ZRC_IN, ZRC_OUT, ZRI_IN, ZRI_OUT, & + &PRT(:,:,:,2), PRT(:,:,:,5), PRT(:,:,:,6), PSIGS, .FALSE., PMFCONV, ZNCLD, ZSIGRC, .FALSE., & + &OSIGMAS, .FALSE., .FALSE., & + &ZDUM, ZDUM, ZDUM, ZDUM, ZDUM, ZSIGQSAT2D) DEALLOCATE(ZTEMP,ZSIGRC) DEALLOCATE(ZRV_OUT) ELSE