Changeset 4693

Timestamp:

Sep 18, 2023, 7:24:45 PM (8 months ago)

Author:

Laurent Fairhead

Message:

Forgot modifications to phylmdiso for lmdz_cloud_optics_prop

Location:

LMDZ6/trunk/libf/phylmdiso

Files:

• lmdz_cloud_optics_prop_ini.F90 (added)
• physiq_mod.F90 (modified) (5 diffs)

LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90

@@ -76 +76 @@
     USE vampir
     USE write_field_phy
-    USE wxios, ONLY: g_ctx, wxios_set_context, using_xios
+    USE wxios, ONLY: g_ctx, wxios_set_context
+    USE lmdz_lscp, ONLY : lscp
     USE lmdz_cloud_optics_prop, ONLY : cloud_optics_prop
-    USE lmdz_lscp, ONLY : lscp
     USE lmdz_lscp_old, ONLY : fisrtilp
     USE lmdz_wake_ini, ONLY : wake_ini
@@ -89 +89 @@
     USE lmdz_ratqs_main, ONLY : ratqs_main
     USE lmdz_ratqs_ini, ONLY : ratqs_ini
+    USE lmdz_cloud_optics_prop_ini, ONLY : cloud_optics_prop_ini
     USE phys_output_var_mod, ONLY :      cloudth_sth,cloudth_senv,cloudth_sigmath,cloudth_sigmaenv
 
@@ -396 +397 @@
 #endif
        !
+       USE phys_local_var_mod, ONLY: scdnc, cldncl, reffclwtop, lcc, reffclws, &
+       reffclwc, cldnvi, lcc3d, lcc3dcon, lcc3dstra, icc3dcon, icc3dstra,  & 
+       zfice, dNovrN, ptconv
+
 
     IMPLICIT NONE
@@ -1926 +1931 @@
                              RCPD, RLSTT, RLVTT, RLMLT, &
                              RVTMP2, RTT,RD,RG)
-
+       CALL cloud_optics_prop_ini(klon, prt_level, lunout, flag_aerosol, &
+                                  & ok_cdnc, bl95_b0, &
+                                  & bl95_b1, latitude_deg)
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
@@ -5583 +5590 @@
 #endif
           ENDIF
-          CALL cloud_optics_prop(flag_aerosol, ok_cdnc, bl95_b0, bl95_b1, &
+          CALL cloud_optics_prop(klon, klev, &
                paprs, pplay, t_seri, radocond, picefra, cldfra, &
                cldtau, cldemi, cldh, cldl, cldm, cldt, cldq, &
                flwp, fiwp, flwc, fiwc, &
                mass_solu_aero, mass_solu_aero_pi, &
-               cldtaupi, latitude_deg, distcltop, temp_cltop, re, fl, ref_liq, ref_ice, &
-               ref_liq_pi, ref_ice_pi)
+               cldtaupi, distcltop, temp_cltop, re, fl, ref_liq, ref_ice, &
+               ref_liq_pi, ref_ice_pi, scdnc, cldncl, reffclwtop, lcc, reffclws, &
+               reffclwc, cldnvi, lcc3d, lcc3dcon, lcc3dstra, icc3dcon, icc3dstra,  & 
+               zfice, dNovrN, ptconv, rnebcon, clwcon)
        ELSE
           CALL nuage (paprs, pplay, &