From e95300d2962a74a064be3e04a98fe67030c8887b Mon Sep 17 00:00:00 2001 From: Martin Beaudoin Date: Wed, 28 May 2014 22:32:29 -0400 Subject: [PATCH] Put additional debug switches under command-line control --- .../fields/fvPatchFields/fvPatchVectorNFields.C | 6 ++++-- .../fields/fvsPatchFields/fvsPatchVectorNFields.C | 6 ++++-- .../polyTopoChange/polyTopoChange/polyTopoChange.C | 6 ++++-- .../polyTopoChange/polyTopoChange/polyTopoChange.H | 2 +- .../fields/faPatchFields/faPatchField/faPatchField.H | 3 ++- .../fields/faPatchFields/faPatchField/faPatchFields.C | 6 ++++-- .../fields/faePatchFields/faePatchField/faePatchField.H | 3 ++- .../fields/faePatchFields/faePatchField/faePatchFields.C | 6 ++++-- src/finiteArea/finiteArea/faSchemes/faSchemes.C | 7 ++++++- src/finiteArea/finiteArea/faSchemes/faSchemes.H | 3 ++- .../fields/fvPatchFields/fvPatchField/fvPatchField.H | 3 ++- .../fields/fvPatchFields/fvPatchField/fvPatchFields.C | 6 ++++-- .../fields/fvsPatchFields/fvsPatchField/fvsPatchField.H | 2 +- .../fields/fvsPatchFields/fvsPatchField/fvsPatchFields.C | 6 ++++-- src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.C | 7 ++++++- src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.H | 3 ++- .../cellPointWeight/cellPointWeight.C | 7 ++++++- .../cellPointWeight/cellPointWeight.H | 2 +- src/foam/db/error/messageStream.C | 7 ++++++- src/foam/db/error/messageStream.H | 3 ++- .../db/functionObjects/functionObject/functionObject.C | 8 +++++++- .../db/functionObjects/functionObject/functionObject.H | 3 ++- src/foam/db/scalarRange/scalarRange.C | 7 ++++++- src/foam/db/scalarRange/scalarRange.H | 3 ++- src/foam/matrices/solution/solution.C | 7 ++++++- src/foam/matrices/solution/solution.H | 3 ++- src/foam/meshes/meshShapes/cell/cell.C | 7 ++++++- src/foam/meshes/meshShapes/cell/cell.H | 3 ++- .../meshes/polyMesh/polyPatches/polyPatch/polyPatch.C | 6 ++++-- .../meshes/polyMesh/polyPatches/polyPatch/polyPatch.H | 2 +- src/foam/primitives/strings/fileName/fileName.C | 9 ++++++++- src/foam/primitives/strings/fileName/fileName.H | 3 ++- 32 files changed, 115 insertions(+), 40 deletions(-) diff --git a/src/VectorN/finiteVolume/fields/fvPatchFields/fvPatchVectorNFields.C b/src/VectorN/finiteVolume/fields/fvPatchFields/fvPatchVectorNFields.C index e50138760..417cf8022 100644 --- a/src/VectorN/finiteVolume/fields/fvPatchFields/fvPatchVectorNFields.C +++ b/src/VectorN/finiteVolume/fields/fvPatchFields/fvPatchVectorNFields.C @@ -36,9 +36,11 @@ namespace Foam \ defineNamedTemplateTypeNameAndDebug(fvPatchTypeField, 0); \ template<> \ -int fvPatchTypeField::disallowGenericFvPatchField \ +debug::debugSwitch \ +fvPatchTypeField::disallowGenericFvPatchField \ ( \ - debug::debugSwitchFromDict("disallowGenericFvPatchField", 0) \ + "disallowGenericFvPatchField", \ + 0 \ ); \ defineTemplateRunTimeSelectionTable(fvPatchTypeField, patch); \ defineTemplateRunTimeSelectionTable(fvPatchTypeField, patchMapper); \ diff --git a/src/VectorN/finiteVolume/fields/fvsPatchFields/fvsPatchVectorNFields.C b/src/VectorN/finiteVolume/fields/fvsPatchFields/fvsPatchVectorNFields.C index 108a80ca6..610a563e7 100644 --- a/src/VectorN/finiteVolume/fields/fvsPatchFields/fvsPatchVectorNFields.C +++ b/src/VectorN/finiteVolume/fields/fvsPatchFields/fvsPatchVectorNFields.C @@ -36,9 +36,11 @@ namespace Foam \ defineNamedTemplateTypeNameAndDebug(fvsPatchTypeField, 0); \ template<> \ -int fvsPatchTypeField::disallowDefaultFvsPatchField \ +Foam::debug::debugSwitch \ +fvsPatchTypeField::disallowDefaultFvsPatchField \ ( \ - debug::debugSwitchFromDict("disallowDefaultFvsPatchField", 0) \ + "disallowDefaultFvsPatchField", \ + 0 \ ); \ defineTemplateRunTimeSelectionTable(fvsPatchTypeField, patch); \ defineTemplateRunTimeSelectionTable(fvsPatchTypeField, patchMapper); \ diff --git a/src/dynamicMesh/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C b/src/dynamicMesh/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C index 89fb0a4dc..7affc03a1 100644 --- a/src/dynamicMesh/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C +++ b/src/dynamicMesh/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C @@ -34,9 +34,11 @@ const Foam::label Foam::polyTopoChange::pointFraction = 10; const Foam::label Foam::polyTopoChange::faceFraction = 10; const Foam::label Foam::polyTopoChange::cellFraction = 10; -int Foam::polyTopoChange::debug +Foam::debug::debugSwitch +Foam::polyTopoChange::debug ( - Foam::debug::debugSwitchFromDict("polyTopoChange", 0) + "polyTopoChange", + 0 ); diff --git a/src/dynamicMesh/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.H b/src/dynamicMesh/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.H index 1fe365053..cad390901 100644 --- a/src/dynamicMesh/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.H +++ b/src/dynamicMesh/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.H @@ -121,7 +121,7 @@ class polyTopoChange public: - static int debug; + static debug::debugSwitch debug; // Constructors diff --git a/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.H b/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.H index e51b4c74e..0ea5345ad 100644 --- a/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.H +++ b/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.H @@ -43,6 +43,7 @@ SourceFiles #include "faPatch.H" #include "DimensionedField.H" +#include "controlSwitches.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -96,7 +97,7 @@ public: TypeName("faPatchField"); //- Debug switch to disallow the use of - static int disallowDefaultFaPatchField; + static debug::debugSwitch disallowDefaultFaPatchField; // Declare run-time constructor selection tables diff --git a/src/finiteArea/fields/faPatchFields/faPatchField/faPatchFields.C b/src/finiteArea/fields/faPatchFields/faPatchField/faPatchFields.C index e528d1ea9..7e179d05e 100644 --- a/src/finiteArea/fields/faPatchFields/faPatchField/faPatchFields.C +++ b/src/finiteArea/fields/faPatchFields/faPatchField/faPatchFields.C @@ -36,9 +36,11 @@ namespace Foam \ defineNamedTemplateTypeNameAndDebug(faPatchTypeField, 0); \ template<> \ -int faPatchTypeField::disallowDefaultFaPatchField \ +Foam::debug::debugSwitch \ +faPatchTypeField::disallowDefaultFaPatchField \ ( \ - debug::debugSwitchFromDict("disallowDefaultFaPatchField", 0) \ + "disallowDefaultFaPatchField", \ + 0 \ ); \ defineTemplateRunTimeSelectionTable(faPatchTypeField, patch); \ defineTemplateRunTimeSelectionTable(faPatchTypeField, patchMapper); \ diff --git a/src/finiteArea/fields/faePatchFields/faePatchField/faePatchField.H b/src/finiteArea/fields/faePatchFields/faePatchField/faePatchField.H index 20865e20d..4da32d728 100644 --- a/src/finiteArea/fields/faePatchFields/faePatchField/faePatchField.H +++ b/src/finiteArea/fields/faePatchFields/faePatchField/faePatchField.H @@ -43,6 +43,7 @@ SourceFiles #include "faPatch.H" #include "DimensionedField.H" +#include "controlSwitches.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -93,7 +94,7 @@ public: TypeName("faePatchField"); //- Debug switch to disallow the use of - static int disallowDefaultFaePatchField; + static debug::debugSwitch disallowDefaultFaePatchField; // Declare run-time constructor selection tables diff --git a/src/finiteArea/fields/faePatchFields/faePatchField/faePatchFields.C b/src/finiteArea/fields/faePatchFields/faePatchField/faePatchFields.C index 2c744a959..636ef7b60 100644 --- a/src/finiteArea/fields/faePatchFields/faePatchField/faePatchFields.C +++ b/src/finiteArea/fields/faePatchFields/faePatchField/faePatchFields.C @@ -39,9 +39,11 @@ namespace Foam \ defineNamedTemplateTypeNameAndDebug(faePatchTypeField, 0); \ template<> \ -int faePatchTypeField::disallowDefaultFaePatchField \ +Foam::debug::debugSwitch \ +faePatchTypeField::disallowDefaultFaePatchField \ ( \ - debug::debugSwitchFromDict("disallowDefaultFaePatchField", 0) \ + "disallowDefaultFaePatchField", \ + 0 \ ); \ defineTemplateRunTimeSelectionTable(faePatchTypeField, patch); \ defineTemplateRunTimeSelectionTable(faePatchTypeField, patchMapper); \ diff --git a/src/finiteArea/finiteArea/faSchemes/faSchemes.C b/src/finiteArea/finiteArea/faSchemes/faSchemes.C index f16953c84..409605e48 100644 --- a/src/finiteArea/finiteArea/faSchemes/faSchemes.C +++ b/src/finiteArea/finiteArea/faSchemes/faSchemes.C @@ -35,7 +35,12 @@ Description namespace Foam { -int faSchemes::debug(Foam::debug::debugSwitchFromDict("faSchemes", false)); +Foam::debug::debugSwitch +faSchemes::debug +( + "faSchemes", + false +); // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // diff --git a/src/finiteArea/finiteArea/faSchemes/faSchemes.H b/src/finiteArea/finiteArea/faSchemes/faSchemes.H index f3975d9ea..ed372600a 100644 --- a/src/finiteArea/finiteArea/faSchemes/faSchemes.H +++ b/src/finiteArea/finiteArea/faSchemes/faSchemes.H @@ -38,6 +38,7 @@ SourceFiles #define faSchemes_H #include "IOdictionary.H" +#include "controlSwitches.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -90,7 +91,7 @@ private: public: //- Debug switch - static int debug; + static debug::debugSwitch debug; // Constructors diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H index 15ee13e11..de0245837 100644 --- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H @@ -46,6 +46,7 @@ SourceFiles #include "fvPatch.H" #include "DimensionedField.H" +#include "controlSwitches.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -114,7 +115,7 @@ public: TypeName("fvPatchField"); //- Debug switch to disallow the use of genericFvPatchField - static int disallowGenericFvPatchField; + static debug::debugSwitch disallowGenericFvPatchField; // Declare run-time constructor selection tables diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFields.C index 4adfef227..31d47a7a3 100644 --- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFields.C +++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFields.C @@ -36,9 +36,11 @@ namespace Foam \ defineNamedTemplateTypeNameAndDebug(fvPatchTypeField, 0); \ template<> \ -int fvPatchTypeField::disallowGenericFvPatchField \ +Foam::debug::debugSwitch \ +fvPatchTypeField::disallowGenericFvPatchField \ ( \ - debug::debugSwitchFromDict("disallowGenericFvPatchField", 0) \ + "disallowGenericFvPatchField", \ + 0 \ ); \ defineTemplateRunTimeSelectionTable(fvPatchTypeField, patch); \ defineTemplateRunTimeSelectionTable(fvPatchTypeField, patchMapper); \ diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H index d2750c0ce..ed672f06b 100644 --- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H +++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H @@ -98,7 +98,7 @@ public: TypeName("fvsPatchField"); //- Debug switch to disallow the use of - static int disallowDefaultFvsPatchField; + static debug::debugSwitch disallowDefaultFvsPatchField; // Declare run-time constructor selection tables diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFields.C b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFields.C index 8e89526f9..cd206968d 100644 --- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFields.C +++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFields.C @@ -36,9 +36,11 @@ namespace Foam \ defineNamedTemplateTypeNameAndDebug(fvsPatchTypeField, 0); \ template<> \ -int fvsPatchTypeField::disallowDefaultFvsPatchField \ +Foam::debug::debugSwitch \ +fvsPatchTypeField::disallowDefaultFvsPatchField \ ( \ - debug::debugSwitchFromDict("disallowDefaultFvsPatchField", 0) \ + "disallowDefaultFvsPatchField", \ + 0 \ ); \ defineTemplateRunTimeSelectionTable(fvsPatchTypeField, patch); \ defineTemplateRunTimeSelectionTable(fvsPatchTypeField, patchMapper); \ diff --git a/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.C b/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.C index 4a9b35359..7122883ac 100644 --- a/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.C +++ b/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.C @@ -29,7 +29,12 @@ License // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -int Foam::fvSchemes::debug(Foam::debug::debugSwitchFromDict("fvSchemes", false)); +Foam::debug::debugSwitch +Foam::fvSchemes::debug +( + "fvSchemes", + false +); // * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * // diff --git a/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.H b/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.H index dad9a4255..9778ea4e6 100644 --- a/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.H +++ b/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.H @@ -38,6 +38,7 @@ SourceFiles #define fvSchemes_H #include "IOdictionary.H" +#include "controlSwitches.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -96,7 +97,7 @@ class fvSchemes public: //- Debug switch - static int debug; + static debug::debugSwitch debug; // Constructors diff --git a/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/cellPointWeight/cellPointWeight.C b/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/cellPointWeight/cellPointWeight.C index b22f76113..63a80aeb0 100644 --- a/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/cellPointWeight/cellPointWeight.C +++ b/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/cellPointWeight/cellPointWeight.C @@ -28,7 +28,12 @@ License // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -int Foam::cellPointWeight::debug(debug::debugSwitchFromDict("cellPointWeight", 0)); +Foam::debug::debugSwitch +Foam::cellPointWeight::debug +( + "cellPointWeight", + 0 +); Foam::scalar Foam::cellPointWeight::tol(SMALL); // * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * // diff --git a/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/cellPointWeight/cellPointWeight.H b/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/cellPointWeight/cellPointWeight.H index abac7611a..68f44648c 100644 --- a/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/cellPointWeight/cellPointWeight.H +++ b/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/cellPointWeight/cellPointWeight.H @@ -84,7 +84,7 @@ protected: public: //- Debug switch - static int debug; + static debug::debugSwitch debug; //- Tolerance used in calculating barycentric co-ordinates // (applied to normailised values) diff --git a/src/foam/db/error/messageStream.C b/src/foam/db/error/messageStream.C index 0056946e2..05a535140 100644 --- a/src/foam/db/error/messageStream.C +++ b/src/foam/db/error/messageStream.C @@ -29,7 +29,12 @@ License // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -int Foam::messageStream::level(Foam::debug::debugSwitchFromDict("level", 2)); +Foam::debug::debugSwitch +Foam::messageStream::level +( + "level", + 2 +); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/foam/db/error/messageStream.H b/src/foam/db/error/messageStream.H index 7aeae6054..8624123d2 100644 --- a/src/foam/db/error/messageStream.H +++ b/src/foam/db/error/messageStream.H @@ -48,6 +48,7 @@ SourceFiles #include "label.H" #include "string.H" +#include "controlSwitches.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -93,7 +94,7 @@ public: // Debug switches - static int level; + static debug::debugSwitch level; // Constructors diff --git a/src/foam/db/functionObjects/functionObject/functionObject.C b/src/foam/db/functionObjects/functionObject/functionObject.C index 0790ecfbe..8bd7208fb 100644 --- a/src/foam/db/functionObjects/functionObject/functionObject.C +++ b/src/foam/db/functionObjects/functionObject/functionObject.C @@ -30,7 +30,13 @@ License // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // defineRunTimeSelectionTable(Foam::functionObject, dictionary); -int Foam::functionObject::debug(Foam::debug::debugSwitchFromDict("functionObject", 0)); + +Foam::debug::debugSwitch +Foam::functionObject::debug +( + "functionObject", + 0 +); // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // diff --git a/src/foam/db/functionObjects/functionObject/functionObject.H b/src/foam/db/functionObjects/functionObject/functionObject.H index c70b85ded..b85382d9e 100644 --- a/src/foam/db/functionObjects/functionObject/functionObject.H +++ b/src/foam/db/functionObjects/functionObject/functionObject.H @@ -41,6 +41,7 @@ SourceFiles #include "typeInfo.H" #include "autoPtr.H" #include "runTimeSelectionTables.H" +#include "controlSwitches.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -76,7 +77,7 @@ public: //- Runtime type information virtual const word& type() const = 0; - static int debug; + static debug::debugSwitch debug; // Declare run-time constructor selection tables diff --git a/src/foam/db/scalarRange/scalarRange.C b/src/foam/db/scalarRange/scalarRange.C index 7d8e2db70..54fb9cf42 100644 --- a/src/foam/db/scalarRange/scalarRange.C +++ b/src/foam/db/scalarRange/scalarRange.C @@ -28,7 +28,12 @@ License // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -int Foam::scalarRange::debug(::Foam::debug::debugSwitchFromDict("scalarRange", 0)); +Foam::debug::debugSwitch +Foam::scalarRange::debug +( + "scalarRange", + 0 +); // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // diff --git a/src/foam/db/scalarRange/scalarRange.H b/src/foam/db/scalarRange/scalarRange.H index 3328a28a3..426c8eacd 100644 --- a/src/foam/db/scalarRange/scalarRange.H +++ b/src/foam/db/scalarRange/scalarRange.H @@ -40,6 +40,7 @@ SourceFiles #define scalarRange_H #include "scalar.H" +#include "controlSwitches.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -82,7 +83,7 @@ class scalarRange public: - static int debug; + static debug::debugSwitch debug; // Constructors diff --git a/src/foam/matrices/solution/solution.C b/src/foam/matrices/solution/solution.C index 69ce7f6e1..72a54fb12 100644 --- a/src/foam/matrices/solution/solution.C +++ b/src/foam/matrices/solution/solution.C @@ -33,7 +33,12 @@ License // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -int Foam::solution::debug(::Foam::debug::debugSwitchFromDict("solution", 0)); +Foam::debug::debugSwitch +Foam::solution::debug +( + "solution", + 0 +); // List of sub-dictionaries to rewrite //! @cond localScope diff --git a/src/foam/matrices/solution/solution.H b/src/foam/matrices/solution/solution.H index 968fec166..771e21ea3 100644 --- a/src/foam/matrices/solution/solution.H +++ b/src/foam/matrices/solution/solution.H @@ -36,6 +36,7 @@ SourceFiles #define solution_H #include "IOdictionary.H" +#include "controlSwitches.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -77,7 +78,7 @@ public: static label upgradeSolverDict(dictionary& dict, const bool verbose=true); //- Debug switch - static int debug; + static debug::debugSwitch debug; // Constructors diff --git a/src/foam/meshes/meshShapes/cell/cell.C b/src/foam/meshes/meshShapes/cell/cell.C index 82e95f3ba..192cfc601 100644 --- a/src/foam/meshes/meshShapes/cell/cell.C +++ b/src/foam/meshes/meshShapes/cell/cell.C @@ -30,7 +30,12 @@ License const char* const Foam::cell::typeName = "cell"; -int Foam::cell::debug(debug::debugSwitchFromDict("cell", 0)); +Foam::debug::debugSwitch +Foam::cell::debug +( + "cell", + 0 +); // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // diff --git a/src/foam/meshes/meshShapes/cell/cell.H b/src/foam/meshes/meshShapes/cell/cell.H index c11470424..dc29c4542 100644 --- a/src/foam/meshes/meshShapes/cell/cell.H +++ b/src/foam/meshes/meshShapes/cell/cell.H @@ -37,6 +37,7 @@ SourceFiles #include "faceList.H" #include "oppositeFace.H" +#include "controlSwitches.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -66,7 +67,7 @@ public: static const char* const typeName; //- Debug switch - static int debug; + static Foam::debug::debugSwitch debug; // Constructors diff --git a/src/foam/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C b/src/foam/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C index de7781df1..559ca8b13 100644 --- a/src/foam/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C +++ b/src/foam/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C @@ -39,9 +39,11 @@ namespace Foam { defineTypeNameAndDebug(polyPatch, 0); - int polyPatch::disallowGenericPolyPatch + debug::debugSwitch + polyPatch::disallowGenericPolyPatch ( - debug::debugSwitchFromDict("disallowGenericPolyPatch", 0) + "disallowGenericPolyPatch", + 0 ); defineRunTimeSelectionTable(polyPatch, word); diff --git a/src/foam/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H b/src/foam/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H index eeacba954..a62548e75 100644 --- a/src/foam/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H +++ b/src/foam/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H @@ -226,7 +226,7 @@ public: // Static data //- Debug switch to disallow the use of genericPolyPatch - static int disallowGenericPolyPatch; + static debug::debugSwitch disallowGenericPolyPatch; //- Relative tolerance (for geometric matching) // Calculated as a factor of maximum edge length per face. diff --git a/src/foam/primitives/strings/fileName/fileName.C b/src/foam/primitives/strings/fileName/fileName.C index 0355b0496..1556aaeb0 100644 --- a/src/foam/primitives/strings/fileName/fileName.C +++ b/src/foam/primitives/strings/fileName/fileName.C @@ -32,7 +32,14 @@ License // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // const char* const Foam::fileName::typeName = "fileName"; -int Foam::fileName::debug(debug::debugSwitchFromDict(fileName::typeName, 0)); + +Foam::debug::debugSwitch +Foam::fileName::debug +( + fileName::typeName, + 0 +); + const Foam::fileName Foam::fileName::null; // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // diff --git a/src/foam/primitives/strings/fileName/fileName.H b/src/foam/primitives/strings/fileName/fileName.H index 52ba06b29..ee0214866 100644 --- a/src/foam/primitives/strings/fileName/fileName.H +++ b/src/foam/primitives/strings/fileName/fileName.H @@ -45,6 +45,7 @@ SourceFiles #define fileName_H #include "word.H" +#include "controlSwitches.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -91,7 +92,7 @@ public: // Static data members static const char* const typeName; - static int debug; + static debug::debugSwitch debug; static const fileName null;