Changeset 5639 for LMDZ6

Timestamp:

Apr 30, 2025, 3:08:27 PM (5 weeks ago)

Author:

aborella

Message:

Small bugfixes contrails RF

Location:

LMDZ6/branches/contrails/libf/phylmd

Files:

• lmdz_cloud_optics_prop.f90 (modified) (8 diffs)
• lmdz_cloud_optics_prop_ini.f90 (modified) (3 diffs)
• lmdz_lscp_condensation.f90 (modified) (2 diffs)
• phys_output_write_mod.F90 (modified) (1 diff)

LMDZ6/branches/contrails/libf/phylmd/lmdz_cloud_optics_prop.f90

@@ -173 +173 @@
   REAL zflwp_var, zfiwp_var
   REAL d_rei_dt
-  REAL pclc_cont, pclc_perscont
+  REAL pclc_cont(klon,klev), pclc_perscont(klon,klev)
   REAL rei_cont, rei_perscont
 
@@ -574 +574 @@
         reice_nocont(i,k) = 0.
         pclc_nocont(i,k) = 0.
+        pclc_cont(i,k) = 0.
+        pclc_perscont(i,k) = 0.
         pcltau_cont(i,k) = 0.
         pclemi_cont(i,k) = 0.
@@ -688 +690 @@
 
         IF ( contfra(i,k) .GT. 0.01 * seuil_neb ) THEN
-          pclc_cont = contfra(i,k)
+          pclc_cont(i,k) = contfra(i,k)
           rei_cont = re_ice_crystals_contrails * 1.E6
         ELSE
-          pclc_cont = 0.
+          pclc_cont(i,k) = 0.
           rei_cont = 1.
         ENDIF
@@ -698 +700 @@
         IF ( perscontfra(i,k) .GT. 0.01 * seuil_neb ) THEN
           !--Everything is the same but with contrails
-          pclc_perscont = perscontfra(i,k)
+          pclc_perscont(i,k) = perscontfra(i,k)
 
           tc = temp(i, k) - 273.15
@@ -705 +707 @@
 
         ELSE
-          pclc_perscont = 0.
+          pclc_perscont(i,k) = 0.
           rei_perscont = 1.
         ENDIF
@@ -711 +713 @@
         IF ( MAX(contfra(i,k), perscontfra(i,k)) .GT. 0.01 * seuil_neb ) THEN
 
-          rei = ( rei_cont * pclc_cont + rei_perscont * pclc_perscont ) &
-              / ( pclc_cont + pclc_perscont )
+          rei = ( rei_cont * pclc_cont(i,k) + rei_perscont * pclc_perscont(i,k) ) &
+              / ( pclc_cont(i,k) + pclc_perscont(i,k) )
           zfiwp_var = 1000.*(xfiwc(i, k)-xfiwc_nocont(i, k))&
                     / (pclc(i, k)-pclc_nocont(i, k))*rhodz(i, k)
@@ -730 +732 @@
 
 
-        rei = ( rei_cont * pclc_cont + rei_perscont * pclc_perscont &
+        rei = ( rei_cont * pclc_cont(i,k) + rei_perscont * pclc_perscont(i,k) &
             + reice_nocont(i, k) * pclc_nocont(i, k) ) &
-            / ( pclc_cont + pclc_perscont + pclc_nocont(i,k) )
+            / ( pclc_cont(i,k) + pclc_perscont(i,k) + pclc_nocont(i,k) )
 
         zflwp_var = 1000.*xflwc(i, k)/pclc(i, k)*rhodz(i, k)
@@ -879 +881 @@
     DO k = klev, 1, -1
       DO i = 1, klon
-        zclear(i) = zclear(i)*(1.-max(contfra(i,k)+perscontfra(i,k),zcloud(i)))/&
+        zclear(i) = zclear(i)*(1.-max(pclc_cont(i,k)+pclc_perscont(i,k),zcloud(i)))/&
           (1.-min(real(zcloud(i),kind=8),1.-zepsec))
         pct_cont(i) = 1. - zclear(i)
-        zcloud(i) = contfra(i,k) + perscontfra(i,k)
+        zcloud(i) = pclc_cont(i,k) + pclc_perscont(i,k)
         IF (paprs(i,k)<prmhc) THEN
           pch_nocont(i) = pch_nocont(i)*(1.-max(pclc_nocont(i,k),zcloudh(i)))/(1.-min(real( &

LMDZ6/branches/contrails/libf/phylmd/lmdz_cloud_optics_prop_ini.f90

@@ -29 +29 @@
   REAL, PARAMETER :: prlmc=680.*100. ! Pressure between low and medium level cloud in Pa
   REAL, PARAMETER :: coef_froi=0.09, coef_chau =0.13
-  REAL, PARAMETER :: seuil_neb=0.001
+  REAL, PROTECTED :: seuil_neb=0.001
 ! if iflag_t_glace=0, old values are used for liquid/ice partitionning:
   REAL, PARAMETER :: t_glace_min_old = 258.
@@ -43 +43 @@
 !$OMP THREADPRIVATE(rei_coef, rei_min_temp)
 !$OMP THREADPRIVATE(zepsec) 
-!$OMP THREADPRIVATE(re_ice_crystals_contrails) 
+!$OMP THREADPRIVATE(re_ice_crystals_contrails, seuil_neb)
 
   
@@ -111 +111 @@
     CALL getin_p('rei_min_temp',rei_min_temp)
     CALL getin_p('re_ice_crystals_contrails', re_ice_crystals_contrails)
+    CALL getin_p('seuil_neb_rad', seuil_neb)
+    write(lunout,*)'seuil_neb_rad=',seuil_neb
 
    

LMDZ6/branches/contrails/libf/phylmd/lmdz_lscp_condensation.f90

@@ -456 +456 @@
       IF ( ok_plane_contrail ) THEN
         contfra(i) = MAX(0., MIN(cldfra(i), contfra_in(i)))
-        perscontfra(i) = MAX(0., MIN(cldfra(i), perscontfra_in(i)))
+        perscontfra(i) = MAX(0., MIN(cldfra(i) - contfra(i), perscontfra_in(i)))
         qcont(i) = MAX(0., MIN(qcld(i), qva_in(i) + qia_in(i)))
 
@@ -1275 +1275 @@
       IF ( cldfra(i) .GE. ( 1. - cfcon(i) - eps ) ) THEN
         contrails_conversion_factor = 1.
+      ELSEIF ( contfra(i) .LT. 1.e-6 ) THEN
+        contrails_conversion_factor = 1.
       ELSE
         contrails_conversion_factor = ( 1. - &

LMDZ6/branches/contrails/libf/phylmd/phys_output_write_mod.F90

@@ -2198 +2198 @@
          IF (ok_rad_contrail) THEN
            IF (vars_defined) zx_tmp_fi2d = topsw_nocont * swradcorr
-           CALL histwrite_phy(o_tops_nocont, topsw_nocont)
+           CALL histwrite_phy(o_tops_nocont, zx_tmp_fi2d)
            CALL histwrite_phy(o_topl_nocont, toplw_nocont)
            IF (vars_defined) zx_tmp_fi2d = topsw_nocont * swradcorr - toplw_nocont
            CALL histwrite_phy(o_nettop_nocont, zx_tmp_fi2d)
            IF (vars_defined) zx_tmp_fi2d = solsw_nocont * swradcorr
-           CALL histwrite_phy(o_sols_nocont, solsw_nocont)
+           CALL histwrite_phy(o_sols_nocont, zx_tmp_fi2d)
            CALL histwrite_phy(o_soll_nocont, sollw_nocont)
          ENDIF