Skip to content

Commit 4f2f579

Browse files
committed
format
1 parent 78ff9c6 commit 4f2f579

File tree

3 files changed

+30
-29
lines changed

3 files changed

+30
-29
lines changed

examples/3D_IGR_33jet/case.py

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@
33
import json
44

55
# Domain parameters
6-
D = 2.5 # Jet diameter
6+
D = 2.5 # Jet diameter
77
Nd = 711 # Cells per jet diameter
88

9-
x0 = 0 # x_beg coordinate
10-
x1 = 19*D # x_end coordinate
11-
y0 = -22*D/2 # y_beg coordinate
12-
y1 = 22*D/2 # y_end coordinate
13-
z0 = -22*D/2 # y_beg coordinate
14-
z1 = 22*D/2 # y_end coordinate
15-
Nx = int(Nd*(x1 - x0)/D) - 1
16-
Ny = int(Nd*(y1 - y0)/D) - 1
17-
Nz = int(Nd*(z1 - z0)/D) - 1
9+
x0 = 0 # x_beg coordinate
10+
x1 = 19 * D # x_end coordinate
11+
y0 = -22 * D / 2 # y_beg coordinate
12+
y1 = 22 * D / 2 # y_end coordinate
13+
z0 = -22 * D / 2 # y_beg coordinate
14+
z1 = 22 * D / 2 # y_end coordinate
15+
Nx = int(Nd * (x1 - x0) / D) - 1
16+
Ny = int(Nd * (y1 - y0) / D) - 1
17+
Nz = int(Nd * (z1 - z0) / D) - 1
1818

1919
time_end = 5
2020
igrIters = 5
@@ -42,8 +42,8 @@
4242
"p": int(Nz),
4343
"dt": dt,
4444
"t_step_start": 0,
45-
"t_step_stop": 10, #Nt,
46-
"t_step_save": 10, #int(Nt/50),
45+
"t_step_stop": 10, # Nt,
46+
"t_step_save": 10, # int(Nt/50),
4747
# Simulation Algorithm Parameters
4848
"num_patches": 1,
4949
"num_bc_patches": 0,
@@ -74,12 +74,12 @@
7474
"down_sample": "T",
7575
# Patch
7676
"patch_icpp(1)%geometry": 9,
77-
"patch_icpp(1)%x_centroid": (x1 + x0)/2,
78-
"patch_icpp(1)%y_centroid": (y1 + y0)/2,
79-
"patch_icpp(1)%z_centroid": (z1 + z0)/2,
80-
"patch_icpp(1)%length_x": 2*(x1 - x0),
81-
"patch_icpp(1)%length_y": 2*(y1 - y0),
82-
"patch_icpp(1)%length_z": 2*(z1 - z0),
77+
"patch_icpp(1)%x_centroid": (x1 + x0) / 2,
78+
"patch_icpp(1)%y_centroid": (y1 + y0) / 2,
79+
"patch_icpp(1)%z_centroid": (z1 + z0) / 2,
80+
"patch_icpp(1)%length_x": 2 * (x1 - x0),
81+
"patch_icpp(1)%length_y": 2 * (y1 - y0),
82+
"patch_icpp(1)%length_z": 2 * (z1 - z0),
8383
"patch_icpp(1)%hcid": 303,
8484
"patch_icpp(1)%vel(1)": 0.0e00,
8585
"patch_icpp(1)%vel(2)": 0.0e00,
@@ -112,6 +112,7 @@
112112
"fluid_pp(1)%pi_inf": 0.0,
113113
"viscous": "T",
114114
"fluid_pp(1)%Re(1)": 5e5,
115-
}, indent=4
115+
},
116+
indent=4,
116117
)
117118
)

src/common/include/3dHardcodedIC.fpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -132,19 +132,19 @@
132132
rcut = f_cut_on(r - r_th, eps_smooth)
133133
xcut = f_cut_on(x_cc(i), eps_smooth)
134134

135-
q_prim_vf(momxb)%sf(i, j, k) = ux_th * rcut * xcut + ux_am
135+
q_prim_vf(momxb)%sf(i, j, k) = ux_th*rcut*xcut + ux_am
136136
q_prim_vf(momxb + 1)%sf(i, j, k) = 0._wp
137137
q_prim_vf(momxe)%sf(i, j, k) = 0._wp
138138

139139
if (num_fluids == 1) then
140-
q_prim_vf(contxb)%sf(i, j, k) = (rho_th - rho_am) * rcut * xcut + rho_am
140+
q_prim_vf(contxb)%sf(i, j, k) = (rho_th - rho_am)*rcut*xcut + rho_am
141141
else
142-
q_prim_vf(advxb)%sf(i, j, k) = (1._wp - 2._wp*eps) * rcut * xcut + eps
142+
q_prim_vf(advxb)%sf(i, j, k) = (1._wp - 2._wp*eps)*rcut*xcut + eps
143143
q_prim_vf(contxb)%sf(i, j, k) = rho_th*q_prim_vf(advxb)%sf(i, j, k)
144144
q_prim_vf(contxe)%sf(i, j, k) = rho_am*(1._wp - q_prim_vf(advxb)%sf(i, j, k))
145145
end if
146146

147-
q_prim_vf(E_idx)%sf(i, j, k) = p_th * rcut * xcut + p_am
147+
q_prim_vf(E_idx)%sf(i, j, k) = p_th*rcut*xcut + p_am
148148

149149
case (303) ! 3D Multijet
150150

@@ -160,19 +160,19 @@
160160
rcut = rcut_arr(j, k)
161161
xcut = f_cut_on(x_cc(i), eps_smooth)
162162

163-
q_prim_vf(momxb)%sf(i, j, k) = ux_th * rcut * xcut + ux_am
163+
q_prim_vf(momxb)%sf(i, j, k) = ux_th*rcut*xcut + ux_am
164164
q_prim_vf(momxb + 1)%sf(i, j, k) = 0._wp
165165
q_prim_vf(momxe)%sf(i, j, k) = 0._wp
166166

167167
if (num_fluids == 1) then
168-
q_prim_vf(contxb)%sf(i, j, k) = (rho_th - rho_am) * rcut * xcut + rho_am
168+
q_prim_vf(contxb)%sf(i, j, k) = (rho_th - rho_am)*rcut*xcut + rho_am
169169
else
170-
q_prim_vf(advxb)%sf(i, j, k) = (1._wp - 2._wp*eps) * rcut * xcut + eps
170+
q_prim_vf(advxb)%sf(i, j, k) = (1._wp - 2._wp*eps)*rcut*xcut + eps
171171
q_prim_vf(contxb)%sf(i, j, k) = rho_th*q_prim_vf(advxb)%sf(i, j, k)
172172
q_prim_vf(contxe)%sf(i, j, k) = rho_am*(1._wp - q_prim_vf(advxb)%sf(i, j, k))
173173
end if
174174

175-
q_prim_vf(E_idx)%sf(i, j, k) = p_th * rcut * xcut + p_am
175+
q_prim_vf(E_idx)%sf(i, j, k) = p_th*rcut*xcut + p_am
176176

177177
case (370)
178178
! This hardcoded case extrudes a 2D profile to initialize a 3D simulation domain

src/simulation/m_ibm.fpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -912,9 +912,9 @@ contains
912912
do q = 1, nb
913913
do l = 1, nnode
914914
presb_IP((q - 1)*nnode + l) = presb_IP((q - 1)*nnode + l) + &
915-
coeff*real(pb_in(i, j, k, l, q), kind=wp)
915+
coeff*real(pb_in(i, j, k, l, q), kind=wp)
916916
massv_IP((q - 1)*nnode + l) = massv_IP((q - 1)*nnode + l) + &
917-
coeff*real(mv_in(i, j, k, l, q), kind=wp)
917+
coeff*real(mv_in(i, j, k, l, q), kind=wp)
918918
end do
919919
end do
920920
end if

0 commit comments

Comments
 (0)