diff --git a/src/MNH/resolved_cloud.f90 b/src/MNH/resolved_cloud.f90 index b32c0783c111ab382eafb4860b8a85461709e8af..7268195331105135fb07543d7768ed1cd02b95c1 100644 --- a/src/MNH/resolved_cloud.f90 +++ b/src/MNH/resolved_cloud.f90 @@ -452,7 +452,7 @@ INTEGER :: JK,JI,JL ! ! REAL, DIMENSION(SIZE(PZZ,1),SIZE(PZZ,2),SIZE(PZZ,3)):: ZDZZ -REAL, DIMENSION(SIZE(PZZ,1),SIZE(PZZ,2),SIZE(PZZ,3)):: ZT,ZEXN,ZLV,ZLS,ZCPH +real, dimension(:,:,:), allocatable :: ZEXN REAL, DIMENSION(SIZE(PZZ,1),SIZE(PZZ,2),SIZE(PZZ,3)):: ZCOR ! for the correction of negative rv REAL, DIMENSION(SIZE(PZZ,1),SIZE(PZZ,2),SIZE(PZZ,3)):: ZZZ @@ -572,6 +572,7 @@ IF (HCLOUD == 'C2R2' .OR. HCLOUD == 'C3R5' .OR. HCLOUD == 'KHKO' & PSVT(:,:,IKE+1,ISVBEG:ISVEND) = PSVT(:,:,IKE,ISVBEG:ISVEND) ENDIF ! +! !* 3. REMOVE NEGATIVE VALUES ! ---------------------- ! @@ -718,6 +719,8 @@ SELECT CASE ( HCLOUD ) !* 9. MIXED-PHASE MICROPHYSICAL SCHEME (WITH 3 ICE SPECIES) ! ----------------------------------------------------- ! + allocate( zexn( size( pzz, 1 ), size( pzz, 2 ), size( pzz, 3 ) ) ) + ZEXN(:,:,:)= (PPABST(:,:,:)/XP00)**(XRD/XCPD) ! !* 9.1 Compute the explicit microphysical sources ! @@ -791,12 +794,16 @@ SELECT CASE ( HCLOUD ) PRS=PRS(:,:,:,5)*PTSTEP, & PRG=PRS(:,:,:,6)*PTSTEP ) END IF + + deallocate( zexn ) ! CASE ('ICE4') ! !* 10. MIXED-PHASE MICROPHYSICAL SCHEME (WITH 4 ICE SPECIES) ! ----------------------------------------------------- ! + allocate( zexn( size( pzz, 1 ), size( pzz, 2 ), size( pzz, 3 ) ) ) + ZEXN(:,:,:)= (PPABST(:,:,:)/XP00)**(XRD/XCPD) ! !* 10.1 Compute the explicit microphysical sources ! @@ -877,6 +884,8 @@ SELECT CASE ( HCLOUD ) PRG=PRS(:,:,:,6)*PTSTEP, & PRH=PRS(:,:,:,7)*PTSTEP ) END IF + + deallocate( zexn ) ! ! !* 12. 2-MOMENT MIXED-PHASE MICROPHYSICAL SCHEME LIMA