Add TimeAccumulate with unit tests. (#4869)

* Add TimeAccumulate with unit tests.

* Add TimeAccumulate with unit tests.

* Remove period calculation; fix update procedures

* Move FileIOSharedMod, NCIOMod, MAPL_LocStreamMod to base3g/; re-export through MAPL umbrella (#4882)

* Extend mapl3g_FileIO WRITE_PARALLEL with scalar/1d integer and real overloads (refs #4879)

* Move FileIOSharedMod and NCIOMod to base3g/, re-export through MAPL umbrella (refs #4874, #4879)

- Move FileIOShared.F90 and NCIO.F90 from base/ to base3g/ with
  temporary internal module names (mapl_FileIOShared, mapl_NCIO)
- Leave thin compatibility wrappers in base/ under original module
  names (FileIOSharedMod, NCIOMod) so existing callers are unaffected
- Copy write_parallel.H and read_parallel.H to base3g/include/
- Update base3g/CMakeLists.txt with new sources and dependencies
- Re-export ArrDescr, ArrDescrInit, ArrDescrSet, MAPL_VarRead,
  MAPL_VarWrite, MAPL_NCIOGetFileType, MAPL_IOGetNonDimVars,
  MAPL_IOCountNonDimVars, MAPL_IOChangeRes, MAPL_IOCountLevels
  through mapl_base3g so they are available via 'use MAPL'

* Move MAPL_LocStreamMod to base3g/ (module mapl_LocStreamMod_impl); leave thin wrapper in base/ (refs #4874)

* Remove base/ thin wrappers for FileIOSharedMod, NCIOMod, MAPL_LocStreamMod (closes #4874) (#4883)

* Remove base/ thin wrappers for FileIOSharedMod, NCIOMod, MAPL_LocStreamMod; move c_mapl_locstream_F.c to base3g/ (closes #4874)

* Drop NCIOMod and MAPL_LocStreamMod from MAPL2 — symbols no longer needed there (refs #4874)

* Add mapl2-migration skill documenting iterative PR process for base/ to base3g/ migrations

* Update mapl2-migration skill: always rebase onto target branch before pushing/opening a PR

* Remove orphaned write_parallel.H and read_parallel.H from base/ (now live in base3g/include/) (refs #4874)

* Remove orphaned GetPointer.H from base/ — no longer used (refs #4874)

* Remove orphaned GetFieldArray.H from base/ — no longer used (refs #4874)

* Add TimeAccumulate with unit tests.

* Remove period calculation; fix update procedures

* Add TimeAccumulate with unit tests.

* Fix two bugs with gfortran in pfunit tests.

* Delete stale conflict markers.

---------

Co-authored-by: Tom Clune <thomas.l.clune@nasa.gov>

Author: darianboggs

gridcomps/StatisticsGridComp/CMakeLists.txt

@@ -5,6 +5,7 @@ set(srcs
   StatisticsVector.F90
   NullStatistic.F90
   TimeAverage.F90
+  TimeAccumulate.F90
   TimeMin.F90
   TimeMax.F90
   StatisticsGridComp.F90
@@ -16,5 +17,5 @@ esma_add_library(${this}
   SRCS ${srcs}
   DEPENDENCIES MAPL MAPL.utilities TYPE SHARED)
 
-#add_subdirectory(tests EXCLUDE_FROM_ALL)
+add_subdirectory(tests)
 

gridcomps/StatisticsGridComp/StatisticsGridComp.F90

@@ -13,6 +13,7 @@ module mapl3g_StatisticsGridComp
    use mapl3g_TimeAverage
    use mapl3g_TimeMin
    use mapl3g_TimeMax
+   use mapl3g_TimeAccumulate
    use mapl3g_State_API
    use pflogger, only: Logger
    use mapl_OS
@@ -79,7 +80,6 @@ subroutine advertise_item(gridcomp, iter, rc)
       type(esmf_HConfigIter), intent(in) :: iter
       integer, optional, intent(out) :: rc
 
-      type(esmf_TimeInterval) :: period
       character(:), allocatable :: action, name
       type(esmf_StateItem_Flag) :: itemtype
       integer :: status
@@ -94,23 +94,25 @@ subroutine advertise_item(gridcomp, iter, rc)
       call MAPL_GridCompAddVarSpec(gridcomp, varspec, _RC)
        select case (action)
        case ('average')
-          period = mapl_HConfigAsTimeInterval(hconfig, keystring='period', _RC)
           varspec = make_VariableSpec(ESMF_STATEINTENT_EXPORT, name, &
                has_deferred_aspects=.true., _RC)
           call MAPL_GridCompAddVarSpec(gridcomp, varspec, _RC)
           call advertise_time_average_internal_fields(gridcomp, name, _RC)
        case ('min')
-          period = mapl_HConfigAsTimeInterval(hconfig, keystring='period', _RC)
           varspec = make_VariableSpec(ESMF_STATEINTENT_EXPORT, name, &
                has_deferred_aspects=.true., _RC)
           call MAPL_GridCompAddVarSpec(gridcomp, varspec, _RC)
           call advertise_time_min_internal_fields(gridcomp, name, _RC)
        case ('max')
-          period = mapl_HConfigAsTimeInterval(hconfig, keystring='period', _RC)
           varspec = make_VariableSpec(ESMF_STATEINTENT_EXPORT, name, &
                has_deferred_aspects=.true., _RC)
           call MAPL_GridCompAddVarSpec(gridcomp, varspec, _RC)
           call advertise_time_max_internal_fields(gridcomp, name, _RC)
+       case ('accumulate')
+          varspec = make_VariableSpec(ESMF_STATEINTENT_EXPORT, name, &
+               has_deferred_aspects=.true., _RC)
+          call MAPL_GridCompAddVarSpec(gridcomp, varspec, _RC)
+          call advertise_time_accumulate_internal_fields(gridcomp, name, _RC)
        case default
           _FAIL('unsupported action: '//action)
       end select
@@ -201,6 +203,9 @@ function make_item(name, iter, clock, rc) result(stat)
           case ('max')
              deallocate(stat) ! gfortran workaround
              stat = make_max_stat(name, iter, alarm, _RC)
+          case ('accumulate')
+             deallocate(stat) ! gfortran workaround
+             stat = make_accumulate_stat(name, iter, alarm, _RC)
           case default
              _FAIL('unsupported statistics class: '//action)
           end select
@@ -263,6 +268,25 @@ function make_max_stat(name, iter, alarm, rc) result(max_stat)
         end function make_max_stat
 
 
+       function make_accumulate_stat(name, iter, alarm, rc) result(accum_stat)
+           type(TimeAccumulate) :: accum_stat
+           character(*), intent(in) :: name
+           type(esmf_HConfigIter), intent(in) :: iter
+           type(SimpleAlarm), intent(in) :: alarm
+           integer, optional, intent(out) :: rc
+
+           integer :: status
+           type(esmf_Field) :: f_in, f_out
+
+           call esmf_StateGet(importState, itemName=name, field=f_in, _RC)
+           call esmf_StateGet(exportState, itemName=name, field=f_out, _RC)
+
+           accum_stat = TimeAccumulate(gridcomp=gridcomp, f=f_in, accum_f=f_out, alarm=alarm, _RC)
+
+           _RETURN(_SUCCESS)
+           _UNUSED_DUMMY(iter)
+        end function make_accumulate_stat
+
        function make_alarm(clock, iter, rc) result(alarm)
            type(SimpleAlarm) :: alarm
            type(esmf_Clock), intent(in) :: clock