Changeset 827 for XIOS/trunk/src/node/interpolate_axis.cpp

Timestamp:

03/23/16 16:10:45 (8 years ago)

Author:

mhnguyen

Message:

Implementing dynamic interpolation on axis

+) Change grid transformation to make it more flexible
+) Make some small improvements

Test
+) On Curie
+) All test pass

File:

• XIOS/trunk/src/node/interpolate_axis.cpp (modified) (2 diffs)

XIOS/trunk/src/node/interpolate_axis.cpp

@@ -1 +1 @@
 #include "interpolate_axis.hpp"
 #include "type.hpp"
+#include "field.hpp"
 
 namespace xios {
@@ -23 +24 @@
   ENodeType CInterpolateAxis::GetType(void)    { return eInterpolateAxis; }
 
-  void CInterpolateAxis::checkValid(CAxis* axisDest)
+  void CInterpolateAxis::checkValid(CAxis* axisSrc)
   {
+    if (this->order.isEmpty()) this->order.setValue(2);
+    int order = this->order.getValue();
+    if (order >= axisSrc->n_glo.getValue())
+    {
+      ERROR("CInterpolateAxis::checkValid(CAxis* axisSrc)",
+             << "Order of interpolation is greater than global size of axis source"
+             << "Size of axis source " <<axisSrc->getId() << " is " << axisSrc->n_glo.getValue()  << std::endl
+             << "Order of interpolation is " << order );
+    }
+
+
+    if (!this->coordinate.isEmpty())
+    {
+      StdString coordinate = this->coordinate.getValue();
+      if (!CField::has(coordinate))
+        ERROR("CInterpolateAxis::checkValid(CAxis* axisSrc)",
+               << "Coordinate field whose id " << coordinate << "does not exist "
+               << "Please define one");
+    }
   }
 
+  std::vector<StdString> CInterpolateAxis::checkAuxInputs_()
+  {
+    std::vector<StdString> auxInputs;
+    if (!this->coordinate.isEmpty())
+    {
+      StdString coordinate = this->coordinate.getValue();
+      if (!CField::has(coordinate))
+        ERROR("CInterpolateAxis::checkValid(CAxis* axisSrc)",
+               << "Coordinate field whose id " << coordinate << "does not exist "
+               << "Please define one");
+      auxInputs.push_back(coordinate);
+    }
+
+    return auxInputs;
+  }
 }