Changeset 5199 for branches/2014/dev_r5134_UKMO4_CF_compliance/NEMOGCM/CONFIG/C1D_PAPA

Timestamp:

2015-04-07T14:27:31+02:00 (9 years ago)

Author:

hadcv

Message:

Addition of standard_name entries and other changes.

• XIOS namelist changes:
  • Added standard_name entries to field_def.xml for physical ocean variables and SBC fields
    • This does not cover all variables!
  • Added some new variable definitions
  • Renamed the coupled variable "calving" to "calving_cea" to avoid a clash with the ICB variable
  • Removed long_name entries from iodef.xml files
    • iodef_ar5.xml has been preserved where possible
  • Added axis definitions for 20C and 28C isotherm depths
  • Performed some minor cleaning and opportunistic minor edits

• NEMO changes:
  • Replaced an iom_put call in DIA/diahth.F90 with a definition in field_def.xml
  • Added axis definitions for 20C and 28C isotherm depths

File:

• branches/2014/dev_r5134_UKMO4_CF_compliance/NEMOGCM/CONFIG/C1D_PAPA/EXP00/iodef.xml (modified) (6 diffs)

branches/2014/dev_r5134_UKMO4_CF_compliance/NEMOGCM/CONFIG/C1D_PAPA/EXP00/iodef.xml

@@ -34 +34 @@
      <field field_ref="empmr"        name="sowaflup"  />
      <field field_ref="qsr"          name="soshfldo"  />
-          <field field_ref="saltflx"      name="sosfldow"  />
+      <field field_ref="saltflx"      name="sosfldow"  />
      <field field_ref="qt"           name="sohefldo"  />
      <field field_ref="mldr10_1"     name="somxl010"  />
      <field field_ref="mldkz5"       name="somixhgt"  />
-        </file>
+    </file>
    
    <file id="file2" name_suffix="_grid_U" description="ocean U grid variables" >
           <field field_ref="uoce"         name="vozocrtx"  />
           <field field_ref="utau"         name="sozotaux"  />
-        </file>
+    </file>
    
    <file id="file3" name_suffix="_grid_V" description="ocean V grid variables" >
           <field field_ref="voce"         name="vomecrty"  /> 
           <field field_ref="vtau"         name="sometauy"  /> 
-        </file>
+    </file>
    
    <file id="file4" name_suffix="_grid_W" description="ocean W grid variables" >
@@ -54 +54 @@
           <field field_ref="avt"          name="votkeavt" />
           <field field_ref="aht2d"        name="soleahtw" />
-        </file>
+    </file>
       </file_group>
 
@@ -72 +72 @@
      <field field_ref="empmr"        name="sowaflup"  />
      <field field_ref="qsr"          name="soshfldo"  />
-          <field field_ref="saltflx"      name="sosfldow"  />
+      <field field_ref="saltflx"      name="sosfldow"  />
      <field field_ref="qt"           name="sohefldo"  />
      <field field_ref="mldr10_1"     name="somxl010"  />
      <field field_ref="mldkz5"       name="somixhgt"  />
-        </file>
+    </file>
    
    <file id="file6" name_suffix="_grid_U" description="ocean U grid variables" >
           <field field_ref="uoce"         name="vozocrtx"  />
           <field field_ref="utau"         name="sozotaux"  />
-        </file>
+    </file>
    
    <file id="file7" name_suffix="_grid_V" description="ocean V grid variables" >
           <field field_ref="voce"         name="vomecrty"  /> 
           <field field_ref="vtau"         name="sometauy"  /> 
-        </file>
+    </file>
    
    <file id="file8" name_suffix="_grid_W" description="ocean W grid variables" >
@@ -92 +92 @@
           <field field_ref="avt"          name="votkeavt" />
           <field field_ref="aht2d"        name="soleahtw" />
-        </file>
+    </file>
       </file_group>
 
@@ -98 +98 @@
       <file_group id="3d" output_freq="3d"  output_level="10" enabled=".TRUE."/> <!-- 3d files -->    
       <file_group id="5d" output_freq="5d"  output_level="10" enabled=".TRUE."/>  <!-- 5d files -->   
+
       <file_group id="1m" output_freq="1mo" output_level="10" enabled=".TRUE."/> <!-- real monthly files -->
       <file_group id="2m" output_freq="2mo" output_level="10" enabled=".TRUE."/> <!-- real 2m files -->
@@ -125 +126 @@
       <axis id="icbcla"  long_name="Iceberg class"      unit="1"                 />
       <axis id="ncatice" long_name="Ice category"       unit="1"                 />
+      <axis id="iax_20C" long_name="20 degC isotherm"   unit="degC"              />
+      <axis id="iax_28C" long_name="28 degC isotherm"   unit="degC"              />
    </axis_definition>