From 1248851fa4ba52f7b6b32050027e8c83680314e1 Mon Sep 17 00:00:00 2001
From: Andrew Heather <a.heather@opencfd.co.uk>
Date: Tue, 22 Nov 2016 15:04:05 +0000
Subject: [PATCH] BUG: waveModel - removed direction() function - co-ordinate
system takes care of direction
---
.../base/waveAbsorptionModel/waveAbsorptionModel.H | 10 ----------
.../base/waveGenerationModel/waveGenerationModel.H | 9 ---------
.../OpenCFD/code/waveModel/waveModel/waveModel.C | 4 +---
.../OpenCFD/code/waveModel/waveModel/waveModel.H | 3 ---
4 files changed, 1 insertion(+), 25 deletions(-)
diff --git a/integration/OpenCFD/code/waveModel/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.H b/integration/OpenCFD/code/waveModel/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.H
index ec498926968..e77a4f9fcef 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 267aa1e83c0..e0e2048334b 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 3d56459e36b..b82ddb92d64 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 dea8125e06a..50876824117 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);
--
GitLab