Skip to content

Commit 30fab57

Browse files
sbryngelsonsbryngelson
committed
fix missing precision, satiate linter
1 parent 4bc191d commit 30fab57

File tree

2 files changed

+41
-41
lines changed

2 files changed

+41
-41
lines changed

‎src/pre_process/include/2dHardcodedIC.fpp

+24-24
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
end if
2626
case (202) ! Gresho vortex (Gouasmi et al 2022 JCP)
2727
r = ((x_cc(i) - 0.5_wp)**2 + (y_cc(j) - 0.5_wp)**2)**0.5_wp
28-
rmax = 0.2
28+
rmax = 0.2_wp
2929

3030
gam = 1._wp + 1._wp/fluid_pp(1)%gamma
3131
umax = 2*pi*rmax*patch_icpp(patch_id)%vel(2)
@@ -42,11 +42,11 @@
4242
else
4343
q_prim_vf(momxb)%sf(i, j, 0) = 0._wp
4444
q_prim_vf(momxe)%sf(i, j, 0) = 0._wp
45-
q_prim_vf(E_idx)%sf(i, j, 0) = p0 + umax**2*(-2 + 4*log(2.))
45+
q_prim_vf(E_idx)%sf(i, j, 0) = p0 + umax**2*(-2 + 4*log(2._wp))
4646
end if
4747
case (203) ! Gresho vortex (Gouasmi et al 2022 JCP) with density correction
48-
r = ((x_cc(i) - 0.5_wp)**2 + (y_cc(j) - 0.5_wp)**2)**0.5_wp
49-
rmax = 0.2
48+
r = ((x_cc(i) - 0.5_wp)**2._wp + (y_cc(j) - 0.5_wp)**2)**0.5_wp
49+
rmax = 0.2_wp
5050

5151
gam = 1._wp + 1._wp/fluid_pp(1)%gamma
5252
umax = 2*pi*rmax*patch_icpp(patch_id)%vel(2)
@@ -55,49 +55,49 @@
5555
if (r < rmax) then
5656
q_prim_vf(momxb)%sf(i, j, 0) = -(y_cc(j) - 0.5_wp)*umax/rmax
5757
q_prim_vf(momxe)%sf(i, j, 0) = (x_cc(i) - 0.5_wp)*umax/rmax
58-
q_prim_vf(E_idx)%sf(i, j, 0) = p0 + umax**2*((r/rmax)**2/2._wp)
58+
q_prim_vf(E_idx)%sf(i, j, 0) = p0 + umax**2*((r/rmax)**2._wp/2._wp)
5959
else if (r < 2*rmax) then
6060
q_prim_vf(momxb)%sf(i, j, 0) = -((y_cc(j) - 0.5_wp)/r)*umax*(2._wp - r/rmax)
6161
q_prim_vf(momxe)%sf(i, j, 0) = ((x_cc(i) - 0.5_wp)/r)*umax*(2._wp - r/rmax)
62-
q_prim_vf(E_idx)%sf(i, j, 0) = p0 + umax**2*((r/rmax)**2/2._wp + 4*(1 - (r/rmax) + log(r/rmax)))
62+
q_prim_vf(E_idx)%sf(i, j, 0) = p0 + umax**2*((r/rmax)**2/2._wp + 4._wp*(1._wp - (r/rmax) + log(r/rmax)))
6363
else
6464
q_prim_vf(momxb)%sf(i, j, 0) = 0._wp
6565
q_prim_vf(momxe)%sf(i, j, 0) = 0._wp
66-
q_prim_vf(E_idx)%sf(i, j, 0) = p0 + umax**2*(-2 + 4*log(2.))
66+
q_prim_vf(E_idx)%sf(i, j, 0) = p0 + umax**2._wp*(-2._wp + 4*log(2._wp))
6767
end if
6868

6969
q_prim_vf(contxb)%sf(i, j, 0) = q_prim_vf(E_idx)%sf(i, j, 0)**(1._wp/gam)
7070

7171
case (204) ! Rayleigh-Taylor instability
72-
rhoH = 3
73-
rhoL = 1
74-
pRef = 1e5_wp
72+
rhoH = 3._wp
73+
rhoL = 1._wp
74+
pRef = 1.e5_wp
7575
pInt = pRef
76-
h = 0.7
77-
lam = 0.2
78-
wl = 2*pi/lam
79-
amp = 0.05/wl
76+
h = 0.7_wp
77+
lam = 0.2_wp
78+
wl = 2._wp*pi/lam
79+
amp = 0.05_wp/wl
8080

81-
intH = amp*sin(2*pi*x_cc(i)/lam - pi/2) + h
81+
intH = amp*sin(2._wp*pi*x_cc(i)/lam - pi/2._wp) + h
8282

83-
alph = 5e-1_wp*(1 + tanh((y_cc(j) - intH)/2.5e-3_wp))
83+
alph = 0.5_wp*(1._wp + tanh((y_cc(j) - intH)/2.5e-3_wp))
8484

8585
if (alph < eps) alph = eps
86-
if (alph > 1 - eps) alph = 1 - eps
86+
if (alph > 1._wp - eps) alph = 1._wp - eps
8787

8888
if (y_cc(j) > intH) then
8989
q_prim_vf(advxb)%sf(i, j, 0) = alph
90-
q_prim_vf(advxe)%sf(i, j, 0) = 1 - alph
90+
q_prim_vf(advxe)%sf(i, j, 0) = 1._wp - alph
9191
q_prim_vf(contxb)%sf(i, j, 0) = alph*rhoH
92-
q_prim_vf(contxe)%sf(i, j, 0) = (1 - alph)*rhoL
93-
q_prim_vf(E_idx)%sf(i, j, 0) = pref + rhoH*9.81*(1.2 - y_cc(j))
92+
q_prim_vf(contxe)%sf(i, j, 0) = (1._wp - alph)*rhoL
93+
q_prim_vf(E_idx)%sf(i, j, 0) = pref + rhoH*9.81_wp*(1.2_wp - y_cc(j))
9494
else
9595
q_prim_vf(advxb)%sf(i, j, 0) = alph
96-
q_prim_vf(advxe)%sf(i, j, 0) = 1 - alph
96+
q_prim_vf(advxe)%sf(i, j, 0) = 1._wp - alph
9797
q_prim_vf(contxb)%sf(i, j, 0) = alph*rhoH
98-
q_prim_vf(contxe)%sf(i, j, 0) = (1 - alph)*rhoL
99-
pInt = pref + rhoH*9.81*(1.2 - intH)
100-
q_prim_vf(E_idx)%sf(i, j, 0) = pInt + rhoL*9.81*(intH - y_cc(j))
98+
q_prim_vf(contxe)%sf(i, j, 0) = (1._wp - alph)*rhoL
99+
pInt = pref + rhoH*9.81_wp*(1.2_wp - intH)
100+
q_prim_vf(E_idx)%sf(i, j, 0) = pInt + rhoL*9.81_wp*(intH - y_cc(j))
101101
end if
102102

103103
case default

‎src/pre_process/include/3dHardcodedIC.fpp

+17-17
Original file line numberDiff line numberDiff line change
@@ -12,35 +12,35 @@
1212

1313
select case (patch_icpp(patch_id)%hcid)
1414
case (300) ! Rayleigh-Taylor instability
15-
rhoH = 3
16-
rhoL = 1
17-
pRef = 1e5_wp
15+
rhoH = 3._wp
16+
rhoL = 1._wp
17+
pRef = 1.e5_wp
1818
pInt = pRef
19-
h = 0.7
20-
lam = 0.2
21-
wl = 2*pi/lam
22-
amp = 0.025/wl
19+
h = 0.7_wp
20+
lam = 0.2_wp
21+
wl = 2._wp*pi/lam
22+
amp = 0.025_wp/wl
2323

24-
intH = amp*(sin(2*pi*x_cc(i)/lam - pi/2) + sin(2*pi*z_cc(k)/lam - pi/2)) + h
24+
intH = amp*(sin(2._wp*pi*x_cc(i)/lam - pi/2._wp) + sin(2._wp*pi*z_cc(k)/lam - pi/2._wp)) + h
2525

26-
alph = 5e-1_wp*(1 + tanh((y_cc(j) - intH)/2.5e-3_wp))
26+
alph = 5e-1_wp*(1._wp + tanh((y_cc(j) - intH)/2.5e-3_wp))
2727

2828
if (alph < eps) alph = eps
29-
if (alph > 1 - eps) alph = 1 - eps
29+
if (alph > 1._wp - eps) alph = 1._wp - eps
3030

3131
if (y_cc(j) > intH) then
3232
q_prim_vf(advxb)%sf(i, j, k) = alph
33-
q_prim_vf(advxe)%sf(i, j, k) = 1 - alph
33+
q_prim_vf(advxe)%sf(i, j, k) = 1._wp - alph
3434
q_prim_vf(contxb)%sf(i, j, k) = alph*rhoH
35-
q_prim_vf(contxe)%sf(i, j, k) = (1 - alph)*rhoL
36-
q_prim_vf(E_idx)%sf(i, j, k) = pref + rhoH*9.81*(1.2 - y_cc(j))
35+
q_prim_vf(contxe)%sf(i, j, k) = (1._wp - alph)*rhoL
36+
q_prim_vf(E_idx)%sf(i, j, k) = pref + rhoH*9.81_wp*(1.2_wp - y_cc(j))
3737
else
3838
q_prim_vf(advxb)%sf(i, j, k) = alph
39-
q_prim_vf(advxe)%sf(i, j, k) = 1 - alph
39+
q_prim_vf(advxe)%sf(i, j, k) = 1._wp- alph
4040
q_prim_vf(contxb)%sf(i, j, k) = alph*rhoH
41-
q_prim_vf(contxe)%sf(i, j, k) = (1 - alph)*rhoL
42-
pInt = pref + rhoH*9.81*(1.2 - intH)
43-
q_prim_vf(E_idx)%sf(i, j, k) = pInt + rhoL*9.81*(intH - y_cc(j))
41+
q_prim_vf(contxe)%sf(i, j, k) = (1._wp - alph)*rhoL
42+
pInt = pref + rhoH*9.81_wp*(1.2_wp - intH)
43+
q_prim_vf(E_idx)%sf(i, j, k) = pInt + rhoL*9.81_wp*(intH - y_cc(j))
4444
end if
4545

4646
! Put your variable assignments here

0 commit comments

Comments
 (0)