<p><b>duda</b> 2013-03-21 17:40:44 -0600 (Thu, 21 Mar 2013)</p><p>BRANCH COMMIT<br>
<br>
Remove more unused variables from shared code as reported by gfortran.<br>
In some cases, unused subroutine arguments have also been removed, leading<br>
to changes in subroutine calls in some core-specific files.<br>
<br>
No change to results for non-hydrostatic atmosphere core.<br>
<br>
<br>
M src/core_hyd_atmos/mpas_atmh_mpas_core.F<br>
M src/core_init_nhyd_atmos/mpas_init_atm_surface.F<br>
M src/core_sw/mpas_sw_mpas_core.F<br>
M src/driver/mpas_subdriver.F<br>
M src/core_nhyd_atmos/mpas_atm_mpas_core.F<br>
M src/core_ocean/mpas_ocn_mpas_core.F<br>
M src/framework/mpas_timer.F<br>
M src/framework/mpas_block_decomp.F<br>
M src/framework/mpas_hash.F<br>
M src/framework/mpas_io_input.F<br>
M src/framework/mpas_sort.F<br>
M src/framework/mpas_io_output.F<br>
M src/framework/mpas_timekeeping.F<br>
M src/framework/mpas_dmpar.F<br>
M src/framework/mpas_io_streams.F<br>
M src/framework/mpas_io.F<br>
M src/framework/mpas_block_creator.F<br>
M src/operators/mpas_rbf_interpolation.F<br>
M src/operators/mpas_spline_interpolation.F<br>
</p><hr noshade><pre><font color="gray">Modified: branches/atmos_physics/src/core_hyd_atmos/mpas_atmh_mpas_core.F
===================================================================
--- branches/atmos_physics/src/core_hyd_atmos/mpas_atmh_mpas_core.F 2013-03-21 23:27:43 UTC (rev 2653)
+++ branches/atmos_physics/src/core_hyd_atmos/mpas_atmh_mpas_core.F 2013-03-21 23:40:44 UTC (rev 2654)
@@ -103,7 +103,7 @@
call mpas_reset_clock_alarm(clock, outputAlarmID, ierr=ierr)
! output_frame will always be > 1 here unless it was reset after the maximum number of frames per outfile was reached
if(output_frame == 1) then
- call mpas_output_state_finalize(output_obj, domain % dminfo)
+ call mpas_output_state_finalize(output_obj)
call mpas_output_state_init(output_obj, domain, "OUTPUT", trim(timeStamp))
end if
call atmh_write_output_frame(output_obj, output_frame, domain)
@@ -115,7 +115,7 @@
! Write one restart time per file
call mpas_output_state_init(restart_obj, domain, "RESTART", trim(timeStamp))
call mpas_output_state_for_domain(restart_obj, domain, 1)
- call mpas_output_state_finalize(restart_obj, domain % dminfo)
+ call mpas_output_state_finalize(restart_obj)
end if
end do
Modified: branches/atmos_physics/src/core_init_nhyd_atmos/mpas_init_atm_surface.F
===================================================================
--- branches/atmos_physics/src/core_init_nhyd_atmos/mpas_init_atm_surface.F 2013-03-21 23:27:43 UTC (rev 2653)
+++ branches/atmos_physics/src/core_init_nhyd_atmos/mpas_init_atm_surface.F 2013-03-21 23:40:44 UTC (rev 2654)
@@ -73,7 +73,7 @@
enddo
- call mpas_output_state_finalize(sfc_update_obj, dminfo)
+ call mpas_output_state_finalize(sfc_update_obj)
end subroutine init_atm_test_case_sfc
Modified: branches/atmos_physics/src/core_nhyd_atmos/mpas_atm_mpas_core.F
===================================================================
--- branches/atmos_physics/src/core_nhyd_atmos/mpas_atm_mpas_core.F 2013-03-21 23:27:43 UTC (rev 2653)
+++ branches/atmos_physics/src/core_nhyd_atmos/mpas_atm_mpas_core.F 2013-03-21 23:40:44 UTC (rev 2654)
@@ -294,7 +294,7 @@
call mpas_reset_clock_alarm(clock, outputAlarmID, ierr=ierr)
! output_frame will always be > 1 here unless it was reset after the maximum number of frames per outfile was reached
if(output_frame == 1) then
- call mpas_output_state_finalize(output_obj, domain % dminfo)
+ call mpas_output_state_finalize(output_obj)
call mpas_output_state_init(output_obj, domain, "OUTPUT", trim(timeStamp))
end if
call atm_write_output_frame(output_obj, output_frame, domain)
@@ -312,7 +312,7 @@
! Write one restart time per file
call mpas_output_state_init(restart_obj, domain, "RESTART", trim(timeStamp))
call mpas_output_state_for_domain(restart_obj, domain, 1)
- call mpas_output_state_finalize(restart_obj, domain % dminfo)
+ call mpas_output_state_finalize(restart_obj)
end if
end do
@@ -482,7 +482,7 @@
type (domain_type), intent(inout) :: domain
integer :: ierr
- if (config_sfc_update_interval /= "none") call mpas_io_input_finalize(sfc_update_obj, domain % dminfo)
+ if (config_sfc_update_interval /= "none") call mpas_io_input_finalize(sfc_update_obj)
call mpas_destroy_clock(clock, ierr)
Modified: branches/atmos_physics/src/core_ocean/mpas_ocn_mpas_core.F
===================================================================
--- branches/atmos_physics/src/core_ocean/mpas_ocn_mpas_core.F 2013-03-21 23:27:43 UTC (rev 2653)
+++ branches/atmos_physics/src/core_ocean/mpas_ocn_mpas_core.F 2013-03-21 23:40:44 UTC (rev 2654)
@@ -394,7 +394,7 @@
! output_frame will always be > 1 here unless it was reset after the
! maximum number of frames per outfile was reached.
if(output_frame == 1) then
- call mpas_output_state_finalize(output_obj, domain % dminfo)
+ call mpas_output_state_finalize(output_obj)
call mpas_output_state_init(output_obj, domain, "OUTPUT", trim(timeStamp))
end if
@@ -419,7 +419,7 @@
! Write one restart time per file
call mpas_output_state_init(restart_obj, domain, "RESTART", trim(timeStamp))
call mpas_output_state_for_domain(restart_obj, domain, 1)
- call mpas_output_state_finalize(restart_obj, domain % dminfo)
+ call mpas_output_state_finalize(restart_obj)
end if
end do
Modified: branches/atmos_physics/src/core_sw/mpas_sw_mpas_core.F
===================================================================
--- branches/atmos_physics/src/core_sw/mpas_sw_mpas_core.F 2013-03-21 23:27:43 UTC (rev 2653)
+++ branches/atmos_physics/src/core_sw/mpas_sw_mpas_core.F 2013-03-21 23:40:44 UTC (rev 2654)
@@ -199,7 +199,7 @@
call mpas_reset_clock_alarm(clock, outputAlarmID, ierr=ierr)
! output_frame will always be > 1 here unless it was reset after the maximum number of frames per outfile was reached
if(output_frame == 1) then
- call mpas_output_state_finalize(output_obj, domain % dminfo)
+ call mpas_output_state_finalize(output_obj)
call mpas_output_state_init(output_obj, domain, "OUTPUT", trim(timeStamp))
end if
call write_output_frame(output_obj, output_frame, domain)
@@ -211,7 +211,7 @@
! Write one restart time per file
call mpas_output_state_init(restart_obj, domain, "RESTART", trim(timeStamp))
call mpas_output_state_for_domain(restart_obj, domain, 1)
- call mpas_output_state_finalize(restart_obj, domain % dminfo)
+ call mpas_output_state_finalize(restart_obj)
end if
end do
Modified: branches/atmos_physics/src/driver/mpas_subdriver.F
===================================================================
--- branches/atmos_physics/src/driver/mpas_subdriver.F 2013-03-21 23:27:43 UTC (rev 2653)
+++ branches/atmos_physics/src/driver/mpas_subdriver.F 2013-03-21 23:40:44 UTC (rev 2654)
@@ -17,7 +17,6 @@
implicit none
- real (kind=RKIND) :: dt
character(len=StrKIND) :: timeStamp
!
@@ -70,7 +69,7 @@
!
! Finalize output streams
!
- call mpas_output_state_finalize(output_obj, domain % dminfo)
+ call mpas_output_state_finalize(output_obj)
!
Modified: branches/atmos_physics/src/framework/mpas_block_creator.F
===================================================================
--- branches/atmos_physics/src/framework/mpas_block_creator.F 2013-03-21 23:27:43 UTC (rev 2653)
+++ branches/atmos_physics/src/framework/mpas_block_creator.F 2013-03-21 23:40:44 UTC (rev 2654)
@@ -54,7 +54,7 @@
type (block_type), pointer :: blockCursor
type (field1dInteger), pointer :: fieldCursor
- integer :: i, iHalo
+ integer :: i
integer :: nBlocks
nBlocks = size(blockID)
@@ -143,10 +143,7 @@
integer, dimension(:), pointer :: sendingHaloLayers
- type (mpas_exchange_list), pointer :: exchListPtr
-
integer :: nCellsInBlock, maxEdges, nHalos
- integer :: i, iHalo
nHalos = config_num_halos
@@ -282,15 +279,12 @@
type (field0dInteger), pointer :: offSetCursor, edgeLimitCursor
type (field1dInteger), pointer :: indexToCellCursor, indexToEdgeCursor, nEdgesCursor, haloCursor, nEdgesSolveCursor
- type (field2dInteger), pointer :: edgesOnCellCursor, cellsOnEdgeCursor, cellsOnCellCursor
+ type (field2dInteger), pointer :: edgesOnCellCursor, cellsOnEdgeCursor
- type (mpas_exchange_list), pointer :: exchListPtr
-
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))
@@ -508,10 +502,8 @@
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
@@ -613,7 +605,7 @@
blockGraph % adjacencyList(:,:) = cellsOnCellCursor % array(:,:)
! Determine all cell id's with the next halo added
- call mpas_block_decomp_add_halo(dminfo, blockGraph, blockGraphWithHalo)
+ call mpas_block_decomp_add_halo(blockGraph, blockGraphWithHalo)
! Setup haloIndices
haloCursor % dimSizes(1) = blockGraphWithHalo % nVerticesTotal - blockGraphWithHalo % nVertices
@@ -754,8 +746,7 @@
!
!-----------------------------------------------------------------------
- subroutine mpas_block_creator_build_edge_halos(indexToCellID, nEdgesOnCell, nCellsSolve, edgesOnCell, indexToEdgeID, cellsOnEdge, nEdgesSolve)!{{{
- type (field1dInteger), pointer :: indexToCellID !< Input: indexToCellID field for all halos
+ subroutine mpas_block_creator_build_edge_halos(nEdgesOnCell, nCellsSolve, edgesOnCell, indexToEdgeID, cellsOnEdge, nEdgesSolve)!{{{
type (field1dInteger), pointer :: nEdgesOnCell !< Input: nEdgesOnCell field for all halos
type (field1dInteger), pointer :: nCellsSolve !< Input: nCellsSolve field for all halos
type (field2dInteger), pointer :: edgesOnCell !< Input/Output: edgesOnCell field for all halos
@@ -767,15 +758,15 @@
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
Modified: branches/atmos_physics/src/framework/mpas_block_decomp.F
===================================================================
--- branches/atmos_physics/src/framework/mpas_block_decomp.F 2013-03-21 23:27:43 UTC (rev 2653)
+++ branches/atmos_physics/src/framework/mpas_block_decomp.F 2013-03-21 23:40:44 UTC (rev 2654)
@@ -43,7 +43,7 @@
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
@@ -334,11 +334,10 @@
end subroutine mpas_block_decomp_all_edges_in_block!}}}
- subroutine mpas_block_decomp_add_halo(dminfo, local_graph_info, local_graph_with_halo)!{{{
+ subroutine mpas_block_decomp_add_halo(local_graph_info, local_graph_with_halo)!{{{
implicit none
- type (dm_info), intent(in) :: dminfo
type (graph), intent(in) :: local_graph_info
type (graph), intent(out) :: local_graph_with_halo
Modified: branches/atmos_physics/src/framework/mpas_dmpar.F
===================================================================
--- branches/atmos_physics/src/framework/mpas_dmpar.F 2013-03-21 23:27:43 UTC (rev 2653)
+++ branches/atmos_physics/src/framework/mpas_dmpar.F 2013-03-21 23:40:44 UTC (rev 2654)
@@ -586,8 +586,8 @@
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
@@ -1132,13 +1132,12 @@
integer, dimension(:), pointer, optional :: haloLayersIn
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
@@ -1412,13 +1411,12 @@
integer, dimension(:), pointer, optional :: haloLayersIn
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
@@ -1693,13 +1691,12 @@
integer, dimension(:), pointer, optional :: haloLayersIn
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
@@ -1981,13 +1978,12 @@
integer, dimension(:), pointer, optional :: haloLayersIn
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
@@ -2259,13 +2255,12 @@
integer, dimension(:), pointer, optional :: haloLayersIn
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
@@ -2541,13 +2536,12 @@
integer, dimension(:), pointer, optional :: haloLayersIn
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
@@ -2831,13 +2825,12 @@
integer, dimension(:), pointer, optional :: haloLayersIn
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
@@ -3129,13 +3122,12 @@
integer, dimension(:), pointer, optional :: haloLayersIn
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
Modified: branches/atmos_physics/src/framework/mpas_hash.F
===================================================================
--- branches/atmos_physics/src/framework/mpas_hash.F 2013-03-21 23:27:43 UTC (rev 2653)
+++ branches/atmos_physics/src/framework/mpas_hash.F 2013-03-21 23:40:44 UTC (rev 2654)
@@ -70,7 +70,7 @@
type (hashtable), intent(inout) :: h
! Local variables
- integer :: hashval, i
+ integer :: hashval
type (hashnode), pointer :: hn
hashval = mod(key, TABLESIZE) + 1
@@ -100,7 +100,7 @@
type (hashtable), intent(inout) :: h
! Local variables
- integer :: hashval, i
+ integer :: hashval
type (hashnode), pointer :: cursor
mpas_hash_search = .false.
Modified: branches/atmos_physics/src/framework/mpas_io.F
===================================================================
--- branches/atmos_physics/src/framework/mpas_io.F 2013-03-21 23:27:43 UTC (rev 2653)
+++ branches/atmos_physics/src/framework/mpas_io.F 2013-03-21 23:40:44 UTC (rev 2654)
@@ -1309,9 +1309,6 @@
integer, intent(out) :: val
integer, intent(out), optional :: ierr
- integer :: pio_ierr
- integer, dimension(1) :: start
- type (fieldlist_type), pointer :: field_cursor
! write(0,*) 'Called MPAS_io_get_var_int0d()'
if (present(ierr)) ierr = MPAS_IO_NOERR
@@ -1330,8 +1327,6 @@
integer, dimension(:), intent(out) :: array
integer, intent(out), optional :: ierr
- integer :: pio_ierr
- type (fieldlist_type), pointer :: field_cursor
! write(0,*) 'Called MPAS_io_get_var_int1d()'
if (present(ierr)) ierr = MPAS_IO_NOERR
@@ -1350,8 +1345,6 @@
integer, dimension(:,:), intent(out) :: array
integer, intent(out), optional :: ierr
- integer :: pio_ierr
- type (fieldlist_type), pointer :: field_cursor
! write(0,*) 'Called MPAS_io_get_var_int2d()'
if (present(ierr)) ierr = MPAS_IO_NOERR
@@ -1370,8 +1363,6 @@
integer, dimension(:,:,:), intent(out) :: array
integer, intent(out), optional :: ierr
- integer :: pio_ierr
- type (fieldlist_type), pointer :: field_cursor
! write(0,*) 'Called MPAS_io_get_var_int3d()'
if (present(ierr)) ierr = MPAS_IO_NOERR
@@ -1390,8 +1381,6 @@
integer, dimension(:,:,:,:), intent(out) :: array
integer, intent(out), optional :: ierr
- integer :: pio_ierr
- type (fieldlist_type), pointer :: field_cursor
! write(0,*) 'Called MPAS_io_get_var_int4d()'
if (present(ierr)) ierr = MPAS_IO_NOERR
@@ -1410,9 +1399,6 @@
real (kind=RKIND), intent(out) :: val
integer, intent(out), optional :: ierr
- integer :: pio_ierr
- integer, dimension(1) :: start
- type (fieldlist_type), pointer :: field_cursor
! write(0,*) 'Called MPAS_io_get_var_real0d()'
if (present(ierr)) ierr = MPAS_IO_NOERR
@@ -1431,8 +1417,6 @@
real (kind=RKIND), dimension(:), intent(out) :: array
integer, intent(out), optional :: ierr
- integer :: pio_ierr
- type (fieldlist_type), pointer :: field_cursor
! write(0,*) 'Called MPAS_io_get_var_real1d()'
if (present(ierr)) ierr = MPAS_IO_NOERR
@@ -1451,8 +1435,6 @@
real (kind=RKIND), dimension(:,:), intent(out) :: array
integer, intent(out), optional :: ierr
- integer :: pio_ierr
- type (fieldlist_type), pointer :: field_cursor
! write(0,*) 'Called MPAS_io_get_var_real2d()'
if (present(ierr)) ierr = MPAS_IO_NOERR
@@ -1471,8 +1453,6 @@
real (kind=RKIND), dimension(:,:,:), intent(out) :: array
integer, intent(out), optional :: ierr
- integer :: pio_ierr
- type (fieldlist_type), pointer :: field_cursor
! write(0,*) 'Called MPAS_io_get_var_real3d()'
if (present(ierr)) ierr = MPAS_IO_NOERR
@@ -1491,8 +1471,6 @@
real (kind=RKIND), dimension(:,:,:,:), intent(out) :: array
integer, intent(out), optional :: ierr
- integer :: pio_ierr
- type (fieldlist_type), pointer :: field_cursor
! write(0,*) 'Called MPAS_io_get_var_real4d()'
if (present(ierr)) ierr = MPAS_IO_NOERR
@@ -1511,8 +1489,6 @@
real (kind=RKIND), dimension(:,:,:,:,:), intent(out) :: array
integer, intent(out), optional :: ierr
- integer :: pio_ierr
- type (fieldlist_type), pointer :: field_cursor
! write(0,*) 'Called MPAS_io_get_var_real5d()'
if (present(ierr)) ierr = MPAS_IO_NOERR
@@ -1531,8 +1507,6 @@
character (len=*), intent(out) :: val
integer, intent(out), optional :: ierr
- integer :: pio_ierr
- type (fieldlist_type), pointer :: field_cursor
! write(0,*) 'Called MPAS_io_get_var_char0d()'
if (present(ierr)) ierr = MPAS_IO_NOERR
@@ -1695,9 +1669,6 @@
integer, intent(in) :: val
integer, intent(out), optional :: ierr
- integer :: pio_ierr
- integer, dimension(1) :: start
- type (fieldlist_type), pointer :: field_cursor
! write(0,*) 'Called MPAS_io_put_var_int0d()'
if (present(ierr)) ierr = MPAS_IO_NOERR
@@ -1716,8 +1687,6 @@
integer, dimension(:), intent(in) :: array
integer, intent(out), optional :: ierr
- integer :: pio_ierr
- type (fieldlist_type), pointer :: field_cursor
! write(0,*) 'Called MPAS_io_put_var_int1d()'
if (present(ierr)) ierr = MPAS_IO_NOERR
@@ -1736,8 +1705,6 @@
integer, dimension(:,:), intent(in) :: array
integer, intent(out), optional :: ierr
- integer :: pio_ierr
- type (fieldlist_type), pointer :: field_cursor
! write(0,*) 'Called MPAS_io_put_var_int2d()'
if (present(ierr)) ierr = MPAS_IO_NOERR
@@ -1756,8 +1723,6 @@
integer, dimension(:,:,:), intent(in) :: array
integer, intent(out), optional :: ierr
- integer :: pio_ierr
- type (fieldlist_type), pointer :: field_cursor
! write(0,*) 'Called MPAS_io_put_var_int3d()'
if (present(ierr)) ierr = MPAS_IO_NOERR
@@ -1776,8 +1741,6 @@
integer, dimension(:,:,:,:), intent(in) :: array
integer, intent(out), optional :: ierr
- integer :: pio_ierr
- type (fieldlist_type), pointer :: field_cursor
! write(0,*) 'Called MPAS_io_put_var_int4d()'
if (present(ierr)) ierr = MPAS_IO_NOERR
@@ -1796,9 +1759,6 @@
real (kind=RKIND), intent(in) :: val
integer, intent(out), optional :: ierr
- integer :: pio_ierr
- integer, dimension(1) :: start
- type (fieldlist_type), pointer :: field_cursor
! write(0,*) 'Called MPAS_io_put_var_real0d()'
if (present(ierr)) ierr = MPAS_IO_NOERR
@@ -1817,8 +1777,6 @@
real (kind=RKIND), dimension(:), intent(in) :: array
integer, intent(out), optional :: ierr
- integer :: pio_ierr
- type (fieldlist_type), pointer :: field_cursor
! write(0,*) 'Called MPAS_io_put_var_real1d()'
if (present(ierr)) ierr = MPAS_IO_NOERR
@@ -1837,8 +1795,6 @@
real (kind=RKIND), dimension(:,:), intent(in) :: array
integer, intent(out), optional :: ierr
- integer :: pio_ierr
- type (fieldlist_type), pointer :: field_cursor
! write(0,*) 'Called MPAS_io_put_var_real2d()'
if (present(ierr)) ierr = MPAS_IO_NOERR
@@ -1857,8 +1813,6 @@
real (kind=RKIND), dimension(:,:,:), intent(in) :: array
integer, intent(out), optional :: ierr
- integer :: pio_ierr
- type (fieldlist_type), pointer :: field_cursor
! write(0,*) 'Called MPAS_io_put_var_real3d()'
if (present(ierr)) ierr = MPAS_IO_NOERR
@@ -1877,8 +1831,6 @@
real (kind=RKIND), dimension(:,:,:,:), intent(in) :: array
integer, intent(out), optional :: ierr
- integer :: pio_ierr
- type (fieldlist_type), pointer :: field_cursor
! write(0,*) 'Called MPAS_io_put_var_real4d()'
if (present(ierr)) ierr = MPAS_IO_NOERR
@@ -1897,8 +1849,6 @@
real (kind=RKIND), dimension(:,:,:,:,:), intent(in) :: array
integer, intent(out), optional :: ierr
- integer :: pio_ierr
- type (fieldlist_type), pointer :: field_cursor
! write(0,*) 'Called MPAS_io_put_var_real5d()'
if (present(ierr)) ierr = MPAS_IO_NOERR
@@ -1917,9 +1867,6 @@
character (len=*), intent(in) :: val
integer, intent(out), optional :: ierr
- integer :: pio_ierr
- type (fieldlist_type), pointer :: field_cursor
-
! write(0,*) 'Called MPAS_io_put_var_char0d()'
if (present(ierr)) ierr = MPAS_IO_NOERR
Modified: branches/atmos_physics/src/framework/mpas_io_input.F
===================================================================
--- branches/atmos_physics/src/framework/mpas_io_input.F 2013-03-21 23:27:43 UTC (rev 2653)
+++ branches/atmos_physics/src/framework/mpas_io_input.F 2013-03-21 23:40:44 UTC (rev 2654)
@@ -42,7 +42,6 @@
type (block_type), pointer :: block_ptr
type (block_type), pointer :: readingBlock
- integer :: i, j, k
type (io_input_object) :: input_obj
#include "dim_decls.inc"
@@ -50,7 +49,6 @@
real (kind=RKIND) :: r_sphere_radius
integer :: ierr
- integer, dimension(:), pointer :: readIndices
type (MPAS_IO_Handle_type) :: inputHandle
type (field1dInteger), pointer :: indexToCellIDField
@@ -63,12 +61,12 @@
type (field2dInteger), pointer :: cellsOnEdgeField
type (field2dInteger), pointer :: cellsOnVertexField
+#ifdef HAVE_ZOLTAN
type (field1dReal), pointer :: xCellField, yCellField, zCellField
type (field1dReal), pointer :: xEdgeField, yEdgeField, zEdgeField
type (field1dReal), pointer :: xVertexField, yVertexField, zVertexField
+#endif
- type (field1DChar) :: xtime
-
type (field1dInteger), pointer :: nCellsSolveField
type (field1dInteger), pointer :: nVerticesSolveField
type (field1dInteger), pointer :: nEdgesSolveField
@@ -85,9 +83,11 @@
type (field1DInteger), pointer :: indexToEdgeID_Block
type (field2DInteger), pointer :: cellsOnEdge_Block
+#ifdef HAVE_ZOLTAN
type (field1DReal), pointer :: xCell, yCell, zCell
type (field1DReal), pointer :: xEdge, yEdge, zEdge
type (field1DReal), pointer :: xVertex, yVertex, zVertex
+#endif
integer, dimension(:), pointer :: local_cell_list
integer, dimension(:), pointer :: block_id, block_start, block_count
@@ -165,13 +165,23 @@
! which cells/edges/vertices are owned by each block, and which are ghost
!
- call mpas_io_setup_cell_block_fields(inputHandle, nreadCells, readCellStart, readingBlock, maxEdges, indexTocellIDField, xCellField, &
- yCellField, zCellField, nEdgesOnCellField, cellsOnCellField, edgesOnCellField, verticesOnCellField)
+ call mpas_io_setup_cell_block_fields(inputHandle, nreadCells, readCellStart, readingBlock, maxEdges, indexTocellIDField, &
+#ifdef HAVE_ZOLTAN
+ xCellField, yCellField, zCellField, &
+#endif
+ nEdgesOnCellField, cellsOnCellField, edgesOnCellField, verticesOnCellField)
- call mpas_io_setup_edge_block_fields(inputHandle, nReadEdges, readEdgeStart, readingBlock, indexToEdgeIDField, xEdgeField, yEdgeField, zEdgeField, cellsOnEdgeField)
+ call mpas_io_setup_edge_block_fields(inputHandle, nReadEdges, readEdgeStart, readingBlock, indexToEdgeIDField, &
+#ifdef HAVE_ZOLTAN
+ xEdgeField, yEdgeField, zEdgeField, &
+#endif
+ cellsOnEdgeField)
call mpas_io_setup_vertex_block_fields(inputHandle, nReadVertices, readVertexStart, readingBlock, vertexDegree, indexToVertexIDField, &
- xVertexField, yVertexField, zVertexField, cellsOnVertexField)
+#ifdef HAVE_ZOLTAN
+ xVertexField, yVertexField, zVertexField, &
+#endif
+ cellsOnVertexField)
!
! Set up a graph derived data type describing the connectivity for the cells
! that were read by this process
@@ -211,8 +221,8 @@
call mpas_block_creator_build_cell_halos(indexToCellID_Block, nEdgesOnCell_Block, cellsOnCell_Block, verticesOnCell_Block, edgesOnCell_Block, nCellsSolveField)
- call mpas_block_creator_build_edge_halos(indexToCellID_Block, nEdgesOnCell_Block, nCellsSolveField, edgesOnCell_Block, indexToEdgeID_Block, cellsOnEdge_Block, nEdgesSolveField)
- call mpas_block_creator_build_edge_halos(indexToCellID_Block, nEdgesOnCell_Block, nCellsSolveField, verticesOnCell_Block, indexToVertexID_Block, cellsOnVertex_Block, nVerticesSolveField)
+ call mpas_block_creator_build_edge_halos(nEdgesOnCell_Block, nCellsSolveField, edgesOnCell_Block, indexToEdgeID_Block, cellsOnEdge_Block, nEdgesSolveField)
+ call mpas_block_creator_build_edge_halos(nEdgesOnCell_Block, nCellsSolveField, verticesOnCell_Block, indexToVertexID_Block, cellsOnVertex_Block, nVerticesSolveField)
! Allocate blocks, and copy indexTo arrays into blocks
@@ -292,7 +302,7 @@
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
call mpas_read_and_distribute_fields(input_obj)
- call mpas_io_input_finalize(input_obj, domain % dminfo)
+ call mpas_io_input_finalize(input_obj)
call MPAS_io_close(inputHandle, ierr)
@@ -564,42 +574,42 @@
end subroutine mpas_io_input_init!}}}
- subroutine mpas_io_input_get_dimension(input_obj, dimname, dimsize)!{{{
+! subroutine mpas_io_input_get_dimension(input_obj, dimname, dimsize)!{{{
+!
+! implicit none
+!
+! type (io_input_object), intent(in) :: input_obj
+! character (len=*), intent(in) :: dimname
+! integer, intent(out) :: dimsize
+!
+!!include "get_dimension_by_name.inc"
+!
+! end subroutine mpas_io_input_get_dimension!}}}
+!
+! subroutine mpas_io_input_get_att_real(input_obj, attname, attvalue)!{{{
+!
+! implicit none
+!
+! type (io_input_object), intent(in) :: input_obj
+! character (len=*), intent(in) :: attname
+! real (kind=RKIND), intent(out) :: attvalue
+!
+! integer :: nferr
+!
+! end subroutine mpas_io_input_get_att_real!}}}
+!
+! subroutine mpas_io_input_get_att_text(input_obj, attname, attvalue)!{{{
+!
+! implicit none
+!
+! type (io_input_object), intent(in) :: input_obj
+! character (len=*), intent(in) :: attname
+! character (len=*), intent(out) :: attvalue
+!
+! integer :: nferr
+!
+! end subroutine mpas_io_input_get_att_text!}}}
- implicit none
-
- type (io_input_object), intent(in) :: input_obj
- character (len=*), intent(in) :: dimname
- integer, intent(out) :: dimsize
-
-!include "get_dimension_by_name.inc"
-
- end subroutine mpas_io_input_get_dimension!}}}
-
- subroutine mpas_io_input_get_att_real(input_obj, attname, attvalue)!{{{
-
- implicit none
-
- type (io_input_object), intent(in) :: input_obj
- character (len=*), intent(in) :: attname
- real (kind=RKIND), intent(out) :: attvalue
-
- integer :: nferr
-
- end subroutine mpas_io_input_get_att_real!}}}
-
- subroutine mpas_io_input_get_att_text(input_obj, attname, attvalue)!{{{
-
- implicit none
-
- type (io_input_object), intent(in) :: input_obj
- character (len=*), intent(in) :: attname
- character (len=*), intent(out) :: attvalue
-
- integer :: nferr
-
- end subroutine mpas_io_input_get_att_text!}}}
-
subroutine mpas_exch_input_field_halos(domain, input_obj)!{{{
implicit none
@@ -613,12 +623,11 @@
end subroutine mpas_exch_input_field_halos!}}}
- subroutine mpas_io_input_finalize(input_obj, dminfo)!{{{
+ subroutine mpas_io_input_finalize(input_obj)!{{{
implicit none
type (io_input_object), intent(inout) :: input_obj
- type (dm_info), intent(in) :: dminfo
integer :: nferr
@@ -626,16 +635,22 @@
end subroutine mpas_io_input_finalize!}}}
- subroutine mpas_io_setup_cell_block_fields(inputHandle, nReadCells, readCellStart, readingBlock, maxEdges, indexToCellID, xCell, yCell, zCell, nEdgesOnCell, cellsOnCell, edgesOnCell, verticesOnCell)!{{{
+ subroutine mpas_io_setup_cell_block_fields(inputHandle, nReadCells, readCellStart, readingBlock, maxEdges, indexToCellID, &
+#ifdef HAVE_ZOLTAN
+ xCell, yCell, zCell, &
+#endif
+ nEdgesOnCell, cellsOnCell, edgesOnCell, verticesOnCell)!{{{
type (MPAS_IO_Handle_type) :: inputHandle
integer, intent(in) :: nReadCells
integer, intent(in) :: readCellStart
integer, intent(in) :: maxEdges
type (block_type), pointer :: readingBlock
type (field1dInteger), pointer :: indexToCellID
+#ifdef HAVE_ZOLTAN
type (field1dReal), pointer :: xCell
type (field1dReal), pointer :: yCell
type (field1dReal), pointer :: zCell
+#endif
type (field1dInteger), pointer :: nEdgesOnCell
type (field2dInteger), pointer :: cellsOnCell
type (field2dInteger), pointer :: edgesOnCell
@@ -808,15 +823,21 @@
end subroutine mpas_io_setup_cell_block_fields!}}}
- subroutine mpas_io_setup_edge_block_fields(inputHandle, nReadEdges, readEdgeStart, readingBlock, indexToEdgeID, xEdge, yEdge, zEdge, cellsOnEdge)!{{{
+ subroutine mpas_io_setup_edge_block_fields(inputHandle, nReadEdges, readEdgeStart, readingBlock, indexToEdgeID, &
+#ifdef HAVE_ZOLTAN
+ xEdge, yEdge, zEdge, &
+#endif
+ cellsOnEdge)!{{{
type (MPAS_IO_Handle_type) :: inputHandle
integer, intent(in) :: nReadEdges
integer, intent(in) :: readEdgeStart
type (block_type), pointer :: readingBlock
type (field1dInteger), pointer :: indexToEdgeID
+#ifdef HAVE_ZOLTAN
type (field1dReal), pointer :: xEdge
type (field1dReal), pointer :: yEdge
type (field1dReal), pointer :: zEdge
+#endif
type (field2dInteger), pointer :: cellsOnEdge
integer :: i, nHalos
@@ -934,16 +955,22 @@
end subroutine mpas_io_setup_edge_block_fields!}}}
- subroutine mpas_io_setup_vertex_block_fields(inputHandle, nReadVertices, readVertexStart, readingBlock, vertexDegree, indexToVertexID, xVertex, yVertex, zVertex, cellsOnVertex)!{{{
+ subroutine mpas_io_setup_vertex_block_fields(inputHandle, nReadVertices, readVertexStart, readingBlock, vertexDegree, indexToVertexID, &
+#ifdef HAVE_ZOLTAN
+ xVertex, yVertex, zVertex, &
+#endif
+ cellsOnVertex)!{{{
type (MPAS_IO_Handle_type) :: inputHandle
integer, intent(in) :: nReadVertices
integer, intent(in) :: readVertexStart
integer, intent(in) :: vertexDegree
type (block_type), pointer :: readingBlock
type (field1dInteger), pointer :: indexToVertexID
+#ifdef HAVE_ZOLTAN
type (field1dReal), pointer :: xVertex
type (field1dReal), pointer :: yVertex
type (field1dReal), pointer :: zVertex
+#endif
type (field2dInteger), pointer :: cellsOnVertex
integer :: i, nHalos
Modified: branches/atmos_physics/src/framework/mpas_io_output.F
===================================================================
--- branches/atmos_physics/src/framework/mpas_io_output.F 2013-03-21 23:27:43 UTC (rev 2653)
+++ branches/atmos_physics/src/framework/mpas_io_output.F 2013-03-21 23:40:44 UTC (rev 2654)
@@ -64,9 +64,7 @@
! For now, we assume that a domain consists only of one block,
! although in future, work needs to be done to write model state
! from many distributed blocks
- call mpas_io_output_init(domain, output_obj, domain % dminfo, &
- block_ptr % mesh &
- )
+ call mpas_io_output_init(domain, output_obj, block_ptr % mesh)
end subroutine mpas_output_state_init!}}}
@@ -318,19 +316,17 @@
end subroutine mpas_output_state_for_domain!}}}
- subroutine mpas_output_state_finalize(output_obj, dminfo)!{{{
+ subroutine mpas_output_state_finalize(output_obj)!{{{
implicit none
type (io_output_object), intent(inout) :: output_obj
- type (dm_info), intent(in) :: dminfo
- call mpas_io_output_finalize(output_obj, dminfo)
+ call mpas_io_output_finalize(output_obj)
end subroutine mpas_output_state_finalize!}}}
subroutine mpas_io_output_init( domain, output_obj, &!{{{
- dminfo, &
mesh &
)
@@ -338,11 +334,9 @@
type (domain_type), intent(in) :: domain
type (io_output_object), intent(inout) :: output_obj
- type (dm_info), intent(in) :: dminfo
type (mesh_type), intent(in) :: mesh
integer :: nferr, ierr
- integer, dimension(10) :: dimlist
call MPAS_createStream(output_obj % io_stream, trim(output_obj % filename), MPAS_IO_PNETCDF, MPAS_IO_WRITE, 1, nferr)
@@ -359,12 +353,11 @@
end subroutine mpas_io_output_init!}}}
- subroutine mpas_io_output_finalize(output_obj, dminfo)!{{{
+ subroutine mpas_io_output_finalize(output_obj)!{{{
implicit none
type (io_output_object), intent(inout) :: output_obj
- type (dm_info), intent(in) :: dminfo
integer :: nferr
Modified: branches/atmos_physics/src/framework/mpas_io_streams.F
===================================================================
--- branches/atmos_physics/src/framework/mpas_io_streams.F 2013-03-21 23:27:43 UTC (rev 2653)
+++ branches/atmos_physics/src/framework/mpas_io_streams.F 2013-03-21 23:40:44 UTC (rev 2654)
@@ -256,16 +256,13 @@
integer, intent(out), optional :: ierr
integer :: io_err
- integer :: i
integer :: idim
integer :: totalDimSize, globalDimSize
logical :: isDecomposed
integer :: ndims
- type (field0dInteger), pointer :: field_ptr
character (len=StrKIND), dimension(:), pointer :: dimNames
integer, dimension(:), pointer :: indices
integer, dimension(:), pointer :: dimSizes
- type (field_list_type), pointer :: field_list_cursor
type (field_list_type), pointer :: new_field_list_node
if (present(ierr)) ierr = MPAS_STREAM_NOERR
@@ -340,12 +337,9 @@
logical :: isDecomposed
integer :: ndims
type (field1dInteger), pointer :: field_ptr
- character (len=StrKIND), dimension(5) :: dimNames
- character (len=StrKIND), dimension(:), pointer :: dimNamesInq
character (len=StrKIND), dimension(0) :: dimNames0
integer, dimension(0) :: dimSizes0
integer, dimension(:), pointer :: indices
- type (field_list_type), pointer :: field_list_cursor
type (field_list_type), pointer :: new_field_list_node
logical :: any_success
logical, dimension(:), pointer :: isAvailable
@@ -441,10 +435,7 @@
logical :: isDecomposed
integer :: ndims
type (field2dInteger), pointer :: field_ptr
- character (len=StrKIND), dimension(5) :: dimNames
- character (len=StrKIND), dimension(:), pointer :: dimNamesInq
integer, dimension(:), pointer :: indices
- type (field_list_type), pointer :: field_list_cursor
type (field_list_type), pointer :: new_field_list_node
logical :: any_success
logical, dimension(:), pointer :: isAvailable
@@ -540,10 +531,7 @@
logical :: isDecomposed
integer :: ndims
type (field3dInteger), pointer :: field_ptr
- character (len=StrKIND), dimension(5) :: dimNames
- character (len=StrKIND), dimension(:), pointer :: dimNamesInq
integer, dimension(:), pointer :: indices
- type (field_list_type), pointer :: field_list_cursor
type (field_list_type), pointer :: new_field_list_node
logical :: any_success
logical, dimension(:), pointer :: isAvailable
@@ -632,16 +620,13 @@
integer, intent(out), optional :: ierr
integer :: io_err
- integer :: i
integer :: idim
integer :: totalDimSize, globalDimSize
logical :: isDecomposed
integer :: ndims
- type (field0dReal), pointer :: field_ptr
character (len=StrKIND), dimension(:), pointer :: dimNames
integer, dimension(:), pointer :: indices
integer, dimension(:), pointer :: dimSizes
- type (field_list_type), pointer :: field_list_cursor
type (field_list_type), pointer :: new_field_list_node
if (present(ierr)) ierr = MPAS_STREAM_NOERR
@@ -716,12 +701,9 @@
logical :: isDecomposed
integer :: ndims
type (field1dReal), pointer :: field_ptr
- character (len=StrKIND), dimension(5) :: dimNames
- character (len=StrKIND), dimension(:), pointer :: dimNamesInq
character (len=StrKIND), dimension(0) :: dimNames0
integer, dimension(0) :: dimSizes0
integer, dimension(:), pointer :: indices
- type (field_list_type), pointer :: field_list_cursor
type (field_list_type), pointer :: new_field_list_node
logical :: any_success
logical, dimension(:), pointer :: isAvailable
@@ -817,10 +799,7 @@
logical :: isDecomposed
integer :: ndims
type (field2dReal), pointer :: field_ptr
- character (len=StrKIND), dimension(5) :: dimNames
- character (len=StrKIND), dimension(:), pointer :: dimNamesInq
integer, dimension(:), pointer :: indices
- type (field_list_type), pointer :: field_list_cursor
type (field_list_type), pointer :: new_field_list_node
logical :: any_success
logical, dimension(:), pointer :: isAvailable
@@ -916,10 +895,7 @@
logical :: isDecomposed
integer :: ndims
type (field3dReal), pointer :: field_ptr
- character (len=StrKIND), dimension(5) :: dimNames
- character (len=StrKIND), dimension(:), pointer :: dimNamesInq
integer, dimension(:), pointer :: indices
- type (field_list_type), pointer :: field_list_cursor
type (field_list_type), pointer :: new_field_list_node
logical :: any_success
logical, dimension(:), pointer :: isAvailable
@@ -1017,10 +993,7 @@
logical :: isDecomposed
integer :: ndims
type (field4dReal), pointer :: field_ptr
- character (len=StrKIND), dimension(5) :: dimNames
- character (len=StrKIND), dimension(:), pointer :: dimNamesInq
integer, dimension(:), pointer :: indices
- type (field_list_type), pointer :: field_list_cursor
type (field_list_type), pointer :: new_field_list_node
logical :: any_success
logical, dimension(:), pointer :: isAvailable
@@ -1118,10 +1091,7 @@
logical :: isDecomposed
integer :: ndims
type (field5dReal), pointer :: field_ptr
- character (len=StrKIND), dimension(5) :: dimNames
- character (len=StrKIND), dimension(:), pointer :: dimNamesInq
integer, dimension(:), pointer :: indices
- type (field_list_type), pointer :: field_list_cursor
type (field_list_type), pointer :: new_field_list_node
logical :: any_success
logical, dimension(:), pointer :: isAvailable
@@ -1218,12 +1188,9 @@
integer :: totalDimSize, globalDimSize
logical :: isDecomposed
integer :: ndims
- type (field0dChar), pointer :: field_ptr
character (len=StrKIND), dimension(5) :: dimNames
- character (len=StrKIND), dimension(:), pointer :: dimNamesInq
integer, dimension(:), pointer :: dimSizes
integer, dimension(:), pointer :: indices
- type (field_list_type), pointer :: field_list_cursor
type (field_list_type), pointer :: new_field_list_node
if (present(ierr)) ierr = MPAS_STREAM_NOERR
@@ -1524,7 +1491,6 @@
type (field4dReal), pointer :: field_4dreal_ptr
type (field5dReal), pointer :: field_5dreal_ptr
type (field0dChar), pointer :: field_0dchar_ptr
- type (field1dChar), pointer :: field_1dchar_ptr
type (field_list_type), pointer :: field_cursor
integer :: int0d_temp
integer, dimension(:), pointer :: int1d_temp
@@ -2311,16 +2277,12 @@
integer :: i, j
integer :: ncons
integer :: ownedSize
- type (field0dInteger), pointer :: field_0dint_ptr
type (field1dInteger), pointer :: field_1dint_ptr
type (field2dInteger), pointer :: field_2dint_ptr
type (field3dInteger), pointer :: field_3dint_ptr
- type (field0dReal), pointer :: field_0dreal_ptr
type (field1dReal), pointer :: field_1dreal_ptr
type (field2dReal), pointer :: field_2dreal_ptr
type (field3dReal), pointer :: field_3dreal_ptr
- type (field0dChar), pointer :: field_0dchar_ptr
- type (field1dChar), pointer :: field_1dchar_ptr
type (field_list_type), pointer :: field_cursor
integer :: int0d_temp
integer, dimension(:), pointer :: int1d_temp
Modified: branches/atmos_physics/src/framework/mpas_sort.F
===================================================================
--- branches/atmos_physics/src/framework/mpas_sort.F 2013-03-21 23:27:43 UTC (rev 2653)
+++ branches/atmos_physics/src/framework/mpas_sort.F 2013-03-21 23:40:44 UTC (rev 2654)
@@ -80,7 +80,7 @@
integer, intent(in) :: nArray
integer, dimension(nArray), intent(inout) :: array
- integer :: i, j, top, l, r, pivot, s
+ integer :: i, top, l, r, pivot, s
integer :: pivot_value
integer, dimension(1) :: temp
integer, dimension(1000) :: lstack, rstack
@@ -142,7 +142,7 @@
integer, intent(in) :: nArray
real (kind=RKIND), dimension(nArray), intent(inout) :: array
- integer :: i, j, top, l, r, pivot, s
+ integer :: i, top, l, r, pivot, s
real (kind=RKIND) :: pivot_value
real (kind=RKIND), dimension(1) :: temp
integer, dimension(1000) :: lstack, rstack
@@ -204,7 +204,7 @@
integer, intent(in) :: nArray
integer, dimension(2,nArray), intent(inout) :: array
- integer :: i, j, top, l, r, pivot, s
+ integer :: i, top, l, r, pivot, s
integer :: pivot_value
integer, dimension(2) :: temp
integer, dimension(1000) :: lstack, rstack
@@ -272,7 +272,7 @@
integer, intent(in) :: nArray
real (kind=RKIND), dimension(2,nArray), intent(inout) :: array
- integer :: i, j, top, l, r, pivot, s
+ integer :: i, top, l, r, pivot, s
real (kind=RKIND) :: pivot_value
real (kind=RKIND), dimension(2) :: temp
integer, dimension(1000) :: lstack, rstack
Modified: branches/atmos_physics/src/framework/mpas_timekeeping.F
===================================================================
--- branches/atmos_physics/src/framework/mpas_timekeeping.F 2013-03-21 23:27:43 UTC (rev 2653)
+++ branches/atmos_physics/src/framework/mpas_timekeeping.F 2013-03-21 23:40:44 UTC (rev 2654)
@@ -523,8 +523,6 @@
type (MPAS_Alarm_type), pointer :: alarmPtr
- type (MPAS_TimeInterval_type) :: alarmTimeInterval
- type (MPAS_Time_type) :: alarmTime
character (len=StrKIND) :: printString
ierr = 0
@@ -735,7 +733,6 @@
type (MPAS_Time_type) :: previousRingTime
type (MPAS_Time_type) :: negativeNeighborRingTime
type (MPAS_Time_type) :: positiveNeighborRingTime
- type (MPAS_TimeInterval_type) :: ringTimeInterval
type (MPAS_Alarm_type), pointer :: alarmPtr
now = mpas_get_clock_time(clock, MPAS_NOW, ierr)
@@ -993,7 +990,7 @@
integer, intent(out), optional :: ierr
integer, parameter :: integerMaxDigits = 8
- integer :: days, hours, minutes, seconds
+! integer :: days, hours, minutes, seconds
integer :: numerator, denominator, denominatorPower
type (MPAS_TimeInterval_type) :: zeroInterval
Modified: branches/atmos_physics/src/framework/mpas_timer.F
===================================================================
--- branches/atmos_physics/src/framework/mpas_timer.F 2013-03-21 23:27:43 UTC (rev 2653)
+++ branches/atmos_physics/src/framework/mpas_timer.F 2013-03-21 23:40:44 UTC (rev 2654)
@@ -41,10 +41,15 @@
logical, optional, intent(in) :: clear_timer !< Input: flag to clear timer
type (timer_node), optional, pointer :: timer_ptr !< Output: pointer to store timer in module
- logical :: timer_added, timer_found, string_equal, check_flag
- type (timer_node), pointer :: current, temp
-
+ logical :: timer_added, timer_found, string_equal
+ type (timer_node), pointer :: current
+#ifdef _PAPI
+ logical :: check_flag
+#else
+#ifndef _MPI
integer :: clock, hz, usecs
+#endif
+#endif
#ifdef MPAS_TAU
call tau_start(timer_name)
@@ -172,8 +177,15 @@
type (timer_node), pointer :: current
real (kind=RKIND) :: time_temp
- logical :: timer_found, string_equal, check_flag
- integer :: clock, hz, usecs
+ logical :: timer_found, string_equal
+#ifdef _PAPI
+ logical :: check_flag
+ integer :: usecs
+#else
+#ifndef _MPI
+ integer :: clock, hz
+#endif
+#endif
#ifdef MPAS_TAU
call tau_stop(timer_name)
Modified: branches/atmos_physics/src/operators/mpas_rbf_interpolation.F
===================================================================
--- branches/atmos_physics/src/operators/mpas_rbf_interpolation.F 2013-03-21 23:27:43 UTC (rev 2653)
+++ branches/atmos_physics/src/operators/mpas_rbf_interpolation.F 2013-03-21 23:40:44 UTC (rev 2654)
@@ -116,7 +116,7 @@
integer :: nCells, nEdges
integer, dimension(:,:), pointer :: cellsOnEdge, edgesOnCell
- integer :: iEdge, iCell, cell1, cell2
+ integer :: iEdge, iCell
real(kind=RKIND), dimension(:), pointer :: xCell, yCell, zCell, xEdge, yEdge, zEdge
real(kind=RKIND), dimension(:,:), pointer :: localVerticalUnitVectors, edgeNormalVectors
real(kind=RKIND), dimension(:,:,:), pointer :: cellTangentPlane
@@ -476,7 +476,7 @@
real(kind=RKIND), intent(in) :: alpha
real(kind=RKIND), dimension(pointCount), intent(out) :: coefficients
- integer :: i, j
+ integer :: i
integer :: matrixSize
real(kind=RKIND), dimension(:,:), pointer :: dirichletMatrix
@@ -554,7 +554,7 @@
real(kind=RKIND), dimension(2,3) :: planeBasisVectors
real(kind=RKIND), dimension(pointCount), intent(out) :: coefficients
- integer :: i, j
+ integer :: i
integer :: matrixSize
real(kind=RKIND), dimension(:,:), pointer :: dirichletMatrix
@@ -630,7 +630,7 @@
real(kind=RKIND), intent(in) :: alpha
real(kind=RKIND), dimension(pointCount), intent(out) :: coefficients
- integer :: i, j
+ integer :: i
integer :: matrixSize
real(kind=RKIND), dimension(:,:), pointer :: dirichletMatrix
@@ -717,7 +717,7 @@
real(kind=RKIND), dimension(pointCount), intent(out) :: &
dirichletCoefficients, neumannCoefficients
- integer :: i, j
+ integer :: i
integer :: matrixSize
real(kind=RKIND), dimension(:,:), pointer :: dirichletMatrix, neumannMatrix
@@ -825,7 +825,7 @@
real(kind=RKIND), dimension(pointCount), intent(out) :: &
dirichletCoefficients, neumannCoefficients
- integer :: i, j
+ integer :: i
integer :: matrixSize
real(kind=RKIND), dimension(:,:), pointer :: dirichletMatrix, neumannMatrix
@@ -936,7 +936,7 @@
real(kind=RKIND), dimension(pointCount), intent(out) :: &
dirichletCoefficients, neumannCoefficients
- integer :: i, j
+ integer :: i
integer :: matrixSize
real(kind=RKIND), dimension(:,:), pointer :: dirichletMatrix, neumannMatrix
@@ -1037,7 +1037,7 @@
real(kind=RKIND), intent(in) :: alpha
real(kind=RKIND), dimension(pointCount, 3), intent(out) :: coefficients
- integer :: i, j
+ integer :: i
integer :: matrixSize
real(kind=RKIND), dimension(:,:), pointer :: matrix, matrixCopy
@@ -1128,11 +1128,9 @@
real(kind=RKIND), dimension(2,3) :: planeBasisVectors
real(kind=RKIND), dimension(pointCount, 3), intent(out) :: coefficients
- integer :: i, j
+ integer :: i
integer :: matrixSize
- real(kind=RKIND) :: rSquared, rbfValue, unitVectorDotProduct
-
real(kind=RKIND), dimension(pointCount,2) :: planarSourcePoints
real(kind=RKIND), dimension(pointCount,2) :: planarUnitVectors
real(kind=RKIND), dimension(2) :: planarDestinationPoint
@@ -1241,7 +1239,7 @@
real(kind=RKIND), intent(in) :: alpha
real(kind=RKIND), dimension(pointCount, 3), intent(out) :: coefficients
- integer :: i, j
+ integer :: i
integer :: matrixSize
real(kind=RKIND), dimension(:,:), pointer :: matrix, matrixCopy
@@ -1343,7 +1341,7 @@
real(kind=RKIND), dimension(2,3), intent(in) :: planeBasisVectors
real(kind=RKIND), dimension(pointCount, 3), intent(out) :: coefficients
- integer :: i, j
+ integer :: i
integer :: matrixSize
real(kind=RKIND), dimension(pointCount,2) :: planarSourcePoints
Modified: branches/atmos_physics/src/operators/mpas_spline_interpolation.F
===================================================================
--- branches/atmos_physics/src/operators/mpas_spline_interpolation.F 2013-03-21 23:27:43 UTC (rev 2653)
+++ branches/atmos_physics/src/operators/mpas_spline_interpolation.F 2013-03-21 23:40:44 UTC (rev 2654)
@@ -170,7 +170,7 @@
! local variables:
- integer :: i,j,k
+ integer :: j
real(kind=RKIND) :: h,h2, A2,B2, F1,F2, eps1
if (x1<x(1).or.x2>x(n).or.x1>x2) then
@@ -252,7 +252,7 @@
! local variables:
- integer :: i,j,k
+ integer :: j,k
real(kind=RKIND) :: h,h2, A2,B2, F1,F2, eps1
y_integral = 0.0
</font>
</pre>