ENH: conformalVoronoiMesh. Reading timeChecks Switch from dictionary.

This commit is contained in:
graham
2010-02-23 13:47:27 +00:00
parent 3844f850e9
commit 2122b0854e
3 changed files with 17 additions and 13 deletions

View File

@ -49,8 +49,6 @@ Foam::cvControls::cvControls
spanSqr_ = sqr(span_); spanSqr_ = sqr(span_);
timeChecks_ = true;
// Surface conformation controls // Surface conformation controls
const dictionary& surfDict(cvMeshDict_.subDict("surfaceConformation")); const dictionary& surfDict(cvMeshDict_.subDict("surfaceConformation"));
@ -99,6 +97,11 @@ Foam::cvControls::cvControls
objOutput_ = Switch(motionDict.lookupOrDefault<Switch>("objOutput", false)); objOutput_ = Switch(motionDict.lookupOrDefault<Switch>("objOutput", false));
timeChecks_ = Switch
(
motionDict.lookupOrDefault<Switch>("timeChecks", false)
);
alignmentSearchSpokes_ = readLabel alignmentSearchSpokes_ = readLabel
( (
motionDict.lookup("alignmentSearchSpokes") motionDict.lookup("alignmentSearchSpokes")

View File

@ -69,8 +69,6 @@ class cvControls
//- Square of span_ //- Square of span_
scalar spanSqr_; scalar spanSqr_;
//- Activate/deactivate detailed timeChecks during meshing
bool timeChecks_;
// Surface conformation controls // Surface conformation controls
@ -114,6 +112,9 @@ class cvControls
//- Switch to control the output of obj files for debug //- Switch to control the output of obj files for debug
Switch objOutput_; Switch objOutput_;
//- Switch to control the reporting of detailed timeChecks
Switch timeChecks_;
//- Number of "spokes" to use to search for secondary alignment //- Number of "spokes" to use to search for secondary alignment
// direction // direction
label alignmentSearchSpokes_; label alignmentSearchSpokes_;
@ -230,9 +231,6 @@ public:
//- Return spanSqr //- Return spanSqr
inline scalar spanSqr() const; inline scalar spanSqr() const;
//- Return timeChecks
inline bool timeChecks() const;
//- Return the pointPairDistanceCoeff //- Return the pointPairDistanceCoeff
inline scalar pointPairDistanceCoeff() const; inline scalar pointPairDistanceCoeff() const;
@ -260,6 +258,9 @@ public:
//- Return the objOutput Switch //- Return the objOutput Switch
inline Switch objOutput() const; inline Switch objOutput() const;
//- Return the timeChecks Switch
inline Switch timeChecks() const;
//- Return the number of alignmentSearchSpokes to use //- Return the number of alignmentSearchSpokes to use
inline label alignmentSearchSpokes() const; inline label alignmentSearchSpokes() const;

View File

@ -44,12 +44,6 @@ inline Foam::scalar Foam::cvControls::spanSqr() const
} }
inline bool Foam::cvControls::timeChecks() const
{
return timeChecks_;
}
inline Foam::scalar Foam::cvControls::pointPairDistanceCoeff() const inline Foam::scalar Foam::cvControls::pointPairDistanceCoeff() const
{ {
return pointPairDistanceCoeff_; return pointPairDistanceCoeff_;
@ -104,6 +98,12 @@ inline Foam::Switch Foam::cvControls::objOutput() const
} }
inline Foam::Switch Foam::cvControls::timeChecks() const
{
return timeChecks_;
}
inline Foam::label Foam::cvControls::alignmentSearchSpokes() const inline Foam::label Foam::cvControls::alignmentSearchSpokes() const
{ {
return alignmentSearchSpokes_; return alignmentSearchSpokes_;