Changeset 820

Timestamp:

02/10/16 14:34:46 (8 years ago)

Author:

mhnguyen

Message:

Fixing duplicate *_ref on reading attributes from file

+) Remove *_ref from *_ref root of the reference tree

Test
+) On Curie
+) Test passes

Location:

XIOS/trunk

Files:

• inputs/REMAP/iodef.xml (modified) (7 diffs)
• src/declare_ref_func.hpp (modified) (1 diff)
• src/test/test_remap.f90 (modified) (2 diffs)

XIOS/trunk/inputs/REMAP/iodef.xml

@@ -10 +10 @@
      <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_tmp"/>
-<!--     <field id="tmp_field_1" operation="instant" grid_ref="src_grid_curvilinear" />-->
-<!--     <field id="tmp_field_2" operation="instant" domain_ref="domain_src_unstructured" />-->
-     <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"/>-->
+     <field id="tmp_field_1" operation="instant" grid_ref="src_grid_curvilinear" />
+     <field id="tmp_field_2" operation="instant" grid_ref="src_grid_unstructured" />
+     <field id="dst_field_regular" operation="instant" field_ref="tmp_field_2" grid_ref="dst_grid_regular" read_access="true"/>
+     <field id="dst_field_regular_pole" operation="instant" field_ref="src_field" domain_ref="dst_domain_regular_pole"/>
    </field_definition>
 
@@ -25 +25 @@
      </file>
      <file id="out_dst_regular_pole" name="out_dst_regular_pole" type="one_file">
-<!--        <field field_ref="dst_field_regular_pole" name="field" />-->
+        <field field_ref="dst_field_regular_pole" name="field" />
      </file>
      <file id="output_dst_regular" name="output_dst_regular" type="one_file">
@@ -31 +31 @@
      </file>
      <file id="output_dst_curvilinear" name="output_dst_curvilinear" type="one_file">
-<!--        <field field_ref="tmp_field_1" operation="instant"/>-->
+        <field field_ref="tmp_field_1" operation="instant"/>
      </file>
      <file id="output_dst_unstructured" name="output_dst_unstructured" type="one_file">
-<!--        <field field_ref="tmp_field_2" operation="instant"/>-->
-     </file>
-
-     <file id="output_src_regular" name="output_src_regular" mode="read" type="multiple_file">
-<!--        <field id="src_field_regular" name="field" domain_ref="src_domain_regular" operation="instant"/>-->
+        <field field_ref="tmp_field_2" operation="instant"/>
      </file>
      <file id="output_src_regular_tmp" name="output_src_regular_tmp" mode="read" type="one_file">
@@ -45 +41 @@
 
      <file id="output_src_curvilinear" name="output_src_curvilinear" mode="read" type="one_file">
-<!--        <field id="src_field_curvilinear" name="field_A" grid_ref="src_grid_curvilinear" operation="instant"/>-->
+        <field id="src_field_curvilinear" name="field_A" grid_ref="src_grid_curvilinear" operation="instant"/>
      </file>
      <file id="output_unstructured" name="output_unstructured" mode="read" type="one_file">
-<!--        <field id="field_src_unstructred" name="field" domain_ref="domain_src_unstructured" operation="instant"/>-->
+        <field id="field_src_unstructred" name="field" grid_ref="src_grid_unstructured" operation="instant"/>
      </file>
    </file_definition>
@@ -68 +64 @@
        <generate_rectilinear_domain id="domain_regular_pole"/>
        <interpolate_domain/>
+<!--       <zoom_domain id="zoom_0" ibegin="0" ni="180" jbegin="0" nj="90"/>-->
      </domain>
      <domain id="dst_domain_regular" ni_glo="90" nj_glo="45" type="rectilinear">
        <generate_rectilinear_domain />
        <interpolate_domain/>
-     </domain>
-     <domain id="src_domain_regular" ni_glo="180" nj_glo="90" type="rectilinear">
-       <generate_rectilinear_domain lat_start="-90" lat_end="90" lon_start="2" lon_end="360" />
      </domain>
      <domain id="src_domain_regular_tmp" type="rectilinear">
@@ -82 +76 @@
        <generate_rectilinear_domain />
      </domain>
-     <domain id="domain_src_unstructured" type="unstructured">
+     <domain id="src_domain_unstructured" type="unstructured">
        <generate_rectilinear_domain />
      </domain>
@@ -91 +85 @@
       <domain domain_ref="src_domain_curvilinear"/>
       <axis axis_ref="src_axis_curvilinear" />
+    </grid>
+    <grid id="src_grid_unstructured">
+      <domain domain_ref="src_domain_unstructured"/>
+    </grid>
+    <grid id="dst_grid_regular">
+      <domain domain_ref="dst_domain_regular"/>
     </grid>
   </grid_definition>

XIOS/trunk/src/declare_ref_func.hpp

@@ -54 +54 @@
 {                                                                      \
   for (int i = 1; i < refObjects.size(); ++i)                          \
-    refObjects[i]->setAttributes(refObjects[0], apply);                \
+    refObjects[i]->setAttributes(refObjects[i-1], apply);              \
+  if (refObjects.size() > 1)                                           \
+    refObjects[refObjects.size()-1]->removeRefInheritance();           \
 }                                                                      \
                                                                        \

XIOS/trunk/src/test/test_remap.f90

@@ -120 +120 @@
                             bounds_lon_1D=dst_boundslon, bounds_lat_1D=dst_boundslat, nvertex=dst_nvertex)
 
-  CALL xios_set_generate_rectilinear_domain_attr("domain_regular_pole", lat_start=dble(-90.0), lat_end=dble(90), &
-                                                 lon_start=dble(2), lon_end=dble(360))
-
   dtime%second = 3600
   CALL xios_set_timestep(dtime)
@@ -134 +131 @@
   ALLOCATE(tmp_field_1(src_tmp_ni*src_tmp_nj*src_tmp_n))
 
-  CALL xios_get_domain_attr("domain_src_unstructured", ni=src_tmp_ni, nj=src_tmp_nj)
+  CALL xios_get_domain_attr("src_domain_unstructured", ni=src_tmp_ni, nj=src_tmp_nj)
   ALLOCATE(tmp_field_2(src_tmp_ni*src_tmp_nj))
 
   DO ts=1,1
+
     CALL xios_recv_field("src_field_regular_tmp", tmp_field)
     CALL xios_recv_field("src_field_curvilinear", tmp_field_1)