diff --git a/integration/OpenCFD/code/waveModel/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.H b/integration/OpenCFD/code/waveModel/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.H index ec498926968a6ffec854ad6ac106db87ad78c3d3..e77a4f9fceff838eece54fe4175cead1b649acb0 100644 --- a/integration/OpenCFD/code/waveModel/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.H +++ b/integration/OpenCFD/code/waveModel/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.H @@ -48,16 +48,6 @@ class waveAbsorptionModel : public waveModel { -protected: - - // Protected Member Functions - - //- Wave direction - virtual scalar direction() const - { - return -1; - } - public: diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/base/waveGenerationModel/waveGenerationModel.H b/integration/OpenCFD/code/waveModel/waveGenerationModels/base/waveGenerationModel/waveGenerationModel.H index 267aa1e83c0d7a5b4d751a4be7fc65679b10a847..e0e2048334b1a778086601c6e5c9c23e92794db4 100644 --- a/integration/OpenCFD/code/waveModel/waveGenerationModels/base/waveGenerationModel/waveGenerationModel.H +++ b/integration/OpenCFD/code/waveModel/waveGenerationModels/base/waveGenerationModel/waveGenerationModel.H @@ -59,15 +59,6 @@ protected: scalar waveAngle_; - // Protected Member Functions - - //- Wave direction - virtual scalar direction() const - { - return 1; - } - - public: //- Runtime type information diff --git a/integration/OpenCFD/code/waveModel/waveModel/waveModel.C b/integration/OpenCFD/code/waveModel/waveModel/waveModel.C index 3d56459e36bb52bb367c06130ce966895c90f99d..b82ddb92d64c963a1425601a00b4cc88a3163aad 100644 --- a/integration/OpenCFD/code/waveModel/waveModel/waveModel.C +++ b/integration/OpenCFD/code/waveModel/waveModel/waveModel.C @@ -372,8 +372,6 @@ void Foam::waveModel::correct(const scalar t) if (patch_.size()) { - const scalar d = direction(); - forAll(activeLevel, facei) { const label paddlei = faceToPaddle_[facei]; @@ -384,7 +382,7 @@ void Foam::waveModel::correct(const scalar t) (calculatedLevel[paddlei] - activeLevel[paddlei]) *sqrt(mag(g_)/activeLevel[paddlei]); - U_[facei].x() += d*UCorr; + U_[facei].x() += UCorr; } } } diff --git a/integration/OpenCFD/code/waveModel/waveModel/waveModel.H b/integration/OpenCFD/code/waveModel/waveModel/waveModel.H index dea8125e06abdbdfdf99612f4657a6a723bc63ac..50876824117f9ddaca70a0989eb24ceeb2b6dff1 100644 --- a/integration/OpenCFD/code/waveModel/waveModel/waveModel.H +++ b/integration/OpenCFD/code/waveModel/waveModel/waveModel.H @@ -154,9 +154,6 @@ protected: const scalarField& level ) = 0; - //- Wave direction - virtual scalar direction() const = 0; - //- Set the alpha field based on the water level virtual void setAlpha(const scalarField& level);