diff --git a/src/mesh/conformalVoronoiMesh/cvControls/cvControls.C b/src/mesh/conformalVoronoiMesh/cvControls/cvControls.C index 1c31cf0e1f88471abc2c6a76490be0e3f47c9a86..71b8dc5a5d88bfcad5273a70faeefc580cbe7aa8 100644 --- a/src/mesh/conformalVoronoiMesh/cvControls/cvControls.C +++ b/src/mesh/conformalVoronoiMesh/cvControls/cvControls.C @@ -49,8 +49,6 @@ Foam::cvControls::cvControls spanSqr_ = sqr(span_); - timeChecks_ = true; - // Surface conformation controls const dictionary& surfDict(cvMeshDict_.subDict("surfaceConformation")); @@ -99,6 +97,11 @@ Foam::cvControls::cvControls objOutput_ = Switch(motionDict.lookupOrDefault<Switch>("objOutput", false)); + timeChecks_ = Switch + ( + motionDict.lookupOrDefault<Switch>("timeChecks", false) + ); + alignmentSearchSpokes_ = readLabel ( motionDict.lookup("alignmentSearchSpokes") diff --git a/src/mesh/conformalVoronoiMesh/cvControls/cvControls.H b/src/mesh/conformalVoronoiMesh/cvControls/cvControls.H index 82435fa260b6e6f778f39ffc83b82ebf2fef56a5..6c893782a705f629f4d5587506fa6af3fdc1b1bb 100644 --- a/src/mesh/conformalVoronoiMesh/cvControls/cvControls.H +++ b/src/mesh/conformalVoronoiMesh/cvControls/cvControls.H @@ -69,8 +69,6 @@ class cvControls //- Square of span_ scalar spanSqr_; - //- Activate/deactivate detailed timeChecks during meshing - bool timeChecks_; // Surface conformation controls @@ -114,6 +112,9 @@ class cvControls //- Switch to control the output of obj files for debug Switch objOutput_; + //- Switch to control the reporting of detailed timeChecks + Switch timeChecks_; + //- Number of "spokes" to use to search for secondary alignment // direction label alignmentSearchSpokes_; @@ -230,9 +231,6 @@ public: //- Return spanSqr inline scalar spanSqr() const; - //- Return timeChecks - inline bool timeChecks() const; - //- Return the pointPairDistanceCoeff inline scalar pointPairDistanceCoeff() const; @@ -260,6 +258,9 @@ public: //- Return the objOutput Switch inline Switch objOutput() const; + //- Return the timeChecks Switch + inline Switch timeChecks() const; + //- Return the number of alignmentSearchSpokes to use inline label alignmentSearchSpokes() const; diff --git a/src/mesh/conformalVoronoiMesh/cvControls/cvControlsI.H b/src/mesh/conformalVoronoiMesh/cvControls/cvControlsI.H index 9fe3c719957ee6ebf29d90ce2c570882848534f0..54e1cfb6ecfc6175cee7c0cd8d4928ec661b6f99 100644 --- a/src/mesh/conformalVoronoiMesh/cvControls/cvControlsI.H +++ b/src/mesh/conformalVoronoiMesh/cvControls/cvControlsI.H @@ -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 { 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 { return alignmentSearchSpokes_;