From d894273a38f477e7da5c3b8ee3f608709984c481 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 22 Nov 2017 12:42:05 +0100
Subject: [PATCH] COMP: downgrade a few methods to compile with 1706

---
 .../helperFunctionsGeometryQueriesI.H            |  4 ++--
 .../helperFunctions/helperFunctionsPar.C         | 16 ++++++++++++++--
 utilities/scaleMesh/scaleMesh.C                  |  3 ++-
 utilities/scaleSurfaceMesh/scaleSurfaceMesh.C    |  3 ++-
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/meshLibrary/utilities/helperFunctions/helperFunctionsGeometryQueriesI.H b/meshLibrary/utilities/helperFunctions/helperFunctionsGeometryQueriesI.H
index 1ca4d78..3771caf 100644
--- a/meshLibrary/utilities/helperFunctions/helperFunctionsGeometryQueriesI.H
+++ b/meshLibrary/utilities/helperFunctions/helperFunctionsGeometryQueriesI.H
@@ -1916,8 +1916,8 @@ inline label numberOfEdgeGroups
     for (const label edgei : containedEdges)
     {
         const edge& e = edges[edgei];
-        const point& sp = points[e.first()];
-        const point& ep = points[e.second()];
+        const point& sp = points[e.start()];
+        const point& ep = points[e.end()];
 
         const point p = nearestPointOnTheEdgeExact(sp, ep, centre);
         if (magSqr(p - centre) < rangeSq)
diff --git a/meshLibrary/utilities/helperFunctions/helperFunctionsPar.C b/meshLibrary/utilities/helperFunctions/helperFunctionsPar.C
index 5b30791..62d986e 100644
--- a/meshLibrary/utilities/helperFunctions/helperFunctionsPar.C
+++ b/meshLibrary/utilities/helperFunctions/helperFunctionsPar.C
@@ -276,7 +276,13 @@ void exchangeMap
         }
 
         // receive data from processors with greater ids
-        forAllConstReverseIters(m, riter)
+//        forAllConstReverseIters(m, riter)
+        for
+        (
+            auto riter = m.rbegin();
+            riter != m.rend();
+            ++riter
+        )
         {
             if (riter->first <= Pstream::myProcNo())
             {
@@ -297,7 +303,13 @@ void exchangeMap
         }
 
         // send data to processors with lower ids
-        forAllConstReverseIters(m, riter)
+//        forAllConstReverseIters(m, riter)
+        for
+        (
+            auto riter = m.rbegin();
+            riter != m.rend();
+            ++riter
+        )
         {
             if (riter->first >= Pstream::myProcNo())
             {
diff --git a/utilities/scaleMesh/scaleMesh.C b/utilities/scaleMesh/scaleMesh.C
index 50e54f4..26fa0a9 100644
--- a/utilities/scaleMesh/scaleMesh.C
+++ b/utilities/scaleMesh/scaleMesh.C
@@ -42,7 +42,8 @@ int main(int argc, char *argv[])
 #   include "setRootCase.H"
 #   include "createTime.H"
 
-    const scalar scalingFactor(readScalar(args[1]));
+    // const scalar scalingFactor(readScalar(args[1]));
+    const scalar scalingFactor(args.argRead<scalar>(1));
 
     Info<< "Scaling mesh vertices by a factor " << scalingFactor << endl;
 
diff --git a/utilities/scaleSurfaceMesh/scaleSurfaceMesh.C b/utilities/scaleSurfaceMesh/scaleSurfaceMesh.C
index 3cc5e3e..ad9cda9 100644
--- a/utilities/scaleSurfaceMesh/scaleSurfaceMesh.C
+++ b/utilities/scaleSurfaceMesh/scaleSurfaceMesh.C
@@ -49,7 +49,8 @@ int main(int argc, char *argv[])
 
     const fileName inFileName(args[1]);
     const fileName outFileName(args[2]);
-    const scalar scalingFactor(readScalar(args[3]));
+    // const scalar scalingFactor(readScalar(args[3]));
+    const scalar scalingFactor(args.argRead<scalar>(3));
 
     // read the surface mesh
     triSurf surface(inFileName);
-- 
GitLab