From dac5beb53a8d45beb3a6846d71f899b0f95a1e1f Mon Sep 17 00:00:00 2001
From: graham <g.macpherson@opencfd.co.uk>
Date: Tue, 3 May 2011 16:33:11 +0100
Subject: [PATCH] BUG/STYLE: vector type fails to compile. Using
extendedFeatureEdgeMesh naming.
---
.../surfaceFeatureExtract.C | 17 ++++---
.../conformationSurfaces.C | 45 +++++++------------
2 files changed, 25 insertions(+), 37 deletions(-)
diff --git a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
index df0dd0b3281..f2926d4c039 100644
--- a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
+++ b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
@@ -318,7 +318,7 @@ void unmarkBaffles
{
label i0 = eFaces[0];
//const labelledTri& f0 = surf[i0];
- const vector& n0 = surf.faceNormals()[i0];
+ const Foam::vector& n0 = surf.faceNormals()[i0];
//Pout<< "edge:" << edgeI << " n0:" << n0 << endl;
@@ -327,7 +327,7 @@ void unmarkBaffles
for (label i = 1; i < eFaces.size(); i++)
{
//const labelledTri& f = surf[i];
- const vector& n = surf.faceNormals()[eFaces[i]];
+ const Foam::vector& n = surf.faceNormals()[eFaces[i]];
//Pout<< " mag(n&n0): " << mag(n&n0) << endl;
@@ -569,9 +569,8 @@ int main(int argc, char *argv[])
surfaceFeatures newSet(surf);
newSet.setFromStatus(edgeStat);
- Info<< endl << "Writing trimmed features to "
- << runTime.constant()/"extendedFeatureEdgeMesh"/outFileName << endl;
- newSet.write(runTime.constant()/"extendedFeatureEdgeMesh"/outFileName);
+ Info<< endl << "Writing trimmed features to " << outFileName << endl;
+ newSet.write(outFileName);
// Info<< endl << "Writing edge objs." << endl;
// newSet.writeObj("final");
@@ -636,7 +635,7 @@ int main(int argc, char *argv[])
(
sFeatFileName + ".closeness",
runTime.constant(),
- "featureEdgeMesh",
+ "extendedFeatureEdgeMesh",
runTime,
IOobject::NO_READ,
IOobject::NO_WRITE
@@ -875,7 +874,7 @@ int main(int argc, char *argv[])
(
sFeatFileName + ".internalCloseness",
runTime.constant(),
- "featureEdgeMesh",
+ "extendedFeatureEdgeMesh",
runTime,
IOobject::NO_READ,
IOobject::NO_WRITE
@@ -893,7 +892,7 @@ int main(int argc, char *argv[])
(
sFeatFileName + ".externalCloseness",
runTime.constant(),
- "featureEdgeMesh",
+ "extendedFeatureEdgeMesh",
runTime,
IOobject::NO_READ,
IOobject::NO_WRITE
@@ -923,7 +922,7 @@ int main(int argc, char *argv[])
(
sFeatFileName + ".curvature",
runTime.constant(),
- "featureEdgeMesh",
+ "extendedFeatureEdgeMesh",
runTime,
IOobject::NO_READ,
IOobject::NO_WRITE
diff --git a/src/mesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C b/src/mesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C
index 2069c6f81be..48aa2c8a067 100644
--- a/src/mesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C
+++ b/src/mesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C
@@ -114,9 +114,12 @@ Foam::conformationSurfaces::conformationSurfaces
word("none")
);
- if (featureMethod == "featureEdgeMesh")
+ if (featureMethod == "extendedFeatureEdgeMesh")
{
- fileName feMeshName(surfaceSubDict.lookup("featureEdgeMesh"));
+ fileName feMeshName
+ (
+ surfaceSubDict.lookup("extendedFeatureEdgeMesh")
+ );
Info<< " features: " << feMeshName<< endl;
@@ -130,10 +133,10 @@ Foam::conformationSurfaces::conformationSurfaces
feMeshName,
cvMesh_.time().findInstance
(
- "featureEdgeMesh",
+ "extendedFeatureEdgeMesh",
feMeshName
),
- "featureEdgeMesh",
+ "extendedFeatureEdgeMesh",
cvMesh_.time(),
IOobject::MUST_READ,
IOobject::NO_WRITE
@@ -151,31 +154,14 @@ Foam::conformationSurfaces::conformationSurfaces
}
else if (featureMethod == "none")
{
- // fileName feMeshName(surfaceName + "_noFeatures");
-
- // features_.set
- // (
- // featureI++,
- // new extendedFeatureEdgeMesh
- // (
- // IOobject
- // (
- // feMeshName,
- // cvMesh_.time().constant(),
- // "featureEdgeMesh",
- // cvMesh_.time(),
- // IOobject::NO_READ,
- // IOobject::NO_WRITE,
- // false
- // )
- // )
- // );
+ // Currently nothing to do
}
else
{
FatalErrorIn("Foam::conformationSurfaces::conformationSurfaces")
<< "No valid featureMethod found for surface " << surfaceName
- << nl << "Use \"featureEdgeMesh\" or \"extractFeatures\"."
+ << nl << "Use \"extendedFeatureEdgeMesh\" "
+ << "or \"extractFeatures\"."
<< exit(FatalError);
}
@@ -204,9 +190,12 @@ Foam::conformationSurfaces::conformationSurfaces
word("none")
);
- if (featureMethod == "featureEdgeMesh")
+ if (featureMethod == "extendedFeatureEdgeMesh")
{
- fileName feMeshName(featureSubDict.lookup("featureEdgeMesh"));
+ fileName feMeshName
+ (
+ featureSubDict.lookup("extendedFeatureEdgeMesh")
+ );
Info<< " features: " << feMeshName << endl;
@@ -220,10 +209,10 @@ Foam::conformationSurfaces::conformationSurfaces
feMeshName,
cvMesh_.time().findInstance
(
- "featureEdgeMesh",
+ "extendedFeatureEdgeMesh",
feMeshName
),
- "featureEdgeMesh",
+ "extendedFeatureEdgeMesh",
cvMesh_.time(),
IOobject::MUST_READ,
IOobject::NO_WRITE
--
GitLab