Changeset 3474 for LMDZ6/trunk/DefLists

Timestamp:

Apr 15, 2019, 4:55:13 PM (5 years ago)

Author:

Laurent Fairhead

Message:

Adding proper hybrid coordinates coefficients as per the CMIP6 data request
r3284 of IPSLCM6.0.15 branch
Also added Cecill license information to a bunch of DefLists? files

Location:

LMDZ6/trunk/DefLists

Files:

• CMIP6_ping_aerosol_lmdz.xml (modified) (1 prop)
• CMIP6_ping_atmosChem_lmdz.xml (modified) (1 prop)
• CMIP6_ping_landIce.xml (modified) (1 prop)
• LISMOI (modified) (1 prop)
• README (modified) (1 prop)
• config_AMIP.def (modified) (1 prop)
• context_input_lmdz.xml (added)
• context_lmdz.xml (modified) (14 diffs)
• context_lmdz_sans_cosp.xml (modified) (1 prop)
• field_def_lmdz.xml (modified) (1 diff)
• file_def_histdayCOSP_lmdz.xml (modified) (1 prop)
• file_def_histdayNMC_lmdz.xml (modified) (1 prop)
• file_def_histhfCOSP_lmdz.xml (modified) (1 prop)
• file_def_histhfNMC_lmdz.xml (modified) (1 prop)
• file_def_histmthCOSP_lmdz.xml (modified) (1 prop)
• file_def_histmthNMC_lmdz.xml (modified) (1 prop)
• file_def_histmth_lmdz.xml (modified) (1 diff)
• file_def_histstrataer_lmdz.xml (modified) (1 prop)
• gcm.def_144x142 (modified) (1 prop)
• physiq.def_AR4 (modified) (1 prop)
• physiq.def_NPv0.0 (modified) (1 prop)
• physiq.def_NPv1.0 (modified) (1 prop)
• physiq.def_NPv2.0 (modified) (1 prop)
• physiq.def_NPv3.0 (modified) (1 prop)
• physiq.def_NPv3.1 (modified) (1 prop)
• physiq.def_NPv3.2 (modified) (1 prop)
• physiq.def_NPv4.12 (modified) (1 prop)
• physiq.def_NPv5.17h (modified) (1 prop)
• physiq.def_NPv5.4 (modified) (1 prop)
• physiq.def_NPv5.5 (modified) (1 prop)
• physiq.def_NPv5.65 (modified) (1 prop)
• physiq.def_NPv5.67 (modified) (1 prop)
• physiq.def_NPv5.70 (modified) (1 prop)
• physiq.def_NPv5.80b (modified) (1 prop)
• physiq.def_NPv5.80bz0 (modified) (1 prop)
• physiq.def_NPv6.0.10 (modified) (1 prop)
• physiq.def_NPv6.0.10fallv (modified) (1 prop)
• physiq.def_NPv6.0.11trigB (modified) (1 prop)
• physiq.def_NPv6.0.12 (modified) (1 prop)
• physiq.def_NPv6.0.12split (modified) (1 prop)
• physiq.def_NPv6.0.12ttop (modified) (1 prop)
• physiq.def_NPv6.0.14splitD (modified) (1 prop)
• physiq.def_NPv6.0.14splith (modified) (1 prop)
• physiq.def_NPv6.0.14ttop (modified) (1 prop)
• physiq.def_NPv6.0.7 (modified) (1 prop)
• physiq.def_NPv6.0.8 (modified) (1 prop)
• physiq.def_NPv6.0.9 (modified) (1 prop)
• physiq.def_NPv6.1 (modified) (1 prop)
• vert_L79.def (modified) (1 prop)

LMDZ6/trunk/DefLists/context_lmdz.xml

@@ +1 @@
+<!-- $Id$ -->
 <!-- Context LMDZ -->
 <context id="LMDZ">
@@ -12 +13 @@
   <file_definition src="./file_def_histhf_lmdz.xml"/>
   <file_definition src="./file_def_histins_lmdz.xml"/>
-<!--  <file_definition src="./file_def_histLES_lmdz.xml"/> -->
+  <file_definition src="./file_def_histLES_lmdz.xml"/>
   <file_definition src="./file_def_histmth_lmdz.xml"/>
-<!--  <file_definition src="./file_def_histstn_lmdz.xml"/> -->
+  <file_definition src="./file_def_histstn_lmdz.xml"/>
   <file_definition src="./file_def_histmthNMC_lmdz.xml"/>
   <file_definition src="./file_def_histdayNMC_lmdz.xml"/>
   <file_definition src="./file_def_histhfNMC_lmdz.xml"/>
-<!--  <file_definition src="./file_def_histmthCOSP_lmdz.xml"/> -->
-<!--  <file_definition src="./file_def_histdayCOSP_lmdz.xml"/> -->
-<!--  <file_definition src="./file_def_histhfCOSP_lmdz.xml"/> -->
+  <file_definition src="./file_def_histmthCOSP_lmdz.xml"/>
+  <file_definition src="./file_def_histdayCOSP_lmdz.xml"/> 
+  <file_definition src="./file_def_histhfCOSP_lmdz.xml"/>  
   <file_definition src="./file_def_histstrataer_lmdz.xml"/>
- 
+
+
+
+
+
   <!-- Define domains and groups of domains -->
   <domain_definition>
@@ -32 +37 @@
     </domain> 
    
-    <domain id="dom_regular" ni_glo="144" nj_glo="142" type="rectilinear"  >
-      <generate_rectilinear_domain/>
+    <domain id="dom_regular" ni_glo="144" nj_glo="143" type="rectilinear"  >
+      <generate_rectilinear_domain lat_start="-90" lat_end="90"/>
       <interpolate_domain order="1"/>
     </domain>
@@ -49 +54 @@
   <grid_definition>
     <grid id="grid_scalar" >
-    <scalar/>
+      <scalar/>
     </grid>
   </grid_definition>
@@ -78 +83 @@
 
 <!-- Cosp axis definitions-->
-    <axis id="height" standard_name="Cosp levels" unit="m"> 
-    </axis>
-    <axis id="height_mlev" standard_name="height_mlev" unit="m"> 
-    </axis>
-    <axis id="sza" standard_name="solar_zenith_angle" unit="degrees">
-    </axis>
-    <axis id="pressure2" standard_name="pressure" unit="mb">
-    </axis>
-    <axis id="column" standard_name="column" unit="count"> 
-    </axis> 
-    <axis id="temp" standard_name="temperature" unit="K"> 
-    </axis> 
-    <axis id="cth" standard_name="altitude" unit="m"> 
-    </axis> 
-    <axis id="ReffIce" standard_name="ReffIce" unit="microne" >
-    </axis>
-    <axis id="ReffLiq" standard_name="ReffLiq" unit="microne" >
-    </axis>
-    <axis id="scatratio" standard_name="scatratio" unit="1" >
-    </axis>
-    <axis id="dbze" standard_name="dbze" unit="dBZ" >
-    </axis>
-    <axis id="tau" standard_name="tau" unit="1" >
-    </axis>
+    <axis id="height" standard_name="Cosp levels" unit="m"/> 
+    <axis id="height_mlev" standard_name="height_mlev" unit="m"/> 
+    <axis id="sza" standard_name="solar_zenith_angle" unit="degrees"/>
+    <axis id="pressure2" standard_name="pressure" unit="mb"/>
+    <axis id="column" standard_name="column" unit="count"/> 
+    <axis id="temp" standard_name="temperature" unit="K"/> 
+<!--    <axis id="cth16" standard_name="altitude" unit="m"/>   ym unused now to be in adequation with axis definition from model --> 
+    <axis id="cth" standard_name="altitude" unit="m"/> 
+    <axis id="ReffIce" standard_name="ReffIce" unit="microne" />
+    <axis id="ReffLiq" standard_name="ReffLiq" unit="microne" />
+    <axis id="scatratio" standard_name="scatratio" unit="1" />
+    <axis id="dbze" standard_name="dbze" unit="dBZ" />
+    <axis id="tau" standard_name="tau" unit="1" />
   </axis_definition>
 
@@ -109 +103 @@
     <grid id="klevp1_bnds"> <axis axis_ref="klevp1" /> <axis axis_ref="bnds" /> </grid>
 
+
      <grid id="grid_glo">
         <domain domain_ref="dom_glo" />
@@ -128 +123 @@
      </grid>
 
+
      <grid id="grid_glo_plev">
         <domain domain_ref="dom_glo" />
@@ -148 +144 @@
         <axis axis_ref="spectband" />
      </grid>
-
+     
 
      <grid id="grid_glo_height">
@@ -154 +150 @@
         <axis axis_ref="height" />
      </grid>
-
      <grid id="grid_out_height">
         <domain domain_ref="dom_out" />
@@ -160 +155 @@
      </grid>
 
+
      <grid id="grid_glo_heightmlev">
         <domain domain_ref="dom_glo" />
         <axis axis_ref="height_mlev" />
      </grid>
-
      <grid id="grid_out_heightmlev">
         <domain domain_ref="dom_out" />
@@ -170 +165 @@
      </grid>
 
+
      <grid id="grid_glo_temp">
         <domain domain_ref="dom_glo" />
         <axis axis_ref="temp" />
      </grid>
-
-     <grid id="grid_gloout_temp">
+     <grid id="grid_out_temp">
         <domain domain_ref="dom_out" />
         <axis axis_ref="temp" />
      </grid>
 
+
+
      <grid id="grid_glo_sza">
         <domain domain_ref="dom_glo" />
         <axis axis_ref="sza" />
      </grid>
-
      <grid id="grid_out_sza">
         <domain domain_ref="dom_out" />
@@ -190 +186 @@
      </grid>
 
+
      <grid id="grid_glo_column">
         <domain domain_ref="dom_glo" />
         <axis axis_ref="column" />
      </grid>
-
      <grid id="grid_out_column">
         <domain domain_ref="dom_out" />
@@ -203 +199 @@
 <!-- Define 4D grids for Cosp simulator -->
      <grid id="grid4Dcol">
-        <domain id="dom_glo" />
-        <axis id="column" />
-        <axis id="height_mlev" />
+        <domain domain_ref="dom_glo" />
+        <axis axis_ref="column" />
+        <axis axis_ref="height_mlev" />
+     </grid>
+     <grid id="grid4Dcol_out">
+        <domain domain_ref="dom_out" />
+        <axis axis_ref="column" />
+        <axis axis_ref="height_mlev" />
      </grid>
 
      <grid id="grid4Dsrbin">
-        <domain id="dom_glo" />
-        <axis id="height" />
-        <axis id="scatratio" />
-     </grid>
+        <domain domain_ref="dom_glo" />
+        <axis axis_ref="height" />
+        <axis axis_ref="scatratio" />
+     </grid>
+     <grid id="grid4Dsrbin_out">
+        <domain domain_ref="dom_out" />
+        <axis axis_ref="height" />
+        <axis axis_ref="scatratio" />
+     </grid>
+
 
      <grid id="grid4Ddbze">
-        <domain id="dom_glo" />
-        <axis id="height" />
-        <axis id="dbze" />
+        <domain domain_ref="dom_glo" />
+        <axis axis_ref="height" />
+        <axis axis_ref="dbze" />
+     </grid>
+     <grid id="grid4Ddbze_out">
+        <domain domain_ref="dom_out" />
+        <axis axis_ref="height" />
+        <axis axis_ref="dbze" />
      </grid>
 
      <grid id="grid4Dtau">
-        <domain id="dom_glo" />
-        <axis id="tau" />
-        <axis id="pressure2" />
+        <domain domain_ref="dom_glo" />
+        <axis axis_ref="tau" />
+        <axis axis_ref="pressure2" />
+     </grid>
+     <grid id="grid4Dtau_out">
+        <domain domain_ref="dom_out" />
+        <axis axis_ref="tau" />
+        <axis axis_ref="pressure2" />
      </grid>
 
      <grid id="grid4Dmisr">
-        <domain id="dom_glo" />
-        <axis id="cth" />
-        <axis id="tau" />
+        <domain domain_ref="dom_glo" />
+        <axis axis_ref="cth" />
+        <axis axis_ref="tau" />
+     </grid>
+     <grid id="grid4Dmisr_out">
+        <domain domain_ref="dom_out" />
+        <axis axis_ref="cth" />
+        <axis axis_ref="tau" />
      </grid>
 
      <grid id="grid4Dreffi">
-        <domain id="dom_glo" />
-        <axis id="tau" />
-        <axis id="ReffIce" />
+        <domain domain_ref="dom_glo" />
+        <axis axis_ref="tau" />
+        <axis axis_ref="ReffIce" />
+     </grid>
+     <grid id="grid4Dreffi_out">
+        <domain domain_ref="dom_out" />
+        <axis axis_ref="tau" />
+        <axis axis_ref="ReffIce" />
      </grid>
 
      <grid id="grid4Dreffl">
-        <domain id="dom_glo" />
-        <axis id="tau" />
-        <axis id="ReffLiq" />
-     </grid>
+        <domain domain_ref="dom_glo" />
+        <axis axis_ref="tau" />
+        <axis axis_ref="ReffLiq" />
+     </grid>
+     <grid id="grid4Dreffl_out">
+        <domain domain_ref="dom_out" />
+        <axis axis_ref="tau" />
+        <axis axis_ref="ReffLiq" />
+     </grid>
+
+
      <grid id="grid4Dcol2">
-        <domain id="dom_glo" />
-        <axis id="height" />
-        <axis id="column" />
-     </grid>
-
- <!-- Grid definitions to allow summing of a 3D varaible -->    
+        <domain domain_ref="dom_glo" />
+        <axis axis_ref="height" />
+        <axis axis_ref="column" />
+     </grid>
+     <grid id="grid4Dcol2_out">
+        <domain domain_ref="dom_out" />
+        <axis axis_ref="height" />
+        <axis axis_ref="column" />
+     </grid>
+
+ <!-- Grid definitions to allow summing of a 3D variable -->    
       <grid id="grid_3D" >
-         <domain id="dom_glo" />
-         <axis id="lev" />
+         <domain domain_ref="dom_glo" />
+         <axis axis_ref="lev" />
        </grid>
 
        <grid id="grid_sum_axis">
-         <domain id="dom_glo" />
+         <domain domain_ref="dom_glo" />
          <scalar>
             <reduce_axis operation="sum" />
@@ -264 +303 @@
        <grid id="grid_sum">
          <scalar >
-        <reduce_domain operation="sum" local="true" />
-        <reduce_scalar operation="sum" />
+           <reduce_domain operation="sum" local="true" />
+           <reduce_scalar operation="sum" />
          </scalar>
-         <scalar>
-         </scalar>
+         <scalar/>
        </grid>
 

LMDZ6/trunk/DefLists/field_def_lmdz.xml

@@ -13 +13 @@
 
     <field_group id="coord_hyb">
-        <field id="Ahyb"      axis_ref="klev" />
-        <field id="Ahyb_inter" grid_ref="klev_bnds" />
-        <field id="Bhyb"       axis_ref="klev"  />
-        <field id="Bhyb_inter"  grid_ref="klev_bnds" />
+        <field id="Ahyb" long_name="Ahyb at level interface"     axis_ref="klevp1" />
+        <field id="Ahyb_bounds" long_name="" grid_ref="klevp1_bnds" />
+        <field id="Bhyb" long_name="Bhyb at level interface"       axis_ref="klevp1"  />
+        <field id="Bhyb_bounds" long_name=""  grid_ref="klevp1_bnds" />
+        <field id="Ahyb_mid" long_name="Ahyb at the middle of the level"      axis_ref="klev" />
+        <field id="Ahyb_mid_bounds" long_name="" grid_ref="klev_bnds" />
+        <field id="Bhyb_mid" long_name="Bhyb at the middle of the level"       axis_ref="klev"  />
+        <field id="Bhyb_mid_bounds" long_name=""  grid_ref="klev_bnds" />
     </field_group>
     

LMDZ6/trunk/DefLists/file_def_histmth_lmdz.xml

@@ -14 +14 @@
               <field field_ref="io_lat" level="1" />
               <field field_ref="Ahyb" level="1" />
-              <field field_ref="Ahyb_inter" level="1" />
+              <field field_ref="Ahyb_mid" level="1" />
               <field field_ref="Bhyb" level="1" />
-              <field field_ref="Bhyb_inter" level="1" />
+              <field field_ref="Bhyb_mid" level="1" />
             </field_group>