Changeset 746 for XIOS/trunk/src/node/field.cpp

Timestamp:

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

Author:

rlacroix

Message:

Restore support for spatial transformations when 'domain_ref'/'axis_ref' are used.

File:

• XIOS/trunk/src/node/field.cpp (modified) (3 diffs)

XIOS/trunk/src/node/field.cpp

@@ -651 +651 @@
      std::pair<boost::shared_ptr<CFilter>, boost::shared_ptr<CFilter> > filters;
      // Check if a spatial transformation is needed
-     if (!grid_ref.isEmpty() && !fieldRef->grid_ref.isEmpty() && grid_ref.getValue() != fieldRef->grid_ref.getValue())
+     if (grid && grid != fieldRef->grid)
        filters = CSpatialTransformFilter::buildFilterGraph(gc, fieldRef->grid, grid);
      else
@@ -819 +819 @@
    void CField::solveTransformedGrid()
    {
-     if (!grid_ref.isEmpty() && hasDirectFieldReference() && !getDirectFieldReference()->grid_ref.isEmpty()
-         && grid_ref.getValue() != getDirectFieldReference()->grid_ref.getValue() && !grid->isTransformed())
+     if (grid && !grid->isTransformed() && hasDirectFieldReference() && grid != getDirectFieldReference()->grid)
        grid->transformGrid(getDirectFieldReference()->grid);
    }
@@ -826 +825 @@
    void CField::solveGenerateGrid()
    {
-     if (!grid_ref.isEmpty() && hasDirectFieldReference() && !getDirectFieldReference()->grid_ref.isEmpty()
-         && grid_ref.getValue() != getDirectFieldReference()->grid_ref.getValue() && !grid->isTransformed())
+     if (grid && !grid->isTransformed() && hasDirectFieldReference() && grid != getDirectFieldReference()->grid)
        grid->completeGrid(getDirectFieldReference()->grid);
    }