diff --git a/src/regionFaModels/thermalShellModel/thermalShellModel.C b/src/regionFaModels/thermalShellModel/thermalShellModel.C
index 4ee3c206e35e6ebf57b0e305dc5aa6f12f6c23ad..41d242f2330786abfec302fc6fb54a993e7b4fc4 100644
--- a/src/regionFaModels/thermalShellModel/thermalShellModel.C
+++ b/src/regionFaModels/thermalShellModel/thermalShellModel.C
@@ -5,7 +5,7 @@
\\ / A nd | www.openfoam.com
\\/ M anipulation |
-------------------------------------------------------------------------------
- Copyright (C) 2019-2020 OpenCFD Ltd.
+ Copyright (C) 2019-2021 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -43,19 +43,6 @@ defineTypeNameAndDebug(thermalShellModel, 0);
defineRunTimeSelectionTable(thermalShellModel, dictionary);
-// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
-
-bool thermalShellModel::read(const dictionary& dict)
-{
- if (regionFaModel::read(dict))
- {
- return true;
- }
-
- return false;
-}
-
-
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
thermalShellModel::thermalShellModel
@@ -95,24 +82,6 @@ void thermalShellModel::preEvolveRegion()
{}
-const Foam::volScalarField& thermalShellModel::Tp() const
-{
- return Tp_;
-}
-
-
-const Foam::areaScalarField& thermalShellModel::T() const
-{
- return T_;
-}
-
-
-Foam::fa::options& thermalShellModel::faOptions()
-{
- return faOptions_;
-}
-
-
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace regionModels
diff --git a/src/regionFaModels/thermalShellModel/thermalShellModel.H b/src/regionFaModels/thermalShellModel/thermalShellModel.H
index 2b2e9ec282980584ea472a5eff0af75185c7de38..5a6294e9f8f1eb64d427d68cebc3bf1807ff5e36 100644
--- a/src/regionFaModels/thermalShellModel/thermalShellModel.H
+++ b/src/regionFaModels/thermalShellModel/thermalShellModel.H
@@ -5,7 +5,7 @@
\\ / A nd | www.openfoam.com
\\/ M anipulation |
-------------------------------------------------------------------------------
- Copyright (C) 2019-2020 OpenCFD Ltd.
+ Copyright (C) 2019-2021 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -34,23 +34,23 @@ Usage
\verbatim
<patchName>
{
- // Mandatory/Optional (inherited) entries
+ // Mandatory/Optional entries
...
- // Mandatory entries (unmodifiable)
+ // Mandatory entries
T <Tname>;
- // Optional entries (unmodifiable)
+ // Optional entries
thermalShellModel <thermalShellModelName>;
- // Mandatory/Optional (derived) entries
+ // Derived entries
...
}
\endverbatim
where the entries mean:
\table
- Property | Description | Type | Reqd | Dflt
+ Property | Description | Type | Reqd | Deflt
T | Name of operand temperature field | word | yes | -
thermalShellModel | Name of thermal-shell model <!--
--> | word | no | thermalShell
@@ -90,12 +90,6 @@ class thermalShellModel
:
public regionFaModel
{
- // Private Member Functions
-
- //- Initialize thermal Baffle
- void init();
-
-
protected:
// Protected Data
@@ -113,12 +107,6 @@ protected:
Foam::fa::options& faOptions_;
- // Protected Member Functions
-
- //- Read control parameters from dictionary
- virtual bool read(const dictionary&);
-
-
public:
//- Runtime type information
@@ -177,13 +165,22 @@ public:
// Access
//- Return primary region temperature
- const volScalarField& Tp() const;
+ const volScalarField& Tp() const noexcept
+ {
+ return Tp_;
+ }
//- Return shell temperature
- const areaScalarField& T() const;
+ const areaScalarField& T() const noexcept
+ {
+ return T_;
+ }
//- Return faOptions
- Foam::fa::options& faOptions();
+ Foam::fa::options& faOptions() noexcept
+ {
+ return faOptions_;
+ }
// Evolution
diff --git a/src/regionFaModels/vibrationShellModel/vibrationShellModel.C b/src/regionFaModels/vibrationShellModel/vibrationShellModel.C
index ea309868a0de69e6d401c67ac5f17812733040fe..0be141cb911e558bdadf4f5178328ab13a40505a 100644
--- a/src/regionFaModels/vibrationShellModel/vibrationShellModel.C
+++ b/src/regionFaModels/vibrationShellModel/vibrationShellModel.C
@@ -5,7 +5,7 @@
\\ / A nd | www.openfoam.com
\\/ M anipulation |
-------------------------------------------------------------------------------
- Copyright (C) 2019-2020 OpenCFD Ltd.
+ Copyright (C) 2019-2021 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -43,20 +43,6 @@ defineTypeNameAndDebug(vibrationShellModel, 0);
defineRunTimeSelectionTable(vibrationShellModel, dictionary);
-
-// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
-
-bool vibrationShellModel::read(const dictionary& dict)
-{
- if (regionFaModel::read(dict))
- {
- return true;
- }
-
- return false;
-}
-
-
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
vibrationShellModel::vibrationShellModel
@@ -110,36 +96,6 @@ void vibrationShellModel::preEvolveRegion()
{}
-const Foam::volScalarField& vibrationShellModel::pa() const
-{
- return pa_;
-}
-
-
-const Foam::areaScalarField& vibrationShellModel::w() const
-{
- return w_;
-}
-
-
-const Foam::areaScalarField& vibrationShellModel::a() const
-{
- return a_;
-}
-
-
-Foam::fa::options& vibrationShellModel::faOptions()
-{
- return faOptions_;
-}
-
-
-const Foam::solidProperties& vibrationShellModel::solid() const
-{
- return solid_;
-}
-
-
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace regionModels
diff --git a/src/regionFaModels/vibrationShellModel/vibrationShellModel.H b/src/regionFaModels/vibrationShellModel/vibrationShellModel.H
index 566d4fd2bd0382aa0396281b857f288876600fdd..a3eb697e3b6a2d04f1851d79e0bcfc23681e5d8d 100644
--- a/src/regionFaModels/vibrationShellModel/vibrationShellModel.H
+++ b/src/regionFaModels/vibrationShellModel/vibrationShellModel.H
@@ -5,7 +5,7 @@
\\ / A nd | www.openfoam.com
\\/ M anipulation |
-------------------------------------------------------------------------------
- Copyright (C) 2019-2020 OpenCFD Ltd.
+ Copyright (C) 2019-2021 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -34,10 +34,10 @@ Usage
\verbatim
<patchName>
{
- // Mandatory/Optional (inherited) entries
+ // Mandatory/Optional entries
...
- // Mandatory entries (unmodifiable)
+ // Mandatory entries
vibrationShellModel <thermalShellModelName>;
p <pName>;
@@ -53,7 +53,7 @@ Usage
where the entries mean:
\table
- Property | Description | Type | Reqd | Dflt
+ Property | Description | Type | Reqd | Deflt
vibrationShellModel | Name of vibration-shell model | word | yes | -
p | Name of the coupled field in the primary <!--
--> region | word | yes | -
@@ -94,15 +94,6 @@ class vibrationShellModel
:
public regionFaModel
{
- // Private Member Functions
-
- //- No copy construct
- vibrationShellModel(const vibrationShellModel&) = delete;
-
- //- No copy assignment
- void operator=(const vibrationShellModel&) = delete;
-
-
protected:
// Protected Data
@@ -126,12 +117,6 @@ protected:
solidProperties solid_;
- // Protected Member Functions
-
- //- Read control parameters from dictionary
- virtual bool read(const dictionary&);
-
-
public:
//- Runtime type information
@@ -164,6 +149,12 @@ public:
const dictionary& dict
);
+ //- No copy construct
+ vibrationShellModel(const vibrationShellModel&) = delete;
+
+ //- No copy assignment
+ void operator=(const vibrationShellModel&) = delete;
+
// Selectors
@@ -184,19 +175,34 @@ public:
// Access
//- Return primary region pa
- const volScalarField& pa() const;
+ const volScalarField& pa() const noexcept
+ {
+ return pa_;
+ }
//- Return shell displacement
- const areaScalarField& w() const;
+ const areaScalarField& w() const noexcept
+ {
+ return w_;
+ }
//- Return shell acceleration
- const areaScalarField& a() const;
+ const areaScalarField& a() const noexcept
+ {
+ return a_;
+ }
//- Return faOptions
- Foam::fa::options& faOptions();
+ Foam::fa::options& faOptions() noexcept
+ {
+ return faOptions_;
+ }
//- Return solid properties
- const solidProperties& solid() const;
+ const solidProperties& solid() const noexcept
+ {
+ return solid_;
+ }
// Evolution