Skip to content

Commit 64ed3ab

Browse files
sbryngelsonsbryngelson
committed
style: apply ffmt v0.4.0 formatting
1 parent 46fee45 commit 64ed3ab

5 files changed

Lines changed: 23 additions & 26 deletions

File tree

‎src/common/include/case.fpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@
44

55
! For pre-process.
66
#:def analytical()
7-
87
#:enddef
98

109
! For moving immersed boundaries in simulation
1110
#:def mib_analytical()
12-
1311
#:enddef

‎src/simulation/m_ib_patches.fpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -390,8 +390,8 @@ contains
390390
do l = ll, lr
391391
do j = jl, jr
392392
do i = il, ir
393-
xyz_local = [x_cc(i) - center(1), y_cc(j) - center(2), &
394-
& z_cc(l) - center(3)] ! get coordinate frame centered on IB
393+
! get coordinate frame centered on IB
394+
xyz_local = [x_cc(i) - center(1), y_cc(j) - center(2), z_cc(l) - center(3)]
395395
xyz_local = matmul(inverse_rotation, xyz_local) ! rotate the frame into the IB's coordinates
396396
xyz_local = xyz_local - offset ! airfoils are a patch that require a centroid offset
397397

‎src/simulation/m_rhs.fpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -517,9 +517,8 @@ contains
517517
type(scalar_field), dimension(sys_size), intent(inout) :: rhs_vf
518518
real(stp), dimension(idwbuff(1)%beg:,idwbuff(2)%beg:,idwbuff(3)%beg:,1:,1:), intent(inout) :: pb_in
519519

520-
real(wp), dimension(idwbuff(1)%beg:,idwbuff(2)%beg:,idwbuff(3)%beg:,1:,1:), &
521-
& intent(inout) &
522-
& :: rhs_pb ! TODO :: I think these other two variables need to be stp as well, but it doesn't compile like that right now
520+
! TODO :: I think these other two variables need to be stp as well, but it doesn't compile like that right now
521+
real(wp), dimension(idwbuff(1)%beg:,idwbuff(2)%beg:,idwbuff(3)%beg:,1:,1:), intent(inout) :: rhs_pb
523522
real(stp), dimension(idwbuff(1)%beg:,idwbuff(2)%beg:,idwbuff(3)%beg:,1:,1:), intent(inout) :: mv_in
524523
real(wp), dimension(idwbuff(1)%beg:,idwbuff(2)%beg:,idwbuff(3)%beg:,1:,1:), intent(inout) :: rhs_mv
525524
integer, intent(in) :: t_step
@@ -530,6 +529,7 @@ contains
530529
integer(kind=8) :: i, j, k, l, q !< Generic loop iterators
531530
532531
! RHS: halo exchange -> reconstruct -> Riemann solve -> flux difference -> source terms
532+
533533
call nvtxStartRange("COMPUTE-RHS")
534534
535535
call cpu_time(t_start)

‎src/simulation/m_riemann_solvers.fpp‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -423,11 +423,11 @@ contains
423423
pres_mag%R = 0.5_wp*(B%R(1)**2._wp + B%R(2)**2._wp + B%R(3)**2._wp)
424424
#:endif
425425
E_L = gamma_L*pres_L + pi_inf_L + 0.5_wp*rho_L*vel_L_rms + qv_L + pres_mag%L
426-
E_R = gamma_R*pres_R + pi_inf_R + 0.5_wp*rho_R*vel_R_rms + qv_R &
427-
& + pres_mag%R ! includes magnetic energy
426+
! includes magnetic energy
427+
E_R = gamma_R*pres_R + pi_inf_R + 0.5_wp*rho_R*vel_R_rms + qv_R + pres_mag%R
428428
H_L = (E_L + pres_L - pres_mag%L)/rho_L
429-
H_R = (E_R + pres_R - pres_mag%R) &
430-
& /rho_R ! stagnation enthalpy here excludes magnetic energy (only used to find speed of sound)
429+
! stagnation enthalpy here excludes magnetic energy (only used to find speed of sound)
430+
H_R = (E_R + pres_R - pres_mag%R)/rho_R
431431
else
432432
E_L = gamma_L*pres_L + pi_inf_L + 5.e-1*rho_L*vel_L_rms + qv_L
433433
E_R = gamma_R*pres_R + pi_inf_R + 5.e-1*rho_R*vel_R_rms + qv_R
@@ -754,9 +754,8 @@ contains
754754
& eqn_idx%psi) - qR_prim_rs${XYZ}$_vf(j + 1, k, l, &
755755
& eqn_idx%psi)))/(s_M - s_P)
756756
else
757-
flux_rs${XYZ}$_vf(j, k, l, &
758-
& eqn_idx%B%beg + norm_dir - 1) &
759-
& = 0._wp ! Without hyperbolic cleaning, make sure flux of B_normal is identically zero
757+
! Without hyperbolic cleaning, make sure flux of B_normal is identically zero
758+
flux_rs${XYZ}$_vf(j, k, l, eqn_idx%B%beg + norm_dir - 1) = 0._wp
760759
end if
761760
end if
762761
flux_src_rs${XYZ}$_vf(j, k, l, eqn_idx%adv%beg) = 0._wp
@@ -1113,11 +1112,11 @@ contains
11131112
pres_mag%L = 0.5_wp*(B%L(1)**2._wp + B%L(2)**2._wp + B%L(3)**2._wp)
11141113
pres_mag%R = 0.5_wp*(B%R(1)**2._wp + B%R(2)**2._wp + B%R(3)**2._wp)
11151114
E_L = gamma_L*pres_L + pi_inf_L + 0.5_wp*rho_L*vel_L_rms + qv_L + pres_mag%L
1116-
E_R = gamma_R*pres_R + pi_inf_R + 0.5_wp*rho_R*vel_R_rms + qv_R &
1117-
& + pres_mag%R ! includes magnetic energy
1115+
! includes magnetic energy
1116+
E_R = gamma_R*pres_R + pi_inf_R + 0.5_wp*rho_R*vel_R_rms + qv_R + pres_mag%R
11181117
H_L = (E_L + pres_L - pres_mag%L)/rho_L
1119-
H_R = (E_R + pres_R - pres_mag%R) &
1120-
& /rho_R ! stagnation enthalpy here excludes magnetic energy (only used to find speed of sound)
1118+
! stagnation enthalpy here excludes magnetic energy (only used to find speed of sound)
1119+
H_R = (E_R + pres_R - pres_mag%R)/rho_R
11211120
else
11221121
E_L = gamma_L*pres_L + pi_inf_L + 5.e-1*rho_L*vel_L_rms + qv_L
11231122
E_R = gamma_R*pres_R + pi_inf_R + 5.e-1*rho_R*vel_R_rms + qv_R
@@ -3474,8 +3473,8 @@ contains
34743473
E%L = gamma%L*pres%L + pi_inf%L + 0.5_wp*rho%L*vel_rms%L + qv%L + pres_mag%L
34753474
E%R = gamma%R*pres%R + pi_inf%R + 0.5_wp*rho%R*vel_rms%R + qv%R + pres_mag%R ! includes magnetic energy
34763475
H_no_mag%L = (E%L + pres%L - pres_mag%L)/rho%L
3477-
H_no_mag%R = (E%R + pres%R - pres_mag%R) &
3478-
& /rho%R ! stagnation enthalpy here excludes magnetic energy (only used to find speed of sound)
3476+
! stagnation enthalpy here excludes magnetic energy (only used to find speed of sound)
3477+
H_no_mag%R = (E%R + pres%R - pres_mag%R)/rho%R
34793478

34803479
! (2) Compute fast wave speeds
34813480
call s_compute_speed_of_sound(pres%L, rho%L, gamma%L, pi_inf%L, H_no_mag%L, alpha_L, vel_rms%L, &

‎src/simulation/m_weno.fpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1204,8 +1204,8 @@ contains
12041204
delta(:) = 0._wp
12051205
beta(:) = weno_eps
12061206

1207-
if (teno) v = v_rs_ws_${XYZ}$ (j - 3:j + 3,k, l, &
1208-
& i) ! temporary field value array for clarity
1207+
! temporary field value array for clarity
1208+
if (teno) v = v_rs_ws_${XYZ}$ (j - 3:j + 3,k, l, i)
12091209

12101210
if (.not. teno) then
12111211
dvd(2) = v_rs_ws_${XYZ}$ (j + 3, k, l, i) - v_rs_ws_${XYZ}$ (j + 2, k, l, i)
@@ -1305,8 +1305,8 @@ contains
13051305
tau = abs(beta(3) - beta(0)) ! Equation 50
13061306
$:GPU_LOOP(parallelism='[seq]')
13071307
do q = 0, weno_num_stencils
1308-
alpha(q) = d_cbL_${XYZ}$ (q, &
1309-
& j)*(1._wp + (tau/beta(q))**wenoz_q) ! wenoz_q = 2,3,4 for stability
1308+
! wenoz_q = 2,3,4 for stability
1309+
alpha(q) = d_cbL_${XYZ}$ (q, j)*(1._wp + (tau/beta(q))**wenoz_q)
13101310
end do
13111311
else if (teno) then
13121312
#:if not MFC_CASE_OPTIMIZATION or weno_num_stencils > 3
@@ -1379,8 +1379,8 @@ contains
13791379
else if (wenoz) then
13801380
$:GPU_LOOP(parallelism='[seq]')
13811381
do q = 0, weno_num_stencils
1382-
alpha(q) = d_cbR_${XYZ}$ (q, &
1383-
& j)*(1._wp + (tau/beta(q))**wenoz_q) ! wenoz_q = 2,3,4 for stability
1382+
! wenoz_q = 2,3,4 for stability
1383+
alpha(q) = d_cbR_${XYZ}$ (q, j)*(1._wp + (tau/beta(q))**wenoz_q)
13841384
end do
13851385
else if (teno) then
13861386
$:GPU_LOOP(parallelism='[seq]')

0 commit comments

Comments
 (0)