Changeset 2198

Timestamp:

07/28/21 11:25:01 (3 years ago)

Author:

jderouillat

Message:

Backporting commit 2088 : bug fix in remapper for gcc

Location:

XIOS/dev/dev_ym/XIOS_COUPLING/extern/remap/src

Files:

• mapper.hpp (modified) (1 diff)
• node.cpp (modified) (1 diff)
• triple.hpp (modified) (1 diff)

XIOS/dev/dev_ym/XIOS_COUPLING/extern/remap/src/mapper.hpp

@@ -27 +27 @@
        void getTargetValue(double* val) ;
 
-       double buildSSTree(vector<Node>& srcMsh, vector<Node>& trgMsh)
+       void buildSSTree(vector<Node>& srcMsh, vector<Node>& trgMsh)
        {
          sstree.build(srcMsh, trgMsh);

XIOS/dev/dev_ym/XIOS_COUPLING/extern/remap/src/node.cpp

@@ -146 +146 @@
 void Node::remove(const NodePtr node)
 {
-        if (&node == NULL) return;
+        if (node == NULL) return;
         double w = double(node->leafCount) / this->leafCount;
         Coord newCentre = proj(this->centre - node->centre * w);

XIOS/dev/dev_ym/XIOS_COUPLING/extern/remap/src/triple.hpp

@@ -36 +36 @@
         Vector& operator+=(const Vector& rhs)
         {
-                u += rhs.u;
-                v += rhs.v;
-                w += rhs.w;
+          u += rhs.u;
+          v += rhs.v;
+          w += rhs.w;
+          return *this;
         }