Merge /u/tmaric/cfmesh/ branch port-OpenFOAM-dev into port-v1606+

https://sourceforge.net/p/cfmesh/code/merge-requests/2/

README

@@ -2,8 +2,8 @@
 #
 #+TITLE:                       *cfMesh README*
 #+AUTHOR:                      Franjo Juretic.
-#+DATE:                           May 2015
-#+LINK:                  http://www.c-fields.com
+#+DATE:                           October 2016
+#+LINK:                  http://www.cfmesh.com
 #+OPTIONS:
 
 cfMesh is a library for mesh generation built on OpenFOAM.

executables/cartesian2DMesh/Make/options

 ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
-    CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
     ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
         CFMESH_MACROS = -DNoSizeType
     else
         CFMESH_MACROS =
     endif
+
+    ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume 
+    else
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+    endif
 endif
 
 ifeq ($(WM_PROJECT), foam)

executables/cartesianMesh/Make/options

 ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
-    CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
     ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
         CFMESH_MACROS = -DNoSizeType
     else
         CFMESH_MACROS =
     endif
+
+    ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume 
+    else
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+    endif
 endif
 
 ifeq ($(WM_PROJECT), foam)

executables/pMesh/Make/options

 ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
-    CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
     ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
         CFMESH_MACROS = -DNoSizeType
     else
         CFMESH_MACROS =
     endif
+
+    ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume 
+    else
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+    endif
 endif
 
 ifeq ($(WM_PROJECT), foam)

executables/tetMesh/Make/options

 ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
-    CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
     ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
         CFMESH_MACROS = -DNoSizeType
     else
         CFMESH_MACROS =
     endif
+
+    ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume 
+    else
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+    endif
 endif
 
 ifeq ($(WM_PROJECT), foam)

meshLibrary/utilities/boundaryLayers/extrudeLayer/extrudeLayer.C

@@ -374,7 +374,7 @@ void extrudeLayer::createNewVertices()
 
             OPstream toOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo(),
                 globalLabels.byteSize()
             );
@@ -390,7 +390,7 @@ void extrudeLayer::createNewVertices()
             labelList receivedData;
             IPstream fromOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo()
             );
 

meshLibrary/utilities/boundaryLayers/refineBoundaryLayers/refineBoundaryLayersFaces.C

@@ -1049,7 +1049,7 @@ void refineBoundaryLayers::generateNewFaces()
 
             OPstream toOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo(),
                 sendData.byteSize()
             );
@@ -1065,7 +1065,7 @@ void refineBoundaryLayers::generateNewFaces()
 
             IPstream fromOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo()
             );
 

meshLibrary/utilities/decomposeCells/decomposeCellsDecomposition.C

@@ -117,7 +117,7 @@ void decomposeCells::checkFaceConnections(const boolList& decomposeCell)
 
             OPstream toOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo(),
                 decFace.byteSize()
             );
@@ -132,7 +132,7 @@ void decomposeCells::checkFaceConnections(const boolList& decomposeCell)
 
             IPstream fromOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo()
             );
 

meshLibrary/utilities/helperFunctions/helperFunctionsPar.C

@@ -79,7 +79,7 @@ void whisperReduce(const ListType& neis, const scatterOp& sop, gatherOp& gop)
     {
         //- receive the data
         List<T> receivedData;
-        IPstream fromOtherProc(Pstream::blocking, above[aboveI]);
+        IPstream fromOtherProc(UPstream::commsTypes::blocking, above[aboveI]);
         fromOtherProc >> receivedData;
 
         gop(receivedData);
@@ -94,7 +94,7 @@ void whisperReduce(const ListType& neis, const scatterOp& sop, gatherOp& gop)
         sop(dts);
 
         //- send the data
-        OPstream toOtherProc(Pstream::blocking, neiProc, dts.byteSize());
+        OPstream toOtherProc(UPstream::commsTypes::blocking, neiProc, dts.byteSize());
         toOtherProc << dts;
     }
 
@@ -104,7 +104,7 @@ void whisperReduce(const ListType& neis, const scatterOp& sop, gatherOp& gop)
     {
         //- receive the data
         List<T> receivedData;
-        IPstream fromOtherProc(Pstream::blocking, below[belowI]);
+        IPstream fromOtherProc(UPstream::commsTypes::blocking, below[belowI]);
         fromOtherProc >> receivedData;
 
         gop(receivedData);
@@ -119,7 +119,7 @@ void whisperReduce(const ListType& neis, const scatterOp& sop, gatherOp& gop)
         sop(dts);
 
         //- send the data
-        OPstream toOtherProc(Pstream::blocking, neiProc, dts.byteSize());
+        OPstream toOtherProc(UPstream::commsTypes::blocking, neiProc, dts.byteSize());
         toOtherProc << dts;
     }
 }
@@ -143,14 +143,14 @@ void exchangeMap
     labelHashSet receiveData;
     for(iter=m.begin();iter!=m.end();++iter)
     {
-        OPstream toOtherProc(Pstream::blocking, iter->first, sizeof(label));
+        OPstream toOtherProc(UPstream::commsTypes::blocking, iter->first, sizeof(label));
 
         toOtherProc << iter->second.size();
     }
 
     for(iter=m.begin();iter!=m.end();++iter)
     {
-        IPstream fromOtherProc(Pstream::blocking, iter->first, sizeof(label));
+        IPstream fromOtherProc(UPstream::commsTypes::blocking, iter->first, sizeof(label));
 
         label s;
         fromOtherProc >> s;
@@ -159,7 +159,7 @@ void exchangeMap
             receiveData.insert(iter->first);
     }
 
-    if( commsType == Pstream::blocking )
+    if( commsType == UPstream::commsTypes::blocking )
     {
         //- start with blocking type of send and received operation
 
@@ -173,7 +173,7 @@ void exchangeMap
 
             OPstream toOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 iter->first,
                 dts.byteSize()
             );
@@ -186,11 +186,11 @@ void exchangeMap
             if( !receiveData.found(iter->first) )
                 continue;
 
-            IPstream fromOtherProc(Pstream::blocking, iter->first);
+            IPstream fromOtherProc(UPstream::commsTypes::blocking, iter->first);
             data.appendFromStream(fromOtherProc);
         }
     }
-    else if( commsType == Pstream::scheduled )
+    else if( commsType == UPstream::commsTypes::scheduled )
     {
         //- start with scheduled data transfer
         //- this type of transfer is intended for long messages because
@@ -205,7 +205,7 @@ void exchangeMap
                 continue;
 
             //List<T> receive;
-            IPstream fromOtherProc(Pstream::scheduled, iter->first);
+            IPstream fromOtherProc(UPstream::commsTypes::scheduled, iter->first);
             //fromOtherProc >> receive;
             data.appendFromStream(fromOtherProc);
 
@@ -226,7 +226,7 @@ void exchangeMap
 
             OPstream toOtherProc
             (
-                Pstream::scheduled,
+                UPstream::commsTypes::scheduled,
                 iter->first,
                 dts.byteSize()
             );
@@ -243,7 +243,7 @@ void exchangeMap
             if( !receiveData.found(riter->first) )
                 continue;
 
-            IPstream fromOtherProc(Pstream::scheduled, riter->first);
+            IPstream fromOtherProc(UPstream::commsTypes::scheduled, riter->first);
             //List<T> receive;
             //fromOtherProc >> receive;
             data.appendFromStream(fromOtherProc);
@@ -265,7 +265,7 @@ void exchangeMap
 
             OPstream toOtherProc
             (
-                Pstream::scheduled,
+                UPstream::commsTypes::scheduled,
                 riter->first,
                 dts.byteSize()
             );
@@ -317,7 +317,7 @@ void exchangeMap
 
         OPstream toOtherProc
         (
-            Pstream::blocking,
+            UPstream::commsTypes::blocking,
             iter->first,
             dataToSend.byteSize()
         );
@@ -330,7 +330,7 @@ void exchangeMap
         mOut.insert(std::make_pair(iter->first, List<T>()));
         List<T>& dataToReceive = mOut[iter->first];
 
-        IPstream fromOtherProc(Pstream::blocking, iter->first);
+        IPstream fromOtherProc(UPstream::commsTypes::blocking, iter->first);
         fromOtherProc >> dataToReceive;
     }
 }

meshLibrary/utilities/helperFunctions/helperFunctionsPar.H

@@ -65,7 +65,7 @@ void exchangeMap
 (
     const std::map<label, ListType>&,
     LongList<T>&,
-    const Pstream::commsTypes commsType = Pstream::blocking
+    const UPstream::commsTypes commsType = UPstream::commsTypes::blocking
 );
 
 //- sends the data stored in a map to other processors and receives the data

meshLibrary/utilities/meshes/partTetMesh/partTetMesh.C

@@ -591,7 +591,7 @@ void partTetMesh::updateOrigMesh(boolList* changedFacePtr)
 
             OPstream toOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 pBnd[patchI].neiProcNo(),
                 sendData.byteSize()
             );
@@ -605,7 +605,7 @@ void partTetMesh::updateOrigMesh(boolList* changedFacePtr)
 
             IPstream fromOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 pBnd[patchI].neiProcNo()
             );
 

meshLibrary/utilities/meshes/partTetMesh/partTetMeshAddressing.C

@@ -88,7 +88,7 @@ void partTetMesh::createPointsAndTets
 
         OPstream toOtherProc
         (
-            Pstream::blocking,
+            UPstream::commsTypes::blocking,
             procBoundaries[patchI].neiProcNo(),
             dataToSend.byteSize()
         );
@@ -103,7 +103,7 @@ void partTetMesh::createPointsAndTets
 
         IPstream fromOtherProc
         (
-            Pstream::blocking,
+            UPstream::commsTypes::blocking,
             procBoundaries[patchI].neiProcNo()
         );
 

meshLibrary/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingParallelAddressing.C

@@ -131,7 +131,7 @@ void polyMeshGenAddressing::calcGlobalPointLabels() const
 
             OPstream toOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo(),
                 dataToSend.byteSize()
             );
@@ -142,7 +142,7 @@ void polyMeshGenAddressing::calcGlobalPointLabels() const
         {
             IPstream fromOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo()
             );
             labelList receivedData;
@@ -236,7 +236,7 @@ void polyMeshGenAddressing::calcGlobalPointLabels() const
 
             OPstream toOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo(),
                 dataToSend.byteSize()
             );
@@ -247,7 +247,7 @@ void polyMeshGenAddressing::calcGlobalPointLabels() const
         {
             IPstream fromOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo()
             );
             labelList receivedData;
@@ -344,7 +344,7 @@ void polyMeshGenAddressing::calcGlobalFaceLabels() const
 
             OPstream toOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo(),
                 dataToSend.byteSize()
             );
@@ -358,7 +358,7 @@ void polyMeshGenAddressing::calcGlobalFaceLabels() const
         {
             IPstream fromOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo()
             );
 
@@ -529,7 +529,7 @@ void polyMeshGenAddressing::calcGlobalEdgeLabels() const
 
             OPstream toOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo(),
                 dataToSend.byteSize()
             );
@@ -540,7 +540,7 @@ void polyMeshGenAddressing::calcGlobalEdgeLabels() const
         {
             IPstream fromOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo()
             );
             labelList receivedData;
@@ -642,7 +642,7 @@ void polyMeshGenAddressing::calcGlobalEdgeLabels() const
 
             OPstream toOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo(),
                 dataToSend.byteSize()
             );
@@ -653,7 +653,7 @@ void polyMeshGenAddressing::calcGlobalEdgeLabels() const
         {
             IPstream fromOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo()
             );
             labelList receivedData;

meshLibrary/utilities/meshes/polyMeshGenChecks/polyMeshGenChecksGeometry.C

@@ -1566,7 +1566,7 @@ bool checkCellPartTetrahedra
 
             OPstream toOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBnd[patchI].neiProcNo(),
                 sendData.byteSize()
             );
@@ -1580,7 +1580,7 @@ bool checkCellPartTetrahedra
 
             IPstream fromOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBnd[patchI].neiProcNo()
             );
 
@@ -1667,7 +1667,7 @@ void checkFaceDotProduct
 
             OPstream toOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo(),
                 cCentres.byteSize()
             );
@@ -1680,7 +1680,7 @@ void checkFaceDotProduct
             vectorField otherCentres;
             IPstream fromOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo()
             );
 
@@ -2076,7 +2076,7 @@ bool checkFacePyramids
 
             OPstream toOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo(),
                 markedFaces.byteSize()
             );
@@ -2089,7 +2089,7 @@ bool checkFacePyramids
             labelList receivedData;
             IPstream fromOtheProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo()
             );
             fromOtheProc >> receivedData;
@@ -2179,7 +2179,7 @@ void checkFaceSkewness
 
             OPstream toOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo(),
                 cCentres.byteSize()
             );
@@ -2194,7 +2194,7 @@ void checkFaceSkewness
             vectorField otherCentres;
             IPstream fromOtheProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo()
             );
 
@@ -2421,7 +2421,7 @@ void checkFaceUniformity
 
             OPstream toOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo(),
                 dst.byteSize()
             );
@@ -2436,7 +2436,7 @@ void checkFaceUniformity
             scalarField otherDst;
             IPstream fromOtheProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo()
             );
 
@@ -2885,7 +2885,7 @@ bool checkFaceFlatness
         {
             OPstream toOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo(),
                 sizeof(label)
             );
@@ -2898,7 +2898,7 @@ bool checkFaceFlatness
         {
             IPstream fromOtheProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo(),
                 sizeof(label)
             );
@@ -2914,7 +2914,7 @@ bool checkFaceFlatness
 
             OPstream toOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo(),
                 markedFaces[patchI].byteSize()
             );
@@ -2930,7 +2930,7 @@ bool checkFaceFlatness
             labelList receivedData;
             IPstream fromOtheProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo(),
                 nMarkedOnOtherProcs[patchI]*sizeof(label)
             );

meshLibrary/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierAddBufferCells.C

@@ -87,7 +87,7 @@ void polyMeshGenModifier::addBufferCells()
         
         OPstream toOtherProc
         (
-            Pstream::blocking,
+            UPstream::commsTypes::blocking,
             procBoundaries[patchI].neiProcNo()
         );
         
@@ -100,7 +100,7 @@ void polyMeshGenModifier::addBufferCells()
         List<labelledPoint> receivedPoints;
         IPstream fromOtherProc
         (
-            IPstream::blocking,
+            UIPstream::commsTypes::blocking,
             procBoundaries[patchI].neiProcNo()
         );
         
@@ -154,7 +154,7 @@ void polyMeshGenModifier::addBufferCells()
         
         OPstream toOtherProc
         (
-            Pstream::blocking,
+            UPstream::commsTypes::blocking,
             procBoundaries[patchI].neiProcNo()
         );
         
@@ -171,7 +171,7 @@ void polyMeshGenModifier::addBufferCells()
         
         IPstream fromOtherProc
         (
-            Pstream::blocking,
+            UPstream::commsTypes::blocking,
             procBoundaries[patchI].neiProcNo()
         );
         

meshLibrary/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierRemoveFaces.C

@@ -126,7 +126,7 @@ void polyMeshGenModifier::removeFaces(const boolList& removeFace)
 
             OPstream toOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo(),
                 removeProcFace.byteSize()
             );
@@ -142,7 +142,7 @@ void polyMeshGenModifier::removeFaces(const boolList& removeFace)
             boolList removeOtherProcFace;
             IPstream fromOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo()
             );
             fromOtherProc >> removeOtherProcFace;

meshLibrary/utilities/meshes/primitives/meshSubsets/meshSubsetI.H

@@ -170,7 +170,7 @@ inline bool meshSubset::operator==(const meshSubset& ms) const
 {
     if( ms.name_ != name_ )
         return false;
-    if( ms.type_ != ms.type_ )
+    if( ms.type_ != type_ )
         return false;
 
     forAllConstIter(std::set<label>, data_, it)