Changeset 3124 for LMDZ6/trunk/libf

Timestamp:

Dec 13, 2017, 3:24:16 PM (7 years ago)

Author:

musat

Message:

Add CMIP6' variables cldicemxrat, cldwatmxrat
IM

Location:

LMDZ6/trunk/libf/phylmd

Files:

• newmicro.F90 (modified) (2 diffs)
• phys_local_var_mod.F90 (modified) (3 diffs)
• phys_output_ctrlout_mod.F90 (modified) (1 diff)
• phys_output_write_mod.F90 (modified) (3 diffs)

LMDZ6/trunk/libf/phylmd/newmicro.F90

@@ -10 +10 @@
   USE dimphy
   USE phys_local_var_mod, ONLY: scdnc, cldncl, reffclwtop, lcc, reffclws, &
-    reffclwc, cldnvi, lcc3d, lcc3dcon, lcc3dstra, icc3dcon, icc3dstra
+    reffclwc, cldnvi, lcc3d, lcc3dcon, lcc3dstra, icc3dcon, icc3dstra, zfice
   USE phys_state_var_mod, ONLY: rnebcon, clwcon
   USE icefrac_lsc_mod ! computes ice fraction (JBM 3/14)
@@ -152 +152 @@
   REAL zrho(klon, klev) !--rho pour la couche
   REAL dh(klon, klev) !--dz pour la couche
-  REAL zfice(klon, klev)
   REAL rad_chaud(klon, klev) !--rayon pour les nuages chauds
   REAL rad_chaud_pi(klon, klev) !--rayon pour les nuages chauds pre-industriels

LMDZ6/trunk/libf/phylmd/phys_local_var_mod.F90

@@ -173 +173 @@
       REAL, SAVE, ALLOCATABLE :: icc3dstra(:,:)
       !$OMP THREADPRIVATE(icc3dstra)
+      REAL, SAVE, ALLOCATABLE :: zfice(:,:)
+      !$OMP THREADPRIVATE(zfice)
       REAL, SAVE, ALLOCATABLE :: od443aer(:) 
       !$OMP THREADPRIVATE(od443aer) 
@@ -599 +601 @@
       ALLOCATE(icc3dcon(klon, klev))
       ALLOCATE(icc3dstra(klon, klev))
+      ALLOCATE(zfice(klon, klev))
       ALLOCATE(od443aer(klon))
       ALLOCATE(od550aer(klon))
@@ -876 +879 @@
       DEALLOCATE(icc3dcon)
       DEALLOCATE(icc3dstra)
+      DEALLOCATE(zfice)
       DEALLOCATE(od443aer)
       DEALLOCATE(od550aer)

LMDZ6/trunk/libf/phylmd/phys_output_ctrlout_mod.F90

@@ -1451 +1451 @@
   TYPE(ctrl_out), SAVE :: o_icc3dstra = ctrl_out((/ 2,  6, 10, 10, 10, 10, 11, 11, 11, 11/), &
     'icc3dstra', 'Stratiform cloud ice fraction', '1', (/ ('', i=1, 10) /))
+  TYPE(ctrl_out), SAVE :: o_cldicemxrat = ctrl_out((/ 2,  6, 10, 10, 10, 10, 11, 11, 11, 11/), &
+    'cldicemxrat', 'Cloud Ice Mixing Ratio', '1', (/ ('', i=1, 10) /))
+  TYPE(ctrl_out), SAVE :: o_cldwatmxrat = ctrl_out((/ 2,  6, 10, 10, 10, 10, 11, 11, 11, 11/), &
+    'cldwatmxrat', 'Cloud Water Mixing Ratio', '1', (/ ('', i=1, 10) /))
   TYPE(ctrl_out), SAVE :: o_solbnd = ctrl_out((/ 2,  6, 10, 10, 10, 10, 11, 11, 11, 11/), &
     'solbnd', 'Top-of-Atmosphere Solar Insolation for each band', 'W m-2', (/ ('', i=1, 10) /))

LMDZ6/trunk/libf/phylmd/phys_output_write_mod.F90

@@ -123 +123 @@
          o_cldnvi, o_lcc, o_lcc3d, o_lcc3dcon, &
          o_lcc3dstra, o_icc3dcon, o_icc3dstra, &
-         o_reffclwtop, o_ec550aer, &
+         o_cldicemxrat, o_cldwatmxrat, o_reffclwtop, o_ec550aer, &
          o_lwcon, o_iwcon, o_temp, o_theta, &
          o_ovapinit, o_ovap, o_oliq, o_ocond, o_geop, &
@@ -280 +280 @@
          scdnc, cldncl, reffclws, reffclwc, cldnvi, stratomask,&
          lcc, lcc3d, lcc3dcon, lcc3dstra, &
-         icc3dcon, icc3dstra, reffclwtop, &
+         icc3dcon, icc3dstra, zfice, reffclwtop, &
          ec550aer, flwc, fiwc, t_seri, theta, q_seri, &
          ql_seri, qs_seri, tr_seri, &
@@ -1410 +1410 @@
           CALL histwrite_phy(o_icc3dcon, icc3dcon)
           CALL histwrite_phy(o_icc3dstra, icc3dstra)
+          CALL histwrite_phy(o_cldicemxrat, zfice)
+          zx_tmp_fi3d(:,:)=1-zfice(:,:)
+          CALL histwrite_phy(o_cldwatmxrat, zx_tmp_fi3d)
           CALL histwrite_phy(o_reffclwtop, reffclwtop)
        ENDIF