Skip to content

Commit 2485e7e

Browse files
sbryngelsonsbryngelson
authored
Merge branch 'master' into cfldtBugFix
2 parents 3642944 + e25dbc4 commit 2485e7e

File tree

23 files changed

+2480
-24
lines changed

23 files changed

+2480
-24
lines changed

‎.github/workflows/test.yml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,6 @@ jobs:
4848
- name: Clone
4949
uses: actions/checkout@v4
5050

51-
- name: Set up Python 3.13
52-
uses: actions/setup-python@v5
53-
with:
54-
python-version: '3.13'
55-
5651
- name: Setup MacOS
5752
if: matrix.os == 'macos'
5853
run: |
@@ -81,6 +76,10 @@ jobs:
8176
source /opt/intel/oneapi/setvars.sh
8277
printenv >> $GITHUB_ENV
8378
79+
- name: Set up Python 3.14
80+
uses: actions/setup-python@v5
81+
with:
82+
python-version: '3.14'
8483

8584
- name: Build
8685
run: |

‎examples/2D_kelvin_helmholtz/README.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# Kelvin-Helmholtz Instability (2D)
2+
3+
Reference: See Example 4.8.
4+
> A.S. Chamarthi, S.H. Frankel, A. Chintagunta, Implicit gradients based novel finite volume scheme for compressible single and multi-component flows, arXiv preprint arXiv:2106.01738 (2021).
5+
6+
### Initial State
7+
<img src="figure0.png" height="MAX_HEIGHT"/>
8+
9+
### Evolved State
10+
<img src="figure1.png" height="MAX_HEIGHT"/>

‎examples/2D_kelvin_helmholtz/case.py‎

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
#!/usr/bin/env python3
2+
import json
3+
import math
4+
5+
6+
eps = 1e-6
7+
time_end = 1.0
8+
time_save = time_end / 100.0
9+
10+
# Configuring case dictionary
11+
print(
12+
json.dumps(
13+
{
14+
# Logistics
15+
"run_time_info": "T",
16+
# Computational Domain Parameters
17+
"x_domain%beg": 0,
18+
"x_domain%end": 1.0,
19+
"y_domain%beg": 0,
20+
"y_domain%end": 1.0,
21+
"m": 512,
22+
"n": 512,
23+
"p": 0,
24+
"cfl_adap_dt": "T",
25+
"cfl_target": 0.2,
26+
"n_start": 0,
27+
"t_stop": time_end,
28+
"t_save": time_save,
29+
# Simulation Algorithm Parameters
30+
"num_patches": 2,
31+
"model_eqns": 2,
32+
"alt_soundspeed": "F",
33+
"num_fluids": 2,
34+
"mpp_lim": "T",
35+
"mixture_err": "T",
36+
"time_stepper": 3,
37+
"weno_order": 5,
38+
"weno_eps": 1.0e-10,
39+
"null_weights": "F",
40+
"mp_weno": "F",
41+
"riemann_solver": 1,
42+
"wave_speeds": 1,
43+
"avg_state": 2,
44+
"bc_x%beg": -1,
45+
"bc_x%end": -1,
46+
"bc_y%beg": -1,
47+
"bc_y%end": -1,
48+
# Formatted Database Files Structure Parameters
49+
"format": 1,
50+
"precision": 2,
51+
"prim_vars_wrt": "T",
52+
"parallel_io": "T",
53+
# Background
54+
"patch_icpp(1)%geometry": 3,
55+
"patch_icpp(1)%hcid": 207,
56+
"patch_icpp(1)%x_centroid": 0.5,
57+
"patch_icpp(1)%y_centroid": 0.5,
58+
"patch_icpp(1)%length_x": 1.0,
59+
"patch_icpp(1)%length_y": 1.0,
60+
"patch_icpp(1)%vel(1)": -0.5,
61+
"patch_icpp(1)%vel(2)": 0.0,
62+
"patch_icpp(1)%pres": 2.5,
63+
"patch_icpp(1)%alpha_rho(1)": 1.0 - eps,
64+
"patch_icpp(1)%alpha(1)": 1.0 - eps,
65+
"patch_icpp(1)%alpha_rho(2)": eps,
66+
"patch_icpp(1)%alpha(2)": eps,
67+
# Center Strip (0.25 < y <= 0.75)
68+
"patch_icpp(2)%geometry": 3,
69+
"patch_icpp(2)%alter_patch(1)": "T",
70+
"patch_icpp(2)%hcid": 207,
71+
"patch_icpp(2)%x_centroid": 0.5,
72+
"patch_icpp(2)%y_centroid": 0.5,
73+
"patch_icpp(2)%length_x": 1.0,
74+
"patch_icpp(2)%length_y": 0.5,
75+
"patch_icpp(2)%vel(1)": 0.5,
76+
"patch_icpp(2)%vel(2)": 0.0,
77+
"patch_icpp(2)%pres": 2.5,
78+
"patch_icpp(2)%alpha_rho(1)": 2.0 * eps,
79+
"patch_icpp(2)%alpha(1)": eps,
80+
"patch_icpp(2)%alpha_rho(2)": 2.0 * (1.0 - eps),
81+
"patch_icpp(2)%alpha(2)": 1.0 - eps,
82+
# Fluids Physical Parameters
83+
"fluid_pp(1)%gamma": 1.0e00 / (5.0 / 3.0 - 1.0e00),
84+
"fluid_pp(1)%pi_inf": 0.0e00,
85+
"fluid_pp(2)%gamma": 1.0e00 / (5.0 / 3.0 - 1.0e00),
86+
"fluid_pp(2)%pi_inf": 0.0e00,
87+
}
88+
)
89+
)

‎examples/2D_kelvin_helmholtz/figure0.png‎

55.3 KB
Loading

‎examples/2D_kelvin_helmholtz/figure1.png‎

962 KB
Loading

‎examples/2D_richtmyer_meshkov/README.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# Richtmyer-Meshkov Instability (2D)
2+
3+
Reference: See Example 4.18.
4+
> A.S. Chamarthi, S.H. Frankel, A. Chintagunta, Implicit gradients based novel finite volume scheme for compressible single and multi-component flows, arXiv preprint arXiv:2106.01738 (2021).
5+
6+
### Initial State
7+
<img src="figure0.png" height="MAX_HEIGHT"/>
8+
9+
### Evolved State
10+
<img src="figure1.png" height="MAX_HEIGHT"/>

‎examples/2D_richtmyer_meshkov/case.py‎

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
#!/usr/bin/env python3
2+
import json
3+
import math
4+
5+
6+
mu = 1.0e-4
7+
lambd = 1.0
8+
time_end = 15.0
9+
time_save = time_end / 20.0
10+
eps = 1.0e-6
11+
12+
# Configuring case dictionary
13+
print(
14+
json.dumps(
15+
{
16+
# Logistics
17+
"run_time_info": "T",
18+
# Computational Domain Parameters
19+
"x_domain%beg": 0,
20+
"x_domain%end": 16.0 * lambd,
21+
"y_domain%beg": 0,
22+
"y_domain%end": lambd,
23+
"m": 4096,
24+
"n": 256,
25+
"p": 0,
26+
"cfl_adap_dt": "T",
27+
"cfl_target": 0.1,
28+
"n_start": 0,
29+
"t_stop": time_end,
30+
"t_save": time_save,
31+
# Simulation Algorithm Parameters
32+
"num_patches": 2,
33+
"model_eqns": 2,
34+
"alt_soundspeed": "F",
35+
"num_fluids": 2,
36+
"mpp_lim": "T",
37+
"mixture_err": "T",
38+
"recon_type": 1,
39+
"time_stepper": 3,
40+
"weno_order": 5,
41+
"weno_eps": 1.0e-9,
42+
"null_weights": "F",
43+
"mapped_weno": "T",
44+
"mp_weno": "T",
45+
"riemann_solver": 2,
46+
"wave_speeds": 1,
47+
"avg_state": 2,
48+
"bc_x%beg": -17,
49+
"bc_x%end": -17,
50+
"bc_y%beg": -15,
51+
"bc_y%end": -15,
52+
# Formatted Database Files Structure Parameters
53+
"format": 1,
54+
"precision": 2,
55+
"prim_vars_wrt": "T",
56+
"parallel_io": "T",
57+
# Fluid #1 = Heavier Fluid
58+
# Fluid #2 = Lighter Fluid
59+
# Pre Shock
60+
"patch_icpp(1)%geometry": 3,
61+
"patch_icpp(1)%hcid": 208,
62+
"patch_icpp(1)%x_centroid": 0.5 * 0.7 * lambd,
63+
"patch_icpp(1)%y_centroid": 0.5 * lambd,
64+
"patch_icpp(1)%length_x": 0.7 * lambd,
65+
"patch_icpp(1)%length_y": lambd,
66+
"patch_icpp(1)%vel(1)": 1.24,
67+
"patch_icpp(1)%vel(2)": 0.0,
68+
"patch_icpp(1)%pres": 1.0 / 1.4,
69+
"patch_icpp(1)%alpha_rho(1)": 1.0 * eps,
70+
"patch_icpp(1)%alpha(1)": eps,
71+
"patch_icpp(1)%alpha_rho(2)": 1.0 * (1.0 - eps),
72+
"patch_icpp(1)%alpha(2)": (1.0 - eps),
73+
# Post Shock
74+
"patch_icpp(2)%geometry": 3,
75+
"patch_icpp(2)%hcid": 208,
76+
"patch_icpp(2)%x_centroid": 0.7 * lambd + 0.5 * 15.3 * lambd,
77+
"patch_icpp(2)%y_centroid": 0.5 * lambd,
78+
"patch_icpp(2)%length_x": 15.3 * lambd,
79+
"patch_icpp(2)%length_y": lambd,
80+
"patch_icpp(2)%vel(1)": 0.8787,
81+
"patch_icpp(2)%vel(2)": 0.0,
82+
"patch_icpp(2)%pres": 1.6272 / 1.4,
83+
"patch_icpp(2)%alpha_rho(1)": 1.4112 * eps,
84+
"patch_icpp(2)%alpha(1)": eps,
85+
"patch_icpp(2)%alpha_rho(2)": 1.4112 * (1.0 - eps),
86+
"patch_icpp(2)%alpha(2)": (1.0 - eps),
87+
# Fluids Physical Parameters
88+
"fluid_pp(1)%gamma": 1.0e00 / (1.093 - 1.0e00),
89+
"fluid_pp(1)%pi_inf": 0.0e00,
90+
"fluid_pp(2)%gamma": 1.0e00 / (1.4 - 1.0e00),
91+
"fluid_pp(2)%pi_inf": 0.0e00,
92+
"viscous": "T",
93+
"fluid_pp(1)%Re(1)": 1 / mu,
94+
"fluid_pp(2)%Re(1)": 1 / mu,
95+
}
96+
)
97+
)

‎examples/2D_richtmyer_meshkov/figure0.png‎

183 KB
Loading

‎examples/2D_richtmyer_meshkov/figure1.png‎

544 KB
Loading

‎examples/2D_viscous_shock_tube/README.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# Viscous Shock Tube (2D)
2+
3+
Reference: See Example 4.13.
4+
> A.S. Chamarthi, S.H. Frankel, A. Chintagunta, Implicit gradients based novel finite volume scheme for compressible single and multi-component flows, arXiv preprint arXiv:2106.01738 (2021)., see Example 4.13
5+
6+
### Initial State
7+
<img src="figure0.png" height="MAX_HEIGHT"/>
8+
9+
### Evolved State
10+
<img src="figure1.png" height="MAX_HEIGHT"/>

0 commit comments

Comments
 (0)