Commit f6109782 authored by laurence's avatar laurence
Browse files

BUG: Fix merge issues

parent 2579c83b
......@@ -571,7 +571,6 @@ void Foam::conformalVoronoiMesh::createExternalEdgePointGroup
Pstream::myProcNo()
)
);
);
}
......@@ -706,7 +705,6 @@ void Foam::conformalVoronoiMesh::createInternalEdgePointGroup
Pstream::myProcNo()
)
);
);
if (nAddPoints == 1)
{
......@@ -848,7 +846,6 @@ void Foam::conformalVoronoiMesh::createMultipleEdgePointGroup
const labelList& edNormalIs = feMesh.edgeNormals()[edHit.index()];
Info<< edNormalIs.size() << endl;
Info<< feMesh.edgeBaffles(edHit.index()) << endl;
// As this is a flat edge, there are two normals by definition
const vector& nA = feNormals[edNormalIs[0]];
......
......@@ -430,7 +430,6 @@ inline void Foam::conformalVoronoiMesh::createBafflePointPair
Pstream::myProcNo()
)
);
);
}
......
......@@ -644,7 +644,6 @@ Foam::autoPtr<Foam::fvMesh> Foam::conformalVoronoiMesh::createDummyMesh
0, //patchStarts[p],
patchI,
mesh.boundaryMesh(),
mesh.comm(),
readLabel(patchDicts[patchI].lookup("myProcNo")),
readLabel(patchDicts[patchI].lookup("neighbProcNo")),
coupledPolyPatch::COINCIDENTFULLMATCH
......
......@@ -32,7 +32,7 @@
#------------------------------------------------------------------------------
export WM_PROJECT=OpenFOAM
export WM_PROJECT_VERSION=dev
export WM_PROJECT_VERSION=dev-cvMesh-foghorn
################################################################################
# USER EDITABLE PART: Changes made here may be lost with the next upgrade
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment