Merge branch 'release/MAPL-v3' into develop

.circleci/config.yml

@@ -45,6 +45,7 @@ workflows:
           repo: GEOSgcm
           checkout_fixture: true
           mepodevelop: true
+          checkout_mapl3_release_branch: true
           checkout_mapl_branch: true
           persist_workspace: false # Needs to be true to run fv3/gcm experiment, costs extra
 
@@ -59,7 +60,8 @@ workflows:
           repo: GEOSldas
           mepodevelop: false
           checkout_fixture: true
-          fixture_branch: develop
+          fixture_branch: release/MAPL-v3
+          checkout_mapl3_release_branch: true
           checkout_mapl_branch: true
 
       # Build GEOSadas (ifort only, needs a couple develop branches)
@@ -73,7 +75,8 @@ workflows:
           resource_class: xlarge
           repo: GEOSadas
           checkout_fixture: true
-          fixture_branch: develop
+          fixture_branch: release/MAPL-v3
+          checkout_mapl3_release_branch: true
           checkout_mapl_branch: true
           mepodevelop: true
           develop_repos: "cmake GEOSana_GridComp" # GEOSadas needs some extra branches to work with mainline MAPL

CHANGELOG.md

@@ -5,6 +5,44 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [v3.0.0 - Development]
+
+### Removed
+
+- Removes backward compatibility for MAPL_FlapCLI functions. Only accepts function usage in which the result is of
+  MAPL_CapOptions type.
+
+### Added
+
+- New command line switches for activating global time and memory
+    profiling.  The default is off.  Use `--enable_global_timeprof` and
+    `--enable_global_memprof` to activate.
+- New gauge for measuring memory allocation based upon mallinfo().
+	MAPL is now instrumented with this memory profiler and it produces
+	reasonable results.  Should nicely complement other tools that
+	measure HWM.
+
+### Changed
+
+- Profile reporting has been relocated into the `./profile` directory.
+- 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.
+- Changed all ESMF_AttributeGet and ESMF_AttributeSet to ESMF_InfoGet and ESMF_InfoSet respectively as old calls will be deprecated soon.
+
+### Fixed
+
+- Fixed failures to fully trap errors in
+  - History GC
+  - MemUtils
+  - `register_generic_entry_points`
+
 ## [Unreleased]
 
 ### Fixed
@@ -103,7 +141,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-- Option to force integer time variable in History output via the History.rc file (IntegerTime: .true./.false. default .false.) rather than the default float time variable if allowed by frequency of output
+- Option to force integer time variable in History output via the
+    History.rc file (IntegerTime: .true./.false. default .false.)
+    rather than the default float time variable if allowed by
+    frequency of output
 - Added mapl_StubComponent to MAPL package
 - Updates to CircleCI
   - Added GEOSadas CI ifort build test

Tests/ExtDataDriver.F90

@@ -16,10 +16,8 @@ program ExtData_Driver
   character(len=*), parameter :: Iam="ExtData_Driver"
   type(ExtDataDriver) :: Driver
   type (MAPL_CapOptions) :: cap_options
-  type (MAPL_FlapCLI) :: cli
 
-  cli = MAPL_FlapCLI(description='extdata driver',authors='gmao')
-  cap_options=MAPL_CapOptions(cli)
+  cap_options = FlapCLI(description='extdata driver',authors='gmao')
 
   driver = ExtDataDriver('ExtDataApp',Root_SetServices,cap_options=cap_options,_RC)
   call driver%run(_RC)