Changeset 4715 for LMDZ6/trunk/libf/phylmdiso

Timestamp:

Oct 5, 2023, 4:14:22 PM (16 months ago)

Author:

Laurent Fairhead

Message:

Final (hopefully) commit from the newmicro replayisation workshop. The final USE statements that were
still included in the cloud_optics_prop routine were moved to the call_cloud_optics_prop routine that
sets up the interface between LMDZ and the parametrization.
LF for LR, MCD, AI, EV, JBM

Location:

LMDZ6/trunk/libf/phylmdiso

Files:

• lmdz_call_cloud_optics_prop.F90 (added)
• physiq_mod.F90 (modified) (4 diffs)

LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90

@@ -78 +78 @@
     USE wxios, ONLY: g_ctx, wxios_set_context
     USE lmdz_lscp, ONLY : lscp
-    USE lmdz_cloud_optics_prop, ONLY : cloud_optics_prop
+    USE lmdz_call_cloud_optics_prop, ONLY : call_cloud_optics_prop
     USE lmdz_lscp_old, ONLY : fisrtilp
     USE lmdz_wake_ini, ONLY : wake_ini
@@ -1932 +1932 @@
                              RCPD, RLSTT, RLVTT, RLMLT, &
                              RVTMP2, RTT,RD,RG)
+       ! Test de coherence sur oc_cdnc utilisé uniquement par cloud_optics_prop
+       IF (ok_newmicro) then
+          IF (iflag_rrtm.EQ.1) THEN
+#ifdef CPP_RRTM
+             IF (ok_cdnc.AND.NRADLP.NE.3) THEN
+             abort_message='RRTM choix incoherent NRADLP doit etre egal a 3 ' &
+                  // 'pour ok_cdnc' 
+             CALL abort_physic(modname,abort_message,1)
+             ENDIF
+#else
+
+             abort_message='You should compile with -rrtm if running with '//'iflag_rrtm=1'
+             CALL abort_physic(modname,abort_message,1)
+#endif
+          ENDIF
+       ENDIF   
        CALL cloud_optics_prop_ini(klon, prt_level, lunout, flag_aerosol, &
                                   & ok_cdnc, bl95_b0, &
@@ -5577 +5593 @@
        ENDIF
 
-       IF (ok_newmicro) then
-! AI          IF (iflag_rrtm.NE.0) THEN 
-          IF (iflag_rrtm.EQ.1) THEN
-#ifdef CPP_RRTM
-             IF (ok_cdnc.AND.NRADLP.NE.3) THEN
-             abort_message='RRTM choix incoherent NRADLP doit etre egal a 3 ' &
-                  // 'pour ok_cdnc' 
-             CALL abort_physic(modname,abort_message,1)
-             ENDIF
-#else
-
-             abort_message='You should compile with -rrtm if running with '//'iflag_rrtm=1'
-             CALL abort_physic(modname,abort_message,1)
-#endif
-          ENDIF
-          CALL cloud_optics_prop(klon, klev, &
+       !Rajout appel a interface calcul proprietes optiques des nuages
+       CALL call_cloud_optics_prop(klon, klev, ok_newmicro, &
                paprs, pplay, t_seri, radocond, picefra, cldfra, &
                cldtau, cldemi, cldh, cldl, cldm, cldt, cldq, &
-               flwp, fiwp, flwc, fiwc, &
+               flwp, fiwp, flwc, fiwc, ok_aie, &
                mass_solu_aero, mass_solu_aero_pi, &
                cldtaupi, distcltop, temp_cltop, re, fl, ref_liq, ref_ice, &
@@ -5601 +5603 @@
                reffclwc, cldnvi, lcc3d, lcc3dcon, lcc3dstra, icc3dcon, icc3dstra,  & 
                zfice, dNovrN, ptconv, rnebcon, clwcon)
-       ELSE
-          CALL nuage (paprs, pplay, &
-               t_seri, radocond, picefra, cldfra, cldtau, cldemi, &
-               cldh, cldl, cldm, cldt, cldq, &
-               ok_aie, &
-               mass_solu_aero, mass_solu_aero_pi, &
-               bl95_b0, bl95_b1, distcltop, temp_cltop, &
-               cldtaupi, re, fl)
-       ENDIF
+
        !
        !IM betaCRF