Changeset 5194 for LMDZ6/branches/Amaury_dev/libf

Timestamp:

Sep 16, 2024, 2:51:32 PM (4 months ago)

Author:

abarral

Message:

Merge r5189, r5191 from trunk

Location:

LMDZ6/branches/Amaury_dev

Files:

• . (modified) (1 prop)
• libf/phylmd/lmdz_lscp.F90 (modified) (2 diffs)
• libf/phylmd/physiq_mod.F90 (modified) (3 diffs)
• libf/phylmdiso/physiq_mod.F90 (modified) (3 diffs)

LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_lscp.F90

@@ -947 +947 @@
 
       ! Partition function depending on temperature
-      CALL icefrac_lscp(klon, Tbef, iflag_ice_thermo, zdistcltop, ztemp_cltop, zfice, dzfice)
+      CALL icefrac_lscp(klon, zt, iflag_ice_thermo, zdistcltop, ztemp_cltop, zfice, dzfice)
 
       ! Partition function depending on tke for non shallow-convective clouds
@@ -1332 +1332 @@
               znebprecipcld(i) = 0.0
             ENDIF
-            !IF ( ((1-zfice(i))*zoliq(i) .GT. 0.) .AND. (zt(i) .LE. 233.15) ) THEN
-            !PRINT*,'WARNING LEA OLIQ A <-40°C '
-            !PRINT*,'zt,Tbef,oliq,oice,cldfraliq,icefrac,rneb',zt(i),Tbef(i),(1-zfice(i))*zoliq(i),zfice(i)*zoliq(i),cldfraliq(i,k),zfice(i),rneb(i,k)
-            !ENDIF
-          ENDDO
+        ENDDO
 
         ENDIF

LMDZ6/branches/Amaury_dev/libf/phylmd/physiq_mod.F90

@@ -1219 +1219 @@
     !albedo SB <<<
 
+    !--Lea Raillard qs_ini
+    REAL, dimension(klon,klev) :: qs_ini
+
     !--OB variables for mass fixer (hard coded for now)
     REAL qql1(klon), qql2(klon), corrqql
@@ -2377 +2380 @@
       ENDDO
     ENDDO
-
-    !--OB water mass fixer
+    ! Lea Raillard qs_ini for cloud phase param.
+    qs_ini(:, :) = qs_seri(:, :)
+
+    !--OB water mass fixer 
     IF (ok_water_mass_fixer) THEN
       !--store initial water burden
@@ -3739 +3744 @@
 
       CALL lscp(klon, klev, phys_tstep, missing_val, paprs, pplay, &
-              t_seri, q_seri, qs_ancien, ptconv, ratqs, &
+              t_seri, q_seri, qs_ini, ptconv, ratqs, &
               d_t_lsc, d_q_lsc, d_ql_lsc, d_qi_lsc, rneb, rneblsvol, rneb_seri, &
               pfraclr, pfracld, cldfraliq, sigma2_icefracturb, mean_icefracturb, &

LMDZ6/branches/Amaury_dev/libf/phylmdiso/physiq_mod.F90

@@ -1340 +1340 @@
     !albedo SB <<<
 
+    !--Lea Raillard qs_ini 
+    REAL, dimension(klon,klev) :: qs_ini
+
     !--OB variables for mass fixer (hard coded for now)
     LOGICAL, PARAMETER :: mass_fixer=.FALSE.
@@ -2582 +2585 @@
        ENDDO
     ENDDO
+    
+    ! Lea Raillard qs_ini for cloud phase param.
+    qs_ini(:,:)=qs_seri(:,:)
 
     ! C Risi: dispatcher les isotopes dans les xt_seri
@@ -5013 +5019 @@
 
     CALL lscp(klon,klev,phys_tstep,missing_val,paprs,pplay, &
-         t_seri, q_seri,qs_ancien,ptconv,ratqs, &
+         t_seri, q_seri,qs_ini,ptconv,ratqs, &
          d_t_lsc, d_q_lsc, d_ql_lsc, d_qi_lsc, rneb, rneblsvol, rneb_seri, & 
          pfraclr, pfracld, cldfraliq, sigma2_icefracturb, mean_icefracturb,  &