Skip to content

Commit 18f6d38

Browse files
AnandAnand
authored andcommitted
format
1 parent 92555a8 commit 18f6d38

6 files changed

Lines changed: 24 additions & 20 deletions

File tree

docs/documentation/case.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -637,6 +637,7 @@ To restart the simulation from $k$-th time step, see @ref running "Restarting Ca
637637
| `cf_wrt` | Logical | Write color function field |
638638
| `chem_wrt_T` | Logical | Write temperature field for chemistry output |
639639
| `fft_wrt` | Logical | Enable FFT output |
640+
| `double_mach` | Logical | Enable Double Mach Reflection case |
640641
| `sim_data` | Logical | Write interface and energy data files (post_process) |
641642
| `integral_wrt` | Logical | Write integral data |
642643
| `num_integrals` | Integer | Number of integral regions |

src/common/include/2dHardcodedIC.fpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,8 @@
374374

375375
q_prim_vf(contxb)%sf(i, j, 0) = 0.5_wp*(1._wp + tanh(cf*sb))*rhoshock + 0.5_wp*(1._wp - tanh(cf*sb))*rho0_dm
376376
q_prim_vf(E_idx)%sf(i, j, 0) = 0.5_wp*(1._wp + tanh(cf*sb))*pshock + 0.5_wp*(1._wp - tanh(cf*sb))*p0_dm
377-
q_prim_vf(momxb)%sf(i, j, 0) = 0.5_wp*(1._wp + tanh(cf*sb))*(velshock*tan(theta_dm)) + 0.5_wp*(1._wp - tanh(cf*sb))*u0_dm
377+
q_prim_vf(momxb)%sf(i, j, &
378+
& 0) = 0.5_wp*(1._wp + tanh(cf*sb))*(velshock*tan(theta_dm)) + 0.5_wp*(1._wp - tanh(cf*sb))*u0_dm
378379
q_prim_vf(momxb + 1)%sf(i, j, 0) = 0.5_wp*(1._wp + tanh(cf*sb))*(-velshock) + 0.5_wp*(1._wp - tanh(cf*sb))*v0_dm
379380
end if
380381
case default

src/common/m_boundary_common.fpp

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -70,27 +70,27 @@ contains
7070

7171
if (double_mach) then
7272
! Smoothing parameter
73-
cf = 20._wp
73+
cf = 20._wp
7474
! Mach number
75-
Mach = 10._wp
75+
Mach = 10._wp
7676

77-
!Pre shock
78-
rho0_dm = 1.4_wp
77+
! Pre shock
78+
rho0_dm = 1.4_wp
7979
p0_dm = 1._wp
8080
u0_dm = 0._wp
8181
v0_dm = 0._wp
8282

83-
gam_dm = 1._wp + 1._wp / fluid_pp(1)%gamma
83+
gam_dm = 1._wp + 1._wp/fluid_pp(1)%gamma
8484

85-
!Post shock
85+
! Post shock
8686
pshock = (2._wp*gam_dm*Mach**2 - (gam_dm - 1._wp))/(1._wp + gam_dm)
8787
rhoshock = ((1._wp + gam_dm)*Mach**2)*rho0_dm/((gam_dm - 1._wp)*Mach**2 + 2._wp)
88-
velshock = (Mach - (Mach*rho0_dm/rhoshock))/2._wp
88+
velshock = (Mach - (Mach*rho0_dm/rhoshock))/2._wp
8989

9090
! Reflecting wall location
91-
xr_dm = 1._wp/6._wp
91+
xr_dm = 1._wp/6._wp
9292
! Shock Angle in radian
93-
theta_dm = (pi/180_wp)*60_wp
93+
theta_dm = (pi/180._wp)*60._wp
9494

9595
$:GPU_UPDATE(device='[double_mach, Mach, pshock, rhoshock, velshock, rho0_dm, p0_dm, u0_dm, v0_dm, xr_dm, theta_dm, gam_dm]')
9696
end if
@@ -483,8 +483,9 @@ contains
483483
if (igr) then
484484
q_prim_vf(momxb)%sf(k, -j, l) = q_prim_vf(contxb)%sf(k, -j, l)*q_prim_vf(momxb)%sf(k, -j, l)
485485
q_prim_vf(momxb + 1)%sf(k, -j, l) = q_prim_vf(contxb)%sf(k, -j, l)*q_prim_vf(momxb + 1)%sf(k, -j, l)
486-
q_prim_vf(E_idx)%sf(k, -j, l) = (gam_dm + 1._wp)*q_prim_vf(E_idx)%sf(k, -j, l) + 0.5_wp*(q_prim_vf(momxb)%sf(k, &
487-
& -j, l)**2 + q_prim_vf(momxb + 1)%sf(k, -j, l)**2)/q_prim_vf(contxb)%sf(k, -j, l)
486+
q_prim_vf(E_idx)%sf(k, -j, l) = (gam_dm + 1._wp)*q_prim_vf(E_idx)%sf(k, -j, &
487+
& l) + 0.5_wp*(q_prim_vf(momxb)%sf(k, -j, l)**2 + q_prim_vf(momxb + 1)%sf(k, -j, &
488+
& l)**2)/q_prim_vf(contxb)%sf(k, -j, l)
488489
end if
489490
#endif
490491
if (.not. igr) then

src/post_process/m_global_parameters.fpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -504,9 +504,9 @@ contains
504504
rhoshock = dflt_real
505505
pshock = dflt_real
506506
velshock = dflt_real
507-
u0_dm = dflt_real
507+
u0_dm = dflt_real
508508
v0_dm = dflt_real
509-
p0_dm = dflt_real
509+
p0_dm = dflt_real
510510
rho0_dm = dflt_real
511511
theta_dm = dflt_real
512512
gam_dm = dflt_real

src/pre_process/m_global_parameters.fpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -543,16 +543,16 @@ contains
543543
bub_pp%cp_g = dflt_real; cp_g = dflt_real
544544
bub_pp%R_v = dflt_real; R_v = dflt_real
545545
bub_pp%R_g = dflt_real; R_g = dflt_real
546-
546+
547547
double_mach = .false.
548548
xshock = dflt_real
549549
cf = dflt_real
550550
rhoshock = dflt_real
551551
pshock = dflt_real
552552
velshock = dflt_real
553-
u0_dm = dflt_real
553+
u0_dm = dflt_real
554554
v0_dm = dflt_real
555-
p0_dm = dflt_real
555+
p0_dm = dflt_real
556556
rho0_dm = dflt_real
557557
theta_dm = dflt_real
558558
gam_dm = dflt_real

src/simulation/m_global_parameters.fpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,8 @@ module m_global_parameters
498498
!> @name Double Mach parameters
499499
logical :: double_mach
500500
real(wp) :: xshock, cf, Mach, pshock, rhoshock, velshock, rho0_dm, p0_dm, u0_dm, v0_dm, xr_dm, theta_dm, gam_dm
501-
$:GPU_DECLARE(create='[double_mach, xshock, cf, Mach, pshock, rhoshock, velshock, rho0_dm, p0_dm, u0_dm, v0_dm, xr_dm, theta_dm, gam_dm]')
501+
$:GPU_DECLARE(create='[double_mach, xshock, cf, Mach, pshock, rhoshock, velshock, rho0_dm, p0_dm, u0_dm, v0_dm, xr_dm, &
502+
& theta_dm, gam_dm]')
502503
503504
contains
504505
@@ -805,9 +806,9 @@ contains
805806
rhoshock = dflt_real
806807
pshock = dflt_real
807808
velshock = dflt_real
808-
u0_dm = dflt_real
809+
u0_dm = dflt_real
809810
v0_dm = dflt_real
810-
p0_dm = dflt_real
811+
p0_dm = dflt_real
811812
rho0_dm = dflt_real
812813
theta_dm = dflt_real
813814
xr_dm = dflt_real

0 commit comments

Comments
 (0)