From f6109782a1a1dd148908f669a4c4be2dd9e69cce Mon Sep 17 00:00:00 2001
From: laurence <laurence>
Date: Fri, 31 May 2013 12:05:06 +0100
Subject: [PATCH] BUG: Fix merge issues
---
.../conformalVoronoiMesh/conformalVoronoiMeshFeaturePoints.C | 3 ---
.../conformalVoronoiMesh/conformalVoronoiMeshI.H | 1 -
.../conformalVoronoiMesh/conformalVoronoiMeshIO.C | 1 -
etc/bashrc | 2 +-
4 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePoints.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePoints.C
index aa862e8c095..841aaf01642 100644
--- a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePoints.C
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePoints.C
@@ -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]];
diff --git a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H
index abb7f7af19e..a669871e04e 100644
--- a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H
@@ -430,7 +430,6 @@ inline void Foam::conformalVoronoiMesh::createBafflePointPair
Pstream::myProcNo()
)
);
- );
}
diff --git a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
index 0d924d10e19..473c2d1ef1b 100644
--- a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
@@ -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
diff --git a/etc/bashrc b/etc/bashrc
index 4fb5d511dfa..7be0dc552f4 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -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
--
GitLab