Changeset 689 for XIOS/trunk/inputs/REMAP

Timestamp:

09/15/15 17:31:13 (9 years ago)

Author:

mhnguyen

Message:

Modifying the interface of interpolation domain

+) Change node name from interpolate_from_file_domain to interpolate_domain and add some new atrributes
+) Add more tests into test_remap

Test
+) On Curie
+) test_remap works for direct weight calculation and reading weight calculation from file

File:

• XIOS/trunk/inputs/REMAP/iodef.xml (modified) (4 diffs)

XIOS/trunk/inputs/REMAP/iodef.xml

@@ -9 +9 @@
      <field id="src_field"  operation="instant" grid_ref="src_grid"/>
      <field id="dst_field"  operation="instant" field_ref="src_field" grid_ref="dst_grid"/>
+     <field id="dst_field_regular"  operation="instant" field_ref="src_field" grid_ref="dst_grid_regular"/>
    </field_definition>
 
@@ -14 +15 @@
    <file_definition type="multiple_file" par_access="collective" output_freq="1ts" output_level="10" enabled=".TRUE.">
      <file id="output" name="output">
-<!--        <field field_ref="src_field" name="field" />-->
+        <field field_ref="src_field" name="field" />
      </file>
      <file id="output_dst" name="output_dst">
         <field field_ref="dst_field" name="field" />
+     </file>
+     <file id="output_dst_regular" name="output_dst_regular">
+        <field field_ref="dst_field_regular" name="field" />
      </file>
    </file_definition>
@@ -28 +32 @@
      <domain id="src_domain" />
      <domain id="dst_domain" domain_src="src_domain">
+       <interpolate_domain file="weight.nc"/>
+     </domain>
+     <domain id="dst_domain_regular" domain_src="src_domain">
        <generate_rectilinear_domain />
-       <interpolate_from_file_domain file="weight.nc" />
+       <interpolate_domain/>
      </domain>
    </domain_definition>
@@ -36 +43 @@
      <grid id="dst_grid">
        <domain domain_ref="dst_domain" />
+     </grid>
+     <grid id="dst_grid_regular">
+       <domain domain_ref="dst_domain_regular" />
      </grid>
      <grid id="src_grid">