From 9a10efc6fab06f2d0e85193980de9737cfe60ba9 Mon Sep 17 00:00:00 2001 From: Andrew Heather Date: Thu, 17 Nov 2016 10:30:00 +0000 Subject: [PATCH] ENH: waveModel - using class varaiable instead of a static to update the model --- integration/OpenCFD/code/waveModel/waveModel/waveModel.C | 7 +++---- integration/OpenCFD/code/waveModel/waveModel/waveModel.H | 4 ++++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/integration/OpenCFD/code/waveModel/waveModel/waveModel.C b/integration/OpenCFD/code/waveModel/waveModel/waveModel.C index 96d234f49f..3d56459e36 100644 --- a/integration/OpenCFD/code/waveModel/waveModel/waveModel.C +++ b/integration/OpenCFD/code/waveModel/waveModel/waveModel.C @@ -276,6 +276,7 @@ Foam::waveModel::waveModel waterDepthRef_(0), initialDepth_(0), rampTime_(VSMALL), + currTimeIndex_(-1), activeAbsorption_(false), U_(patch.size(), vector::zero), alpha_(patch.size(), 0) @@ -338,9 +339,7 @@ bool Foam::waveModel::read() void Foam::waveModel::correct(const scalar t) { - static label timeIndex = -1; - - if (mesh_.time().timeIndex() != timeIndex) + if (mesh_.time().timeIndex() != currTimeIndex_) { Info<< "Updating " << type() << " wave model for patch " << patch_.name() << endl; @@ -394,7 +393,7 @@ void Foam::waveModel::correct(const scalar t) // Transform velocity into global co-ordinate system U_ = Rlg_ & U_; - timeIndex = mesh_.time().timeIndex(); + currTimeIndex_ = mesh_.time().timeIndex(); } } diff --git a/integration/OpenCFD/code/waveModel/waveModel/waveModel.H b/integration/OpenCFD/code/waveModel/waveModel/waveModel.H index 077633ae37..dea8125e06 100644 --- a/integration/OpenCFD/code/waveModel/waveModel/waveModel.H +++ b/integration/OpenCFD/code/waveModel/waveModel/waveModel.H @@ -114,9 +114,13 @@ protected: //- Ramp time scalar rampTime_; + //- Time index used for updating + label currTimeIndex_; + //- Active wave absorption switch bool activeAbsorption_; + // Current values //- Velocity field