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: make coeffs dictionaries optional for surfaceFeatureExtract

Browse Source
This commit is contained in:
Mark Olesen
2017-05-10 14:11:28 +02:00
parent 0e7630feca
commit 034ddfa78f
8 changed files with 46 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
applications/utilities/surface/surfaceFeatureExtract/extractionMethod/Make/options
View File

@ -1,11 +1,7 @@
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/edgeMesh/lnInclude \
-I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude
-I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude
LIB_LIBS = \
-lmeshTools \
-ledgeMesh \
-ltriSurface
-lmeshTools

3
applications/utilities/surface/surfaceFeatureExtract/extractionMethod/extractFromFile.C
View File

@ -53,7 +53,8 @@ Foam::surfaceFeaturesExtraction::extractFromFile::extractFromFile
:
method()
{
const dictionary& coeffDict = dict.subDict("extractFromFileCoeffs");
const dictionary& coeffDict =
dict.optionalSubDict("extractFromFileCoeffs");
coeffDict.lookup("featureEdgeFile") >> featureEdgeFile_;
coeffDict.readIfPresent("geometricTestOnly", geometricTestOnly_);

7
applications/utilities/surface/surfaceFeatureExtract/extractionMethod/extractFromFile.H
View File

@ -27,8 +27,11 @@ Class
Description
Run-time selectable surface feature extraction.
Mandatory dictionary entries: "featureEdgeFile".
Optional dictionary entries: "geometricTestOnly".
SourceFiles
extractionMethod.C
extractFromFile.C
\*---------------------------------------------------------------------------*/
@ -36,8 +39,6 @@ SourceFiles
#define surfaceFeaturesExtraction_extractFromFile_H
#include "surfaceFeaturesExtraction.H"
#include "dictionary.H"
#include "Switch.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

2
applications/utilities/surface/surfaceFeatureExtract/extractionMethod/extractFromNone.C
View File

@ -52,7 +52,7 @@ Foam::surfaceFeaturesExtraction::extractFromNone::extractFromNone
:
method()
{
const dictionary& coeffDict = dict.subOrEmptyDict("extractFromNoneCoeffs");
const dictionary& coeffDict = dict.optionalSubDict("noneCoeffs");
coeffDict.readIfPresent("includedAngle", includedAngle_);
coeffDict.readIfPresent("geometricTestOnly", geometricTestOnly_);

11
applications/utilities/surface/surfaceFeatureExtract/extractionMethod/extractFromNone.H
View File

@ -25,10 +25,13 @@ Class
Foam::surfaceFeaturesExtraction::extractFromNone
Description
Run-time selectable surface feature extraction.
Run-time selectable surface feature extraction - no extraction.
Primarily useful with self-intersection methods.
Optional dictionary entries: "includedAngle", "geometricTestOnly".
SourceFiles
extractionMethod.C
extractFromNone.C
\*---------------------------------------------------------------------------*/
@ -36,10 +39,6 @@ SourceFiles
#define surfaceFeaturesExtraction_extractFromNone_H
#include "surfaceFeaturesExtraction.H"
#include "dictionary.H"
#include "Switch.H"
#include "triSurface.H"
#include "edgeIntersections.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

3
applications/utilities/surface/surfaceFeatureExtract/extractionMethod/extractFromSurface.C
View File

@ -52,7 +52,8 @@ Foam::surfaceFeaturesExtraction::extractFromSurface::extractFromSurface
:
method()
{
const dictionary& coeffDict = dict.subDict("extractFromSurfaceCoeffs");
const dictionary& coeffDict =
dict.optionalSubDict("extractFromSurfaceCoeffs");
coeffDict.lookup("includedAngle") >> includedAngle_;
coeffDict.readIfPresent("geometricTestOnly", geometricTestOnly_);

11
applications/utilities/surface/surfaceFeatureExtract/extractionMethod/extractFromSurface.H
View File

@ -25,10 +25,13 @@ Class
Foam::surfaceFeaturesExtraction::extractFromSurface
Description
Run-time selectable surface feature extraction.
Run-time selectable surface feature extraction - extract from surface.
Mandatory dictionary entries: "includedAngle".
Optional dictionary entries: "geometricTestOnly".
SourceFiles
extractionMethod.C
extractFromSurface.C
\*---------------------------------------------------------------------------*/
@ -36,10 +39,6 @@ SourceFiles
#define surfaceFeaturesExtraction_extractFromSurface_H
#include "surfaceFeaturesExtraction.H"
#include "dictionary.H"
#include "Switch.H"
#include "triSurface.H"
#include "edgeIntersections.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //