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

ENH: Use non-templated vtwWriters. Remove FatalErrors on intersection failure.

Browse Source
This commit is contained in:
graham
2011-02-03 11:40:28 +00:00
parent a05a4ddc4c
commit d4731f9cab
2 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
applications/utilities/surface/surfaceFeatureExtract/Make/options
View File

@ -10,6 +10,7 @@ EXE_INC = \
${USE_F2C} \ ${USE_F2C} \
${CGAL_INC} \ ${CGAL_INC} \
-ICGALPolyhedron \ -ICGALPolyhedron \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/edgeMesh/lnInclude \ -I$(LIB_SRC)/edgeMesh/lnInclude \
-I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/triSurface/lnInclude \

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

@ -595,7 +595,7 @@ int main(int argc, char *argv[])
// if (writeVTK) // if (writeVTK)
// { // {
// vtkSurfaceWriter<scalar>().write // vtkSurfaceWriter().write
// ( // (
// runTime.constant()/"triSurface", // outputDir // runTime.constant()/"triSurface", // outputDir
// sFeatFileName, // surfaceName // sFeatFileName, // surfaceName
@ -692,25 +692,25 @@ int main(int argc, char *argv[])
{ {
drawHitProblem(fI, surf, start, faceCentres, end, hitInfo); drawHitProblem(fI, surf, start, faceCentres, end, hitInfo);
FatalErrorIn(args.executable()) // FatalErrorIn(args.executable())
<< "findLineAll did not hit its own face." // << "findLineAll did not hit its own face."
<< exit(FatalError); // << exit(FatalError);
} }
else if (hitInfo.size() == 1) else if (hitInfo.size() == 1)
{ {
if (!hitInfo[0].hit()) if (!hitInfo[0].hit())
{ {
FatalErrorIn(args.executable()) // FatalErrorIn(args.executable())
<< "findLineAll did not hit any face." // << "findLineAll did not hit any face."
<< exit(FatalError); // << exit(FatalError);
} }
else if (hitInfo[0].index() != fI) else if (hitInfo[0].index() != fI)
{ {
drawHitProblem(fI, surf, start, faceCentres, end, hitInfo); drawHitProblem(fI, surf, start, faceCentres, end, hitInfo);
FatalErrorIn(args.executable()) // FatalErrorIn(args.executable())
<< "findLineAll did not hit its own face." // << "findLineAll did not hit its own face."
<< exit(FatalError); // << exit(FatalError);
} }
} }
else else
@ -733,9 +733,9 @@ int main(int argc, char *argv[])
{ {
drawHitProblem(fI, surf, start, faceCentres, end, hitInfo); drawHitProblem(fI, surf, start, faceCentres, end, hitInfo);
FatalErrorIn(args.executable()) // FatalErrorIn(args.executable())
<< "findLineAll did not hit its own face." // << "findLineAll did not hit its own face."
<< exit(FatalError); // << exit(FatalError);
} }
else if (ownHitI == 0) else if (ownHitI == 0)
{ {
@ -868,7 +868,7 @@ int main(int argc, char *argv[])
if (writeVTK) if (writeVTK)
{ {
vtkSurfaceWriter<scalar>().write vtkSurfaceWriter().write
( (
runTime.constant()/"triSurface", // outputDir runTime.constant()/"triSurface", // outputDir
sFeatFileName, // surfaceName sFeatFileName, // surfaceName
@ -880,7 +880,7 @@ int main(int argc, char *argv[])
true // verbose true // verbose
); );
vtkSurfaceWriter<scalar>().write vtkSurfaceWriter().write
( (
runTime.constant()/"triSurface", // outputDir runTime.constant()/"triSurface", // outputDir
sFeatFileName, // surfaceName sFeatFileName, // surfaceName
@ -892,7 +892,7 @@ int main(int argc, char *argv[])
true // verbose true // verbose
); );
vtkSurfaceWriter<scalar>().write vtkSurfaceWriter().write
( (
runTime.constant()/"triSurface", // outputDir runTime.constant()/"triSurface", // outputDir
sFeatFileName, // surfaceName sFeatFileName, // surfaceName