zhyang-dev/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ENH: vibrationShellModel and thermalShellModel: remove read()

Browse Source 
STYLE: vibrationShellModel and thermalShellModel: regroup the access functions
This commit is contained in:
sergio
2021-07-12 17:30:04 +01:00
committed by Sergio Ferraris
parent a9aa6cb0db
commit d3807a6ee3
4 changed files with 50 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/regionFaModels/vibrationShellModel/vibrationShellModel.C
View File

@ -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

54
src/regionFaModels/vibrationShellModel/vibrationShellModel.H
View File

@ -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