Adding new timers to mpas_block_decomp.F

This commit introduces new timers to the mpas_block_decomp_cells_for_proc
and the mpas_block_decomp_scotch routines in src/framework/mpas_block_decomp.F.
These timers may be useful in tracking the time spent in online graph
partitioning or in reading the graph partition files from disk and in
collective MPI calls.

Author: abishekg7

src/framework/Makefile

@@ -87,7 +87,7 @@ mpas_timekeeping.o: mpas_string_utils.o mpas_kind_types.o mpas_derived_types.o m
 
 mpas_timer.o: mpas_kind_types.o mpas_dmpar.o mpas_threading.o mpas_log.o
 
-mpas_block_decomp.o: mpas_derived_types.o mpas_hash.o mpas_io_units.o mpas_dmpar.o mpas_ptscotch_interface.o
+mpas_block_decomp.o: mpas_derived_types.o mpas_hash.o mpas_io_units.o mpas_dmpar.o mpas_timer.o mpas_ptscotch_interface.o
 
 mpas_block_creator.o: mpas_dmpar.o mpas_hash.o mpas_sort.o mpas_io_units.o mpas_block_decomp.o mpas_stream_manager.o mpas_decomp.o mpas_abort.o $(DEPS)
 

src/framework/mpas_block_decomp.F

@@ -54,6 +54,8 @@ module mpas_block_decomp
    subroutine mpas_block_decomp_cells_for_proc(dminfo, partial_global_graph_info, local_cell_list, block_id, block_start, &
                                                block_count, numBlocks, explicitProcDecomp, blockFilePrefix, procFilePrefix)!{{{
 
+      use mpas_timer, only : mpas_timer_start, mpas_timer_stop
+
       implicit none
 
       type (dm_info), intent(inout) :: dminfo !< Input: domain information
@@ -84,6 +86,8 @@ subroutine mpas_block_decomp_cells_for_proc(dminfo, partial_global_graph_info, l
 
       no_blocks = .false.
 
+      call mpas_timer_start('mpas_block_decomp_cells_for_proc')
+
       if (numBlocks == 0) then
         dminfo % total_blocks = dminfo % nProcs
       else
@@ -321,6 +325,8 @@ subroutine mpas_block_decomp_cells_for_proc(dminfo, partial_global_graph_info, l
         end if
       end if
 
+      call mpas_timer_stop('mpas_block_decomp_cells_for_proc')
+
    end subroutine mpas_block_decomp_cells_for_proc!}}}
 
 !***********************************************************************
@@ -341,6 +347,7 @@ end subroutine mpas_block_decomp_cells_for_proc!}}}
 #ifdef MPAS_SCOTCH
    subroutine mpas_block_decomp_scotch(dminfo, partial_global_graph_info, blockFilePrefix, blockFilename)!{{{
 
+      use mpas_timer, only : mpas_timer_start, mpas_timer_stop
 #ifdef MPAS_USE_MPI_F08
       use mpi_f08, only : MPI_Comm, MPI_INTEGER, MPI_Comm_dup, MPI_Comm_free, MPI_Gather, MPI_Gatherv
 #else
@@ -386,6 +393,8 @@ subroutine mpas_block_decomp_scotch(dminfo, partial_global_graph_info, blockFile
       allocate(global_block_id_arr(partial_global_graph_info % nVerticesTotal))
       allocate(local_block_id_arr(partial_global_graph_info % nVertices))
 
+      call mpas_timer_start('scotch_total')
+
       ! Count the number of edges (including to ghost cells) in the portion of graph
       ! owned by the current rank. Each edge is counted twice, once for each vertex,
       ! with the exception of edges to ghost vertices, which are counted only once.
@@ -451,10 +460,13 @@ subroutine mpas_block_decomp_scotch(dminfo, partial_global_graph_info, blockFile
       ! Initialize the strategy data structure
       call scotch_stratinit (stradat)
 
+      call mpas_timer_start('scotch_graph_partitioning')
       ! Partition the distributed graph and save the result in local_block_id_arr
       npart = dminfo % nProcs
       call scotch_dgraphpart (scotchdgraph, npart, stradat, local_block_id_arr)
 
+      call mpas_timer_stop('scotch_graph_partitioning')
+
       ! After the paritioning above, each processor would not necessarily have information about all of the
       ! vertices it owns. To obtain this information, Scotch provides a convenience function to redistribute the graph
       ! to all processors, so that each processor has information about all of the vertices it owns.
@@ -533,6 +545,8 @@ subroutine mpas_block_decomp_scotch(dminfo, partial_global_graph_info, blockFile
 
       call MPI_Comm_free(localcomm, mpi_ierr)
 
+      call mpas_timer_stop('scotch_total')
+
    end subroutine mpas_block_decomp_scotch
 #endif