Skip to content

Commit 6131df3

Browse files
sbryngelsonsbryngelson
committed
fix: remove more unused variables and dead code
Remove unused locals in m_boundary_common.fpp (status, i, offset), m_model.fpp (theta, ndot, norm_mag, c, total_vertices, eta, max_iv1/2), and m_data_input.f90 (delx, dely, delz). Remove dead module-level bubrs_qbmm from m_qbmm.fpp (allocated and GPU-updated but never read by any code).
1 parent ab00a28 commit 6131df3

4 files changed

Lines changed: 12 additions & 31 deletions

File tree

‎src/common/m_boundary_common.fpp‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1573,7 +1573,7 @@ contains
15731573
type(integer_field), dimension(1:num_dims,1:2), intent(in) :: bc_type
15741574
logical, intent(in) :: old_grid_in
15751575
character(LEN=*), intent(in) :: step_dirpath
1576-
integer :: dir, loc, i
1576+
integer :: dir, loc
15771577
character(len=path_len) :: file_path
15781578
character(len=10) :: status
15791579

@@ -1612,12 +1612,10 @@ contains
16121612
type(integer_field), dimension(1:num_dims,1:2), intent(in) :: bc_type
16131613
integer :: dir, loc
16141614
character(len=path_len) :: file_loc, file_path
1615-
character(len=10) :: status
16161615

16171616
#ifdef MFC_MPI
16181617
integer :: ierr
16191618
integer :: file_id
1620-
integer :: offset
16211619
character(len=7) :: proc_rank_str
16221620
logical :: dir_check
16231621
integer :: nelements
@@ -1642,8 +1640,6 @@ contains
16421640
file_path = trim(file_loc) // '/bc_' // trim(proc_rank_str) // '.dat'
16431641
call MPI_File_open(MPI_COMM_SELF, trim(file_path), MPI_MODE_CREATE + MPI_MODE_WRONLY, MPI_INFO_NULL, file_id, ierr)
16441642

1645-
offset = 0
1646-
16471643
! Write bc_types
16481644
do dir = 1, num_dims
16491645
do loc = 1, 2
@@ -1678,7 +1674,6 @@ contains
16781674
integer :: dir, loc
16791675
logical :: file_exist
16801676
character(len=path_len) :: file_path
1681-
character(len=10) :: status
16821677

16831678
! Read bc_types
16841679

@@ -1721,12 +1716,10 @@ contains
17211716
type(integer_field), dimension(1:num_dims,1:2), intent(inout) :: bc_type
17221717
integer :: dir, loc
17231718
character(len=path_len) :: file_loc, file_path
1724-
character(len=10) :: status
17251719

17261720
#ifdef MFC_MPI
17271721
integer :: ierr
17281722
integer :: file_id
1729-
integer :: offset
17301723
character(len=7) :: proc_rank_str
17311724
logical :: dir_check
17321725
integer :: nelements
@@ -1750,8 +1743,6 @@ contains
17501743
file_path = trim(file_loc) // '/bc_' // trim(proc_rank_str) // '.dat'
17511744
call MPI_File_open(MPI_COMM_SELF, trim(file_path), MPI_MODE_RDONLY, MPI_INFO_NULL, file_id, ierr)
17521745

1753-
offset = 0
1754-
17551746
! Read bc_types
17561747
do dir = 1, num_dims
17571748
do loc = 1, 2

‎src/common/m_model.fpp‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,7 @@ contains
488488
real(wp), dimension(1:3), intent(in) :: point
489489
real(wp), dimension(1:3), intent(in) :: spacing
490490
integer, intent(in) :: spc
491-
real(wp) :: phi, theta
491+
real(wp) :: phi
492492
integer :: rand_seed
493493
real(wp) :: fraction
494494
type(t_ray) :: ray
@@ -779,7 +779,7 @@ contains
779779
real(wp) :: v1(1:3), v2(1:3), v3(1:3)
780780
real(wp) :: e0(1:3), e1(1:3), pv(1:3)
781781
real(wp) :: n(1:3), proj(1:3), norm_vec(1:3)
782-
real(wp) :: d, ndot, denom, norm_mag
782+
real(wp) :: d, denom, norm_mag
783783
real(wp) :: u, v_bary, w
784784
real(wp) :: l00, l01, l11, l20, l21
785785
real(wp) :: edge(1:3), pe(1:3)
@@ -905,9 +905,9 @@ contains
905905
real(wp), dimension(1:3), intent(out) :: normals
906906
real(wp), intent(out) :: distance
907907
integer :: i
908-
real(wp) :: dist_min, dist, t, norm_mag
908+
real(wp) :: dist_min, dist, t
909909
real(wp) :: v1(1:2), v2(1:2), edge(1:2), pv(1:2)
910-
real(wp) :: edge_len_sq, proj(1:2), norm(1:2), c
910+
real(wp) :: edge_len_sq, proj(1:2), norm(1:2)
911911

912912
dist_min = initial_distance_buffer
913913
normals = 0._wp
@@ -967,16 +967,15 @@ contains
967967
subroutine s_instantiate_STL_models()
968968

969969
! Variables for IBM+STL
970-
real(wp) :: normals(1:3) !< Boundary normal buffer
971-
integer :: boundary_vertex_count, boundary_edge_count, total_vertices !< Boundary vertex
972-
real(wp), allocatable, dimension(:,:,:) :: boundary_v !< Boundary vertex buffer
973-
real(wp) :: dx_local, dy_local, dz_local !< Levelset distance buffer
974-
integer :: i, j, k !< Generic loop iterators
970+
real(wp) :: normals(1:3) !< Boundary normal buffer
971+
integer :: boundary_vertex_count, boundary_edge_count !< Boundary vertex
972+
real(wp), allocatable, dimension(:,:,:) :: boundary_v !< Boundary vertex buffer
973+
real(wp) :: dx_local, dy_local, dz_local !< Levelset distance buffer
974+
integer :: i, j, k !< Generic loop iterators
975975
integer :: patch_id
976976
type(t_bbox) :: bbox, bbox_old
977977
type(t_model) :: model
978978
type(ic_model_parameters) :: params
979-
real(wp) :: eta
980979
real(wp), dimension(1:3) :: point, model_center
981980
real(wp) :: grid_mm(1:3,1:2)
982981
real(wp), dimension(1:4,1:4) :: transform, transform_n
@@ -1066,11 +1065,10 @@ contains
10661065
! Pack and upload flat arrays for GPU (AFTER the loop)
10671066
block
10681067
integer :: pid, max_ntrs
1069-
integer :: max_bv1, max_bv2, max_bv3, max_iv1, max_iv2
1068+
integer :: max_bv1, max_bv2, max_bv3
10701069

10711070
max_ntrs = 0
10721071
max_bv1 = 0; max_bv2 = 0; max_bv3 = 0
1073-
max_iv1 = 0; max_iv2 = 0
10741072

10751073
do pid = 1, num_ibs
10761074
if (allocated(models(pid)%model)) then

‎src/post_process/m_data_input.f90‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,6 @@ impure subroutine s_read_parallel_data_files(t_step)
258258
integer(KIND=MPI_OFFSET_KIND) :: NVARS_MOK
259259
integer(KIND=MPI_OFFSET_KIND) :: MOK
260260
integer(kind=MPI_OFFSET_KIND) :: offset
261-
real(wp) :: delx, dely, delz
262261
character(LEN=path_len + 2*name_len) :: file_loc
263262
logical :: file_exist
264263
character(len=10) :: t_step_string

‎src/simulation/m_qbmm.fpp‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,8 @@ module m_qbmm
3232
type(int_bounds_info) :: is1_qbmm, is2_qbmm, is3_qbmm
3333
$:GPU_DECLARE(create='[is1_qbmm, is2_qbmm, is3_qbmm]')
3434

35-
integer, allocatable, dimension(:) :: bubrs_qbmm
3635
integer, allocatable, dimension(:,:) :: bubmoms
37-
$:GPU_DECLARE(create='[bubrs_qbmm, bubmoms]')
36+
$:GPU_DECLARE(create='[bubmoms]')
3837

3938
contains
4039

@@ -383,14 +382,8 @@ contains
383382

384383
$:GPU_UPDATE(device='[momrhs]')
385384

386-
@:ALLOCATE(bubrs_qbmm(1:nb))
387385
@:ALLOCATE(bubmoms(1:nb, 1:nmom))
388386

389-
do i = 1, nb
390-
bubrs_qbmm(i) = bub_idx%rs(i)
391-
end do
392-
$:GPU_UPDATE(device='[bubrs_qbmm]')
393-
394387
do j = 1, nmom
395388
do i = 1, nb
396389
bubmoms(i, j) = bub_idx%moms(i, j)

0 commit comments

Comments
 (0)