Integration branch: enums relocation + regularization + labeler bump (#4914)

* Create enums/ library (Tier 0) from scattered types

Relocate 11 enum-like types from esmf_utils/, generic3g/,
and component/ into a new enums/ directory (MAPL.enums).
No public module names or interfaces changed.

The three *Metadata files previously used mapl3g_InfoUtilities
as a thin pass-through to ESMF; replace with direct ESMF calls
to keep MAPL.enums free of upward esmf_utils dependency.

Part of MAPL v3 restructuring (#4905), closes #4907.

* Bump actions/labeler from 5 to 6

Bumps [actions/labeler](https://github.com/actions/labeler) from 5 to 6.
- [Release notes](https://github.com/actions/labeler/releases)
- [Commits](actions/labeler@v5...v6)

---
updated-dependencies:
- dependency-name: actions/labeler
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update CHANGELOG.md

Co-authored-by: Atanas Trayanov <Atanas.L.Trayanov@nasa.gov>

* Regularize MAPL.enums module names and cleanup

Rename all 11 enum module prefixes from mapl3g_ to mapl_
and update all use statements across the codebase (~55 files).

Additional cleanup in CouplerPhases: remove stale #include MAPL.h
and strengthen implicit none to implicit none(type,external).

Add rationale comments to CouplerPhases and GenericPhases
explaining why enum,bind(c) is used instead of integer parameters.

Part of MAPL v3 restructuring (#4905), closes #4908.

* Remove MPI from ErrorHandling and Throw layers (#4921)

* Remove MPI from ErrorHandling and Throw layers

- MAPL_Throw.F90: replace MAPL_Fail (MPI-dependent) with a serial
  error stop default; add MAPL_set_throw_method procedure pointer
- ErrorHandling.F90: remove 'use MPI'; replace MPI_Abort in
  MAPL_abort with a procedure pointer defaulting to error stop;
  add MAPL_set_abort_handler; collapse MAPL_ExceptionHandling
  alias into bottom of file; delete MAPL_ExceptionHandling.F90
- MAPL_MpiErrorHandling.F90: new file owning both MPI-aware
  handlers and MAPL_initialize_error_handling() registration
  routine; call this once after MPI_Init for MPI programs
- Remove dead 'use MPI' from AbstractCommSplitter.F90,
  pfio/BaseThread.F90, pfio/ForwardDataAndMessage.F90
- Update shared/CMakeLists.txt accordingly

Closes #4917

* Add CHANGELOG entry for #4917 MPI-free error handling

* Fix wrong module name in Test_Scenarios.pf

mapl3g_GenericPhases does not exist; correct name is
mapl_GenericPhases (defined in enums/GenericPhases.F90).

* Fix mapl3g_ -> mapl_ for enum modules in tests

* Fix more mapl3g_ -> mapl_ for enum modules in tests

* Create utils/ (MAPL.utils, Tier 1, MPI-free) (#4922)

* Create utils/ (MAPL.utils, Tier 1, MPI-free)

- New utils/ directory consolidates MPI-free foundational code
- Moves from shared/: ErrorHandling.F90, MAPL_Throw.F90, hash.c,
  sort.c, and all serial utility modules (String, Sort, Range, etc.)
  plus Constants/ and Interp/ subdirectories
- Moves from utilities/: all sources, arrays/, regex/, tests/
- Moves udunits2f/ into utils/udunits2f/
- Moves generic3g/Validation.F90 into utils/
- MAPL_MpiErrorHandling.F90 stays in shared/ (MPI-dependent)
- MAPL.shared now depends on MAPL.utils; all MAPL.utilities
  references updated to MAPL.utils
- SYSTEM_DSO_SUFFIX and OpenMP definitions moved to utils/

Part of #4905, closes #4915

* Add CHANGELOG entry for #4915 MAPL.utils creation

* Add MAPL.utilities alias for backward compat

* Fix MAPL.utilities compat: interface lib instead of alias

* Create mp_utils/ (MAPL.mp_utils, Tier 2, MPI-dependent) (#4924)

* Create mp_utils/ (MAPL.mp_utils, Tier 2, MPI-dependent)

* Remove nonexistent tests subdir from mp_utils

* Add CHANGELOG entry for #4923 MAPL.mp_utils creation

* Move profiler to mp_utils/profiler/, clean stale shared/ copies

* Restore ShaveMantissa.h needed by ShaveMantissa.c

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Atanas Trayanov <Atanas.L.Trayanov@nasa.gov>

Author: 3 people

.github/workflows/labeler.yml

@@ -15,7 +15,7 @@ jobs:
       contents: read
       pull-requests: write
     steps:
-      - uses: actions/labeler@v5
+      - uses: actions/labeler@v6
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           configuration-path: .github/labeler.yml

CHANGELOG.md

@@ -17,6 +17,32 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- Create `mp_utils/` directory (`MAPL.mp_utils`, Tier 2) as an MPI-dependent,
+  ESMF-free library. Absorbs comm-splitter and load-balance sources from
+  `shared/`, and the entire `profiler/` library (sources + reporting).
+  `MAPL.profiler` and `MAPL.shared` remain as backward-compatible targets.
+  Part of the MAPL v3 directory restructuring (#4905, phase 3, closes #4923).
+
+- Create `utils/` directory (`MAPL.utils`, Tier 1) as an MPI-free library
+  consolidating serial-only sources from `shared/`, `utilities/`, `udunits2f/`,
+  and `generic3g/`. `MAPL.utils` depends only on ESMF and OpenMP — no MPI.
+  Part of the MAPL v3 directory restructuring (#4905, phase 2a, closes #4915).
+
+- Remove direct MPI dependencies from `ErrorHandling.F90` and `MAPL_Throw.F90`
+  using a lazy-init procedure pointer pattern. Both modules now default to serial
+  `error stop` behavior and are fully MPI-free. MPI-aware error handling (rank in
+  error messages, `MPI_Abort`) is provided by the new `MAPL_MpiErrorHandling.F90`
+  module; call `MAPL_initialize_error_handling()` once after `MPI_Init` to
+  register MPI-aware handlers. Serial and pFUnit programs require no changes.
+  `MAPL_ExceptionHandling` is now an alias defined in `ErrorHandling.F90` rather
+  than a separate file. Closes #4917, part of #4905.
+
+- Create `enums/` directory (`MAPL.enums`, Tier 0) and relocate 11 enum-like
+  type definitions into it from `esmf_utils/`, `generic3g/`, and `component/`.
+  No module names or interfaces changed; this is a pure file relocation.
+  Part of the MAPL v3 directory restructuring (#4905, phase 1a, closes #4907).
+
+Several files were renamed, MAPL_InfoSet was replaced with ESMF_InfoSet.
 ### Removed
 
 ### Deprecated

CMakeLists.txt

@@ -222,9 +222,10 @@ if (APPLE)
   add_compile_definitions("-D__DARWIN")
 endif()
 
-add_subdirectory (udunits2f)
+add_subdirectory (enums)
+add_subdirectory (utils)
+add_subdirectory (mp_utils)
 add_subdirectory (pfio)
-add_subdirectory (profiler)
 add_subdirectory (generic3g)
 add_subdirectory (vm)
 add_subdirectory (field)
@@ -234,7 +235,6 @@ add_subdirectory (shared)
 add_subdirectory (include)
 add_subdirectory (base3g)
 add_subdirectory (mapl3g)
-add_subdirectory (utilities)
 add_subdirectory (gridcomps)
 add_subdirectory (GeomIO)
 add_subdirectory (esmf_utils)

base3g/CMakeLists.txt

@@ -23,7 +23,7 @@ set (srcs
 
 esma_add_library (${this}
   SRCS ${srcs}
-  DEPENDENCIES ESMF::ESMF PFLOGGER::pflogger GFTL_SHARED::gftl-shared-v2 MAPL.shared MAPL.geom MAPL.esmf_utils MAPL.pfio MAPL.field_bundle MAPL.utilities MAPL.constants MPI::MPI_Fortran NetCDF::NetCDF_Fortran
+  DEPENDENCIES ESMF::ESMF PFLOGGER::pflogger GFTL_SHARED::gftl-shared-v2 MAPL.shared MAPL.geom MAPL.esmf_utils MAPL.pfio MAPL.field_bundle MAPL.utils MAPL.constants MPI::MPI_Fortran NetCDF::NetCDF_Fortran
   TYPE SHARED
 )
 

component/CMakeLists.txt

@@ -1,7 +1,6 @@
 esma_set_this (OVERRIDE MAPL.component)
 
 set (srcs
-  CouplerPhases.F90
   ComponentDriver.F90
   ComponentDriverVector.F90
   ComponentDriverPtrVector.F90
@@ -13,7 +12,7 @@ set (srcs
 
 esma_add_library(${this}
     SRCS ${srcs}
-    DEPENDENCIES MAPL.esmf_utils MAPL.shared
+    DEPENDENCIES MAPL.enums MAPL.esmf_utils MAPL.shared
     TYPE SHARED
     )
 

component/GriddedComponentDriver/run_export_couplers.F90

@@ -2,7 +2,7 @@
 
 submodule(mapl3g_GriddedComponentDriver) run_export_couplers_smod
 
-   use mapl3g_CouplerPhases
+   use mapl_CouplerPhases
    use mapl_ErrorHandling
    implicit none(type,external)
 

component/GriddedComponentDriver/run_import_couplers.F90

@@ -1,7 +1,7 @@
 #include "MAPL.h"
 
 submodule(mapl3g_GriddedComponentDriver) run_import_couplers_smod
-   use mapl3g_CouplerPhases
+   use mapl_CouplerPhases
    use mapl_ErrorHandling
    implicit none(type,external)
 

enums/CMakeLists.txt

@@ -0,0 +1,24 @@
+esma_set_this (OVERRIDE MAPL.enums)
+
+set (srcs
+  ConservationType.F90
+  NormalizationType.F90
+  QuantityType.F90
+  VectorBasisKind.F90
+  ConservationMetadata.F90
+  NormalizationMetadata.F90
+  QuantityTypeMetadata.F90
+  ValidationMode.F90
+  VerificationStatus.F90
+  GenericPhases.F90
+  CouplerPhases.F90
+  )
+
+esma_add_library (${this}
+  SRCS ${srcs}
+  DEPENDENCIES MAPL.shared ESMF::ESMF
+  TYPE SHARED
+  )
+
+target_include_directories (${this} PUBLIC
+  $<BUILD_INTERFACE:${MAPL_SOURCE_DIR}/include>)

esmf_utils/ConservationMetadata.F90 enums/ConservationMetadata.F90esmf_utils/ConservationMetadata.F90 renamed to enums/ConservationMetadata.F90

@@ -1,10 +1,10 @@
 #include "MAPL.h"
 
-module mapl3g_ConservationMetadata
-   use mapl3g_ConservationType
-   use mapl3g_InfoUtilities
+module mapl_ConservationMetadata
+   use mapl_ConservationType
    use mapl_ErrorHandling
-   use esmf
+   use esmf, only: ESMF_Info, ESMF_InfoCreate, ESMF_InfoIsPresent
+   use esmf, only: ESMF_InfoSet, ESMF_InfoGet, ESMF_InfoGetCharAlloc
 
    implicit none(type, external)
    private
@@ -90,12 +90,12 @@ function make_info(this, rc) result(info)
 
       info = ESMF_InfoCreate(_RC)
 
-      call MAPL_InfoSet(info, key=KEY_IS_MIRROR, value=this%is_mirror(), _RC)
+      call ESMF_InfoSet(info, key=KEY_IS_MIRROR, value=this%is_mirror(), _RC)
       _RETURN_IF(this%is_mirror())
 
       ! Write conservation properties
-      call MAPL_InfoSet(info, KEY_CONSERVATION_TYPE, this%conservation_type%to_string(), _RC)
-      call MAPL_InfoSet(info, KEY_IS_CONSERVABLE, this%is_conservable, _RC)
+      call ESMF_InfoSet(info, KEY_CONSERVATION_TYPE, this%conservation_type%to_string(), _RC)
+      call ESMF_InfoSet(info, KEY_IS_CONSERVABLE, this%is_conservable, _RC)
 
       _RETURN(_SUCCESS)
    end function make_info
@@ -117,7 +117,7 @@ function make_ConservationMetadata(info, key, rc) result(metadata)
       if (present(key)) full_key = key // full_key
       is_present = ESMF_InfoIsPresent(info, key=full_key, _RC)
       if (is_present) then
-         call MAPL_InfoGet(info, key=full_key, value=is_mirror, _RC)
+         call ESMF_InfoGet(info, key=full_key, value=is_mirror, _RC)
       end if
 
       if (is_mirror) then
@@ -133,7 +133,7 @@ function make_ConservationMetadata(info, key, rc) result(metadata)
       if (present(key)) full_key = key // full_key
       is_present = ESMF_InfoIsPresent(info, key=full_key, _RC)
       if (is_present) then
-         call MAPL_InfoGet(info, full_key, str_value, _RC)
+         call ESMF_InfoGetCharAlloc(info, full_key, str_value, _RC)
          metadata%conservation_type = ConservationType(str_value)
       end if
 
@@ -142,7 +142,7 @@ function make_ConservationMetadata(info, key, rc) result(metadata)
       if (present(key)) full_key = key // full_key
       is_present = ESMF_InfoIsPresent(info, key=full_key, _RC)
       if (is_present) then
-         call MAPL_InfoGet(info, full_key, is_conservable_buffer, _RC)
+         call ESMF_InfoGet(info, full_key, is_conservable_buffer, _RC)
          metadata%is_conservable = is_conservable_buffer
       end if
 
@@ -173,4 +173,4 @@ logical function not_equal_to(lhs, rhs) result(not_equals)
       not_equals = .not. (lhs == rhs)
    end function not_equal_to
 
-end module mapl3g_ConservationMetadata
+end module mapl_ConservationMetadata

esmf_utils/ConservationType.F90 enums/ConservationType.F90esmf_utils/ConservationType.F90 renamed to enums/ConservationType.F90

@@ -1,4 +1,4 @@
-module mapl3g_ConservationType
+module mapl_ConservationType
    implicit none(type, external)
    private
 
@@ -103,4 +103,4 @@ function conservation_type_from_string(name, rc) result(ctype)
       if (present(rc)) rc = 0
    end function conservation_type_from_string
 
-end module mapl3g_ConservationType
+end module mapl_ConservationType