Changeset 2056 for LMDZ5/branches/testing/DefLists/iodef_dev.xml

Timestamp:

Jun 11, 2014, 3:46:46 PM (10 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r1997:2055 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• DefLists/iodef_dev.xml (modified) (2 diffs)

LMDZ5/branches/testing/DefLists/iodef_dev.xml

@@ -2 +2 @@
 <simulation> 
     <context id="LMDZ" calendar_type="D360" start_date="1980-01-01 00:00:00">
-        <!-- Définition des variables -->
-        <field_definition prec="4" operation="average" freq_op="1ts" enabled=".TRUE.">
+        <!-- Definition of model variables -->
+        <field_definition prec="4" 
+                          freq_op="1ts"
+                          enabled=".TRUE.">
+            
+            <!-- 2D variables -->
             <field_group id="fields_2D" domain_ref="dom_glo">
-                <field id="u"           long_name="Eastward Zonal Wind"                 unit="m/s" />
-                <field id="v"           long_name="Northward Meridional Wind"           unit="m/s" />
-                <field id="ps"          long_name="Surface Pressure"                    unit="m/s" />
+                <field id="ps"
+                       long_name="Surface Pressure" 
+                       unit="m/s" />
             </field_group>
 
-            <field_group id="fields_3D" domain_ref="dom_glo">
-                <field id="temperature" long_name="Atmospheric temperature"             unit="K" />
+            <!-- 3D variables -->
+            <field_group id="fields_3D"
+                         domain_ref="dom_glo">
+                <field id="temperature"
+                       long_name="Atmospheric temperature"
+                       unit="K" />
+                <field id="temp_newton"
+                       long_name="Relaxation temperature"
+                       unit="K" />
+                <field id="u"
+                       long_name="Eastward Zonal Wind"
+                       unit="m/s" />
+                <field id="v" 
+                       long_name="Northward Meridional Wind" 
+                       unit="m/s" />
             </field_group>
         </field_definition>
 
-        <!-- Définition des fichiers de sortie -->
+        <!-- Définition of output files -->
 
         <file_definition>
-            <file_group id="defile">
-                <file id="histins" name="Xhistins" output_freq="1ts" enabled=".TRUE.">
+            <!-- <file_group id="defile"> -->
+                <file id="histins"
+                      name="Xhistins"
+                      output_freq="12ts" 
+                      enabled=".TRUE."> <!-- NB: output_freq in physics ts-->
+                    
                     <!-- VARS 2D -->
-                    <field_group operation="instant" freq_op="1ts">
+                    <field_group operation="instant"
+                                 freq_op="1ts">
                         <field field_ref="ps" />
                     </field_group>
+                    <!-- <field_group field_group_ref="fields_2D"
+                                 operation="instant" /> doesn't work ?!? -->
 
                     <!-- VARS 3D -->
-                    <field_group operation="instant" freq_op="1ts" axis_ref="presnivs_histins">
+                    <field_group operation="instant"
+                                 freq_op="1ts"
+                                 axis_ref="presnivs">
+                        <field field_ref="temperature" />
+                        <field field_ref="temp_newton" operation="once" />
+                        <field field_ref="u" />
+                        <field field_ref="v" />
+                    </field_group>
+                    <!-- <field_group field_group_ref="fields_3D"
+                                 operation="instant" /> doesn't work ?!? -->
+                </file>
+
+                <file id="diurnalave"
+                      name="Xdiurnalave"
+                      output_freq="1d"
+                      enabled=".true.">
+                    <!-- VARS 2D -->
+                    <field_group operation="average"
+                                 freq_op="1ts">
+                        <field field_ref="ps" />
+                    </field_group>
+                    <!-- VARS 3D -->
+                    <field_group operation="average"
+                                 freq_op="1ts"
+                                 axis_ref="presnivs">
                         <field field_ref="temperature" />
                         <field field_ref="u" />
                         <field field_ref="v" />
-                    </field_group>
+                    </field_group>                     
                 </file>
-            </file_group>
+            <!-- </file_group> -->
         </file_definition>
 
 
-
-
-        <!-- Définition des domaines et groupes de domaines -->
+        <!-- Definition of domains and groups of domains -->
         <domain_definition>
             <domain id="dom_glo" data_dim="2" />
         </domain_definition>
         
-        <!-- Définition des axes verticaux -->
+        <!-- Definition of vertical axes 
+             NB: these must be defined and set in code via
+             wxios_add_vaxis -->
         <axis_definition>
-            <axis_group id="presnivs" standard_name="Vertical levels" unit="Pa">
+            <!--
+            <axis_group id="presnivs" 
+                        standard_name="Pseudo-pressure of model vertical levels" 
+                        unit="Pa">
             </axis_group>
-            <axis_group id="Ahyb" standard_name="Ahyb comp of Hyb Cord" unit="Pa">
-            </axis_group>
-            <axis_group id="Bhyb" standard_name="Bhyb comp of Hyb Cord" unit="">
-            </axis_group>
-            <axis_group id="Alt" standard_name="Height approx for scale heigh of 8km at levels" unit="Km">
-            </axis_group>
+            -->
+            <axis id="presnivs" 
+                        standard_name="Pseudo-pressure of model vertical levels" 
+                        unit="Pa">
+            </axis>
         </axis_definition>
     </context>
@@ -65 +115 @@
             <variable_group id="parameters" >
                 <variable id="using_server" type="boolean">true</variable>
-                <variable id="info_level" type="int">100</variable>
+                <variable id="info_level" type="int">10</variable>
             </variable_group>
         </variable_definition>