Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
dg
dg
Commits
e10a81b9
Commit
e10a81b9
authored
Jan 13, 2017
by
Jonathan Lambrechts
Browse files
fix manning parameterization
parent
fe1598bd
Pipeline
#1658
passed with stage
in 30 minutes and 34 seconds
Changes
3
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
benchmarks/wetting-drying/volcano/volcano.geo
View file @
e10a81b9
...
...
@@ -2,8 +2,8 @@ L = 12000;
lc = 1000;
Point(1) = {-L/2,-L/2,0,lc};
Point(2) = {-L/2,L/2,0,lc};
Point(3) = {L/2,L/2,0,lc};
Point(4) = {L/2,-L/2,0,lc};
Point(3) = {L/2
+L
,L/2,0,lc};
Point(4) = {L/2
+L
,-L/2,0,lc};
Line(1) = {1,2};
Line(2) = {2,3};
...
...
benchmarks/wetting-drying/volcano/volcano.py
View file @
e10a81b9
...
...
@@ -21,7 +21,7 @@ def bathf(x,y) :
return
0
hlimt
=
1
hlimd
=
0.5
hlimd
=
1
linDrag
=
0.05
###################
...
...
modules/shallowWater/dgConservationLawShallowWater2dC.cpp
View file @
e10a81b9
...
...
@@ -4,7 +4,7 @@
static
double
tdrag
(
double
g
,
double
H
,
double
U
,
double
V
,
double
HLIM
,
double
linDrag
)
{
const
double
Hc
=
std
::
max
(
HLIM
,
H
);
const
double
a
=
std
::
max
(
0.
,
(
HLIM
-
std
::
max
(
0.
,
H
))
/
HLIM
);
return
0.0004
*
g
*
(
hypot
(
U
,
V
))
*
pow
(
Hc
,
-
4
.
/
3
)
+
a
*
linDrag
;
return
0.0004
*
g
*
(
hypot
(
U
,
V
))
*
pow
(
Hc
,
-
7
.
/
3
)
+
a
*
linDrag
;
}
static
void
tflux
(
double
g
,
double
H
,
double
U
,
double
V
,
double
&
fluxU
,
double
&
fluxV
,
double
&
c
,
double
&
ct
,
double
_HLIM
)
{
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment