Changeset 5396 for LMDZ6/trunk/libf/phylmdiso

Timestamp:

Dec 6, 2024, 4:35:41 PM (8 months ago)

Author:

evignon

Message:

ajout de ql_seri et qi_seri dans lmdz_lscp

File:

• LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90 (modified) (6 diffs)

LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90

@@ -365 +365 @@
        distcltop, temp_cltop,  &
        !-- LSCP - condensation and ice supersaturation variables
-       qsub, qissr, qcld, subfra, issrfra, gamma_cond, ratio_qi_qtot, &
+       qsub, qissr, qcld, subfra, issrfra, gamma_cond, &
+       ql_seri_lscp, ratio_ql_qtot, qi_seri_lscp, ratio_qi_qtot, &
        dcf_sub, dcf_con, dcf_mix, dqi_adj, dqi_sub, dqi_con, dqi_mix, &
        dqvc_adj, dqvc_sub, dqvc_con, dqvc_mix, qsatliq, qsatice, &
@@ -2480 +2481 @@
 
       !--Init for LSCP - condensation
+      ratio_ql_qtot(:,:) = 0.
       ratio_qi_qtot(:,:) = 0.
 
@@ -3010 +3012 @@
         DO i = 1, klon
           IF ( ( q_seri(i,k) + ql_seri(i,k) + qs_seri(i,k) ) .GT. 0. ) THEN
+            ratio_ql_qtot(i,k) = ql_seri(i,k) / ( q_seri(i,k) + ql_seri(i,k) + qs_seri(i,k) )
             ratio_qi_qtot(i,k) = qs_seri(i,k) / ( q_seri(i,k) + ql_seri(i,k) + qs_seri(i,k) )
             rvc_seri(i,k) = rvc_seri(i,k) * q_seri(i,k) / ( q_seri(i,k) + ql_seri(i,k) + qs_seri(i,k) )
           ELSE
+            ratio_ql_qtot(i,k) = 0.
             ratio_qi_qtot(i,k) = 0.
             rvc_seri(i,k) = 0.
+          ENDIF
+        ENDDO
+      ENDDO
+    ELSE
+      DO k = 1, klev
+        DO i = 1, klon
+          IF ( ( q_seri(i,k) + ql_seri(i,k) + qs_seri(i,k) ) .GT. 0. ) THEN
+            ratio_ql_qtot(i,k) = ql_seri(i,k) / ( q_seri(i,k) + ql_seri(i,k) + qs_seri(i,k) )
+            ratio_qi_qtot(i,k) = qs_seri(i,k) / ( q_seri(i,k) + ql_seri(i,k) + qs_seri(i,k) )
+          ELSE
+            ratio_ql_qtot(i,k) = 0.
+            ratio_qi_qtot(i,k) = 0.
           ENDIF
         ENDDO
@@ -5060 +5076 @@
     IF (ok_new_lscp) THEN
 
+ 
+    DO k = 1, klev
+      DO i = 1, klon
+        ql_seri_lscp(i,k) = ratio_ql_qtot(i,k) * q_seri(i,k)
+        qi_seri_lscp(i,k) = ratio_qi_qtot(i,k) * q_seri(i,k)
+      ENDDO
+    ENDDO
+
+
     !--mise à jour de flight_m et flight_h2o dans leur module
     !IF (ok_plane_h2o .OR. ok_plane_contrail) THEN
@@ -5066 +5091 @@
 
     CALL lscp(klon,klev,phys_tstep,missing_val,paprs,pplay,omega, &
-         t_seri, q_seri, ptconv, ratqs, sigma_qtherm, &
+         t_seri, q_seri, ql_seri_lscp, qi_seri_lscp, ptconv, ratqs, sigma_qtherm, &
          d_t_lsc, d_q_lsc, d_ql_lsc, d_qi_lsc, rneb, rneblsvol, &
          pfraclr, pfracld, cldfraliq, sigma2_icefracturb, mean_icefracturb,  &
@@ -5077 +5102 @@
          cell_area, &
          cf_seri, rvc_seri, u_seri, v_seri, &
-         qsub, qissr, qcld, subfra, issrfra, gamma_cond, ratio_qi_qtot, &
+         qsub, qissr, qcld, subfra, issrfra, gamma_cond,  &
          dcf_sub, dcf_con, dcf_mix, dqi_adj, dqi_sub, dqi_con, dqi_mix, &
          dqvc_adj, dqvc_sub, dqvc_con, dqvc_mix, qsatliq, qsatice, &