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

Merge branch 'master' into cvm

Browse Source 
Conflicts:
	applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
	src/edgeMesh/Make/files
	src/edgeMesh/featureEdgeMesh/featureEdgeMesh.C
	src/edgeMesh/featureEdgeMesh/featureEdgeMesh.H
This commit is contained in:
graham
2011-02-17 11:20:03 +00:00
parent 0090ec6526 ecf13f23c4
commit de64877baa
388 changed files with 47966 additions and 6703 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,6 +36,7 @@ Description
#include "Time.H"
#include "surfaceFeatures.H"
#include "featureEdgeMesh.H"
#include "extendedFeatureEdgeMesh.H"
#include "treeBoundBox.H"
#include "meshTools.H"
#include "OFstream.H"
@ -537,10 +538,7 @@ int main(int argc, char *argv[])
// Extracting and writing a featureEdgeMesh
Pout<< nl << "Writing featureEdgeMesh to constant/featureEdgeMesh."
<< endl;
featureEdgeMesh feMesh
extendedFeatureEdgeMesh feMesh
(
IOobject
(
@ -554,12 +552,38 @@ int main(int argc, char *argv[])
newSet
);
Info<< nl << "Writing extendedFeatureEdgeMesh to " << feMesh.objectPath()
<< endl;
feMesh.writeObj(surfFileName.lessExt().name());
feMesh.write();
if (writeObj)
// Write a featureEdgeMesh for backwards compatibility
{
feMesh.writeObj(runTime.constant()/"featureEdgeMesh"/sFeatFileName);
};
featureEdgeMesh bfeMesh
(
IOobject
(
surfFileName.lessExt().name() + ".eMesh", // name
runTime.constant(), // instance
"triSurface",
runTime, // registry
IOobject::NO_READ,
IOobject::AUTO_WRITE,
false
),
feMesh.points(),
feMesh.edges()
);
Info<< nl << "Writing featureEdgeMesh to "
<< bfeMesh.objectPath() << endl;
bfeMesh.regIOobject::write();
}
triSurfaceMesh searchSurf
(
@ -905,7 +929,7 @@ int main(int argc, char *argv[])
);
}
Info<< nl << "End" << endl;
Info<< "End\n" << endl;
return 0;
}