From 3bb5cef5bfff444c9c410e6f8be987272c214969 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 18 Jul 2018 09:29:28 +0100
Subject: [PATCH] ENH: decompsition: check for mesh dimensions. Fixes #937.

---
 .../geomDecomp/geomDecomp.C                   | 21 ++++++++++++++++++-
 .../geomDecomp/geomDecomp.H                   |  7 +++++++
 .../hierarchGeomDecomp/hierarchGeomDecomp.H   |  2 ++
 .../simpleGeomDecomp/simpleGeomDecomp.H       |  6 ++++--
 4 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/src/parallel/decompose/decompositionMethods/geomDecomp/geomDecomp.C b/src/parallel/decompose/decompositionMethods/geomDecomp/geomDecomp.C
index 1c2df26498..e71ed39b5d 100644
--- a/src/parallel/decompose/decompositionMethods/geomDecomp/geomDecomp.C
+++ b/src/parallel/decompose/decompositionMethods/geomDecomp/geomDecomp.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -58,6 +58,25 @@ void Foam::geomDecomp::readCoeffs()
 }
 
 
+void Foam::geomDecomp::checkDecompositionDirections
+(
+    const Vector<label>& meshDirs
+) const
+{
+    for (direction dir = 0; dir < Vector<label>::nComponents; dir++)
+    {
+        if (n_[dir] > 1 && meshDirs[dir] == -1)
+        {
+            FatalErrorInFunction << "Trying to decompose a 1/2D mesh"
+                << " into " << n_[dir]
+                << " parts in direction "
+                << Vector<label>::componentNames[dir]
+                << exit(FatalError);
+        }
+    }
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::geomDecomp::geomDecomp
diff --git a/src/parallel/decompose/decompositionMethods/geomDecomp/geomDecomp.H b/src/parallel/decompose/decompositionMethods/geomDecomp/geomDecomp.H
index b334ef4323..d5c38c8f9d 100644
--- a/src/parallel/decompose/decompositionMethods/geomDecomp/geomDecomp.H
+++ b/src/parallel/decompose/decompositionMethods/geomDecomp/geomDecomp.H
@@ -76,6 +76,13 @@ protected:
 
         tensor rotDelta_;
 
+
+    // Protected Member Functions
+
+        //- Check that mesh directions are compatible with decomposition
+        void checkDecompositionDirections(const Vector<label>&) const;
+
+
 public:
 
     // Constructors
diff --git a/src/parallel/decompose/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.H b/src/parallel/decompose/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.H
index 663d45c574..cfc6b70a93 100644
--- a/src/parallel/decompose/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.H
+++ b/src/parallel/decompose/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.H
@@ -224,6 +224,7 @@ public:
             const scalarField& cWeights
         ) const
         {
+            checkDecompositionDirections(mesh.geometricD());
             return decompose(cc, cWeights);
         }
 
@@ -236,6 +237,7 @@ public:
             const pointField& cc
         ) const
         {
+            checkDecompositionDirections(mesh.geometricD());
             return decompose(cc);
         }
 
diff --git a/src/parallel/decompose/decompositionMethods/simpleGeomDecomp/simpleGeomDecomp.H b/src/parallel/decompose/decompositionMethods/simpleGeomDecomp/simpleGeomDecomp.H
index b4e16411b5..e0e044ef5d 100644
--- a/src/parallel/decompose/decompositionMethods/simpleGeomDecomp/simpleGeomDecomp.H
+++ b/src/parallel/decompose/decompositionMethods/simpleGeomDecomp/simpleGeomDecomp.H
@@ -128,21 +128,23 @@ public:
         //- Decompose with uniform weights.
         virtual labelList decompose
         (
-            const polyMesh&,
+            const polyMesh& mesh,
             const pointField& points
         ) const
         {
+            checkDecompositionDirections(mesh.geometricD());
             return decompose(points);
         }
 
         //- Return for every coordinate the wanted processor number.
         virtual labelList decompose
         (
-            const polyMesh&,
+            const polyMesh& mesh,
             const pointField& points,
             const scalarField& weights
         ) const
         {
+            checkDecompositionDirections(mesh.geometricD());
             return decompose(points, weights);
         }