Skip to content

Commit 9047418

Browse files
ChrisZYJChrisZYJ
committed
remove Bxb Bxe
1 parent abd055d commit 9047418

File tree

8 files changed

+59
-68
lines changed

8 files changed

+59
-68
lines changed

‎src/common/m_variables_conversion.fpp‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -927,12 +927,12 @@ contains
927927
if (relativity) then
928928
if (n == 0) then
929929
B(1) = Bx0
930-
B(2) = qK_cons_vf(Bxb)%sf(j, k, l)
931-
B(3) = qK_cons_vf(Bxb + 1)%sf(j, k, l)
930+
B(2) = qK_cons_vf(B_idx%beg)%sf(j, k, l)
931+
B(3) = qK_cons_vf(B_idx%beg + 1)%sf(j, k, l)
932932
else
933-
B(1) = qK_cons_vf(Bxb)%sf(j, k, l)
934-
B(2) = qK_cons_vf(Bxb + 1)%sf(j, k, l)
935-
B(3) = qK_cons_vf(Bxb + 2)%sf(j, k, l)
933+
B(1) = qK_cons_vf(B_idx%beg)%sf(j, k, l)
934+
B(2) = qK_cons_vf(B_idx%beg + 1)%sf(j, k, l)
935+
B(3) = qK_cons_vf(B_idx%beg + 2)%sf(j, k, l)
936936
end if
937937
B2 = B(1)**2 + B(2)**2 + B(3)**2
938938

@@ -991,7 +991,7 @@ contains
991991
qK_prim_vf(1)%sf(j, k, l) = D/Ga ! Hard-coded for single-component for now
992992

993993
!$acc loop seq
994-
do i = Bxb, Bxe
994+
do i = B_idx%beg, B_idx%end
995995
qK_prim_vf(i)%sf(j, k, l) = qK_cons_vf(i)%sf(j, k, l)
996996
end do
997997

@@ -1049,9 +1049,9 @@ contains
10491049

10501050
if (mhd) then
10511051
if (n == 0) then
1052-
pres_mag = 0.5_wp*(Bx0**2 + qK_cons_vf(Bxb)%sf(j, k, l)**2 + qK_cons_vf(Bxb + 1)%sf(j, k, l)**2)
1052+
pres_mag = 0.5_wp*(Bx0**2 + qK_cons_vf(B_idx%beg)%sf(j, k, l)**2 + qK_cons_vf(B_idx%beg + 1)%sf(j, k, l)**2)
10531053
else
1054-
pres_mag = 0.5_wp*(qK_cons_vf(Bxb)%sf(j, k, l)**2 + qK_cons_vf(Bxb + 1)%sf(j, k, l)**2 + qK_cons_vf(Bxb + 2)%sf(j, k, l)**2)
1054+
pres_mag = 0.5_wp*(qK_cons_vf(B_idx%beg)%sf(j, k, l)**2 + qK_cons_vf(B_idx%beg + 1)%sf(j, k, l)**2 + qK_cons_vf(B_idx%beg + 2)%sf(j, k, l)**2)
10551055
end if
10561056
else
10571057
pres_mag = 0._wp
@@ -1107,7 +1107,7 @@ contains
11071107

11081108
if (mhd) then
11091109
!$acc loop seq
1110-
do i = Bxb, Bxe
1110+
do i = B_idx%beg, B_idx%end
11111111
qK_prim_vf(i)%sf(j, k, l) = qK_cons_vf(i)%sf(j, k, l)
11121112
end do
11131113
end if
@@ -1225,12 +1225,12 @@ contains
12251225

12261226
if (n == 0) then
12271227
B(1) = Bx0
1228-
B(2) = q_prim_vf(Bxb)%sf(j, k, l)
1229-
B(3) = q_prim_vf(Bxb + 1)%sf(j, k, l)
1228+
B(2) = q_prim_vf(B_idx%beg)%sf(j, k, l)
1229+
B(3) = q_prim_vf(B_idx%beg + 1)%sf(j, k, l)
12301230
else
1231-
B(1) = q_prim_vf(Bxb)%sf(j, k, l)
1232-
B(2) = q_prim_vf(Bxb + 1)%sf(j, k, l)
1233-
B(3) = q_prim_vf(Bxb + 2)%sf(j, k, l)
1231+
B(1) = q_prim_vf(B_idx%beg)%sf(j, k, l)
1232+
B(2) = q_prim_vf(B_idx%beg + 1)%sf(j, k, l)
1233+
B(3) = q_prim_vf(B_idx%beg + 2)%sf(j, k, l)
12341234
end if
12351235

12361236
v2 = 0._wp
@@ -1244,7 +1244,7 @@ contains
12441244
h = 1._wp + (gamma + 1)*q_prim_vf(E_idx)%sf(j, k, l)/rho ! Assume perfect gas for now
12451245

12461246
B2 = 0._wp
1247-
do i = Bxb, Bxe
1247+
do i = B_idx%beg, B_idx%end
12481248
B2 = B2 + q_prim_vf(i)%sf(j, k, l)**2
12491249
end do
12501250
if (n == 0) B2 = B2 + Bx0**2
@@ -1270,7 +1270,7 @@ contains
12701270
q_cons_vf(E_idx)%sf(j, k, l) = q_cons_vf(E_idx)%sf(j, k, l) - q_cons_vf(i)%sf(j, k, l)
12711271
end do
12721272

1273-
do i = Bxb, Bxe
1273+
do i = B_idx%beg, B_idx%end
12741274
q_cons_vf(i)%sf(j, k, l) = q_prim_vf(i)%sf(j, k, l)
12751275
end do
12761276

@@ -1310,9 +1310,9 @@ contains
13101310
! Computing the energy from the pressure
13111311
if (mhd) then
13121312
if (n == 0) then
1313-
pres_mag = 0.5_wp*(Bx0**2 + q_prim_vf(Bxb)%sf(j, k, l)**2 + q_prim_vf(Bxb + 1)%sf(j, k, l)**2)
1313+
pres_mag = 0.5_wp*(Bx0**2 + q_prim_vf(B_idx%beg)%sf(j, k, l)**2 + q_prim_vf(B_idx%beg + 1)%sf(j, k, l)**2)
13141314
else
1315-
pres_mag = 0.5_wp*(q_prim_vf(Bxb)%sf(j, k, l)**2 + q_prim_vf(Bxb + 1)%sf(j, k, l)**2 + q_prim_vf(Bxb + 2)%sf(j, k, l)**2)
1315+
pres_mag = 0.5_wp*(q_prim_vf(B_idx%beg)%sf(j, k, l)**2 + q_prim_vf(B_idx%beg + 1)%sf(j, k, l)**2 + q_prim_vf(B_idx%beg + 2)%sf(j, k, l)**2)
13161316
end if
13171317
q_cons_vf(E_idx)%sf(j, k, l) = &
13181318
gamma*q_prim_vf(E_idx)%sf(j, k, l) + dyn_pres + pres_mag &
@@ -1377,7 +1377,7 @@ contains
13771377
end if
13781378

13791379
if (mhd) then
1380-
do i = Bxb, Bxe
1380+
do i = B_idx%beg, B_idx%end
13811381
q_cons_vf(i)%sf(j, k, l) = q_prim_vf(i)%sf(j, k, l)
13821382
end do
13831383
end if
@@ -1669,7 +1669,7 @@ contains
16691669
real(wp), intent(in) :: B(3), rho, c
16701670
real(wp), intent(in) :: h ! only used for relativity
16711671
real(wp), intent(out) :: c_fast
1672-
integer :: norm
1672+
integer, intent(in) :: norm
16731673

16741674
real(wp) :: B2, term, disc
16751675
real(wp) :: term2

‎src/post_process/m_global_parameters.fpp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,6 @@ module m_global_parameters
299299
integer :: strxb, strxe
300300
integer :: xibeg, xiend
301301
integer :: chemxb, chemxe
302-
integer :: Bxb, Bxe
303302
!> @}
304303

305304
!> @name Lagrangian bubbles
@@ -740,8 +739,6 @@ contains
740739
xiend = xi_idx%end
741740
chemxb = species_idx%beg
742741
chemxe = species_idx%end
743-
Bxb = B_idx%beg
744-
Bxe = B_idx%end
745742

746743
#ifdef MFC_MPI
747744
if (bubbles_lagrange) then

‎src/pre_process/include/2dHardcodedIC.fpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,8 @@
140140
q_prim_vf(momxb)%sf(i, j, 0) = -sin(2._wp*pi*y_cc(j))
141141
q_prim_vf(momxb + 1)%sf(i, j, 0) = sin(2._wp*pi*x_cc(i))
142142

143-
q_prim_vf(Bxb)%sf(i, j, 0) = -sin(2._wp*pi*y_cc(j))/sqrt(4._wp*pi)
144-
q_prim_vf(Bxb + 1)%sf(i, j, 0) = sin(4._wp*pi*x_cc(i))/sqrt(4._wp*pi)
143+
q_prim_vf(B_idx%beg)%sf(i, j, 0) = -sin(2._wp*pi*y_cc(j))/sqrt(4._wp*pi)
144+
q_prim_vf(B_idx%beg + 1)%sf(i, j, 0) = sin(4._wp*pi*x_cc(i))/sqrt(4._wp*pi)
145145

146146
case (251) ! RMHD Cylindrical Blast Wave [Mignone, 2006: Section 4.3.1]
147147

‎src/pre_process/m_global_parameters.fpp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,6 @@ module m_global_parameters
248248
integer :: strxb, strxe
249249
integer :: xibeg, xiend
250250
integer :: chemxb, chemxe
251-
integer :: Bxb, Bxe
252251
!> @}
253252

254253
!> @ lagrangian solver parameters
@@ -821,8 +820,6 @@ contains
821820
xiend = xi_idx%end
822821
chemxb = species_idx%beg
823822
chemxe = species_idx%end
824-
Bxb = B_idx%beg
825-
Bxe = B_idx%end
826823

827824
call s_configure_coordinate_bounds(weno_polyn, buff_size, &
828825
idwint, idwbuff, viscous, &

‎src/simulation/m_global_parameters.fpp‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -445,8 +445,7 @@ module m_global_parameters
445445
integer :: strxb, strxe
446446
integer :: chemxb, chemxe
447447
integer :: xibeg, xiend
448-
integer :: Bxb, Bxe
449-
!$acc declare create(momxb, momxe, advxb, advxe, contxb, contxe, intxb, intxe, bubxb, bubxe, strxb, strxe, chemxb, chemxe, Bxb, Bxe)
448+
!$acc declare create(momxb, momxe, advxb, advxe, contxb, contxe, intxb, intxe, bubxb, bubxe, strxb, strxe, chemxb, chemxe)
450449
!$acc declare create(xibeg,xiend)
451450

452451
real(wp), allocatable, dimension(:) :: gammas, gs_min, pi_infs, ps_inf, cvs, qvs, qvps
@@ -1176,10 +1175,8 @@ contains
11761175
xiend = xi_idx%end
11771176
chemxb = species_idx%beg
11781177
chemxe = species_idx%end
1179-
Bxb = B_idx%beg
1180-
Bxe = B_idx%end
11811178
1182-
!$acc update device(momxb, momxe, advxb, advxe, contxb, contxe, bubxb, bubxe, intxb, intxe, sys_size, buff_size, E_idx, alf_idx, n_idx, adv_n, adap_dt, pi_fac, strxb, strxe, chemxb, chemxe, Bxb, Bxe)
1179+
!$acc update device(momxb, momxe, advxb, advxe, contxb, contxe, bubxb, bubxe, intxb, intxe, sys_size, buff_size, E_idx, alf_idx, n_idx, adv_n, adap_dt, pi_fac, strxb, strxe, chemxb, chemxe)
11831180
!$acc update device(b_size, xibeg, xiend, tensor_size)
11841181
11851182
!$acc update device(species_idx)

‎src/simulation/m_mhd.fpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -87,26 +87,26 @@ contains
8787
divB = 0._wp
8888
!$acc loop seq
8989
do r = -fd_number, fd_number
90-
divB = divB + q_prim_vf(Bxb)%sf(k + r, l, q)*fd_coeff_x_h(r, k)
90+
divB = divB + q_prim_vf(B_idx%beg)%sf(k + r, l, q)*fd_coeff_x_h(r, k)
9191
end do
9292
!$acc loop seq
9393
do r = -fd_number, fd_number
94-
divB = divB + q_prim_vf(Bxb + 1)%sf(k, l + r, q)*fd_coeff_y_h(r, l)
94+
divB = divB + q_prim_vf(B_idx%beg + 1)%sf(k, l + r, q)*fd_coeff_y_h(r, l)
9595
end do
9696
if (p > 0) then
9797
!$acc loop seq
9898
do r = -fd_number, fd_number
99-
divB = divB + q_prim_vf(Bxb + 2)%sf(k, l, q + r)*fd_coeff_z_h(r, q)
99+
divB = divB + q_prim_vf(B_idx%beg + 2)%sf(k, l, q + r)*fd_coeff_z_h(r, q)
100100
end do
101101
end if
102102

103103
v(1) = q_prim_vf(momxb)%sf(k, l, q)
104104
v(2) = q_prim_vf(momxb + 1)%sf(k, l, q)
105105
v(3) = q_prim_vf(momxb + 2)%sf(k, l, q)
106106

107-
B(1) = q_prim_vf(Bxb)%sf(k, l, q)
108-
B(2) = q_prim_vf(Bxb + 1)%sf(k, l, q)
109-
B(3) = q_prim_vf(Bxb + 2)%sf(k, l, q)
107+
B(1) = q_prim_vf(B_idx%beg)%sf(k, l, q)
108+
B(2) = q_prim_vf(B_idx%beg + 1)%sf(k, l, q)
109+
B(3) = q_prim_vf(B_idx%beg + 2)%sf(k, l, q)
110110

111111
vdotB = sum(v*B)
112112

@@ -125,9 +125,9 @@ contains
125125

126126
rhs_vf(E_idx)%sf(k, l, q) = rhs_vf(E_idx)%sf(k, l, q) - divB*vdotB
127127

128-
rhs_vf(Bxb)%sf(k, l, q) = rhs_vf(Bxb)%sf(k, l, q) - divB*v(1)
129-
rhs_vf(Bxb + 1)%sf(k, l, q) = rhs_vf(Bxb + 1)%sf(k, l, q) - divB*v(2)
130-
rhs_vf(Bxb + 2)%sf(k, l, q) = rhs_vf(Bxb + 2)%sf(k, l, q) - divB*v(3)
128+
rhs_vf(B_idx%beg)%sf(k, l, q) = rhs_vf(B_idx%beg)%sf(k, l, q) - divB*v(1)
129+
rhs_vf(B_idx%beg + 1)%sf(k, l, q) = rhs_vf(B_idx%beg + 1)%sf(k, l, q) - divB*v(2)
130+
rhs_vf(B_idx%beg + 2)%sf(k, l, q) = rhs_vf(B_idx%beg + 2)%sf(k, l, q) - divB*v(3)
131131

132132
end do
133133
end do

‎src/simulation/m_riemann_solvers.fpp‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -428,17 +428,17 @@ contains
428428
if (n == 0) then ! 1D: constant Bx; By, Bz as variables
429429
B%L(1) = Bx0
430430
B%R(1) = Bx0
431-
B%L(2) = qL_prim_rs${XYZ}$_vf(j, k, l, Bxb)
432-
B%R(2) = qR_prim_rs${XYZ}$_vf(j + 1, k, l, Bxb)
433-
B%L(3) = qL_prim_rs${XYZ}$_vf(j, k, l, Bxb + 1)
434-
B%R(3) = qR_prim_rs${XYZ}$_vf(j + 1, k, l, Bxb + 1)
431+
B%L(2) = qL_prim_rs${XYZ}$_vf(j, k, l, B_idx%beg)
432+
B%R(2) = qR_prim_rs${XYZ}$_vf(j + 1, k, l, B_idx%beg)
433+
B%L(3) = qL_prim_rs${XYZ}$_vf(j, k, l, B_idx%beg + 1)
434+
B%R(3) = qR_prim_rs${XYZ}$_vf(j + 1, k, l, B_idx%beg + 1)
435435
else ! 2D/3D: Bx, By, Bz as variables
436-
B%L(1) = qL_prim_rs${XYZ}$_vf(j, k, l, Bxb)
437-
B%R(1) = qR_prim_rs${XYZ}$_vf(j + 1, k, l, Bxb)
438-
B%L(2) = qL_prim_rs${XYZ}$_vf(j, k, l, Bxb + 1)
439-
B%R(2) = qR_prim_rs${XYZ}$_vf(j + 1, k, l, Bxb + 1)
440-
B%L(3) = qL_prim_rs${XYZ}$_vf(j, k, l, Bxb + 2)
441-
B%R(3) = qR_prim_rs${XYZ}$_vf(j + 1, k, l, Bxb + 2)
436+
B%L(1) = qL_prim_rs${XYZ}$_vf(j, k, l, B_idx%beg)
437+
B%R(1) = qR_prim_rs${XYZ}$_vf(j + 1, k, l, B_idx%beg)
438+
B%L(2) = qL_prim_rs${XYZ}$_vf(j, k, l, B_idx%beg + 1)
439+
B%R(2) = qR_prim_rs${XYZ}$_vf(j + 1, k, l, B_idx%beg + 1)
440+
B%L(3) = qL_prim_rs${XYZ}$_vf(j, k, l, B_idx%beg + 2)
441+
B%R(3) = qR_prim_rs${XYZ}$_vf(j + 1, k, l, B_idx%beg + 2)
442442
end if
443443
end if
444444

@@ -3076,17 +3076,17 @@ contains
30763076
if (n == 0) then ! 1D: constant Bx; By, Bz as variables; only in x so not permutated
30773077
B%L(1) = Bx0
30783078
B%R(1) = Bx0
3079-
B%L(2) = qL_prim_rs${XYZ}$_vf(j, k, l, Bxb)
3080-
B%R(2) = qR_prim_rs${XYZ}$_vf(j + 1, k, l, Bxb)
3081-
B%L(3) = qL_prim_rs${XYZ}$_vf(j, k, l, Bxb + 1)
3082-
B%R(3) = qR_prim_rs${XYZ}$_vf(j + 1, k, l, Bxb + 1)
3079+
B%L(2) = qL_prim_rs${XYZ}$_vf(j, k, l, B_idx%beg)
3080+
B%R(2) = qR_prim_rs${XYZ}$_vf(j + 1, k, l, B_idx%beg)
3081+
B%L(3) = qL_prim_rs${XYZ}$_vf(j, k, l, B_idx%beg + 1)
3082+
B%R(3) = qR_prim_rs${XYZ}$_vf(j + 1, k, l, B_idx%beg + 1)
30833083
else ! 2D/3D: Bx, By, Bz as variables
3084-
B%L(1) = qL_prim_rs${XYZ}$_vf(j, k, l, Bxb + dir_idx(1) - 1)
3085-
B%R(1) = qR_prim_rs${XYZ}$_vf(j + 1, k, l, Bxb + dir_idx(1) - 1)
3086-
B%L(2) = qL_prim_rs${XYZ}$_vf(j, k, l, Bxb + dir_idx(2) - 1)
3087-
B%R(2) = qR_prim_rs${XYZ}$_vf(j + 1, k, l, Bxb + dir_idx(2) - 1)
3088-
B%L(3) = qL_prim_rs${XYZ}$_vf(j, k, l, Bxb + dir_idx(3) - 1)
3089-
B%R(3) = qR_prim_rs${XYZ}$_vf(j + 1, k, l, Bxb + dir_idx(3) - 1)
3084+
B%L(1) = qL_prim_rs${XYZ}$_vf(j, k, l, B_idx%beg + dir_idx(1) - 1)
3085+
B%R(1) = qR_prim_rs${XYZ}$_vf(j + 1, k, l, B_idx%beg + dir_idx(1) - 1)
3086+
B%L(2) = qL_prim_rs${XYZ}$_vf(j, k, l, B_idx%beg + dir_idx(2) - 1)
3087+
B%R(2) = qR_prim_rs${XYZ}$_vf(j + 1, k, l, B_idx%beg + dir_idx(2) - 1)
3088+
B%L(3) = qL_prim_rs${XYZ}$_vf(j, k, l, B_idx%beg + dir_idx(3) - 1)
3089+
B%R(3) = qR_prim_rs${XYZ}$_vf(j + 1, k, l, B_idx%beg + dir_idx(3) - 1)
30903090
end if
30913091
end if
30923092
@@ -3254,11 +3254,11 @@ contains
32543254
flux_rs${XYZ}$_vf(j, k, l, contxe + dir_idx(3)) = F_hlld(4)
32553255
! Magnetic field
32563256
if (n == 0) then
3257-
flux_rs${XYZ}$_vf(j, k, l, Bxb) = F_hlld(5)
3258-
flux_rs${XYZ}$_vf(j, k, l, Bxb + 1) = F_hlld(6)
3257+
flux_rs${XYZ}$_vf(j, k, l, B_idx%beg) = F_hlld(5)
3258+
flux_rs${XYZ}$_vf(j, k, l, B_idx%beg + 1) = F_hlld(6)
32593259
else
3260-
flux_rs${XYZ}$_vf(j, k, l, Bxb + dir_idx(2) - 1) = F_hlld(5)
3261-
flux_rs${XYZ}$_vf(j, k, l, Bxb + dir_idx(3) - 1) = F_hlld(6)
3260+
flux_rs${XYZ}$_vf(j, k, l, B_idx%beg + dir_idx(2) - 1) = F_hlld(5)
3261+
flux_rs${XYZ}$_vf(j, k, l, B_idx%beg + dir_idx(3) - 1) = F_hlld(6)
32623262
end if
32633263
! Energy
32643264
flux_rs${XYZ}$_vf(j, k, l, E_idx) = F_hlld(7)

‎toolchain/mfc/case.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
QPVF_IDX_VARS = {
1111
'alpha_rho': 'contxb', 'vel' : 'momxb', 'pres': 'E_idx',
1212
'alpha': 'advxb', 'tau_e': 'stress_idx%beg', 'Y': 'chemxb',
13-
'cf_val': 'c_idx', 'B%x': 'Bxb', 'B%y': 'Bxe-1', 'B%z': 'Bxe',
13+
'cf_val': 'c_idx', 'B%x': 'B_idx%beg', 'B%y': 'B_idx%end-1', 'B%z': 'B_idx%end',
1414
}
15-
# Bxe must be used because 1D doesn't have Bx
15+
# "B_idx%end - 1" not "B_idx%beg + 1" must be used because 1D does not have Bx
1616

1717
@dataclasses.dataclass(init=False)
1818
class Case:

0 commit comments

Comments
 (0)