zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ENH: waveModel - updated restart method

Browse Source
This commit is contained in:
Andrew Heather
2016-11-23 15:48:56 +00:00
parent c7b51f98e7
commit bc05a40b56
22 changed files with 66 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
integration/OpenCFD/code/waveModel/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.C
View File

@ -50,7 +50,7 @@ Foam::waveModels::waveAbsorptionModel::waveAbsorptionModel
{
if (readFields)
{
read();
read(dict);
}
}
@ -63,9 +63,9 @@ Foam::waveModels::waveAbsorptionModel::~waveAbsorptionModel()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
bool Foam::waveModels::waveAbsorptionModel::read()
bool Foam::waveModels::waveAbsorptionModel::read(const dictionary& overrideDict)
{
if (waveModel::read())
if (waveModel::read(overrideDict))
{
// Note: always set to true
activeAbsorption_ = true;

2
integration/OpenCFD/code/waveModel/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.H
View File

@ -70,7 +70,7 @@ public:
// Public Member Functions
//- Read from dictionary
virtual bool read();
virtual bool read(const dictionary& overrideDict);
};

9
integration/OpenCFD/code/waveModel/waveAbsorptionModels/derived/shallowWaterAbsorption/shallowWaterAbsorption.C
View File

@ -92,7 +92,7 @@ Foam::waveModels::shallowWaterAbsorption::shallowWaterAbsorption
{
if (readFields)
{
read();
read(dict);
}
}
@ -105,9 +105,12 @@ Foam::waveModels::shallowWaterAbsorption::~shallowWaterAbsorption()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
bool Foam::waveModels::shallowWaterAbsorption::read()
bool Foam::waveModels::shallowWaterAbsorption::read
(
const dictionary& overrideDict
)
{
return waveAbsorptionModel::read();
return waveAbsorptionModel::read(overrideDict);
}

2
integration/OpenCFD/code/waveModel/waveAbsorptionModels/derived/shallowWaterAbsorption/shallowWaterAbsorption.H
View File

@ -94,7 +94,7 @@ public:
// Public Member Functions
//- Read from dictionary
virtual bool read();
virtual bool read(const dictionary& overrideDict);
};