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/waveGenerationModels/derived/Boussinesq/BoussinesqWaveModel.C
View File

@ -179,7 +179,7 @@ Foam::waveModels::Boussinesq::Boussinesq
{
if (readFields)
{
read();
read(dict);
}
}
@ -192,9 +192,9 @@ Foam::waveModels::Boussinesq::~Boussinesq()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
bool Foam::waveModels::Boussinesq::read()
bool Foam::waveModels::Boussinesq::read(const dictionary& overrideDict)
{
if (solitaryWaveModel::read())
if (solitaryWaveModel::read(overrideDict))
{
return true;
}

2
integration/OpenCFD/code/waveModel/waveGenerationModels/derived/Boussinesq/BoussinesqWaveModel.H
View File

@ -127,7 +127,7 @@ public:
// Public Member Functions
//- Read from dictionary
virtual bool read();
virtual bool read(const dictionary& overrideDict);
//- Info
virtual void info(Ostream& os) const;

6
integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesI/StokesIWaveModel.C
View File

@ -155,7 +155,7 @@ Foam::waveModels::StokesI::StokesI
{
if (readFields)
{
read();
read(dict);
}
}
@ -168,9 +168,9 @@ Foam::waveModels::StokesI::~StokesI()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
bool Foam::waveModels::StokesI::read()
bool Foam::waveModels::StokesI::read(const dictionary& overrideDict)
{
if (regularWaveModel::read())
if (regularWaveModel::read(overrideDict))
{
waveLength_ = waveLength(waterDepthRef_, wavePeriod_);

2
integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesI/StokesIWaveModel.H
View File

@ -120,7 +120,7 @@ public:
// Public Member Functions
//- Read from dictionary
virtual bool read();
virtual bool read(const dictionary& overrideDict);
//- Info
virtual void info(Ostream& os) const;

6
integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesII/StokesIIWaveModel.C
View File

@ -148,7 +148,7 @@ Foam::waveModels::StokesII::StokesII
{
if (readFields)
{
read();
read(dict);
}
}
@ -161,9 +161,9 @@ Foam::waveModels::StokesII::~StokesII()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
bool Foam::waveModels::StokesII::read()
bool Foam::waveModels::StokesII::read(const dictionary& overrideDict)
{
if (StokesI::read())
if (StokesI::read(overrideDict))
{
return true;
}

2
integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesII/StokesIIWaveModel.H
View File

@ -110,7 +110,7 @@ public:
// Public Member Functions
//- Read from dictionary
virtual bool read();
virtual bool read(const dictionary& overrideDict);
//- Info
virtual void info(Ostream& os) const;

6
integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesV/StokesVWaveModel.C
View File

@ -788,7 +788,7 @@ Foam::waveModels::StokesV::StokesV
{
if (readFields)
{
read();
read(dict);
}
}
@ -801,9 +801,9 @@ Foam::waveModels::StokesV::~StokesV()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
bool Foam::waveModels::StokesV::read()
bool Foam::waveModels::StokesV::read(const dictionary& overrideDict)
{
if (regularWaveModel::read())
if (regularWaveModel::read(overrideDict))
{
scalar f1;
scalar f2;

2
integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesV/StokesVWaveModel.H
View File

@ -209,7 +209,7 @@ public:
// Public Member Functions
//- Read from dictionary
virtual bool read();
virtual bool read(const dictionary& overrideDict);
//- Info
virtual void info(Ostream& os) const;

6
integration/OpenCFD/code/waveModel/waveGenerationModels/derived/cnoidal/cnoidalWaveModel.C
View File

@ -277,7 +277,7 @@ Foam::waveModels::cnoidal::cnoidal
{
if (readFields)
{
read();
read(dict);
}
}
@ -290,9 +290,9 @@ Foam::waveModels::cnoidal::~cnoidal()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
bool Foam::waveModels::cnoidal::read()
bool Foam::waveModels::cnoidal::read(const dictionary& overrideDict)
{
if (regularWaveModel::read())
if (regularWaveModel::read(overrideDict))
{
// Initialise m parameter and wavelength
initialise

2
integration/OpenCFD/code/waveModel/waveGenerationModels/derived/cnoidal/cnoidalWaveModel.H
View File

@ -156,7 +156,7 @@ public:
// Public Member Functions
//- Read from dictionary
virtual bool read();
virtual bool read(const dictionary& overrideDict);
//- Info
virtual void info(Ostream& os) const;