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 - using class varaiable instead of a static to update the model

Browse Source
This commit is contained in:
Andrew Heather
2016-11-17 10:30:00 +00:00
parent ce7cc3a744
commit 9a10efc6fa
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
integration/OpenCFD/code/waveModel/waveModel/waveModel.C
View File

@ -276,6 +276,7 @@ Foam::waveModel::waveModel
waterDepthRef_(0), waterDepthRef_(0),
initialDepth_(0), initialDepth_(0),
rampTime_(VSMALL), rampTime_(VSMALL),
currTimeIndex_(-1),
activeAbsorption_(false), activeAbsorption_(false),
U_(patch.size(), vector::zero), U_(patch.size(), vector::zero),
alpha_(patch.size(), 0) alpha_(patch.size(), 0)
@ -338,9 +339,7 @@ bool Foam::waveModel::read()
void Foam::waveModel::correct(const scalar t) void Foam::waveModel::correct(const scalar t)
{ {
static label timeIndex = -1; if (mesh_.time().timeIndex() != currTimeIndex_)
if (mesh_.time().timeIndex() != timeIndex)
{ {
Info<< "Updating " << type() << " wave model for patch " Info<< "Updating " << type() << " wave model for patch "
<< patch_.name() << endl; << patch_.name() << endl;
@ -394,7 +393,7 @@ void Foam::waveModel::correct(const scalar t)
// Transform velocity into global co-ordinate system // Transform velocity into global co-ordinate system
U_ = Rlg_ & U_; U_ = Rlg_ & U_;
timeIndex = mesh_.time().timeIndex(); currTimeIndex_ = mesh_.time().timeIndex();
} }
} }

4
integration/OpenCFD/code/waveModel/waveModel/waveModel.H
View File

@ -114,9 +114,13 @@ protected:
//- Ramp time //- Ramp time
scalar rampTime_; scalar rampTime_;
//- Time index used for updating
label currTimeIndex_;
//- Active wave absorption switch //- Active wave absorption switch
bool activeAbsorption_; bool activeAbsorption_;
// Current values // Current values
//- Velocity field //- Velocity field