Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
O
OpenFOAM-plus
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
Development
OpenFOAM-plus
Commits
66ed283a
Commit
66ed283a
authored
8 years ago
by
Andrew Heather
Browse files
Options
Downloads
Patches
Plain Diff
BUG: waveModels - corrected reference water levels - thanks to Gabi Barajas
parent
db6fc1d5
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/waveModels/waveModel/waveModel.C
+17
-11
17 additions, 11 deletions
src/waveModels/waveModel/waveModel.C
src/waveModels/waveModel/waveModel.H
+3
-0
3 additions, 0 deletions
src/waveModels/waveModel/waveModel.H
with
20 additions
and
11 deletions
src/waveModels/waveModel/waveModel.C
+
17
−
11
View file @
66ed283a
...
...
@@ -111,6 +111,9 @@ void Foam::waveModel::initialiseGeometry()
}
}
// Set minimum z reference level
zMin0_
=
gMin
(
zMin_
);
// Local paddle-to-face addressing
faceToPaddle_
.
setSize
(
patch_
.
size
(),
-
1
);
forAll
(
faceToPaddle_
,
facei
)
...
...
@@ -162,18 +165,21 @@ void Foam::waveModel::setAlpha(const scalarField& level)
const
label
paddlei
=
faceToPaddle_
[
facei
];
const
scalar
paddleCalc
=
level
[
paddlei
];
if
(
zMax_
[
facei
]
<
paddleCalc
)
const
scalar
zMin0
=
zMin_
[
facei
]
-
zMin0_
;
const
scalar
zMax0
=
zMax_
[
facei
]
-
zMin0_
;
if
(
zMax0
<
paddleCalc
)
{
alpha_
[
facei
]
=
1
.
0
;
}
else
if
(
zMin
_
[
facei
]
>
paddleCalc
)
else
if
(
zMin
0
>
paddleCalc
)
{
alpha_
[
facei
]
=
0
.
0
;
}
else
{
scalar
dz
=
paddleCalc
-
zMin
_
[
facei
]
;
alpha_
[
facei
]
=
dz
/
zSpan_
;
scalar
dz
=
paddleCalc
-
zMin
0
;
alpha_
[
facei
]
=
dz
/
(
zMax0
-
zMin0
)
;
}
}
}
...
...
@@ -190,15 +196,15 @@ void Foam::waveModel::setPaddlePropeties
const
label
paddlei
=
faceToPaddle_
[
facei
];
const
scalar
paddleCalc
=
level
[
paddlei
];
const
scalar
paddleHeight
=
min
(
paddleCalc
,
waterDepthRef_
);
const
scalar
zMin
=
zMin_
[
facei
];
const
scalar
zMax
=
zMax_
[
facei
];
const
scalar
zMin
=
zMin_
[
facei
]
-
zMin0_
;
const
scalar
zMax
=
zMax_
[
facei
]
-
zMin0_
;
fraction
=
1
;
z
=
0
;
if
(
zMax
<
paddleHeight
)
{
z
=
z_
[
facei
];
z
=
z_
[
facei
]
-
zMin0_
;
}
else
if
(
zMin
>
paddleCalc
)
{
...
...
@@ -211,8 +217,8 @@ void Foam::waveModel::setPaddlePropeties
if
((
zMax
>
paddleCalc
)
&&
(
zMin
<
paddleCalc
))
{
scalar
dz
=
paddleCalc
-
zMin
;
fraction
=
dz
/
zSpan_
;
z
=
z_
[
facei
];
fraction
=
dz
/
(
zMax
-
zMin
)
;
z
=
z_
[
facei
]
-
zMin0_
;
}
}
else
...
...
@@ -224,7 +230,7 @@ void Foam::waveModel::setPaddlePropeties
else
if
((
zMax
>
paddleCalc
)
&&
(
zMin
<
paddleCalc
))
{
scalar
dz
=
paddleCalc
-
zMin
;
fraction
=
dz
/
zSpan_
;
fraction
=
dz
/
(
zMax
-
zMin
)
;
z
=
waterDepthRef_
;
}
}
...
...
@@ -382,7 +388,7 @@ void Foam::waveModel::correct(const scalar t)
{
const
label
paddlei
=
faceToPaddle_
[
facei
];
if
(
zMin_
[
facei
]
<
activeLevel
[
paddlei
])
if
(
zMin_
[
facei
]
-
zMin0_
<
activeLevel
[
paddlei
])
{
scalar
UCorr
=
(
calculatedLevel
[
paddlei
]
-
activeLevel
[
paddlei
])
...
...
This diff is collapsed.
Click to expand it.
src/waveModels/waveModel/waveModel.H
+
3
−
0
View file @
66ed283a
...
...
@@ -106,6 +106,9 @@ protected:
//- Maximum z (point) height per patch face / [m]
scalarField
zMax_
;
//- Minimum z reference level / [m]
scalar
zMin0_
;
//- Reference water depth / [m]
scalar
waterDepthRef_
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment