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/STYLE: vector type fails to compile. Using extendedFeatureEdgeMesh naming.

Browse Source
This commit is contained in:
graham
2011-05-03 16:33:11 +01:00
parent 02ff182be1
commit dac5beb53a
2 changed files with 25 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
View File

@ -318,7 +318,7 @@ void unmarkBaffles
{ {
label i0 = eFaces[0]; label i0 = eFaces[0];
//const labelledTri& f0 = surf[i0]; //const labelledTri& f0 = surf[i0];
const vector& n0 = surf.faceNormals()[i0]; const Foam::vector& n0 = surf.faceNormals()[i0];
//Pout<< "edge:" << edgeI << " n0:" << n0 << endl; //Pout<< "edge:" << edgeI << " n0:" << n0 << endl;
@ -327,7 +327,7 @@ void unmarkBaffles
for (label i = 1; i < eFaces.size(); i++) for (label i = 1; i < eFaces.size(); i++)
{ {
//const labelledTri& f = surf[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; //Pout<< " mag(n&n0): " << mag(n&n0) << endl;
@ -569,9 +569,8 @@ int main(int argc, char *argv[])
surfaceFeatures newSet(surf); surfaceFeatures newSet(surf);
newSet.setFromStatus(edgeStat); newSet.setFromStatus(edgeStat);
Info<< endl << "Writing trimmed features to " Info<< endl << "Writing trimmed features to " << outFileName << endl;
<< runTime.constant()/"extendedFeatureEdgeMesh"/outFileName << endl; newSet.write(outFileName);
newSet.write(runTime.constant()/"extendedFeatureEdgeMesh"/outFileName);
// Info<< endl << "Writing edge objs." << endl; // Info<< endl << "Writing edge objs." << endl;
// newSet.writeObj("final"); // newSet.writeObj("final");
@ -636,7 +635,7 @@ int main(int argc, char *argv[])
( (
sFeatFileName + ".closeness", sFeatFileName + ".closeness",
runTime.constant(), runTime.constant(),
"featureEdgeMesh", "extendedFeatureEdgeMesh",
runTime, runTime,
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE
@ -875,7 +874,7 @@ int main(int argc, char *argv[])
( (
sFeatFileName + ".internalCloseness", sFeatFileName + ".internalCloseness",
runTime.constant(), runTime.constant(),
"featureEdgeMesh", "extendedFeatureEdgeMesh",
runTime, runTime,
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE
@ -893,7 +892,7 @@ int main(int argc, char *argv[])
( (
sFeatFileName + ".externalCloseness", sFeatFileName + ".externalCloseness",
runTime.constant(), runTime.constant(),
"featureEdgeMesh", "extendedFeatureEdgeMesh",
runTime, runTime,
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE
@ -923,7 +922,7 @@ int main(int argc, char *argv[])
( (
sFeatFileName + ".curvature", sFeatFileName + ".curvature",
runTime.constant(), runTime.constant(),
"featureEdgeMesh", "extendedFeatureEdgeMesh",
runTime, runTime,
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE

45
src/mesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C
View File

@ -114,9 +114,12 @@ Foam::conformationSurfaces::conformationSurfaces
word("none") word("none")
); );
if (featureMethod == "featureEdgeMesh") if (featureMethod == "extendedFeatureEdgeMesh")
{ {
fileName feMeshName(surfaceSubDict.lookup("featureEdgeMesh")); fileName feMeshName
(
surfaceSubDict.lookup("extendedFeatureEdgeMesh")
);
Info<< " features: " << feMeshName<< endl; Info<< " features: " << feMeshName<< endl;
@ -130,10 +133,10 @@ Foam::conformationSurfaces::conformationSurfaces
feMeshName, feMeshName,
cvMesh_.time().findInstance cvMesh_.time().findInstance
( (
"featureEdgeMesh", "extendedFeatureEdgeMesh",
feMeshName feMeshName
), ),
"featureEdgeMesh", "extendedFeatureEdgeMesh",
cvMesh_.time(), cvMesh_.time(),
IOobject::MUST_READ, IOobject::MUST_READ,
IOobject::NO_WRITE IOobject::NO_WRITE
@ -151,31 +154,14 @@ Foam::conformationSurfaces::conformationSurfaces
} }
else if (featureMethod == "none") else if (featureMethod == "none")
{ {
// fileName feMeshName(surfaceName + "_noFeatures"); // Currently nothing to do
// features_.set
// (
// featureI++,
// new extendedFeatureEdgeMesh
// (
// IOobject
// (
// feMeshName,
// cvMesh_.time().constant(),
// "featureEdgeMesh",
// cvMesh_.time(),
// IOobject::NO_READ,
// IOobject::NO_WRITE,
// false
// )
// )
// );
} }
else else
{ {
FatalErrorIn("Foam::conformationSurfaces::conformationSurfaces") FatalErrorIn("Foam::conformationSurfaces::conformationSurfaces")
<< "No valid featureMethod found for surface " << surfaceName << "No valid featureMethod found for surface " << surfaceName
<< nl << "Use \"featureEdgeMesh\" or \"extractFeatures\"." << nl << "Use \"extendedFeatureEdgeMesh\" "
<< "or \"extractFeatures\"."
<< exit(FatalError); << exit(FatalError);
} }
@ -204,9 +190,12 @@ Foam::conformationSurfaces::conformationSurfaces
word("none") word("none")
); );
if (featureMethod == "featureEdgeMesh") if (featureMethod == "extendedFeatureEdgeMesh")
{ {
fileName feMeshName(featureSubDict.lookup("featureEdgeMesh")); fileName feMeshName
(
featureSubDict.lookup("extendedFeatureEdgeMesh")
);
Info<< " features: " << feMeshName << endl; Info<< " features: " << feMeshName << endl;
@ -220,10 +209,10 @@ Foam::conformationSurfaces::conformationSurfaces
feMeshName, feMeshName,
cvMesh_.time().findInstance cvMesh_.time().findInstance
( (
"featureEdgeMesh", "extendedFeatureEdgeMesh",
feMeshName feMeshName
), ),
"featureEdgeMesh", "extendedFeatureEdgeMesh",
cvMesh_.time(), cvMesh_.time(),
IOobject::MUST_READ, IOobject::MUST_READ,
IOobject::NO_WRITE IOobject::NO_WRITE