From 1f393aefa86c207f3f7bc2e604021c0148c32d2d Mon Sep 17 00:00:00 2001
From: Andrew Heather <>
Date: Fri, 29 Jul 2022 15:00:42 +0100
Subject: [PATCH] ENH: subModelBase - added log data member
---
.../primitives/subModelBase/subModelBase.C | 19 +++++++++----------
.../primitives/subModelBase/subModelBase.H | 8 +++++++-
2 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/src/OpenFOAM/primitives/subModelBase/subModelBase.C b/src/OpenFOAM/primitives/subModelBase/subModelBase.C
index 3e640d27346..913192339ff 100644
--- a/src/OpenFOAM/primitives/subModelBase/subModelBase.C
+++ b/src/OpenFOAM/primitives/subModelBase/subModelBase.C
@@ -45,7 +45,8 @@ Foam::subModelBase::subModelBase(dictionary& properties)
dict_(),
baseName_(),
modelType_(),
- coeffDict_()
+ coeffDict_(),
+ log(properties.getOrDefault<bool>("log", true))
{}
@@ -63,7 +64,8 @@ Foam::subModelBase::subModelBase
dict_(dict),
baseName_(baseName),
modelType_(modelType),
- coeffDict_(dict.subDict(modelType + dictExt))
+ coeffDict_(dict.subDict(modelType + dictExt)),
+ log(coeffDict_.getOrDefault<bool>("log", true))
{}
@@ -81,7 +83,8 @@ Foam::subModelBase::subModelBase
dict_(dict),
baseName_(baseName),
modelType_(modelType),
- coeffDict_(dict)
+ coeffDict_(dict),
+ log(coeffDict_.getOrDefault<bool>("log", true))
{}
@@ -92,13 +95,8 @@ Foam::subModelBase::subModelBase(const subModelBase& smb)
dict_(smb.dict_),
baseName_(smb.baseName_),
modelType_(smb.modelType_),
- coeffDict_(smb.coeffDict_)
-{}
-
-
-// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-
-Foam::subModelBase::~subModelBase()
+ coeffDict_(smb.coeffDict_),
+ log(coeffDict_.getOrDefault<bool>("log", true))
{}
@@ -145,6 +143,7 @@ bool Foam::subModelBase::defaultCoeffs(const bool printMsg) const
bool def = coeffDict_.getOrDefault("defaultCoeffs", false);
if (printMsg && def)
{
+ // Note: not using Log<< for output
Info<< incrIndent;
Info<< indent << "Employing default coefficients" << endl;
Info<< decrIndent;
diff --git a/src/OpenFOAM/primitives/subModelBase/subModelBase.H b/src/OpenFOAM/primitives/subModelBase/subModelBase.H
index 1154240e77c..6e592df6ab8 100644
--- a/src/OpenFOAM/primitives/subModelBase/subModelBase.H
+++ b/src/OpenFOAM/primitives/subModelBase/subModelBase.H
@@ -91,6 +91,12 @@ protected:
public:
+ // Public Data
+
+ //- Flag to write log into Info
+ bool log;
+
+
// Constructors
//- Construct null
@@ -121,7 +127,7 @@ public:
//- Destructor
- virtual ~subModelBase();
+ virtual ~subModelBase() = default;
// Member Functions
--
GitLab