From a9dc5e1934bbe6560c8334c4568690b94e5e7ad2 Mon Sep 17 00:00:00 2001 From: Will Bainbridge Date: Fri, 12 Aug 2022 09:42:25 +0100 Subject: [PATCH] thermalBaffleModel: Simplification Removed unused run-time selection mechanism for the baffle model. Removed two layers of unnecessary base class (thermalBaffleModel and regionModel1D). Simplified the handling of thickness and made apply regarduess of dimensionality. Made thickness data a dimensioned field, so that mesh changes get applied to it automatically. Replaced ad-hoc baffle thickness calculation with a "proper" parallel-aware wave-based method. --- src/meshTools/Make/files | 1 - .../mappedVariableThicknessWallPolyPatch.C | 174 --------- .../mappedVariableThicknessWallPolyPatch.H | 238 ------------ src/regionModels/Allwclean | 2 +- src/regionModels/Allwmake | 2 +- src/regionModels/regionModel/Make/files | 9 - .../mappedVariableThicknessWallFvPatch.C | 64 ---- .../mappedVariableThicknessWallFvPatch.H | 93 ----- .../regionModel/regionModel/regionModel.C | 17 +- .../regionModel/regionModel/regionModel.H | 5 - .../regionModel/regionModel1D/regionModel1D.C | 352 ------------------ .../regionModel/regionModel1D/regionModel1D.H | 196 ---------- .../regionModel1D/regionModel1DI.H | 70 ---- .../regionModelFunctionObject.C | 102 ----- .../regionModelFunctionObject.H | 157 -------- .../regionModelFunctionObjectList.C | 124 ------ .../regionModelFunctionObjectList.H | 133 ------- .../regionModelFunctionObjectListI.H | 47 --- .../regionModelFunctionObjectNew.C | 67 ---- src/regionModels/thermalBaffle/Make/files | 5 + .../Make/options | 0 .../thermalBaffleFvPatchScalarField.C | 7 +- .../thermalBaffleFvPatchScalarField.H | 8 +- .../thermalBaffle/DeltaInfoData.H | 204 ++++++++++ .../thermalBaffle/DeltaInfoDataI.H | 233 ++++++++++++ .../thermalBaffle/thermalBaffle.C | 290 ++++++++------- .../thermalBaffle/thermalBaffle.H | 77 ++-- .../thermalBaffleModels/Make/files | 9 - .../thermalBaffleModels/noThermo/noThermo.C | 156 -------- .../thermalBaffleModels/noThermo/noThermo.H | 147 -------- .../thermalBaffle/thermalBaffleI.H | 63 ---- .../thermalBaffleModel/thermalBaffleModel.C | 238 ------------ .../thermalBaffleModel/thermalBaffleModel.H | 238 ------------ .../thermalBaffleModelNew.C | 112 ------ .../circuitBoardCooling/system/controlDict | 2 +- 35 files changed, 653 insertions(+), 2989 deletions(-) delete mode 100644 src/meshTools/mappedPatches/mappedPolyPatch/mappedVariableThicknessWallPolyPatch.C delete mode 100644 src/meshTools/mappedPatches/mappedPolyPatch/mappedVariableThicknessWallPolyPatch.H delete mode 100644 src/regionModels/regionModel/derivedFvPatches/mappedVariableThicknessWall/mappedVariableThicknessWallFvPatch.C delete mode 100644 src/regionModels/regionModel/derivedFvPatches/mappedVariableThicknessWall/mappedVariableThicknessWallFvPatch.H delete mode 100644 src/regionModels/regionModel/regionModel1D/regionModel1D.C delete mode 100644 src/regionModels/regionModel/regionModel1D/regionModel1D.H delete mode 100644 src/regionModels/regionModel/regionModel1D/regionModel1DI.H delete mode 100644 src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObject.C delete mode 100644 src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObject.H delete mode 100644 src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObjectList.C delete mode 100644 src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObjectList.H delete mode 100644 src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObjectListI.H delete mode 100644 src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObjectNew.C create mode 100644 src/regionModels/thermalBaffle/Make/files rename src/regionModels/{thermalBaffleModels => thermalBaffle}/Make/options (100%) rename src/regionModels/{thermalBaffleModels => thermalBaffle}/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.C (98%) rename src/regionModels/{thermalBaffleModels => thermalBaffle}/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.H (97%) create mode 100644 src/regionModels/thermalBaffle/thermalBaffle/DeltaInfoData.H create mode 100644 src/regionModels/thermalBaffle/thermalBaffle/DeltaInfoDataI.H rename src/regionModels/{thermalBaffleModels => thermalBaffle}/thermalBaffle/thermalBaffle.C (55%) rename src/regionModels/{thermalBaffleModels => thermalBaffle}/thermalBaffle/thermalBaffle.H (71%) delete mode 100644 src/regionModels/thermalBaffleModels/Make/files delete mode 100644 src/regionModels/thermalBaffleModels/noThermo/noThermo.C delete mode 100644 src/regionModels/thermalBaffleModels/noThermo/noThermo.H delete mode 100644 src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffleI.H delete mode 100644 src/regionModels/thermalBaffleModels/thermalBaffleModel/thermalBaffleModel.C delete mode 100644 src/regionModels/thermalBaffleModels/thermalBaffleModel/thermalBaffleModel.H delete mode 100644 src/regionModels/thermalBaffleModels/thermalBaffleModel/thermalBaffleModelNew.C diff --git a/src/meshTools/Make/files b/src/meshTools/Make/files index 75de118fba..21b4df99cb 100644 --- a/src/meshTools/Make/files +++ b/src/meshTools/Make/files @@ -250,7 +250,6 @@ patchToPatch/rays/raysPatchToPatch.C mappedPatches/mappedPolyPatch/mappedPatchBase.C mappedPatches/mappedPolyPatch/mappedPolyPatch.C mappedPatches/mappedPolyPatch/mappedWallPolyPatch.C -mappedPatches/mappedPolyPatch/mappedVariableThicknessWallPolyPatch.C mappedPatches/mappedPointPatch/mappedPointPatch.C mappedPatches/mappedPointPatch/mappedWallPointPatch.C diff --git a/src/meshTools/mappedPatches/mappedPolyPatch/mappedVariableThicknessWallPolyPatch.C b/src/meshTools/mappedPatches/mappedPolyPatch/mappedVariableThicknessWallPolyPatch.C deleted file mode 100644 index eb170405b9..0000000000 --- a/src/meshTools/mappedPatches/mappedPolyPatch/mappedVariableThicknessWallPolyPatch.C +++ /dev/null @@ -1,174 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -#include "mappedVariableThicknessWallPolyPatch.H" -#include "addToRunTimeSelectionTable.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - defineTypeNameAndDebug(mappedVariableThicknessWallPolyPatch, 0); - - addToRunTimeSelectionTable - ( - polyPatch, - mappedVariableThicknessWallPolyPatch, - word - ); - - addToRunTimeSelectionTable - ( - polyPatch, - mappedVariableThicknessWallPolyPatch, - dictionary - ); -} - - -// * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * * * * * // - -Foam::mappedVariableThicknessWallPolyPatch::mappedVariableThicknessWallPolyPatch -( - const word& name, - const label size, - const label start, - const label index, - const polyBoundaryMesh& bm, - const word& patchType -) -: - mappedWallPolyPatch(name, size, start, index, bm, patchType), - thickness_(size) -{} - - -Foam::mappedVariableThicknessWallPolyPatch::mappedVariableThicknessWallPolyPatch -( - const word& name, - const label size, - const label start, - const label index, - const word& sampleRegion, - const mappedPatchBase::sampleMode mode, - const word& samplePatch, - const vectorField& offset, - const polyBoundaryMesh& bm -) -: - mappedWallPolyPatch(name, size, start, index, bm, typeName), - thickness_(size) -{} - - -Foam::mappedVariableThicknessWallPolyPatch::mappedVariableThicknessWallPolyPatch -( - const word& name, - const label size, - const label start, - const label index, - const word& sampleRegion, - const mappedPatchBase::sampleMode mode, - const word& samplePatch, - const vector& offset, - const polyBoundaryMesh& bm -) -: - mappedWallPolyPatch(name, size, start, index, bm, typeName), - thickness_(size) -{} - - -Foam::mappedVariableThicknessWallPolyPatch::mappedVariableThicknessWallPolyPatch -( - const word& name, - const dictionary& dict, - const label index, - const polyBoundaryMesh& bm, - const word& patchType -) -: - mappedWallPolyPatch(name, dict, index, bm, patchType), - thickness_(scalarField("thickness", dict, this->size())) -{} - - -Foam::mappedVariableThicknessWallPolyPatch:: -mappedVariableThicknessWallPolyPatch -( - const mappedVariableThicknessWallPolyPatch& pp, - const polyBoundaryMesh& bm -) -: - mappedWallPolyPatch(pp, bm), - thickness_(pp.thickness_) -{} - - -Foam::mappedVariableThicknessWallPolyPatch::mappedVariableThicknessWallPolyPatch -( - const mappedVariableThicknessWallPolyPatch& pp, - const polyBoundaryMesh& bm, - const label index, - const label newSize, - const label newStart -) -: - mappedWallPolyPatch(pp, bm, index, newSize, newStart), - thickness_(newSize) -{} - - -Foam::mappedVariableThicknessWallPolyPatch::mappedVariableThicknessWallPolyPatch -( - const mappedVariableThicknessWallPolyPatch& pp, - const polyBoundaryMesh& bm, - const label index, - const labelUList& mapAddressing, - const label newStart -) -: - mappedWallPolyPatch(pp, bm, index, mapAddressing, newStart), - thickness_(pp.size()) -{} - - -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // - -Foam::mappedVariableThicknessWallPolyPatch:: -~mappedVariableThicknessWallPolyPatch() -{} - - -// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // - -void Foam::mappedVariableThicknessWallPolyPatch:: -write(Foam::Ostream& os) const -{ - writeEntry(os, "thickness", thickness_); -} - - -// ************************************************************************* // diff --git a/src/meshTools/mappedPatches/mappedPolyPatch/mappedVariableThicknessWallPolyPatch.H b/src/meshTools/mappedPatches/mappedPolyPatch/mappedVariableThicknessWallPolyPatch.H deleted file mode 100644 index 299ef6cd1e..0000000000 --- a/src/meshTools/mappedPatches/mappedPolyPatch/mappedVariableThicknessWallPolyPatch.H +++ /dev/null @@ -1,238 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -Class - Foam::mappedVariableThicknessWallPolyPatch - -Description - Foam::mappedVariableThicknessWallPolyPatch - -SourceFiles - mappedVariableThicknessWallPolyPatch.C - -\*---------------------------------------------------------------------------*/ - -#ifndef mappedVariableThicknessWallPolyPatch_H -#define mappedVariableThicknessWallPolyPatch_H - -#include "wallPolyPatch.H" -#include "mappedWallPolyPatch.H" - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -class polyMesh; - -/*---------------------------------------------------------------------------*\ - Class mappedVariableThicknessWallPolyPatch Declaration -\*---------------------------------------------------------------------------*/ - -class mappedVariableThicknessWallPolyPatch -: - public mappedWallPolyPatch -{ - - // Private Data - - //- Thickness - scalarList thickness_; - - -public: - - //- Runtime type information - TypeName("mappedWallVariableThickness"); - - - // Constructors - - //- Construct from components - mappedVariableThicknessWallPolyPatch - ( - const word& name, - const label size, - const label start, - const label index, - const polyBoundaryMesh& bm, - const word& patchType - ); - - //- Construct from components - mappedVariableThicknessWallPolyPatch - ( - const word& name, - const label size, - const label start, - const label index, - const word& sampleRegion, - const mappedPatchBase::sampleMode mode, - const word& samplePatch, - const vectorField& offset, - const polyBoundaryMesh& bm - ); - - //- Construct from components. Uniform offset. - mappedVariableThicknessWallPolyPatch - ( - const word& name, - const label size, - const label start, - const label index, - const word& sampleRegion, - const mappedPatchBase::sampleMode mode, - const word& samplePatch, - const vector& offset, - const polyBoundaryMesh& bm - ); - - //- Construct from dictionary - mappedVariableThicknessWallPolyPatch - ( - const word& name, - const dictionary& dict, - const label index, - const polyBoundaryMesh& bm, - const word& patchType - ); - - //- Construct as copy, resetting the boundary mesh - mappedVariableThicknessWallPolyPatch - ( - const mappedVariableThicknessWallPolyPatch&, - const polyBoundaryMesh& - ); - - //- Construct given the original patch and resetting the - // face list and boundary mesh information - mappedVariableThicknessWallPolyPatch - ( - const mappedVariableThicknessWallPolyPatch& pp, - const polyBoundaryMesh& bm, - const label index, - const label newSize, - const label newStart - ); - - //- Construct given the original patch and a map - mappedVariableThicknessWallPolyPatch - ( - const mappedVariableThicknessWallPolyPatch& pp, - const polyBoundaryMesh& bm, - const label index, - const labelUList& mapAddressing, - const label newStart - ); - - //- Construct and return a clone, resetting the boundary mesh - virtual autoPtr clone(const polyBoundaryMesh& bm) const - { - return autoPtr - ( - new mappedVariableThicknessWallPolyPatch(*this, bm) - ); - } - - //- Construct and return a clone, resetting the face list - // and boundary mesh - virtual autoPtr clone - ( - const polyBoundaryMesh& bm, - const label index, - const label newSize, - const label newStart - ) const - { - return autoPtr - ( - new mappedVariableThicknessWallPolyPatch - ( - *this, - bm, - index, - newSize, - newStart - ) - ); - } - - //- Construct and return a clone, resetting the face list - // and boundary mesh - virtual autoPtr clone - ( - const polyBoundaryMesh& bm, - const label index, - const labelUList& mapAddressing, - const label newStart - ) const - { - return autoPtr - ( - new mappedVariableThicknessWallPolyPatch - ( - *this, - bm, - index, - mapAddressing, - newStart - ) - ); - } - - - //- Destructor - virtual ~mappedVariableThicknessWallPolyPatch(); - - - // Member Functions - - //- Return non const thickness - scalarList& thickness() - { - return thickness_; - } - - - //- Return const thickness - const scalarList& thickness() const - { - return thickness_; - } - - - //- Write the polyPatch data as a dictionary - void write(Ostream&) const; -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/regionModels/Allwclean b/src/regionModels/Allwclean index 037a56e5eb..5be3d3a625 100755 --- a/src/regionModels/Allwclean +++ b/src/regionModels/Allwclean @@ -4,6 +4,6 @@ makeType=${1:-libso} wclean $makeType regionModel wclean $makeType surfaceFilmModels -wclean $makeType thermalBaffleModels +wclean $makeType thermalBaffle #------------------------------------------------------------------------------ diff --git a/src/regionModels/Allwmake b/src/regionModels/Allwmake index 5dc821bcf2..23978b3b4c 100755 --- a/src/regionModels/Allwmake +++ b/src/regionModels/Allwmake @@ -6,6 +6,6 @@ cd ${0%/*} || exit 1 # Run from this directory wmake $targetType regionModel wmake $targetType surfaceFilmModels -wmake $targetType thermalBaffleModels +wmake $targetType thermalBaffle #------------------------------------------------------------------------------ diff --git a/src/regionModels/regionModel/Make/files b/src/regionModels/regionModel/Make/files index c75f2ba44e..bc96ee0113 100644 --- a/src/regionModels/regionModel/Make/files +++ b/src/regionModels/regionModel/Make/files @@ -1,13 +1,4 @@ -# Region models regionModel/regionModel.C singleLayerRegion/singleLayerRegion.C -regionModel1D/regionModel1D.C - -# Boundary conditions -derivedFvPatches/mappedVariableThicknessWall/mappedVariableThicknessWallFvPatch.C - -regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObject.C -regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObjectNew.C -regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObjectList.C LIB = $(FOAM_LIBBIN)/libregionModels diff --git a/src/regionModels/regionModel/derivedFvPatches/mappedVariableThicknessWall/mappedVariableThicknessWallFvPatch.C b/src/regionModels/regionModel/derivedFvPatches/mappedVariableThicknessWall/mappedVariableThicknessWallFvPatch.C deleted file mode 100644 index 0261229f28..0000000000 --- a/src/regionModels/regionModel/derivedFvPatches/mappedVariableThicknessWall/mappedVariableThicknessWallFvPatch.C +++ /dev/null @@ -1,64 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -#include "mappedVariableThicknessWallFvPatch.H" -#include "addToRunTimeSelectionTable.H" -#include "regionModel1D.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - defineTypeNameAndDebug(mappedVariableThicknessWallFvPatch, 0); - addToRunTimeSelectionTable - ( - fvPatch, - mappedVariableThicknessWallFvPatch, - polyPatch - ); -} - - -// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // - -void Foam::mappedVariableThicknessWallFvPatch:: -makeDeltaCoeffs(scalarField& dc) const -{ - const mappedVariableThicknessWallPolyPatch& pp = - refCast(patch()); - - typedef regionModels::regionModel1D modelType; - - const modelType& region1D = - patch().boundaryMesh().mesh().time().lookupObject - ( - "thermalBaffleProperties" - ); - - dc = 2.0/(pp.thickness()/region1D.nLayers()); -} - - -// ************************************************************************* // diff --git a/src/regionModels/regionModel/derivedFvPatches/mappedVariableThicknessWall/mappedVariableThicknessWallFvPatch.H b/src/regionModels/regionModel/derivedFvPatches/mappedVariableThicknessWall/mappedVariableThicknessWallFvPatch.H deleted file mode 100644 index 9ee07c440c..0000000000 --- a/src/regionModels/regionModel/derivedFvPatches/mappedVariableThicknessWall/mappedVariableThicknessWallFvPatch.H +++ /dev/null @@ -1,93 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -Class - Foam::mappedVariableThicknessWallFvPatch - -Description - Take thickness field and number of layers and returns deltaCoeffs - as 2.0/thickness/nLayers. - To be used with 1D thermo baffle. - -SourceFiles - mappedVariableThicknessWallFvPatch.C - -\*---------------------------------------------------------------------------*/ - -#ifndef mappedVariableThicknessWallFvPatch_H -#define mappedVariableThicknessWallFvPatch_H - -#include "wallFvPatch.H" -#include "mappedVariableThicknessWallPolyPatch.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -/*---------------------------------------------------------------------------*\ - Class mappedVariableThicknessWallFvPatch Declaration -\*---------------------------------------------------------------------------*/ - -class mappedVariableThicknessWallFvPatch -: - public wallFvPatch -{ - -protected: - - // Protected Member Functions - - //- Read neighbour cell distances from dictionary - void makeDeltaCoeffs(scalarField& dc) const; - - -public: - - //- Runtime type information - TypeName(mappedVariableThicknessWallPolyPatch::typeName_()); - - - // Constructors - - //- Construct from components - mappedVariableThicknessWallFvPatch - ( - const polyPatch& patch, - const fvBoundaryMesh& bm - ) - : - wallFvPatch(patch, bm) - {} -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/regionModels/regionModel/regionModel/regionModel.C b/src/regionModels/regionModel/regionModel/regionModel.C index 6344f337eb..66ede01ff2 100644 --- a/src/regionModels/regionModel/regionModel/regionModel.C +++ b/src/regionModels/regionModel/regionModel/regionModel.C @@ -267,8 +267,7 @@ Foam::regionModels::regionModel::regionModel outputPropertiesPtr_(nullptr), primaryPatchIDs_(), intCoupledPatchIDs_(), - regionName_("none"), - functions_(*this) + regionName_("none") {} @@ -300,8 +299,7 @@ Foam::regionModels::regionModel::regionModel outputPropertiesPtr_(nullptr), primaryPatchIDs_(), intCoupledPatchIDs_(), - regionName_(lookup("regionName")), - functions_(*this, subOrEmptyDict("functions")) + regionName_(lookup("regionName")) { constructMeshObjects(); initialise(); @@ -344,8 +342,7 @@ Foam::regionModels::regionModel::regionModel outputPropertiesPtr_(nullptr), primaryPatchIDs_(), intCoupledPatchIDs_(), - regionName_(dict.lookup("regionName")), - functions_(*this, subOrEmptyDict("functions")) + regionName_(dict.lookup("regionName")) { constructMeshObjects(); initialise(); @@ -398,9 +395,7 @@ void Foam::regionModels::regionModel::evolve() void Foam::regionModels::regionModel::preEvolveRegion() -{ - functions_.preEvolveRegion(); -} +{} void Foam::regionModels::regionModel::evolveRegion() @@ -408,9 +403,7 @@ void Foam::regionModels::regionModel::evolveRegion() void Foam::regionModels::regionModel::postEvolveRegion() -{ - functions_.postEvolveRegion(); -} +{} void Foam::regionModels::regionModel::info() diff --git a/src/regionModels/regionModel/regionModel/regionModel.H b/src/regionModels/regionModel/regionModel/regionModel.H index 93aa7b2dc9..9b39f2c5fe 100644 --- a/src/regionModels/regionModel/regionModel/regionModel.H +++ b/src/regionModels/regionModel/regionModel/regionModel.H @@ -39,13 +39,11 @@ SourceFiles #include "fvMesh.H" #include "timeIOdictionary.H" -#include "regionModelFunctionObjectList.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { - namespace regionModels { @@ -110,9 +108,6 @@ protected: //- Region name word regionName_; - //- Region model function objects - regionModelFunctionObjectList functions_; - // Protected member functions diff --git a/src/regionModels/regionModel/regionModel1D/regionModel1D.C b/src/regionModels/regionModel/regionModel1D/regionModel1D.C deleted file mode 100644 index 5afd737079..0000000000 --- a/src/regionModels/regionModel/regionModel1D/regionModel1D.C +++ /dev/null @@ -1,352 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -#include "regionModel1D.H" - -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // - -namespace Foam -{ -namespace regionModels -{ - defineTypeNameAndDebug(regionModel1D, 0); -} -} - -// * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * // - -void Foam::regionModels::regionModel1D::constructMeshObjects() -{ - nMagSfPtr_.reset - ( - new surfaceScalarField - ( - IOobject - ( - "nMagSf", - time().timeName(), - regionMesh(), - IOobject::NO_READ, - IOobject::NO_WRITE - ), - regionMesh(), - dimensionedScalar(dimArea, 0) - ) - ); -} - - -void Foam::regionModels::regionModel1D::initialise() -{ - DebugInFunction << endl; - - // Calculate boundaryFaceFaces and boundaryFaceCells - - DynamicList