BUGFIX: Bring sources up to date with repository

src/dynamicMesh/meshMotion/mesquiteMotionSolver/mesquiteMotionSolver.H

@@ -49,10 +49,18 @@ SourceFiles
 // Have gcc ignore certain warnings while including mesquite headers
 #if defined(__GNUC__) && !defined(__INTEL_COMPILER)
 #   pragma GCC diagnostic ignored "-Wold-style-cast"
+#   pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#   pragma GCC diagnostic ignored "-Wunused-but-set-variable"
 #endif
 
 #include "Mesquite_all_headers.hpp"
 
+#if defined(__GNUC__) && !defined(__INTEL_COMPILER)
+#   pragma GCC diagnostic warning "-Wold-style-cast"
+#   pragma GCC diagnostic warning "-Wnon-virtual-dtor"
+#   pragma GCC diagnostic warning "-Wunused-but-set-variable"
+#endif
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
@@ -88,6 +96,17 @@ class mesquiteMotionSolver
         //- Number of elements
         unsigned long nCells_;
 
+        //- Polyhedra decomposition type
+        //  1: for cell, 2: for face
+        label decompType_;
+
+        //- Number of points from poly decomposition
+        unsigned long nDecompPoints_;
+
+        //- List of decomposition centres
+        List<labelPair> decompCellCentres_;
+        List<labelPair> decompFaceCentres_;
+
         //- Number of auxiliary points
         labelList nAuxPoints_;
 
@@ -106,7 +125,7 @@ class mesquiteMotionSolver
         //- Specify max volume correction iterations
         label volCorrMaxIter_;
 
-        // Specify tolerance for the CG solver
+        //- Specify tolerance for the CG solver
         scalar tolerance_;
 
         //- Specify multiple mesh-motion sweeps
@@ -159,6 +178,7 @@ class mesquiteMotionSolver
         List<vectorField> gradEdge_;
         List<vectorField> localPts_;
         List<scalarField> edgeMarker_;
+        List<scalarField> edgeConstant_;
 
         //- Data for the auxiliary entities
         labelList procIndices_;
@@ -219,7 +239,7 @@ class mesquiteMotionSolver
         scalar cmptSumMag(const vectorField& field);
 
         // Transfer buffers for surface point fields
-        void transferBuffers(vectorField &field);
+        void transferBuffers(vectorField &field, bool fix = false);
 
         // Apply boundary conditions
         void applyBCs(vectorField &field);
@@ -253,6 +273,14 @@ class mesquiteMotionSolver
         // Prepare mesquite connectivity for parallel runs
         void initMesquiteParallelArrays();
 
+        // Compute centroids based on up-to-date point positions
+        void computeCentroids
+        (
+            const pointField& points,
+            pointField& faceCentres,
+            pointField& cellCentres
+        );
+
         // Copy auxiliary points to/from buffers
         void copyAuxiliaryPoints(bool firstCopy);
 
@@ -286,6 +314,9 @@ class mesquiteMotionSolver
         // Prepare point-normals with updated point positions
         void preparePointNormals();
 
+        // Prepare non-uniform edge constants with updated point positions
+        void prepareEdgeConstants(const vectorField& p);
+
         // Utility method to check validity of cells connected to a point.
         bool checkValidity
         (