Changeset 6021 for LMDZ6/trunk/libf/phylmd/physiq_mod.F90

Timestamp:

Jan 13, 2026, 11:42:56 AM (5 days ago)

Author:

evignon

Message:

petites modifs pour:

• adapter le diag de rhliq et rhice (revision papier mixed-phase dans ACP)
• mettre les precip totales en inout de call_lscp

File:

• LMDZ6/trunk/libf/phylmd/physiq_mod.F90 (modified) (4 diffs)

LMDZ6/trunk/libf/phylmd/physiq_mod.F90

@@ -3565 +3565 @@
     CALL prt_enerbil('convection',itap)
 
+    ! total precipitation (rain_lsc and snow_lsc will be added in call_lscp)
+    DO i = 1, klon
+       rain_fall(i) = rain_con(i)
+       snow_fall(i) = snow_con(i)         
+    ENDDO
+
+
     !-------------------------------------------------------------------------
 
@@ -3961 +3968 @@
      mean_icefracturb,mean_icefracturbth,               &
      radocond, radicefrac, rain_lsc, snow_lsc,          &
+     rain_fall, snow_fall,                              &
      frac_impa, frac_nucl, beta,                        &
      pfrac_impa, pfrac_nucl, pfrac_1nucl,               &
@@ -4167 +4175 @@
        ENDDO
     ENDIF
-    !
-    ! Precipitation totale
-    !
-    DO i = 1, klon
-       rain_fall(i) = rain_con(i) + rain_lsc(i)
-       snow_fall(i) = snow_con(i) + snow_lsc(i)
-    ENDDO
     !
     ! Calculer l'humidite relative pour diagnostique
@@ -4200 +4201 @@
           zx_rh(i,k) = q_seri(i,k)/zx_qs
           IF (iflag_ice_thermo .GT. 0) THEN
-             zx_rhl(i,k) = q_seri(i,k)/(qsatl(zx_t)/pplay(i,k))
-             zx_rhi(i,k) = q_seri(i,k)/(qsats(zx_t)/pplay(i,k))
+             zx_rhl(i,k) = MIN(q_seri(i,k)/(qsatl(zx_t)/pplay(i,k)),1.)
+             zx_rhi(i,k) = zx_rhl(i,k)*qsatl(zx_t)/qsats(zx_t)
           ENDIF
           zqsat(i,k)=zx_qs