Changeset 5717 for LMDZ6/branches/contrails/libf/phylmd/lmdz_cloud_optics_prop.f90

Timestamp:

Jun 18, 2025, 5:12:20 PM (6 months ago)

Author:

aborella

Message:

Merge with trunk r5653

Location:

LMDZ6/branches/contrails

Files:

• . (modified) (1 prop)
• libf/phylmd/lmdz_cloud_optics_prop.f90 (modified) (3 diffs)

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

@@ -29 +29 @@
   USE lmdz_cloud_optics_prop_ini , ONLY : k_ice0, df
   USE lmdz_cloud_optics_prop_ini , ONLY : rg, rd, rpi
-  USE lmdz_cloud_optics_prop_ini , ONLY : rad_chau1, rad_chau2, rad_froid, iflag_rei
+  USE lmdz_cloud_optics_prop_ini , ONLY : rad_chau1, rad_chau2, iflag_rei
   USE lmdz_cloud_optics_prop_ini , ONLY : ok_icefra_lscp, rei_max, rei_min
   USE lmdz_cloud_optics_prop_ini , ONLY : rei_coef, rei_min_temp
@@ -207 +207 @@
   reice_pi = 0.
 
-  IF (iflag_t_glace.EQ.0) THEN
+  IF ((.NOT. ok_new_lscp) .AND. iflag_t_glace.EQ.0) THEN
     DO k = 1, klev
       DO i = 1, klon
@@ -233 +233 @@
 
       DO i = 1, klon
-        
+
         IF ((.NOT. ptconv(i,k)) .AND. ok_new_lscp .AND. ok_icefra_lscp) THEN
         ! EV: take the ice fraction directly from the lscp code