Changeset 1980 for XIOS/trunk/src/node

Timestamp:

11/24/20 11:33:59 (3 years ago)

Author:

yushan

Message:

trunk : axis interpolate can have coordinate source (coordinate_src) and coordinate destination (coordinate_dst), while previous attribute coordinate compatible to source

File:

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

XIOS/trunk/src/node/interpolate_axis.cpp

@@ -41 +41 @@
   {
     if (this->order.isEmpty()) this->order.setValue(1);
+    if (this->coordinate.isEmpty() && !this->coordinate_src.isEmpty()) this->coordinate.setValue(this->coordinate_src.getValue());
+    if (this->coordinate_src.isEmpty() && !this->coordinate.isEmpty()) this->coordinate_src.setValue(this->coordinate.getValue());
     int order = this->order.getValue();
     if (order >= axisSrc->n_glo.getValue())
@@ -67 +69 @@
                << "Please define one");
     }
+    
+    if (!this->coordinate_dst.isEmpty())
+    {
+      StdString coordinate = this->coordinate_dst.getValue();
+      if (!CField::has(coordinate))
+        ERROR("CInterpolateAxis::checkValid(CAxis* axisSrc)",
+               << "Coordinate field whose id " << coordinate << "does not exist "
+               << "Please define one");
+    }
+   
   }
 
@@ -72 +84 @@
   {
     std::vector<StdString> auxInputs;
-    if (!this->coordinate.isEmpty())
+    if (!this->coordinate.isEmpty() && this->coordinate_src.isEmpty())
     {
       StdString coordinate = this->coordinate.getValue();
+      this->coordinate_src.setValue(coordinate);
+      if (!CField::has(coordinate))
+        ERROR("CInterpolateAxis::checkValid(CAxis* axisSrc)",
+               << "Coordinate field whose id " << coordinate << "does not exist "
+               << "Please define one");
+      auxInputs.push_back(coordinate);
+    }
+    if (!this->coordinate_src.isEmpty() || !this->coordinate.isEmpty())
+    {
+      StdString coordinate = !this->coordinate.isEmpty()? this->coordinate.getValue():this->coordinate_src.getValue();
+      this->coordinate.setValue(coordinate);
+      if (!CField::has(coordinate))
+        ERROR("CInterpolateAxis::checkValid(CAxis* axisSrc)",
+               << "Coordinate field whose id " << coordinate << "does not exist "
+               << "Please define one");
+      auxInputs.push_back(coordinate);
+    }
+    
+    if (!this->coordinate_dst.isEmpty())
+    {
+      StdString coordinate = this->coordinate_dst.getValue();
       if (!CField::has(coordinate))
         ERROR("CInterpolateAxis::checkValid(CAxis* axisSrc)",