Changeset 5415 for trunk/NEMOGCM/CONFIG

Timestamp:

2015-06-13T05:54:27+02:00 (9 years ago)

Author:

hadcv

Message:

Final commits for CF compliance development.

• Add cell area output (under ln_cfmeta)
• Add depth bounds
• Update Met Office ARCH file to use XIOS-1.0 r618
• Remove current XIOS domain definition for scalar variables (a zoom of the T grid) and go back to the one defined in iom.F90
• Add new scalar variable XIOS domain definition with coordinates that better represent collapsed global coordinates
• Rewrite the grid bounds code in iom.F90 to allocate less memory.

Location:

trunk/NEMOGCM/CONFIG/SHARED

Files:

• domain_def.xml (modified) (2 diffs)
• field_def.xml (modified) (4 diffs)

trunk/NEMOGCM/CONFIG/SHARED/domain_def.xml

@@ -5 +5 @@
     <!--   My zoom: example of hand defined zoom   -->
          <domain id="myzoom" zoom_ibegin="10" zoom_jbegin="10" zoom_ni="5" zoom_nj="5" />
-         <domain id="1point" zoom_ibegin="10" zoom_jbegin="10" zoom_ni="1" zoom_nj="1" />
          <!--   Eq section   -->
          <domain id="EqT" zoom_ibegin="1" zoom_jbegin="0000" zoom_ni="0000" zoom_nj="1" />
@@ -169 +168 @@
       </domain_group>
 
-      <domain_group id="scalarpoint">
-         <domain id="scalarpoint" long_name="scalar"/>
-         <!--
-         <domain id="1point" zoom_ibegin="1" zoom_jbegin="1" zoom_ni="1" zoom_nj="1" />
-         -->
+      <domain_group id="scalarpoint" long_name="scalar" zoom_ibegin="1" zoom_jbegin="1" zoom_ni="1" zoom_nj="1">
+         <domain id="1point"/>
+         <domain id="globalscalar" />
       </domain_group>
 

trunk/NEMOGCM/CONFIG/SHARED/field_def.xml

@@ -460 +460 @@
       <!-- scalar variables available with key_diaar5 -->
 
-      <field_group id="scalar"  domain_ref="1point" >
+      <field_group id="scalar"  domain_ref="globalscalar" >
          <field id="voltot"     long_name="global total volume"                          standard_name="sea_water_volume"                               unit="m3"   />
          <field id="sshtot"     long_name="global mean ssh"                              standard_name="global_average_sea_level_change"                unit="m"    />
@@ -468 +468 @@
          <field id="temptot"    long_name="global mean temperature"                      standard_name="sea_water_potential_temperature"                unit="degC" />
          <field id="saltot"     long_name="global mean salinity"                         standard_name="sea_water_salinity"                             unit="1e-3" />
-         <field id="fram_trans" long_name="Sea Ice Mass Transport Through Fram Strait"   standard_name="sea_ice_transport_across_line"                  unit="kg/s" />
+         <field id="fram_trans" long_name="Sea Ice Mass Transport Through Fram Strait"   standard_name="sea_ice_transport_across_line"                  unit="kg/s"   domain_ref="1point" />
 
           <!-- available with ln_diahsb -->
@@ -489 +489 @@
       <!-- LIM3 scalar variables -->
 
-      <field_group id="SBC_scalar"  domain_ref="1point" >
+      <field_group id="SBC_scalar"  domain_ref="globalscalar" >
          <!-- available with ln_limdiaout -->
          <field id="ibgvoltot"    long_name="global mean ice volume"                                 unit="km3"        />
@@ -920 +920 @@
      </field_group>
 
-     <field_group id="PISCES_scalar"  domain_ref="1point" >
+     <field_group id="PISCES_scalar"  domain_ref="globalscalar" >
        <field id="pno3tot"         long_name="global mean nitrate concentration"                  unit="mol/m3"   />
        <field id="ppo4tot"         long_name="global mean phosphorus concentration"               unit="mol/m3"   />