Changeset 5593 for LMDZ6

Timestamp:

Mar 26, 2025, 7:29:27 PM (3 months ago)

Author:

aborella

Message:

Forgot a USE + small bug fixes and errors from previous commits

Location:

LMDZ6/branches/contrails

Files:

• DefLists/field_def_lmdz.xml (modified) (2 diffs)
• DefLists/file_def_histmth_lmdz.xml (modified) (1 diff)
• libf/phylmd/lmdz_lscp.f90 (modified) (2 diffs)
• libf/phylmd/phys_output_write_mod.F90 (modified) (1 diff)

LMDZ6/branches/contrails/DefLists/field_def_lmdz.xml ¶

@@ -594 +594 @@
         <field id="issrfra300to400" long_name="Supersaturated fraction in the 300to400 hPa layer"    unit="kg/kg" />
         <field id="issrfra400to500" long_name="Supersaturated fraction in the 400to500 hPa layer"    unit="kg/kg" />
+        <field id="cldh_nocont"   long_name="High-level cloudiness w/o contrails"    unit="-" />
+        <field id="contcov"       long_name="Total contrails cover"    unit="-" />
+        <field id="iwp_nocont"    long_name="Cloud ice water path w/o contrails"    unit="kg/m2" />
+        <field id="tops_nocont"   long_name="Solar rad. at TOA w/o contrails"    unit="W/m2" />
+        <field id="topl_nocont"   long_name="IR rad. at TOA w/o contrails"    unit="W/m2" />
+        <field id="sols_nocont"   long_name="Solar rad. at surf. w/o contrails"    unit="W/m2" />
+        <field id="soll_nocont"   long_name="IR rad. at surface w/o contrails"    unit="W/m2" />
+        <field id="nettop_nocont" long_name="Net dn radiatif flux at TOA w/o contrails"    unit="W/m2" />
             <!-- Begin Added SN isotopes 2D fields 07 2023 -->
             <!-- water oxygen H216O H217O H218O -->
@@ -925 +933 @@
         <field id="flightdist" long_name="Aviation flown distance concentration"    unit="m/s/m3" />
         <field id="flighth2o"  long_name="Aviation emitted H2O concentration"    unit="kg H2O/s/m3" />
-            <field id="dqavi"      long_name="Water vapor emissions from aviation tendency"    unit="kg/kg/s" />
-            <field id="cldfra_nocont" long_name="Cloud fraction w/o contrails"    unit="-" />
-            <field id="cldtau_nocont" long_name="Cloud optical thickness w/o contrails"    unit="1" />
-            <field id="cldemi_nocont" long_name="Cloud optical emissivity w/o contrails"    unit="1" />
-            <field id="cldh_nocont"   long_name="High-level cloudiness w/o contrails"    unit="-" />
-            <field id="contcov"       long_name="Total contrails cover"    unit="-" />
-        <field id="iwp_nocont"    long_name="Cloud ice water path w/o contrails"    unit="kg/m2" />
+        <field id="dqavi"      long_name="Water vapor emissions from aviation tendency"    unit="kg/kg/s" />
+        <field id="cldfra_nocont" long_name="Cloud fraction w/o contrails"    unit="-" />
+        <field id="cldtau_nocont" long_name="Cloud optical thickness w/o contrails"    unit="1" />
+        <field id="cldemi_nocont" long_name="Cloud optical emissivity w/o contrails"    unit="1" />
         <field id="iwc_nocont"    long_name="Cloud ice water content seen by radiation w/o contrails"    unit="kg/m3" />
-            <field id="ref_ice_nocont" long_name="Effective radius of ice crystals w/o contrails"    unit="microns" />
-        <field id="tops_nocont"   long_name="Solar rad. at TOA w/o contrails"    unit="W/m2" />
-        <field id="topl_nocont"   long_name="IR rad. at TOA w/o contrails"    unit="W/m2" />
-        <field id="sols_nocont"   long_name="Solar rad. at surf. w/o contrails"    unit="W/m2" />
-        <field id="soll_nocont"   long_name="IR rad. at surface w/o contrails"    unit="W/m2" />
-        <field id="nettop_nocont" long_name="Net dn radiatif flux at TOA w/o contrails"    unit="W/m2" />
+        <field id="ref_ice_nocont" long_name="Effective radius of ice crystals w/o contrails"    unit="microns" />
 
         <field id="fluxt"     long_name="flux h"     unit="W/m2" />

LMDZ6/branches/contrails/DefLists/file_def_histmth_lmdz.xml ¶

@@ -553 +553 @@
             <!-- VARS 3D -->
             <field_group operation="average" grid_ref="grid_out_presnivs">
-                <field field_ref="flightdist" level="1" />
-                <field field_ref="cfseri" level="1"  />
-                <field field_ref="qissr" level="1"   />
-                <field field_ref="qcld" level="1"    />
-                <field field_ref="subfra" level="1"  />
-                <field field_ref="issrfra" level="1" />
-                <field field_ref="dqvcmix" level="1" />
-                <field field_ref="dqimix" level="1"  />
-                <field field_ref="dcfmix" level="1"  />
-                <field field_ref="fallice_velo" level="1" />
                 <field field_ref="CO2" level="5" />  <!-- Added PC -->
                 <field field_ref="dCO2_vdf" level="5" />  <!-- Added PC -->

LMDZ6/branches/contrails/libf/phylmd/lmdz_lscp.f90 ¶

@@ -960 +960 @@
     IF (ok_plane_contrail) THEN
       !--Contrails do not precipitate. We remove then from the variables temporarily
-      IF (rneb(i,k) .GT. eps) THEN
-        zqcont(i) = zcond(i) * zfice(i) * contfra(i,k) / rneb(i,k)
-      ELSE
-        zqcont(i) = 0.
-      ENDIF
-      rneb(i,k) = rneb(i,k) - contfra(i,k)
-      zoliqi(i) = zoliqi(i) - zqcont(i)
+      DO i = 1, klon
+        IF (rneb(i,k) .GT. eps) THEN
+          zqcont(i) = zcond(i) * zfice(i) * contfra(i,k) / rneb(i,k)
+        ELSE
+          zqcont(i) = 0.
+        ENDIF
+        rneb(i,k) = rneb(i,k) - contfra(i,k)
+        zoliqi(i) = zoliqi(i) - zqcont(i)
+      ENDDO
     ENDIF
 
@@ -1004 +1006 @@
     IF (ok_plane_contrail) THEN
       !--Contrails are reintroduced in the variables
-      rneb(i,k) = rneb(i,k) + contfra(i,k)
-      zoliqi(i) = zoliqi(i) + zqcont(i)
+      DO i = 1, klon
+        rneb(i,k) = rneb(i,k) + contfra(i,k)
+        zoliqi(i) = zoliqi(i) + zqcont(i)
+      ENDDO
     ENDIF
 

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

@@ -234 +234 @@
          o_cldfra_nocont, o_cldtau_nocont, o_cldemi_nocont, o_cldh_nocont, &
          o_contcov, o_iwp_nocont, o_iwc_nocont, o_ref_ice_nocont, &
-         o_tops_nocont, o_topl_nocont, o_sols_nocont, o_soll_nocont, &
+         o_tops_nocont, o_topl_nocont, o_sols_nocont, o_soll_nocont, o_nettop_nocont, &
 !--interactive CO2
          o_flx_co2_ocean, o_flx_co2_ocean_cor, &