Revert MAPL_Constants rename: keep as umbrella module, not subject to _mod convention

tclune · tclune · commit b975e997710f · 2026-05-22T11:42:21.000-04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -51,7 +51,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   `mapl_KeywordEnforcerMod`, `MAPL_ShmemMod`). Duplicate `VerticalAlignment.F90`
   removed from `superstructure/generic/specs/` (canonical copy remains in
   `infrastructure/vertical/vertical_grid/`). Legacy `base3g/Comms.F90` retains
-  `MAPL_CommsMod` name pending resolution of #4961.
+  `MAPL_CommsMod` name pending resolution of #4961. `MAPL_Constants` retains its
+  name as it functions as an umbrella module.
 
 - Remove `MAPL_GridCompsMod` and enforce that `gridcomps/` modules `use MAPL`
   (the umbrella module) rather than internal modules directly (#4959).
diff --git a/base3g/Comms.F90 b/base3g/Comms.F90
@@ -21,7 +21,7 @@ module MAPL_CommsMod
   use mapl_Shmem_mod, only: MAPL_ShmInitialized, MAPL_SyncSharedMemory, &
                            MAPL_BroadcastToNodes, MAPL_NodeRankList, &
                            MAPL_GetNewRank
-  use mapl_Constants_mod, only: MAPL_Unknown, MAPL_IsGather, MAPL_IsScatter, MAPL_UNDEF
+  use MAPL_Constants, only: MAPL_Unknown, MAPL_IsGather, MAPL_IsScatter, MAPL_UNDEF
   use mapl_ErrorHandling_mod, only: MAPL_Assert, MAPL_Verify, MAPL_Return
   use mapl_GridGetGlobal_mod, only: GridGetGlobalCellCountPerDim
   use mpi
diff --git a/base3g/MAPL_LocStreamMod.F90 b/base3g/MAPL_LocStreamMod.F90
@@ -24,7 +24,7 @@ module mapl_LocStreamMod_impl_mod
 
 use ESMF
 use mapl_Geom_API_mod, only: MAPL_GridGet
-use mapl_Constants_mod
+use MAPL_Constants
 use mapl_GridAccessors_mod, only: geom_GridGet => GridGet
 use mapl_NCIO_mod, only: MAPL_ReadTilingNC4
 use MAPL_CommsMod
diff --git a/base3g/NCIO.F90 b/base3g/NCIO.F90
@@ -26,7 +26,7 @@ module mapl_NCIO_mod
   use mapl_ExceptionHandling_mod
   use netcdf
   use pFIO
-  use mapl_Constants_mod
+  use MAPL_Constants
   use gFTL2_StringIntegerMap
   use gFTL2_StringVector
   use, intrinsic :: ISO_C_BINDING
diff --git a/base3g/SimpleBundleMod.F90 b/base3g/SimpleBundleMod.F90
@@ -24,7 +24,7 @@ module mapl_SimpleBundleMod_impl_mod
    use mapl_FieldBundle_API_mod, only: MAPL_FieldBundleGetByIndex, MAPL_FieldBundleDestroy
    use mapl_ArrayReductions_mod, only: MaxMin => MAPL_MaxMin
    use MAPL_CommsMod, only: MAPL_AM_I_ROOT
-   use mapl_Constants_mod, only: MAPL_PI
+   use MAPL_Constants, only: MAPL_PI
    use mapl_ExceptionHandling_mod
 
    implicit none
diff --git a/base3g/SunOrbit.F90 b/base3g/SunOrbit.F90
@@ -25,7 +25,7 @@ module mapl_Sun_mod
 ! !USES:
 
   use ESMF
-  use mapl_Constants_mod
+  use MAPL_Constants
   use MAPL_CommsMod
   use mapl_ErrorHandling_mod, only: MAPL_Assert, MAPL_Verify, MAPL_Return
   use mapl_TimeInterpolation_mod, only: MAPL_ClimInterpFac
diff --git a/enums/QuantityTypeMetadata.F90 b/enums/QuantityTypeMetadata.F90
@@ -3,7 +3,7 @@
 module mapl_QuantityTypeMetadata_mod
    use mapl_QuantityType_mod
    use mapl_ErrorHandling_mod
-   use mapl_Constants_mod, only: MAPL_UNDEF => MAPL_UNDEFINED_REAL
+   use MAPL_Constants, only: MAPL_UNDEF => MAPL_UNDEFINED_REAL
    use esmf, only: ESMF_Info, ESMF_InfoCreate, ESMF_InfoIsPresent
    use esmf, only: ESMF_InfoSet, ESMF_InfoGet, ESMF_InfoGetCharAlloc
    
diff --git a/gridcomps/orbit/MAPL_NominalOrbitsMod.F90 b/gridcomps/orbit/MAPL_NominalOrbitsMod.F90
@@ -19,7 +19,7 @@
 !- 30Jul2009   Albayrak  Beta version 2 implemantation
 !
   MODULE mapl_NominalOrbits_mod
-     use mapl_Constants_mod
+     use MAPL_Constants
      IMPLICIT NONE
 
       PRIVATE
diff --git a/infrastructure/esmf/comms/MAPL_Comms.F90 b/infrastructure/esmf/comms/MAPL_Comms.F90
@@ -9,7 +9,7 @@
 module mapl_Comms_mod
 
    use ESMF
-   use mapl_Constants_mod, only: MAPL_UNDEFINED_REAL
+   use MAPL_Constants, only: MAPL_UNDEFINED_REAL
    use mapl_DistGridGet_mod, only: DistGridGet
    use mapl_ErrorHandling_mod
    use mpi
diff --git a/infrastructure/fields/field/FieldBLAS.F90 b/infrastructure/fields/field/FieldBLAS.F90
@@ -3,7 +3,7 @@
 module mapl_FieldBLAS_mod
 
    use ESMF
-   use mapl_Constants_mod, only: MAPL_UNDEFINED_REAL32, MAPL_UNDEFINED_REAL64
+   use MAPL_Constants, only: MAPL_UNDEFINED_REAL32, MAPL_UNDEFINED_REAL64
    use mapl_ExceptionHandling_mod
    use mapl_FieldCondensedArray_mod
    use mapl_FieldPointerUtilities_mod
diff --git a/infrastructure/fields/state/StateArithmeticParser.F90 b/infrastructure/fields/state/StateArithmeticParser.F90
@@ -51,7 +51,7 @@
 MODULE mapl_StateArithmeticParser_mod
 
   use ESMF
-   use mapl_Constants_mod,  only: MAPL_UNDEF
+   use MAPL_Constants,  only: MAPL_UNDEF
    use mapl_FieldUtils_mod
   use mapl_ExceptionHandling_mod
   use gFTL2_StringVector
diff --git a/infrastructure/fields/state/StateMasking.F90 b/infrastructure/fields/state/StateMasking.F90
@@ -8,7 +8,7 @@ module mapl_StateMask_mod
    use mapl_ExceptionHandling_mod
    use gFTL2_StringVector
    use mapl_StateArithmeticParser_mod
-   use mapl_Constants_mod
+   use MAPL_Constants
    use mapl_State_API_mod, only: MAPL_StateGetPointer
    implicit none
    private
diff --git a/infrastructure/geom/GeomIO/CompressionSettings.F90 b/infrastructure/geom/GeomIO/CompressionSettings.F90
@@ -2,7 +2,7 @@
 module mapl_CompressionSettings_mod
     use ESMF
     use mapl_ErrorHandling_mod
-    use mapl_Constants_mod
+    use MAPL_Constants
     use mapl_esmf_info_keys_mod
     implicit none
     private
diff --git a/infrastructure/geom/GeomIO/Grid_PFIO.F90 b/infrastructure/geom/GeomIO/Grid_PFIO.F90
@@ -9,7 +9,7 @@ module mapl_GridPFIO_mod
    use mapl_SharedIO_mod
    use ESMF
    use PFIO
-   use mapl_Constants_mod,  only: MAPL_RADIANS_TO_DEGREES
+   use MAPL_Constants,  only: MAPL_RADIANS_TO_DEGREES
    use mapl_FieldPointerUtilities_mod
    use mapl_pFIOServerBounds_mod, only: pFIOServerBounds, PFIO_BOUNDS_WRITE, PFIO_BOUNDS_READ
 
diff --git a/infrastructure/geom/geom/CubedSphere/CubedSphereGeomFactory_smod.F90 b/infrastructure/geom/geom/CubedSphere/CubedSphereGeomFactory_smod.F90
@@ -9,7 +9,7 @@
    use mapl_CubedSphereGeomSpec_mod
    use mapl_MinMax_mod
    use mapl_ErrorHandling_mod
-   use mapl_Constants_mod
+   use MAPL_Constants
    use pFIO
    use gFTL2_StringVector
    use mapl_StringDictionary_mod
diff --git a/infrastructure/geom/geom/CubedSphere/CubedSphereGeomSpec/get_horz_ij_index.F90 b/infrastructure/geom/geom/CubedSphere/CubedSphereGeomSpec/get_horz_ij_index.F90
@@ -2,7 +2,7 @@
 
 submodule (mapl_CubedSphereGeomSpec_mod) CubedSphereGeomSpec_get_horz_ij_index_smod
 
-   use mapl_Constants_mod, only: MAPL_PI_R8
+   use MAPL_Constants, only: MAPL_PI_R8
    use mapl_ErrorHandling_mod
 
    implicit none(type, external)
diff --git a/infrastructure/geom/geom/CubedSphere/CubedSphereGeomSpec_smod.F90 b/infrastructure/geom/geom/CubedSphere/CubedSphereGeomSpec_smod.F90
@@ -7,7 +7,7 @@
    use pfio
    use mapl_Range_mod
    use mapl_ErrorHandling_mod
-   use mapl_Constants_mod
+   use MAPL_Constants
    use esmf
    use, intrinsic :: iso_fortran_env, only: REAL32, REAL64
 
diff --git a/infrastructure/geom/geom/CubedSphere/CubedSphereGetGlobalHorzIJIndex.F90 b/infrastructure/geom/geom/CubedSphere/CubedSphereGetGlobalHorzIJIndex.F90
@@ -17,7 +17,7 @@ module mapl_CubedSphereGetGlobalHorzIJIndex_mod
                                ESMF_InfoGetFromHost, ESMF_InfoIsPresent, ESMF_InfoGet, &
                                ESMF_GridGet, ESMF_STAGGERLOC_CENTER, ESMF_MAXDIM
   use mapl_GridAccessors_mod,   only: GridGet
-  use mapl_Constants_mod,   only: MAPL_PI_R8, MAPL_DEGREES_TO_RADIANS_R8
+  use MAPL_Constants,   only: MAPL_PI_R8, MAPL_DEGREES_TO_RADIANS_R8
   use mapl_ErrorHandling_mod
 
   implicit none(type, external)
diff --git a/infrastructure/geom/geom/EASE/EASEGeomSpec/get_horz_ij_index.F90 b/infrastructure/geom/geom/EASE/EASEGeomSpec/get_horz_ij_index.F90
@@ -3,7 +3,7 @@
 submodule (mapl_EASEGeomSpec_mod) get_horz_ij_index_smod
 
    use mapl_EASEConversion_mod
-   use mapl_Constants_mod, only: MAPL_RADIANS_TO_DEGREES
+   use MAPL_Constants, only: MAPL_RADIANS_TO_DEGREES
    use mapl_ErrorHandling_mod
 
    implicit none (type, external)
diff --git a/infrastructure/geom/geom/GridGet/grid_get_corners.F90 b/infrastructure/geom/geom/GridGet/grid_get_corners.F90
@@ -2,7 +2,7 @@
 
 submodule (mapl_GridAccessors_mod) grid_get_corners_smod
 
-   use mapl_Constants_mod
+   use MAPL_Constants
    use esmf
 
    implicit none(type, external)
diff --git a/infrastructure/geom/geom/LatLon/LatLonGeomFactory/create_basic_grid.F90 b/infrastructure/geom/geom/LatLon/LatLonGeomFactory/create_basic_grid.F90
@@ -7,7 +7,7 @@
    use mapl_LatLonGeomSpec_mod
    use mapl_MinMax_mod
    use mapl_ErrorHandling_mod
-   use mapl_Constants_mod
+   use MAPL_Constants
    use pFIO
    use gFTL2_StringVector
    use esmf
diff --git a/infrastructure/geom/geom/LatLon/LatLonGeomFactory/fill_coordinates.F90 b/infrastructure/geom/geom/LatLon/LatLonGeomFactory/fill_coordinates.F90
@@ -7,7 +7,7 @@
    use mapl_LatLonGeomSpec_mod
    use mapl_MinMax_mod
    use mapl_ErrorHandling_mod
-   use mapl_Constants_mod
+   use MAPL_Constants
    use pFIO
    use gFTL2_StringVector
    use esmf
diff --git a/infrastructure/geom/geom/LatLon/LatLonGeomFactory/make_file_metadata.F90 b/infrastructure/geom/geom/LatLon/LatLonGeomFactory/make_file_metadata.F90
@@ -9,7 +9,7 @@
    use mapl_LatLonGeomSpec_mod
    use mapl_MinMax_mod
    use mapl_ErrorHandling_mod
-   use mapl_Constants_mod
+   use MAPL_Constants
    use pFIO
    use gFTL2_StringVector
    use esmf
diff --git a/infrastructure/geom/geom/LatLon/LatLonGeomFactory/make_geom.F90 b/infrastructure/geom/geom/LatLon/LatLonGeomFactory/make_geom.F90
@@ -9,7 +9,7 @@
    use mapl_LatLonGeomSpec_mod
    use mapl_MinMax_mod
    use mapl_ErrorHandling_mod
-   use mapl_Constants_mod
+   use MAPL_Constants
    use pFIO
    use gFTL2_StringVector
    use esmf
diff --git a/infrastructure/geom/geom/LatLon/LatLonGeomFactory/make_gridded_dims.F90 b/infrastructure/geom/geom/LatLon/LatLonGeomFactory/make_gridded_dims.F90
@@ -9,7 +9,7 @@
    use mapl_LatLonGeomSpec_mod
    use mapl_MinMax_mod
    use mapl_ErrorHandling_mod
-   use mapl_Constants_mod
+   use MAPL_Constants
    use pFIO
    use gFTL2_StringVector
    use esmf
diff --git a/infrastructure/geom/geom/LatLon/LatLonGeomFactory/make_variable_attributes.F90 b/infrastructure/geom/geom/LatLon/LatLonGeomFactory/make_variable_attributes.F90
@@ -9,7 +9,7 @@
    use mapl_LatLonGeomSpec_mod
    use mapl_MinMax_mod
    use mapl_ErrorHandling_mod
-   use mapl_Constants_mod
+   use MAPL_Constants
    use pFIO
    use mapl_StringDictionary_mod
    use esmf
diff --git a/infrastructure/geom/geom/LatLon/LatLonGeomFactory/typesafe_make_file_metadata.F90 b/infrastructure/geom/geom/LatLon/LatLonGeomFactory/typesafe_make_file_metadata.F90
@@ -7,7 +7,7 @@
    use mapl_LatLonGeomSpec_mod
    use mapl_MinMax_mod
    use mapl_ErrorHandling_mod
-   use mapl_Constants_mod
+   use MAPL_Constants
    use pFIO
    use gFTL2_StringVector
    use esmf
diff --git a/infrastructure/geom/geom/LatLon/LatLonGeomFactory/typesafe_make_geom.F90 b/infrastructure/geom/geom/LatLon/LatLonGeomFactory/typesafe_make_geom.F90
@@ -7,7 +7,7 @@
    use mapl_LatLonGeomSpec_mod
    use mapl_MinMax_mod
    use mapl_ErrorHandling_mod
-   use mapl_Constants_mod
+   use MAPL_Constants
    use pFIO
    use gFTL2_StringVector
    use esmf
diff --git a/infrastructure/geom/geom/LatLon/LatLonGeomSpec/get_horz_ij_index.F90 b/infrastructure/geom/geom/LatLon/LatLonGeomSpec/get_horz_ij_index.F90
@@ -2,7 +2,7 @@
 
 submodule (mapl_LatLonGeomSpec_mod) get_horz_ij_index_smod
 
-   use mapl_Constants_mod, only: MAPL_RADIANS_TO_DEGREES
+   use MAPL_Constants, only: MAPL_RADIANS_TO_DEGREES
    use mapl_ErrorHandling_mod
 
    implicit none (type, external)
diff --git a/infrastructure/geom/geom/LocStream/LocStreamGeomFactory.F90 b/infrastructure/geom/geom/LocStream/LocStreamGeomFactory.F90
@@ -19,7 +19,7 @@ module mapl_LocStreamGeomFactory_mod
    use gftl2_StringVector, only: StringVector
    use mapl_StringDictionary_mod, only: StringDictionary
    use mapl_KeywordEnforcer_mod, only: KeywordEnforcer
-   use mapl_Constants_mod, only: MAPL_PI_R8
+   use MAPL_Constants, only: MAPL_PI_R8
    use esmf
    implicit none
    private
diff --git a/infrastructure/geom/geom/Mesh/MeshGeomFactory_smod.F90 b/infrastructure/geom/geom/Mesh/MeshGeomFactory_smod.F90
@@ -6,7 +6,7 @@
    use mapl_MeshGeomSpec_mod
    use mapl_MeshDecomposition_mod
    use mapl_ErrorHandling_mod
-   use mapl_Constants_mod, only: MAPL_PI_R8
+   use MAPL_Constants, only: MAPL_PI_R8
    use mapl_StringUtilities_mod, only: to_lower
    use mapl_get_hconfig_mod, only: get_hconfig
    use mapl_hconfig_params_mod, only: HConfigParams
diff --git a/infrastructure/geom/geom/Mesh/raster_to_mesh/Mesh.F90 b/infrastructure/geom/geom/Mesh/raster_to_mesh/Mesh.F90
@@ -6,8 +6,8 @@ module mapl_Mesh_mod
    use mapl_MeshElement_mod
    use mapl_MeshElementVector_mod
    use mapl_ErrorHandling_mod
-   use mapl_Constants_mod, only: MAPL_DEGREES_TO_RADIANS_R8, MAPL_PI_R8
-   use mapl_Constants_mod, only: MAPL_RADIANS_TO_DEGREES
+   use MAPL_Constants, only: MAPL_DEGREES_TO_RADIANS_R8, MAPL_PI_R8
+   use MAPL_Constants, only: MAPL_RADIANS_TO_DEGREES
    use gFTL2_Integer64Vector
    use esmf
    use, intrinsic :: iso_fortran_env, only: INT64, REAL64
diff --git a/infrastructure/geom/geom/VectorBasis/xyz2latlon.F90 b/infrastructure/geom/geom/VectorBasis/xyz2latlon.F90
@@ -4,7 +4,7 @@
 contains
 
    pure module function xyz2latlon(xyz_coord) result(sph_coord)
-      use mapl_Constants_mod, only: PI => MAPL_PI_R8
+      use MAPL_Constants, only: PI => MAPL_PI_R8
       real(kind=ESMF_KIND_R8), intent(in):: xyz_coord(3)
       real(kind=ESMF_KIND_R8) :: sph_coord(2)
       real(kind=ESMF_KIND_R8), parameter:: esl=1.e-10
diff --git a/infrastructure/geom/geom/XY/XYGeomFactory/fill_coordinates.F90 b/infrastructure/geom/geom/XY/XYGeomFactory/fill_coordinates.F90
@@ -12,7 +12,7 @@
 submodule (mapl_XYGeomFactory_mod) fill_coordinates_smod
    use mapl_ErrorHandling_mod
    use mapl_InternalConstants_mod, only: MAPL_UNDEFINED_REAL64
-   use mapl_Constants_mod, only: MAPL_DEGREES_TO_RADIANS_R8
+   use MAPL_Constants, only: MAPL_DEGREES_TO_RADIANS_R8
    use mapl_Comms_mod,   only: am_i_root, ROOT_PROCESS_ID
    use NetCDF
    use esmf
diff --git a/infrastructure/geom/geom/XY/XYGeomFactory/fill_coordinates_abi.F90 b/infrastructure/geom/geom/XY/XYGeomFactory/fill_coordinates_abi.F90
@@ -10,7 +10,7 @@
 
 submodule (mapl_XYGeomFactory_mod) fill_coordinates_abi_smod
    use mapl_ErrorHandling_mod
-   use mapl_Constants_mod, only: MAPL_DEGREES_TO_RADIANS_R8
+   use MAPL_Constants, only: MAPL_DEGREES_TO_RADIANS_R8
    use mapl_Comms_mod,   only: am_i_root, ROOT_PROCESS_ID
    use mapl_EarthConstants_mod, only: R_EQ  => MAPL_SEMIMAJOR_AXIS, &
                                   R_POL => MAPL_SEMIMINOR_AXIS, &
diff --git a/infrastructure/geom/geom/tests/Test_CubedSphereGeomSpec.pf b/infrastructure/geom/geom/tests/Test_CubedSphereGeomSpec.pf
@@ -6,7 +6,7 @@ module Test_CubedSphereGeomSpec
    use pfunit
    use esmf_TestMethod_mod ! mapl
    use mapl_CubedSphereGeomSpec_mod
-   use mapl_Constants_mod, only: MAPL_PI, MAPL_PI_R8
+   use MAPL_Constants, only: MAPL_PI, MAPL_PI_R8
    use esmf
 
    implicit none
diff --git a/infrastructure/geom/regridder_mgr/RegridderMethods.F90 b/infrastructure/geom/regridder_mgr/RegridderMethods.F90
@@ -3,7 +3,7 @@ module mapl_RegridderMethods_mod
    use ESMF
    use mapl_DynamicMask_mod
    use mapl_ErrorHandling_mod
-   use mapl_Constants_mod, only: MAPL_UNDEFINED_REAL, MAPL_UNDEFINED_REAL64
+   use MAPL_Constants, only: MAPL_UNDEFINED_REAL, MAPL_UNDEFINED_REAL64
    use mapl_EsmfRegridder_mod, only: EsmfRegridderParam
    implicit none
    private
diff --git a/infrastructure/geom/regridder_mgr/tests/Test_RegridderManager.pf b/infrastructure/geom/regridder_mgr/tests/Test_RegridderManager.pf
@@ -8,7 +8,7 @@ module Test_RegridderManager
    use mapl_regridder_mgr_mod
    use mapl_Geom_API_mod
    use mapl_FieldBundle_API_mod
-   use mapl_Constants_mod, only: MAPL_UNDEF, MAPL_UNDEFINED_REAL64
+   use MAPL_Constants, only: MAPL_UNDEF, MAPL_UNDEFINED_REAL64
    use esmf_TestMethod_mod ! mapl
    use esmf
    use, intrinsic :: iso_fortran_env, only: REAL32, REAL64
diff --git a/infrastructure/vertical/vertical/VerticalRegridConserveInterface.F90 b/infrastructure/vertical/vertical/VerticalRegridConserveInterface.F90
@@ -6,7 +6,7 @@ module VerticalRegridConserveInterfaceMod
    use mapl_ExceptionHandling_mod
    use MAPL_CommsMod
    use mapl_Eta2Eta_mod
-   use mapl_Constants_mod, only: MAPL_GRAV,MAPL_AIRMW,MAPL_H2OMW
+   use MAPL_Constants, only: MAPL_GRAV,MAPL_AIRMW,MAPL_H2OMW
    use udunits2f, UDUNITS_are_convertible => are_convertible, &
       initialize_udunits => initialize, finalize_udunits => finalize
 
diff --git a/infrastructure/vertical/vertical/VerticalRegridUtilities.F90 b/infrastructure/vertical/vertical/VerticalRegridUtilities.F90
@@ -5,7 +5,7 @@ module VerticalRegridUtilitiesMod
    use PFIO
    use mapl_ExceptionHandling_mod
    use MAPL_CommsMod
-   use mapl_Constants_mod, only: MAPL_GRAV
+   use MAPL_Constants, only: MAPL_GRAV
 
    implicit none
    private
diff --git a/mapl/MAPL.F90 b/mapl/MAPL.F90
@@ -21,7 +21,7 @@ module MAPL
    use mapl_Hash_mod
    use mapl_ErrorHandling_mod
    use mapl_DirPath_mod
-   use mapl_Constants_mod
+   use MAPL_Constants
    use mapl_CommGroupDescription_mod
    use mapl_AbstractCommSplitter_mod
    use mapl_Downbit_mod
diff --git a/mp_utils/ArrayReductions.F90 b/mp_utils/ArrayReductions.F90
@@ -30,7 +30,7 @@ module mapl_ArrayReductions_mod
    use, intrinsic :: iso_fortran_env, only: real32, real64
 
    use mapl_ErrorHandling_mod, only: MAPL_Verify, MAPL_Assert, MAPL_Return
-   use mapl_Constants_mod, only: MAPL_UNDEFINED_REAL, MAPL_UNDEFINED_REAL64
+   use MAPL_Constants, only: MAPL_UNDEFINED_REAL, MAPL_UNDEFINED_REAL64
 
    implicit none
    private
diff --git a/mp_utils/MAPL_LoadBalance.F90 b/mp_utils/MAPL_LoadBalance.F90
@@ -8,7 +8,7 @@
 !
 module mapl_LoadBalance_mod
 
-  use mapl_Constants_mod, only : MAPL_R8
+  use MAPL_Constants, only : MAPL_R8
   use mapl_Sort_mod
   use mapl_ExceptionHandling_mod
   use mpi
diff --git a/mp_utils/SatVapor.F90 b/mp_utils/SatVapor.F90
@@ -36,7 +36,7 @@ module mapl_SatVapor_mod
 ! !USES:
 !
 #ifdef MAPL_MODE
-  use mapl_Constants_mod, only: MAPL_H2OMW, MAPL_AIRMW, MAPL_TICE, &
+  use MAPL_Constants, only: MAPL_H2OMW, MAPL_AIRMW, MAPL_TICE, &
                             MAPL_UseStarrQsat, MAPL_UseGoffGratchQsat, &
                             MAPL_UseMurphyKoopQsat
 #endif
diff --git a/mp_utils/Shmem/Shmem.F90 b/mp_utils/Shmem/Shmem.F90
diff --git a/mp_utils/Shmem/Shmem_implementation.F90 b/mp_utils/Shmem/Shmem_implementation.F90
diff --git a/superstructure/generic/tests/Test_TimeInterpolateTransform.pf b/superstructure/generic/tests/Test_TimeInterpolateTransform.pf
diff --git a/superstructure/generic/transforms/TimeInterpolateTransform.F90 b/superstructure/generic/transforms/TimeInterpolateTransform.F90
diff --git a/tests/GetHorzIJIndex/create_stretched_cs_grid.F90 b/tests/GetHorzIJIndex/create_stretched_cs_grid.F90
diff --git a/utils/Constants/Constants.F90 b/utils/Constants/Constants.F90
diff --git a/utils/MAPL_DirPath.F90 b/utils/MAPL_DirPath.F90
diff --git a/utils/tests/test_DirPath.pf b/utils/tests/test_DirPath.pf

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`!- 30Jul2009 Albayrak Beta version 2 implemantation`
`20`	`20`	`!`
`21`	`21`	`MODULE mapl_NominalOrbits_mod`
`22`		`- use mapl_Constants_mod`
	`22`	`+ use MAPL_Constants`
`23`	`23`	`IMPLICIT NONE`
`24`	`24`
`25`	`25`	`PRIVATE`