Changeset 824

Timestamp:

02/16/16 10:14:30 (8 years ago)

Author:

mhnguyen

Message:

Correcting the behavior of field_ref

+) If a field refers to another one via field_ref and there is no transformation between
grid of this field and one of refered field, this field will inherit attributes from field_ref.

Test
+) On Curie
+) All tests pass

Location:

XIOS/trunk

Files:

• inputs/REMAP/iodef.xml (modified) (3 diffs)
• src/node/field.cpp (modified) (1 diff)
• src/node/grid.cpp (modified) (3 diffs)
• src/node/grid.hpp (modified) (2 diffs)
• src/test/test_remap.f90 (modified) (1 diff)
• src/transformation/grid_transformation.cpp (modified) (1 diff)
• src/transformation/grid_transformation.hpp (modified) (1 diff)

XIOS/trunk/inputs/REMAP/iodef.xml

@@ -8 +8 @@
    <field_definition level="1" >
      <field id="src_field" operation="instant" domain_ref="src_domain"/>
+     <field id="src_field_clone" operation="instant" field_ref="src_field" domain_ref="src_domain_clone"/>
      <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"/>
@@ -21 +22 @@
      <file id="output" name="output">
         <field field_ref="src_field" name="field" />
+     </file>
+     <file id="output_clone" name="output_clone">
+        <field field_ref="src_field_clone" name="field" />
      </file>
      <file id="output_dst" name="output_dst" type="one_file">
@@ -61 +65 @@
    <domain_definition>
      <domain id="src_domain" />
+     <domain id="src_domain_clone" />
      <domain id="dst_domain">
        <interpolate_domain/>

XIOS/trunk/src/node/field.cpp

@@ -770 +770 @@
      std::pair<boost::shared_ptr<CFilter>, boost::shared_ptr<CFilter> > filters;
      // Check if a spatial transformation is needed
-     if (grid && grid != fieldRef->grid)
+     if (grid && grid != fieldRef->grid && grid->hasTransform())
        filters = CSpatialTransformFilter::buildFilterGraph(gc, fieldRef->grid, grid);
      else

XIOS/trunk/src/node/grid.cpp

@@ -32 +32 @@
       , transformations_(0), isTransformed_(false)
       , axisPositionInGrid_(), positionDimensionDistributed_(1), hasDomainAxisBaseRef_(false)
-      , gridSrc_()
+      , gridSrc_(), hasTransform_(false)
    {
      setVirtualDomainGroup();
@@ -47 +47 @@
       , transformations_(0), isTransformed_(false)
       , axisPositionInGrid_(), positionDimensionDistributed_(1), hasDomainAxisBaseRef_(false)
-      , gridSrc_()
+      , gridSrc_(), hasTransform_(false)
    {
      setVirtualDomainGroup();
@@ -1408 +1408 @@
     transformations_ = new CGridTransformation(this, transformGridSrc);
     transformations_->computeAll();
+    if (0 < transformations_->getNbAlgo()) hasTransform_ = true;
 
     // Ok, now need to compute index of grid source
     transformGridSrc->checkMaskIndex(false);
+  }
+
+  bool CGrid::hasTransform()
+  {
+    return hasTransform_;
   }
 

XIOS/trunk/src/node/grid.hpp

@@ -195 +195 @@
          void addTransGridSource(CGrid* gridSrc);
          std::map<CGrid*, std::pair<bool,StdString> >& getTransGridSource();
+         bool hasTransform();
 
       public:
@@ -273 +274 @@
         std::vector<int> globalDim_;
         std::map<CGrid*, std::pair<bool,StdString> > gridSrc_;
+        bool hasTransform_;
    }; // class CGrid
 

XIOS/trunk/src/test/test_remap.f90

@@ -116 +116 @@
                             bounds_lon_1D=src_boundslon, bounds_lat_1D=src_boundslat, nvertex=src_nvertex)
 
+  CALL xios_set_domain_attr("src_domain_clone", ni_glo=src_ni_glo, ibegin=src_ibegin, ni=src_ni, type="unstructured")
+  CALL xios_set_domain_attr("src_domain_clone", lonvalue_1D=src_lon, latvalue_1D=src_lat, &
+                            bounds_lon_1D=src_boundslon, bounds_lat_1D=src_boundslat, nvertex=src_nvertex)
+
   CALL xios_set_domain_attr("dst_domain", ni_glo=dst_ni_glo, ibegin=dst_ibegin, ni=dst_ni, type="unstructured")
   CALL xios_set_domain_attr("dst_domain", lonvalue_1D=dst_lon, latvalue_1D=dst_lat, &

XIOS/trunk/src/transformation/grid_transformation.cpp

@@ -355 +355 @@
 void CGridTransformation::computeAll()
 {
+  if (nbAlgos_ < 1) return;
+
   CContext* context = CContext::getCurrent();
   CContextClient* client = context->client;

XIOS/trunk/src/transformation/grid_transformation.hpp

@@ -48 +48 @@
   CGrid* getGridDestination() { return gridDestination_; }
   ListAlgoType getAlgoList() const {return listAlgos_; }
+  int getNbAlgo() { return nbAlgos_; }
 
 protected: