Skip to content

Commit 5d8c07c

Browse files
sbryngelsonsbryngelson
authored
Remove junk comments and code + check in CI (#777)
1 parent 97296ad commit 5d8c07c

File tree

125 files changed

+9330
-10421
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

125 files changed

+9330
-10421
lines changed

‎.github/workflows/formatting.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on: [push, pull_request, workflow_dispatch]
44

55
jobs:
66
docs:
7-
name: Code formatting
7+
name: Formatting
88
runs-on: ubuntu-latest
99

1010
steps:

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,10 @@ jobs:
3838
run: |
3939
! grep -iR 'double_precision\|dsqrt\|dexp\|dlog\|dble\|dabs\|double\ precision\|real(8)\|real(4)\|dprod\|dmin\|dmax\|dfloat\|dreal\|dcos\|dsin\|dtan\|dsign\|dtanh\|dsinh\|dcosh\|d0' --exclude-dir=syscheck --exclude="*nvtx*" --exclude="*precision_select*" ./src/*
4040
41+
- name: Looking for junk code
42+
run: |
43+
! grep -iR -e '\.\.\.' -e '\-\-\-' -e '===' ./src/*
44+
45+
- name: Looking for junk comments in examples
46+
run: |
47+
! grep -R '# ===' ./examples/**/*.py

‎examples/0D_bubblecollapse_adap/case.py‎

Lines changed: 117 additions & 139 deletions
Original file line numberDiff line numberDiff line change
@@ -1,163 +1,141 @@
11
#!/usr/bin/env python2
2-
32
import math
43
import json
54

65
# FLUID PROPERTIES ============================================================
76
# Water
8-
n_tait = 7.1
9-
B_tait = 306.E+06
10-
rho0 = 1.E+03
11-
mul0 = 1.002E-03
12-
ss = 0.07275
13-
pv = 2.3388E+03
7+
n_tait = 7.1
8+
B_tait = 306.0e06
9+
rho0 = 1.0e03
10+
mul0 = 1.002e-03
11+
ss = 0.07275
12+
pv = 2.3388e03
1413

1514
# Vapor
1615
gamma_v = 1.33
17-
M_v = 18.02
18-
mu_v = 0.8816E-05
19-
k_v = 0.019426
16+
M_v = 18.02
17+
mu_v = 0.8816e-05
18+
k_v = 0.019426
2019

2120
# Air
2221
gamma_n = 1.4
23-
M_n = 28.97
24-
mu_n = 1.8E-05
25-
k_n = 0.02556
22+
M_n = 28.97
23+
mu_n = 1.8e-05
24+
k_n = 0.02556
2625

2726
# REFERENCE VALUES ============================================================
28-
R0ref = 50.E-06
29-
x0 = R0ref
30-
p0 = 8236. # for Ca = 1 in mixing layer scale
31-
u0 = math.sqrt( p0/rho0 )
32-
patm = 1.
33-
cact = math.sqrt(n_tait*(p0+B_tait)/rho0)
27+
R0ref = 50.0e-06
28+
x0 = R0ref
29+
p0 = 8236.0 # for Ca = 1 in mixing layer scale
30+
u0 = math.sqrt(p0 / rho0)
31+
patm = 1.0
32+
cact = math.sqrt(n_tait * (p0 + B_tait) / rho0)
3433

3534
# NONDIMENSIONAL NUMBERS ======================================================
36-
Ca = (p0 - pv)/(rho0*(u0**2.)) # Cavitation number
37-
We = rho0*(u0**2.)*R0ref/ss # Weber number
38-
Re_inv = mul0/(rho0*u0*R0ref) # Inv. bubble Reynolds number
35+
Ca = (p0 - pv) / (rho0 * (u0**2.0)) # Cavitation number
36+
We = rho0 * (u0**2.0) * R0ref / ss # Weber number
37+
Re_inv = mul0 / (rho0 * u0 * R0ref) # Inv. bubble Reynolds number
3938

4039
# BUBBLES =====================================================================
41-
vf0 = 1e-5
42-
nb = 1
40+
vf0 = 1e-5
41+
nb = 1
4342

4443
# DOMAIN ======================================================================
45-
Nx = 30
46-
Ldomain = 20.E-03
47-
L = Ldomain/x0
48-
dx = L/float(Nx+1)
44+
Nx = 30
45+
Ldomain = 20.0e-03
46+
L = Ldomain / x0
47+
dx = L / float(Nx + 1)
4948

5049
# TIME STEPS ==================================================================
51-
Tfinal = 0.05
52-
Nt = int(5e2+1)
53-
t_save = 1
54-
dt = Tfinal/(Nt-1)
50+
Tfinal = 0.05
51+
Nt = int(5e2 + 1)
52+
t_save = 1
53+
dt = Tfinal / (Nt - 1)
5554

5655
# Configuring case dictionary
57-
print(json.dumps({
58-
# Logistics ================================================
59-
'run_time_info' : 'T',
60-
# ==========================================================
61-
62-
# Computational Domain Parameters ==========================
63-
'x_domain%beg' : -0.5*L,
64-
'x_domain%end' : 0.5*L,
65-
'stretch_x' : 'F',
66-
'cyl_coord' : 'F',
67-
'm' : Nx,
68-
'n' : 0,
69-
'p' : 0,
70-
'dt' : dt,
71-
't_step_start' : 0,
72-
't_step_stop' : Nt,
73-
't_step_save' : t_save,
74-
# ==========================================================
75-
76-
# Simulation Algorithm Parameters ==========================
77-
'num_patches' : 1,
78-
'model_eqns' : 2,
79-
'alt_soundspeed' : 'F',
80-
'num_fluids' : 1,
81-
'mpp_lim' : 'F',
82-
'mixture_err' : 'F',
83-
'time_stepper' : 3,
84-
'weno_order' : 5,
85-
'weno_eps' : 1.E-16,
86-
'mapped_weno' : 'T',
87-
'null_weights' : 'F',
88-
'mp_weno' : 'T',
89-
'riemann_solver' : 2,
90-
'wave_speeds' : 1,
91-
'avg_state' : 2,
92-
'bc_x%beg' : -1,
93-
'bc_x%end' : -1,
94-
# ==========================================================
95-
96-
# Formatted Database Files Structure Parameters ============
97-
'format' : 1,
98-
'precision' : 2,
99-
'prim_vars_wrt' :'T',
100-
'parallel_io' :'T',
101-
'fd_order' : 1,
102-
# ==========================================================
103-
104-
# Patch 1 _ Background =====================================
105-
'patch_icpp(1)%geometry' : 1,
106-
'patch_icpp(1)%x_centroid' : 0.,
107-
'patch_icpp(1)%length_x' : L,
108-
'patch_icpp(1)%vel(1)' : 0.,
109-
'patch_icpp(1)%pres' : 1000.,
110-
'patch_icpp(1)%alpha_rho(1)' : (1.-vf0),
111-
'patch_icpp(1)%alpha(1)' : vf0,
112-
'patch_icpp(1)%r0' : 1.,
113-
'patch_icpp(1)%v0' : 0.,
114-
# ==========================================================
115-
116-
# Non-polytropic gas compression model AND/OR Tait EOS =====
117-
'pref' : p0,
118-
'rhoref' : rho0,
119-
# ==========================================================
120-
121-
# Bubbles ==================================================
122-
'bubbles_euler' : 'T',
123-
'bubble_model' : 2,
124-
125-
# Nondimensional numbers
126-
'Ca' : Ca,
127-
'Web' : We,
128-
'Re_inv' : Re_inv,
129-
130-
# adv_n
131-
'adv_n' : 'T',
132-
133-
# adap_dt
134-
'adap_dt' : 'T',
135-
136-
# Gas compression model
137-
'polytropic' : 'T',
138-
'thermal' : 1,
139-
140-
# Polydispersity
141-
'polydisperse' : 'F',
142-
'nb' : nb,
143-
144-
# QBMM
145-
'qbmm' : 'F',
146-
# ==========================================================
147-
148-
# Fluids Physical Parameters ===============================
149-
# Surrounding liquid
150-
'fluid_pp(1)%gamma' : 1.E+00/(n_tait-1.E+00),
151-
'fluid_pp(1)%pi_inf' : n_tait*(B_tait/p0)/(n_tait-1.),
152-
'fluid_pp(1)%ss' : ss,
153-
'fluid_pp(1)%pv' : pv,
154-
155-
# Last fluid_pp is always reserved for bubble gas state ===
156-
# if applicable ==========================================
157-
'fluid_pp(2)%gamma' : 1./(gamma_n-1.),
158-
'fluid_pp(2)%pi_inf' : 0.0E+00,
159-
# ==========================================================
160-
161-
}))
162-
163-
# ==============================================================================
56+
print(
57+
json.dumps(
58+
{
59+
# Logistics ================================================
60+
"run_time_info": "T",
61+
# Computational Domain Parameters ==========================
62+
"x_domain%beg": -0.5 * L,
63+
"x_domain%end": 0.5 * L,
64+
"stretch_x": "F",
65+
"cyl_coord": "F",
66+
"m": Nx,
67+
"n": 0,
68+
"p": 0,
69+
"dt": dt,
70+
"t_step_start": 0,
71+
"t_step_stop": Nt,
72+
"t_step_save": t_save,
73+
# Simulation Algorithm Parameters ==========================
74+
"num_patches": 1,
75+
"model_eqns": 2,
76+
"alt_soundspeed": "F",
77+
"num_fluids": 1,
78+
"mpp_lim": "F",
79+
"mixture_err": "F",
80+
"time_stepper": 3,
81+
"weno_order": 5,
82+
"weno_eps": 1.0e-16,
83+
"mapped_weno": "T",
84+
"null_weights": "F",
85+
"mp_weno": "T",
86+
"riemann_solver": 2,
87+
"wave_speeds": 1,
88+
"avg_state": 2,
89+
"bc_x%beg": -1,
90+
"bc_x%end": -1,
91+
# Formatted Database Files Structure Parameters ============
92+
"format": 1,
93+
"precision": 2,
94+
"prim_vars_wrt": "T",
95+
"parallel_io": "T",
96+
"fd_order": 1,
97+
# Patch 1 _ Background =====================================
98+
"patch_icpp(1)%geometry": 1,
99+
"patch_icpp(1)%x_centroid": 0.0,
100+
"patch_icpp(1)%length_x": L,
101+
"patch_icpp(1)%vel(1)": 0.0,
102+
"patch_icpp(1)%pres": 1000.0,
103+
"patch_icpp(1)%alpha_rho(1)": (1.0 - vf0),
104+
"patch_icpp(1)%alpha(1)": vf0,
105+
"patch_icpp(1)%r0": 1.0,
106+
"patch_icpp(1)%v0": 0.0,
107+
# Non-polytropic gas compression model AND/OR Tait EOS =====
108+
"pref": p0,
109+
"rhoref": rho0,
110+
# Bubbles ==================================================
111+
"bubbles_euler": "T",
112+
"bubble_model": 2,
113+
# Nondimensional numbers
114+
"Ca": Ca,
115+
"Web": We,
116+
"Re_inv": Re_inv,
117+
# adv_n
118+
"adv_n": "T",
119+
# adap_dt
120+
"adap_dt": "T",
121+
# Gas compression model
122+
"polytropic": "T",
123+
"thermal": 1,
124+
# Polydispersity
125+
"polydisperse": "F",
126+
"nb": nb,
127+
# QBMM
128+
"qbmm": "F",
129+
# Fluids Physical Parameters ===============================
130+
# Surrounding liquid
131+
"fluid_pp(1)%gamma": 1.0e00 / (n_tait - 1.0e00),
132+
"fluid_pp(1)%pi_inf": n_tait * (B_tait / p0) / (n_tait - 1.0),
133+
"fluid_pp(1)%ss": ss,
134+
"fluid_pp(1)%pv": pv,
135+
# Last fluid_pp is always reserved for bubble gas state ===
136+
# if applicable ==========================================
137+
"fluid_pp(2)%gamma": 1.0 / (gamma_n - 1.0),
138+
"fluid_pp(2)%pi_inf": 0.0e00,
139+
}
140+
)
141+
)

0 commit comments

Comments
 (0)