Changeset 2536

Timestamp:

07/21/23 14:46:10 (18 months ago)

Author:

jderouillat

Message:

Fix some minor merge error

Location:

XIOS3/branches/xios-3.0-beta/extern/remap/src

Files:

• meshutil.cpp (modified) (1 diff)
• polyg.cpp (modified) (1 diff)

XIOS3/branches/xios-3.0-beta/extern/remap/src/meshutil.cpp

@@ -73 +73 @@
   polyline.clear();
   indices_a_gno.clear();
-
+  delete [] a_gno ;
 }
 

XIOS3/branches/xios-3.0-beta/extern/remap/src/polyg.cpp

@@ -103 +103 @@
   else if (n == 2) return midpoint(x[0], x[1]);
   else if (n == 1) return x[0];
+
+  error_exit( "Missing return in : Coord exact_barycentre(const Coord *x, int n)" );
+  return ORIGIN;
 }