Changeset 744 for XIOS/trunk/inputs

Timestamp:

10/21/15 11:50:09 (9 years ago)

Author:

rlacroix

Message:

Grid: Force 'grid_ref' and 'axis_ref'/'domain_ref' to be mutually exclusive.

Users must ensure that they don't mix those arguments even when using 'field_ref'.

Location:

XIOS/trunk/inputs

Files:

• COMPLETE/context_atmosphere.xml (modified) (2 diffs)
• REMAP/iodef.xml (modified) (3 diffs)

XIOS/trunk/inputs/COMPLETE/context_atmosphere.xml

@@ -5 +5 @@
   <field_definition level="1" enabled=".FALSE." default_value="9.96921e+36">
     <field id="field_A_atm"  name="field_A_atm_origin" operation="average" freq_op="1ts" grid_ref="grid_A_atm" />
-    <field id="field_A_atm_zoom"  name="field_A_atm" operation="average" freq_op="1ts" field_ref="field_A_atm" domain_ref="domain_atm_zoom" axis_ref="axis_atm" />
+    <field id="field_A_atm_zoom"  name="field_A_atm" operation="average" freq_op="1ts" field_ref="field_A_atm" grid_ref="grid_A_atm_zoom" />
   </field_definition>
 
@@ -36 +36 @@
      <axis axis_ref="axis_atm" />
    </grid>
+   <grid id="grid_A_atm_zoom">
+     <domain domain_ref="domain_atm_zoom" />
+     <axis axis_ref="axis_atm_zoom" />
+   </grid>
   </grid_definition>
 

XIOS/trunk/inputs/REMAP/iodef.xml

@@ -7 +7 @@
 
    <field_definition level="1" >
-     <field id="src_field"  operation="instant" domain_ref="src_domain"/>
-     <field id="dst_field"  operation="instant" field_ref="src_field" domain_ref="dst_domain"/>
-     <field id="tmp_field"  operation="instant" domain_ref="src_domain_regular"/>
-     <field id="dst_field_regular_grid"  operation="instant" field_ref="tmp_field" grid_ref="dst_grid_regular"  read_access="true"/>
-     <field id="dst_field_regular"  operation="instant" field_ref="tmp_field" domain_ref="dst_domain_regular"  read_access="true"/>
-     <field id="dst_field_regular_pole"  operation="instant" field_ref="src_field" domain_ref="dst_domain_regular_pole"  read_access="true"/>
-
+     <field id="src_field" operation="instant" domain_ref="src_domain"/>
+     <field id="dst_field" operation="instant" field_ref="src_field" domain_ref="dst_domain"/>
+     <field id="tmp_field" operation="instant" domain_ref="src_domain_regular"/>
+     <field id="dst_field_regular" operation="instant" field_ref="tmp_field" domain_ref="dst_domain_regular" read_access="true"/>
+     <field id="dst_field_regular_pole" operation="instant" field_ref="src_field" domain_ref="dst_domain_regular_pole" read_access="true"/>
    </field_definition>
 
@@ -29 +27 @@
      <file id="output_dst_regular" name="output_dst_regular" type="one_file">
         <field field_ref="dst_field_regular" name="field" />
-        <field field_ref="dst_field_regular_grid" name="field_grid" />
      </file>
      <file id="output_src_regular" name="output_src_regular" mode="read" type="multiple_file">
@@ -60 +57 @@
      </domain>
    </domain_definition>
-
-   <grid_definition>
-     <grid id="dst_grid_regular">
-       <domain domain_ref="dst_domain_regular" />
-     </grid>
-   </grid_definition>
   </context>