Skip to content

Commit

Permalink
Remove unused variables reported by gfortran -Wall from shared code.
Browse files Browse the repository at this point in the history
  • Loading branch information
mgduda authored and douglasjacobsen committed Nov 15, 2013
1 parent 29326b7 commit 8d82e7f
Show file tree
Hide file tree
Showing 16 changed files with 67 additions and 189 deletions.
1 change: 0 additions & 1 deletion src/driver/mpas_subdriver.F
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ subroutine mpas_init()

implicit none

real (kind=RKIND) :: dt
character(len=StrKIND) :: timeStamp
integer :: ierr

Expand Down
20 changes: 6 additions & 14 deletions src/framework/mpas_block_creator.F
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ subroutine mpas_block_creator_setup_blocks_and_0halo_cells(domain, indexToCellID
type (block_type), pointer :: blockCursor
type (field1dInteger), pointer :: fieldCursor

integer :: i, iHalo
integer :: i
integer :: nBlocks

nBlocks = size(blockID)
Expand Down Expand Up @@ -147,10 +147,7 @@ subroutine mpas_block_creator_build_0halo_cell_fields(indexToCellIDBlock, nEdges

integer, dimension(:), pointer :: sendingHaloLayers

type (mpas_exchange_list), pointer :: exchListPtr

integer :: nCellsInBlock, maxEdges, nHalos
integer :: i, iHalo

nHalos = config_num_halos

Expand Down Expand Up @@ -285,15 +282,12 @@ subroutine mpas_block_creator_build_0_and_1halo_edge_fields(indexToEdgeIDBlock,

type (field0dInteger), pointer :: offSetCursor, edgeLimitCursor
type (field1dInteger), pointer :: indexToCellCursor, indexToEdgeCursor, nEdgesCursor, haloCursor, nEdgesSolveCursor
type (field2dInteger), pointer :: edgesOnCellCursor, cellsOnEdgeCursor, cellsOnCellCursor

type (mpas_exchange_list), pointer :: exchListPtr
type (field2dInteger), pointer :: edgesOnCellCursor, cellsOnEdgeCursor

integer, dimension(:), pointer :: localEdgeList
integer, dimension(:), pointer :: sendingHaloLayers
integer :: nEdgesLocal, nCellsInBlock, maxEdges, edgeDegree, nHalos
integer :: haloStart
integer :: iBlock, i, j, k

! Setup sendingHaloLayers
allocate(sendingHaloLayers(1))
Expand Down Expand Up @@ -510,10 +504,8 @@ subroutine mpas_block_creator_build_cell_halos(indexToCellID, nEdgesOnCell, cell

type (graph), pointer :: blockGraph, blockGraphWithHalo

type (mpas_exchange_list), pointer :: exchListPtr

integer :: nHalos, nCellsInBlock, nCellsInHalo, maxEdges
integer :: iHalo, iBlock, i
integer :: iHalo

nHalos = config_num_halos
dminfo => indexToCellID % block % domain % dminfo
Expand Down Expand Up @@ -768,15 +760,15 @@ subroutine mpas_block_creator_build_edge_halos(indexToCellID, nEdgesOnCell, nCel
type (field1dInteger), pointer :: haloIndices
type (field0dInteger), pointer :: offSetCursor, edgeLimitCursor
type (field1dInteger), pointer :: indexToCellCursor, nEdgesCursor, nCellsSolveCursor, indexToEdgeCursor, nEdgesSolveCursor, haloCursor
type (field1dInteger), pointer :: nEdgesCursor, nCellsSolveCursor, indexToEdgeCursor, nEdgesSolveCursor, haloCursor
type (field2dInteger), pointer :: edgesOnCellCursor, cellsOnEdgeCursor
integer, dimension(:), pointer :: sendingHaloLayers
integer, dimension(:), pointer :: array1dHolder, localEdgeList
integer, dimension(:,:), pointer :: array2dHolder
integer :: iHalo, iBlock, i, j, k
integer :: nHalos, nBlocks, nCellsInBlock, nEdgesLocal, haloStart, haloEnd, haloSize
integer :: iHalo, iBlock, i, j
integer :: nHalos, nBlocks, nCellsInBlock, nEdgesLocal, haloSize
integer :: maxEdges, edgeDegree
type (hashtable), dimension(:), pointer :: edgeList
Expand Down
2 changes: 1 addition & 1 deletion src/framework/mpas_block_decomp.F
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ subroutine mpas_block_decomp_cells_for_proc(dminfo, partial_global_graph_info, l
integer, dimension(:), allocatable :: local_block_list
integer, dimension(:,:), allocatable :: sorted_local_cell_list
integer :: i, j, global_block_id, local_block_id, owning_proc, iunit, istatus
integer :: i, global_block_id, local_block_id, owning_proc, iunit, istatus
integer :: blocks_per_proc
integer, dimension(:), pointer :: local_nvertices
character (len=StrKIND) :: filename
Expand Down
62 changes: 19 additions & 43 deletions src/framework/mpas_dmpar.F
Original file line number Diff line number Diff line change
Expand Up @@ -910,8 +910,8 @@ subroutine mpas_dmpar_get_exch_list(haloLayer, ownedListField, neededListField,
type (dm_info), pointer :: dminfo

integer :: i, j, k, kk, iBlock
integer :: totalSize, nMesgRecv, nMesgSend, recvNeighbor, sendNeighbor, currentProc, offset
integer :: totalSent, totalRecv
integer :: totalSize, nMesgRecv, nMesgSend, recvNeighbor, sendNeighbor, currentProc
integer :: totalSent
integer, allocatable, dimension(:) :: numToSend, numToRecv
integer, allocatable, dimension(:) :: ownedList, ownedListIndex, ownedBlock, neededList, neededListIndex, neededBlock
integer, allocatable, dimension(:) :: offsetList, ownedLimitList
Expand Down Expand Up @@ -1500,7 +1500,7 @@ subroutine mpas_dmpar_build_comm_lists(sendExchList, recvExchList, haloLayers, d
! local variables
!-----------------------------------------------------------------
type (mpas_multihalo_exchange_list), pointer :: sendListCursor, recvListCursor
type (mpas_exchange_list), pointer :: exchListPtr, exchListPtr2
type (mpas_exchange_list), pointer :: exchListPtr
type (mpas_communication_list), pointer :: commListPtr, commListPtr2
logical :: comm_list_found
integer :: nAdded, bufferOffset
Expand Down Expand Up @@ -1673,13 +1673,12 @@ subroutine mpas_dmpar_alltoall_field1d_integer(fieldIn, fieldout, haloLayersIn)!
integer, dimension(:), pointer, optional :: haloLayersIn !< Input: Halo layers to communicated. Defaults to all.
type (field1dInteger), pointer :: fieldInPtr, fieldOutPtr
type (mpas_exchange_list), pointer :: exchListPtr, exchListPtr2
type (mpas_exchange_list), pointer :: exchListPtr
type (mpas_communication_list), pointer :: sendList, recvList, commListPtr, commListPtr2
type (dm_info), pointer :: dminfo
logical :: comm_list_found
integer :: lastPackedIdx, lastUnpackedIdx, nPacked, nUnpacked
integer :: nAdded, bufferOffset
integer :: mpi_ierr
integer :: iHalo, iBuffer, i
Expand Down Expand Up @@ -1964,13 +1963,12 @@ subroutine mpas_dmpar_alltoall_field2d_integer(fieldIn, fieldout, haloLayersIn)!
integer, dimension(:), pointer, optional :: haloLayersIn !< Input: List of halo layers to communicate. Defaults to all
type (field2dInteger), pointer :: fieldInPtr, fieldOutPtr
type (mpas_exchange_list), pointer :: exchListPtr, exchListPtr2
type (mpas_exchange_list), pointer :: exchListPtr
type (mpas_communication_list), pointer :: sendList, recvList, commListPtr, commListPtr2
type (dm_info), pointer :: dminfo
logical :: comm_list_found
integer :: lastPackedIdx, lastUnpackedIdx, nPacked, nUnpacked
integer :: nAdded, bufferOffset
integer :: mpi_ierr
integer :: iHalo, iBuffer, i, j
Expand Down Expand Up @@ -2256,13 +2254,12 @@ subroutine mpas_dmpar_alltoall_field3d_integer(fieldIn, fieldout, haloLayersIn)!
integer, dimension(:), pointer, optional :: haloLayersIn !< Input: List of halo layers to communicate. Defaults to all
type (field3dInteger), pointer :: fieldInPtr, fieldOutPtr
type (mpas_exchange_list), pointer :: exchListPtr, exchListPtr2
type (mpas_exchange_list), pointer :: exchListPtr
type (mpas_communication_list), pointer :: sendList, recvList, commListPtr, commListPtr2
type (dm_info), pointer :: dminfo
logical :: comm_list_found
integer :: lastPackedIdx, lastUnpackedIdx, nPacked, nUnpacked
integer :: nAdded, bufferOffset
integer :: mpi_ierr
integer :: iHalo, iBuffer, i, j, k
Expand Down Expand Up @@ -2555,13 +2552,12 @@ subroutine mpas_dmpar_alltoall_field1d_real(fieldIn, fieldout, haloLayersIn)!{{{
integer, dimension(:), pointer, optional :: haloLayersIn !< Input: List of halo layers to communicate. Defaults to all
type (field1dReal), pointer :: fieldInPtr, fieldOutPtr
type (mpas_exchange_list), pointer :: exchListPtr, exchListPtr2
type (mpas_exchange_list), pointer :: exchListPtr
type (mpas_communication_list), pointer :: sendList, recvList, commListPtr, commListPtr2
type (dm_info), pointer :: dminfo
logical :: comm_list_found
integer :: lastPackedIdx, lastUnpackedIdx, nPacked, nUnpacked
integer :: nAdded, bufferOffset
integer :: mpi_ierr
integer :: iHalo, iBuffer, i
Expand Down Expand Up @@ -2844,13 +2840,12 @@ subroutine mpas_dmpar_alltoall_field2d_real(fieldIn, fieldout, haloLayersIn)!{{{
integer, dimension(:), pointer, optional :: haloLayersIn !< Input: List of halo layers to communicate. Defaults to all
type (field2dReal), pointer :: fieldInPtr, fieldOutPtr
type (mpas_exchange_list), pointer :: exchListPtr, exchListPtr2
type (mpas_exchange_list), pointer :: exchListPtr
type (mpas_communication_list), pointer :: sendList, recvList, commListPtr, commListPtr2
type (dm_info), pointer :: dminfo
logical :: comm_list_found
integer :: lastPackedIdx, lastUnpackedIdx, nPacked, nUnpacked
integer :: nAdded, bufferOffset
integer :: mpi_ierr
integer :: iHalo, iBuffer, i, j
Expand Down Expand Up @@ -3137,13 +3132,12 @@ subroutine mpas_dmpar_alltoall_field3d_real(fieldIn, fieldout, haloLayersIn)!{{{
integer, dimension(:), pointer, optional :: haloLayersIn !< Input: List of halo layers to communicate. Defaults to all
type (field3dReal), pointer :: fieldInPtr, fieldOutPtr
type (mpas_exchange_list), pointer :: exchListPtr, exchListPtr2
type (mpas_exchange_list), pointer :: exchListPtr
type (mpas_communication_list), pointer :: sendList, recvList, commListPtr, commListPtr2
type (dm_info), pointer :: dminfo
logical :: comm_list_found
integer :: lastPackedIdx, lastUnpackedIdx, nPacked, nUnpacked
integer :: nAdded, bufferOffset
integer :: mpi_ierr
integer :: iHalo, iBuffer, i, j, k
Expand Down Expand Up @@ -3438,13 +3432,12 @@ subroutine mpas_dmpar_alltoall_field4d_real(fieldIn, fieldout, haloLayersIn)!{{{
integer, dimension(:), pointer, optional :: haloLayersIn !< Input: List of halo layers to communicate. Defaults to all
type (field4dReal), pointer :: fieldInPtr, fieldOutPtr
type (mpas_exchange_list), pointer :: exchListPtr, exchListPtr2
type (mpas_exchange_list), pointer :: exchListPtr
type (mpas_communication_list), pointer :: sendList, recvList, commListPtr, commListPtr2
type (dm_info), pointer :: dminfo
logical :: comm_list_found
integer :: lastPackedIdx, lastUnpackedIdx, nPacked, nUnpacked
integer :: nAdded, bufferOffset
integer :: mpi_ierr
integer :: iHalo, iBuffer, i, j, k, l
Expand Down Expand Up @@ -3747,13 +3740,12 @@ subroutine mpas_dmpar_alltoall_field5d_real(fieldIn, fieldout, haloLayersIn)!{{{
integer, dimension(:), pointer, optional :: haloLayersIn !< Input: List of halo layers to communicate. Defaults to all.
type (field5dReal), pointer :: fieldInPtr, fieldOutPtr
type (mpas_exchange_list), pointer :: exchListPtr, exchListPtr2
type (mpas_exchange_list), pointer :: exchListPtr
type (mpas_communication_list), pointer :: sendList, recvList, commListPtr, commListPtr2
type (dm_info), pointer :: dminfo
logical :: comm_list_found
integer :: lastPackedIdx, lastUnpackedIdx, nPacked, nUnpacked
integer :: nAdded, bufferOffset
integer :: mpi_ierr
integer :: iHalo, iBuffer, i, j, k, l, m
Expand Down Expand Up @@ -4063,14 +4055,12 @@ subroutine mpas_dmpar_exch_halo_field1d_integer(field, haloLayersIn)!{{{
type (dm_info), pointer :: dminfo
type (field1DInteger), pointer :: fieldCursor, fieldCursor2
type (mpas_exchange_list), pointer :: exchListPtr
type (mpas_communication_list), pointer :: sendList, recvList, commListPtr, commListPtr2
type (mpas_communication_list), pointer :: sendList, recvList, commListPtr
integer :: mpi_ierr
integer :: nHaloLayers, iHalo, i
integer :: bufferOffset, nAdded
integer, dimension(:), pointer :: haloLayers
logical :: comm_list_found
do i = 1, 1
if(field % dimSizes(i) <= 0) then
return
Expand Down Expand Up @@ -4233,14 +4223,12 @@ subroutine mpas_dmpar_exch_halo_field2d_integer(field, haloLayersIn)!{{{
type (dm_info), pointer :: dminfo
type (field2DInteger), pointer :: fieldCursor, fieldCursor2
type (mpas_exchange_list), pointer :: exchListPtr
type (mpas_communication_list), pointer :: sendList, recvList, commListPtr, commListPtr2
type (mpas_communication_list), pointer :: sendList, recvList, commListPtr
integer :: mpi_ierr
integer :: nHaloLayers, iHalo, i, j
integer :: bufferOffset, nAdded
integer, dimension(:), pointer :: haloLayers
logical :: comm_list_found
do i = 1, 2
if(field % dimSizes(i) <= 0) then
return
Expand Down Expand Up @@ -4405,14 +4393,12 @@ subroutine mpas_dmpar_exch_halo_field3d_integer(field, haloLayersIn)!{{{
type (dm_info), pointer :: dminfo
type (field3DInteger), pointer :: fieldCursor, fieldCursor2
type (mpas_exchange_list), pointer :: exchListPtr
type (mpas_communication_list), pointer :: sendList, recvList, commListPtr, commListPtr2
type (mpas_communication_list), pointer :: sendList, recvList, commListPtr
integer :: mpi_ierr
integer :: nHaloLayers, iHalo, i, j, k
integer :: bufferOffset, nAdded
integer, dimension(:), pointer :: haloLayers
logical :: comm_list_found
do i = 1, 3
if(field % dimSizes(i) <= 0) then
return
Expand Down Expand Up @@ -4583,14 +4569,12 @@ subroutine mpas_dmpar_exch_halo_field1d_real(field, haloLayersIn)!{{{
type (dm_info), pointer :: dminfo
type (field1dReal), pointer :: fieldCursor, fieldCursor2
type (mpas_exchange_list), pointer :: exchListPtr
type (mpas_communication_list), pointer :: sendList, recvList, commListPtr, commListPtr2
type (mpas_communication_list), pointer :: sendList, recvList, commListPtr
integer :: mpi_ierr
integer :: nHaloLayers, iHalo, i
integer :: bufferOffset, nAdded
integer, dimension(:), pointer :: haloLayers
logical :: comm_list_found
do i = 1, 1
if(field % dimSizes(i) <= 0) then
return
Expand Down Expand Up @@ -4751,14 +4735,12 @@ subroutine mpas_dmpar_exch_halo_field2d_real(field, haloLayersIn)!{{{
type (dm_info), pointer :: dminfo
type (field2dReal), pointer :: fieldCursor, fieldCursor2
type (mpas_exchange_list), pointer :: exchListPtr
type (mpas_communication_list), pointer :: sendList, recvList, commListPtr, commListPtr2
type (mpas_communication_list), pointer :: sendList, recvList, commListPtr
integer :: mpi_ierr
integer :: nHaloLayers, iHalo, i, j
integer :: bufferOffset, nAdded
integer, dimension(:), pointer :: haloLayers
logical :: comm_list_found
do i = 1, 2
if(field % dimSizes(i) <= 0) then
return
Expand Down Expand Up @@ -4922,14 +4904,12 @@ subroutine mpas_dmpar_exch_halo_field3d_real(field, haloLayersIn)!{{{
type (dm_info), pointer :: dminfo
type (field3dReal), pointer :: fieldCursor, fieldCursor2
type (mpas_exchange_list), pointer :: exchListPtr
type (mpas_communication_list), pointer :: sendList, recvList, commListPtr, commListPtr2
type (mpas_communication_list), pointer :: sendList, recvList, commListPtr
integer :: mpi_ierr
integer :: nHaloLayers, iHalo, i, j, k
integer :: bufferOffset, nAdded
integer, dimension(:), pointer :: haloLayers
logical :: comm_list_found
do i = 1, 3
if(field % dimSizes(i) <= 0) then
return
Expand Down Expand Up @@ -5099,14 +5079,12 @@ subroutine mpas_dmpar_exch_halo_field4d_real(field, haloLayersIn)!{{{
type (dm_info), pointer :: dminfo
type (field4dReal), pointer :: fieldCursor, fieldCursor2
type (mpas_exchange_list), pointer :: exchListPtr
type (mpas_communication_list), pointer :: sendList, recvList, commListPtr, commListPtr2
type (mpas_communication_list), pointer :: sendList, recvList, commListPtr
integer :: mpi_ierr
integer :: nHaloLayers, iHalo, i, j, k, l
integer :: bufferOffset, nAdded
integer, dimension(:), pointer :: haloLayers
logical :: comm_list_found
do i = 1, 4
if(field % dimSizes(i) <= 0) then
return
Expand Down Expand Up @@ -5285,14 +5263,12 @@ subroutine mpas_dmpar_exch_halo_field5d_real(field, haloLayersIn)!{{{
type (dm_info), pointer :: dminfo
type (field5dReal), pointer :: fieldCursor, fieldCursor2
type (mpas_exchange_list), pointer :: exchListPtr
type (mpas_communication_list), pointer :: sendList, recvList, commListPtr, commListPtr2
type (mpas_communication_list), pointer :: sendList, recvList, commListPtr
integer :: mpi_ierr
integer :: nHaloLayers, iHalo, i, j, k, l, m
integer :: bufferOffset, nAdded
integer, dimension(:), pointer :: haloLayers
logical :: comm_list_found
do i = 1, 5
if(field % dimSizes(i) <= 0) then
return
Expand Down
4 changes: 2 additions & 2 deletions src/framework/mpas_hash.F
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ subroutine mpas_hash_insert(h, key)!{{{
type (hashtable), intent(inout) :: h !< Input/Output: Hashtable

! Local variables
integer :: hashval, i
integer :: hashval
type (hashnode), pointer :: hn

hashval = mod(key, TABLESIZE) + 1
Expand Down Expand Up @@ -123,7 +123,7 @@ logical function mpas_hash_search(h, key)!{{{
type (hashtable), intent(inout) :: h !< Input/Output: Hashtable

! Local variables
integer :: hashval, i
integer :: hashval
type (hashnode), pointer :: cursor

mpas_hash_search = .false.
Expand Down
Loading

0 comments on commit 8d82e7f

Please sign in to comment.