Skip to content

Commit bb715b1

Browse files
sbryngelsonsbryngelson
committed
refactor: replace xibeg/xiend shorthands with eqn_idx%xi%beg/end references
1 parent 9d45f6c commit bb715b1

11 files changed

Lines changed: 43 additions & 56 deletions

‎src/common/m_boundary_common.fpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ contains
362362
end if
363363

364364
if (hyperelasticity) then
365-
q_prim_vf(xibeg)%sf(-j, k, l) = -q_prim_vf(xibeg)%sf(j - 1, k, l)
365+
q_prim_vf(eqn_idx%xi%beg)%sf(-j, k, l) = -q_prim_vf(eqn_idx%xi%beg)%sf(j - 1, k, l)
366366
end if
367367
end do
368368

@@ -396,7 +396,7 @@ contains
396396
end if
397397

398398
if (hyperelasticity) then
399-
q_prim_vf(xibeg)%sf(m + j, k, l) = -q_prim_vf(xibeg)%sf(m - (j - 1), k, l)
399+
q_prim_vf(eqn_idx%xi%beg)%sf(m + j, k, l) = -q_prim_vf(eqn_idx%xi%beg)%sf(m - (j - 1), k, l)
400400
end if
401401
end do
402402
if (qbmm .and. .not. polytropic .and. present(pb_in) .and. present(mv_in)) then
@@ -431,7 +431,7 @@ contains
431431
end if
432432

433433
if (hyperelasticity) then
434-
q_prim_vf(xibeg + 1)%sf(k, -j, l) = -q_prim_vf(xibeg + 1)%sf(k, j - 1, l)
434+
q_prim_vf(eqn_idx%xi%beg + 1)%sf(k, -j, l) = -q_prim_vf(eqn_idx%xi%beg + 1)%sf(k, j - 1, l)
435435
end if
436436
end do
437437

@@ -465,7 +465,7 @@ contains
465465
end if
466466

467467
if (hyperelasticity) then
468-
q_prim_vf(xibeg + 1)%sf(k, n + j, l) = -q_prim_vf(xibeg + 1)%sf(k, n - (j - 1), l)
468+
q_prim_vf(eqn_idx%xi%beg + 1)%sf(k, n + j, l) = -q_prim_vf(eqn_idx%xi%beg + 1)%sf(k, n - (j - 1), l)
469469
end if
470470
end do
471471

@@ -501,7 +501,7 @@ contains
501501
end if
502502

503503
if (hyperelasticity) then
504-
q_prim_vf(xiend)%sf(k, l, -j) = -q_prim_vf(xiend)%sf(k, l, j - 1)
504+
q_prim_vf(eqn_idx%xi%end)%sf(k, l, -j) = -q_prim_vf(eqn_idx%xi%end)%sf(k, l, j - 1)
505505
end if
506506
end do
507507

@@ -535,7 +535,7 @@ contains
535535
end if
536536

537537
if (hyperelasticity) then
538-
q_prim_vf(xiend)%sf(k, l, p + j) = -q_prim_vf(xiend)%sf(k, l, p - (j - 1))
538+
q_prim_vf(eqn_idx%xi%end)%sf(k, l, p + j) = -q_prim_vf(eqn_idx%xi%end)%sf(k, l, p - (j - 1))
539539
end if
540540
end do
541541

‎src/common/m_variables_conversion.fpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -749,7 +749,7 @@ contains
749749

750750
if (hyperelasticity) then
751751
$:GPU_LOOP(parallelism='[seq]')
752-
do i = xibeg, xiend
752+
do i = eqn_idx%xi%beg, eqn_idx%xi%end
753753
qK_prim_vf(i)%sf(j, k, l) = qK_cons_vf(i)%sf(j, k, l)/rho_K
754754
end do
755755
end if
@@ -1002,7 +1002,7 @@ contains
10021002
! using \rho xi as the conservative formulation stated in Kamrin et al. JFM 2022
10031003
if (hyperelasticity) then
10041004
! Multiply \xi to \rho \xi
1005-
do i = xibeg, xiend
1005+
do i = eqn_idx%xi%beg, eqn_idx%xi%end
10061006
q_cons_vf(i)%sf(j, k, l) = rho*q_prim_vf(i)%sf(j, k, l)
10071007
end do
10081008
end if

‎src/post_process/m_global_parameters.fpp‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -262,8 +262,6 @@ module m_global_parameters
262262
logical :: surface_tension
263263
!> @}
264264

265-
integer :: xibeg, xiend
266-
267265
!> @name Lagrangian bubbles
268266
!> @{
269267
logical :: bubbles_lagrange
@@ -741,9 +739,6 @@ contains
741739
z_output_idx%end = 0
742740
end if
743741

744-
xibeg = eqn_idx%xi%beg
745-
xiend = eqn_idx%xi%end
746-
747742
#ifdef MFC_MPI
748743
if (qbmm .and. .not. polytropic) then
749744
allocate (MPI_IO_DATA%view(1:sys_size + 2*nb*nnode))

‎src/post_process/m_start_up.fpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -492,9 +492,9 @@ contains
492492
end if
493493
494494
if (hyperelasticity) then
495-
do i = 1, xiend - xibeg + 1
495+
do i = 1, eqn_idx%xi%end - eqn_idx%xi%beg + 1
496496
if (prim_vars_wrt) then
497-
q_sf(:,:,:) = q_prim_vf(i - 1 + xibeg)%sf(x_beg:x_end,y_beg:y_end,z_beg:z_end)
497+
q_sf(:,:,:) = q_prim_vf(i - 1 + eqn_idx%xi%beg)%sf(x_beg:x_end,y_beg:y_end,z_beg:z_end)
498498
write (varname, '(A,I0)') 'xi', i
499499
call s_write_variable_to_formatted_database_file(varname, t_step)
500500
end if

‎src/pre_process/m_assign_variables.fpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ contains
400400

401401
! assigning the reference map to the q_prim vector field
402402
do i = 1, num_dims
403-
q_prim_vf(i + xibeg - 1)%sf(j, k, l) = eta*xi_cart(i) + (1._wp - eta)*orig_prim_vf(i + xibeg - 1)
403+
q_prim_vf(i + eqn_idx%xi%beg - 1)%sf(j, k, l) = eta*xi_cart(i) + (1._wp - eta)*orig_prim_vf(i + eqn_idx%xi%beg - 1)
404404
end do
405405
end if
406406

‎src/pre_process/m_global_parameters.fpp‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,6 @@ module m_global_parameters
180180
logical :: surface_tension
181181
!> @}
182182

183-
integer :: xibeg, xiend
184183
integer, allocatable, dimension(:,:,:) :: logic_grid
185184
type(pres_field) :: pb
186185
type(pres_field) :: mv
@@ -777,9 +776,6 @@ contains
777776
sys_size = eqn_idx%species%end
778777
end if
779778

780-
xibeg = eqn_idx%xi%beg
781-
xiend = eqn_idx%xi%end
782-
783779
call s_configure_coordinate_bounds(recon_type, weno_polyn, muscl_polyn, igr_order, buff_size, idwint, idwbuff, viscous, &
784780
& bubbles_lagrange, m, n, p, num_dims, igr, ib)
785781

‎src/simulation/m_global_parameters.fpp‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -427,9 +427,6 @@ module m_global_parameters
427427
$:GPU_DECLARE(create='[sigma, surface_tension]')
428428
!> @}
429429

430-
integer :: xibeg, xiend
431-
$:GPU_DECLARE(create='[xibeg, xiend]')
432-
433430
real(wp), allocatable, dimension(:) :: gammas, gs_min, pi_infs, ps_inf, cvs, qvs, qvps
434431
$:GPU_DECLARE(create='[gammas, gs_min, pi_infs, ps_inf, cvs, qvs, qvps]')
435432

@@ -1173,11 +1170,8 @@ contains
11731170
grid_geometry = 3
11741171
end if
11751172
1176-
xibeg = eqn_idx%xi%beg
1177-
xiend = eqn_idx%xi%end
1178-
11791173
$:GPU_UPDATE(device='[sys_size, buff_size, eqn_idx, adv_n, adap_dt, pi_fac, adap_dt_tol, adap_dt_max_iters]')
1180-
$:GPU_UPDATE(device='[b_size, xibeg, xiend, tensor_size]')
1174+
$:GPU_UPDATE(device='[b_size, tensor_size]')
11811175
11821176
$:GPU_UPDATE(device='[cfl_target, m, n, p]')
11831177

‎src/simulation/m_hyperelastic.fpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -116,17 +116,17 @@ contains
116116
$:GPU_LOOP(parallelism='[seq]')
117117
do r = -fd_number, fd_number
118118
! derivatives in the x-direction
119-
tensora(1) = tensora(1) + q_prim_vf(xibeg)%sf(j + r, k, l)*fd_coeff_x_hyper(r, j)
120-
tensora(2) = tensora(2) + q_prim_vf(xibeg + 1)%sf(j + r, k, l)*fd_coeff_x_hyper(r, j)
121-
tensora(3) = tensora(3) + q_prim_vf(xiend)%sf(j + r, k, l)*fd_coeff_x_hyper(r, j)
119+
tensora(1) = tensora(1) + q_prim_vf(eqn_idx%xi%beg)%sf(j + r, k, l)*fd_coeff_x_hyper(r, j)
120+
tensora(2) = tensora(2) + q_prim_vf(eqn_idx%xi%beg + 1)%sf(j + r, k, l)*fd_coeff_x_hyper(r, j)
121+
tensora(3) = tensora(3) + q_prim_vf(eqn_idx%xi%end)%sf(j + r, k, l)*fd_coeff_x_hyper(r, j)
122122
! derivatives in the y-direction
123-
tensora(4) = tensora(4) + q_prim_vf(xibeg)%sf(j, k + r, l)*fd_coeff_y_hyper(r, k)
124-
tensora(5) = tensora(5) + q_prim_vf(xibeg + 1)%sf(j, k + r, l)*fd_coeff_y_hyper(r, k)
125-
tensora(6) = tensora(6) + q_prim_vf(xiend)%sf(j, k + r, l)*fd_coeff_y_hyper(r, k)
123+
tensora(4) = tensora(4) + q_prim_vf(eqn_idx%xi%beg)%sf(j, k + r, l)*fd_coeff_y_hyper(r, k)
124+
tensora(5) = tensora(5) + q_prim_vf(eqn_idx%xi%beg + 1)%sf(j, k + r, l)*fd_coeff_y_hyper(r, k)
125+
tensora(6) = tensora(6) + q_prim_vf(eqn_idx%xi%end)%sf(j, k + r, l)*fd_coeff_y_hyper(r, k)
126126
! derivatives in the z-direction
127-
tensora(7) = tensora(7) + q_prim_vf(xibeg)%sf(j, k, l + r)*fd_coeff_z_hyper(r, l)
128-
tensora(8) = tensora(8) + q_prim_vf(xibeg + 1)%sf(j, k, l + r)*fd_coeff_z_hyper(r, l)
129-
tensora(9) = tensora(9) + q_prim_vf(xiend)%sf(j, k, l + r)*fd_coeff_z_hyper(r, l)
127+
tensora(7) = tensora(7) + q_prim_vf(eqn_idx%xi%beg)%sf(j, k, l + r)*fd_coeff_z_hyper(r, l)
128+
tensora(8) = tensora(8) + q_prim_vf(eqn_idx%xi%beg + 1)%sf(j, k, l + r)*fd_coeff_z_hyper(r, l)
129+
tensora(9) = tensora(9) + q_prim_vf(eqn_idx%xi%end)%sf(j, k, l + r)*fd_coeff_z_hyper(r, l)
130130
end do
131131
! STEP 2a: computing the adjoint of the grad_xi tensor for the inverse
132132
tensorb(1) = tensora(5)*tensora(9) - tensora(6)*tensora(8)
@@ -174,7 +174,7 @@ contains
174174
end if
175175
! STEP 5b: updating the pressure field
176176
q_prim_vf(eqn_idx%E)%sf(j, k, l) = q_prim_vf(eqn_idx%E)%sf(j, k, &
177-
& l) - G_local*q_prim_vf(xiend + 1)%sf(j, k, l)/gamma
177+
& l) - G_local*q_prim_vf(eqn_idx%xi%end + 1)%sf(j, k, l)/gamma
178178
! STEP 5c: updating the Cauchy stress conservative scalar field
179179
$:GPU_LOOP(parallelism='[seq]')
180180
do i = 1, b_size - 1
@@ -214,7 +214,7 @@ contains
214214
q_prim_vf(eqn_idx%stress%beg + i - 1)%sf(j, k, l) = G_param*btensor_in(i)%sf(j, k, l)/btensor_in(b_size)%sf(j, k, l)
215215
end do
216216
! First invariant strain energy: W = G/2 * (I1 - 3), neo-Hookean model
217-
q_prim_vf(xiend + 1)%sf(j, k, l) = 0.5_wp*(trace - 3.0_wp)/btensor_in(b_size)%sf(j, k, l)
217+
q_prim_vf(eqn_idx%xi%end + 1)%sf(j, k, l) = 0.5_wp*(trace - 3.0_wp)/btensor_in(b_size)%sf(j, k, l)
218218

219219
end subroutine s_neoHookean_cauchy_solver
220220

@@ -243,7 +243,7 @@ contains
243243
q_prim_vf(eqn_idx%stress%beg + i - 1)%sf(j, k, l) = G_param*btensor_in(i)%sf(j, k, l)/btensor_in(b_size)%sf(j, k, l)
244244
end do
245245
! First invariant strain energy: W = G/2 * (I1 - 3), neo-Hookean model
246-
q_prim_vf(xiend + 1)%sf(j, k, l) = 0.5_wp*(trace - 3.0_wp)/btensor_in(b_size)%sf(j, k, l)
246+
q_prim_vf(eqn_idx%xi%end + 1)%sf(j, k, l) = 0.5_wp*(trace - 3.0_wp)/btensor_in(b_size)%sf(j, k, l)
247247

248248
end subroutine s_Mooney_Rivlin_cauchy_solver
249249

‎src/simulation/m_riemann_solvers.fpp‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1944,8 +1944,8 @@ contains
19441944
if (hyperelasticity) then
19451945
$:GPU_LOOP(parallelism='[seq]')
19461946
do i = 1, num_dims
1947-
xi_field_L(i) = qL_prim_rs${XYZ}$_vf(j, k, l, xibeg - 1 + i)
1948-
xi_field_R(i) = qR_prim_rs${XYZ}$_vf(j + 1, k, l, xibeg - 1 + i)
1947+
xi_field_L(i) = qL_prim_rs${XYZ}$_vf(j, k, l, eqn_idx%xi%beg - 1 + i)
1948+
xi_field_R(i) = qR_prim_rs${XYZ}$_vf(j + 1, k, l, eqn_idx%xi%beg - 1 + i)
19491949
end do
19501950
G_L = 0._wp; G_R = 0._wp
19511951
$:GPU_LOOP(parallelism='[seq]')
@@ -1956,8 +1956,8 @@ contains
19561956
end do
19571957
! Elastic contribution to energy if G large enough
19581958
if (G_L > verysmall .and. G_R > verysmall) then
1959-
E_L = E_L + G_L*qL_prim_rs${XYZ}$_vf(j, k, l, xiend + 1)
1960-
E_R = E_R + G_R*qR_prim_rs${XYZ}$_vf(j + 1, k, l, xiend + 1)
1959+
E_L = E_L + G_L*qL_prim_rs${XYZ}$_vf(j, k, l, eqn_idx%xi%end + 1)
1960+
E_R = E_R + G_R*qR_prim_rs${XYZ}$_vf(j + 1, k, l, eqn_idx%xi%end + 1)
19611961
end if
19621962
$:GPU_LOOP(parallelism='[seq]')
19631963
do i = 1, b_size - 1
@@ -2166,9 +2166,10 @@ contains
21662166
$:GPU_LOOP(parallelism='[seq]')
21672167
do i = 1, num_dims
21682168
flux_rs${XYZ}$_vf(j, k, l, &
2169-
& xibeg - 1 + i) = xi_M*(s_S/(s_L - s_S))*(s_L*rho_L*xi_field_L(i) &
2170-
& - rho_L*vel_L(dir_idx(1))*xi_field_L(i)) + xi_P*(s_S/(s_R - s_S)) &
2171-
& *(s_R*rho_R*xi_field_R(i) - rho_R*vel_R(dir_idx(1))*xi_field_R(i))
2169+
& eqn_idx%xi%beg - 1 + i) = xi_M*(s_S/(s_L - s_S)) &
2170+
& *(s_L*rho_L*xi_field_L(i) - rho_L*vel_L(dir_idx(1))*xi_field_L(i)) &
2171+
& + xi_P*(s_S/(s_R - s_S))*(s_R*rho_R*xi_field_R(i) &
2172+
& - rho_R*vel_R(dir_idx(1))*xi_field_R(i))
21722173
end do
21732174
end if
21742175

@@ -3027,8 +3028,8 @@ contains
30273028
if (hyperelasticity) then
30283029
$:GPU_LOOP(parallelism='[seq]')
30293030
do i = 1, num_dims
3030-
xi_field_L(i) = qL_prim_rs${XYZ}$_vf(j, k, l, xibeg - 1 + i)
3031-
xi_field_R(i) = qR_prim_rs${XYZ}$_vf(j + 1, k, l, xibeg - 1 + i)
3031+
xi_field_L(i) = qL_prim_rs${XYZ}$_vf(j, k, l, eqn_idx%xi%beg - 1 + i)
3032+
xi_field_R(i) = qR_prim_rs${XYZ}$_vf(j + 1, k, l, eqn_idx%xi%beg - 1 + i)
30323033
end do
30333034
G_L = 0._wp
30343035
G_R = 0._wp
@@ -3040,8 +3041,8 @@ contains
30403041
end do
30413042
! Elastic contribution to energy if G large enough
30423043
if (G_L > verysmall .and. G_R > verysmall) then
3043-
E_L = E_L + G_L*qL_prim_rs${XYZ}$_vf(j, k, l, xiend + 1)
3044-
E_R = E_R + G_R*qR_prim_rs${XYZ}$_vf(j + 1, k, l, xiend + 1)
3044+
E_L = E_L + G_L*qL_prim_rs${XYZ}$_vf(j, k, l, eqn_idx%xi%end + 1)
3045+
E_R = E_R + G_R*qR_prim_rs${XYZ}$_vf(j + 1, k, l, eqn_idx%xi%end + 1)
30453046
end if
30463047
$:GPU_LOOP(parallelism='[seq]')
30473048
do i = 1, b_size - 1
@@ -3231,9 +3232,10 @@ contains
32313232
$:GPU_LOOP(parallelism='[seq]')
32323233
do i = 1, num_dims
32333234
flux_rs${XYZ}$_vf(j, k, l, &
3234-
& xibeg - 1 + i) = xi_M*(s_S/(s_L - s_S))*(s_L*rho_L*xi_field_L(i) &
3235-
& - rho_L*vel_L(dir_idx(1))*xi_field_L(i)) + xi_P*(s_S/(s_R - s_S)) &
3236-
& *(s_R*rho_R*xi_field_R(i) - rho_R*vel_R(dir_idx(1))*xi_field_R(i))
3235+
& eqn_idx%xi%beg - 1 + i) = xi_M*(s_S/(s_L - s_S)) &
3236+
& *(s_L*rho_L*xi_field_L(i) - rho_L*vel_L(dir_idx(1))*xi_field_L(i)) &
3237+
& + xi_P*(s_S/(s_R - s_S))*(s_R*rho_R*xi_field_R(i) &
3238+
& - rho_R*vel_R(dir_idx(1))*xi_field_R(i))
32373239
end do
32383240
end if
32393241

‎src/simulation/m_sim_helpers.fpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ contains
130130

131131
! Adjust energy for hyperelasticity
132132
if (hyperelasticity) then
133-
E = E + G_local*q_prim_vf(xiend + 1)%sf(j, k, l)
133+
E = E + G_local*q_prim_vf(eqn_idx%xi%end + 1)%sf(j, k, l)
134134
end if
135135

136136
H = (E + pres)/rho

0 commit comments

Comments
 (0)