diff --git a/src/MNH/condensation.f90 b/src/MNH/condensation.f90 index a11aa885844b8275acc19f7ada5fa0da08fa305d..6633d68cb7af08784928eb9ff578c1ed473c1b6d 100644 --- a/src/MNH/condensation.f90 +++ b/src/MNH/condensation.f90 @@ -399,7 +399,7 @@ IKTB=1+JPVEXT IKTE=KKU-JPVEXT ! ! -!$acc kernels present_cr(zrt) +!$acc kernels present_cr(ZRT) PCLDFR(:,:,:) = 0. ! Initialize values PSIGRC(:,:,:) = 0. ! Initialize values ! @@ -412,13 +412,13 @@ PSIGRC(:,:,:) = 0. ! Initialize values ! latent heat of vaporisation/sublimation IF(GPRESENT_PLV .AND. GPRESENT_PLS) THEN !$acc data present( PLV, PLS ) -!$acc kernels present_cr(zlv,zls) +!$acc kernels present_cr(ZLV,ZLS) ZLV(:,:,:)=PLV(:,:,:) ZLS(:,:,:)=PLS(:,:,:) !$acc end kernels !$acc end data ELSE -!$acc kernels present_cr(zlv,zls) +!$acc kernels present_cr(ZLV, ZLS) ! latent heat of vaporisation/sublimation ZLV(KIB:KIE,KJB:KJE,IKTB:IKTE) = XLVTT + ( XCPV - XCL ) * ( PT(KIB:KIE,KJB:KJE,IKTB:IKTE) - XTT ) ZLS(KIB:KIE,KJB:KJE,IKTB:IKTE) = XLSTT + ( XCPV - XCI ) * ( PT(KIB:KIE,KJB:KJE,IKTB:IKTE) - XTT ) @@ -426,12 +426,12 @@ ELSE ENDIF IF(GPRESENT_PCPH) THEN !$acc data present( PCPH ) -!$acc kernels present_cr(zcpd) +!$acc kernels present_cr(ZCPD) ZCPD(:,:,:)=PCPH(:,:,:) !$acc end kernels !$acc end data ELSE -!$acc kernels present_cr(zcpd) +!$acc kernels present_cr(ZCPD) ZCPD(KIB:KIE,KJB:KJE,IKTB:IKTE) = XCPD + XCPV*PRV(KIB:KIE,KJB:KJE,IKTB:IKTE) & + XCL*PRC(KIB:KIE,KJB:KJE,IKTB:IKTE) + XCI*PRI(KIB:KIE,KJB:KJE,IKTB:IKTE) & + XCI*(PRS(KIB:KIE,KJB:KJE,IKTB:IKTE) + PRG(KIB:KIE,KJB:KJE,IKTB:IKTE) ) @@ -441,7 +441,7 @@ ENDIF !acc kernels ! Preliminary calculations needed for computing the "turbulent part" of Sigma_s IF ( .NOT. OSIGMAS ) THEN -!$acc kernels present_cr(ztmin,zzzp) +!$acc kernels present_cr(ZTLK,ITPL,ZTMIN,ZZZP) ! store temperature at saturation ZTLK(KIB:KIE,KJB:KJE,IKTB:IKTE) = PT(KIB:KIE,KJB:KJE,IKTB:IKTE) & - ZLV(KIB:KIE,KJB:KJE,IKTB:IKTE)*PRC(KIB:KIE,KJB:KJE,IKTB:IKTE)/ZCPD(KIB:KIE,KJB:KJE,IKTB:IKTE) & @@ -652,7 +652,8 @@ DO CONCURRENT (JI=KIB:KIE,JJ=KJB:KJE,JK=IKTB:IKTE) ZCONDP(JI,JJ,JK) = BR_EXP( 1.2*ZQ1P(JI,JJ,JK)-1. ) #endif END IF - + ZCONDP(JI,JJ,JK) = ZCONDP(JI,JJ,JK) * ZSIGMAP(JI,JJ,JK) + INQ1P(JI,JJ,JK) = MIN( MAX(-22,FLOOR(MIN(100., MAX(-100., 2*ZQ1P(JI,JJ,JK)))) ), 10) !inner min/max prevents sigfpe when 2*zq1 does not fit into an int ZINCP(JI,JJ,JK) = 2.*ZQ1P(JI,JJ,JK) - INQ1P(JI,JJ,JK)