Commit f3eb3473 authored by Franjo's avatar Franjo

Merge branch 'port-v1606+' of git://git.code.sf.net/p/cfmesh/code into port-v1606+

parents 4f46fdff 42c238e8
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
# #
#+TITLE: *cfMesh README* #+TITLE: *cfMesh README*
#+AUTHOR: Franjo Juretic. #+AUTHOR: Franjo Juretic.
#+DATE: May 2015 #+DATE: October 2016
#+LINK: http://www.c-fields.com #+LINK: http://www.cfmesh.com
#+OPTIONS: #+OPTIONS:
cfMesh is a library for mesh generation built on OpenFOAM. cfMesh is a library for mesh generation built on OpenFOAM.
......
ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT))) ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION))) ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
CFMESH_MACROS = -DNoSizeType CFMESH_MACROS = -DNoSizeType
else else
CFMESH_MACROS = CFMESH_MACROS =
endif endif
ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume
else
CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
endif
endif endif
ifeq ($(WM_PROJECT), foam) ifeq ($(WM_PROJECT), foam)
......
ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT))) ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION))) ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
CFMESH_MACROS = -DNoSizeType CFMESH_MACROS = -DNoSizeType
else else
CFMESH_MACROS = CFMESH_MACROS =
endif endif
ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume
else
CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
endif
endif endif
ifeq ($(WM_PROJECT), foam) ifeq ($(WM_PROJECT), foam)
......
ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT))) ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION))) ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
CFMESH_MACROS = -DNoSizeType CFMESH_MACROS = -DNoSizeType
else else
CFMESH_MACROS = CFMESH_MACROS =
endif endif
ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume
else
CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
endif
endif endif
ifeq ($(WM_PROJECT), foam) ifeq ($(WM_PROJECT), foam)
......
ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT))) ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION))) ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
CFMESH_MACROS = -DNoSizeType CFMESH_MACROS = -DNoSizeType
else else
CFMESH_MACROS = CFMESH_MACROS =
endif endif
ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume
else
CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
endif
endif endif
ifeq ($(WM_PROJECT), foam) ifeq ($(WM_PROJECT), foam)
......
...@@ -374,7 +374,7 @@ void extrudeLayer::createNewVertices() ...@@ -374,7 +374,7 @@ void extrudeLayer::createNewVertices()
OPstream toOtherProc OPstream toOtherProc
( (
Pstream::blocking, UPstream::commsTypes::blocking,
procBoundaries[patchI].neiProcNo(), procBoundaries[patchI].neiProcNo(),
globalLabels.byteSize() globalLabels.byteSize()
); );
...@@ -390,7 +390,7 @@ void extrudeLayer::createNewVertices() ...@@ -390,7 +390,7 @@ void extrudeLayer::createNewVertices()
labelList receivedData; labelList receivedData;
IPstream fromOtherProc IPstream fromOtherProc
( (
Pstream::blocking, UPstream::commsTypes::blocking,
procBoundaries[patchI].neiProcNo() procBoundaries[patchI].neiProcNo()
); );
......
...@@ -1049,7 +1049,7 @@ void refineBoundaryLayers::generateNewFaces() ...@@ -1049,7 +1049,7 @@ void refineBoundaryLayers::generateNewFaces()
OPstream toOtherProc OPstream toOtherProc
( (
Pstream::blocking, UPstream::commsTypes::blocking,
procBoundaries[patchI].neiProcNo(), procBoundaries[patchI].neiProcNo(),
sendData.byteSize() sendData.byteSize()
); );
...@@ -1065,7 +1065,7 @@ void refineBoundaryLayers::generateNewFaces() ...@@ -1065,7 +1065,7 @@ void refineBoundaryLayers::generateNewFaces()
IPstream fromOtherProc IPstream fromOtherProc
( (
Pstream::blocking, UPstream::commsTypes::blocking,
procBoundaries[patchI].neiProcNo() procBoundaries[patchI].neiProcNo()
); );
......
...@@ -117,7 +117,7 @@ void decomposeCells::checkFaceConnections(const boolList& decomposeCell) ...@@ -117,7 +117,7 @@ void decomposeCells::checkFaceConnections(const boolList& decomposeCell)
OPstream toOtherProc OPstream toOtherProc
( (
Pstream::blocking, UPstream::commsTypes::blocking,
procBoundaries[patchI].neiProcNo(), procBoundaries[patchI].neiProcNo(),
decFace.byteSize() decFace.byteSize()
); );
...@@ -132,7 +132,7 @@ void decomposeCells::checkFaceConnections(const boolList& decomposeCell) ...@@ -132,7 +132,7 @@ void decomposeCells::checkFaceConnections(const boolList& decomposeCell)
IPstream fromOtherProc IPstream fromOtherProc
( (
Pstream::blocking, UPstream::commsTypes::blocking,
procBoundaries[patchI].neiProcNo() procBoundaries[patchI].neiProcNo()
); );
......
...@@ -79,7 +79,7 @@ void whisperReduce(const ListType& neis, const scatterOp& sop, gatherOp& gop) ...@@ -79,7 +79,7 @@ void whisperReduce(const ListType& neis, const scatterOp& sop, gatherOp& gop)
{ {
//- receive the data //- receive the data
List<T> receivedData; List<T> receivedData;
IPstream fromOtherProc(Pstream::blocking, above[aboveI]); IPstream fromOtherProc(UPstream::commsTypes::blocking, above[aboveI]);
fromOtherProc >> receivedData; fromOtherProc >> receivedData;
gop(receivedData); gop(receivedData);
...@@ -94,7 +94,7 @@ void whisperReduce(const ListType& neis, const scatterOp& sop, gatherOp& gop) ...@@ -94,7 +94,7 @@ void whisperReduce(const ListType& neis, const scatterOp& sop, gatherOp& gop)
sop(dts); sop(dts);
//- send the data //- send the data
OPstream toOtherProc(Pstream::blocking, neiProc, dts.byteSize()); OPstream toOtherProc(UPstream::commsTypes::blocking, neiProc, dts.byteSize());
toOtherProc << dts; toOtherProc << dts;
} }
...@@ -104,7 +104,7 @@ void whisperReduce(const ListType& neis, const scatterOp& sop, gatherOp& gop) ...@@ -104,7 +104,7 @@ void whisperReduce(const ListType& neis, const scatterOp& sop, gatherOp& gop)
{ {
//- receive the data //- receive the data
List<T> receivedData; List<T> receivedData;
IPstream fromOtherProc(Pstream::blocking, below[belowI]); IPstream fromOtherProc(UPstream::commsTypes::blocking, below[belowI]);
fromOtherProc >> receivedData; fromOtherProc >> receivedData;
gop(receivedData); gop(receivedData);
...@@ -119,7 +119,7 @@ void whisperReduce(const ListType& neis, const scatterOp& sop, gatherOp& gop) ...@@ -119,7 +119,7 @@ void whisperReduce(const ListType& neis, const scatterOp& sop, gatherOp& gop)
sop(dts); sop(dts);
//- send the data //- send the data
OPstream toOtherProc(Pstream::blocking, neiProc, dts.byteSize()); OPstream toOtherProc(UPstream::commsTypes::blocking, neiProc, dts.byteSize());
toOtherProc << dts; toOtherProc << dts;
} }
} }
...@@ -143,14 +143,14 @@ void exchangeMap ...@@ -143,14 +143,14 @@ void exchangeMap
labelHashSet receiveData; labelHashSet receiveData;
for(iter=m.begin();iter!=m.end();++iter) 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(); toOtherProc << iter->second.size();
} }
for(iter=m.begin();iter!=m.end();++iter) 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; label s;
fromOtherProc >> s; fromOtherProc >> s;
...@@ -159,7 +159,7 @@ void exchangeMap ...@@ -159,7 +159,7 @@ void exchangeMap
receiveData.insert(iter->first); receiveData.insert(iter->first);
} }
if( commsType == Pstream::blocking ) if( commsType == UPstream::commsTypes::blocking )
{ {
//- start with blocking type of send and received operation //- start with blocking type of send and received operation
...@@ -173,7 +173,7 @@ void exchangeMap ...@@ -173,7 +173,7 @@ void exchangeMap
OPstream toOtherProc OPstream toOtherProc
( (
Pstream::blocking, UPstream::commsTypes::blocking,
iter->first, iter->first,
dts.byteSize() dts.byteSize()
); );
...@@ -186,11 +186,11 @@ void exchangeMap ...@@ -186,11 +186,11 @@ void exchangeMap
if( !receiveData.found(iter->first) ) if( !receiveData.found(iter->first) )
continue; continue;
IPstream fromOtherProc(Pstream::blocking, iter->first); IPstream fromOtherProc(UPstream::commsTypes::blocking, iter->first);
data.appendFromStream(fromOtherProc); data.appendFromStream(fromOtherProc);
} }
} }
else if( commsType == Pstream::scheduled ) else if( commsType == UPstream::commsTypes::scheduled )
{ {
//- start with scheduled data transfer //- start with scheduled data transfer
//- this type of transfer is intended for long messages because //- this type of transfer is intended for long messages because
...@@ -205,7 +205,7 @@ void exchangeMap ...@@ -205,7 +205,7 @@ void exchangeMap
continue; continue;
//List<T> receive; //List<T> receive;
IPstream fromOtherProc(Pstream::scheduled, iter->first); IPstream fromOtherProc(UPstream::commsTypes::scheduled, iter->first);
//fromOtherProc >> receive; //fromOtherProc >> receive;
data.appendFromStream(fromOtherProc); data.appendFromStream(fromOtherProc);
...@@ -226,7 +226,7 @@ void exchangeMap ...@@ -226,7 +226,7 @@ void exchangeMap
OPstream toOtherProc OPstream toOtherProc
( (
Pstream::scheduled, UPstream::commsTypes::scheduled,
iter->first, iter->first,
dts.byteSize() dts.byteSize()
); );
...@@ -243,7 +243,7 @@ void exchangeMap ...@@ -243,7 +243,7 @@ void exchangeMap
if( !receiveData.found(riter->first) ) if( !receiveData.found(riter->first) )
continue; continue;
IPstream fromOtherProc(Pstream::scheduled, riter->first); IPstream fromOtherProc(UPstream::commsTypes::scheduled, riter->first);
//List<T> receive; //List<T> receive;
//fromOtherProc >> receive; //fromOtherProc >> receive;
data.appendFromStream(fromOtherProc); data.appendFromStream(fromOtherProc);
...@@ -265,7 +265,7 @@ void exchangeMap ...@@ -265,7 +265,7 @@ void exchangeMap
OPstream toOtherProc OPstream toOtherProc
( (
Pstream::scheduled, UPstream::commsTypes::scheduled,
riter->first, riter->first,
dts.byteSize() dts.byteSize()
); );
...@@ -317,7 +317,7 @@ void exchangeMap ...@@ -317,7 +317,7 @@ void exchangeMap
OPstream toOtherProc OPstream toOtherProc
( (
Pstream::blocking, UPstream::commsTypes::blocking,
iter->first, iter->first,
dataToSend.byteSize() dataToSend.byteSize()
); );
...@@ -330,7 +330,7 @@ void exchangeMap ...@@ -330,7 +330,7 @@ void exchangeMap
mOut.insert(std::make_pair(iter->first, List<T>())); mOut.insert(std::make_pair(iter->first, List<T>()));
List<T>& dataToReceive = mOut[iter->first]; List<T>& dataToReceive = mOut[iter->first];
IPstream fromOtherProc(Pstream::blocking, iter->first); IPstream fromOtherProc(UPstream::commsTypes::blocking, iter->first);
fromOtherProc >> dataToReceive; fromOtherProc >> dataToReceive;
} }
} }
......
...@@ -65,7 +65,7 @@ void exchangeMap ...@@ -65,7 +65,7 @@ void exchangeMap
( (
const std::map<label, ListType>&, const std::map<label, ListType>&,
LongList<T>&, 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 //- sends the data stored in a map to other processors and receives the data
......
...@@ -591,7 +591,7 @@ void partTetMesh::updateOrigMesh(boolList* changedFacePtr) ...@@ -591,7 +591,7 @@ void partTetMesh::updateOrigMesh(boolList* changedFacePtr)
OPstream toOtherProc OPstream toOtherProc
( (
Pstream::blocking, UPstream::commsTypes::blocking,
pBnd[patchI].neiProcNo(), pBnd[patchI].neiProcNo(),
sendData.byteSize() sendData.byteSize()
); );
...@@ -605,7 +605,7 @@ void partTetMesh::updateOrigMesh(boolList* changedFacePtr) ...@@ -605,7 +605,7 @@ void partTetMesh::updateOrigMesh(boolList* changedFacePtr)
IPstream fromOtherProc IPstream fromOtherProc
( (
Pstream::blocking, UPstream::commsTypes::blocking,
pBnd[patchI].neiProcNo() pBnd[patchI].neiProcNo()
); );
......
...@@ -88,7 +88,7 @@ void partTetMesh::createPointsAndTets ...@@ -88,7 +88,7 @@ void partTetMesh::createPointsAndTets
OPstream toOtherProc OPstream toOtherProc
( (
Pstream::blocking, UPstream::commsTypes::blocking,
procBoundaries[patchI].neiProcNo(), procBoundaries[patchI].neiProcNo(),
dataToSend.byteSize() dataToSend.byteSize()
); );
...@@ -103,7 +103,7 @@ void partTetMesh::createPointsAndTets ...@@ -103,7 +103,7 @@ void partTetMesh::createPointsAndTets
IPstream fromOtherProc IPstream fromOtherProc
( (
Pstream::blocking, UPstream::commsTypes::blocking,
procBoundaries[patchI].neiProcNo() procBoundaries[patchI].neiProcNo()
); );
......
...@@ -131,7 +131,7 @@ void polyMeshGenAddressing::calcGlobalPointLabels() const ...@@ -131,7 +131,7 @@ void polyMeshGenAddressing::calcGlobalPointLabels() const
OPstream toOtherProc OPstream toOtherProc
( (
Pstream::blocking, UPstream::commsTypes::blocking,
procBoundaries[patchI].neiProcNo(), procBoundaries[patchI].neiProcNo(),
dataToSend.byteSize() dataToSend.byteSize()
); );
...@@ -142,7 +142,7 @@ void polyMeshGenAddressing::calcGlobalPointLabels() const ...@@ -142,7 +142,7 @@ void polyMeshGenAddressing::calcGlobalPointLabels() const
{ {
IPstream fromOtherProc IPstream fromOtherProc
( (
Pstream::blocking, UPstream::commsTypes::blocking,
procBoundaries[patchI].neiProcNo() procBoundaries[patchI].neiProcNo()
); );
labelList receivedData; labelList receivedData;
...@@ -236,7 +236,7 @@ void polyMeshGenAddressing::calcGlobalPointLabels() const ...@@ -236,7 +236,7 @@ void polyMeshGenAddressing::calcGlobalPointLabels() const
OPstream toOtherProc OPstream toOtherProc
( (
Pstream::blocking, UPstream::commsTypes::blocking,
procBoundaries[patchI].neiProcNo(), procBoundaries[patchI].neiProcNo(),
dataToSend.byteSize() dataToSend.byteSize()
); );
...@@ -247,7 +247,7 @@ void polyMeshGenAddressing::calcGlobalPointLabels() const ...@@ -247,7 +247,7 @@ void polyMeshGenAddressing::calcGlobalPointLabels() const
{ {
IPstream fromOtherProc IPstream fromOtherProc
( (
Pstream::blocking, UPstream::commsTypes::blocking,
procBoundaries[patchI].neiProcNo() procBoundaries[patchI].neiProcNo()
); );
labelList receivedData; labelList receivedData;
...@@ -344,7 +344,7 @@ void polyMeshGenAddressing::calcGlobalFaceLabels() const ...@@ -344,7 +344,7 @@ void polyMeshGenAddressing::calcGlobalFaceLabels() const
OPstream toOtherProc OPstream toOtherProc
( (
Pstream::blocking, UPstream::commsTypes::blocking,
procBoundaries[patchI].neiProcNo(), procBoundaries[patchI].neiProcNo(),
dataToSend.byteSize() dataToSend.byteSize()
); );
...@@ -358,7 +358,7 @@ void polyMeshGenAddressing::calcGlobalFaceLabels() const ...@@ -358,7 +358,7 @@ void polyMeshGenAddressing::calcGlobalFaceLabels() const
{ {
IPstream fromOtherProc IPstream fromOtherProc
( (
Pstream::blocking, UPstream::commsTypes::blocking,
procBoundaries[patchI].neiProcNo() procBoundaries[patchI].neiProcNo()
); );
...@@ -529,7 +529,7 @@ void polyMeshGenAddressing::calcGlobalEdgeLabels() const ...@@ -529,7 +529,7 @@ void polyMeshGenAddressing::calcGlobalEdgeLabels() const
OPstream toOtherProc OPstream toOtherProc
( (
Pstream::blocking, UPstream::commsTypes::blocking,
procBoundaries[patchI].neiProcNo(), procBoundaries[patchI].neiProcNo(),
dataToSend.byteSize() dataToSend.byteSize()
); );
...@@ -540,7 +540,7 @@ void polyMeshGenAddressing::calcGlobalEdgeLabels() const ...@@ -540,7 +540,7 @@ void polyMeshGenAddressing::calcGlobalEdgeLabels() const
{ {
IPstream fromOtherProc IPstream fromOtherProc
( (
Pstream::blocking, UPstream::commsTypes::blocking,
procBoundaries[patchI].neiProcNo() procBoundaries[patchI].neiProcNo()
); );
labelList receivedData; labelList receivedData;
...@@ -642,7 +642,7 @@ void polyMeshGenAddressing::calcGlobalEdgeLabels() const ...@@ -642,7 +642,7 @@ void polyMeshGenAddressing::calcGlobalEdgeLabels() const