Merge pull request #1394 from GEOS-ESM/revert/mathomp4/revert-PR1359

Reverts the changes from PR #1359

CHANGELOG.md

@@ -10,23 +10,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - Fixed duration of the clock to be the smaller of the user specified duration and (END_DATE - currTime)
-- Fixed failures to fully trap errors in
-  - History GC
-  - MemUtils
-  - `register_generic_entry_points`
 
 ### Added
 
 ### Changed
 
-- Major refactoring of GenericSetServices
-  Work is not completed, but a new layer is introduced with the intent that the user SetServices is called
-  from with in the new layer as opposed to the previous mechanism that obligated user SetServices to call
-  generic.   That call is now deprecated.   Significant cleanup remains.
-- Improved diagnostic message for profiler imbalances at end of run.
-  Now gives the name of the timer that has not been stopped when
-  finalizing a profiler.
-
 ### Removed
 
 ### Deprecated

base/ApplicationSupport.F90

@@ -61,7 +61,8 @@ subroutine MAPL_Finalize(unusable,comm,rc)
       else
          comm_world=MPI_COMM_WORLD
       end if
-      call stop_global_time_profiler(_RC)
+      call stop_global_time_profiler(rc=status)
+      _VERIFY(status)
       call report_global_profiler(comm=comm_world)
       call finalize_profiler()
       call finalize_pflogger()

base/MAPL_MemUtils.F90

@@ -395,7 +395,7 @@ subroutine MAPL_MemUtilsWriteComm( text, comm, always, RC )
 #if defined(__sgi) || defined(__aix) || defined(__SX)
     m = memuse()*1e-3
 #else
-    call mem_dump(mhwm, mrss, memused, swapused, commitlimit, committed_as, _RC)
+    call mem_dump(mhwm, mrss, memused, swapused, commitlimit, committed_as)
 #endif
     call MPI_Comm_Size(comm_,npes,status)
     if (MAPL_MemUtilsMode == MAPL_MemUtilsModeFull) then

generic/CMakeLists.txt

@@ -42,7 +42,6 @@ set (srcs
 
   GenericCplComp.F90
 
-  SetServicesWrapper.F90
   MaplGeneric.F90
 
   MAPL_Generic.F90