From 9c9088f1910ea3205e928d75b13d56aab0eeee1c Mon Sep 17 00:00:00 2001 From: Andrew Heather <> Date: Fri, 29 Jul 2022 15:56:20 +0100 Subject: [PATCH] ENH: CloudSubModelBase - added info() function to set log flag --- .../submodels/CloudSubModelBase.C | 31 ++++++++++++------- .../submodels/CloudSubModelBase.H | 7 +++-- 2 files changed, 25 insertions(+), 13 deletions(-) diff --git a/src/lagrangian/intermediate/submodels/CloudSubModelBase.C b/src/lagrangian/intermediate/submodels/CloudSubModelBase.C index 1203dff816f..b2d2face2c9 100644 --- a/src/lagrangian/intermediate/submodels/CloudSubModelBase.C +++ b/src/lagrangian/intermediate/submodels/CloudSubModelBase.C @@ -6,6 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2016 OpenFOAM Foundation + Copyright (C) 2022 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -35,7 +36,9 @@ Foam::CloudSubModelBase<CloudType>::CloudSubModelBase(CloudType& owner) : subModelBase(owner.outputProperties()), owner_(owner) -{} +{ + this->log = owner_.solution().log(); +} template<class CloudType> @@ -57,7 +60,9 @@ Foam::CloudSubModelBase<CloudType>::CloudSubModelBase dictExt ), owner_(owner) -{} +{ + this->log = owner_.solution().log(); +} template<class CloudType> @@ -79,7 +84,9 @@ Foam::CloudSubModelBase<CloudType>::CloudSubModelBase modelType ), owner_(owner) -{} +{ + this->log = owner_.solution().log(); +} template<class CloudType> @@ -90,14 +97,9 @@ Foam::CloudSubModelBase<CloudType>::CloudSubModelBase : subModelBase(smb), owner_(smb.owner_) -{} - - -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // - -template<class CloudType> -Foam::CloudSubModelBase<CloudType>::~CloudSubModelBase() -{} +{ + this->log = owner_.solution().log(); +} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // @@ -138,6 +140,13 @@ Foam::fileName Foam::CloudSubModelBase<CloudType>::localPath() const } +template<class CloudType> +void Foam::CloudSubModelBase<CloudType>::info() +{ + this->log = owner_.solution().log(); +} + + template<class CloudType> void Foam::CloudSubModelBase<CloudType>::write(Ostream& os) const { diff --git a/src/lagrangian/intermediate/submodels/CloudSubModelBase.H b/src/lagrangian/intermediate/submodels/CloudSubModelBase.H index 500f4ddd49c..79a9db81bc3 100644 --- a/src/lagrangian/intermediate/submodels/CloudSubModelBase.H +++ b/src/lagrangian/intermediate/submodels/CloudSubModelBase.H @@ -93,7 +93,7 @@ public: //- Destructor - virtual ~CloudSubModelBase(); + virtual ~CloudSubModelBase() = default; //- Type of cloud this model was instantiated for typedef CloudType cloudType; @@ -121,7 +121,10 @@ public: // I-O - //- Write + //- Write to info + virtual void info(); + + //- Write to os virtual void write(Ostream& os) const; }; -- GitLab