zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

BUG: Fix merge issues

Browse Source
This commit is contained in:
laurence
2013-05-31 12:05:06 +01:00
parent 2579c83bc6
commit f6109782a1
4 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePoints.C
View File

@ -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]];

1
applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H
View File

@ -430,7 +430,6 @@ inline void Foam::conformalVoronoiMesh::createBafflePointPair
Pstream::myProcNo()
)
);
);
}

1
applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
View File

@ -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

2
etc/bashrc
View File

@ -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