Commit 9c32f564 authored by Lambert Theisen's avatar Lambert Theisen
Browse files

Rename BCs field names

parent 47f9699a
......@@ -66,11 +66,11 @@ bcs:
3000:
"name": "upper"
"theta_w": 1.0
"v_t": -1.0
"u_t_w": -1.0
3100:
"name": "lower"
"theta_w": 1.0
"v_t": 0.0
"u_t_w": 0.0
# heat source
heat_source: "0"
......
......@@ -53,11 +53,11 @@ class Input:
"anyof": [{"type": "string"}, {"type": "float"}],
"required": True,
},
"v_t": {
"u_t_w": {
"anyof": [{"type": "string"}, {"type": "float"}],
"required": True
},
"v_n": {
"u_n_w": {
"anyof": [{"type": "string"}, {"type": "float"}],
"required": True
},
......@@ -65,7 +65,7 @@ class Input:
"anyof": [{"type": "string"}, {"type": "float"}],
"required": True
},
"gamma": {
"gamma_w": {
"anyof": [{"type": "string"}, {"type": "float"}],
"required": True
},
......
......@@ -298,14 +298,14 @@ class Solver:
- cpl * 2/5 * s_t
) * psi_nt
) * df.ds + 2 * sum([
bcs[bc]["gamma"] * (p + sigma_nn) * psi_nn * df.ds(bc)
bcs[bc]["gamma_w"] * (p + sigma_nn) * psi_nn * df.ds(bc)
for bc in bcs.keys()
])
l3 = sum([
- 2.0 * psi_nt * bcs[bc]["v_t"] * df.ds(bc)
- 2.0 * psi_nt * bcs[bc]["u_t_w"] * df.ds(bc)
- 2.0 * (
- bcs[bc]["gamma"] * bcs[bc]["p_w"]
+ bcs[bc]["v_n"]
- bcs[bc]["gamma_w"] * bcs[bc]["p_w"]
+ bcs[bc]["u_n_w"]
) * psi_nn * df.ds(bc)
for bc in bcs.keys()
])
......@@ -319,13 +319,13 @@ class Solver:
a5 = + (
df.dot(u, df.grad(q))
) * df.dx - sum([
bcs[bc]["gamma"] * (p + sigma_nn) * q * df.ds(bc)
bcs[bc]["gamma_w"] * (p + sigma_nn) * q * df.ds(bc)
for bc in bcs.keys()
])
l5 = - (f_mass * q) * df.dx + sum([
(
- bcs[bc]["gamma"] * bcs[bc]["p_w"]
+ bcs[bc]["v_n"]
- bcs[bc]["gamma_w"] * bcs[bc]["p_w"]
+ bcs[bc]["u_n_w"]
) * q * df.ds(bc)
for bc in bcs.keys()
])
......
......@@ -65,16 +65,16 @@ xi_tilde: 1.0
bcs:
3000:
theta_w: 1
v_t: 0
v_n: 0
u_t_w: 0
u_n_w: 0
p_w: 0
gamma: pow(10,-3)
gamma_w: pow(10,-3)
3100:
theta_w: 2
v_t: -1.00 * sin(phi)
v_n: +1.00 * cos(phi)
u_t_w: -1.00 * sin(phi)
u_n_w: +1.00 * cos(phi)
p_w: -0.27 * cos(phi)
gamma: pow(10,+3)
gamma_w: pow(10,+3)
# heat source
heat_source: 0
......
......@@ -65,16 +65,16 @@ xi_tilde: 1.0
bcs:
3000:
theta_w: 1.0
v_t: -10
v_n: 0
u_t_w: -10
u_n_w: 0
p_w: 0
gamma: 0
gamma_w: 0
3100:
theta_w: 0.5
v_t: 0
v_n: 0
u_t_w: 0
u_n_w: 0
p_w: 0
gamma: 0
gamma_w: 0
# heat source
heat_source: 0
......
......@@ -65,17 +65,17 @@ xi_tilde: 1.0
bcs:
3000:
theta_w: 1.0
v_t: -10
v_n: 0
u_t_w: -10
u_n_w: 0
p_w: 0
gamma: 0
gamma_w: 0
3100:
theta_w: 0.5
v_t: 0
v_n: 0
u_t_w: 0
u_n_w: 0
p_w: 0
gamma: 0
gamma_w: 0
# heat source
......
......@@ -63,16 +63,16 @@ xi_tilde: 1.0
bcs:
3000:
theta_w: 1.0
v_t: 10
v_n: 0
u_t_w: 10
u_n_w: 0
p_w: 0
gamma: 0
gamma_w: 0
3100:
theta_w: 0.5
v_t: 0
v_n: 0
u_t_w: 0
u_n_w: 0
p_w: 0
gamma: 0
gamma_w: 0
# heat source
heat_source: 2.0 - 1.0 * pow(sqrt(pow(x[0],2)+pow(x[1],2)),2)
......
......@@ -63,16 +63,16 @@ xi_tilde: 1.0
bcs:
3000:
theta_w: 1.0
v_t: 10
v_n: 0
u_t_w: 10
u_n_w: 0
p_w: 0
gamma: 0
gamma_w: 0
3100:
theta_w: 0.5
v_t: 0
v_n: 0
u_t_w: 0
u_n_w: 0
p_w: 0
gamma: 0
gamma_w: 0
# heat source
heat_source: 2.0 - 1.0 * pow(sqrt(pow(x[0],2)+pow(x[1],2)),2)
......
......@@ -65,16 +65,16 @@ xi_tilde: 1.0
bcs:
3000:
theta_w: 1.0
v_t: 10
v_n: 0
u_t_w: 10
u_n_w: 0
p_w: 0
gamma: 0
gamma_w: 0
3100:
theta_w: 0.5
v_t: 0
v_n: 0
u_t_w: 0
u_n_w: 0
p_w: 0
gamma: 0
gamma_w: 0
# heat source
heat_source: 2.0 - 1.0 * pow(sqrt(pow(x[0],2)+pow(x[1],2)),2)
......
......@@ -63,16 +63,16 @@ xi_tilde: 1.0
bcs:
3000:
theta_w: 1.0
v_t: 10
v_n: 0
u_t_w: 10
u_n_w: 0
p_w: 0
gamma: 0
gamma_w: 0
3100:
theta_w: 0.5
v_t: 0
v_n: 0
u_t_w: 0
u_n_w: 0
p_w: 0
gamma: 0
gamma_w: 0
# heat source
heat_source: 2.0 - 1.0 * pow(sqrt(pow(x[0],2)+pow(x[1],2)),2)
......
......@@ -63,16 +63,16 @@ xi_tilde: 1.0
bcs:
3000:
theta_w: 1.0
v_t: 10
v_n: 0
u_t_w: 10
u_n_w: 0
p_w: 0
gamma: 0
gamma_w: 0
3100:
theta_w: 0.5
v_t: 0
v_n: 0
u_t_w: 0
u_n_w: 0
p_w: 0
gamma: 0
gamma_w: 0
# heat source
heat_source: 2.0 - 1.0 * pow(sqrt(pow(x[0],2)+pow(x[1],2)),2)
......
......@@ -65,16 +65,16 @@ xi_tilde: 1.0
bcs:
3000:
theta_w: 1.0
v_t: -10
v_n: 0
u_t_w: -10
u_n_w: 0
p_w: 0
gamma: 0
gamma_w: 0
3100:
theta_w: 0.5
v_t: 0
v_n: 0
u_t_w: 0
u_n_w: 0
p_w: 0
gamma: 0
gamma_w: 0
# heat source
heat_source: 2.0 - 1.0 * pow(sqrt(pow(x[0],2)+pow(x[1],2)),2)
......
......@@ -65,16 +65,16 @@ xi_tilde: 1.0
bcs:
3000:
theta_w: 1.0
v_t: 0
v_n: 0
u_t_w: 0
u_n_w: 0
p_w: 0
gamma: 0
gamma_w: 0
3100:
theta_w: 0.5
v_t: 0
v_n: 0
u_t_w: 0
u_n_w: 0
p_w: 0
gamma: 0
gamma_w: 0
# heat source
heat_source: 2.0 - 1.0 * pow(sqrt(pow(x[0],2)+pow(x[1],2)),2)
......
......@@ -65,16 +65,16 @@ xi_tilde: 1.0
bcs:
3000:
theta_w: 1.0
v_t: -10
v_n: 0
u_t_w: -10
u_n_w: 0
p_w: 0
gamma: 0
gamma_w: 0
3100:
theta_w: 0.5
v_t: 0
v_n: 0
u_t_w: 0
u_n_w: 0
p_w: 0
gamma: 0
gamma_w: 0
# heat source
heat_source: 2.0 - 1.0 * pow(sqrt(pow(x[0],2)+pow(x[1],2)),2)
......
......@@ -65,16 +65,16 @@ xi_tilde: 1.0
bcs:
3000:
theta_w: 1.0
v_t: -10
v_n: 0
u_t_w: -10
u_n_w: 0
p_w: 0
gamma: 0
gamma_w: 0
3100:
theta_w: 0.5
v_t: 0
v_n: 0
u_t_w: 0
u_n_w: 0
p_w: 0
gamma: 0
gamma_w: 0
# heat source
heat_source: 2.0 - 1.0 * pow(sqrt(pow(x[0],2)+pow(x[1],2)),2)
......
......@@ -65,16 +65,16 @@ xi_tilde: 1.0
bcs:
3000:
theta_w: 1.0
v_t: -10
v_n: 0
u_t_w: -10
u_n_w: 0
p_w: 0
gamma: 0
gamma_w: 0
3100:
theta_w: 0.5
v_t: 0
v_n: 0
u_t_w: 0
u_n_w: 0
p_w: 0
gamma: 0
gamma_w: 0
# heat source
heat_source: 2.0 - 1.0 * pow(sqrt(pow(x[0],2)+pow(x[1],2)),2)
......
......@@ -65,16 +65,16 @@ xi_tilde: 1.0
bcs:
3000:
theta_w: 1.0
v_t: -10
v_n: 0
u_t_w: -10
u_n_w: 0
p_w: 0
gamma: 0
gamma_w: 0
3100:
theta_w: 0.5
v_t: 0
v_n: 0
u_t_w: 0
u_n_w: 0
p_w: 0
gamma: 0
gamma_w: 0
# heat source
heat_source: 2.0 - 1.0 * pow(sqrt(pow(x[0],2)+pow(x[1],2)),2)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment