Changeset 820 for XIOS/trunk/src

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/src

Files:

• declare_ref_func.hpp (modified) (1 diff)
• test/test_remap.f90 (modified) (2 diffs)

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)