Skip to content

Commit 34de750

Browse files
sbryngelsonsbryngelson
committed
Revert "add back master inline !< comments to matching code lines"
This reverts commit 72c1b87.
1 parent 72c1b87 commit 34de750

File tree

10 files changed

+77
-79
lines changed

10 files changed

+77
-79
lines changed

‎src/common/m_boundary_common.fpp‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ contains
8080
if (p == 0) then
8181
beta_bc_bounds(3)%beg = 0
8282
beta_bc_bounds(3)%end = 0
83-
else !< bc_x%end
83+
else
8484
beta_bc_bounds(3)%beg = -mapcells - 1
8585
beta_bc_bounds(3)%end = p + mapcells + 1
8686
end if
@@ -102,7 +102,7 @@ contains
102102

103103
if (bc_x%beg >= 0) then
104104
call s_mpi_sendrecv_variables_buffers(q_prim_vf, 1, -1, sys_size, pb_in, mv_in)
105-
else !< bc_y%end
105+
else
106106
$:GPU_PARALLEL_LOOP(private='[l, k]', collapse=2)
107107
do l = 0, p
108108
do k = 0, n
@@ -131,7 +131,7 @@ contains
131131

132132
if (bc_x%end >= 0) then
133133
call s_mpi_sendrecv_variables_buffers(q_prim_vf, 1, 1, sys_size, pb_in, mv_in)
134-
else !< bc_z%end
134+
else
135135
$:GPU_PARALLEL_LOOP(private='[l, k]', collapse=2)
136136
do l = 0, p
137137
do k = 0, n
@@ -165,7 +165,7 @@ contains
165165
#:if not MFC_CASE_OPTIMIZATION or num_dims > 1
166166
if (bc_y%beg >= 0) then
167167
call s_mpi_sendrecv_variables_buffers(q_prim_vf, 2, -1, sys_size, pb_in, mv_in)
168-
else !< bc_x%end
168+
else
169169
$:GPU_PARALLEL_LOOP(private='[l, k]', collapse=2)
170170
do l = 0, p
171171
do k = -buff_size, m + buff_size
@@ -197,7 +197,7 @@ contains
197197

198198
if (bc_y%end >= 0) then
199199
call s_mpi_sendrecv_variables_buffers(q_prim_vf, 2, 1, sys_size, pb_in, mv_in)
200-
else !< bc_y%end
200+
else
201201
$:GPU_PARALLEL_LOOP(private='[l, k]', collapse=2)
202202
do l = 0, p
203203
do k = -buff_size, m + buff_size
@@ -232,7 +232,7 @@ contains
232232
#:if not MFC_CASE_OPTIMIZATION or num_dims > 2
233233
if (bc_z%beg >= 0) then
234234
call s_mpi_sendrecv_variables_buffers(q_prim_vf, 3, -1, sys_size, pb_in, mv_in)
235-
else !< bc_z%end
235+
else
236236
$:GPU_PARALLEL_LOOP(private='[l, k]', collapse=2)
237237
do l = -buff_size, n + buff_size
238238
do k = -buff_size, m + buff_size
@@ -302,7 +302,7 @@ contains
302302
integer :: j, i
303303

304304
if (bc_dir == 1) then !< x-direction
305-
if (bc_loc == -1) then ! bc_x%beg !< bc_y%beg
305+
if (bc_loc == -1) then ! bc_x%beg
306306
do i = 1, sys_size
307307
do j = 1, buff_size
308308
q_prim_vf(i)%sf(-j, k, l) = q_prim_vf(i)%sf(0, k, l)
@@ -671,7 +671,7 @@ contains
671671
end do
672672
end do
673673
end if
674-
else !< bc_x%end
674+
else !< bc_z%end
675675
do i = 1, sys_size
676676
do j = 1, buff_size
677677
q_prim_vf(i)%sf(k, l, p + j) = q_prim_vf(i)%sf(k, l, j - 1)
@@ -716,7 +716,7 @@ contains
716716
do i = E_idx, sys_size
717717
q_prim_vf(i)%sf(k, -j, l) = q_prim_vf(i)%sf(k, j - 1, l + ((p + 1)/2))
718718
end do
719-
else !< bc_y%end
719+
else
720720
do i = 1, momxb
721721
q_prim_vf(i)%sf(k, -j, l) = q_prim_vf(i)%sf(k, j - 1, l - ((p + 1)/2))
722722
end do
@@ -764,12 +764,12 @@ contains
764764
end if
765765
end do
766766
end do
767-
else !< bc_z%end
767+
else !< bc_x%end
768768
do i = 1, sys_size
769769
do j = 1, buff_size
770770
if (i == momxb) then
771771
q_prim_vf(i)%sf(m + j, k, l) = -q_prim_vf(i)%sf(m - (j - 1), k, l) + 2._wp*bc_x%ve1
772-
else !< bc_x%end
772+
else
773773
q_prim_vf(i)%sf(m + j, k, l) = q_prim_vf(i)%sf(m, k, l)
774774
end if
775775
end do
@@ -791,7 +791,7 @@ contains
791791
do j = 1, buff_size
792792
if (i == momxb + 1) then
793793
q_prim_vf(i)%sf(k, n + j, l) = -q_prim_vf(i)%sf(k, n - (j - 1), l) + 2._wp*bc_y%ve2
794-
else !< bc_z%end
794+
else
795795
q_prim_vf(i)%sf(k, n + j, l) = q_prim_vf(i)%sf(k, n, l)
796796
end if
797797
end do
@@ -808,12 +808,12 @@ contains
808808
end if
809809
end do
810810
end do
811-
else !< bc_x%end
811+
else !< bc_z%end
812812
do i = 1, sys_size
813813
do j = 1, buff_size
814814
if (i == momxe) then
815815
q_prim_vf(i)%sf(k, l, p + j) = -q_prim_vf(i)%sf(k, l, p - (j - 1)) + 2._wp*bc_z%ve3
816-
else !< bc_y%end
816+
else
817817
q_prim_vf(i)%sf(k, l, p + j) = q_prim_vf(i)%sf(k, l, p)
818818
end if
819819
end do
@@ -848,7 +848,7 @@ contains
848848
end if
849849
end do
850850
end do
851-
else !< bc_z%end
851+
else !< bc_x%end
852852
do i = 1, sys_size
853853
do j = 1, buff_size
854854
if (i == momxb) then
@@ -857,7 +857,7 @@ contains
857857
q_prim_vf(i)%sf(m + j, k, l) = -q_prim_vf(i)%sf(m - (j - 1), k, l) + 2._wp*bc_x%ve2
858858
else if (i == momxb + 2 .and. num_dims > 2) then
859859
q_prim_vf(i)%sf(m + j, k, l) = -q_prim_vf(i)%sf(m - (j - 1), k, l) + 2._wp*bc_x%ve3
860-
else !< bc_x%end
860+
else
861861
q_prim_vf(i)%sf(m + j, k, l) = q_prim_vf(i)%sf(m, k, l)
862862
end if
863863
end do
@@ -887,7 +887,7 @@ contains
887887
q_prim_vf(i)%sf(k, n + j, l) = -q_prim_vf(i)%sf(k, n - (j - 1), l) + 2._wp*bc_y%ve2
888888
else if (i == momxb + 2 .and. num_dims > 2) then
889889
q_prim_vf(i)%sf(k, n + j, l) = -q_prim_vf(i)%sf(k, n - (j - 1), l) + 2._wp*bc_y%ve3
890-
else !< bc_z%end
890+
else
891891
q_prim_vf(i)%sf(k, n + j, l) = q_prim_vf(i)%sf(k, n, l)
892892
end if
893893
end do
@@ -908,7 +908,7 @@ contains
908908
end if
909909
end do
910910
end do
911-
else !< bc_x%end
911+
else !< bc_z%end
912912
do i = 1, sys_size
913913
do j = 1, buff_size
914914
if (i == momxb) then
@@ -938,7 +938,7 @@ contains
938938

939939
#ifdef MFC_SIMULATION
940940
if (bc_dir == 1) then !< x-direction
941-
if (bc_loc == -1) then ! bc_x%beg !< bc_z%beg
941+
if (bc_loc == -1) then ! bc_x%beg
942942
do i = 1, sys_size
943943
do j = 1, buff_size
944944
q_prim_vf(i)%sf(-j, k, l) = bc_buffers(1, 1)%sf(i, k, l)
@@ -1000,7 +1000,7 @@ contains
10001000
integer :: j, q, i
10011001

10021002
if (bc_dir == 1) then !< x-direction
1003-
if (bc_loc == -1) then ! bc_x%beg !< bc_x%beg
1003+
if (bc_loc == -1) then ! bc_x%beg
10041004
do i = 1, nb
10051005
do q = 1, nnode
10061006
do j = 1, buff_size
@@ -1049,7 +1049,7 @@ contains
10491049
end do
10501050
end do
10511051
end do
1052-
else !< bc_y%end
1052+
else !< bc_z%end
10531053
do i = 1, nb
10541054
do q = 1, nnode
10551055
do j = 1, buff_size
@@ -1207,7 +1207,7 @@ contains
12071207
real(wp) :: y_kahan, t_kahan
12081208

12091209
if (bc_dir == 1) then !< x-direction
1210-
if (bc_loc == -1) then ! bc_x%beg !< bc_y%beg
1210+
if (bc_loc == -1) then ! bc_x%beg
12111211
do i = 1, nvar
12121212
do j = -mapCells - 1, mapCells
12131213
! Kahan-compensated addition of ghost to interior
@@ -1219,7 +1219,7 @@ contains
12191219
q_beta(beta_vars(i))%sf(j, k, l) = t_kahan
12201220
end do
12211221
end do
1222-
else !< bc_z%end
1222+
else
12231223
do i = 1, nvar
12241224
do j = -mapcells, mapcells + 1
12251225
q_beta(beta_vars(i))%sf(m + j, k, l) = q_beta(beta_vars(i))%sf(j - 1, k, l)
@@ -1238,7 +1238,7 @@ contains
12381238
q_beta(beta_vars(i))%sf(k, j, l) = t_kahan
12391239
end do
12401240
end do
1241-
else !< bc_x%end
1241+
else
12421242
do i = 1, nvar
12431243
do j = -mapcells, mapcells + 1
12441244
q_beta(beta_vars(i))%sf(k, n + j, l) = q_beta(beta_vars(i))%sf(k, j - 1, l)
@@ -1257,7 +1257,7 @@ contains
12571257
q_beta(beta_vars(i))%sf(k, l, j) = t_kahan
12581258
end do
12591259
end do
1260-
else !< bc_y%end
1260+
else
12611261
do i = 1, nvar
12621262
do j = -mapcells, mapcells + 1
12631263
q_beta(beta_vars(i))%sf(k, l, p + j) = q_beta(beta_vars(i))%sf(k, l, j - 1)
@@ -1281,13 +1281,13 @@ contains
12811281
! Set beta in buffer regions equal to zero
12821282

12831283
if (bc_dir == 1) then !< x-direction
1284-
if (bc_loc == -1) then ! bc_x%beg !< bc_z%beg
1284+
if (bc_loc == -1) then ! bc_x%beg
12851285
do i = 1, nvar
12861286
do j = 1, buff_size
12871287
q_beta(beta_vars(i))%sf(-j, k, l) = 0._wp
12881288
end do
12891289
end do
1290-
else !< bc_z%end
1290+
else
12911291
do i = 1, nvar
12921292
do j = 1, buff_size
12931293
q_beta(beta_vars(i))%sf(m + j, k, l) = 0._wp
@@ -1301,7 +1301,7 @@ contains
13011301
q_beta(beta_vars(i))%sf(k, -j, l) = 0._wp
13021302
end do
13031303
end do
1304-
else !< bc_x%end
1304+
else
13051305
do i = 1, nvar
13061306
do j = 1, buff_size
13071307
q_beta(beta_vars(i))%sf(k, n + j, l) = 0._wp
@@ -1341,7 +1341,7 @@ contains
13411341
! ghost cells = mirror of (now-folded) interior values
13421342

13431343
if (bc_dir == 1) then !< x-direction
1344-
if (bc_loc == -1) then ! bc_x%beg !< bc_x%beg
1344+
if (bc_loc == -1) then ! bc_x%beg
13451345
do i = 1, nvar
13461346
do j = 1, mapCells + 1
13471347
y_kahan = real(q_beta(beta_vars(i))%sf(-j, k, l), kind=wp) + kahan_comp(beta_vars(i))%sf(-j, k, &
@@ -1417,7 +1417,7 @@ contains
14171417
kahan_comp(beta_vars(i))%sf(k, l, -j) = kahan_comp(beta_vars(i))%sf(k, l, j - 1)
14181418
end do
14191419
end do
1420-
else !< bc_y%end
1420+
else
14211421
do i = 1, nvar
14221422
do j = 1, mapCells + 1
14231423
y_kahan = real(q_beta(beta_vars(i))%sf(k, l, p + j), kind=wp) + kahan_comp(beta_vars(i))%sf(k, l, &
@@ -1467,7 +1467,7 @@ contains
14671467

14681468
if (bc_x%end >= 0) then
14691469
call s_mpi_sendrecv_variables_buffers(c_divs, 1, 1, num_dims + 1)
1470-
else !< bc_z%end
1470+
else
14711471
$:GPU_PARALLEL_LOOP(private='[l, k]', collapse=2)
14721472
do l = 0, p
14731473
do k = 0, n
@@ -1490,7 +1490,7 @@ contains
14901490
!> y-direction
14911491
if (bc_y%beg >= 0) then
14921492
call s_mpi_sendrecv_variables_buffers(c_divs, 2, -1, num_dims + 1)
1493-
else !< bc_x%end
1493+
else
14941494
$:GPU_PARALLEL_LOOP(private='[l, k]', collapse=2)
14951495
do l = 0, p
14961496
do k = -buff_size, m + buff_size
@@ -1533,7 +1533,7 @@ contains
15331533
!> z-direction
15341534
if (bc_z%beg >= 0) then
15351535
call s_mpi_sendrecv_variables_buffers(c_divs, 3, -1, num_dims + 1)
1536-
else !< bc_y%end
1536+
else
15371537
$:GPU_PARALLEL_LOOP(private='[l, k]', collapse=2)
15381538
do l = -buff_size, n + buff_size
15391539
do k = -buff_size, m + buff_size
@@ -1552,7 +1552,7 @@ contains
15521552

15531553
if (bc_z%end >= 0) then
15541554
call s_mpi_sendrecv_variables_buffers(c_divs, 3, 1, num_dims + 1)
1555-
else !< bc_z%end
1555+
else
15561556
$:GPU_PARALLEL_LOOP(private='[l, k]', collapse=2)
15571557
do l = -buff_size, n + buff_size
15581558
do k = -buff_size, m + buff_size
@@ -1582,7 +1582,7 @@ contains
15821582
integer :: j, i
15831583

15841584
if (bc_dir == 1) then !< x-direction
1585-
if (bc_loc == -1) then ! bc_x%beg !< bc_y%beg
1585+
if (bc_loc == -1) then ! bc_x%beg
15861586
do i = 1, num_dims + 1
15871587
do j = 1, buff_size
15881588
c_divs(i)%sf(-j, k, l) = c_divs(i)%sf(m - (j - 1), k, l)
@@ -1602,7 +1602,7 @@ contains
16021602
c_divs(i)%sf(k, -j, l) = c_divs(i)%sf(k, n - (j - 1), l)
16031603
end do
16041604
end do
1605-
else
1605+
else !< bc_y%end
16061606
do i = 1, num_dims + 1
16071607
do j = 1, buff_size
16081608
c_divs(i)%sf(k, n + j, l) = c_divs(i)%sf(k, j - 1, l)
@@ -1637,7 +1637,7 @@ contains
16371637
integer :: j, i
16381638

16391639
if (bc_dir == 1) then !< x-direction
1640-
if (bc_loc == -1) then ! bc_x%beg !< bc_z%beg
1640+
if (bc_loc == -1) then ! bc_x%beg
16411641
do i = 1, num_dims + 1
16421642
do j = 1, buff_size
16431643
if (i == bc_dir) then
@@ -1669,7 +1669,7 @@ contains
16691669
end if
16701670
end do
16711671
end do
1672-
else
1672+
else !< bc_y%end
16731673
do i = 1, num_dims + 1
16741674
do j = 1, buff_size
16751675
if (i == bc_dir) then
@@ -1691,7 +1691,7 @@ contains
16911691
end if
16921692
end do
16931693
end do
1694-
else
1694+
else !< bc_z%end
16951695
do i = 1, num_dims + 1
16961696
do j = 1, buff_size
16971697
if (i == bc_dir) then
@@ -1716,7 +1716,7 @@ contains
17161716
integer :: j, i
17171717

17181718
if (bc_dir == 1) then !< x-direction
1719-
if (bc_loc == -1) then ! bc_x%beg !< bc_x%beg
1719+
if (bc_loc == -1) then ! bc_x%beg
17201720
do i = 1, num_dims + 1
17211721
do j = 1, buff_size
17221722
c_divs(i)%sf(-j, k, l) = c_divs(i)%sf(0, k, l)

‎src/common/m_mpi_common.fpp‎

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

127127
#ifdef MFC_MPI
128128
! Generic loop iterator
129-
integer :: i, j !< Generic loop iterators
129+
integer :: i, j
130130
integer :: ierr !< Generic flag used to identify and report MPI errors
131131

132132
! Altered system size for the lagrangian subgrid bubble model

‎src/post_process/m_global_parameters.fpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -965,7 +965,7 @@ contains
965965
!> Deallocation procedures for the module
966966
impure subroutine s_finalize_global_parameters_module
967967

968-
integer :: i !< Generic loop iterator
968+
integer :: i
969969

970970
! Deallocating the grid variables for the x-coordinate direction
971971

‎src/pre_process/m_global_parameters.fpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ module m_global_parameters
183183
logical :: bc_io !< whether or not to save BC data
184184
!> Boundary condition patch parameters Database of the boundary condition patch parameters for each of the patches employed in
185185
!! the configuration of the boundary conditions
186-
type(bc_patch_parameters), dimension(num_bc_patches_max) :: patch_bc !< Boundary condition patch parameters
186+
type(bc_patch_parameters), dimension(num_bc_patches_max) :: patch_bc
187187
188188
! Fluids Physical Parameters
189189
!> Database of the physical parameters of each of the fluids that is present in the flow. These include the stiffened gas
@@ -981,7 +981,7 @@ contains
981981
!> @brief Deallocates all global grid, index, and equation-of-state parameter arrays.
982982
impure subroutine s_finalize_global_parameters_module
983983
984-
integer :: i !< Generic loop operator
984+
integer :: i
985985
986986
! Deallocating grid variables for the x-direction
987987

‎src/simulation/m_compute_levelset.fpp‎

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

8181
type(ghost_point), intent(inout) :: gp
8282
real(wp) :: radius, dist
83-
real(wp), dimension(2) :: center !< x and y coordinates in local IB frame
83+
real(wp), dimension(2) :: center
8484
real(wp), dimension(3) :: dist_vec
8585
integer :: i, j, ib_patch_id !< Loop index variables
8686
ib_patch_id = gp%ib_patch_id

0 commit comments

Comments
 (0)