Skip to content

Commit 18f6673

Browse files
mcarcanamcarcana
committed
conflicts resolved in master->source
2 parents e3572d1 + 8b66e30 commit 18f6673

38 files changed

+2107
-574
lines changed

‎.github/workflows/lint-source.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,15 @@ jobs:
4242
run: |
4343
! grep -iR -e '\.\.\.' -e '\-\-\-' -e '===' ./src/*
4444
45+
- name: Looking for all caps comments in source
46+
run: |
47+
! grep -RE '^\s+[!]\s+[A-Z]{5}' ./src/*
48+
4549
- name: Looking for junk comments in examples
4650
run: |
4751
! grep -R '# ===' ./benchmarks **/*.py
4852
! grep -R '# ===' ./examples/**/*.py
4953
! grep -R '===' ./benchmarks/**/*.py
5054
! grep -R '===' ./examples/**/*.py
5155
56+

‎docs/documentation/case.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -513,6 +513,7 @@ To restart the simulation from $k$-th time step, see [Restarting Cases](running.
513513
| `vel_wrt(i)` | Logical | Add the $i$-direction velocity to the database |
514514
| `E_wrt` | Logical | Add the total energy to the database |
515515
| `pres_wrt` | Logical | Add the pressure to the database |
516+
| `tau_wrt` | Logical | Add the elastic stresses to the database |
516517
| `alpha_wrt(i)` | Logical | Add the volume fraction of fluid $i$ to the database |
517518
| `gamma_wrt` | Logical | Add the specific heat ratio function to the database |
518519
| `heat_ratio_wrt` | Logical | Add the specific heat ratio to the database |

‎examples/1D_hyper_impact_strong/case.py‎

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
#!/usr/bin/env python3
2+
import math
3+
import json
4+
5+
# Numerical setup
6+
Nx = 201
7+
dx = 1.0 / (1.0 * (Nx + 1))
8+
9+
Tend = 41e-06
10+
Nt = 4000
11+
mydt = Tend / (1.0 * Nt)
12+
13+
# Configuring case dictionary
14+
print(
15+
json.dumps(
16+
{
17+
# Logistics
18+
"run_time_info": "T",
19+
# Computational Domain Parameters
20+
"x_domain%beg": 0.0e00,
21+
"x_domain%end": 1.0e00,
22+
# 'y_domain%beg' : 0.E+00,
23+
# 'y_domain%end' : 0.002,
24+
"m": Nx,
25+
"n": 0,
26+
"p": 0,
27+
"dt": mydt,
28+
"t_step_start": 0,
29+
"t_step_stop": int(Nt),
30+
"t_step_save": int(Nt / 200),
31+
# Simulation Algorithm Parameters
32+
"num_patches": 2,
33+
"model_eqns": 2,
34+
"alt_soundspeed": "F",
35+
"num_fluids": 1,
36+
"mpp_lim": "F",
37+
"mixture_err": "F",
38+
"time_stepper": 3,
39+
"weno_order": 5,
40+
"weno_eps": 1.0e-16,
41+
"weno_Re_flux": "F",
42+
"weno_avg": "F",
43+
"mapped_weno": "F",
44+
"null_weights": "F",
45+
"mp_weno": "T",
46+
"riemann_solver": 2,
47+
"wave_speeds": 1,
48+
"avg_state": 2,
49+
"bc_x%beg": -3,
50+
"bc_x%end": -3,
51+
#'bc_y%beg' : -3,
52+
#'bc_y%end' : -3,
53+
# Turning on Hypoelasticity
54+
"hyperelasticity": "T",
55+
"hyper_model": 1,
56+
"fd_order": 4,
57+
# Formatted Database Files Structure Parameters
58+
"format": 1,
59+
"precision": 2,
60+
"prim_vars_wrt": "T",
61+
"parallel_io": "F",
62+
# Patch 1 L
63+
"patch_icpp(1)%geometry": 1,
64+
"patch_icpp(1)%x_centroid": 0.25,
65+
# 'patch_icpp(1)%y_centroid' : 0.001,
66+
"patch_icpp(1)%length_x": 0.5,
67+
# 'patch_icpp(1)%length_y' : 0.002,
68+
"patch_icpp(1)%vel(1)": 1000,
69+
# 'patch_icpp(1)%vel(2)' : 100*0,
70+
"patch_icpp(1)%pres": 1.0e5,
71+
"patch_icpp(1)%alpha_rho(1)": 1000,
72+
"patch_icpp(1)%alpha(1)": 1.0,
73+
"patch_icpp(1)%tau_e(1)": 0.0,
74+
# Patch 2 R
75+
"patch_icpp(2)%geometry": 1,
76+
"patch_icpp(2)%x_centroid": 0.75,
77+
# 'patch_icpp(2)%y_centroid' : 0.001,
78+
"patch_icpp(2)%length_x": 0.5,
79+
# 'patch_icpp(2)%length_y' : 0.002,
80+
"patch_icpp(2)%vel(1)": 1000,
81+
# 'patch_icpp(2)%vel(2)' : -100*0,
82+
"patch_icpp(2)%pres": 1.0e05,
83+
"patch_icpp(2)%alpha_rho(1)": 1000,
84+
"patch_icpp(2)%alpha(1)": 1.0,
85+
"patch_icpp(2)%tau_e(1)": 0.0,
86+
# Fluids Physical Parameters
87+
"fluid_pp(1)%gamma": 1.0e00 / (4.4e00 - 1.0e00),
88+
"fluid_pp(1)%pi_inf": 4.4e00 * 6.0e08 / (4.4e00 - 1.0e00),
89+
"fluid_pp(1)%G": 1e010,
90+
}
91+
)
92+
)

‎examples/1D_hyper_impact_weak/case.py‎

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
#!/usr/bin/env python3
2+
import math
3+
import json
4+
5+
# Numerical setup
6+
Nx = 201
7+
dx = 1.0 / (1.0 * (Nx + 1))
8+
9+
Tend = 64e-06
10+
Nt = 4000
11+
mydt = Tend / (1.0e00 * Nt)
12+
# print(mydt)
13+
# Configuring case dictionary
14+
print(
15+
json.dumps(
16+
{
17+
# Logistics
18+
"run_time_info": "T",
19+
# Computational Domain Parameters
20+
"x_domain%beg": 0.0e00,
21+
"x_domain%end": 1.0e00,
22+
"m": Nx,
23+
"n": 0,
24+
"p": 0,
25+
"dt": mydt,
26+
"t_step_start": 0,
27+
"t_step_stop": int(Nt),
28+
"t_step_save": int(Nt / 200),
29+
# Simulation Algorithm Parameters
30+
"num_patches": 2,
31+
"model_eqns": 3,
32+
"alt_soundspeed": "F",
33+
"num_fluids": 1,
34+
"mpp_lim": "F",
35+
"mixture_err": "F",
36+
"time_stepper": 3,
37+
"weno_order": 5,
38+
"weno_eps": 1.0e-16,
39+
"weno_Re_flux": "F",
40+
"weno_avg": "F",
41+
"mapped_weno": "F",
42+
"null_weights": "F",
43+
"mp_weno": "T",
44+
"riemann_solver": 2,
45+
"wave_speeds": 1,
46+
"avg_state": 2,
47+
"bc_x%beg": -3,
48+
"bc_x%end": -3,
49+
# Turning on Hyperelasticity
50+
"hyperelasticity": "T",
51+
"hyper_model": 1,
52+
"fd_order": 4,
53+
# Formatted Database Files Structure Parameters
54+
"format": 1,
55+
"precision": 2,
56+
"prim_vars_wrt": "T",
57+
"parallel_io": "F",
58+
# Patch 1 L
59+
"patch_icpp(1)%geometry": 1,
60+
"patch_icpp(1)%x_centroid": 0.25,
61+
"patch_icpp(1)%length_x": 0.5,
62+
"patch_icpp(1)%vel(1)": 10,
63+
"patch_icpp(1)%pres": 1.0e5,
64+
"patch_icpp(1)%alpha_rho(1)": 1000,
65+
"patch_icpp(1)%alpha(1)": 1.0,
66+
"patch_icpp(1)%tau_e(1)": 0.0,
67+
# Patch 2 R
68+
"patch_icpp(2)%geometry": 1,
69+
"patch_icpp(2)%x_centroid": 0.75,
70+
"patch_icpp(2)%length_x": 0.5,
71+
"patch_icpp(2)%vel(1)": -10, # 10,
72+
"patch_icpp(2)%pres": 1.0e05,
73+
"patch_icpp(2)%alpha_rho(1)": 1000,
74+
"patch_icpp(2)%alpha(1)": 1.0,
75+
"patch_icpp(2)%tau_e(1)": 0.0,
76+
# Fluids Physical Parameters
77+
"fluid_pp(1)%gamma": 1.0e00 / (4.4e00 - 1.0e00),
78+
"fluid_pp(1)%pi_inf": 4.4e00 * 6.0e08 / (4.4e00 - 1.0e00),
79+
"fluid_pp(1)%G": 1.0e00, # .E+010,
80+
}
81+
)
82+
)

‎examples/1D_hyper_impact_weak/original.py‎

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
#!/usr/bin/env python3
2+
import math
3+
import json
4+
5+
# Numerical setup
6+
Nx = 201
7+
dx = 1.0 / (1.0 * (Nx + 1))
8+
9+
Tend = 64e-06
10+
Nt = 4000
11+
mydt = Tend / (1.0e00 * Nt)
12+
# print(mydt)
13+
# Configuring case dictionary
14+
print(
15+
json.dumps(
16+
{
17+
# Logistics
18+
"run_time_info": "T",
19+
# Computational Domain Parameters
20+
"x_domain%beg": 0.0e00,
21+
"x_domain%end": 1.0e00,
22+
# 'y_domain%beg' : 0.E+00,
23+
# 'y_domain%end' : 0.002,
24+
"m": Nx,
25+
"n": 0,
26+
"p": 0,
27+
"dt": mydt,
28+
"t_step_start": 0,
29+
"t_step_stop": int(Nt),
30+
"t_step_save": int(Nt / 200),
31+
# Simulation Algorithm Parameters
32+
"num_patches": 2,
33+
"model_eqns": 3,
34+
"alt_soundspeed": "F",
35+
"num_fluids": 1,
36+
"mpp_lim": "F",
37+
"mixture_err": "F",
38+
"time_stepper": 3,
39+
"weno_order": 5,
40+
"weno_eps": 1.0e-16,
41+
"weno_Re_flux": "F",
42+
"weno_avg": "F",
43+
"mapped_weno": "F",
44+
"null_weights": "F",
45+
"mp_weno": "T",
46+
"riemann_solver": 2,
47+
"wave_speeds": 1,
48+
"avg_state": 2,
49+
"bc_x%beg": -3,
50+
"bc_x%end": -3,
51+
#'bc_y%beg' : -3,
52+
#'bc_y%end' : -3,
53+
# Turning on Hyperelasticity
54+
"hyperelasticity": "T",
55+
# Formatted Database Files Structure Parameters
56+
"format": 1,
57+
"precision": 2,
58+
"prim_vars_wrt": "T",
59+
"parallel_io": "F",
60+
# Patch 1 L
61+
"patch_icpp(1)%geometry": 1,
62+
"patch_icpp(1)%x_centroid": 0.25,
63+
# 'patch_icpp(1)%y_centroid' : 0.001,
64+
"patch_icpp(1)%length_x": 0.5,
65+
# 'patch_icpp(1)%length_y' : 0.002,
66+
"patch_icpp(1)%vel(1)": 10,
67+
# 'patch_icpp(1)%vel(2)' : 100*0,
68+
"patch_icpp(1)%pres": 1.0e5,
69+
"patch_icpp(1)%alpha_rho(1)": 1000,
70+
"patch_icpp(1)%alpha(1)": 1.0,
71+
"patch_icpp(1)%tau_e(1)": 0.0,
72+
# Patch 2 R
73+
"patch_icpp(2)%geometry": 1,
74+
"patch_icpp(2)%x_centroid": 0.75,
75+
# 'patch_icpp(2)%y_centroid' : 0.001,
76+
"patch_icpp(2)%length_x": 0.5,
77+
# 'patch_icpp(2)%length_y' : 0.002,
78+
"patch_icpp(2)%vel(1)": 10, # -10,
79+
# 'patch_icpp(2)%vel(2)' : -100*0,
80+
"patch_icpp(2)%pres": 1.0e05,
81+
"patch_icpp(2)%alpha_rho(1)": 1000,
82+
"patch_icpp(2)%alpha(1)": 1.0,
83+
"patch_icpp(2)%tau_e(1)": 0.0,
84+
# Fluids Physical Parameters
85+
"fluid_pp(1)%gamma": 1.0e00 / (4.4e00 - 1.0e00),
86+
"fluid_pp(1)%pi_inf": 4.4e00 * 6.0e08 / (4.4e00 - 1.0e00),
87+
"fluid_pp(1)%G": 1.0e00, # .E+010,
88+
}
89+
)
90+
)

‎examples/1D_hypo_impact_strong/case.py‎

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
#!/usr/bin/env python3
2+
import math
3+
import json
4+
5+
# Numerical setup
6+
Nx = 201
7+
dx = 1.0 / (1.0 * (Nx + 1))
8+
9+
Tend = 41e-06
10+
Nt = 4000
11+
mydt = Tend / (1.0 * Nt)
12+
13+
# Configuring case dictionary
14+
print(
15+
json.dumps(
16+
{
17+
# Logistics
18+
"run_time_info": "T",
19+
# Computational Domain Parameters
20+
"x_domain%beg": 0.0e00,
21+
"x_domain%end": 1.0e00,
22+
# 'y_domain%beg' : 0.E+00,
23+
# 'y_domain%end' : 0.002,
24+
"m": Nx,
25+
"n": 0,
26+
"p": 0,
27+
"dt": mydt,
28+
"t_step_start": 0,
29+
"t_step_stop": int(Nt),
30+
"t_step_save": int(Nt / 200),
31+
# Simulation Algorithm Parameters
32+
"num_patches": 2,
33+
"model_eqns": 2,
34+
"alt_soundspeed": "F",
35+
"num_fluids": 1,
36+
"mpp_lim": "F",
37+
"mixture_err": "F",
38+
"time_stepper": 3,
39+
"weno_order": 5,
40+
"weno_eps": 1.0e-16,
41+
"weno_Re_flux": "F",
42+
"weno_avg": "F",
43+
"mapped_weno": "F",
44+
"null_weights": "F",
45+
"mp_weno": "T",
46+
"riemann_solver": 2,
47+
"wave_speeds": 1,
48+
"avg_state": 2,
49+
"bc_x%beg": -3,
50+
"bc_x%end": -3,
51+
#'bc_y%beg' : -3,
52+
#'bc_y%end' : -3,
53+
# Turning on Hypoelasticity
54+
"hypoelasticity": "T",
55+
"fd_order": 4,
56+
# Formatted Database Files Structure Parameters
57+
"format": 1,
58+
"precision": 2,
59+
"prim_vars_wrt": "T",
60+
"parallel_io": "F",
61+
# Patch 1 L
62+
"patch_icpp(1)%geometry": 1,
63+
"patch_icpp(1)%x_centroid": 0.25,
64+
# 'patch_icpp(1)%y_centroid' : 0.001,
65+
"patch_icpp(1)%length_x": 0.5,
66+
# 'patch_icpp(1)%length_y' : 0.002,
67+
"patch_icpp(1)%vel(1)": 1000,
68+
# 'patch_icpp(1)%vel(2)' : 100*0,
69+
"patch_icpp(1)%pres": 1.0e5,
70+
"patch_icpp(1)%alpha_rho(1)": 1000,
71+
"patch_icpp(1)%alpha(1)": 1.0,
72+
"patch_icpp(1)%tau_e(1)": 0.0,
73+
# Patch 2 R
74+
"patch_icpp(2)%geometry": 1,
75+
"patch_icpp(2)%x_centroid": 0.75,
76+
# 'patch_icpp(2)%y_centroid' : 0.001,
77+
"patch_icpp(2)%length_x": 0.5,
78+
# 'patch_icpp(2)%length_y' : 0.002,
79+
"patch_icpp(2)%vel(1)": 1000,
80+
# 'patch_icpp(2)%vel(2)' : -100*0,
81+
"patch_icpp(2)%pres": 1.0e05,
82+
"patch_icpp(2)%alpha_rho(1)": 1000,
83+
"patch_icpp(2)%alpha(1)": 1.0,
84+
"patch_icpp(2)%tau_e(1)": 0.0,
85+
# Fluids Physical Parameters
86+
"fluid_pp(1)%gamma": 1.0e00 / (4.4e00 - 1.0e00),
87+
"fluid_pp(1)%pi_inf": 4.4e00 * 6.0e08 / (4.4e00 - 1.0e00),
88+
"fluid_pp(1)%G": 1e010,
89+
}
90+
)
91+
)

0 commit comments

Comments
 (0)