diff --git a/.opencode/skills/github-workflow/SKILL.md b/.opencode/skills/github-workflow/SKILL.md index fec380b93f7..b3a1e692c9b 100644 --- a/.opencode/skills/github-workflow/SKILL.md +++ b/.opencode/skills/github-workflow/SKILL.md @@ -40,23 +40,21 @@ These rules exist to maintain code quality and prevent accidental breaking chang #### develop -**Purpose:** Legacy MAPL (MAPL 2.x) maintenance and development +**Purpose:** Primary integration branch for both MAPL 2.x maintenance and MAPL v3 development **Use for:** - Bug fixes for MAPL 2.x - Features for current production version - Maintenance and stability improvements +- **MAPL v3 restructuring and new features** (previously on release/MAPL-v3) -**Status:** Stable, production-ready code +**Status:** Active integration branch — all PRs (including MAPL v3 work) target here #### release/MAPL-v3 -**Purpose:** MAPL v3 pre-release development +**Purpose:** No longer used for active development of MAPL (superseded by `develop`) -**Use for:** -- New features for MAPL v3 -- MAPL v3 specific improvements -- Next major version development +**Note:** MAPL v3 integration work has moved to `develop`. External client repos are still using `release/MAPL-v3` **Status:** Active development, pre-release diff --git a/CHANGELOG.md b/CHANGELOG.md index 87700136a56..5f52d6cfbc7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -52,6 +52,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed +- Rename all internal MAPL modules from `mapl_[Mod]` to `mapl__mod` + convention (#4958). Affects 446 module definitions across 695 source files. + Three thin-wrapper duplicate modules removed (`mapl_ErrorHandlingMod`, + `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_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). + - Resolve Intel Fortran error #6450 (case-insensitive module/alias name collision) for 13 modules in `infrastructure/fields/` whose module name matched their sole public symbol when renamed via USE aliases in the layer diff --git a/apps/Regrid_Util/Regrid_Util.F90 b/apps/Regrid_Util/Regrid_Util.F90 index a02f05010b3..acd2cef0e5b 100644 --- a/apps/Regrid_Util/Regrid_Util.F90 +++ b/apps/Regrid_Util/Regrid_Util.F90 @@ -5,7 +5,7 @@ module regrid_util_support_mod use ESMF use MAPL - use mapl_RegridderMethods + use mapl_RegridderMethods_mod use gFTL2_StringVector implicit NONE @@ -376,8 +376,8 @@ Program Regrid_Util use ESMF use MAPL - use MAPL_FileMetadataUtilsMod, only: FileMetadataUtils - use mapl_Profiler + use mapl_FileMetadataUtils_mod, only: FileMetadataUtils + use mapl_Profiler_mod use regrid_util_support_mod use mpi use gFTL2_StringVector diff --git a/apps/tests/acg3/ACG3.F90 b/apps/tests/acg3/ACG3.F90 index 59131f236bb..0a5dd9b1ed2 100644 --- a/apps/tests/acg3/ACG3.F90 +++ b/apps/tests/acg3/ACG3.F90 @@ -2,16 +2,16 @@ #define _RETURN(status) if(present(rc)) rc=status #define _SUCCESS ESMF_SUCCESS #define _FAILURE _SUCCESS-1 -module mapl_acg3 - use mapl_Generic, only: MAPL_GridCompAddSpec - use mapl_UngriddedDim, only: UngriddedDim - use mapl_State_API, only: MAPL_StateGetPointer - use mapl_ErrorHandling - use mapl_KeywordEnforcer +module mapl_acg3_mod + use mapl_Generic_mod, only: MAPL_GridCompAddSpec + use mapl_UngriddedDim_mod, only: UngriddedDim + use mapl_State_API_mod, only: MAPL_StateGetPointer + use mapl_ErrorHandling_mod + use mapl_KeywordEnforcer_mod use esmf, only: ESMF_STATEITEM_FIELD, ESMF_SUCCESS, ESMF_STATEINTENT_IMPORT, ESMF_STATEINTENT_EXPORT, ESMF_STATEINTENT_INTERNAL use esmf, only: ESMF_State, ESMF_GridComp, Esmf_StateIntent_Flag, ESMF_Field use esmf, only: ESMF_KIND_R4, ESMF_KIND_R8 - use mapl_VerticalStaggerLoc + use mapl_VerticalStaggerLoc_mod use, intrinsic :: iso_fortran_env, only: R64 => real64, R32 => real32 implicit none(type, external) @@ -49,4 +49,4 @@ subroutine get_pointers(rc) _RETURN(status) end subroutine get_pointers -end module mapl_acg3 +end module mapl_acg3_mod diff --git a/base3g/API.F90 b/base3g/API.F90 index c61c18561a0..4baf1fe7757 100644 --- a/base3g/API.F90 +++ b/base3g/API.F90 @@ -1,14 +1,14 @@ -module mapl_base3g - use MAPL_FileMetadataUtilsMod - use MAPL_FileMetadataUtilsVectorMod - use MAPL_PackedTimeMod, only: MAPL_PackedDateCreate => PackedDateCreate, & +module mapl_base3g_mod + use mapl_FileMetadataUtils_mod + use mapl_FileMetadataUtilsVector_mod + use mapl_PackedTime_mod, only: MAPL_PackedDateCreate => PackedDateCreate, & MAPL_PackedTimeCreate => PackedTimeCreate, & MAPL_PackedDateTimeCreate => PackedDateTimeCreate, & MAPL_ESMFTimeFromPacked => ESMFTimeFromPacked, & MAPL_UnpackDate => UnpackDate, & MAPL_UnpackTime => UnpackTime, & MAPL_UnpackDateTime => UnpackDateTime - use mapl_SimulationTime, only: set_reference_clock, fill_time_dict + use mapl_SimulationTime_mod, only: set_reference_clock, fill_time_dict use MAPL_CommsMod, only: mapl_CommsBcast, mapl_CommsScatterV, mapl_CommsGatherV, & mapl_CommsAllGather, mapl_CommsAllGatherV, & mapl_CommsAllReduceMin, mapl_CommsAllReduceMax, & @@ -20,23 +20,23 @@ module mapl_base3g mapl_ArrayIScatter, mapl_CollectiveWait, & mapl_CollectiveScatter3D, mapl_CollectiveGather3D, & mapl_RoundRobinPEList, mapl_BcastShared, ArrPtr - use MAPL_SatVaporMod, only: MAPL_EQsatSET, MAPL_EQsat - use MAPL_StringTemplate, only: fill_grads_template, StrTemplate, fill_grads_template_esmf - use mapl_LocalDisplacementEnsemble, only: LocalDisplacementEnsemble - use MAPL_MemUtilsMod, only: MAPL_MemUtilsInit, MAPL_MemUtilsDisable, & + use mapl_SatVapor_mod, only: MAPL_EQsatSET, MAPL_EQsat + use mapl_StringTemplate_mod, only: fill_grads_template, StrTemplate, fill_grads_template_esmf + use mapl_LocalDisplacementEnsemble_mod, only: LocalDisplacementEnsemble + use mapl_MemUtils_mod, only: MAPL_MemUtilsInit, MAPL_MemUtilsDisable, & MAPL_MemUtilsWrite, MAPL_MemUtilsIsDisabled, MAPL_MemUtilsFree, & MAPL_MemCommited, MAPL_MemUsed, MAPL_MemReport - use MAPL_SunMod, only: MAPL_SunOrbitCreate, MAPL_SunOrbitCreateFromConfig, & + use mapl_Sun_mod, only: MAPL_SunOrbitCreate, MAPL_SunOrbitCreateFromConfig, & MAPL_SunOrbitCreated, MAPL_SunOrbitDestroy, MAPL_SunOrbitQuery, & MAPL_SunGetInsolation, MAPL_SunGetSolarConstant, & MAPL_SunGetDaylightDuration, MAPL_SunGetDaylightDurationMax, & MAPL_SunGetLocalSolarHourAngle, MAPL_SunOrbit - use MAPL_TimeInterpolation, only: MAPL_Interp_Fac, MAPL_ClimInterpFac - use mapl_FileIO, only: WRITE_PARALLEL - use mapl_SimpleBundleMod_impl, only: MAPL_SimpleBundleCreate, MAPL_SimpleBundlePrint, & + use mapl_TimeInterpolation_mod, only: MAPL_Interp_Fac, MAPL_ClimInterpFac + use mapl_FileIO_mod, only: WRITE_PARALLEL + use mapl_SimpleBundleMod_impl_mod, only: MAPL_SimpleBundleCreate, MAPL_SimpleBundlePrint, & MAPL_SimpleBundleGetIndex, MAPL_SimpleBundleDestroy, MAPL_SimpleBundle - use mapl_FileIOShared, only: ArrDescr, ArrDescrInit, ArrDescrSet - use mapl_NCIO, only: MAPL_VarRead, MAPL_VarWrite, MAPL_NCIOGetFileType, & + use mapl_FileIOShared_mod, only: ArrDescr, ArrDescrInit, ArrDescrSet + use mapl_NCIO_mod, only: MAPL_VarRead, MAPL_VarWrite, MAPL_NCIOGetFileType, & MAPL_IOGetNonDimVars, MAPL_IOCountNonDimVars, & MAPL_IOChangeRes, MAPL_IOCountLevels implicit none(type,external) @@ -77,4 +77,4 @@ module mapl_base3g public :: MAPL_IOGetNonDimVars, MAPL_IOCountNonDimVars public :: MAPL_IOChangeRes, MAPL_IOCountLevels -end module mapl_base3g +end module mapl_base3g_mod diff --git a/base3g/Comms.F90 b/base3g/Comms.F90 index 84eaed14fff..a35ce733aed 100644 --- a/base3g/Comms.F90 +++ b/base3g/Comms.F90 @@ -18,12 +18,12 @@ module MAPL_CommsMod ESMF_MAXSTR, ESMF_SUCCESS, & ESMF_VM, ESMF_VMGatherV, ESMF_VMGet, ESMF_VMGetCurrent, & ESMF_VMScatterV, ESMF_VmBarrier, ESMF_VmGet - use MAPL_ShmemMod, only: MAPL_ShmInitialized, MAPL_SyncSharedMemory, & + use mapl_Shmem_mod, only: MAPL_ShmInitialized, MAPL_SyncSharedMemory, & MAPL_BroadcastToNodes, MAPL_NodeRankList, & MAPL_GetNewRank use MAPL_Constants, only: MAPL_Unknown, MAPL_IsGather, MAPL_IsScatter, MAPL_UNDEF - use mapl_ErrorHandling, only: MAPL_Assert, MAPL_Verify, MAPL_Return - use mapl_GridGetGlobal, only: GridGetGlobalCellCountPerDim + use mapl_ErrorHandling_mod, only: MAPL_Assert, MAPL_Verify, MAPL_Return + use mapl_GridGetGlobal_mod, only: GridGetGlobalCellCountPerDim use mpi use, intrinsic :: iso_fortran_env, only: REAL64 implicit none diff --git a/base3g/FileIO.F90 b/base3g/FileIO.F90 index b35f7b172cc..f1b96948236 100644 --- a/base3g/FileIO.F90 +++ b/base3g/FileIO.F90 @@ -1,6 +1,6 @@ #include "MAPL.h" -module mapl_FileIO +module mapl_FileIO_mod use MAPL_CommsMod, only: MAPL_AM_I_ROOT use, intrinsic :: iso_fortran_env, only: INT32, REAL32, REAL64, OUTPUT_UNIT implicit none @@ -181,4 +181,4 @@ subroutine write_parallel_r64_1d(data, unit, format, rc) end subroutine write_parallel_r64_1d -end module mapl_FileIO +end module mapl_FileIO_mod diff --git a/base3g/FileIOShared.F90 b/base3g/FileIOShared.F90 index cb48742933b..5205dd75f56 100644 --- a/base3g/FileIOShared.F90 +++ b/base3g/FileIOShared.F90 @@ -15,16 +15,16 @@ ! ! `FileIO_Shared` -- A Module that contains shared subroutines/functions needed by NetCDF and Binary IO ! -module mapl_FileIOShared +module mapl_FileIOShared_mod use ESMF - use mapl_DistGridGet, only: MAPL_DistGridGet_impl => DistGridGet - use mapl_GridAccessors, only: GridGet - use mapl_GridGetGlobal, only: GridGetGlobalCellCountPerDim - use MAPL_SortMod + use mapl_DistGridGet_mod, only: MAPL_DistGridGet_impl => DistGridGet + use mapl_GridAccessors_mod, only: GridGet + use mapl_GridGetGlobal_mod, only: GridGetGlobalCellCountPerDim + use mapl_Sort_mod use MAPL_CommsMod - use MAPL_ShmemMod - use MAPL_ExceptionHandling + use mapl_Shmem_mod + use mapl_ExceptionHandling_mod use, intrinsic :: ISO_C_BINDING use, intrinsic :: iso_fortran_env use mpi @@ -944,4 +944,4 @@ subroutine MAPL_Comm_Dup(comm, newcomm, rc) end if _RETURN(ESMF_SUCCESS) end subroutine MAPL_Comm_Dup -end module mapl_FileIOShared +end module mapl_FileIOShared_mod diff --git a/base3g/FileMetadataUtilities.F90 b/base3g/FileMetadataUtilities.F90 index 10014023e29..dcad374a28c 100644 --- a/base3g/FileMetadataUtilities.F90 +++ b/base3g/FileMetadataUtilities.F90 @@ -1,11 +1,11 @@ #include "MAPL_ErrLog.h" -module MAPL_FileMetadataUtilsMod +module mapl_FileMetadataUtils_mod use pFIO - use Mapl_keywordenforcermod + use mapl_KeywordEnforcer_mod use gFTL2_StringIntegerMap use ESMF - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod use, intrinsic :: iso_fortran_env, only: REAL64,REAL32,INT64,INT32 implicit none @@ -699,7 +699,7 @@ function get_source_file(this,rc) result(source_file) _RETURN(_SUCCESS) end function -end module MAPL_FileMetadataUtilsMod +end module mapl_FileMetadataUtils_mod diff --git a/base3g/FileMetadataUtilitiesVector.F90 b/base3g/FileMetadataUtilitiesVector.F90 index bc6739d7ae0..ffbd8b55cad 100644 --- a/base3g/FileMetadataUtilitiesVector.F90 +++ b/base3g/FileMetadataUtilitiesVector.F90 @@ -1,9 +1,9 @@ -module MAPL_FileMetadataUtilsVectorMod - use MAPL_FileMetadataUtilsMod +module mapl_FileMetadataUtilsVector_mod + use mapl_FileMetadataUtils_mod #define _type type (FileMetadataUtils) #define _vector FileMetadataUtilsVector #define _iterator FileMetadataUtilsVectorIterator #include "templates/vector.inc" -end module MAPL_FileMetadataUtilsVectorMod +end module mapl_FileMetadataUtilsVector_mod diff --git a/base3g/MAPL_LocStreamMod.F90 b/base3g/MAPL_LocStreamMod.F90 index 404adacbcde..78f28d4b063 100644 --- a/base3g/MAPL_LocStreamMod.F90 +++ b/base3g/MAPL_LocStreamMod.F90 @@ -18,20 +18,20 @@ ! ! The module `MAPL_LocStreamMod` manipulates location streams. ! -module mapl_LocStreamMod_impl +module mapl_LocStreamMod_impl_mod ! !USES: use ESMF -use mapl_Geom_API, only: MAPL_GridGet +use mapl_Geom_API_mod, only: MAPL_GridGet use MAPL_Constants -use mapl_GridAccessors, only: geom_GridGet => GridGet -use mapl_NCIO, only: MAPL_ReadTilingNC4 +use mapl_GridAccessors_mod, only: geom_GridGet => GridGet +use mapl_NCIO_mod, only: MAPL_ReadTilingNC4 use MAPL_CommsMod -use MAPL_HashMod -use MAPL_ShmemMod -use MAPL_ExceptionHandling -use mapl_EASEConversion, only: MAPL_ease_extent => ease_extent +use mapl_Hash_mod +use mapl_Shmem_mod +use mapl_ExceptionHandling_mod +use mapl_EASEConversion_mod, only: MAPL_ease_extent => ease_extent use, intrinsic :: iso_fortran_env, only: REAL64, INT64 use mpi @@ -3224,7 +3224,7 @@ subroutine MAPL_DistGridGet(distGrid, minIndex, maxIndex, rc) end subroutine MAPL_DistGridGet subroutine MAPL_GetImsJms(Imins, Imaxs, Jmins, Jmaxs, Ims, Jms, rc) - use MAPL_SortMod + use mapl_Sort_mod use ESMF, only: ESMF_SUCCESS integer, dimension(:), intent(in) :: Imins, Imaxs, Jmins, Jmaxs integer, pointer :: Ims(:), Jms(:) @@ -3285,4 +3285,4 @@ subroutine MAPL_GetImsJms(Imins, Imaxs, Jmins, Jmaxs, Ims, Jms, rc) _RETURN(ESMF_SUCCESS) end subroutine MAPL_GetImsJms -end module mapl_LocStreamMod_impl +end module mapl_LocStreamMod_impl_mod diff --git a/base3g/MemUtils.F90 b/base3g/MemUtils.F90 index 5c0f5599a6b..757844ccdaa 100755 --- a/base3g/MemUtils.F90 +++ b/base3g/MemUtils.F90 @@ -12,13 +12,13 @@ ! ! `MAPL_MemUtilsMod` -- A Module to query/print memory use per processor (Adapted by WMP from FMS memuse utility) ! -module MAPL_MemUtilsMod +module mapl_MemUtils_mod use ESMF use MAPL_CommsMod - use MAPL_ShmemMod - use mapl_ErrorHandling - use mapl_FileIO, only: WRITE_PARALLEL + use mapl_Shmem_mod + use mapl_ErrorHandling_mod + use mapl_FileIO_mod, only: WRITE_PARALLEL use, intrinsic :: iso_fortran_env, only: INT64 use, intrinsic :: iso_fortran_env, only: REAL64 use mpi @@ -349,7 +349,7 @@ end subroutine MAPL_MemUtilsWriteComm !####################################################################### subroutine MAPL_MemUsed ( memtotal, used, percent_used, RC ) - use MAPL_ErrorHandlingMod, only: MAPL_RTRN + use mapl_ErrorHandling_mod, only: MAPL_RTRN real, intent(out) :: memtotal, used, percent_used integer, optional, intent(OUT ) :: RC @@ -686,4 +686,4 @@ subroutine MAPL_MemReport(comm,file_name,line,decorator,rc) end subroutine -end module MAPL_MemUtilsMod +end module mapl_MemUtils_mod diff --git a/base3g/NCIO.F90 b/base3g/NCIO.F90 index 523574aa38b..890abbc9f16 100644 --- a/base3g/NCIO.F90 +++ b/base3g/NCIO.F90 @@ -9,21 +9,21 @@ ! !INTERFACE: -module mapl_NCIO +module mapl_NCIO_mod - use mapl_FileIOShared, only: ArrDescr, ArrDescrSet, WRITE_PARALLEL, MAPL_TileMaskGet - use mapl_FileIOShared, only: ArrayScatterShm + use mapl_FileIOShared_mod, only: ArrDescr, ArrDescrSet, WRITE_PARALLEL, MAPL_TileMaskGet + use mapl_FileIOShared_mod, only: ArrayScatterShm use ESMF - use mapl_GridGetGlobal, only: GridGetGlobalCellCountPerDim - use MAPL_RangeMod, only: MAPL_Range - use mapl_GridAccessors, only: geom_GridGet => GridGet + use mapl_GridGetGlobal_mod, only: GridGetGlobalCellCountPerDim + use mapl_Range_mod, only: MAPL_Range + use mapl_GridAccessors_mod, only: geom_GridGet => GridGet use MAPL_CommsMod use mapl_Field_API, only: MAPL_FieldEmptyComplete, MAPL_FieldClone - use MAPL_SortMod - use mapl_EASEConversion, only: MAPL_get_ease_gridname_by_cols => get_ease_gridname_by_cols + use mapl_Sort_mod + use mapl_EASEConversion_mod, only: MAPL_get_ease_gridname_by_cols => get_ease_gridname_by_cols - use MAPL_ShmemMod - use MAPL_ExceptionHandling + use mapl_Shmem_mod + use mapl_ExceptionHandling_mod use netcdf use pFIO use MAPL_Constants @@ -5232,4 +5232,4 @@ subroutine MAPL_WriteTilingNC4(File, GridName, im, jm, nx, ny, iTable, rTable, N _RETURN(_SUCCESS) end subroutine MAPL_WriteTilingNC4 -end module mapl_NCIO +end module mapl_NCIO_mod diff --git a/base3g/SimpleBundleMod.F90 b/base3g/SimpleBundleMod.F90 index bb670b93673..bc6faff655d 100644 --- a/base3g/SimpleBundleMod.F90 +++ b/base3g/SimpleBundleMod.F90 @@ -17,15 +17,15 @@ ! #include "MAPL.h" -module mapl_SimpleBundleMod_impl +module mapl_SimpleBundleMod_impl_mod use ESMF - use mapl_Geom_API, only: MAPL_GridGet - use mapl_FieldBundle_API, only: MAPL_FieldBundleGetByIndex, MAPL_FieldBundleDestroy - use mapl_ArrayReductions, only: MaxMin => MAPL_MaxMin + use mapl_Geom_API_mod, only: MAPL_GridGet + 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, only: MAPL_PI - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod implicit none private @@ -801,4 +801,4 @@ end subroutine AddThisField_ end subroutine BundleAddState_ -end module mapl_SimpleBundleMod_impl +end module mapl_SimpleBundleMod_impl_mod diff --git a/base3g/SunOrbit.F90 b/base3g/SunOrbit.F90 index ca215f46932..c3b590e62f2 100644 --- a/base3g/SunOrbit.F90 +++ b/base3g/SunOrbit.F90 @@ -20,16 +20,16 @@ ! The mathematical derivation of the Equation of Time underlying this module ! is documented in docs/equation_of_time.md. ! -module MAPL_SunMod +module mapl_Sun_mod ! !USES: use ESMF use MAPL_Constants use MAPL_CommsMod - use mapl_ErrorHandling, only: MAPL_Assert, MAPL_Verify, MAPL_Return - use MAPL_TimeInterpolation, only: MAPL_ClimInterpFac - use mapl_FileIO, only: WRITE_PARALLEL + use mapl_ErrorHandling_mod, only: MAPL_Assert, MAPL_Verify, MAPL_Return + use mapl_TimeInterpolation_mod, only: MAPL_ClimInterpFac + use mapl_FileIO_mod, only: WRITE_PARALLEL use netcdf use, intrinsic :: iso_fortran_env, only: REAL64 use pflogger, only: logging, Logger @@ -3188,4 +3188,4 @@ end subroutine MAPL_SunGetLocalSolarHourAngle !========================================================================== -end module MAPL_SunMod +end module mapl_Sun_mod diff --git a/base3g/tests/CMakeLists.txt b/base3g/tests/CMakeLists.txt index afa4baa91af..d9ccc669ff1 100644 --- a/base3g/tests/CMakeLists.txt +++ b/base3g/tests/CMakeLists.txt @@ -8,7 +8,7 @@ add_pfunit_ctest(MAPL.base3g.tests TEST_SOURCES ${TEST_SRCS} LINK_LIBRARIES MAPL.base3g MAPL.pfunit EXTRA_INITIALIZE Initialize - EXTRA_USE MAPL_pFUnit_Initialize + EXTRA_USE mapl_pFUnit_Initialize_mod MAX_PES 1 ) set_target_properties(MAPL.base3g.tests PROPERTIES Fortran_MODULE_DIRECTORY ${MODULE_DIRECTORY}) diff --git a/base3g/tests/Test_PackedTime.pf b/base3g/tests/Test_PackedTime.pf index 583a91b22a8..e0001583428 100644 --- a/base3g/tests/Test_PackedTime.pf +++ b/base3g/tests/Test_PackedTime.pf @@ -2,7 +2,7 @@ module Test_PackedTime - use MAPL_PackedTimeMod, only: PackedDateCreate, PackedTimeCreate, & + use mapl_PackedTime_mod, only: PackedDateCreate, PackedTimeCreate, & PackedDateTimeCreate, ESMFTimeFromPacked, & UnpackDate, UnpackTime, UnpackDateTime use ESMF diff --git a/benchmarks/esmf/gc_run.F90 b/benchmarks/esmf/gc_run.F90 index b3f23293742..4510caf046d 100644 --- a/benchmarks/esmf/gc_run.F90 +++ b/benchmarks/esmf/gc_run.F90 @@ -2,7 +2,7 @@ module my_gc use esmf - use mapl_ErrorHandlingMod + use mapl_ErrorHandling_mod implicit none private @@ -92,7 +92,7 @@ end module my_gc program main use my_gc use esmf - use mapl_ErrorHandlingMod + use mapl_ErrorHandling_mod use iso_fortran_env, only: INT64 implicit none diff --git a/benchmarks/io/checkpoint_simulator/checkpoint_simulator.F90 b/benchmarks/io/checkpoint_simulator/checkpoint_simulator.F90 index b96abbc9038..6238c246226 100644 --- a/benchmarks/io/checkpoint_simulator/checkpoint_simulator.F90 +++ b/benchmarks/io/checkpoint_simulator/checkpoint_simulator.F90 @@ -5,7 +5,7 @@ module mapl_checkpoint_support_mod use ESMF use MPI use NetCDF - use MAPL_ErrorHandlingMod + use mapl_ErrorHandling_mod use fargparse use, intrinsic :: iso_fortran_env, only: INT64, REAL64, REAL32 implicit none @@ -906,7 +906,7 @@ subroutine write_level(this,var_name,local_var,z_index) #include "MAPL.h" program checkpoint_tester use ESMF - use MAPL_ErrorHandlingMod + use mapl_ErrorHandling_mod use mapl_checkpoint_support_mod use MPI use NetCDF diff --git a/benchmarks/io/combo/BW_Benchmark.F90 b/benchmarks/io/combo/BW_Benchmark.F90 index 51f763fc31d..43c167bc842 100644 --- a/benchmarks/io/combo/BW_Benchmark.F90 +++ b/benchmarks/io/combo/BW_Benchmark.F90 @@ -1,7 +1,7 @@ #include "MAPL.h" -module mapl_BW_Benchmark - use mapl_ErrorHandlingMod +module mapl_BW_Benchmark_mod + use mapl_ErrorHandling_mod use Kernel_mod use, intrinsic :: iso_fortran_env, only: INT64 implicit none @@ -83,5 +83,5 @@ subroutine delete_file(filename, rc) _RETURN(_SUCCESS) end subroutine delete_file -end module mapl_BW_Benchmark +end module mapl_BW_Benchmark_mod diff --git a/benchmarks/io/combo/ComboSpec.F90 b/benchmarks/io/combo/ComboSpec.F90 index c0b74b2728f..1e7e7029708 100644 --- a/benchmarks/io/combo/ComboSpec.F90 +++ b/benchmarks/io/combo/ComboSpec.F90 @@ -1,8 +1,8 @@ #include "MAPL.h" -module mapl_ComboSpec - use mapl_GathervKernel - use mapl_BW_Benchmark - use mapl_ErrorHandlingMod +module mapl_ComboSpec_mod + use mapl_GathervKernel_mod + use mapl_BW_Benchmark_mod + use mapl_ErrorHandling_mod use fArgParse use mpi use, intrinsic :: iso_fortran_env, only: INT64 @@ -150,4 +150,4 @@ function make_filename(base, rank, width, rc) result(filename) _RETURN(_SUCCESS) end function make_filename -end module mapl_ComboSpec +end module mapl_ComboSpec_mod diff --git a/benchmarks/io/combo/GathervKernel.F90 b/benchmarks/io/combo/GathervKernel.F90 index 51307878997..777ff94cc3e 100644 --- a/benchmarks/io/combo/GathervKernel.F90 +++ b/benchmarks/io/combo/GathervKernel.F90 @@ -1,7 +1,7 @@ #include "MAPL.h" -module mapl_GathervKernel - use mapl_ErrorHandlingMod +module mapl_GathervKernel_mod + use mapl_ErrorHandling_mod use Kernel_mod use mpi implicit none @@ -93,4 +93,4 @@ subroutine run(this, rc) end subroutine run -end module mapl_GathervKernel +end module mapl_GathervKernel_mod diff --git a/benchmarks/io/combo/Kernel.F90 b/benchmarks/io/combo/Kernel.F90 index 5de498f96fc..0a8da04dc02 100644 --- a/benchmarks/io/combo/Kernel.F90 +++ b/benchmarks/io/combo/Kernel.F90 @@ -9,7 +9,7 @@ module Kernel_mod abstract interface subroutine I_Run(this, rc) - use mapl_ErrorHandlingMod + use mapl_ErrorHandling_mod import Kernel_T class(Kernel_T), intent(in) :: this integer, optional, intent(out) :: rc diff --git a/benchmarks/io/combo/driver.F90 b/benchmarks/io/combo/driver.F90 index b6fd0e02c07..dcde2becd39 100644 --- a/benchmarks/io/combo/driver.F90 +++ b/benchmarks/io/combo/driver.F90 @@ -1,10 +1,10 @@ #define I_AM_MAIN #include "MAPL.h" program main - use mapl_ComboSpec - use mapl_GathervKernel - use mapl_BW_Benchmark - use mapl_ErrorHandlingMod + use mapl_ComboSpec_mod + use mapl_GathervKernel_mod + use mapl_BW_Benchmark_mod + use mapl_ErrorHandling_mod use Kernel_mod use mpi implicit none diff --git a/benchmarks/io/gatherv/GathervKernel.F90 b/benchmarks/io/gatherv/GathervKernel.F90 index ba7c28e484e..4b67a618fc6 100644 --- a/benchmarks/io/gatherv/GathervKernel.F90 +++ b/benchmarks/io/gatherv/GathervKernel.F90 @@ -1,7 +1,7 @@ #include "MAPL.h" -module mapl_GathervKernel - use mapl_ErrorHandlingMod +module mapl_GathervKernel_mod + use mapl_ErrorHandling_mod use mpi implicit none private @@ -92,4 +92,4 @@ subroutine run(this, rc) end subroutine run -end module mapl_GathervKernel +end module mapl_GathervKernel_mod diff --git a/benchmarks/io/gatherv/GathervSpec.F90 b/benchmarks/io/gatherv/GathervSpec.F90 index 2ff4bfe9248..d406942852b 100644 --- a/benchmarks/io/gatherv/GathervSpec.F90 +++ b/benchmarks/io/gatherv/GathervSpec.F90 @@ -1,7 +1,7 @@ #include "MAPL.h" -module mapl_GathervSpec - use mapl_GathervKernel - use mapl_ErrorHandlingMod +module mapl_GathervSpec_mod + use mapl_GathervKernel_mod + use mapl_ErrorHandling_mod use fArgParse use mpi use, intrinsic :: iso_fortran_env, only: INT64 @@ -105,4 +105,4 @@ function make_GathervKernel(spec, comm, rc) result(kernel) _RETURN(_SUCCESS) end function make_GathervKernel -end module mapl_GathervSpec +end module mapl_GathervSpec_mod diff --git a/benchmarks/io/gatherv/driver.F90 b/benchmarks/io/gatherv/driver.F90 index 1bf647e9bdc..6ed20e05577 100644 --- a/benchmarks/io/gatherv/driver.F90 +++ b/benchmarks/io/gatherv/driver.F90 @@ -1,9 +1,9 @@ #define I_AM_MAIN #include "MAPL.h" program main - use mapl_GathervSpec - use mapl_GathervKernel - use mapl_ErrorHandlingMod + use mapl_GathervSpec_mod + use mapl_GathervKernel_mod + use mapl_ErrorHandling_mod use mpi implicit none diff --git a/benchmarks/io/raw_bw/BW_Benchmark.F90 b/benchmarks/io/raw_bw/BW_Benchmark.F90 index 755abe3e896..74928308a2c 100644 --- a/benchmarks/io/raw_bw/BW_Benchmark.F90 +++ b/benchmarks/io/raw_bw/BW_Benchmark.F90 @@ -1,7 +1,7 @@ #include "MAPL.h" -module mapl_BW_Benchmark - use mapl_ErrorHandlingMod +module mapl_BW_Benchmark_mod + use mapl_ErrorHandling_mod use netcdf use, intrinsic :: iso_fortran_env, only: INT64 implicit none @@ -148,5 +148,5 @@ subroutine delete_netcdf_file(filename, rc) _RETURN(_SUCCESS) end subroutine delete_netcdf_file -end module mapl_BW_Benchmark +end module mapl_BW_Benchmark_mod diff --git a/benchmarks/io/raw_bw/BW_BenchmarkSpec.F90 b/benchmarks/io/raw_bw/BW_BenchmarkSpec.F90 index a173e09d12d..879357ed550 100644 --- a/benchmarks/io/raw_bw/BW_BenchmarkSpec.F90 +++ b/benchmarks/io/raw_bw/BW_BenchmarkSpec.F90 @@ -1,7 +1,7 @@ #include "MAPL.h" -module mapl_BW_BenchmarkSpec - use mapl_BW_Benchmark - use mapl_ErrorHandlingMod +module mapl_BW_BenchmarkSpec_mod + use mapl_BW_Benchmark_mod + use mapl_ErrorHandling_mod use fArgParse use mpi use, intrinsic :: iso_fortran_env, only: INT64 @@ -141,4 +141,4 @@ function make_filename(base, rank, width, rc) result(filename) _RETURN(_SUCCESS) end function make_filename -end module mapl_BW_BenchmarkSpec +end module mapl_BW_BenchmarkSpec_mod diff --git a/benchmarks/io/raw_bw/driver.F90 b/benchmarks/io/raw_bw/driver.F90 index f836847b776..c309a0f739a 100644 --- a/benchmarks/io/raw_bw/driver.F90 +++ b/benchmarks/io/raw_bw/driver.F90 @@ -1,9 +1,9 @@ #define I_AM_MAIN #include "MAPL.h" program main - use mapl_BW_BenchmarkSpec - use mapl_BW_Benchmark - use mapl_ErrorHandlingMod + use mapl_BW_BenchmarkSpec_mod + use mapl_BW_Benchmark_mod + use mapl_ErrorHandling_mod use mpi use, intrinsic :: iso_fortran_env, only: INT64 implicit none diff --git a/benchmarks/io/restart_simulator/restart_simulator.F90 b/benchmarks/io/restart_simulator/restart_simulator.F90 index 242f3e4c872..20d58359af6 100644 --- a/benchmarks/io/restart_simulator/restart_simulator.F90 +++ b/benchmarks/io/restart_simulator/restart_simulator.F90 @@ -4,8 +4,8 @@ module mapl_restart_support_mod use ESMF use MPI use NetCDF - use MAPL_ErrorHandlingMod - use MAPL_MemUtilsMod + use mapl_ErrorHandling_mod + use mapl_MemUtils_mod use fargparse use, intrinsic :: iso_fortran_env, only: INT64, REAL64, REAL32 implicit none diff --git a/enums/ConservationMetadata.F90 b/enums/ConservationMetadata.F90 index a6e8f01d834..4d62e4aec96 100644 --- a/enums/ConservationMetadata.F90 +++ b/enums/ConservationMetadata.F90 @@ -1,8 +1,8 @@ #include "MAPL.h" -module mapl_ConservationMetadata - use mapl_ConservationType - use mapl_ErrorHandling +module mapl_ConservationMetadata_mod + use mapl_ConservationType_mod + use mapl_ErrorHandling_mod use esmf, only: ESMF_Info, ESMF_InfoCreate, ESMF_InfoIsPresent use esmf, only: ESMF_InfoSet, ESMF_InfoGet, ESMF_InfoGetCharAlloc @@ -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 mapl_ConservationMetadata +end module mapl_ConservationMetadata_mod diff --git a/enums/ConservationType.F90 b/enums/ConservationType.F90 index 38d8d09b569..fff14e8f6c3 100644 --- a/enums/ConservationType.F90 +++ b/enums/ConservationType.F90 @@ -1,4 +1,4 @@ -module mapl_ConservationType +module mapl_ConservationType_mod 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 mapl_ConservationType +end module mapl_ConservationType_mod diff --git a/enums/CouplerPhases.F90 b/enums/CouplerPhases.F90 index 64db1ff5493..d938788cd70 100644 --- a/enums/CouplerPhases.F90 +++ b/enums/CouplerPhases.F90 @@ -1,4 +1,4 @@ -module mapl_CouplerPhases +module mapl_CouplerPhases_mod implicit none(type,external) private @@ -20,4 +20,4 @@ module mapl_CouplerPhases enumerator :: GENERIC_COUPLER_CLOCK_ADVANCE end enum -end module mapl_CouplerPhases +end module mapl_CouplerPhases_mod diff --git a/enums/GenericPhases.F90 b/enums/GenericPhases.F90 index 2e39d3a23aa..5e5c19147b9 100644 --- a/enums/GenericPhases.F90 +++ b/enums/GenericPhases.F90 @@ -1,4 +1,4 @@ -module mapl_GenericPhases +module mapl_GenericPhases_mod implicit none(type,external) private @@ -68,4 +68,4 @@ module mapl_GenericPhases GENERIC_INIT_USER & ] -end module mapl_GenericPhases +end module mapl_GenericPhases_mod diff --git a/enums/NormalizationMetadata.F90 b/enums/NormalizationMetadata.F90 index 027b5994a5e..f07c6995ccc 100644 --- a/enums/NormalizationMetadata.F90 +++ b/enums/NormalizationMetadata.F90 @@ -1,8 +1,8 @@ #include "MAPL.h" -module mapl_NormalizationMetadata - use mapl_NormalizationType - use mapl_ErrorHandling +module mapl_NormalizationMetadata_mod + use mapl_NormalizationType_mod + use mapl_ErrorHandling_mod use esmf, only: ESMF_Info, ESMF_InfoCreate, ESMF_InfoIsPresent use esmf, only: ESMF_InfoSet, ESMF_InfoGet, ESMF_InfoGetCharAlloc @@ -171,4 +171,4 @@ logical function not_equal_to(lhs, rhs) result(not_equals) not_equals = .not. (lhs == rhs) end function not_equal_to -end module mapl_NormalizationMetadata +end module mapl_NormalizationMetadata_mod diff --git a/enums/NormalizationType.F90 b/enums/NormalizationType.F90 index 6fab4c21119..f520b64f923 100644 --- a/enums/NormalizationType.F90 +++ b/enums/NormalizationType.F90 @@ -1,4 +1,4 @@ -module mapl_NormalizationType +module mapl_NormalizationType_mod implicit none(type, external) private @@ -114,4 +114,4 @@ function normalization_type_from_string(name, rc) result(ntype) if (present(rc)) rc = 0 end function normalization_type_from_string -end module mapl_NormalizationType +end module mapl_NormalizationType_mod diff --git a/enums/QuantityType.F90 b/enums/QuantityType.F90 index 7dc3780fb7e..868477cb239 100644 --- a/enums/QuantityType.F90 +++ b/enums/QuantityType.F90 @@ -1,4 +1,4 @@ -module mapl_QuantityType +module mapl_QuantityType_mod implicit none(type, external) private @@ -193,4 +193,4 @@ function mixing_ratio_basis_from_string(name, rc) result(basis) if (present(rc)) rc = 0 end function mixing_ratio_basis_from_string -end module mapl_QuantityType +end module mapl_QuantityType_mod diff --git a/enums/QuantityTypeMetadata.F90 b/enums/QuantityTypeMetadata.F90 index c9579582698..4f946a6d9d5 100644 --- a/enums/QuantityTypeMetadata.F90 +++ b/enums/QuantityTypeMetadata.F90 @@ -1,9 +1,9 @@ #include "MAPL.h" -module mapl_QuantityTypeMetadata - use mapl_QuantityType - use mapl_ErrorHandling - use mapl_Constants, only: MAPL_UNDEF => MAPL_UNDEFINED_REAL +module mapl_QuantityTypeMetadata_mod + use mapl_QuantityType_mod + use mapl_ErrorHandling_mod + 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 @@ -244,4 +244,4 @@ logical function not_equal_to(a, b) not_equal_to = .not. (a == b) end function not_equal_to -end module mapl_QuantityTypeMetadata +end module mapl_QuantityTypeMetadata_mod diff --git a/enums/ValidationMode.F90 b/enums/ValidationMode.F90 index 4f7675d8664..70b1922bbb0 100644 --- a/enums/ValidationMode.F90 +++ b/enums/ValidationMode.F90 @@ -1,5 +1,5 @@ -module mapl_ValidationMode - use mapl_StringUtilities, only: to_lower +module mapl_ValidationMode_mod + use mapl_StringUtilities_mod, only: to_lower implicit none(type, external) private @@ -76,4 +76,4 @@ elemental logical function not_equal(a, b) not_equal = .not. (a%id == b%id) end function not_equal -end module mapl_ValidationMode +end module mapl_ValidationMode_mod diff --git a/enums/VectorBasisKind.F90 b/enums/VectorBasisKind.F90 index 47b993ddec6..a83b4d41282 100644 --- a/enums/VectorBasisKind.F90 +++ b/enums/VectorBasisKind.F90 @@ -1,4 +1,4 @@ -module mapl_VectorBasisKind +module mapl_VectorBasisKind_mod implicit none(type, external) private @@ -76,4 +76,4 @@ elemental logical function not_equal(a, b) not_equal = .not. (a%id == b%id) end function not_equal -end module mapl_VectorBasisKind +end module mapl_VectorBasisKind_mod diff --git a/enums/VerificationStatus.F90 b/enums/VerificationStatus.F90 index 5b5084c33d0..78a034d2ecf 100644 --- a/enums/VerificationStatus.F90 +++ b/enums/VerificationStatus.F90 @@ -1,5 +1,5 @@ -module mapl_VerificationStatus - use mapl_StringUtilities, only: to_lower +module mapl_VerificationStatus_mod + use mapl_StringUtilities_mod, only: to_lower implicit none(type, external) private @@ -82,4 +82,4 @@ elemental logical function not_equal(a, b) not_equal = .not. (a%id == b%id) end function not_equal -end module mapl_VerificationStatus +end module mapl_VerificationStatus_mod diff --git a/gridcomps/CMakeLists.txt b/gridcomps/CMakeLists.txt index 3db8483572b..9573fcbaf76 100644 --- a/gridcomps/CMakeLists.txt +++ b/gridcomps/CMakeLists.txt @@ -1,19 +1,3 @@ -esma_set_this(OVERRIDE MAPL.gridcomps) - -esma_add_library (${this} - SRCS MAPL_GridComps.F90 - DEPENDENCIES MAPL.pfio - $<$:FARGPARSE::fargparse> - TYPE SHARED - ) - -target_include_directories (${this} PUBLIC - $) -if (BUILD_WITH_FARGPARSE) - target_link_libraries(${this} PRIVATE FARGPARSE::fargparse) - target_compile_definitions (${this} PRIVATE USE_FARGPARSE) -endif() - add_subdirectory(orbit) add_subdirectory(cap) add_subdirectory(history) diff --git a/gridcomps/FakeParent/FakeParentGridComp.F90 b/gridcomps/FakeParent/FakeParentGridComp.F90 index 774449a37ec..63211ecc7f3 100644 --- a/gridcomps/FakeParent/FakeParentGridComp.F90 +++ b/gridcomps/FakeParent/FakeParentGridComp.F90 @@ -1,11 +1,11 @@ #include "MAPL.h" -module mapl_FakeParentGridComp +module mapl_FakeParentGridComp_mod - use mapl_ErrorHandling, only: MAPL_Verify, MAPL_Assert, MAPL_Return - use mapl_generic, only: MAPL_GridCompSetEntryPoint - use mapl_generic, only: MAPL_GridCompGet - use mapl_generic, only: MAPL_GridCompRunChildren + use MAPL, only: MAPL_Verify, MAPL_Assert, MAPL_Return + use MAPL, only: MAPL_GridCompSetEntryPoint + use MAPL, only: MAPL_GridCompGet + use MAPL, only: MAPL_GridCompRunChildren use ESMF, only: ESMF_GridComp, ESMF_State, ESMF_Clock, ESMF_METHOD_RUN use ESMF, only: ESMF_HConfig, ESMF_HConfigIsDefined, ESMF_HConfigAsLogical use ESMF, only: ESMF_HConfigCreateAt, ESMF_HConfigDestroy @@ -82,11 +82,11 @@ subroutine get_run_phases_(hconfig, run1, run2, rc) _RETURN(_SUCCESS) end subroutine get_run_phases_ -end module mapl_FakeParentGridComp +end module mapl_FakeParentGridComp_mod subroutine SetServices(gridcomp, rc) - use MAPL_ErrorHandlingMod - use mapl_FakeParentGridComp, only: FakeParent_SetServices => SetServices + use MAPL + use mapl_FakeParentGridComp_mod, only: FakeParent_SetServices => SetServices use esmf type(ESMF_GridComp), intent(inout) :: gridcomp diff --git a/gridcomps/MAPL_GridComps.F90 b/gridcomps/MAPL_GridComps.F90 deleted file mode 100644 index 9ae26c4e699..00000000000 --- a/gridcomps/MAPL_GridComps.F90 +++ /dev/null @@ -1,3 +0,0 @@ -module MAPL_GridCompsMod - implicit none -end module MAPL_GridCompsMod diff --git a/gridcomps/cap/Cap.F90 b/gridcomps/cap/Cap.F90 index 18a915498d5..9e925a2122b 100644 --- a/gridcomps/cap/Cap.F90 +++ b/gridcomps/cap/Cap.F90 @@ -1,10 +1,8 @@ #include "MAPL.h" -module mapl_Cap +module mapl_Cap_mod use MAPL - use mapl_CapGridComp, only: cap_setservices => setServices - use mapl_os - use mapl_ErrorHandling, only: MAPL_Assert + use mapl_CapGridComp_mod, only: cap_setservices => setServices use pflogger use esmf implicit none(type,external) @@ -221,7 +219,7 @@ function get_timestamp(clock, rc) result(path) end function get_timestamp function make_driver(clock, hconfig, options, rc) result(driver) - use mapl_GenericGridComp, only: generic_SetServices => setServices + use mapl_GenericGridComp_mod, only: generic_setServices => setServices type(GriddedComponentDriver) :: driver type(esmf_HConfig), intent(in) :: hconfig type(esmf_Clock), intent(in) :: clock @@ -632,4 +630,4 @@ subroutine update_restart(hconfig, clock, rc) end subroutine update_restart -end module mapl_Cap +end module mapl_Cap_mod diff --git a/gridcomps/cap/CapGridComp.F90 b/gridcomps/cap/CapGridComp.F90 index 8691a0c8e2f..f2587fc7461 100644 --- a/gridcomps/cap/CapGridComp.F90 +++ b/gridcomps/cap/CapGridComp.F90 @@ -1,9 +1,9 @@ #include "MAPL.h" -module mapl_CapGridComp +module mapl_CapGridComp_mod use :: generic3g - use :: mapl_ErrorHandling + use :: mapl_ErrorHandling_mod implicit none @@ -101,4 +101,4 @@ subroutine run(gridcomp, importState, exportState, clock, rc) _UNUSED_DUMMY(clock) end subroutine run -end module mapl_CapGridComp +end module mapl_CapGridComp_mod diff --git a/gridcomps/cap/GEOS.F90 b/gridcomps/cap/GEOS.F90 index bb27d9b7190..63a8637bd0f 100644 --- a/gridcomps/cap/GEOS.F90 +++ b/gridcomps/cap/GEOS.F90 @@ -3,7 +3,7 @@ program geos use MAPL - use mapl_Cap + use mapl_Cap_mod use esmf implicit none diff --git a/gridcomps/componentDriverGridComp/componentDriverGridComp.F90 b/gridcomps/componentDriverGridComp/componentDriverGridComp.F90 index 5c628957f84..5df803a47f1 100644 --- a/gridcomps/componentDriverGridComp/componentDriverGridComp.F90 +++ b/gridcomps/componentDriverGridComp/componentDriverGridComp.F90 @@ -1,8 +1,7 @@ #include "MAPL.h" -module mapl_ComponentDriverDriverGridComp +module mapl_ComponentDriverDriverGridComp_mod - use mapl_ErrorHandling use MAPL use esmf use gFTL2_StringStringMap @@ -452,12 +451,12 @@ subroutine compare_states(state, reference_state, threshold, rc) _RETURN(_SUCCESS) end subroutine compare_states -end module mapl_ComponentDriverDriverGridComp +end module mapl_ComponentDriverDriverGridComp_mod subroutine setServices(gridcomp, rc) use ESMF - use MAPL_ErrorHandlingMod - use mapl_ComponentDriverDriverGridComp, only: Root_setServices => SetServices + use MAPL + use mapl_ComponentDriverDriverGridComp_mod, only: Root_setServices => SetServices type(ESMF_GridComp) :: gridcomp integer, intent(out) :: rc diff --git a/gridcomps/configurable/ConfigurableGridComp.F90 b/gridcomps/configurable/ConfigurableGridComp.F90 index 8cde970465a..b227df76d25 100644 --- a/gridcomps/configurable/ConfigurableGridComp.F90 +++ b/gridcomps/configurable/ConfigurableGridComp.F90 @@ -1,12 +1,9 @@ #include "MAPL.h" -module mapl_ConfigurableGridComp +module mapl_ConfigurableGridComp_mod - use mapl_ErrorHandling - use mapl_Generic, only: MAPL_GridCompSetEntryPoint, MAPL_GridCompRunChildren - use mapl_Generic, only: MAPL_GridCompGet - use mapl_State_API, only: MAPL_StateGetPointer - use MAPL_FieldPointerUtilities + use MAPL + use MAPL, only: MAPL_StateGetPointer use esmf implicit none @@ -136,12 +133,12 @@ recursive subroutine run(gridcomp, importState, exportState, clock, rc) _UNUSED_DUMMY(clock) end subroutine run -end module mapl_ConfigurableGridComp +end module mapl_ConfigurableGridComp_mod subroutine setServices(gridcomp, rc) use ESMF - use MAPL_ErrorHandlingMod - use mapl_ConfigurableGridComp, only: Configurable_setServices => SetServices + use MAPL + use mapl_ConfigurableGridComp_mod, only: Configurable_setServices => SetServices type(ESMF_GridComp) :: gridcomp integer, intent(out) :: rc diff --git a/gridcomps/extdata/AbstractDataSetFileSelector.F90 b/gridcomps/extdata/AbstractDataSetFileSelector.F90 index 65b14095cd6..1b8520e3a4a 100644 --- a/gridcomps/extdata/AbstractDataSetFileSelector.F90 +++ b/gridcomps/extdata/AbstractDataSetFileSelector.F90 @@ -1,15 +1,11 @@ #include "MAPL.h" -module mapl_AbstractDataSetFileSelector +module mapl_AbstractDataSetFileSelector_mod use ESMF - use MAPL_KeywordEnforcerMod - use MAPL_ExceptionHandling - use mapl_DataSetBracket - use mapl_StringTemplate - use mapl_FileMetadataUtilsMod - use mapl_geomio - use mapl_ExtDataConstants + use MAPL + use mapl_DataSetBracket_mod + use mapl_ExtDataConstants_mod implicit none private @@ -43,7 +39,7 @@ module mapl_AbstractDataSetFileSelector abstract interface subroutine I_update_file_bracket(this, bundle, current_time, bracket, rc) use ESMF, only: ESMF_Time, ESMF_FieldBundle - use mapl_DataSetBracket + use mapl_DataSetBracket_mod import AbstractDataSetFileSelector class(AbstractDataSetFileSelector), intent(inout) :: this type(ESMF_FieldBundle), intent(inout) :: bundle @@ -188,4 +184,4 @@ subroutine get_valid_range_single_file(this, rc) _RETURN(_SUCCESS) end subroutine get_valid_range_single_file -end module mapl_AbstractDataSetFileSelector +end module mapl_AbstractDataSetFileSelector_mod diff --git a/gridcomps/extdata/ClimDataSetFileSelector.F90 b/gridcomps/extdata/ClimDataSetFileSelector.F90 index 640a3671c42..593d28be385 100644 --- a/gridcomps/extdata/ClimDataSetFileSelector.F90 +++ b/gridcomps/extdata/ClimDataSetFileSelector.F90 @@ -1,18 +1,14 @@ #include "MAPL.h" -module mapl_ClimDataSetFileSelector +module mapl_ClimDataSetFileSelector_mod use ESMF - use MAPL_KeywordEnforcerMod - use MAPL_ExceptionHandling - use mapl_DataSetBracket - use mapl_DataSetNode - use mapl_AbstractDataSetFileSelector - use mapl_ExtdataUtilities - use mapl_StringTemplate - use mapl_geomio - use mapl_FieldBundle_API - use MAPL_FieldUtils + use MAPL + use mapl_DataSetBracket_mod + use mapl_DataSetNode_mod + use mapl_AbstractDataSetFileSelector_mod + use mapl_ExtDataUtilities_mod + use MAPL implicit none private @@ -250,5 +246,5 @@ subroutine swap_bracket_fields(bundle, rc) _RETURN(_SUCCESS) end subroutine swap_bracket_fields -end module mapl_ClimDataSetFileSelector +end module mapl_ClimDataSetFileSelector_mod diff --git a/gridcomps/extdata/DataSetBracket.F90 b/gridcomps/extdata/DataSetBracket.F90 index 9478a869081..e92811d838d 100644 --- a/gridcomps/extdata/DataSetBracket.F90 +++ b/gridcomps/extdata/DataSetBracket.F90 @@ -1,9 +1,8 @@ #include "MAPL.h" -module mapl_DataSetBracket +module mapl_DataSetBracket_mod use ESMF - use MAPL_KeywordEnforcerMod - use MAPL_ExceptionHandling - use mapl_DataSetNode + use MAPL + use mapl_DataSetNode_mod implicit none private @@ -125,4 +124,4 @@ function compute_bracket_weights(this,time,rc) result(weights) end function compute_bracket_weights -end module mapl_DataSetBracket +end module mapl_DataSetBracket_mod diff --git a/gridcomps/extdata/DataSetNode.F90 b/gridcomps/extdata/DataSetNode.F90 index 55c104c6957..1d2e11cdcde 100644 --- a/gridcomps/extdata/DataSetNode.F90 +++ b/gridcomps/extdata/DataSetNode.F90 @@ -1,14 +1,11 @@ #include "MAPL.h" -module mapl_DataSetNode +module mapl_DataSetNode_mod use ESMF - use MAPL_KeywordEnforcerMod - use MAPL_ExceptionHandling + use MAPL use pFIO - use MAPL_FileMetadataUtilsMod - use mapl_geomio - use mapl_ExtDataUtilities + use mapl_ExtDataUtilities_mod use pFlogger, only: logger implicit none @@ -256,4 +253,4 @@ subroutine write_node(this, lgr) call lgr%info('node status side %a at time %a time index %i0.5 updated %g0 enabled %g0', node_side, interp_time_string, this%time_index, this%update, this%enabled) end subroutine -end module mapl_DataSetNode +end module mapl_DataSetNode_mod diff --git a/gridcomps/extdata/ExtDataCollection.F90 b/gridcomps/extdata/ExtDataCollection.F90 index fda36a96276..bfde0c8193c 100644 --- a/gridcomps/extdata/ExtDataCollection.F90 +++ b/gridcomps/extdata/ExtDataCollection.F90 @@ -1,14 +1,10 @@ #include "MAPL.h" -module mapl_ExtDataCollection +module mapl_ExtDataCollection_mod use ESMF - use MAPL_KeywordEnforcerMod - use MAPL_ExceptionHandling - use MAPL_StringTemplate - use mapl_HConfigAs, only: mapl_HConfigAsTimeInterval => HConfigAsTimeInterval - use mapl_HConfigAs, only: mapl_HConfigAsTimeRange => HConfigAsTimeRange + use MAPL use pfio_FileMetadataMod - use mapl_AbstractDataSetFileSelector - use mapl_NonClimDataSetFileSelector + use mapl_AbstractDataSetFileSelector_mod + use mapl_NonClimDataSetFileSelector_mod implicit none private @@ -216,4 +212,4 @@ function is_valid_range_allocated(this) result(is_allocated) is_allocated = allocated(this%valid_range) end function is_valid_range_allocated -end module mapl_ExtDataCollection +end module mapl_ExtDataCollection_mod diff --git a/gridcomps/extdata/ExtDataCollectionMap.F90 b/gridcomps/extdata/ExtDataCollectionMap.F90 index 5054caf6282..e61053c4b02 100644 --- a/gridcomps/extdata/ExtDataCollectionMap.F90 +++ b/gridcomps/extdata/ExtDataCollectionMap.F90 @@ -1,5 +1,5 @@ -module mapl_ExtDataCollectionMap - use mapl_ExtDataCollection +module mapl_ExtDataCollectionMap_mod + use mapl_ExtDataCollection_mod #define Key __CHARACTER_DEFERRED #define T ExtDataCollection @@ -15,4 +15,4 @@ module mapl_ExtDataCollectionMap #undef T #undef Key -end module mapl_ExtDataCollectionMap +end module mapl_ExtDataCollectionMap_mod diff --git a/gridcomps/extdata/ExtDataConfig.F90 b/gridcomps/extdata/ExtDataConfig.F90 index b0f12c236be..3cee464f4bd 100644 --- a/gridcomps/extdata/ExtDataConfig.F90 +++ b/gridcomps/extdata/ExtDataConfig.F90 @@ -1,26 +1,24 @@ #include "MAPL.h" -module mapl_ExtDataConfig +module mapl_ExtDataConfig_mod use ESMF use PFIO use gFTL2_StringVector - use MAPL_KeywordEnforcerMod - use MAPL_ExceptionHandling - use mapl_ExtDataCollection - use mapl_ExtDataCollectionMap - use mapl_ExtDataRule - use mapl_ExtDataRuleMap - use mapl_ExtDataDerived - use mapl_ExtDataDerivedMap - use mapl_ExtDataConstants - use mapl_ExtDataSample - use mapl_ExtDataSampleMap - use mapl_PrimaryExport - use mapl_geomio - use mapl_HConfig_API, only: mapl_HConfigAsTime - use mapl_AbstractDataSetFileSelector - use mapl_NonClimDataSetFileSelector + use MAPL + use mapl_ExtDataCollection_mod + use mapl_ExtDataCollectionMap_mod + use mapl_ExtDataRule_mod + use mapl_ExtDataRuleMap_mod + use mapl_ExtDataDerived_mod + use mapl_ExtDataDerivedMap_mod + use mapl_ExtDataConstants_mod + use mapl_ExtDataSample_mod + use mapl_ExtDataSampleMap_mod + use mapl_PrimaryExport_mod + use MAPL, only: mapl_HConfigAsTime + use mapl_AbstractDataSetFileSelector_mod + use mapl_NonClimDataSetFileSelector_mod implicit none private @@ -479,4 +477,4 @@ function make_PrimaryExport(this, full_name, base_name, time_step, rc) result(ex _RETURN(_SUCCESS) end function make_PrimaryExport -end module mapl_ExtDataConfig +end module mapl_ExtDataConfig_mod diff --git a/gridcomps/extdata/ExtDataConstants.F90 b/gridcomps/extdata/ExtDataConstants.F90 index 471942be67d..d3cc4b5cd5e 100644 --- a/gridcomps/extdata/ExtDataConstants.F90 +++ b/gridcomps/extdata/ExtDataConstants.F90 @@ -1,4 +1,4 @@ -module mapl_ExtDataConstants +module mapl_ExtDataConstants_mod implicit none private @@ -9,4 +9,4 @@ module mapl_ExtDataConstants integer, parameter, public :: DERIVED_TYPE = 4 character(len=14), parameter, public :: FILE_NOT_FOUND = "file_not_found" -end module mapl_ExtDataConstants +end module mapl_ExtDataConstants_mod diff --git a/gridcomps/extdata/ExtDataDerived.F90 b/gridcomps/extdata/ExtDataDerived.F90 index 6187535f781..04ba96a40b8 100644 --- a/gridcomps/extdata/ExtDataDerived.F90 +++ b/gridcomps/extdata/ExtDataDerived.F90 @@ -1,8 +1,6 @@ #include "MAPL.h" -module mapl_ExtDataDerived +module mapl_ExtDataDerived_mod use ESMF - use MAPL_KeywordEnforcerMod - use MAPL_ExceptionHandling use gFTL2_StringVector use MAPL implicit none @@ -85,4 +83,4 @@ subroutine display(this) write(*,*)"function: ",trim(this%expression) end subroutine display -end module mapl_ExtDataDerived +end module mapl_ExtDataDerived_mod diff --git a/gridcomps/extdata/ExtDataDerivedMap.F90 b/gridcomps/extdata/ExtDataDerivedMap.F90 index e065cc19cef..5a19826c1d0 100644 --- a/gridcomps/extdata/ExtDataDerivedMap.F90 +++ b/gridcomps/extdata/ExtDataDerivedMap.F90 @@ -1,5 +1,5 @@ -module mapl_ExtDataDerivedMap - use mapl_ExtDataDerived +module mapl_ExtDataDerivedMap_mod + use mapl_ExtDataDerived_mod #define Key __CHARACTER_DEFERRED #define T ExtDataDerived @@ -15,4 +15,4 @@ module mapl_ExtDataDerivedMap #undef T #undef Key -end module mapl_ExtDataDerivedMap +end module mapl_ExtDataDerivedMap_mod diff --git a/gridcomps/extdata/ExtDataFileReader.F90 b/gridcomps/extdata/ExtDataFileReader.F90 index e89cd7e00dd..2984377bef9 100644 --- a/gridcomps/extdata/ExtDataFileReader.F90 +++ b/gridcomps/extdata/ExtDataFileReader.F90 @@ -1,13 +1,10 @@ #include "MAPL.h" -module mapl_ExtDataReader +module mapl_ExtDataReader_mod use esmf - use MAPL_ExceptionHandling use gftl2_StringStringMap use gftl2_StringIntegerMap - use mapl_FieldBundle_API - use mapl_geomio + use MAPL use PFIO - use MAPL_FieldPointerUtilities use pFlogger, only: logger use, intrinsic :: iso_c_binding, only: c_ptr @@ -128,4 +125,4 @@ subroutine read_items(this, lgr, rc) _RETURN(_SUCCESS) end subroutine -end module mapl_ExtDataReader +end module mapl_ExtDataReader_mod diff --git a/gridcomps/extdata/ExtDataGridComp.F90 b/gridcomps/extdata/ExtDataGridComp.F90 index fb99c16cc4b..585d69b5b55 100644 --- a/gridcomps/extdata/ExtDataGridComp.F90 +++ b/gridcomps/extdata/ExtDataGridComp.F90 @@ -1,26 +1,23 @@ #include "MAPL.h" -module mapl_ExtDataGridComp +module mapl_ExtDataGridComp_mod use generic3g - use mapl_ErrorHandling + use MAPL use esmf use pfio - use mapl_ExtDataGridComp_private - use mapl_Geom_API - use MAPL_FieldUtils - use mapl_FieldBundle_API - use mapl_ExtDataConfig - use mapl_PrimaryExportVector - use mapl_PrimaryExport - use mapl_geomio - use mapl_Geom_API - use mapl_AbstractDataSetFileSelector - use MAPL_FileMetadataUtilsMod + use mapl_ExtDataGridComp_private_mod + use MAPL + use MAPL + use mapl_ExtDataConfig_mod + use mapl_PrimaryExportVector_mod + use mapl_PrimaryExport_mod + use MAPL + use mapl_AbstractDataSetFileSelector_mod use gftl2_StringStringMap use gftl2_IntegerVector use gFTL2_StringVector, only: StringVector, StringVectorIterator, operator(/=) - use mapl_ExtDataReader + use mapl_ExtDataReader_mod implicit none(type,external) private @@ -257,12 +254,12 @@ function get_item_index(this,base_name,current_time,rc) result(item_index) _RETURN(_SUCCESS) end function get_item_index -end module mapl_ExtDataGridComp +end module mapl_ExtDataGridComp_mod subroutine setServices(gridcomp,rc) use ESMF - use MAPL_ErrorHandlingMod - use mapl_ExtDataGridComp, only: ExtData_setServices => SetServices + use MAPL + use mapl_ExtDataGridComp_mod, only: ExtData_setServices => SetServices type(ESMF_GridComp) :: gridcomp integer, intent(out) :: rc diff --git a/gridcomps/extdata/ExtDataGridComp_private.F90 b/gridcomps/extdata/ExtDataGridComp_private.F90 index fa1cc6b850b..5d9f02178af 100644 --- a/gridcomps/extdata/ExtDataGridComp_private.F90 +++ b/gridcomps/extdata/ExtDataGridComp_private.F90 @@ -1,12 +1,9 @@ #include "MAPL.h" -module mapl_ExtDataGridComp_private - use mapl_ErrorHandlingMod - use mapl_keywordenforcermod +module mapl_ExtDataGridComp_private_mod use esmf use MAPL - use mapl_StateItemImpl - use mapl_PrimaryExportVector - use mapl_PrimaryExport + use mapl_PrimaryExportVector_mod + use mapl_PrimaryExport_mod use gFTL2_StringVector, only: StringVector, StringVectorIterator, operator(/=) use pflogger, only: logger implicit none @@ -251,4 +248,4 @@ function get_bracket_size(item_type) result(bracket_size) bracket_size = 4 end if end function get_bracket_size -end module mapl_ExtDataGridComp_private +end module mapl_ExtDataGridComp_private_mod diff --git a/gridcomps/extdata/ExtDataRule.F90 b/gridcomps/extdata/ExtDataRule.F90 index 8779ebdea4d..19323002981 100644 --- a/gridcomps/extdata/ExtDataRule.F90 +++ b/gridcomps/extdata/ExtDataRule.F90 @@ -1,11 +1,10 @@ #include "MAPL.h" -module mapl_ExtDataRule +module mapl_ExtDataRule_mod use ESMF - use MAPL_KeywordEnforcerMod - use MAPL_ExceptionHandling - use mapl_ExtDataSample - use mapl_ExtDataSampleMap - use mapl_HConfig_API, only: mapl_HConfigAsTime + use MAPL + use mapl_ExtDataSample_mod + use mapl_ExtDataSampleMap_mod + use MAPL, only: mapl_HConfigAsTime use gFTL2_StringVector implicit none private @@ -155,4 +154,4 @@ function split_file_var(original_string) result(file_vars) end if end function -end module mapl_ExtDataRule +end module mapl_ExtDataRule_mod diff --git a/gridcomps/extdata/ExtDataRuleMap.F90 b/gridcomps/extdata/ExtDataRuleMap.F90 index f0dfbb4ef16..d53bddc9379 100644 --- a/gridcomps/extdata/ExtDataRuleMap.F90 +++ b/gridcomps/extdata/ExtDataRuleMap.F90 @@ -1,5 +1,5 @@ -module mapl_ExtDataRuleMap - use mapl_ExtDataRule +module mapl_ExtDataRuleMap_mod + use mapl_ExtDataRule_mod #define Key __CHARACTER_DEFERRED #define T ExtDataRule @@ -15,6 +15,6 @@ module mapl_ExtDataRuleMap #undef T #undef Key -end module mapl_ExtDataRuleMap +end module mapl_ExtDataRuleMap_mod diff --git a/gridcomps/extdata/ExtDataSample.F90 b/gridcomps/extdata/ExtDataSample.F90 index 76be4ccc26c..88315b1720a 100644 --- a/gridcomps/extdata/ExtDataSample.F90 +++ b/gridcomps/extdata/ExtDataSample.F90 @@ -1,9 +1,7 @@ #include "MAPL.h" -module mapl_ExtDataSample +module mapl_ExtDataSample_mod use ESMF - use MAPL_KeywordEnforcerMod - use MAPL_ExceptionHandling - use mapl_HConfigAs, only: mapl_HConfigAsTimeRange => HConfigAsTimeRange + use MAPL implicit none private @@ -97,4 +95,4 @@ subroutine set_defaults(this,unusable,rc) _RETURN(_SUCCESS) end subroutine set_defaults -end module mapl_ExtDataSample +end module mapl_ExtDataSample_mod diff --git a/gridcomps/extdata/ExtDataSampleMap.F90 b/gridcomps/extdata/ExtDataSampleMap.F90 index 8befc3f4520..39b1158a520 100644 --- a/gridcomps/extdata/ExtDataSampleMap.F90 +++ b/gridcomps/extdata/ExtDataSampleMap.F90 @@ -1,5 +1,5 @@ -module mapl_ExtDataSampleMap - use mapl_ExtDataSample +module mapl_ExtDataSampleMap_mod + use mapl_ExtDataSample_mod #define Key __CHARACTER_DEFERRED #define T ExtDataSample @@ -15,4 +15,4 @@ module mapl_ExtDataSampleMap #undef T #undef Key -end module mapl_ExtDataSampleMap +end module mapl_ExtDataSampleMap_mod diff --git a/gridcomps/extdata/ExtDataUtilities.F90 b/gridcomps/extdata/ExtDataUtilities.F90 index 4d4c6c7de34..5b99f01f957 100644 --- a/gridcomps/extdata/ExtDataUtilities.F90 +++ b/gridcomps/extdata/ExtDataUtilities.F90 @@ -1,8 +1,7 @@ #include "MAPL.h" -module mapl_ExtDataUtilities +module mapl_ExtDataUtilities_mod use ESMF - use MAPL_KeywordEnforcerMod - use MAPL_ExceptionHandling + use MAPL implicit none private diff --git a/gridcomps/extdata/NonClimDataSetFileSelector.F90 b/gridcomps/extdata/NonClimDataSetFileSelector.F90 index 7f67087a819..622db0a1279 100644 --- a/gridcomps/extdata/NonClimDataSetFileSelector.F90 +++ b/gridcomps/extdata/NonClimDataSetFileSelector.F90 @@ -1,16 +1,12 @@ #include "MAPL.h" -module mapl_NonClimDataSetFileSelector +module mapl_NonClimDataSetFileSelector_mod use ESMF - use MAPL_KeywordEnforcerMod - use MAPL_ExceptionHandling - use mapl_DataSetBracket - use mapl_DataSetNode - use mapl_AbstractDataSetFileSelector - use mapl_ExtdataUtilities - use mapl_StringTemplate - use mapl_geomio - use mapl_FieldBundle_API - use MAPL_FieldUtils + use MAPL + use mapl_DataSetBracket_mod + use mapl_DataSetNode_mod + use mapl_AbstractDataSetFileSelector_mod + use mapl_ExtDataUtilities_mod + use MAPL implicit none private @@ -260,5 +256,5 @@ subroutine swap_bracket_fields(bundle, rc) _RETURN(_SUCCESS) end subroutine swap_bracket_fields -end module mapl_NonClimDataSetFileSelector +end module mapl_NonClimDataSetFileSelector_mod diff --git a/gridcomps/extdata/PrimaryExport.F90 b/gridcomps/extdata/PrimaryExport.F90 index 9f220965cc9..4ea9aa52122 100644 --- a/gridcomps/extdata/PrimaryExport.F90 +++ b/gridcomps/extdata/PrimaryExport.F90 @@ -1,28 +1,24 @@ #include "MAPL.h" -module mapl_PrimaryExport +module mapl_PrimaryExport_mod use ESMF - use MAPL_ExceptionHandling - use mapl_AbstractDataSetFileSelector - use mapl_NonClimDataSetFileSelector - use mapl_ClimDataSetFileSelector - use mapl_Geom_API - use mapl_VerticalGrid_API - use MAPL_FileMetadataUtilsMod + use mapl_AbstractDataSetFileSelector_mod + use mapl_NonClimDataSetFileSelector_mod + use mapl_ClimDataSetFileSelector_mod + use MAPL + use MAPL use generic3g - use mapl_DataSetBracket - use mapl_DataSetNode - use mapl_ExtDataReader + use mapl_DataSetBracket_mod + use mapl_DataSetNode_mod + use mapl_ExtDataReader_mod use gftl2_StringStringMap use gftl2_IntegerVector use gftl2_StringVector - use mapl_ExtDataRule - use mapl_ExtDataCollection - use mapl_ExtDataSample + use mapl_ExtDataRule_mod + use mapl_ExtDataCollection_mod + use mapl_ExtDataSample_mod use pfio, only: i_clients use VerticalCoordinateMod - use mapl_FieldBundle_API - use mapl_EsmfRegridder, only: EsmfRegridderParam - use mapl_RegridderMethods + use MAPL implicit none private @@ -338,4 +334,4 @@ subroutine set_fraction_values_to_zero(this, bundle, rc) end subroutine set_fraction_values_to_zero -end module mapl_PrimaryExport +end module mapl_PrimaryExport_mod diff --git a/gridcomps/extdata/PrimaryExportVector.F90 b/gridcomps/extdata/PrimaryExportVector.F90 index 5cd1e8b3711..6dbf9f11b2c 100644 --- a/gridcomps/extdata/PrimaryExportVector.F90 +++ b/gridcomps/extdata/PrimaryExportVector.F90 @@ -1,5 +1,5 @@ -module mapl_PrimaryExportVector - use mapl_PrimaryExport +module mapl_PrimaryExportVector_mod + use mapl_PrimaryExport_mod #define T PrimaryExport #define Vector PrimaryExportVector #define VectorIterator PrimaryExportVectorIterator @@ -10,4 +10,4 @@ module mapl_PrimaryExportVector #undef Vector #undef VectorIterator -end module mapl_PrimaryExportVector +end module mapl_PrimaryExportVector_mod diff --git a/gridcomps/extdata/tests/CMakeLists.txt b/gridcomps/extdata/tests/CMakeLists.txt index a1a3de435d2..1e0bc8ab60c 100644 --- a/gridcomps/extdata/tests/CMakeLists.txt +++ b/gridcomps/extdata/tests/CMakeLists.txt @@ -13,7 +13,7 @@ add_pfunit_ctest(MAPL.extdata.tests TEST_SOURCES ${test_srcs} LINK_LIBRARIES MAPL.extdata MAPL.pfunit EXTRA_INITIALIZE Initialize - EXTRA_USE MAPL_pFUnit_Initialize + EXTRA_USE mapl_pFUnit_Initialize_mod WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} MAX_PES 1 ) diff --git a/gridcomps/extdata/tests/Test_DataSetNode.pf b/gridcomps/extdata/tests/Test_DataSetNode.pf index bc4669273ef..53227f0bc68 100644 --- a/gridcomps/extdata/tests/Test_DataSetNode.pf +++ b/gridcomps/extdata/tests/Test_DataSetNode.pf @@ -1,7 +1,7 @@ #include "MAPL_TestErr.h" module Test_DataSetNode use pfunit - use mapl_DataSetNode + use mapl_DataSetNode_mod use esmf implicit none diff --git a/gridcomps/extdata/tests/Test_ExtDataNodeBracket.pf b/gridcomps/extdata/tests/Test_ExtDataNodeBracket.pf index 10bd3629fb6..0dda5fa48be 100644 --- a/gridcomps/extdata/tests/Test_ExtDataNodeBracket.pf +++ b/gridcomps/extdata/tests/Test_ExtDataNodeBracket.pf @@ -1,8 +1,8 @@ #include "MAPL_TestErr.h" module Test_ExtDataNodeBracket use pfunit - use mapl_DataSetNode - use mapl_DataSetBracket + use mapl_DataSetNode_mod + use mapl_DataSetBracket_mod use esmf implicit none diff --git a/gridcomps/extdata/tests/Test_NonClimDataSetFileSelector.pf b/gridcomps/extdata/tests/Test_NonClimDataSetFileSelector.pf index 175c03bb69d..804dc1972c1 100644 --- a/gridcomps/extdata/tests/Test_NonClimDataSetFileSelector.pf +++ b/gridcomps/extdata/tests/Test_NonClimDataSetFileSelector.pf @@ -1,13 +1,13 @@ #include "MAPL_TestErr.h" module Test_NonClimDataSetFileSelector use pfunit - use mapl_DataSetNode - use mapl_DataSetBracket - use mapl_NonClimDataSetFileSelector - use mapl_DataSetNode - use mapl_DataSetBracket - use MAPL_FieldUtils - use mapl_FieldBundle_API + use mapl_DataSetNode_mod + use mapl_DataSetBracket_mod + use mapl_NonClimDataSetFileSelector_mod + use mapl_DataSetNode_mod + use mapl_DataSetBracket_mod + use mapl_FieldUtils + use mapl_FieldBundle_API_mod use esmf implicit none diff --git a/gridcomps/history/HistoryCollectionGridComp.F90 b/gridcomps/history/HistoryCollectionGridComp.F90 index b38cd966255..9a23010b115 100644 --- a/gridcomps/history/HistoryCollectionGridComp.F90 +++ b/gridcomps/history/HistoryCollectionGridComp.F90 @@ -1,12 +1,11 @@ #include "MAPL.h" -module mapl_HistoryCollectionGridComp +module mapl_HistoryCollectionGridComp_mod use MAPL - use mapl_HistoryCollectionGridComp_private - use mapl_HistoryConstants + use mapl_HistoryCollectionGridComp_private_mod + use mapl_HistoryConstants_mod use esmf - use MAPL_StringTemplate, only: fill_grads_template_esmf use pFlogger, only: logger, logging implicit none @@ -184,4 +183,4 @@ subroutine run(gridcomp, importState, exportState, clock, rc) _UNUSED_DUMMY(exportState) end subroutine run -end module mapl_HistoryCollectionGridComp +end module mapl_HistoryCollectionGridComp_mod diff --git a/gridcomps/history/HistoryCollectionGridComp_private.F90 b/gridcomps/history/HistoryCollectionGridComp_private.F90 index d28badbaaa4..766229b548e 100644 --- a/gridcomps/history/HistoryCollectionGridComp_private.F90 +++ b/gridcomps/history/HistoryCollectionGridComp_private.F90 @@ -1,18 +1,13 @@ #include "MAPL.h" -module mapl_HistoryCollectionGridComp_private +module mapl_HistoryCollectionGridComp_private_mod use MAPL use esmf use gFTL2_StringVector use gFTL2_StringSet - use mapl_EsmfRegridder, only: EsmfRegridderParam - use mapl_RegridderMethods - use mapl_CompressionSettings - use mapl_StateItemImpl - use mapl_State_API - use mapl_HistoryUtilities - use mapl_HistoryConstants + use mapl_HistoryUtilities_mod + use mapl_HistoryConstants_mod implicit none(type,external) private @@ -552,4 +547,4 @@ function compute_file_timestamp(accumulation_mode, current_time, timestep, rc) r _RETURN(_SUCCESS) end function compute_file_timestamp -end module mapl_HistoryCollectionGridComp_private +end module mapl_HistoryCollectionGridComp_private_mod diff --git a/gridcomps/history/HistoryConstants.F90 b/gridcomps/history/HistoryConstants.F90 index 48793ab14c3..273e659b40b 100644 --- a/gridcomps/history/HistoryConstants.F90 +++ b/gridcomps/history/HistoryConstants.F90 @@ -1,4 +1,4 @@ -module mapl_HistoryConstants +module mapl_HistoryConstants_mod implicit none(type,external) private @@ -25,4 +25,4 @@ module mapl_HistoryConstants character(len=*), parameter :: KEY_INSTANTANEOUS = 'instantaneous' character(len=*), parameter :: KEY_REGRID = 'regrid' -end module mapl_HistoryConstants +end module mapl_HistoryConstants_mod diff --git a/gridcomps/history/HistoryGridComp.F90 b/gridcomps/history/HistoryGridComp.F90 index e782af0ba01..f6212e099e6 100644 --- a/gridcomps/history/HistoryGridComp.F90 +++ b/gridcomps/history/HistoryGridComp.F90 @@ -1,12 +1,12 @@ #include "MAPL.h" -module mapl_HistoryGridComp +module mapl_HistoryGridComp_mod use MAPL use ESMF - use mapl_HistoryGridComp_private - use mapl_HistoryCollectionGridComp, only: collection_setServices => setServices - use mapl_StatisticsGridComp, only: statistics_setServices => setServices + use mapl_HistoryGridComp_private_mod + use mapl_HistoryCollectionGridComp_mod, only: collection_setServices => setServices + use mapl_StatisticsGridComp_mod, only: statistics_setServices => setServices use pFlogger, only: logger implicit none(type,external) @@ -162,12 +162,12 @@ subroutine run(gridcomp, importState, exportState, clock, rc) _UNUSED_DUMMY(clock) end subroutine run -end module mapl_HistoryGridComp +end module mapl_HistoryGridComp_mod subroutine setServices(gridcomp,rc) use ESMF - use MAPL_ErrorHandlingMod - use mapl_HistoryGridComp, only: History_setServices => SetServices + use MAPL + use mapl_HistoryGridComp_mod, only: History_setServices => SetServices type(ESMF_GridComp) :: gridcomp integer, intent(out) :: rc diff --git a/gridcomps/history/HistoryGridComp_private.F90 b/gridcomps/history/HistoryGridComp_private.F90 index 8db80468b8c..903cabb4d0c 100644 --- a/gridcomps/history/HistoryGridComp_private.F90 +++ b/gridcomps/history/HistoryGridComp_private.F90 @@ -1,12 +1,10 @@ #include "MAPL.h" -module mapl_HistoryGridComp_private +module mapl_HistoryGridComp_private_mod use MAPL - use mapl_ErrorHandlingMod - use mapl_keywordenforcermod - use mapl_HistoryConstants - use mapl_HistoryUtilities - use mapl_StatisticsGridComp, only: statistics_setServices => setServices + use mapl_HistoryConstants_mod + use mapl_HistoryUtilities_mod + use mapl_StatisticsGridComp_mod, only: statistics_setServices => setServices use esmf implicit none @@ -158,4 +156,4 @@ function create_stats_entry(name, action, period, ref_datetime, rc) result(stat_ end function create_stats_entry -end module mapl_HistoryGridComp_private +end module mapl_HistoryGridComp_private_mod diff --git a/gridcomps/history/HistoryUtilities.F90 b/gridcomps/history/HistoryUtilities.F90 index 1d40afba5ea..f814dbafd91 100644 --- a/gridcomps/history/HistoryUtilities.F90 +++ b/gridcomps/history/HistoryUtilities.F90 @@ -1,8 +1,8 @@ #include "MAPL.h" -module mapl_HistoryUtilities +module mapl_HistoryUtilities_mod use MAPL use esmf - use mapl_HistoryConstants + use mapl_HistoryConstants_mod !use gFTL2_StringVector !use gFTL2_StringSet @@ -77,4 +77,4 @@ subroutine parse_item(item, short_name, alias, name_in_comp, rc) _RETURN(_SUCCESS) end subroutine parse_item -end module mapl_HistoryUtilities +end module mapl_HistoryUtilities_mod diff --git a/gridcomps/history/tests/CMakeLists.txt b/gridcomps/history/tests/CMakeLists.txt index f403ace59bd..2301cf9a5a8 100644 --- a/gridcomps/history/tests/CMakeLists.txt +++ b/gridcomps/history/tests/CMakeLists.txt @@ -9,7 +9,7 @@ add_pfunit_ctest(MAPL.history.tests TEST_SOURCES ${test_srcs} LINK_LIBRARIES MAPL.history MAPL.pfunit EXTRA_INITIALIZE Initialize - EXTRA_USE MAPL_pFUnit_Initialize + EXTRA_USE mapl_pFUnit_Initialize_mod WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} MAX_PES 1 ) diff --git a/gridcomps/history/tests/Test_HistoryCollectionGridComp.pf b/gridcomps/history/tests/Test_HistoryCollectionGridComp.pf index af234a16748..60d067de6a8 100644 --- a/gridcomps/history/tests/Test_HistoryCollectionGridComp.pf +++ b/gridcomps/history/tests/Test_HistoryCollectionGridComp.pf @@ -4,9 +4,9 @@ module Test_HistoryCollectionGridComp use pfunit - use mapl_HistoryCollectionGridComp_private - use mapl_HistoryConstants - use mapl_HistoryUtilities + use mapl_HistoryCollectionGridComp_private_mod + use mapl_HistoryConstants_mod + use mapl_HistoryUtilities_mod use esmf use gFTL2_StringVector diff --git a/gridcomps/history/tests/Test_HistoryGridComp.pf b/gridcomps/history/tests/Test_HistoryGridComp.pf index f1d213072c2..18fe96063c6 100644 --- a/gridcomps/history/tests/Test_HistoryGridComp.pf +++ b/gridcomps/history/tests/Test_HistoryGridComp.pf @@ -1,7 +1,7 @@ #include "MAPL_TestErr.h" module Test_HistoryGridComp use pfunit - use mapl_HistoryGridComp_private + use mapl_HistoryGridComp_private_mod use generic3g, only: MAPL_HConfigMatch use esmf implicit none diff --git a/gridcomps/orbit/MAPL_NominalOrbitsMod.F90 b/gridcomps/orbit/MAPL_NominalOrbitsMod.F90 index c771eb0ca82..35306029667 100644 --- a/gridcomps/orbit/MAPL_NominalOrbitsMod.F90 +++ b/gridcomps/orbit/MAPL_NominalOrbitsMod.F90 @@ -18,7 +18,7 @@ !- 07Jul2009 Albayrak Initial implementation. !- 30Jul2009 Albayrak Beta version 2 implemantation ! - MODULE MAPL_NominalOrbitsMod + MODULE mapl_NominalOrbits_mod use MAPL_Constants IMPLICIT NONE @@ -1298,6 +1298,6 @@ SUBROUTINE orbits(lat, lon, iSat, nymd, nhms) ! for now time has to be after ECEF_est(3,1), lat, lon, alt) END SUBROUTINE orbits -END MODULE MAPL_NominalOrbitsMod +END MODULE mapl_NominalOrbits_mod diff --git a/gridcomps/orbit/MAPL_OrbGridCompMod.F90 b/gridcomps/orbit/MAPL_OrbGridCompMod.F90 index d8db44d2b7f..b502f9b4b7a 100644 --- a/gridcomps/orbit/MAPL_OrbGridCompMod.F90 +++ b/gridcomps/orbit/MAPL_OrbGridCompMod.F90 @@ -18,32 +18,19 @@ !#### History !- 30Nov2010 da Silva Initial version. ! - MODULE MAPL_OrbGridCompMod + MODULE mapl_OrbGridComp_mod ! ! !USES: ! Use ESMF - use MAPL_MathConstants, only: MAPL_PI, MAPL_DEGREES_TO_RADIANS_R8, & - MAPL_RADIANS_TO_DEGREES - use MAPL_InternalConstants, only: MAPL_UNDEFINED_REAL, MAPL_R4, MAPL_DimsHorzOnly, & - MAPL_VLocationCenter - use MAPL_ISO8601_DateTime, only: convert_ISO8601_to_integer_date, & - convert_ISO8601_to_integer_time - use mapl_FieldCreateImpl, only: MAPL_FieldCreate - use mapl_FieldBundle_API, only: MAPL_FieldBundleAdd + use MAPL, only: MAPL_FieldCreate + use MAPL, only: MAPL_FieldBundleAdd Use MAPL_CommsMod, only: MAPL_AM_I_ROOT - Use MAPL_ErrorHandlingMod - use mapl_generic, only: MAPL_GridCompGet - use mapl_generic, only: MAPL_UserCompSetInternalState, MAPL_UserCompGetInternalState - use mapl_generic, only: MAPL_GridCompAddSpec - use mapl_VerticalStaggerLoc, only: VERTICAL_STAGGER_NONE, VERTICAL_STAGGER_CENTER - use mapl_generic, only: MAPL_STATEITEM_FIELDBUNDLE - use mapl_generic, only: MAPL_GridCompSetEntryPoint - use mapl_Geom_API, only: MAPL_GridGet, MAPL_GridGetCoordinates - use mapl_GridGetGlobal, only: GridGetGlobalCellCountPerDim - use mapl_State_API, only: MAPL_StateGetPointer - use mapl_FieldBundle_API, only: MAPL_FieldBundleGetPointer - use mapl_generic, only: MAPL_GridCompGetResource + Use MAPL + use MAPL, only: VERTICAL_STAGGER_NONE, VERTICAL_STAGGER_CENTER + use MAPL, only: MAPL_GridGet, MAPL_GridGetCoordinates + use MAPL, only: MAPL_StateGetPointer + use MAPL, only: MAPL_FieldBundleGetPointer IMPLICIT NONE PRIVATE @@ -463,7 +450,7 @@ subroutine DoMasking_ (field, im, jm, lons, lats, undef, & sat_name, nymd, nhms, dt, swath, & ihalo, jhalo, rc ) - use MAPL_NominalOrbitsMod + use mapl_NominalOrbits_mod implicit NONE @@ -568,7 +555,7 @@ subroutine DoMasking_CS (field, im, jm, x, y, undef, & sat_name, nymd, nhms, dt, swath, & ihalo, jhalo, face, rc ) - use MAPL_NominalOrbitsMod + use mapl_NominalOrbits_mod implicit NONE @@ -1503,4 +1490,4 @@ subroutine orb_halo(im,jm,mask,ihalo,jhalo,rc) end subroutine orb_halo -end module MAPL_OrbGridCompMod +end module mapl_OrbGridComp_mod diff --git a/gridcomps/statistics/AbstractCovarianceKernel.F90 b/gridcomps/statistics/AbstractCovarianceKernel.F90 index 70c9bcb6c01..a0deb80f3a9 100644 --- a/gridcomps/statistics/AbstractCovarianceKernel.F90 +++ b/gridcomps/statistics/AbstractCovarianceKernel.F90 @@ -1,11 +1,9 @@ #include "MAPL.h" -module mapl_AbstractCovarianceKernel +module mapl_AbstractCovarianceKernel_mod use MAPL use ESMF - use mapl_ErrorHandling - use mapl_KeywordEnforcer implicit none(type, external) private @@ -85,4 +83,4 @@ end subroutine I_compute end interface -end module mapl_AbstractCovarianceKernel +end module mapl_AbstractCovarianceKernel_mod diff --git a/gridcomps/statistics/AbstractTimeStatistic.F90 b/gridcomps/statistics/AbstractTimeStatistic.F90 index 8f5e54525da..57ab3674404 100644 --- a/gridcomps/statistics/AbstractTimeStatistic.F90 +++ b/gridcomps/statistics/AbstractTimeStatistic.F90 @@ -1,7 +1,6 @@ -module mapl_AbstractTimeStatistic +module mapl_AbstractTimeStatistic_mod use MAPL use ESMF - use mapl_SimpleAlarm, only: SimpleAlarm implicit none(type,external) private @@ -59,4 +58,4 @@ end function I_get_alarm end interface -end module mapl_AbstractTimeStatistic +end module mapl_AbstractTimeStatistic_mod diff --git a/gridcomps/statistics/NullStatistic.F90 b/gridcomps/statistics/NullStatistic.F90 index 799071d324a..a5a8a863fe9 100644 --- a/gridcomps/statistics/NullStatistic.F90 +++ b/gridcomps/statistics/NullStatistic.F90 @@ -1,11 +1,10 @@ #include "MAPL.h" -module mapl_NullStatistic +module mapl_NullStatistic_mod - use mapl_AbstractTimeStatistic - use mapl_ErrorHandling + use mapl_AbstractTimeStatistic_mod + use MAPL use esmf, only: esmf_State, esmf_GridComp, esmf_Clock - use mapl_SimpleAlarm, only: SimpleAlarm implicit none(type,external) private @@ -74,4 +73,4 @@ function noop_get_alarm(this) result(alarm) error stop 'NullStatistic does not have an alarm' end function noop_get_alarm -end module mapl_NullStatistic +end module mapl_NullStatistic_mod diff --git a/gridcomps/statistics/ShiftedCovarianceKernel.F90 b/gridcomps/statistics/ShiftedCovarianceKernel.F90 index 523dcb38f31..f059af05b8c 100644 --- a/gridcomps/statistics/ShiftedCovarianceKernel.F90 +++ b/gridcomps/statistics/ShiftedCovarianceKernel.F90 @@ -1,11 +1,10 @@ #include "MAPL.h" -module mapl_ShiftedCovarianceKernel +module mapl_ShiftedCovarianceKernel_mod - use mapl_AbstractCovarianceKernel + use mapl_AbstractCovarianceKernel_mod use MAPL use ESMF - use mapl_ErrorHandling implicit none(type, external) private @@ -341,4 +340,4 @@ subroutine compute_r8(this, gridcomp, f_x, f_y, counts_f, cov_f, biased, rc) end subroutine compute_r8 -end module mapl_ShiftedCovarianceKernel +end module mapl_ShiftedCovarianceKernel_mod diff --git a/gridcomps/statistics/StatisticsGridComp.F90 b/gridcomps/statistics/StatisticsGridComp.F90 index a452b0563d9..f85b49f92a4 100644 --- a/gridcomps/statistics/StatisticsGridComp.F90 +++ b/gridcomps/statistics/StatisticsGridComp.F90 @@ -1,26 +1,19 @@ #include "MAPL.h" -module mapl_StatisticsGridComp +module mapl_StatisticsGridComp_mod use MAPL use ESMF - use mapl_RestartHandler - use mapl_ESMF_Time_Utilities, only: sub_time_in_datetime ! local modules - use mapl_AbstractTimeStatistic - use mapl_StatisticsVector - use mapl_NullStatistic - use mapl_TimeAverage - use mapl_TimeMin - use mapl_TimeMax - use mapl_TimeAccumulate - use mapl_TimeVariance - use mapl_State_API + use mapl_AbstractTimeStatistic_mod + use mapl_StatisticsVector_mod + use mapl_NullStatistic_mod + use mapl_TimeAverage_mod + use mapl_TimeMin_mod + use mapl_TimeMax_mod + use mapl_TimeAccumulate_mod + use mapl_TimeVariance_mod use pflogger, only: Logger - use mapl_OS - use mapl_mp_utils, only: MAPL_GetCheckpointSubdir - use mapl_SimpleAlarm, only: SimpleAlarm - use mapl_ComponentSpec, only: ComponentSpec, CheckpointControls implicit none(type,external) private @@ -470,11 +463,11 @@ subroutine custom_write_restart(gridcomp, importState, exportState, clock, rc) _UNUSED_DUMMY(exportState) end subroutine custom_write_restart -end module mapl_StatisticsGridComp +end module mapl_StatisticsGridComp_mod subroutine setServices(gridComp, rc) use MAPL - use mapl_StatisticsGridComp, only: StatisticsSetServices => setServices + use mapl_StatisticsGridComp_mod, only: StatisticsSetServices => setServices implicit none(type,external) type(esmf_GridComp), intent(inout) :: gridcomp integer, intent(out) :: rc diff --git a/gridcomps/statistics/StatisticsVector.F90 b/gridcomps/statistics/StatisticsVector.F90 index 0cad7d8a138..05eb6c36c04 100644 --- a/gridcomps/statistics/StatisticsVector.F90 +++ b/gridcomps/statistics/StatisticsVector.F90 @@ -1,5 +1,5 @@ -module mapl_StatisticsVector - use mapl_AbstractTimeStatistic +module mapl_StatisticsVector_mod + use mapl_AbstractTimeStatistic_mod #define T AbstractTimeStatistic #define T_polymorphic @@ -14,4 +14,4 @@ module mapl_StatisticsVector #undef T_polymorphic #undef T -end module mapl_StatisticsVector +end module mapl_StatisticsVector_mod diff --git a/gridcomps/statistics/TimeAccumulate.F90 b/gridcomps/statistics/TimeAccumulate.F90 index 16584abfd86..46c9025ce4f 100644 --- a/gridcomps/statistics/TimeAccumulate.F90 +++ b/gridcomps/statistics/TimeAccumulate.F90 @@ -1,13 +1,10 @@ #include "MAPL.h" -module mapl_TimeAccumulate +module mapl_TimeAccumulate_mod - use mapl_AbstractTimeStatistic + use mapl_AbstractTimeStatistic_mod use MAPL use ESMF - use mapl_ErrorHandling - use mapl_KeywordEnforcer - use mapl_SimpleAlarm, only: SimpleAlarm implicit none(type,external) private @@ -318,4 +315,4 @@ subroutine advertise_time_accumulate_internal_fields(gridcomp, name, rc) _RETURN(_SUCCESS) end subroutine advertise_time_accumulate_internal_fields -end module mapl_TimeAccumulate +end module mapl_TimeAccumulate_mod diff --git a/gridcomps/statistics/TimeAverage.F90 b/gridcomps/statistics/TimeAverage.F90 index c77cfbab810..8938dca5cb0 100644 --- a/gridcomps/statistics/TimeAverage.F90 +++ b/gridcomps/statistics/TimeAverage.F90 @@ -1,13 +1,10 @@ #include "MAPL.h" -module mapl_TimeAverage +module mapl_TimeAverage_mod - use mapl_AbstractTimeStatistic + use mapl_AbstractTimeStatistic_mod use MAPL use ESMF - use mapl_ErrorHandling - use mapl_KeywordEnforcer - use mapl_SimpleAlarm, only: SimpleAlarm implicit none(type,external) private @@ -351,4 +348,4 @@ subroutine advertise_time_average_internal_fields(gridcomp, name, rc) _RETURN(_SUCCESS) end subroutine advertise_time_average_internal_fields -end module mapl_TimeAverage +end module mapl_TimeAverage_mod diff --git a/gridcomps/statistics/TimeMax.F90 b/gridcomps/statistics/TimeMax.F90 index 7d87725c24a..243d7ee5e94 100644 --- a/gridcomps/statistics/TimeMax.F90 +++ b/gridcomps/statistics/TimeMax.F90 @@ -1,13 +1,10 @@ #include "MAPL.h" -module mapl_TimeMax +module mapl_TimeMax_mod - use mapl_AbstractTimeStatistic + use mapl_AbstractTimeStatistic_mod use MAPL use ESMF - use mapl_ErrorHandling - use mapl_KeywordEnforcer - use mapl_SimpleAlarm, only: SimpleAlarm implicit none(type,external) private @@ -328,4 +325,4 @@ subroutine advertise_time_max_internal_fields(gridcomp, name, rc) _RETURN(_SUCCESS) end subroutine advertise_time_max_internal_fields -end module mapl_TimeMax +end module mapl_TimeMax_mod diff --git a/gridcomps/statistics/TimeMin.F90 b/gridcomps/statistics/TimeMin.F90 index 1155737e3f0..eda65ab9dc4 100644 --- a/gridcomps/statistics/TimeMin.F90 +++ b/gridcomps/statistics/TimeMin.F90 @@ -1,13 +1,10 @@ #include "MAPL.h" -module mapl_TimeMin +module mapl_TimeMin_mod - use mapl_AbstractTimeStatistic + use mapl_AbstractTimeStatistic_mod use MAPL use ESMF - use mapl_ErrorHandling - use mapl_KeywordEnforcer - use mapl_SimpleAlarm, only: SimpleAlarm implicit none(type,external) private @@ -328,4 +325,4 @@ subroutine advertise_time_min_internal_fields(gridcomp, name, rc) _RETURN(_SUCCESS) end subroutine advertise_time_min_internal_fields -end module mapl_TimeMin +end module mapl_TimeMin_mod diff --git a/gridcomps/statistics/TimeVariance.F90 b/gridcomps/statistics/TimeVariance.F90 index fddad520c2d..c9d6d756b06 100644 --- a/gridcomps/statistics/TimeVariance.F90 +++ b/gridcomps/statistics/TimeVariance.F90 @@ -1,16 +1,13 @@ #include "MAPL.h" -module mapl_TimeVariance +module mapl_TimeVariance_mod - use mapl_AbstractTimeStatistic - use mapl_AbstractCovarianceKernel - use mapl_ShiftedCovarianceKernel - use mapl_WelfordCovarianceKernel + use mapl_AbstractTimeStatistic_mod + use mapl_AbstractCovarianceKernel_mod + use mapl_ShiftedCovarianceKernel_mod + use mapl_WelfordCovarianceKernel_mod use MAPL use ESMF - use mapl_ErrorHandling - use mapl_KeywordEnforcer - use mapl_SimpleAlarm, only: SimpleAlarm implicit none(type, external) private @@ -287,4 +284,4 @@ logical function needs_initialization(stat) end function needs_initialization -end module mapl_TimeVariance +end module mapl_TimeVariance_mod diff --git a/gridcomps/statistics/WelfordCovarianceKernel.F90 b/gridcomps/statistics/WelfordCovarianceKernel.F90 index f3bee707d0c..e5f4b170cd3 100644 --- a/gridcomps/statistics/WelfordCovarianceKernel.F90 +++ b/gridcomps/statistics/WelfordCovarianceKernel.F90 @@ -1,11 +1,10 @@ #include "MAPL.h" -module mapl_WelfordCovarianceKernel +module mapl_WelfordCovarianceKernel_mod - use mapl_AbstractCovarianceKernel + use mapl_AbstractCovarianceKernel_mod use MAPL use ESMF - use mapl_ErrorHandling implicit none(type, external) private @@ -314,4 +313,4 @@ subroutine compute_r8(this, gridcomp, f_x, f_y, counts_f, cov_f, biased, rc) end subroutine compute_r8 -end module mapl_WelfordCovarianceKernel +end module mapl_WelfordCovarianceKernel_mod diff --git a/gridcomps/statistics/tests/CMakeLists.txt b/gridcomps/statistics/tests/CMakeLists.txt index 38e50b08459..bb39e88fa26 100644 --- a/gridcomps/statistics/tests/CMakeLists.txt +++ b/gridcomps/statistics/tests/CMakeLists.txt @@ -8,7 +8,7 @@ add_pfunit_ctest(MAPL.statistics.tests TEST_SOURCES ${test_srcs} LINK_LIBRARIES MAPL.statistics MAPL.pfunit EXTRA_INITIALIZE Initialize - EXTRA_USE MAPL_pFUnit_Initialize + EXTRA_USE mapl_pFUnit_Initialize_mod WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} MAX_PES 1 ) diff --git a/gridcomps/statistics/tests/Test_TimeAccumulate.pf b/gridcomps/statistics/tests/Test_TimeAccumulate.pf index 7c8539dad06..acc0f20998e 100644 --- a/gridcomps/statistics/tests/Test_TimeAccumulate.pf +++ b/gridcomps/statistics/tests/Test_TimeAccumulate.pf @@ -2,8 +2,8 @@ module Test_TimeAccumulate use pfunit - use mapl_TimeAccumulate - use mapl_SimpleAlarm, only: SimpleAlarm + use mapl_TimeAccumulate_mod + use mapl_SimpleAlarm_mod, only: SimpleAlarm use MAPL use ESMF use ESMF_TestMethod_mod diff --git a/infrastructure/esmf/API.F90 b/infrastructure/esmf/API.F90 index d355a48da36..3698407230f 100644 --- a/infrastructure/esmf/API.F90 +++ b/infrastructure/esmf/API.F90 @@ -1,3 +1,3 @@ -module mapl_VM_API - use mapl_vm -end module mapl_VM_API +module mapl_VM_API_mod + use mapl_vm_mod +end module mapl_VM_API_mod diff --git a/infrastructure/esmf/DistGridGet.F90 b/infrastructure/esmf/DistGridGet.F90 index 76dee1134fa..3f90ae0aeb5 100644 --- a/infrastructure/esmf/DistGridGet.F90 +++ b/infrastructure/esmf/DistGridGet.F90 @@ -1,9 +1,9 @@ #include "MAPL.h" -module mapl_DistGridGet +module mapl_DistGridGet_mod use ESMF, only: ESMF_DistGrid, ESMF_DistGridGet - use MAPL_ErrorHandlingMod + use mapl_ErrorHandling_mod implicit none private @@ -93,4 +93,4 @@ subroutine dist_grid_get(dist_grid, min_index, max_index, rc) _RETURN(_SUCCESS) end subroutine dist_grid_get -end module mapl_DistGridGet +end module mapl_DistGridGet_mod diff --git a/infrastructure/esmf/ESMF_HConfigUtilities.F90 b/infrastructure/esmf/ESMF_HConfigUtilities.F90 index ba41f02596a..9aab79c2fbf 100644 --- a/infrastructure/esmf/ESMF_HConfigUtilities.F90 +++ b/infrastructure/esmf/ESMF_HConfigUtilities.F90 @@ -1,8 +1,8 @@ #include "MAPL.h" -module mapl_ESMF_HConfigUtilities +module mapl_ESMF_HConfigUtilities_mod use esmf - use mapl_ErrorHandling + use mapl_ErrorHandling_mod implicit none(type,external) private @@ -36,4 +36,4 @@ end function MAPL_HConfigMatch END INTERFACE -end module mapl_ESMF_HConfigUtilities +end module mapl_ESMF_HConfigUtilities_mod diff --git a/infrastructure/esmf/ESMF_HConfigUtilities/MAPL_HConfigMatch.F90 b/infrastructure/esmf/ESMF_HConfigUtilities/MAPL_HConfigMatch.F90 index 6e627311014..4f406f6d80a 100644 --- a/infrastructure/esmf/ESMF_HConfigUtilities/MAPL_HConfigMatch.F90 +++ b/infrastructure/esmf/ESMF_HConfigUtilities/MAPL_HConfigMatch.F90 @@ -1,6 +1,6 @@ #include "MAPL.h" -submodule (mapl_ESMF_HConfigUtilities) MAPL_HConfigMatch_smod +submodule (mapl_ESMF_HConfigUtilities_mod) MAPL_HConfigMatch_smod implicit none(type,external) diff --git a/infrastructure/esmf/ESMF_HConfigUtilities/write_hconfig.F90 b/infrastructure/esmf/ESMF_HConfigUtilities/write_hconfig.F90 index 4c75394de36..4ef6121ed60 100644 --- a/infrastructure/esmf/ESMF_HConfigUtilities/write_hconfig.F90 +++ b/infrastructure/esmf/ESMF_HConfigUtilities/write_hconfig.F90 @@ -1,6 +1,6 @@ #include "MAPL.h" -submodule (mapl_ESMF_HConfigUtilities) write_hconfig_smod +submodule (mapl_ESMF_HConfigUtilities_mod) write_hconfig_smod implicit none(type,external) contains diff --git a/infrastructure/esmf/ESMF_Interfaces.F90 b/infrastructure/esmf/ESMF_Interfaces.F90 index 207035d6823..0a73e273263 100644 --- a/infrastructure/esmf/ESMF_Interfaces.F90 +++ b/infrastructure/esmf/ESMF_Interfaces.F90 @@ -8,7 +8,7 @@ !------- -module mapl_ESMF_Interfaces +module mapl_ESMF_Interfaces_mod implicit none(type,external) private @@ -91,4 +91,4 @@ end subroutine I_CplRun end interface -end module mapl_ESMF_Interfaces +end module mapl_ESMF_Interfaces_mod diff --git a/infrastructure/esmf/ESMF_Subset.F90 b/infrastructure/esmf/ESMF_Subset.F90 index ed3b5515d39..5d64ea5f3c0 100644 --- a/infrastructure/esmf/ESMF_Subset.F90 +++ b/infrastructure/esmf/ESMF_Subset.F90 @@ -3,7 +3,7 @@ ! wrappers when appropriate. Compliant MAPL components should not do ! 'USE ESMF', but instead should have 'USE mapl_ESMF_SUBSET'. -module mapl_ESMF_Subset +module mapl_ESMF_Subset_mod ! Note: items should be listed in alphabetic order for easy human search. ! types @@ -78,4 +78,4 @@ module mapl_ESMF_Subset implicit none(type,external) -end module mapl_ESMF_Subset +end module mapl_ESMF_Subset_mod diff --git a/infrastructure/esmf/ESMF_Time_Utilities.F90 b/infrastructure/esmf/ESMF_Time_Utilities.F90 index 950f8771aa9..20d99622766 100644 --- a/infrastructure/esmf/ESMF_Time_Utilities.F90 +++ b/infrastructure/esmf/ESMF_Time_Utilities.F90 @@ -1,11 +1,11 @@ #include "unused_dummy.H" #include "MAPL.h" -module mapl_ESMF_Time_Utilities +module mapl_ESMF_Time_Utilities_mod use esmf, I4 => ESMF_KIND_I4, I8 => ESMF_KIND_I8 - use mapl_ErrorHandling - use MAPL_KeywordEnforcerMod + use mapl_ErrorHandling_mod + use mapl_KeywordEnforcer_mod implicit none (type, external) private @@ -285,4 +285,4 @@ function sub_time_in_datetime(time, ref_datetime, rc) result(new_time) _RETURN(_SUCCESS) end function sub_time_in_datetime -end module mapl_ESMF_Time_Utilities +end module mapl_ESMF_Time_Utilities_mod diff --git a/infrastructure/esmf/ESMF_Utilities.F90 b/infrastructure/esmf/ESMF_Utilities.F90 index f1d84a3e227..b5b506b1773 100644 --- a/infrastructure/esmf/ESMF_Utilities.F90 +++ b/infrastructure/esmf/ESMF_Utilities.F90 @@ -1,8 +1,8 @@ #include "MAPL.h" -module mapl_ESMF_Utilities +module mapl_ESMF_Utilities_mod use esmf - use mapl_ErrorHandling + use mapl_ErrorHandling_mod implicit none private @@ -135,7 +135,7 @@ end subroutine write_state_ ! Traverse nested states to return the innermost substate specified by path. ! Intermediate states are created if they do not exist. subroutine get_substate(state, path, substate, rc) - use mapl_ErrorHandling + use mapl_ErrorHandling_mod type(ESMF_State), intent(inout) :: state character(*), intent(in) :: path type(ESMF_State), intent(out) :: substate @@ -217,4 +217,4 @@ function esmf_state_intent_to_string(state_intent, rc) result(state_intent_str) _RETURN(_SUCCESS) end function esmf_state_intent_to_string -end module mapl_ESMF_Utilities +end module mapl_ESMF_Utilities_mod diff --git a/infrastructure/esmf/EsmfUtils_API.F90 b/infrastructure/esmf/EsmfUtils_API.F90 index a86961a53cc..20d7a166ec4 100644 --- a/infrastructure/esmf/EsmfUtils_API.F90 +++ b/infrastructure/esmf/EsmfUtils_API.F90 @@ -1,6 +1,6 @@ -module mapl_EsmfUtils_API - use mapl_UngriddedDim, only: UngriddedDim, make_UngriddedDim => make_ungriddedDim - use mapl_UngriddedDims, only: UngriddedDims +module mapl_EsmfUtils_API_mod + use mapl_UngriddedDim_mod, only: UngriddedDim, make_UngriddedDim => make_ungriddedDim + use mapl_UngriddedDims_mod, only: UngriddedDims implicit none(type,external) private @@ -8,4 +8,4 @@ module mapl_EsmfUtils_API public :: UngriddedDim, make_UngriddedDim public :: UngriddedDims -end module mapl_EsmfUtils_API +end module mapl_EsmfUtils_API_mod diff --git a/infrastructure/esmf/FieldPointerUtilities.F90 b/infrastructure/esmf/FieldPointerUtilities.F90 index fa6b20af951..2adbaa24a95 100644 --- a/infrastructure/esmf/FieldPointerUtilities.F90 +++ b/infrastructure/esmf/FieldPointerUtilities.F90 @@ -1,9 +1,9 @@ #include "MAPL.h" -module MAPL_FieldPointerUtilities +module mapl_FieldPointerUtilities_mod use ESMF - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod use, intrinsic :: iso_c_binding, only: c_ptr, c_f_pointer, c_loc, c_associated implicit none @@ -1175,4 +1175,4 @@ function same_data(x, y, rc) result(match) _RETURN(_SUCCESS) end function same_data -end module MAPL_FieldPointerUtilities +end module mapl_FieldPointerUtilities_mod diff --git a/infrastructure/esmf/HorizontalDimsSpec.F90 b/infrastructure/esmf/HorizontalDimsSpec.F90 index cae96a27d9c..06caad70fe3 100644 --- a/infrastructure/esmf/HorizontalDimsSpec.F90 +++ b/infrastructure/esmf/HorizontalDimsSpec.F90 @@ -1,4 +1,4 @@ -module mapl_HorizontalDimsSpec +module mapl_HorizontalDimsSpec_mod implicit none private @@ -81,4 +81,4 @@ function to_HorizontalDimsSpec(string) result(horizontal_dims_spec) end select end function to_HorizontalDimsSpec -end module mapl_HorizontalDimsSpec +end module mapl_HorizontalDimsSpec_mod diff --git a/infrastructure/esmf/InfoUtilities.F90 b/infrastructure/esmf/InfoUtilities.F90 index f6ec2e27fc4..304bf2d879f 100644 --- a/infrastructure/esmf/InfoUtilities.F90 +++ b/infrastructure/esmf/InfoUtilities.F90 @@ -4,12 +4,12 @@ ! objects and thereby ensure consistent support for namespace ! management and such. -module mapl_InfoUtilities +module mapl_InfoUtilities_mod - use mapl_ErrorHandling - use mapl_KeywordEnforcer + use mapl_ErrorHandling_mod + use mapl_KeywordEnforcer_mod - use mapl_esmf_info_keys + use mapl_esmf_info_keys_mod use esmf, only: ESMF_StateItem_Flag use esmf, only: ESMF_STATEITEM_FIELD use esmf, only: ESMF_STATEITEM_FIELDBundle @@ -884,6 +884,6 @@ function concat(namespace, key) result(full_key) end function concat -end module mapl_InfoUtilities +end module mapl_InfoUtilities_mod diff --git a/infrastructure/esmf/LU_Bound.F90 b/infrastructure/esmf/LU_Bound.F90 index cf929f0c35a..a6f0551e1a4 100644 --- a/infrastructure/esmf/LU_Bound.F90 +++ b/infrastructure/esmf/LU_Bound.F90 @@ -1,4 +1,4 @@ -module mapl_LU_Bound +module mapl_LU_Bound_mod implicit none private @@ -9,4 +9,4 @@ module mapl_LU_Bound integer :: upper end type LU_Bound -end module mapl_LU_Bound +end module mapl_LU_Bound_mod diff --git a/infrastructure/esmf/StateItem.F90 b/infrastructure/esmf/StateItem.F90 index 2f46751e934..c74bc425e8f 100644 --- a/infrastructure/esmf/StateItem.F90 +++ b/infrastructure/esmf/StateItem.F90 @@ -1,4 +1,4 @@ -module mapl_StateItemImpl +module mapl_StateItemImpl_mod use esmf implicit none private @@ -33,4 +33,4 @@ module mapl_StateItemImpl MAPL_STATEITEM_VECTORBRACKET = ESMF_StateItem_Flag(207), & MAPL_STATEITEM_EXPRESSION = ESMF_StateItem_Flag(208) -end module mapl_StateItemImpl +end module mapl_StateItemImpl_mod diff --git a/infrastructure/esmf/UngriddedDim.F90 b/infrastructure/esmf/UngriddedDim.F90 index d5949b27f47..ab0f2fad28f 100644 --- a/infrastructure/esmf/UngriddedDim.F90 +++ b/infrastructure/esmf/UngriddedDim.F90 @@ -1,8 +1,8 @@ #include "MAPL.h" -module mapl_UngriddedDim - use mapl_InfoUtilities - use mapl_LU_Bound - use mapl_ErrorHandling +module mapl_UngriddedDim_mod + use mapl_InfoUtilities_mod + use mapl_LU_Bound_mod + use mapl_ErrorHandling_mod use esmf, only: ESMF_Info use esmf, only: ESMF_InfoCreate use esmf, only: ESMF_InfoSet @@ -185,5 +185,5 @@ function make_ungriddedDim(info, rc) result(dim) _RETURN(_SUCCESS) end function make_ungriddedDim -end module mapl_UngriddedDim +end module mapl_UngriddedDim_mod diff --git a/infrastructure/esmf/UngriddedDimVector.F90 b/infrastructure/esmf/UngriddedDimVector.F90 index 447eceff062..878b9b84022 100644 --- a/infrastructure/esmf/UngriddedDimVector.F90 +++ b/infrastructure/esmf/UngriddedDimVector.F90 @@ -1,5 +1,5 @@ -module mapl_UngriddedDimVector - use mapl_UngriddedDim +module mapl_UngriddedDimVector_mod + use mapl_UngriddedDim_mod #define T UngriddedDim #define Vector UngriddedDimVector @@ -11,4 +11,4 @@ module mapl_UngriddedDimVector #undef Vector #undef VectorIterator -end module mapl_UngriddedDimVector +end module mapl_UngriddedDimVector_mod diff --git a/infrastructure/esmf/UngriddedDims.F90 b/infrastructure/esmf/UngriddedDims.F90 index ca6a64b654c..d5018529961 100644 --- a/infrastructure/esmf/UngriddedDims.F90 +++ b/infrastructure/esmf/UngriddedDims.F90 @@ -1,12 +1,12 @@ #include "MAPL.h" -module mapl_UngriddedDims - use mapl_InfoUtilities - use mapl_ESMF_Info_Keys - use mapl_UngriddedDimVector - use mapl_UngriddedDim - use mapl_LU_Bound - use mapl_ErrorHandling +module mapl_UngriddedDims_mod + use mapl_InfoUtilities_mod + use mapl_esmf_info_keys_mod + use mapl_UngriddedDimVector_mod + use mapl_UngriddedDim_mod + use mapl_LU_Bound_mod + use mapl_ErrorHandling_mod use esmf, only: ESMF_Info use esmf, only: ESMF_InfoCreate use esmf, only: ESMF_InfoSet @@ -266,5 +266,5 @@ logical function is_mirror(this) is_mirror = this%is_mirror_ end function is_mirror -end module mapl_UngriddedDims +end module mapl_UngriddedDims_mod diff --git a/infrastructure/esmf/alarm/SimpleAlarm.F90 b/infrastructure/esmf/alarm/SimpleAlarm.F90 index cc01fc04cc2..0c2b067476b 100644 --- a/infrastructure/esmf/alarm/SimpleAlarm.F90 +++ b/infrastructure/esmf/alarm/SimpleAlarm.F90 @@ -5,9 +5,9 @@ ! and a frequency which defines an infinite number of times ! given an input time, you are either one of those or you aren't -module mapl_SimpleAlarm +module mapl_SimpleAlarm_mod use esmf - use mapl_ErrorHandling + use mapl_ErrorHandling_mod implicit none private @@ -98,4 +98,4 @@ function all_zero(time_interval, rc) result(is_all_zero) _RETURN(_SUCCESS) end function -end module mapl_SimpleAlarm +end module mapl_SimpleAlarm_mod diff --git a/infrastructure/esmf/alarm/tests/CMakeLists.txt b/infrastructure/esmf/alarm/tests/CMakeLists.txt index 9c0de75600c..acd502c9d4d 100644 --- a/infrastructure/esmf/alarm/tests/CMakeLists.txt +++ b/infrastructure/esmf/alarm/tests/CMakeLists.txt @@ -8,7 +8,7 @@ add_pfunit_ctest(MAPL.alarm.tests TEST_SOURCES ${test_srcs} LINK_LIBRARIES MAPL.alarm MAPL.pfunit EXTRA_INITIALIZE Initialize - EXTRA_USE MAPL_pFUnit_Initialize + EXTRA_USE mapl_pFUnit_Initialize_mod WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} MAX_PES 1 ) diff --git a/infrastructure/esmf/alarm/tests/Test_SimpleAlarm.pf b/infrastructure/esmf/alarm/tests/Test_SimpleAlarm.pf index 4f52a5762fc..d916177cbb6 100644 --- a/infrastructure/esmf/alarm/tests/Test_SimpleAlarm.pf +++ b/infrastructure/esmf/alarm/tests/Test_SimpleAlarm.pf @@ -2,7 +2,7 @@ module Test_SimpleAlarm use pfunit - use mapl_SimpleAlarm + use mapl_SimpleAlarm_mod use esmf implicit none diff --git a/infrastructure/esmf/comms/Comms_API.F90 b/infrastructure/esmf/comms/Comms_API.F90 index a4e9f8480f3..287b6056f65 100644 --- a/infrastructure/esmf/comms/Comms_API.F90 +++ b/infrastructure/esmf/comms/Comms_API.F90 @@ -1,21 +1,21 @@ -module mapl_Utilities_Comms_API - use mapl_Comms, only: MAPL_Am_I_Root => Am_I_Root - use mapl_Comms, only: MAPL_NPES => num_pes +module mapl_Utilities_Comms_API_mod + use mapl_Comms_mod, only: MAPL_Am_I_Root => Am_I_Root + use mapl_Comms_mod, only: MAPL_NPES => num_pes - use mapl_Comms, only: MAPL_CommsSend => comms_send - use mapl_Comms, only: MAPL_CommsRecv => comms_recv - use mapl_Comms, only: MAPL_CommsSendRecv => comms_sendrecv + use mapl_Comms_mod, only: MAPL_CommsSend => comms_send + use mapl_Comms_mod, only: MAPL_CommsRecv => comms_recv + use mapl_Comms_mod, only: MAPL_CommsSendRecv => comms_sendrecv - use mapl_Comms, only: MAPL_CommsGatherV => comms_gatherv - use mapl_Comms, only: MAPL_CommsScatterV => comms_scatterv + use mapl_Comms_mod, only: MAPL_CommsGatherV => comms_gatherv + use mapl_Comms_mod, only: MAPL_CommsScatterV => comms_scatterv - use mapl_Comms, only: MAPL_CommsAllGather => comms_allgather - use mapl_Comms, only: MAPL_CommsAllGatherV => comms_allgatherv + use mapl_Comms_mod, only: MAPL_CommsAllGather => comms_allgather + use mapl_Comms_mod, only: MAPL_CommsAllGatherV => comms_allgatherv - use mapl_Comms, only: MAPL_ArrayGather => array_gather - use mapl_Comms, only: MAPL_ArrayScatter => array_scatter + use mapl_Comms_mod, only: MAPL_ArrayGather => array_gather + use mapl_Comms_mod, only: MAPL_ArrayScatter => array_scatter - use mapl_Comms, only: MAPL_CommsAllReduceMin => comms_allreduce_min - use mapl_Comms, only: MAPL_CommsAllReduceMax => comms_allreduce_max - use mapl_Comms, only: MAPL_CommsAllReduceSum => comms_allreduce_sum -end module mapl_Utilities_Comms_API + use mapl_Comms_mod, only: MAPL_CommsAllReduceMin => comms_allreduce_min + use mapl_Comms_mod, only: MAPL_CommsAllReduceMax => comms_allreduce_max + use mapl_Comms_mod, only: MAPL_CommsAllReduceSum => comms_allreduce_sum +end module mapl_Utilities_Comms_API_mod diff --git a/infrastructure/esmf/comms/MAPL_Comms.F90 b/infrastructure/esmf/comms/MAPL_Comms.F90 index b9e8289823a..55874783c18 100644 --- a/infrastructure/esmf/comms/MAPL_Comms.F90 +++ b/infrastructure/esmf/comms/MAPL_Comms.F90 @@ -6,12 +6,12 @@ !INTERFACE: -module mapl_Comms +module mapl_Comms_mod use ESMF use MAPL_Constants, only: MAPL_UNDEFINED_REAL - use mapl_DistGridGet, only: DistGridGet - use MAPL_ErrorHandling + use mapl_DistGridGet_mod, only: DistGridGet + use mapl_ErrorHandling_mod use mpi implicit none @@ -1524,4 +1524,4 @@ end function num_pes_layout #define VARTYPE_ 3 #include "arraygatherRcvCnt.H" -end module mapl_Comms +end module mapl_Comms_mod diff --git a/infrastructure/esmf/hconfig/HConfigAs.F90 b/infrastructure/esmf/hconfig/HConfigAs.F90 index 3d531180711..5990f732cf7 100644 --- a/infrastructure/esmf/hconfig/HConfigAs.F90 +++ b/infrastructure/esmf/hconfig/HConfigAs.F90 @@ -1,8 +1,8 @@ #include "MAPL.h" -module mapl_HConfigAs +module mapl_HConfigAs_mod use gftl2_StringVector - use mapl_KeywordEnforcer - use mapl_ErrorHandling + use mapl_KeywordEnforcer_mod + use mapl_ErrorHandling_mod use esmf implicit none(type,external) @@ -388,4 +388,4 @@ function iter_as_stringvector(hconfig_iter, unusable, keystring, index, rc) resu _UNUSED_DUMMY(unusable) end function iter_as_stringvector -end module mapl_HConfigAs +end module mapl_HConfigAs_mod diff --git a/infrastructure/esmf/hconfig/HConfig_API.F90 b/infrastructure/esmf/hconfig/HConfig_API.F90 index 64c1c9f5db2..08b52fc8173 100644 --- a/infrastructure/esmf/hconfig/HConfig_API.F90 +++ b/infrastructure/esmf/hconfig/HConfig_API.F90 @@ -1,10 +1,10 @@ module mapl_HConfig_API - use mapl_HConfigAs, only: mapl_HConfigAsItemType => HConfigAsItemType - use mapl_HConfigAs, only: mapl_HConfigAsStateIntent => HConfigAsStateIntent - use mapl_HConfigAs, only: mapl_HConfigAsTime => HConfigAstime - use mapl_HConfigAs, only: mapl_HConfigAsTimeInterval => HConfigAsTimeInterval - use mapl_HConfigAs, only: mapl_HConfigAsTimeRange => HConfigAsTimeRange - use mapl_HConfigAs, only: mapl_HConfigAsStringVector => HConfigAsStringVector + use mapl_HConfigAs_mod, only: mapl_HConfigAsItemType => HConfigAsItemType + use mapl_HConfigAs_mod, only: mapl_HConfigAsStateIntent => HConfigAsStateIntent + use mapl_HConfigAs_mod, only: mapl_HConfigAsTime => HConfigAstime + use mapl_HConfigAs_mod, only: mapl_HConfigAsTimeInterval => HConfigAsTimeInterval + use mapl_HConfigAs_mod, only: mapl_HConfigAsTimeRange => HConfigAsTimeRange + use mapl_HConfigAs_mod, only: mapl_HConfigAsStringVector => HConfigAsStringVector implicit none(type,external) end module mapl_HConfig_API diff --git a/infrastructure/esmf/hconfig/tests/CMakeLists.txt b/infrastructure/esmf/hconfig/tests/CMakeLists.txt index 82cb466f52d..6f668caab30 100644 --- a/infrastructure/esmf/hconfig/tests/CMakeLists.txt +++ b/infrastructure/esmf/hconfig/tests/CMakeLists.txt @@ -8,7 +8,7 @@ add_pfunit_ctest(MAPL.hconfig.tests TEST_SOURCES ${TEST_SRCS} LINK_LIBRARIES MAPL.hconfig MAPL.shared MAPL.pfunit EXTRA_INITIALIZE Initialize - EXTRA_USE MAPL_pFUnit_Initialize + EXTRA_USE mapl_pFUnit_Initialize_mod MAX_PES 1 ) set_target_properties(MAPL.hconfig.tests PROPERTIES Fortran_MODULE_DIRECTORY ${MODULE_DIRECTORY}) diff --git a/infrastructure/esmf/hconfig/tests/Test_HConfigAs.pf b/infrastructure/esmf/hconfig/tests/Test_HConfigAs.pf index 00e0422c515..cd823ab555a 100644 --- a/infrastructure/esmf/hconfig/tests/Test_HConfigAs.pf +++ b/infrastructure/esmf/hconfig/tests/Test_HConfigAs.pf @@ -1,7 +1,7 @@ #include "MAPL_TestErr.h" module Test_HConfigAs - use mapl_HConfigAs + use mapl_HConfigAs_mod use esmf use gftl2_StringVector use pfunit diff --git a/infrastructure/esmf/hconfig_utils/HConfig3G.F90 b/infrastructure/esmf/hconfig_utils/HConfig3G.F90 index de404a760e2..38f33d3ca4b 100644 --- a/infrastructure/esmf/hconfig_utils/HConfig3G.F90 +++ b/infrastructure/esmf/hconfig_utils/HConfig3G.F90 @@ -1,3 +1,3 @@ module hconfig3g - use mapl_hconfig_get + use mapl_hconfig_get_mod end module hconfig3g diff --git a/infrastructure/esmf/hconfig_utils/HConfigUtilities.F90 b/infrastructure/esmf/hconfig_utils/HConfigUtilities.F90 index adcd27c396a..d91304d2276 100644 --- a/infrastructure/esmf/hconfig_utils/HConfigUtilities.F90 +++ b/infrastructure/esmf/hconfig_utils/HConfigUtilities.F90 @@ -1,13 +1,13 @@ #include "MAPL.h" -module mapl_HConfigUtilities +module mapl_HConfigUtilities_mod use esmf, only: ESMF_HConfig, ESMF_HConfigIter, ESMF_HConfigIterBegin use esmf, only: ESMF_HConfigIterEnd, ESMF_HConfigIterLoop use esmf, only: ESMF_HConfigCreate, ESMF_HConfigIsMap, ESMF_HConfigAsStringMapKey use esmf, only: ESMF_HConfigIsDefined, ESMF_HConfigCreateAtMapVal, ESMF_HConfigAdd use esmf, only: ESMF_HConfigLog - use mapl_ErrorHandling + use mapl_ErrorHandling_mod implicit none(type,external) private @@ -62,5 +62,5 @@ function merge_hconfig(parent_hconfig, child_hconfig, rc) result(total_hconfig) _RETURN(_SUCCESS) end function merge_hconfig -end module mapl_HConfigUtilities +end module mapl_HConfigUtilities_mod diff --git a/infrastructure/esmf/hconfig_utils/generalized_equality.F90 b/infrastructure/esmf/hconfig_utils/generalized_equality.F90 index 7b6c3840e89..aab9e54a1a4 100644 --- a/infrastructure/esmf/hconfig_utils/generalized_equality.F90 +++ b/infrastructure/esmf/hconfig_utils/generalized_equality.F90 @@ -1,4 +1,4 @@ -module mapl_generalized_equality +module mapl_generalized_equality_mod use :: esmf, only: ESMF_KIND_R4, ESMF_KIND_R8, ESMF_KIND_I4, ESMF_KIND_I8 implicit none @@ -105,4 +105,4 @@ logical function equals_l_array(u, v) result(lval) end function equals_l_array -end module mapl_generalized_equality +end module mapl_generalized_equality_mod diff --git a/infrastructure/esmf/hconfig_utils/get_hconfig.F90 b/infrastructure/esmf/hconfig_utils/get_hconfig.F90 index 6e7db88fddf..9592a82ed9f 100644 --- a/infrastructure/esmf/hconfig_utils/get_hconfig.F90 +++ b/infrastructure/esmf/hconfig_utils/get_hconfig.F90 @@ -1,7 +1,7 @@ #include "MAPL.h" -module mapl_get_hconfig +module mapl_get_hconfig_mod - use mapl_hconfig_params + use mapl_hconfig_params_mod use :: esmf, only: ESMF_KIND_R4, ESMF_KIND_R8, ESMF_KIND_I4, ESMF_KIND_I8 use :: esmf, only: ESMF_HConfig, ESMF_HConfigAsString use :: esmf, only: ESMF_HConfigAsLogical, ESMF_HConfigAsLogicalSeq @@ -9,7 +9,7 @@ module mapl_get_hconfig use :: esmf, only: ESMF_HConfigAsR4, ESMF_HConfigAsR4Seq use :: esmf, only: ESMF_HConfigAsI8, ESMF_HConfigAsI8Seq use :: esmf, only: ESMF_HConfigAsR8, ESMF_HConfigAsR8Seq - use mapl_ErrorHandling + use mapl_ErrorHandling_mod implicit none private @@ -153,4 +153,4 @@ subroutine get_hconfig_as_logical_seq(value, params, rc) end subroutine get_hconfig_as_logical_seq -end module mapl_get_hconfig +end module mapl_get_hconfig_mod diff --git a/infrastructure/esmf/hconfig_utils/hconfig_get.F90 b/infrastructure/esmf/hconfig_utils/hconfig_get.F90 index 81832b49c27..60f5943ebb3 100644 --- a/infrastructure/esmf/hconfig_utils/hconfig_get.F90 +++ b/infrastructure/esmf/hconfig_utils/hconfig_get.F90 @@ -1,8 +1,8 @@ -module mapl_hconfig_get +module mapl_hconfig_get_mod - use mapl_hconfig_get_private, only: MAPL_HConfigGet - use mapl_hconfig_params, only: HConfigParams + use mapl_hconfig_get_private_mod, only: MAPL_HConfigGet + use mapl_hconfig_params_mod, only: HConfigParams implicit none public :: MAPL_HConfigGet -end module mapl_hconfig_get +end module mapl_hconfig_get_mod diff --git a/infrastructure/esmf/hconfig_utils/hconfig_get_private.F90 b/infrastructure/esmf/hconfig_utils/hconfig_get_private.F90 index b02f392e828..075d800caed 100644 --- a/infrastructure/esmf/hconfig_utils/hconfig_get_private.F90 +++ b/infrastructure/esmf/hconfig_utils/hconfig_get_private.F90 @@ -1,8 +1,8 @@ #include "MAPL.h" -module mapl_hconfig_get_private - use mapl_hconfig_params - use mapl_get_hconfig - use mapl_generalized_equality, only: are_equal +module mapl_hconfig_get_private_mod + use mapl_hconfig_params_mod + use mapl_get_hconfig_mod + use mapl_generalized_equality_mod, only: are_equal use :: esmf, only: ESMF_MAXSTR use :: esmf, only: ESMF_KIND_R4, ESMF_KIND_R8, ESMF_KIND_I4, ESMF_KIND_I8 use :: esmf, only: ESMF_HConfig, ESMF_HConfigIsDefined @@ -12,8 +12,8 @@ module mapl_hconfig_get_private use :: esmf, only: ESMF_HConfigAsI4Seq, ESMF_HConfigAsI8Seq use :: esmf, only: ESMF_HConfigAsR4Seq, ESMF_HConfigAsR8Seq use :: esmf, only: ESMF_HConfigAsLogicalSeq - use mapl_ErrorHandling - use mapl_KeywordEnforcerMod + use mapl_ErrorHandling_mod + use mapl_KeywordEnforcer_mod use pFlogger, only: logging, Logger implicit none @@ -265,4 +265,4 @@ end function make_fmt #include "mapl_hconfig_macros_undef.h" -end module mapl_hconfig_get_private +end module mapl_hconfig_get_private_mod diff --git a/infrastructure/esmf/hconfig_utils/hconfig_params.F90 b/infrastructure/esmf/hconfig_utils/hconfig_params.F90 index 30b0e045820..691006ff8ae 100644 --- a/infrastructure/esmf/hconfig_utils/hconfig_params.F90 +++ b/infrastructure/esmf/hconfig_utils/hconfig_params.F90 @@ -1,10 +1,10 @@ #include "MAPL.h" -module mapl_hconfig_params +module mapl_hconfig_params_mod use :: esmf, only: ESMF_HConfig use :: pflogger, only: logger_t => logger - use mapl_ErrorHandling + use mapl_ErrorHandling_mod implicit none private @@ -61,4 +61,4 @@ subroutine log_message(this, typestring, valuestring, rc) _RETURN(_SUCCESS) end subroutine log_message -end module mapl_hconfig_params +end module mapl_hconfig_params_mod diff --git a/infrastructure/esmf/hconfig_utils/tests/CMakeLists.txt b/infrastructure/esmf/hconfig_utils/tests/CMakeLists.txt index b68c52ee6d5..be78d323d04 100644 --- a/infrastructure/esmf/hconfig_utils/tests/CMakeLists.txt +++ b/infrastructure/esmf/hconfig_utils/tests/CMakeLists.txt @@ -10,7 +10,7 @@ add_pfunit_ctest(MAPL.hconfig_utils.tests TEST_SOURCES ${test_srcs} LINK_LIBRARIES MAPL.hconfig_utils MAPL.shared MAPL.pfunit EXTRA_INITIALIZE Initialize - EXTRA_USE MAPL_pFUnit_Initialize + EXTRA_USE mapl_pFUnit_Initialize_mod WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} MAX_PES 4 ) diff --git a/infrastructure/esmf/hconfig_utils/tests/Test_HConfigUtilities.pf b/infrastructure/esmf/hconfig_utils/tests/Test_HConfigUtilities.pf index 708144f622a..d2af9b03f1e 100644 --- a/infrastructure/esmf/hconfig_utils/tests/Test_HConfigUtilities.pf +++ b/infrastructure/esmf/hconfig_utils/tests/Test_HConfigUtilities.pf @@ -1,10 +1,10 @@ #include "MAPL_TestErr.h" module Test_HConfigUtilities - use mapl_HConfigUtilities + use mapl_HConfigUtilities_mod use esmf, only: ESMF_HConfig, ESMF_HConfigCreate, ESMF_HConfigDestroy use esmf, only: ESMF_HConfigAdd, ESMF_HConfigAsString use esmf, only: ESMF_HConfigIsDefined - use mapl_ErrorHandling + use mapl_ErrorHandling_mod use pfunit implicit none(type, external) diff --git a/infrastructure/esmf/hconfig_utils/tests/Test_hconfig_get_private.pf b/infrastructure/esmf/hconfig_utils/tests/Test_hconfig_get_private.pf index 7ec547f8656..81e22909016 100644 --- a/infrastructure/esmf/hconfig_utils/tests/Test_hconfig_get_private.pf +++ b/infrastructure/esmf/hconfig_utils/tests/Test_hconfig_get_private.pf @@ -1,9 +1,9 @@ #include "MAPL_TestErr.h" module Test_hconfig_get_private - use mapl_hconfig_get_private, DEFTAG => DEFAULT_TAG + use mapl_hconfig_get_private_mod, DEFTAG => DEFAULT_TAG use ESMF, R4 => ESMF_KIND_R4, R8 => ESMF_KIND_R8 use ESMF, I4 => ESMF_KIND_I4, I8 => ESMF_KIND_I8 - use mapl_ErrorHandling + use mapl_ErrorHandling_mod use pfunit use ESMF_TestMethod_mod diff --git a/infrastructure/esmf/tests/CMakeLists.txt b/infrastructure/esmf/tests/CMakeLists.txt index d5a9a874a92..c2bafed7539 100644 --- a/infrastructure/esmf/tests/CMakeLists.txt +++ b/infrastructure/esmf/tests/CMakeLists.txt @@ -11,7 +11,7 @@ add_pfunit_ctest(MAPL.esmf_utils.tests TEST_SOURCES ${test_srcs} LINK_LIBRARIES MAPL.esmf_utils MAPL.pfunit EXTRA_INITIALIZE Initialize - EXTRA_USE MAPL_pFUnit_Initialize + EXTRA_USE mapl_pFUnit_Initialize_mod WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} MAX_PES 8 ) diff --git a/infrastructure/esmf/tests/Test_Comms.pf b/infrastructure/esmf/tests/Test_Comms.pf index 50297f04799..a45e88f0e11 100644 --- a/infrastructure/esmf/tests/Test_Comms.pf +++ b/infrastructure/esmf/tests/Test_Comms.pf @@ -4,7 +4,7 @@ module Test_Comms use ESMF_TestCase_mod use ESMF_TestMethod_mod use ESMF - use mapl_Comms + use mapl_Comms_mod use, intrinsic :: iso_fortran_env, only: real64 implicit none diff --git a/infrastructure/esmf/tests/Test_ESMF_Time_Utilities.pf b/infrastructure/esmf/tests/Test_ESMF_Time_Utilities.pf index a00ec3e8eca..4e8e79ce40d 100644 --- a/infrastructure/esmf/tests/Test_ESMF_Time_Utilities.pf +++ b/infrastructure/esmf/tests/Test_ESMF_Time_Utilities.pf @@ -1,6 +1,6 @@ #include "MAPL_TestErr.h" module Test_ESMF_Time_Utilities - use mapl_ESMF_Time_Utilities + use mapl_ESMF_Time_Utilities_mod use esmf use funit implicit none diff --git a/infrastructure/esmf/tests/Test_InfoUtilities.pf b/infrastructure/esmf/tests/Test_InfoUtilities.pf index 650be0d6cd3..0842f88753c 100644 --- a/infrastructure/esmf/tests/Test_InfoUtilities.pf +++ b/infrastructure/esmf/tests/Test_InfoUtilities.pf @@ -1,8 +1,8 @@ #include "MAPL_TestErr.h" module Test_InfoUtilities - use mapl_ESMF_info_keys - use mapl_InfoUtilities + use mapl_ESMF_info_keys_mod + use mapl_InfoUtilities_mod use esmf use funit diff --git a/infrastructure/esmf/tests/Test_Ungridded.pf b/infrastructure/esmf/tests/Test_Ungridded.pf index 661b5e7bab3..8ae0e57abfa 100644 --- a/infrastructure/esmf/tests/Test_Ungridded.pf +++ b/infrastructure/esmf/tests/Test_Ungridded.pf @@ -1,8 +1,8 @@ #include "MAPL_TestErr.h" module Test_Ungridded - use mapl_UngriddedDim - use mapl_UngriddedDims + use mapl_UngriddedDim_mod + use mapl_UngriddedDims_mod use funit use esmf implicit none diff --git a/infrastructure/esmf/vm.F90 b/infrastructure/esmf/vm.F90 index 301f74c132c..7707f9ec7ca 100644 --- a/infrastructure/esmf/vm.F90 +++ b/infrastructure/esmf/vm.F90 @@ -1,8 +1,8 @@ #include "MAPL.h" -module mapl_vm +module mapl_vm_mod - use mapl_ErrorHandling + use mapl_ErrorHandling_mod use esmf, only: esmf_VM use esmf, only: esmf_VMGetCurrent use esmf, only: esmf_VMGet @@ -88,4 +88,4 @@ function current_vm(vm, rc) _RETURN(_SUCCESS) end function current_vm -end module mapl_vm +end module mapl_vm_mod diff --git a/infrastructure/field_dictionary/FieldDictionary.F90 b/infrastructure/field_dictionary/FieldDictionary.F90 index fd960dbb6d9..dd17e215b5f 100644 --- a/infrastructure/field_dictionary/FieldDictionary.F90 +++ b/infrastructure/field_dictionary/FieldDictionary.F90 @@ -12,16 +12,16 @@ ! Note that each short name must be unique such that it is unambiguous ! as to which entry a short name is referring. -module mapl_FieldDictionary +module mapl_FieldDictionary_mod use esmf - use mapl_ErrorHandling + use mapl_ErrorHandling_mod use pflogger, only: logging, logger_t => logger use gftl2_StringVector use gftl2_StringStringMap - use mapl_FieldDictionaryItem - use mapl_FieldDictionaryItemMap - use mapl_VerificationStatus + use mapl_FieldDictionaryItem_mod + use mapl_FieldDictionaryItemMap_mod + use mapl_VerificationStatus_mod implicit none(type,external) private @@ -347,4 +347,4 @@ function get_field_dictionary() result(ptr) ptr => the_field_dictionary end function get_field_dictionary -end module mapl_FieldDictionary +end module mapl_FieldDictionary_mod diff --git a/infrastructure/field_dictionary/FieldDictionaryConfig.F90 b/infrastructure/field_dictionary/FieldDictionaryConfig.F90 index 1e79d0a22f8..bee039749d0 100644 --- a/infrastructure/field_dictionary/FieldDictionaryConfig.F90 +++ b/infrastructure/field_dictionary/FieldDictionaryConfig.F90 @@ -10,12 +10,12 @@ ! as 'field_dictionary.yaml' in the run directory. Use has_dictionary_path() ! to distinguish a user-supplied explicit path from the default. -module mapl_FieldDictionaryConfig +module mapl_FieldDictionaryConfig_mod use esmf - use mapl_ErrorHandling - use mapl_ValidationMode - use mapl_StateItemImpl + use mapl_ErrorHandling_mod + use mapl_ValidationMode_mod + use mapl_StateItemImpl_mod implicit none(type, external) private @@ -115,4 +115,4 @@ pure logical function has_dictionary_path(this) has_dictionary_path = len(this%dictionary_path) > 0 end function has_dictionary_path -end module mapl_FieldDictionaryConfig +end module mapl_FieldDictionaryConfig_mod diff --git a/infrastructure/field_dictionary/FieldDictionaryItem.F90 b/infrastructure/field_dictionary/FieldDictionaryItem.F90 index bd2cd26a314..30528bd21fe 100644 --- a/infrastructure/field_dictionary/FieldDictionaryItem.F90 +++ b/infrastructure/field_dictionary/FieldDictionaryItem.F90 @@ -1,8 +1,8 @@ -module mapl_FieldDictionaryItem +module mapl_FieldDictionaryItem_mod use gftl2_StringVector use esmf - use mapl_VerificationStatus + use mapl_VerificationStatus_mod implicit none(type,external) private @@ -169,4 +169,4 @@ pure logical function is_conserved(this) is_conserved = this%conserved end function is_conserved -end module mapl_FieldDictionaryItem +end module mapl_FieldDictionaryItem_mod diff --git a/infrastructure/field_dictionary/FieldDictionaryItemMap.F90 b/infrastructure/field_dictionary/FieldDictionaryItemMap.F90 index 0add86f6c41..028648f7bc9 100644 --- a/infrastructure/field_dictionary/FieldDictionaryItemMap.F90 +++ b/infrastructure/field_dictionary/FieldDictionaryItemMap.F90 @@ -1,5 +1,5 @@ -module mapl_FieldDictionaryItemMap - use mapl_FieldDictionaryItem +module mapl_FieldDictionaryItemMap_mod + use mapl_FieldDictionaryItem_mod #define Key __CHARACTER_DEFERRED #define T FieldDictionaryItem @@ -15,4 +15,4 @@ module mapl_FieldDictionaryItemMap #undef T #undef Key -end module mapl_FieldDictionaryItemMap +end module mapl_FieldDictionaryItemMap_mod diff --git a/infrastructure/fields/field/API.F90 b/infrastructure/fields/field/API.F90 index 5ce3226de75..2533e5d96ec 100644 --- a/infrastructure/fields/field/API.F90 +++ b/infrastructure/fields/field/API.F90 @@ -1,14 +1,14 @@ module mapl_Field_API - use mapl_FieldGetImpl, only: MAPL_FieldGet => FieldGet - use mapl_FieldSetImpl, only: MAPL_FieldSet => FieldSet - use mapl_FieldFillImpl, only: MAPL_FieldFill => FieldFill - use mapl_FieldCreateImpl - use mapl_StateItemAllocation - use mapl_RestartModes - use mapl_FieldPointerUtilities, only: MAPL_AssignFptr => assign_fptr - use mapl_FieldPointerUtilities, only: MAPL_FieldClone => FieldClone + use mapl_FieldGetImpl_mod, only: MAPL_FieldGet => FieldGet + use mapl_FieldSetImpl_mod, only: MAPL_FieldSet => FieldSet + use mapl_FieldFillImpl_mod, only: MAPL_FieldFill => FieldFill + use mapl_FieldCreateImpl_mod + use mapl_StateItemAllocation_mod + use mapl_RestartModes_mod + use mapl_FieldPointerUtilities_mod, only: MAPL_AssignFptr => assign_fptr + use mapl_FieldPointerUtilities_mod, only: MAPL_FieldClone => FieldClone ! Internal info should not be exposed to users - use mapl_FieldInfo + use mapl_FieldInfo_mod public :: MAPL_FieldClone diff --git a/infrastructure/fields/field/FieldBLAS.F90 b/infrastructure/fields/field/FieldBLAS.F90 index cbd16074672..341d1942356 100644 --- a/infrastructure/fields/field/FieldBLAS.F90 +++ b/infrastructure/fields/field/FieldBLAS.F90 @@ -1,12 +1,12 @@ #include "MAPL.h" -module mapl_FieldBLAS +module mapl_FieldBLAS_mod use ESMF - use mapl_Constants, only: MAPL_UNDEFINED_REAL32, MAPL_UNDEFINED_REAL64 - use MAPL_ExceptionHandling - use mapl_FieldCondensedArray - use MAPL_FieldPointerUtilities + use MAPL_Constants, only: MAPL_UNDEFINED_REAL32, MAPL_UNDEFINED_REAL64 + use mapl_ExceptionHandling_mod + use mapl_FieldCondensedArray_mod + use mapl_FieldPointerUtilities_mod implicit none private @@ -467,4 +467,4 @@ subroutine convert_prec_R8_to_R4(original, converted, rc) _RETURN(_SUCCESS) end subroutine convert_prec_R8_to_R4 -end module mapl_FieldBLAS +end module mapl_FieldBLAS_mod diff --git a/infrastructure/fields/field/FieldBinaryOperations.F90 b/infrastructure/fields/field/FieldBinaryOperations.F90 index dc256c715bf..bdae51d47d6 100644 --- a/infrastructure/fields/field/FieldBinaryOperations.F90 +++ b/infrastructure/fields/field/FieldBinaryOperations.F90 @@ -1,9 +1,9 @@ #include "MAPL.h" -module MAPL_FieldBinaryOperations +module mapl_FieldBinaryOperations_mod use ESMF - use MAPL_ExceptionHandling - use MAPL_FieldPointerUtilities + use mapl_ExceptionHandling_mod + use mapl_FieldPointerUtilities_mod implicit none private @@ -45,4 +45,4 @@ module MAPL_FieldBinaryOperations #undef _OP #undef _FUNC -end module MAPL_FieldBinaryOperations +end module mapl_FieldBinaryOperations_mod diff --git a/infrastructure/fields/field/FieldCondensedArray.F90 b/infrastructure/fields/field/FieldCondensedArray.F90 index 99eaa778573..f4646ea06f6 100644 --- a/infrastructure/fields/field/FieldCondensedArray.F90 +++ b/infrastructure/fields/field/FieldCondensedArray.F90 @@ -1,10 +1,10 @@ #include "MAPL.h" -module mapl_FieldCondensedArray - use mapl_FieldCondensedArray_private, only: ARRAY_RANK, get_fptr_shape_private - use mapl_FieldPointerUtilities, only: FieldGetLocalElementCount, assign_fptr - use mapl_VerticalStaggerLoc - use mapl_ExceptionHandling - use mapl_FieldGetImpl +module mapl_FieldCondensedArray_mod + use mapl_FieldCondensedArray_private_mod, only: ARRAY_RANK, get_fptr_shape_private + use mapl_FieldPointerUtilities_mod, only: FieldGetLocalElementCount, assign_fptr + use mapl_VerticalStaggerLoc_mod + use mapl_ExceptionHandling_mod + use mapl_FieldGetImpl_mod use ESMF, only: ESMF_Field, ESMF_FieldGet use ESMF, only: ESMF_KIND_R4, ESMF_KIND_R8, ESMF_KIND_I8 use, intrinsic :: iso_c_binding, only: c_ptr, c_f_pointer @@ -74,4 +74,4 @@ function get_fptr_shape(f, rc) result(fptr_shape) _RETURN(_SUCCESS) end function get_fptr_shape -end module mapl_FieldCondensedArray +end module mapl_FieldCondensedArray_mod diff --git a/infrastructure/fields/field/FieldCondensedArray_private.F90 b/infrastructure/fields/field/FieldCondensedArray_private.F90 index e5b8d8e530c..6f0a3d09acc 100644 --- a/infrastructure/fields/field/FieldCondensedArray_private.F90 +++ b/infrastructure/fields/field/FieldCondensedArray_private.F90 @@ -1,7 +1,7 @@ #include "MAPL.h" -module mapl_FieldCondensedArray_private +module mapl_FieldCondensedArray_private_mod - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod implicit none private @@ -41,4 +41,4 @@ function get_fptr_shape_private(gridToFieldMap, localElementCount, has_vertical, end function get_fptr_shape_private -end module mapl_FieldCondensedArray_private +end module mapl_FieldCondensedArray_private_mod diff --git a/infrastructure/fields/field/FieldCreate.F90 b/infrastructure/fields/field/FieldCreate.F90 index 54101ffb888..7f843ecb986 100644 --- a/infrastructure/fields/field/FieldCreate.F90 +++ b/infrastructure/fields/field/FieldCreate.F90 @@ -1,23 +1,23 @@ #include "MAPL.h" -module mapl_FieldCreateImpl - - use mapl_VerticalGrid_API - use mapl_VerticalStaggerLoc - use mapl_VerticalAlignment - use mapl_FieldInfo - use mapl_FieldSetImpl - use mapl_FieldGetImpl - use mapl_UngriddedDims - use mapl_HorizontalDimsSpec - use mapl_StateItemAllocation - use mapl_LU_Bound - use mapl_FieldFillImpl, only: FieldFill - use mapl_KeywordEnforcer - use mapl_ErrorHandling - use mapl_InternalConstants, only: MAPL_UNDEFINED_REAL +module mapl_FieldCreateImpl_mod + + use mapl_VerticalGrid_API_mod + use mapl_VerticalStaggerLoc_mod + use mapl_VerticalAlignment_mod + use mapl_FieldInfo_mod + use mapl_FieldSetImpl_mod + use mapl_FieldGetImpl_mod + use mapl_UngriddedDims_mod + use mapl_HorizontalDimsSpec_mod + use mapl_StateItemAllocation_mod + use mapl_LU_Bound_mod + use mapl_FieldFillImpl_mod, only: FieldFill + use mapl_KeywordEnforcer_mod + use mapl_ErrorHandling_mod + use mapl_InternalConstants_mod, only: MAPL_UNDEFINED_REAL use esmf, MAPL_FieldEmptyCreate => ESMF_FieldEmptyCreate - use mapl_BasicVerticalGrid, only: BasicVerticalGrid, BasicVerticalGridSpec + use mapl_BasicVerticalGrid_mod, only: BasicVerticalGrid, BasicVerticalGridSpec implicit none(type,external) private @@ -366,4 +366,4 @@ logical function fields_are_aliased(field1, field2, rc) result(are_aliased) _RETURN(_SUCCESS) end function fields_are_aliased -end module mapl_FieldCreateImpl +end module mapl_FieldCreateImpl_mod diff --git a/infrastructure/fields/field/FieldDelta.F90 b/infrastructure/fields/field/FieldDelta.F90 index 348a9bf1ce5..c45b6519bf0 100644 --- a/infrastructure/fields/field/FieldDelta.F90 +++ b/infrastructure/fields/field/FieldDelta.F90 @@ -4,16 +4,16 @@ #include "MAPL.h" -module mapl_FieldDelta - - use mapl_FieldInfo - use mapl_FieldGetImpl - use mapl_VerticalStaggerLoc - use mapl_InfoUtilities - use mapl_FieldFillImpl, only: FieldFill - use mapl_FieldPointerUtilities - use mapl_ErrorHandling - use mapl_KeywordEnforcer +module mapl_FieldDelta_mod + + use mapl_FieldInfo_mod + use mapl_FieldGetImpl_mod + use mapl_VerticalStaggerLoc_mod + use mapl_InfoUtilities_mod + use mapl_FieldFillImpl_mod, only: FieldFill + use mapl_FieldPointerUtilities_mod + use mapl_ErrorHandling_mod + use mapl_KeywordEnforcer_mod use esmf implicit none(type,external) private @@ -382,4 +382,4 @@ subroutine MAPL_EmptyField(field, rc) _RETURN(_SUCCESS) end subroutine MAPL_EmptyField -end module mapl_FieldDelta +end module mapl_FieldDelta_mod diff --git a/infrastructure/fields/field/FieldFill.F90 b/infrastructure/fields/field/FieldFill.F90 index 4d80c98d852..0aab322699d 100644 --- a/infrastructure/fields/field/FieldFill.F90 +++ b/infrastructure/fields/field/FieldFill.F90 @@ -1,9 +1,9 @@ #include "MAPL.h" -module mapl_FieldFillImpl - use mapl_FieldFillDefault - use mapl_FieldPointerUtilities, only: assign_fptr - use mapl_ErrorHandling +module mapl_FieldFillImpl_mod + use mapl_FieldFillDefault_mod + use mapl_FieldPointerUtilities_mod, only: assign_fptr + use mapl_ErrorHandling_mod use esmf implicit none(type,external) private @@ -53,4 +53,4 @@ subroutine field_fill(field, rc) _RETURN(_SUCCESS) end subroutine field_fill -end module mapl_FieldFillImpl +end module mapl_FieldFillImpl_mod diff --git a/infrastructure/fields/field/FieldFillDefault.F90 b/infrastructure/fields/field/FieldFillDefault.F90 index fe29739f3c0..b24135999fb 100644 --- a/infrastructure/fields/field/FieldFillDefault.F90 +++ b/infrastructure/fields/field/FieldFillDefault.F90 @@ -1,4 +1,4 @@ -module mapl_FieldFillDefault +module mapl_FieldFillDefault_mod use iso_fortran_env, only: REAL32, REAL64 implicit none(type, external) private @@ -60,4 +60,4 @@ subroutine reset_field_fill_defaults() call initialize_field_fill_defaults() end subroutine reset_field_fill_defaults -end module mapl_FieldFillDefault +end module mapl_FieldFillDefault_mod diff --git a/infrastructure/fields/field/FieldGet.F90 b/infrastructure/fields/field/FieldGet.F90 index 5a534f3eeaf..394dff8dbe2 100644 --- a/infrastructure/fields/field/FieldGet.F90 +++ b/infrastructure/fields/field/FieldGet.F90 @@ -1,19 +1,19 @@ #include "MAPL.h" -module mapl_FieldGetImpl +module mapl_FieldGetImpl_mod - use mapl_VerticalGrid_API - use mapl_VerticalAlignment - use mapl_FieldInfo - use mapl_StateItemAllocation - use mapl_QuantityTypeMetadata - use mapl_NormalizationMetadata - use mapl_ConservationMetadata - use mapl_KeywordEnforcer - use mapl_ErrorHandling - use mapl_UngriddedDims - use mapl_VerticalGridManager - use mapl_HorizontalDimsSpec, only: HorizontalDimsSpec + use mapl_VerticalGrid_API_mod + use mapl_VerticalAlignment_mod + use mapl_FieldInfo_mod + use mapl_StateItemAllocation_mod + use mapl_QuantityTypeMetadata_mod + use mapl_NormalizationMetadata_mod + use mapl_ConservationMetadata_mod + use mapl_KeywordEnforcer_mod + use mapl_ErrorHandling_mod + use mapl_UngriddedDims_mod + use mapl_VerticalGridManager_mod + use mapl_HorizontalDimsSpec_mod, only: HorizontalDimsSpec use esmf implicit none (type,external) @@ -120,4 +120,4 @@ subroutine field_get(field, unusable, & _UNUSED_DUMMY(unusable) end subroutine field_get -end module mapl_FieldGetImpl +end module mapl_FieldGetImpl_mod diff --git a/infrastructure/fields/field/FieldInfo.F90 b/infrastructure/fields/field/FieldInfo.F90 index 53e2b8092fb..a6eaa904081 100644 --- a/infrastructure/fields/field/FieldInfo.F90 +++ b/infrastructure/fields/field/FieldInfo.F90 @@ -1,24 +1,24 @@ #include "MAPL.h" -module mapl_FieldInfo - - use mapl_ESMF_Utilities, only: MAPL_TYPEKIND_MIRROR - use mapl_esmf_info_keys, only: INFO_SHARED_NAMESPACE - use mapl_esmf_info_keys, only: INFO_INTERNAL_NAMESPACE - use mapl_esmf_info_keys, only: INFO_PRIVATE_NAMESPACE - use mapl_InfoUtilities - use mapl_VerticalGrid_API - use mapl_UngriddedDims - use mapl_QuantityTypeMetadata - use mapl_NormalizationMetadata - use mapl_ConservationMetadata - use mapl_VerticalStaggerLoc - use mapl_VerticalAlignment - use mapl_StateItemAllocation - use mapl_RestartModes, only: RestartMode, MAPL_RESTART_REQUIRED - use mapl_HorizontalDimsSpec, only: HorizontalDimsSpec, HORIZONTAL_DIMS_UNKNOWN, to_HorizontalDimsSpec - use mapl_KeywordEnforcer - use mapl_ErrorHandling +module mapl_FieldInfo_mod + + use mapl_ESMF_Utilities_mod, only: MAPL_TYPEKIND_MIRROR + use mapl_esmf_info_keys_mod, only: INFO_SHARED_NAMESPACE + use mapl_esmf_info_keys_mod, only: INFO_INTERNAL_NAMESPACE + use mapl_esmf_info_keys_mod, only: INFO_PRIVATE_NAMESPACE + use mapl_InfoUtilities_mod + use mapl_VerticalGrid_API_mod + use mapl_UngriddedDims_mod + use mapl_QuantityTypeMetadata_mod + use mapl_NormalizationMetadata_mod + use mapl_ConservationMetadata_mod + use mapl_VerticalStaggerLoc_mod + use mapl_VerticalAlignment_mod + use mapl_StateItemAllocation_mod + use mapl_RestartModes_mod, only: RestartMode, MAPL_RESTART_REQUIRED + use mapl_HorizontalDimsSpec_mod, only: HorizontalDimsSpec, HORIZONTAL_DIMS_UNKNOWN, to_HorizontalDimsSpec + use mapl_KeywordEnforcer_mod + use mapl_ErrorHandling_mod use esmf use gftl2_StringVector @@ -593,4 +593,4 @@ subroutine derive_num_levels_from_vgrid(info, namespace, num_levels, num_layers, _RETURN(_SUCCESS) end subroutine derive_num_levels_from_vgrid -end module mapl_FieldInfo +end module mapl_FieldInfo_mod diff --git a/infrastructure/fields/field/FieldSet.F90 b/infrastructure/fields/field/FieldSet.F90 index 8a3a486023b..d6e2a32b57a 100644 --- a/infrastructure/fields/field/FieldSet.F90 +++ b/infrastructure/fields/field/FieldSet.F90 @@ -1,22 +1,22 @@ #include "MAPL.h" -module mapl_FieldSetImpl +module mapl_FieldSetImpl_mod - use mapl_VerticalGrid_API - use mapl_VerticalStaggerLoc - use mapl_VerticalAlignment - use mapl_FieldInfo - use mapl_FieldGetImpl - use mapl_FieldDelta - use mapl_StateItemAllocation - use mapl_QuantityTypeMetadata - use mapl_NormalizationMetadata - use mapl_ConservationMetadata - use mapl_KeywordEnforcer - use mapl_ErrorHandling - use mapl_FieldPointerUtilities, only: FieldGetLocalElementCount - use mapl_UngriddedDims - use mapl_HorizontalDimsSpec, only: HorizontalDimsSpec + use mapl_VerticalGrid_API_mod + use mapl_VerticalStaggerLoc_mod + use mapl_VerticalAlignment_mod + use mapl_FieldInfo_mod + use mapl_FieldGetImpl_mod + use mapl_FieldDelta_mod + use mapl_StateItemAllocation_mod + use mapl_QuantityTypeMetadata_mod + use mapl_NormalizationMetadata_mod + use mapl_ConservationMetadata_mod + use mapl_KeywordEnforcer_mod + use mapl_ErrorHandling_mod + use mapl_FieldPointerUtilities_mod, only: FieldGetLocalElementCount + use mapl_UngriddedDims_mod + use mapl_HorizontalDimsSpec_mod, only: HorizontalDimsSpec use esmf use gftl2_StringVector @@ -148,4 +148,4 @@ subroutine field_set(field, & _UNUSED_DUMMY(attributes) end subroutine field_set -end module mapl_FieldSetImpl +end module mapl_FieldSetImpl_mod diff --git a/infrastructure/fields/field/FieldUnaryFunctions.F90 b/infrastructure/fields/field/FieldUnaryFunctions.F90 index 8a345b098db..1b9d83aa8b9 100644 --- a/infrastructure/fields/field/FieldUnaryFunctions.F90 +++ b/infrastructure/fields/field/FieldUnaryFunctions.F90 @@ -1,9 +1,9 @@ #include "MAPL.h" -module MAPL_FieldUnaryFunctions +module mapl_FieldUnaryFunctions_mod use ESMF - use MAPL_ExceptionHandling - use MAPL_FieldPointerUtilities + use mapl_ExceptionHandling_mod + use mapl_FieldPointerUtilities_mod implicit none private @@ -80,5 +80,5 @@ module MAPL_FieldUnaryFunctions #include "FieldUnaryFunctionTemplate.H" #undef _FUNC -end module MAPL_FieldUnaryFunctions +end module mapl_FieldUnaryFunctions_mod diff --git a/infrastructure/fields/field/FieldUnits.F90 b/infrastructure/fields/field/FieldUnits.F90 index 3e97eff5e3e..1804c6b4efc 100644 --- a/infrastructure/fields/field/FieldUnits.F90 +++ b/infrastructure/fields/field/FieldUnits.F90 @@ -26,11 +26,11 @@ ! and conv % convert cannot be called before calling GetFieldUnitsConverter for conv. #include "MAPL.h" #include "unused_dummy.H" -module mapl_FieldUnits +module mapl_FieldUnits_mod use udunits2f, FieldUnitsConverter => Converter, & initialize_udunits => initialize, finalize_udunits => finalize - use mapl_KeywordEnforcer, only: KeywordEnforcer - use mapl_ErrorHandlingMod + use mapl_KeywordEnforcer_mod, only: KeywordEnforcer + use mapl_ErrorHandling_mod use ESMF implicit none @@ -81,4 +81,4 @@ subroutine FinalizeFieldUnits() end subroutine FinalizeFieldUnits - end module mapl_FieldUnits + end module mapl_FieldUnits_mod diff --git a/infrastructure/fields/field/FieldUtilities.F90 b/infrastructure/fields/field/FieldUtilities.F90 index 45738a53ce8..68587e4bec6 100644 --- a/infrastructure/fields/field/FieldUtilities.F90 +++ b/infrastructure/fields/field/FieldUtilities.F90 @@ -1,13 +1,13 @@ #include "MAPL.h" -module MAPL_FieldUtilities - use mapl_FieldInfo - use MAPL_ErrorHandlingMod - use MAPL_FieldPointerUtilities - use mapl_InfoUtilities - use mapl_UngriddedDims - use mapl_LU_Bound - use mapl_KeywordEnforcer +module mapl_FieldUtilities_mod + use mapl_FieldInfo_mod + use mapl_ErrorHandling_mod + use mapl_FieldPointerUtilities_mod + use mapl_InfoUtilities_mod + use mapl_UngriddedDims_mod + use mapl_LU_Bound_mod + use mapl_KeywordEnforcer_mod use esmf implicit none (type, external) @@ -258,4 +258,4 @@ subroutine destroy_fields(fields, rc) _RETURN(_SUCCESS) end subroutine destroy_fields -end module MAPL_FieldUtilities +end module mapl_FieldUtilities_mod diff --git a/infrastructure/fields/field/FieldUtils.F90 b/infrastructure/fields/field/FieldUtils.F90 index 8f0cc81a656..6e2f90d9f87 100644 --- a/infrastructure/fields/field/FieldUtils.F90 +++ b/infrastructure/fields/field/FieldUtils.F90 @@ -1,7 +1,7 @@ -module MAPL_FieldUtils - use MAPL_FieldUnaryFunctions - use MAPL_FieldBinaryOperations - use MAPL_FieldUtilities - use MAPL_FieldPointerUtilities - use mapl_FieldBlas -end module MAPL_FieldUtils +module mapl_FieldUtils + use mapl_FieldUnaryFunctions_mod + use mapl_FieldBinaryOperations_mod + use mapl_FieldUtilities_mod + use mapl_FieldPointerUtilities_mod + use mapl_FieldBLAS_mod +end module mapl_FieldUtils diff --git a/infrastructure/fields/field/RestartModes.F90 b/infrastructure/fields/field/RestartModes.F90 index b39a450b900..60b106a199d 100644 --- a/infrastructure/fields/field/RestartModes.F90 +++ b/infrastructure/fields/field/RestartModes.F90 @@ -1,4 +1,4 @@ -module mapl_RestartModes +module mapl_RestartModes_mod implicit none(type, external) private @@ -56,4 +56,4 @@ logical function not_equal(a, b) not_equal = .not. (a == b) end function not_equal -end module mapl_RestartModes +end module mapl_RestartModes_mod diff --git a/infrastructure/fields/field/StateItemAllocation.F90 b/infrastructure/fields/field/StateItemAllocation.F90 index 593ba2239e0..c51570b00b3 100644 --- a/infrastructure/fields/field/StateItemAllocation.F90 +++ b/infrastructure/fields/field/StateItemAllocation.F90 @@ -1,4 +1,4 @@ -module mapl_StateItemAllocation +module mapl_StateItemAllocation_mod implicit none(type, external) private @@ -124,4 +124,4 @@ elemental logical function greater_than_or_equal(a, b) greater_than_or_equal = .not. (a%id < b%id) end function greater_than_or_equal -end module mapl_StateItemAllocation +end module mapl_StateItemAllocation_mod diff --git a/infrastructure/fields/field/tests/CMakeLists.txt b/infrastructure/fields/field/tests/CMakeLists.txt index 6f5fe48e314..acb78ccba61 100644 --- a/infrastructure/fields/field/tests/CMakeLists.txt +++ b/infrastructure/fields/field/tests/CMakeLists.txt @@ -4,7 +4,7 @@ add_pfunit_ctest(MAPL.field.test_fieldcreate TEST_SOURCES Test_FieldCreate.pf Test_FieldFill.pf LINK_LIBRARIES MAPL.field MAPL.pfunit EXTRA_INITIALIZE Initialize - EXTRA_USE MAPL_pFUnit_Initialize + EXTRA_USE mapl_pFUnit_Initialize_mod MAX_PES 1 ) set_target_properties(MAPL.field.test_fieldcreate PROPERTIES Fortran_MODULE_DIRECTORY "${MODULE_DIRECTORY}/create") @@ -15,7 +15,7 @@ add_pfunit_ctest(MAPL.field.test_utils Test_FieldDelta.pf Test_FieldInfo.pf Test_FieldUtilities.pf LINK_LIBRARIES MAPL.field MAPL.pfunit EXTRA_INITIALIZE Initialize - EXTRA_USE MAPL_pFUnit_Initialize + EXTRA_USE mapl_pFUnit_Initialize_mod OTHER_SOURCES field_utils_setup.F90 MAX_PES 4 ) diff --git a/infrastructure/fields/field/tests/Test_FieldArithmetic.pf b/infrastructure/fields/field/tests/Test_FieldArithmetic.pf index 9df2a6aeb51..9baddc9af08 100644 --- a/infrastructure/fields/field/tests/Test_FieldArithmetic.pf +++ b/infrastructure/fields/field/tests/Test_FieldArithmetic.pf @@ -3,13 +3,13 @@ module Test_FieldArithmetic use field_utils_setup - use MAPL_FieldUnaryFunctions - use MAPL_FieldBinaryOperations - use MAPL_FieldUtilities - use MAPL_FieldPointerUtilities + use mapl_FieldUnaryFunctions_mod + use mapl_FieldBinaryOperations_mod + use mapl_FieldUtilities_mod + use mapl_FieldPointerUtilities_mod use ESMF use pfunit - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod implicit none diff --git a/infrastructure/fields/field/tests/Test_FieldBLAS.pf b/infrastructure/fields/field/tests/Test_FieldBLAS.pf index dcebeb76369..a9c8fc6e14e 100644 --- a/infrastructure/fields/field/tests/Test_FieldBLAS.pf +++ b/infrastructure/fields/field/tests/Test_FieldBLAS.pf @@ -1,15 +1,15 @@ #include "MAPL.h" module Test_FieldBLAS - use mapl_FieldCreateImpl - use mapl_VerticalStaggerLoc - use mapl_VerticalGrid_API - use mapl_FieldBLAS + use mapl_FieldCreateImpl_mod + use mapl_VerticalStaggerLoc_mod + use mapl_VerticalGrid_API_mod + use mapl_FieldBLAS_mod use field_utils_setup - use MAPL_FieldPointerUtilities + use mapl_FieldPointerUtilities_mod use ESMF use pfunit - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod use, intrinsic :: iso_c_binding, only: c_ptr implicit none diff --git a/infrastructure/fields/field/tests/Test_FieldCondensedArray_private.pf b/infrastructure/fields/field/tests/Test_FieldCondensedArray_private.pf index 4359d1f0da1..f4bc30cc82c 100644 --- a/infrastructure/fields/field/tests/Test_FieldCondensedArray_private.pf +++ b/infrastructure/fields/field/tests/Test_FieldCondensedArray_private.pf @@ -1,9 +1,9 @@ #include "MAPL_TestErr.h" module Test_FieldCondensedArray_private - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod use pfunit - use mapl_FieldCondensedArray_private + use mapl_FieldCondensedArray_private_mod implicit none character, parameter :: GENERIC_MESSAGE = 'actual does not match expected.' diff --git a/infrastructure/fields/field/tests/Test_FieldCreate.pf b/infrastructure/fields/field/tests/Test_FieldCreate.pf index 9d4e545ef1f..681691a3649 100644 --- a/infrastructure/fields/field/tests/Test_FieldCreate.pf +++ b/infrastructure/fields/field/tests/Test_FieldCreate.pf @@ -4,12 +4,12 @@ module Test_FieldCreate use mapl_Field_API, only: MAPL_FieldCreate, MAPL_FieldEmptyComplete, MAPL_FieldGet use mapl_Field_API, only: MAPL_FieldsAreAliased - use mapl_FieldInfo - use mapl_VerticalStaggerLoc, only: VERTICAL_STAGGER_EDGE, VERTICAL_STAGGER_CENTER - use mapl_FieldCondensedArray, only: assign_fptr_condensed_array - use mapl_VerticalGrid_API - use mapl_FixedLevelsVerticalGrid - use mapl_FieldSetImpl, only: FieldSet + use mapl_FieldInfo_mod + use mapl_VerticalStaggerLoc_mod, only: VERTICAL_STAGGER_EDGE, VERTICAL_STAGGER_CENTER + use mapl_FieldCondensedArray_mod, only: assign_fptr_condensed_array + use mapl_VerticalGrid_API_mod + use mapl_FixedLevelsVerticalGrid_mod + use mapl_FieldSetImpl_mod, only: FieldSet use funit use ESMF_TestMethod_mod use esmf diff --git a/infrastructure/fields/field/tests/Test_FieldDelta.pf b/infrastructure/fields/field/tests/Test_FieldDelta.pf index ff991bc7ce0..9a8f6177c94 100644 --- a/infrastructure/fields/field/tests/Test_FieldDelta.pf +++ b/infrastructure/fields/field/tests/Test_FieldDelta.pf @@ -1,14 +1,14 @@ #include "MAPL_TestErr.h" #include "unused_dummy.H" module Test_FieldDelta - use mapl_FieldDelta + use mapl_FieldDelta_mod use mapl_Field_API - use mapl_UngriddedDims - use mapl_UngriddedDim - use mapl_InfoUtilities - use mapl_VerticalStaggerLoc - use mapl_VerticalGrid_API - use mapl_FieldInfo + use mapl_UngriddedDims_mod + use mapl_UngriddedDim_mod + use mapl_InfoUtilities_mod + use mapl_VerticalStaggerLoc_mod + use mapl_VerticalGrid_API_mod + use mapl_FieldInfo_mod use esmf use ESMF_TestMethod_mod use funit diff --git a/infrastructure/fields/field/tests/Test_FieldFill.pf b/infrastructure/fields/field/tests/Test_FieldFill.pf index 559d484b416..2f83ef30fe4 100644 --- a/infrastructure/fields/field/tests/Test_FieldFill.pf +++ b/infrastructure/fields/field/tests/Test_FieldFill.pf @@ -2,9 +2,9 @@ #include "unused_dummy.H" module Test_FieldFill - use mapl_FieldFillDefault - use mapl_FieldCreateImpl, only: MAPL_FieldEmptyComplete - use mapl_FieldPointerUtilities, only: assign_fptr + use mapl_FieldFillDefault_mod + use mapl_FieldCreateImpl_mod, only: MAPL_FieldEmptyComplete + use mapl_FieldPointerUtilities_mod, only: assign_fptr use funit use ESMF_TestMethod_mod use esmf diff --git a/infrastructure/fields/field/tests/Test_FieldInfo.pf b/infrastructure/fields/field/tests/Test_FieldInfo.pf index 7701f7acc8f..a4a83176b91 100644 --- a/infrastructure/fields/field/tests/Test_FieldInfo.pf +++ b/infrastructure/fields/field/tests/Test_FieldInfo.pf @@ -2,7 +2,7 @@ module Test_FieldInfo use pfunit - use mapl_FieldInfo + use mapl_FieldInfo_mod use esmf implicit none(type,external) diff --git a/infrastructure/fields/field/tests/Test_FieldUtilities.pf b/infrastructure/fields/field/tests/Test_FieldUtilities.pf index 9e383c26677..53c35ee0e3b 100644 --- a/infrastructure/fields/field/tests/Test_FieldUtilities.pf +++ b/infrastructure/fields/field/tests/Test_FieldUtilities.pf @@ -2,7 +2,7 @@ #include "unused_dummy.H" module Test_FieldUtilities - use MAPL_FieldUtilities, only: FieldsDestroy + use mapl_FieldUtilities_mod, only: FieldsDestroy use pfunit use ESMF_TestMethod_mod use esmf diff --git a/infrastructure/fields/field/tests/field_utils_setup.F90 b/infrastructure/fields/field/tests/field_utils_setup.F90 index 24b98e952d7..bb5df282358 100644 --- a/infrastructure/fields/field/tests/field_utils_setup.F90 +++ b/infrastructure/fields/field/tests/field_utils_setup.F90 @@ -4,7 +4,7 @@ module field_utils_setup use ESMF use funit - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod implicit none diff --git a/infrastructure/fields/field_bundle/API.F90 b/infrastructure/fields/field_bundle/API.F90 index e6963366f89..d531ad3ce5a 100644 --- a/infrastructure/fields/field_bundle/API.F90 +++ b/infrastructure/fields/field_bundle/API.F90 @@ -1,19 +1,19 @@ -module mapl_FieldBundle_API +module mapl_FieldBundle_API_mod use ESMF, only: MAPL_FieldBundleAdd => ESMF_FieldBundleAdd - use mapl_FieldBundleType_Flag - use mapl_VectorBasisKind - use mapl_FieldBundleCreateImpl, only: MAPL_FieldBundleCreate => FieldBundleCreate - use mapl_FieldBundleCreateImpl, only: MAPL_FieldBundlesAreAliased => FieldBundlesAreAliased - use mapl_FieldBundleDestroyImpl, only: MAPL_FieldBundleDestroy - use mapl_FieldBundleGetImpl, only: MAPL_FieldBundleGet => FieldBundleGet - use mapl_FieldBundleGetByIndexImpl, only: MAPL_FieldBundleGetByIndex => FieldBundleGetByIndex - use mapl_FieldBundleSetImpl, only: MAPL_FieldBundleSet => FieldBundleSet - use mapl_FieldBundleInfo, only: MAPL_FieldBundleInfoGetInternal => FieldBundleInfoGetInternal - use mapl_FieldBundleInfo, only: MAPL_FieldBundleInfoSetInternal => FieldBundleInfoSetInternal - use mapl_FieldBundleGetPointerImpl, only: MAPL_FieldBundleGetPointer => FieldBundleGetPointerToData - use mapl_FieldBundleCopyImpl, only: MAPL_FieldBundleCopy => FieldBundleCopy - use mapl_FieldBundleMatch, only: MAPL_FieldBundleSameData => FieldBundleSameData + use mapl_FieldBundleType_Flag_mod + use mapl_VectorBasisKind_mod + use mapl_FieldBundleCreateImpl_mod, only: MAPL_FieldBundleCreate => FieldBundleCreate + use mapl_FieldBundleCreateImpl_mod, only: MAPL_FieldBundlesAreAliased => FieldBundlesAreAliased + use mapl_FieldBundleDestroyImpl_mod, only: MAPL_FieldBundleDestroy + use mapl_FieldBundleGetImpl_mod, only: MAPL_FieldBundleGet => FieldBundleGet + use mapl_FieldBundleGetByIndexImpl_mod, only: MAPL_FieldBundleGetByIndex => FieldBundleGetByIndex + use mapl_FieldBundleSetImpl_mod, only: MAPL_FieldBundleSet => FieldBundleSet + use mapl_FieldBundleInfo_mod, only: MAPL_FieldBundleInfoGetInternal => FieldBundleInfoGetInternal + use mapl_FieldBundleInfo_mod, only: MAPL_FieldBundleInfoSetInternal => FieldBundleInfoSetInternal + use mapl_FieldBundleGetPointerImpl_mod, only: MAPL_FieldBundleGetPointer => FieldBundleGetPointerToData + use mapl_FieldBundleCopyImpl_mod, only: MAPL_FieldBundleCopy => FieldBundleCopy + use mapl_FieldBundleMatch_mod, only: MAPL_FieldBundleSameData => FieldBundleSameData implicit none @@ -53,4 +53,4 @@ module mapl_FieldBundle_API ! Used internally by MAPL ! Users shouldn't need these -end module mapl_FieldBundle_API +end module mapl_FieldBundle_API_mod diff --git a/infrastructure/fields/field_bundle/FieldBundleCopy.F90 b/infrastructure/fields/field_bundle/FieldBundleCopy.F90 index 78c68c80fa5..02d9b54acde 100644 --- a/infrastructure/fields/field_bundle/FieldBundleCopy.F90 +++ b/infrastructure/fields/field_bundle/FieldBundleCopy.F90 @@ -1,10 +1,10 @@ #include "MAPL.h" #include "unused_dummy.H" -module mapl_FieldBundleCopyImpl - use MAPL_FieldUtils, only: FieldCopy - use MAPL_ExceptionHandling - use MAPL_KeywordEnforcer +module mapl_FieldBundleCopyImpl_mod + use mapl_FieldUtils, only: FieldCopy + use mapl_ExceptionHandling_mod + use mapl_KeywordEnforcer_mod ! use esmf, only: ESMF_Field, ESMF_FieldBundle, ESMF_MAXSTR use esmf implicit none(type, external) @@ -56,4 +56,4 @@ subroutine copy_bundle(bundle_in, bundle_out, unusable, ignore_names, rc) end subroutine copy_bundle -end module mapl_FieldBundleCopyImpl +end module mapl_FieldBundleCopyImpl_mod diff --git a/infrastructure/fields/field_bundle/FieldBundleCreate.F90 b/infrastructure/fields/field_bundle/FieldBundleCreate.F90 index 9148663c674..81464af40e7 100644 --- a/infrastructure/fields/field_bundle/FieldBundleCreate.F90 +++ b/infrastructure/fields/field_bundle/FieldBundleCreate.F90 @@ -1,12 +1,12 @@ #include "MAPL.h" -module mapl_FieldBundleCreateImpl +module mapl_FieldBundleCreateImpl_mod - use mapl_FieldBundleType_Flag - use mapl_FieldBundleSetImpl - use mapl_VectorBasisKind - use mapl_ErrorHandling - use mapl_KeywordEnforcer + use mapl_FieldBundleType_Flag_mod + use mapl_FieldBundleSetImpl_mod + use mapl_VectorBasisKind_mod + use mapl_ErrorHandling_mod + use mapl_KeywordEnforcer_mod use esmf implicit none(type,external) @@ -122,4 +122,4 @@ logical function bundles_are_aliased(bundle1, bundle2, rc) result(are_aliased) _RETURN(_SUCCESS) end function bundles_are_aliased -end module mapl_FieldBundleCreateImpl +end module mapl_FieldBundleCreateImpl_mod diff --git a/infrastructure/fields/field_bundle/FieldBundleDelta.F90 b/infrastructure/fields/field_bundle/FieldBundleDelta.F90 index 229884b234d..6c9f7790e50 100644 --- a/infrastructure/fields/field_bundle/FieldBundleDelta.F90 +++ b/infrastructure/fields/field_bundle/FieldBundleDelta.F90 @@ -4,24 +4,24 @@ #include "MAPL.h" -module mapl_FieldBundleDelta - - use mapl_FieldBundleGetImpl - use mapl_FieldBundleSetImpl - use mapl_FieldBundleType_Flag - use mapl_LU_Bound - use mapl_FieldDelta - use mapl_InfoUtilities - use mapl_VerticalStaggerLoc - use mapl_VerticalGrid_API +module mapl_FieldBundleDelta_mod + + use mapl_FieldBundleGetImpl_mod + use mapl_FieldBundleSetImpl_mod + use mapl_FieldBundleType_Flag_mod + use mapl_LU_Bound_mod + use mapl_FieldDelta_mod + use mapl_InfoUtilities_mod + use mapl_VerticalStaggerLoc_mod + use mapl_VerticalGrid_API_mod use mapl_Field_API - use mapl_FieldInfo - use mapl_FieldUtilities - use mapl_UngriddedDims - use mapl_HorizontalDimsSpec - use mapl_FieldPointerUtilities - use mapl_ErrorHandling - use mapl_KeywordEnforcer + use mapl_FieldInfo_mod + use mapl_FieldUtilities_mod + use mapl_UngriddedDims_mod + use mapl_HorizontalDimsSpec_mod + use mapl_FieldPointerUtilities_mod + use mapl_ErrorHandling_mod + use mapl_KeywordEnforcer_mod use esmf implicit none(type, external) @@ -299,4 +299,4 @@ end subroutine destroy_fields end subroutine reallocate_bundle -end module mapl_FieldBundleDelta +end module mapl_FieldBundleDelta_mod diff --git a/infrastructure/fields/field_bundle/FieldBundleDestroy.F90 b/infrastructure/fields/field_bundle/FieldBundleDestroy.F90 index 9926febabd7..a9aafe6ecbc 100644 --- a/infrastructure/fields/field_bundle/FieldBundleDestroy.F90 +++ b/infrastructure/fields/field_bundle/FieldBundleDestroy.F90 @@ -1,12 +1,12 @@ #include "MAPL.h" #include "unused_dummy.H" -module mapl_FieldBundleDestroyImpl +module mapl_FieldBundleDestroyImpl_mod use esmf - use MAPL_ExceptionHandling - use mapl_KeywordEnforcer - use MAPL_FieldUtils, only : FieldsDestroy - use mapl_FieldBundleGetImpl, only: MAPL_FieldBundleGet => FieldBundleGet + use mapl_ExceptionHandling_mod + use mapl_KeywordEnforcer_mod + use mapl_FieldUtils, only : FieldsDestroy + use mapl_FieldBundleGetImpl_mod, only: MAPL_FieldBundleGet => FieldBundleGet implicit none(type, external) @@ -44,4 +44,4 @@ subroutine destroy_bundle(bundle, unusable, destroy_contents, rc) end subroutine destroy_bundle -end module mapl_FieldBundleDestroyImpl +end module mapl_FieldBundleDestroyImpl_mod diff --git a/infrastructure/fields/field_bundle/FieldBundleGet.F90 b/infrastructure/fields/field_bundle/FieldBundleGet.F90 index 6c8f5c7bf91..2396b33abae 100644 --- a/infrastructure/fields/field_bundle/FieldBundleGet.F90 +++ b/infrastructure/fields/field_bundle/FieldBundleGet.F90 @@ -1,20 +1,20 @@ #include "MAPL.h" -module mapl_FieldBundleGetImpl - use mapl_VerticalGrid_API - use mapl_VerticalAlignment - use mapl_KeywordEnforcer - use mapl_ErrorHandling +module mapl_FieldBundleGetImpl_mod + use mapl_VerticalGrid_API_mod + use mapl_VerticalAlignment_mod + use mapl_KeywordEnforcer_mod + use mapl_ErrorHandling_mod use mapl_Field_API - use mapl_UngriddedDims - use mapl_QuantityTypeMetadata - use mapl_NormalizationMetadata - use mapl_ConservationMetadata - use mapl_FieldBundleType_Flag - use mapl_VectorBasisKind - use mapl_FieldBundleInfo - use mapl_InfoUtilities - use mapl_LU_Bound + use mapl_UngriddedDims_mod + use mapl_QuantityTypeMetadata_mod + use mapl_NormalizationMetadata_mod + use mapl_ConservationMetadata_mod + use mapl_FieldBundleType_Flag_mod + use mapl_VectorBasisKind_mod + use mapl_FieldBundleInfo_mod + use mapl_InfoUtilities_mod + use mapl_LU_Bound_mod use esmf implicit none private @@ -160,4 +160,4 @@ end subroutine get_geom end subroutine bundle_get -end module mapl_FieldBundleGetImpl +end module mapl_FieldBundleGetImpl_mod diff --git a/infrastructure/fields/field_bundle/FieldBundleGetByIndex.F90 b/infrastructure/fields/field_bundle/FieldBundleGetByIndex.F90 index 84d5eec092b..5423bccd90c 100644 --- a/infrastructure/fields/field_bundle/FieldBundleGetByIndex.F90 +++ b/infrastructure/fields/field_bundle/FieldBundleGetByIndex.F90 @@ -1,7 +1,7 @@ #include "MAPL.h" -module mapl_FieldBundleGetByIndexImpl - use mapl_ErrorHandling +module mapl_FieldBundleGetByIndexImpl_mod + use mapl_ErrorHandling_mod use esmf implicit none private @@ -42,4 +42,4 @@ subroutine FieldBundleGetByIndex(bundle, fieldIndex, field, rc) _RETURN(_SUCCESS) end subroutine FieldBundleGetByIndex -end module mapl_FieldBundleGetByIndexImpl +end module mapl_FieldBundleGetByIndexImpl_mod diff --git a/infrastructure/fields/field_bundle/FieldBundleGetPointer.F90 b/infrastructure/fields/field_bundle/FieldBundleGetPointer.F90 index 22660d1554c..2cf16aaf02b 100644 --- a/infrastructure/fields/field_bundle/FieldBundleGetPointer.F90 +++ b/infrastructure/fields/field_bundle/FieldBundleGetPointer.F90 @@ -1,10 +1,10 @@ #include "MAPL.h" #include "unused_dummy.H" -module mapl_FieldBundleGetPointerImpl +module mapl_FieldBundleGetPointerImpl_mod use ESMF - use MAPL_ErrorHandling + use mapl_ErrorHandling_mod use, intrinsic :: iso_fortran_env, only: REAL64 implicit none(type,external) @@ -193,4 +193,4 @@ subroutine FieldBundleGetPointerToR8DataByName3(bundle, name, ptr, rc) _RETURN(_SUCCESS) end subroutine FieldBundleGetPointerToR8DataByName3 -end module mapl_FieldBundleGetPointerImpl +end module mapl_FieldBundleGetPointerImpl_mod diff --git a/infrastructure/fields/field_bundle/FieldBundleInfo.F90 b/infrastructure/fields/field_bundle/FieldBundleInfo.F90 index 9e640e53b10..ddeee2b820a 100644 --- a/infrastructure/fields/field_bundle/FieldBundleInfo.F90 +++ b/infrastructure/fields/field_bundle/FieldBundleInfo.F90 @@ -1,21 +1,21 @@ #include "MAPL.h" -module mapl_FieldBundleInfo - use mapl_esmf_info_keys - use mapl_InfoUtilities - use mapl_ESMF_Info_Keys +module mapl_FieldBundleInfo_mod + use mapl_esmf_info_keys_mod + use mapl_InfoUtilities_mod + use mapl_esmf_info_keys_mod use mapl_Field_API - use mapl_FieldInfo - use mapl_UngriddedDims - use mapl_QuantityTypeMetadata - use mapl_NormalizationMetadata - use mapl_ConservationMetadata - use mapl_FieldBundleType_Flag - use mapl_VectorBasisKind - use mapl_VerticalAlignment - use mapl_VerticalGrid_API - use mapl_KeywordEnforcer - use mapl_ErrorHandling + use mapl_FieldInfo_mod + use mapl_UngriddedDims_mod + use mapl_QuantityTypeMetadata_mod + use mapl_NormalizationMetadata_mod + use mapl_ConservationMetadata_mod + use mapl_FieldBundleType_Flag_mod + use mapl_VectorBasisKind_mod + use mapl_VerticalAlignment_mod + use mapl_VerticalGrid_API_mod + use mapl_KeywordEnforcer_mod + use mapl_ErrorHandling_mod use esmf implicit none(type,external) private @@ -294,4 +294,4 @@ subroutine fieldbundle_set_internal(info, unusable, & end subroutine fieldbundle_set_internal -end module mapl_FieldBundleInfo +end module mapl_FieldBundleInfo_mod diff --git a/infrastructure/fields/field_bundle/FieldBundleMatch.F90 b/infrastructure/fields/field_bundle/FieldBundleMatch.F90 index f88354ab147..18cb44b0519 100644 --- a/infrastructure/fields/field_bundle/FieldBundleMatch.F90 +++ b/infrastructure/fields/field_bundle/FieldBundleMatch.F90 @@ -1,12 +1,12 @@ #include "MAPL.h" #include "unused_dummy.H" -module mapl_FieldBundleMatch +module mapl_FieldBundleMatch_mod use ESMF, only: ESMF_Field, ESMF_FieldBundle, ESMF_FieldBundleGet use ESMF, only: ESMF_ITEMORDER_ADDORDER - use MAPL_FieldPointerUtilities, only: FieldSameData - use MAPL_ExceptionHandling, only: MAPL_Verify, MAPL_Return + use mapl_FieldPointerUtilities_mod, only: FieldSameData + use mapl_ExceptionHandling_mod, only: MAPL_Verify, MAPL_Return implicit none(type, external) private @@ -48,4 +48,4 @@ function same_data_order_addorder(bundle_1, bundle_2, rc) result(match) _RETURN(_SUCCESS) end function same_data_order_addorder -end module mapl_FieldBundleMatch +end module mapl_FieldBundleMatch_mod diff --git a/infrastructure/fields/field_bundle/FieldBundleSet.F90 b/infrastructure/fields/field_bundle/FieldBundleSet.F90 index 2d2c5e6ab7c..0a2862fb8ba 100644 --- a/infrastructure/fields/field_bundle/FieldBundleSet.F90 +++ b/infrastructure/fields/field_bundle/FieldBundleSet.F90 @@ -1,20 +1,20 @@ #include "MAPL.h" -module mapl_FieldBundleSetImpl - use mapl_VerticalGrid_API +module mapl_FieldBundleSetImpl_mod + use mapl_VerticalGrid_API_mod use mapl_Field_API - use mapl_UngriddedDims - use mapl_QuantityTypeMetadata - use mapl_NormalizationMetadata - use mapl_ConservationMetadata - use mapl_FieldBundleType_Flag - use mapl_VectorBasisKind - use mapl_FieldBundleInfo - use mapl_InfoUtilities - use mapl_FieldBundleGetImpl - use mapl_LU_Bound - use mapl_KeywordEnforcer - use mapl_ErrorHandling + use mapl_UngriddedDims_mod + use mapl_QuantityTypeMetadata_mod + use mapl_NormalizationMetadata_mod + use mapl_ConservationMetadata_mod + use mapl_FieldBundleType_Flag_mod + use mapl_VectorBasisKind_mod + use mapl_FieldBundleInfo_mod + use mapl_InfoUtilities_mod + use mapl_FieldBundleGetImpl_mod + use mapl_LU_Bound_mod + use mapl_KeywordEnforcer_mod + use mapl_ErrorHandling_mod use esmf implicit none(type,external) private @@ -180,4 +180,4 @@ subroutine bundle_reset(fieldBundle, status) end subroutine bundle_reset -end module mapl_FieldBundleSetImpl +end module mapl_FieldBundleSetImpl_mod diff --git a/infrastructure/fields/field_bundle/FieldBundleType_Flag.F90 b/infrastructure/fields/field_bundle/FieldBundleType_Flag.F90 index 05cc81c6f9d..bcf9dd4ad52 100644 --- a/infrastructure/fields/field_bundle/FieldBundleType_Flag.F90 +++ b/infrastructure/fields/field_bundle/FieldBundleType_Flag.F90 @@ -1,4 +1,4 @@ -module mapl_FieldBundleType_Flag +module mapl_FieldBundleType_Flag_mod implicit none private @@ -90,4 +90,4 @@ elemental logical function not_equal_to(a,b) not_equal_to = .not. (a%id == b%id) end function not_equal_to -end module mapl_FieldBundleType_Flag +end module mapl_FieldBundleType_Flag_mod diff --git a/infrastructure/fields/field_bundle/tests/CMakeLists.txt b/infrastructure/fields/field_bundle/tests/CMakeLists.txt index 54bc62e4f5f..9229bf285b3 100644 --- a/infrastructure/fields/field_bundle/tests/CMakeLists.txt +++ b/infrastructure/fields/field_bundle/tests/CMakeLists.txt @@ -13,7 +13,7 @@ add_pfunit_ctest(MAPL.field_bundle.tests TEST_SOURCES ${SRCS} LINK_LIBRARIES MAPL.field_bundle MAPL.pfunit EXTRA_INITIALIZE Initialize - EXTRA_USE MAPL_pFUnit_Initialize + EXTRA_USE mapl_pFUnit_Initialize_mod MAX_PES 4 ) add_dependencies(build-tests MAPL.field_bundle.tests) diff --git a/infrastructure/fields/field_bundle/tests/Test_FieldBundleDelta.pf b/infrastructure/fields/field_bundle/tests/Test_FieldBundleDelta.pf index 28ddb125d10..f0524029b04 100644 --- a/infrastructure/fields/field_bundle/tests/Test_FieldBundleDelta.pf +++ b/infrastructure/fields/field_bundle/tests/Test_FieldBundleDelta.pf @@ -1,20 +1,20 @@ #include "MAPL_TestErr.h" #include "unused_dummy.H" module Test_FieldBundleDelta - use mapl_FieldBundle_API - use mapl_FieldBundleDelta - use mapl_FieldDelta + use mapl_FieldBundle_API_mod + use mapl_FieldBundleDelta_mod + use mapl_FieldDelta_mod use mapl_Field_API - use mapl_FieldInfo - use mapl_esmf_info_keys - use mapl_VerticalStaggerLoc - use mapl_BasicVerticalGrid - use mapl_VerticalGrid_API - use mapl_InfoUtilities - use mapl_FieldUtilities - use mapl_UngriddedDims - use mapl_UngriddedDim - use mapl_LU_Bound + use mapl_FieldInfo_mod + use mapl_esmf_info_keys_mod + use mapl_VerticalStaggerLoc_mod + use mapl_BasicVerticalGrid_mod + use mapl_VerticalGrid_API_mod + use mapl_InfoUtilities_mod + use mapl_FieldUtilities_mod + use mapl_UngriddedDims_mod + use mapl_UngriddedDim_mod + use mapl_LU_Bound_mod use esmf use ESMF_TestMethod_mod use funit diff --git a/infrastructure/fields/field_bundle/tests/Test_FieldBundleDestroy.pf b/infrastructure/fields/field_bundle/tests/Test_FieldBundleDestroy.pf index 446a897040b..a14a8281923 100644 --- a/infrastructure/fields/field_bundle/tests/Test_FieldBundleDestroy.pf +++ b/infrastructure/fields/field_bundle/tests/Test_FieldBundleDestroy.pf @@ -2,7 +2,7 @@ #include "unused_dummy.H" module Test_FieldBundleDestroy - use mapl_FieldBundleDestroyImpl + use mapl_FieldBundleDestroyImpl_mod use esmf use pfunit use ESMF_TestMethod_mod diff --git a/infrastructure/fields/field_bundle/tests/Test_FieldBundleGetByIndex.pf b/infrastructure/fields/field_bundle/tests/Test_FieldBundleGetByIndex.pf index f2f8a17bc5e..c1fbc72f063 100644 --- a/infrastructure/fields/field_bundle/tests/Test_FieldBundleGetByIndex.pf +++ b/infrastructure/fields/field_bundle/tests/Test_FieldBundleGetByIndex.pf @@ -2,7 +2,7 @@ #include "unused_dummy.H" module Test_FieldBundleGetByIndex - use mapl_FieldBundleGetByIndexImpl + use mapl_FieldBundleGetByIndexImpl_mod use esmf use pfunit use ESMF_TestMethod_mod diff --git a/infrastructure/fields/field_bundle/tests/Test_FieldBundleGetPointer.pf b/infrastructure/fields/field_bundle/tests/Test_FieldBundleGetPointer.pf index dd029e54901..7671acb838f 100644 --- a/infrastructure/fields/field_bundle/tests/Test_FieldBundleGetPointer.pf +++ b/infrastructure/fields/field_bundle/tests/Test_FieldBundleGetPointer.pf @@ -5,8 +5,8 @@ module Test_FieldBundleGetPointer - use mapl_FieldBundleGetPointerImpl - use MAPL_ErrorHandling, only: MAPL_Verify + use mapl_FieldBundleGetPointerImpl_mod + use mapl_ErrorHandling_mod, only: MAPL_Verify use ESMF use, intrinsic :: iso_fortran_env, only: REAL64 use pfunit diff --git a/infrastructure/fields/field_bundle/tests/Test_FieldBundleMatch.pf b/infrastructure/fields/field_bundle/tests/Test_FieldBundleMatch.pf index 5f9ae655870..c1b34827301 100644 --- a/infrastructure/fields/field_bundle/tests/Test_FieldBundleMatch.pf +++ b/infrastructure/fields/field_bundle/tests/Test_FieldBundleMatch.pf @@ -1,6 +1,6 @@ #include "MAPL_TestErr.h" module Test_FieldBundleMatch - use mapl_FieldBundleMatch, only: FieldBundleSameData + use mapl_FieldBundleMatch_mod, only: FieldBundleSameData use esmf use funit use ESMF_TestMethod_mod diff --git a/infrastructure/fields/field_bundle/tests/Test_FieldBundlesAreAliased.pf b/infrastructure/fields/field_bundle/tests/Test_FieldBundlesAreAliased.pf index 3c1a7e39ed0..ccee1cd30e4 100644 --- a/infrastructure/fields/field_bundle/tests/Test_FieldBundlesAreAliased.pf +++ b/infrastructure/fields/field_bundle/tests/Test_FieldBundlesAreAliased.pf @@ -1,6 +1,6 @@ #include "MAPL_TestErr.h" module Test_FieldBundlesAreAliased - use mapl_FieldBundle_API, only: mapl_FieldBundlesAreAliased + use mapl_FieldBundle_API_mod, only: mapl_FieldBundlesAreAliased use esmf use funit use ESMF_TestMethod_mod diff --git a/infrastructure/fields/state/API.F90 b/infrastructure/fields/state/API.F90 index 015d97a89b4..5c343f2fb06 100644 --- a/infrastructure/fields/state/API.F90 +++ b/infrastructure/fields/state/API.F90 @@ -1,13 +1,13 @@ -module mapl_State_API - use mapl_StateGetImpl, only: MAPL_StateGet => StateGet - use mapl_StateGetPointerImpl, only: MAPL_StateGetPointer => StateGetPointer - use MAPL_StateArithmeticParserMod, only: MAPL_ParserVariablesInExpression => parser_variables_in_expression - use mapl_StateAddMethodImpl, only: mapl_StateAddMethod - use mapl_StateAddMethodImpl, only: CallbackMap - use mapl_StateAddMethodImpl, only: CallbackMapIterator - use mapl_StateAddMethodImpl, only: CallbackMethodWrapper - use mapl_StateAddMethodImpl, only: get_callbacks - use mapl_StateGetGeomImpl, only: MAPL_StateGetGeom => StateGetGeom +module mapl_State_API_mod + use mapl_StateGetImpl_mod, only: MAPL_StateGet => StateGet + use mapl_StateGetPointerImpl_mod, only: MAPL_StateGetPointer => StateGetPointer + use mapl_StateArithmeticParser_mod, only: MAPL_ParserVariablesInExpression => parser_variables_in_expression + use mapl_StateAddMethodImpl_mod, only: mapl_StateAddMethod + use mapl_StateAddMethodImpl_mod, only: CallbackMap + use mapl_StateAddMethodImpl_mod, only: CallbackMapIterator + use mapl_StateAddMethodImpl_mod, only: CallbackMethodWrapper + use mapl_StateAddMethodImpl_mod, only: get_callbacks + use mapl_StateGetGeomImpl_mod, only: MAPL_StateGetGeom => StateGetGeom implicit none private @@ -22,4 +22,4 @@ module mapl_State_API public :: get_callbacks public :: MAPL_StateGetGeom -end module mapl_State_API +end module mapl_State_API_mod diff --git a/infrastructure/fields/state/StateAddMethod.F90 b/infrastructure/fields/state/StateAddMethod.F90 index d335e1fd6a8..e269d231305 100644 --- a/infrastructure/fields/state/StateAddMethod.F90 +++ b/infrastructure/fields/state/StateAddMethod.F90 @@ -1,7 +1,7 @@ #include "MAPL.h" -module mapl_CallbackMap_private - use mapl_ESMF_Interfaces, only: I_CallBackMethod +module mapl_CallbackMap_private_mod + use mapl_ESMF_Interfaces_mod, only: I_CallBackMethod implicit none(type,external) private @@ -11,10 +11,10 @@ module mapl_CallbackMap_private procedure(I_CallBackMethod), pointer, nopass :: userRoutine end type CallbackMethodWrapper -end module mapl_CallbackMap_private +end module mapl_CallbackMap_private_mod -module mapl_CallbackMap - use mapl_CallbackMap_private, only: CallbackMethodWrapper +module mapl_CallbackMap_mod + use mapl_CallbackMap_private_mod, only: CallbackMethodWrapper #define Key __CHARACTER_DEFERRED #define T CallbackMethodWrapper @@ -30,16 +30,16 @@ module mapl_CallbackMap #undef T #undef Key -end module mapl_CallbackMap +end module mapl_CallbackMap_mod -module mapl_StateAddMethodImpl +module mapl_StateAddMethodImpl_mod use ESMF, only: ESMF_State, ESMF_MethodAdd use ESMF, only: ESMF_Info, ESMF_InfoGetFromHost, ESMF_InfoIsPresent, ESMF_InfoSet, ESMF_InfoGet use ESMF, only: ESMF_KIND_I4 - use mapl_CallbackMap - use mapl_ESMF_Interfaces, only: I_CallBackMethod - use mapl_CallbackMap_private, only: CallbackMethodWrapper - use mapl_ErrorHandling + use mapl_CallbackMap_mod + use mapl_ESMF_Interfaces_mod, only: I_CallBackMethod + use mapl_CallbackMap_private_mod, only: CallbackMethodWrapper + use mapl_ErrorHandling_mod implicit none(type,external) private @@ -107,4 +107,4 @@ subroutine get_callbacks(state, callbacks, rc) _RETURN(_SUCCESS) end subroutine get_callbacks -end module mapl_StateAddMethodImpl +end module mapl_StateAddMethodImpl_mod diff --git a/infrastructure/fields/state/StateArithmeticParser.F90 b/infrastructure/fields/state/StateArithmeticParser.F90 index 0e712d994ed..2dbab3501e3 100644 --- a/infrastructure/fields/state/StateArithmeticParser.F90 +++ b/infrastructure/fields/state/StateArithmeticParser.F90 @@ -48,12 +48,12 @@ !---------------------------------------------------------------------- ! End of original license -MODULE MAPL_StateArithmeticParserMod +MODULE mapl_StateArithmeticParser_mod use ESMF use MAPL_Constants, only: MAPL_UNDEF - use MAPL_FieldUtils - use MAPL_ExceptionHandling + use mapl_FieldUtils + use mapl_ExceptionHandling_mod use gFTL2_StringVector IMPLICIT NONE @@ -1118,4 +1118,4 @@ FUNCTION Heav3D(r) RESULT(res) endwhere END FUNCTION Heav3D -END MODULE MAPL_StateArithmeticParserMod +END MODULE mapl_StateArithmeticParser_mod diff --git a/infrastructure/fields/state/StateDestroy.F90 b/infrastructure/fields/state/StateDestroy.F90 index 091dec38718..656ffdeec28 100644 --- a/infrastructure/fields/state/StateDestroy.F90 +++ b/infrastructure/fields/state/StateDestroy.F90 @@ -1,12 +1,12 @@ #include "MAPL.h" #include "unused_dummy.H" -module mapl_StateDestroyImpl +module mapl_StateDestroyImpl_mod use esmf - use MAPL_FieldUtils, only: FieldsDestroy - use mapl_FieldBundleDestroyImpl - use MAPL_ExceptionHandling - use mapl_KeywordEnforcer + use mapl_FieldUtils, only: FieldsDestroy + use mapl_FieldBundleDestroyImpl_mod + use mapl_ExceptionHandling_mod + use mapl_KeywordEnforcer_mod implicit none(type, external) private @@ -160,4 +160,4 @@ subroutine destroy_bundles(bundles, rc) end subroutine destroy_bundles -end module mapl_StateDestroyImpl +end module mapl_StateDestroyImpl_mod diff --git a/infrastructure/fields/state/StateFilter.F90 b/infrastructure/fields/state/StateFilter.F90 index b5a1ae7df2e..3e8ae8f41c2 100644 --- a/infrastructure/fields/state/StateFilter.F90 +++ b/infrastructure/fields/state/StateFilter.F90 @@ -1,10 +1,10 @@ #include "MAPL_ErrLog.h" -module MAPL_StateFilter +module mapl_StateFilter_mod use ESMF - use MAPL_ExceptionHandling - use MAPL_FieldUtils - use MAPL_StateArithmeticParserMod - use MAPL_StateMaskMod + use mapl_ExceptionHandling_mod + use mapl_FieldUtils + use mapl_StateArithmeticParser_mod + use mapl_StateMask_mod use, intrinsic :: iso_fortran_env, only: REAL32, REAL64 implicit none private @@ -143,4 +143,4 @@ function substitute_name(filter_expression, field_name, rc) result(processed_exp _RETURN(_SUCCESS) end function -end module MAPL_StateFilter +end module mapl_StateFilter_mod diff --git a/infrastructure/fields/state/StateGet.F90 b/infrastructure/fields/state/StateGet.F90 index cb6eec52cb1..79204232471 100644 --- a/infrastructure/fields/state/StateGet.F90 +++ b/infrastructure/fields/state/StateGet.F90 @@ -1,11 +1,11 @@ #include "MAPL.h" -module mapl_StateGetImpl - use mapl_VerticalGrid_API +module mapl_StateGetImpl_mod + use mapl_VerticalGrid_API_mod use mapl_Field_API - use mapl_UngriddedDims - use mapl_ErrorHandling - use mapl_KeywordEnforcer + use mapl_UngriddedDims_mod + use mapl_ErrorHandling_mod + use mapl_KeywordEnforcer_mod use esmf implicit none(type,external) private @@ -90,4 +90,4 @@ recursive subroutine state_get_status(state, itemName, itemType, rc) _RETURN(_SUCCESS) end subroutine state_get_status -end module mapl_StateGetImpl +end module mapl_StateGetImpl_mod diff --git a/infrastructure/fields/state/StateGetGeom.F90 b/infrastructure/fields/state/StateGetGeom.F90 index af04034d7dd..89d192ded52 100644 --- a/infrastructure/fields/state/StateGetGeom.F90 +++ b/infrastructure/fields/state/StateGetGeom.F90 @@ -1,9 +1,9 @@ #include "MAPL.h" -module mapl_StateGetGeomImpl +module mapl_StateGetGeomImpl_mod use esmf - use mapl_ErrorHandling - use mapl_Geom_API + use mapl_ErrorHandling_mod + use mapl_Geom_API_mod implicit none(type,external) private @@ -89,4 +89,4 @@ recursive subroutine collect_geom(state, geom, found, rc) _RETURN(_SUCCESS) end subroutine collect_geom -end module mapl_StateGetGeomImpl +end module mapl_StateGetGeomImpl_mod diff --git a/infrastructure/fields/state/StateGetPointer.F90 b/infrastructure/fields/state/StateGetPointer.F90 index 7926685a018..a09c9730c2f 100644 --- a/infrastructure/fields/state/StateGetPointer.F90 +++ b/infrastructure/fields/state/StateGetPointer.F90 @@ -1,9 +1,9 @@ #include "MAPL.h" -module mapl_StateGetPointerImpl - use mapl_ErrorHandling - use mapl_KeywordEnforcer +module mapl_StateGetPointerImpl_mod + use mapl_ErrorHandling_mod + use mapl_KeywordEnforcer_mod use esmf implicit none(type,external) private @@ -84,4 +84,4 @@ module mapl_StateGetPointerImpl #undef NAME_ -end module mapl_StateGetPointerImpl +end module mapl_StateGetPointerImpl_mod diff --git a/infrastructure/fields/state/StateMasking.F90 b/infrastructure/fields/state/StateMasking.F90 index 36f4c9c7ee7..4fea006ba78 100644 --- a/infrastructure/fields/state/StateMasking.F90 +++ b/infrastructure/fields/state/StateMasking.F90 @@ -1,15 +1,15 @@ #include "MAPL_Exceptions.h" #include "MAPL_ErrLog.h" #include "MAPL.h" -module MAPL_StateMaskMod +module mapl_StateMask_mod use ESMF - use MAPL_KeywordEnforcerMod - use mapl_Geom_API, only: MAPL_GridGet, mapl_GridGetGlobalCellCountPerDim - use MAPL_ExceptionHandling + use mapl_KeywordEnforcer_mod + use mapl_Geom_API_mod, only: MAPL_GridGet, mapl_GridGetGlobalCellCountPerDim + use mapl_ExceptionHandling_mod use gFTL2_StringVector - use MAPL_StateArithmeticParserMod + use mapl_StateArithmeticParser_mod use MAPL_Constants - use mapl_State_API, only: MAPL_StateGetPointer + use mapl_State_API_mod, only: MAPL_StateGetPointer implicit none private @@ -591,4 +591,4 @@ SUBROUTINE ExtDataExtractIntegers(string,iSize,iValues,delimiter,verbose,rc) _RETURN(ESMF_SUCCESS) END SUBROUTINE ExtDataExtractIntegers -end module MAPL_StateMaskMod +end module mapl_StateMask_mod diff --git a/infrastructure/fields/state/StateSet.F90 b/infrastructure/fields/state/StateSet.F90 index 30c92657c30..706799dcda4 100644 --- a/infrastructure/fields/state/StateSet.F90 +++ b/infrastructure/fields/state/StateSet.F90 @@ -1,12 +1,12 @@ #include "MAPL.h" -module mapl_StateSet +module mapl_StateSet_mod use mapl_Field_API - use mapl_UngriddedDims - use mapl_VerticalStaggerLoc - use mapl_ErrorHandling - use mapl_KeywordEnforcer + use mapl_UngriddedDims_mod + use mapl_VerticalStaggerLoc_mod + use mapl_ErrorHandling_mod + use mapl_KeywordEnforcer_mod use esmf implicit none(type,external) @@ -49,4 +49,4 @@ subroutine state_set(state, itemName, unusable, & _UNUSED_DUMMY(num_vgrid_levels) end subroutine state_set -end module mapl_StateSet +end module mapl_StateSet_mod diff --git a/infrastructure/fields/state/StateUtils.F90 b/infrastructure/fields/state/StateUtils.F90 index 7f8cf9fc597..7c568dec014 100644 --- a/infrastructure/fields/state/StateUtils.F90 +++ b/infrastructure/fields/state/StateUtils.F90 @@ -1,5 +1,5 @@ -module MAPL_StateUtils - use MAPL_StateMaskMod - use MAPL_StateArithmeticParserMod - use MAPL_StateFilter, only: MAPL_StateFilterItem => StateFilterItem +module mapl_StateUtils + use mapl_StateMask_mod + use mapl_StateArithmeticParser_mod + use mapl_StateFilter_mod, only: MAPL_StateFilterItem => StateFilterItem end module diff --git a/infrastructure/fields/state/tests/CMakeLists.txt b/infrastructure/fields/state/tests/CMakeLists.txt index 08223ead76c..27b96c62cc3 100644 --- a/infrastructure/fields/state/tests/CMakeLists.txt +++ b/infrastructure/fields/state/tests/CMakeLists.txt @@ -13,7 +13,7 @@ add_pfunit_ctest(MAPL.state.tests TEST_SOURCES ${test_srcs} LINK_LIBRARIES MAPL.state MAPL.geom MAPL.pfunit EXTRA_INITIALIZE Initialize - EXTRA_USE MAPL_pFUnit_Initialize + EXTRA_USE mapl_pFUnit_Initialize_mod OTHER_SOURCES state_utils_setup.F90 MAX_PES 1 ) diff --git a/infrastructure/fields/state/tests/Test_StateArithmetic.pf b/infrastructure/fields/state/tests/Test_StateArithmetic.pf index ce9f03943f0..3aef453f4c5 100644 --- a/infrastructure/fields/state/tests/Test_StateArithmetic.pf +++ b/infrastructure/fields/state/tests/Test_StateArithmetic.pf @@ -5,8 +5,8 @@ module Test_StateArithmetic use state_utils_setup use ESMF use pfunit - use MAPL_ExceptionHandling - use MAPL_StateUtils + use mapl_ExceptionHandling_mod + use mapl_StateUtils use ESMF_TestMethod_mod implicit none diff --git a/infrastructure/fields/state/tests/Test_StateDestroy.pf b/infrastructure/fields/state/tests/Test_StateDestroy.pf index 50ec8adf792..5a04b439ddf 100644 --- a/infrastructure/fields/state/tests/Test_StateDestroy.pf +++ b/infrastructure/fields/state/tests/Test_StateDestroy.pf @@ -2,7 +2,7 @@ #include "unused_dummy.H" module Test_StateDestroy - use mapl_StateDestroyImpl + use mapl_StateDestroyImpl_mod use pfunit use ESMF_TestMethod_mod use esmf diff --git a/infrastructure/fields/state/tests/Test_StateFilter.pf b/infrastructure/fields/state/tests/Test_StateFilter.pf index 658efd71edd..e2be5725525 100644 --- a/infrastructure/fields/state/tests/Test_StateFilter.pf +++ b/infrastructure/fields/state/tests/Test_StateFilter.pf @@ -5,8 +5,8 @@ module Test_StateFilter use state_utils_setup use ESMF use pfunit - use MAPL_ExceptionHandling - use MAPL_StateUtils + use mapl_ExceptionHandling_mod + use mapl_StateUtils use ESMF_TestMethod_mod implicit none diff --git a/infrastructure/fields/state/tests/Test_StateGetGeom.pf b/infrastructure/fields/state/tests/Test_StateGetGeom.pf index 14ed1ddf1d1..0462e2e804a 100644 --- a/infrastructure/fields/state/tests/Test_StateGetGeom.pf +++ b/infrastructure/fields/state/tests/Test_StateGetGeom.pf @@ -2,12 +2,12 @@ #include "unused_dummy.H" module Test_StateGetGeom - use mapl_StateGetGeomImpl - use mapl_Geom_API, only: get_geom_manager, GeomManager, MaplGeom + use mapl_StateGetGeomImpl_mod + use mapl_Geom_API_mod, only: get_geom_manager, GeomManager, MaplGeom use pfunit use ESMF_TestMethod_mod use esmf - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod implicit none(type, external) diff --git a/infrastructure/fields/state/tests/Test_StateMask.pf b/infrastructure/fields/state/tests/Test_StateMask.pf index 39c88f05fd1..ec83e4c7612 100644 --- a/infrastructure/fields/state/tests/Test_StateMask.pf +++ b/infrastructure/fields/state/tests/Test_StateMask.pf @@ -5,8 +5,8 @@ module Test_StateMask use state_utils_setup use ESMF use pfunit - use MAPL_ExceptionHandling - use MAPL_StateUtils + use mapl_ExceptionHandling_mod + use mapl_StateUtils use ESMF_TestMethod_mod implicit none diff --git a/infrastructure/fields/state/tests/state_utils_setup.F90 b/infrastructure/fields/state/tests/state_utils_setup.F90 index 02a2727b8e2..a3840bae1ef 100644 --- a/infrastructure/fields/state/tests/state_utils_setup.F90 +++ b/infrastructure/fields/state/tests/state_utils_setup.F90 @@ -2,7 +2,7 @@ module state_utils_setup use ESMF - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod implicit none diff --git a/infrastructure/geom/GeomIO/CompressionSettings.F90 b/infrastructure/geom/GeomIO/CompressionSettings.F90 index bcfd1088c5d..3995f87f414 100644 --- a/infrastructure/geom/GeomIO/CompressionSettings.F90 +++ b/infrastructure/geom/GeomIO/CompressionSettings.F90 @@ -1,9 +1,9 @@ #include "MAPL.h" -module mapl_CompressionSettings +module mapl_CompressionSettings_mod use ESMF - use MAPL_ErrorHandling + use mapl_ErrorHandling_mod use MAPL_Constants - use mapl_esmf_info_keys + use mapl_esmf_info_keys_mod implicit none private @@ -277,4 +277,4 @@ subroutine set_all_levels(this, deflate, zstandard, quantize, algorithm, nbits) this%nbits = nbits end subroutine set_all_levels -end module mapl_CompressionSettings +end module mapl_CompressionSettings_mod diff --git a/infrastructure/geom/GeomIO/DataCollection.F90 b/infrastructure/geom/GeomIO/DataCollection.F90 index 4b877449b41..b4d176eeb8c 100644 --- a/infrastructure/geom/GeomIO/DataCollection.F90 +++ b/infrastructure/geom/GeomIO/DataCollection.F90 @@ -1,12 +1,12 @@ #include "MAPL.h" -module mapl_DataCollection +module mapl_DataCollection_mod use pFIO - use MAPL_FileMetadataUtilsVectorMod - use MAPL_FileMetadataUtilsMod + use mapl_FileMetadataUtilsVector_mod + use mapl_FileMetadataUtils_mod use gFTL2_StringIntegerMap use esmf - use mapl_ErrorHandlingMod + use mapl_ErrorHandling_mod implicit none private @@ -98,6 +98,6 @@ function find_(this, file_name, rc) result(metadata) _RETURN(_SUCCESS) end function find_ -end module mapl_DataCollection +end module mapl_DataCollection_mod diff --git a/infrastructure/geom/GeomIO/DataCollectionManager.F90 b/infrastructure/geom/GeomIO/DataCollectionManager.F90 index 7f8ffff457c..7817df21ce2 100644 --- a/infrastructure/geom/GeomIO/DataCollectionManager.F90 +++ b/infrastructure/geom/GeomIO/DataCollectionManager.F90 @@ -1,6 +1,6 @@ -module mapl_DataCollectionManager -use mapl_DataCollectionVector -use mapl_DataCollection +module mapl_DataCollectionManager_mod +use mapl_DataCollectionVector_mod +use mapl_DataCollection_mod implicit none private diff --git a/infrastructure/geom/GeomIO/DataCollectionVector.F90 b/infrastructure/geom/GeomIO/DataCollectionVector.F90 index 6c470e92ac6..77b980b1191 100644 --- a/infrastructure/geom/GeomIO/DataCollectionVector.F90 +++ b/infrastructure/geom/GeomIO/DataCollectionVector.F90 @@ -1,6 +1,6 @@ -module mapl_DataCollectionVector +module mapl_DataCollectionVector_mod use pFIO - use mapl_DataCollection + use mapl_DataCollection_mod ! Create a map (associative array) between names and pFIO_Attributes. @@ -12,5 +12,5 @@ module mapl_DataCollectionVector #include "templates/vector.inc" -end module mapl_DataCollectionVector +end module mapl_DataCollectionVector_mod diff --git a/infrastructure/geom/GeomIO/FieldBundleRead.F90 b/infrastructure/geom/GeomIO/FieldBundleRead.F90 index f37db9beea3..823ddc90f9a 100644 --- a/infrastructure/geom/GeomIO/FieldBundleRead.F90 +++ b/infrastructure/geom/GeomIO/FieldBundleRead.F90 @@ -1,22 +1,22 @@ #include "MAPL.h" -module mapl_FieldBundleRead +module mapl_FieldBundleRead_mod use ESMF - use mapl_ErrorHandling - use mapl_GeomPFIO - use mapl_GeomCatagorizer - use mapl_Geom_API, only: GeomManager, MaplGeom, get_geom_manager, get_mapl_geom, MAPL_SameGeom + use mapl_ErrorHandling_mod + use mapl_GeomPFIO_mod + use mapl_GeomCatagorizer_mod + use mapl_Geom_API_mod, only: GeomManager, MaplGeom, get_geom_manager, get_mapl_geom, MAPL_SameGeom use mapl_Field_API, only: MAPL_FieldCreate, MAPL_FieldGet - use mapl_FieldBundle_API - use mapl_VerticalStaggerLoc - use mapl_VerticalGrid_API - use mapl_RegridderManager, only: get_regridder_manager, RegridderManager - use mapl_RegridderSpec - use mapl_RegridderMethods - use mapl_Regridder, only: Regridder - use MAPL_FileMetadataUtilsMod - use MAPL_StringTemplate, only: fill_grads_template + use mapl_FieldBundle_API_mod + use mapl_VerticalStaggerLoc_mod + use mapl_VerticalGrid_API_mod + use mapl_RegridderManager_mod, only: get_regridder_manager, RegridderManager + use mapl_RegridderSpec_mod + use mapl_RegridderMethods_mod + use mapl_Regridder_mod, only: Regridder + use mapl_FileMetadataUtils_mod + use mapl_StringTemplate_mod, only: fill_grads_template use pFIO use gFTL2_StringVector @@ -390,4 +390,4 @@ subroutine MAPL_read_bundle(bundle, file_tmpl, time, only_vars, regrid_method, & _RETURN(_SUCCESS) end subroutine mapl_read_bundle -end module mapl_FieldBundleRead +end module mapl_FieldBundleRead_mod diff --git a/infrastructure/geom/GeomIO/FieldBundleWrite.F90 b/infrastructure/geom/GeomIO/FieldBundleWrite.F90 index 2bea4b2a594..a704d661dbc 100644 --- a/infrastructure/geom/GeomIO/FieldBundleWrite.F90 +++ b/infrastructure/geom/GeomIO/FieldBundleWrite.F90 @@ -1,12 +1,12 @@ #include "MAPL.h" -module mapl_FieldBundleWrite +module mapl_FieldBundleWrite_mod use ESMF use pFIO use pFIO_ClientManagerMod, only: o_Clients - use MAPL_ExceptionHandling - use mapl_GeomPFIO - use mapl_SharedIO - use mapl_GeomCatagorizer + use mapl_ExceptionHandling_mod + use mapl_GeomPFIO_mod + use mapl_SharedIO_mod + use mapl_GeomCatagorizer_mod implicit none private @@ -115,4 +115,4 @@ subroutine start_new_file(this, filename, time, rc) _RETURN(_SUCCESS) end subroutine start_new_file -end module mapl_FieldBundleWrite +end module mapl_FieldBundleWrite_mod diff --git a/infrastructure/geom/GeomIO/GeomCatagorizer.F90 b/infrastructure/geom/GeomIO/GeomCatagorizer.F90 index da7e4066b50..485858e2161 100644 --- a/infrastructure/geom/GeomIO/GeomCatagorizer.F90 +++ b/infrastructure/geom/GeomIO/GeomCatagorizer.F90 @@ -1,10 +1,10 @@ #include "MAPL.h" -module mapl_GeomCatagorizer +module mapl_GeomCatagorizer_mod - use mapl_ErrorHandling - use mapl_GridPFIO - use mapl_GeomPFIO + use mapl_ErrorHandling_mod + use mapl_GridPFIO_mod + use mapl_GeomPFIO_mod use pfio implicit none @@ -32,4 +32,4 @@ function make_geom_pfio(metadata, rc) result(geom_pfio) _UNUSED_DUMMY(metadata) end function make_geom_pfio -end module mapl_GeomCatagorizer +end module mapl_GeomCatagorizer_mod diff --git a/infrastructure/geom/GeomIO/GeomIO.F90 b/infrastructure/geom/GeomIO/GeomIO.F90 index 98fd6c6e19b..150f92753b3 100644 --- a/infrastructure/geom/GeomIO/GeomIO.F90 +++ b/infrastructure/geom/GeomIO/GeomIO.F90 @@ -1,15 +1,15 @@ module mapl_geomio - use mapl_GeomCatagorizer - use mapl_GeomPFIO - use mapl_sharedIO - use mapl_DataCollection - use mapl_DataCollectionVector - use mapl_DataCollectionManager - use mapl_pFIOServerBounds - use mapl_FieldBundleWrite - use mapl_FieldBundleRead - use mapl_CompressionSettings + use mapl_GeomCatagorizer_mod + use mapl_GeomPFIO_mod + use mapl_SharedIO_mod + use mapl_DataCollection_mod + use mapl_DataCollectionVector_mod + use mapl_DataCollectionManager_mod + use mapl_pFIOServerBounds_mod + use mapl_FieldBundleWrite_mod + use mapl_FieldBundleRead_mod + use mapl_CompressionSettings_mod implicit none end module mapl_geomio diff --git a/infrastructure/geom/GeomIO/Geom_PFIO.F90 b/infrastructure/geom/GeomIO/Geom_PFIO.F90 index 1813ef3c447..e678d4e2774 100644 --- a/infrastructure/geom/GeomIO/Geom_PFIO.F90 +++ b/infrastructure/geom/GeomIO/Geom_PFIO.F90 @@ -1,11 +1,11 @@ #include "MAPL.h" -module mapl_GeomPFIO - use mapl_ErrorHandling +module mapl_GeomPFIO_mod + use mapl_ErrorHandling_mod use ESMF use pfio, only: i_Clients, o_Clients, StringVariableMap, ArrayReference, FileMetadata, Variable - use mapl_Geom_API - use mapl_SharedIO + use mapl_Geom_API_mod + use mapl_SharedIO_mod implicit none private @@ -144,4 +144,4 @@ function get_esmf_geom(this) result(esmfgeom) esmfgeom=this%esmfgeom end function get_esmf_geom -end module mapl_GeomPFIO +end module mapl_GeomPFIO_mod diff --git a/infrastructure/geom/GeomIO/Grid_PFIO.F90 b/infrastructure/geom/GeomIO/Grid_PFIO.F90 index fd76adfc951..50c1cddbb02 100644 --- a/infrastructure/geom/GeomIO/Grid_PFIO.F90 +++ b/infrastructure/geom/GeomIO/Grid_PFIO.F90 @@ -1,17 +1,17 @@ #include "MAPL.h" -module mapl_GridPFIO +module mapl_GridPFIO_mod use, intrinsic :: iso_c_binding, only: c_ptr, c_loc - use mapl_ErrorHandling - use mapl_GeomPFIO - use mapl_SharedIO + use mapl_ErrorHandling_mod + use mapl_GeomPFIO_mod + use mapl_SharedIO_mod use ESMF use PFIO use MAPL_Constants, only: MAPL_RADIANS_TO_DEGREES - use MAPL_FieldPointerUtilities - use mapl_pFIOServerBounds, only: pFIOServerBounds, PFIO_BOUNDS_WRITE, PFIO_BOUNDS_READ + use mapl_FieldPointerUtilities_mod + use mapl_pFIOServerBounds_mod, only: pFIOServerBounds, PFIO_BOUNDS_WRITE, PFIO_BOUNDS_READ implicit none private @@ -211,4 +211,4 @@ subroutine request_data_from_file(this, filename, bundle, rc) _RETURN(_SUCCESS) end subroutine request_data_from_file -end module mapl_GridPFIO +end module mapl_GridPFIO_mod diff --git a/infrastructure/geom/GeomIO/SharedIO.F90 b/infrastructure/geom/GeomIO/SharedIO.F90 index d9087d5f849..26ae4e6d960 100644 --- a/infrastructure/geom/GeomIO/SharedIO.F90 +++ b/infrastructure/geom/GeomIO/SharedIO.F90 @@ -1,21 +1,21 @@ #include "MAPL.h" -module mapl_SharedIO +module mapl_SharedIO_mod - use mapl_ErrorHandlingMod - use mapl_FieldBundle_API + use mapl_ErrorHandling_mod + use mapl_FieldBundle_API_mod use mapl_Field_API - use mapl_VerticalStaggerLoc + use mapl_VerticalStaggerLoc_mod use pfio, only: FileMetaData, Variable, UnlimitedEntity use pfio, only: PFIO_UNLIMITED, PFIO_REAL32, PFIO_REAL64, PFIO_INT32, PFIO_INT64 use gFTL2_StringVector - use mapl_StringDictionary + use mapl_StringDictionary_mod use gFTL2_StringSet - use mapl_Geom_API - use mapl_UngriddedDims + use mapl_Geom_API_mod + use mapl_UngriddedDims_mod use, intrinsic :: iso_fortran_env, only: REAL64 - use mapl_UngriddedDim - use mapl_CompressionSettings + use mapl_UngriddedDim_mod + use mapl_CompressionSettings_mod use esmf implicit none(type,external) @@ -372,4 +372,4 @@ function cat_ungridded_dim_names(dims) result(dim_names) #undef JOIN end function cat_ungridded_dim_names -end module mapl_SharedIO +end module mapl_SharedIO_mod diff --git a/infrastructure/geom/GeomIO/pFIOServerBounds.F90 b/infrastructure/geom/GeomIO/pFIOServerBounds.F90 index 3afec29055c..a11fd585a39 100644 --- a/infrastructure/geom/GeomIO/pFIOServerBounds.F90 +++ b/infrastructure/geom/GeomIO/pFIOServerBounds.F90 @@ -1,12 +1,12 @@ #include "MAPL.h" -module mapl_pFIOServerBounds +module mapl_pFIOServerBounds_mod - use mapl_ErrorHandlingMod + use mapl_ErrorHandling_mod use esmf use pfio use gFTL2_StringVector - use mapl_Geom_API, only: MAPL_GridGet, mapl_GridGetGlobalCellCountPerDim + use mapl_Geom_API_mod, only: MAPL_GridGet, mapl_GridGetGlobalCellCountPerDim implicit none private @@ -208,4 +208,4 @@ function pFIOServerBounds_gridded_field(grid, field_shape, read_or_write, time_i _RETURN(_SUCCESS) end function pFIOServerBounds_gridded_field -end module mapl_pFIOServerBounds +end module mapl_pFIOServerBounds_mod diff --git a/infrastructure/geom/GeomIO/tests/CMakeLists.txt b/infrastructure/geom/GeomIO/tests/CMakeLists.txt index 0109ec76f67..ad8c0a5abb4 100644 --- a/infrastructure/geom/GeomIO/tests/CMakeLists.txt +++ b/infrastructure/geom/GeomIO/tests/CMakeLists.txt @@ -9,7 +9,7 @@ add_pfunit_ctest(MAPL.GeomIO.tests TEST_SOURCES ${test_srcs} LINK_LIBRARIES MAPL.GeomIO MAPL.pfunit EXTRA_INITIALIZE Initialize - EXTRA_USE MAPL_pFUnit_Initialize + EXTRA_USE mapl_pFUnit_Initialize_mod WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} MAX_PES 1 ) diff --git a/infrastructure/geom/GeomIO/tests/Test_FieldBundleIO.pf b/infrastructure/geom/GeomIO/tests/Test_FieldBundleIO.pf index dbd297f72a4..d126de32f90 100644 --- a/infrastructure/geom/GeomIO/tests/Test_FieldBundleIO.pf +++ b/infrastructure/geom/GeomIO/tests/Test_FieldBundleIO.pf @@ -5,10 +5,10 @@ module Test_FieldBundleIO use pfunit use esmf use esmf_TestMethod_mod - use mapl_Geom_API, only: GeomManager, MaplGeom, get_geom_manager + use mapl_Geom_API_mod, only: GeomManager, MaplGeom, get_geom_manager use mapl_Field_API, only: MAPL_FieldCreate, MAPL_FieldGet - use mapl_FieldBundle_API - use mapl_VerticalGrid_API + use mapl_FieldBundle_API_mod + use mapl_VerticalGrid_API_mod use mapl_geomio implicit none diff --git a/infrastructure/geom/GeomIO/tests/Test_SharedIO.pf b/infrastructure/geom/GeomIO/tests/Test_SharedIO.pf index 047899bec0a..4976b5f9d3c 100644 --- a/infrastructure/geom/GeomIO/tests/Test_SharedIO.pf +++ b/infrastructure/geom/GeomIO/tests/Test_SharedIO.pf @@ -1,9 +1,9 @@ module Test_SharedIO use pfunit - use mapl_SharedIO - use mapl_UngriddedDims - use mapl_UngriddedDim + use mapl_SharedIO_mod + use mapl_UngriddedDims_mod + use mapl_UngriddedDim_mod implicit none diff --git a/infrastructure/geom/geom/API.F90 b/infrastructure/geom/geom/API.F90 index d91a2c709fc..c16b87a767c 100644 --- a/infrastructure/geom/geom/API.F90 +++ b/infrastructure/geom/geom/API.F90 @@ -1,21 +1,21 @@ -module mapl_Geom_API +module mapl_Geom_API_mod - use mapl_KeywordEnforcer - use mapl_MaplGeom, only: MaplGeom - use mapl_GeomSpec, only: GeomSpec - use mapl_GeomManager, only: GeomManager, geom_manager, get_geom_manager, get_mapl_geom - use mapl_GeomUtilities, only: mapl_SameGeom, mapl_GeomGetId - use mapl_GeomAccessors, only: mapl_GeomGet => GeomGet, & + use mapl_KeywordEnforcer_mod + use mapl_MaplGeom_mod, only: MaplGeom + use mapl_GeomSpec_mod, only: GeomSpec + use mapl_GeomManager_mod, only: GeomManager, geom_manager, get_geom_manager, get_mapl_geom + use mapl_GeomUtilities_mod, only: mapl_SameGeom, mapl_GeomGetId + use mapl_GeomAccessors_mod, only: mapl_GeomGet => GeomGet, & mapl_GeomGetHorzIJIndex => GeomGetHorzIJIndex, & mapl_GridGetHorzIJIndex => GridGetHorzIJIndex - use mapl_GridAccessors, only: mapl_GridGet => GridGet, mapl_GridGetCoordinates => GridGetCoordinates, & + use mapl_GridAccessors_mod, only: mapl_GridGet => GridGet, mapl_GridGetCoordinates => GridGetCoordinates, & mapl_GridHasDE => grid_has_DE - use mapl_GridGetGlobal, only: mapl_GridGetGlobalCellCountPerDim => GridGetGlobalCellCountPerDim - use mapl_Subgrid, only: mapl_Interval => Interval, mapl_make_subgrids => make_subgrids - use mapl_XYGeomSpec, only: XYGeomSpec, make_XYGeomSpec, XY_COORD_STANDARD, XY_COORD_ABI - use mapl_XYGeomFactory, only: XYGeomFactory - use mapl_CubedSphereGeomSpec, only: CubedSphereGeomSpec, make_CubedSphereGeomSpec - use mapl_CubedSphereDecomposition, only: CubedSphereDecomposition, make_CubedSphereDecomposition + use mapl_GridGetGlobal_mod, only: mapl_GridGetGlobalCellCountPerDim => GridGetGlobalCellCountPerDim + use mapl_Subgrid_mod, only: mapl_Interval => Interval, mapl_make_subgrids => make_subgrids + use mapl_XYGeomSpec_mod, only: XYGeomSpec, make_XYGeomSpec, XY_COORD_STANDARD, XY_COORD_ABI + use mapl_XYGeomFactory_mod, only: XYGeomFactory + use mapl_CubedSphereGeomSpec_mod, only: CubedSphereGeomSpec, make_CubedSphereGeomSpec + use mapl_CubedSphereDecomposition_mod, only: CubedSphereDecomposition, make_CubedSphereDecomposition use esmf, only: ESMF_Grid, ESMF_Geom, ESMF_KIND_R4 implicit none(type,external) @@ -42,4 +42,4 @@ module mapl_Geom_API public :: CubedSphereGeomSpec, make_CubedSphereGeomSpec public :: CubedSphereDecomposition, make_CubedSphereDecomposition -end module mapl_Geom_API +end module mapl_Geom_API_mod diff --git a/infrastructure/geom/geom/CoordinateAxis.F90 b/infrastructure/geom/geom/CoordinateAxis.F90 index 618d810eb11..766bcc1af72 100644 --- a/infrastructure/geom/geom/CoordinateAxis.F90 +++ b/infrastructure/geom/geom/CoordinateAxis.F90 @@ -1,5 +1,5 @@ -module mapl_CoordinateAxis - use mapl_RangeMod +module mapl_CoordinateAxis_mod + use mapl_Range_mod use esmf, only: ESMF_KIND_R8 use pfio implicit none(type,external) @@ -106,5 +106,5 @@ end function get_coordinates_dim end interface -end module mapl_CoordinateAxis +end module mapl_CoordinateAxis_mod diff --git a/infrastructure/geom/geom/CoordinateAxis/equal_to.F90 b/infrastructure/geom/geom/CoordinateAxis/equal_to.F90 index b24eee102bf..036e4878688 100644 --- a/infrastructure/geom/geom/CoordinateAxis/equal_to.F90 +++ b/infrastructure/geom/geom/CoordinateAxis/equal_to.F90 @@ -1,7 +1,7 @@ #include "MAPL.h" -submodule (mapl_CoordinateAxis) equal_to_smod - use mapl_ErrorHandling +submodule (mapl_CoordinateAxis_mod) equal_to_smod + use mapl_ErrorHandling_mod use gftl2_StringVector implicit none(type,external) diff --git a/infrastructure/geom/geom/CoordinateAxis/get_centers.F90 b/infrastructure/geom/geom/CoordinateAxis/get_centers.F90 index a80605bd426..be2eb1d4fd9 100644 --- a/infrastructure/geom/geom/CoordinateAxis/get_centers.F90 +++ b/infrastructure/geom/geom/CoordinateAxis/get_centers.F90 @@ -1,7 +1,7 @@ #include "MAPL.h" -submodule (mapl_CoordinateAxis) get_centers_smod - use mapl_ErrorHandling +submodule (mapl_CoordinateAxis_mod) get_centers_smod + use mapl_ErrorHandling_mod use gftl2_StringVector implicit none(type,external) diff --git a/infrastructure/geom/geom/CoordinateAxis/get_coordinates_dim.F90 b/infrastructure/geom/geom/CoordinateAxis/get_coordinates_dim.F90 index 8462db3e8d1..927cf3c4473 100644 --- a/infrastructure/geom/geom/CoordinateAxis/get_coordinates_dim.F90 +++ b/infrastructure/geom/geom/CoordinateAxis/get_coordinates_dim.F90 @@ -1,7 +1,7 @@ #include "MAPL.h" -submodule (mapl_CoordinateAxis) get_coordinates_dim_smod - use mapl_ErrorHandling +submodule (mapl_CoordinateAxis_mod) get_coordinates_dim_smod + use mapl_ErrorHandling_mod use gftl2_StringVector use, intrinsic :: iso_fortran_env, only: REAL32, REAL64 implicit none(type,external) diff --git a/infrastructure/geom/geom/CoordinateAxis/get_corners.F90 b/infrastructure/geom/geom/CoordinateAxis/get_corners.F90 index 68b2c792ee8..2f414a9bb45 100644 --- a/infrastructure/geom/geom/CoordinateAxis/get_corners.F90 +++ b/infrastructure/geom/geom/CoordinateAxis/get_corners.F90 @@ -1,5 +1,5 @@ #include "MAPL.h" -submodule (mapl_CoordinateAxis) get_corners_smod +submodule (mapl_CoordinateAxis_mod) get_corners_smod implicit none(type,external) contains diff --git a/infrastructure/geom/geom/CoordinateAxis/get_dim_name.F90 b/infrastructure/geom/geom/CoordinateAxis/get_dim_name.F90 index 7a5c3537161..4b98af67906 100644 --- a/infrastructure/geom/geom/CoordinateAxis/get_dim_name.F90 +++ b/infrastructure/geom/geom/CoordinateAxis/get_dim_name.F90 @@ -1,8 +1,8 @@ #include "MAPL.h" -submodule (mapl_CoordinateAxis) get_dim_name_smod +submodule (mapl_CoordinateAxis_mod) get_dim_name_smod use esmf, only: ESMF_UtilStringLowerCase - use mapl_ErrorHandling + use mapl_ErrorHandling_mod use gftl2_StringVector implicit none(type,external) diff --git a/infrastructure/geom/geom/CoordinateAxis/get_extent.F90 b/infrastructure/geom/geom/CoordinateAxis/get_extent.F90 index 66399738c36..cda01006359 100644 --- a/infrastructure/geom/geom/CoordinateAxis/get_extent.F90 +++ b/infrastructure/geom/geom/CoordinateAxis/get_extent.F90 @@ -1,7 +1,7 @@ #include "MAPL.h" -submodule (mapl_CoordinateAxis) get_extent_smod - use mapl_ErrorHandling +submodule (mapl_CoordinateAxis_mod) get_extent_smod + use mapl_ErrorHandling_mod use gftl2_StringVector implicit none(type,external) diff --git a/infrastructure/geom/geom/CoordinateAxis/is_periodic.F90 b/infrastructure/geom/geom/CoordinateAxis/is_periodic.F90 index 2f6e699b690..ceb00109b6e 100644 --- a/infrastructure/geom/geom/CoordinateAxis/is_periodic.F90 +++ b/infrastructure/geom/geom/CoordinateAxis/is_periodic.F90 @@ -1,7 +1,7 @@ #include "MAPL.h" -submodule (mapl_CoordinateAxis) is_periodic_smod - use mapl_ErrorHandling +submodule (mapl_CoordinateAxis_mod) is_periodic_smod + use mapl_ErrorHandling_mod use gftl2_StringVector implicit none(type,external) diff --git a/infrastructure/geom/geom/CoordinateAxis/new_CoordinateAxis.F90 b/infrastructure/geom/geom/CoordinateAxis/new_CoordinateAxis.F90 index a0facce30e8..2ef41bcce53 100644 --- a/infrastructure/geom/geom/CoordinateAxis/new_CoordinateAxis.F90 +++ b/infrastructure/geom/geom/CoordinateAxis/new_CoordinateAxis.F90 @@ -1,7 +1,7 @@ #include "MAPL.h" -submodule (mapl_CoordinateAxis) new_CoordinateAxis_smod - use mapl_ErrorHandling +submodule (mapl_CoordinateAxis_mod) new_CoordinateAxis_smod + use mapl_ErrorHandling_mod use gftl2_StringVector implicit none(type,external) diff --git a/infrastructure/geom/geom/CoordinateAxis/not_equal_to.F90 b/infrastructure/geom/geom/CoordinateAxis/not_equal_to.F90 index b983b688d5f..cd87801a89e 100644 --- a/infrastructure/geom/geom/CoordinateAxis/not_equal_to.F90 +++ b/infrastructure/geom/geom/CoordinateAxis/not_equal_to.F90 @@ -1,7 +1,7 @@ #include "MAPL.h" -submodule (mapl_CoordinateAxis) not_equal_to_smod - use mapl_ErrorHandling +submodule (mapl_CoordinateAxis_mod) not_equal_to_smod + use mapl_ErrorHandling_mod use gftl2_StringVector implicit none(type,external) diff --git a/infrastructure/geom/geom/CubedSphere/CubedSphereDecomposition.F90 b/infrastructure/geom/geom/CubedSphere/CubedSphereDecomposition.F90 index 7d0c8597e08..39f368be77a 100644 --- a/infrastructure/geom/geom/CubedSphere/CubedSphereDecomposition.F90 +++ b/infrastructure/geom/geom/CubedSphere/CubedSphereDecomposition.F90 @@ -1,5 +1,5 @@ -module mapl_CubedSphereDecomposition - use mapl_KeywordEnforcer +module mapl_CubedSphereDecomposition_mod + use mapl_KeywordEnforcer_mod use esmf implicit none private @@ -49,6 +49,7 @@ end function new_CubedSphereDecomposition_basic ! Keyword enforced to avoid ambiguity with '_topo' interface module function new_CubedSphereDecomposition_petcount(dims, unusable, petCount) result(decomp) + use mapl_KeywordEnforcer_mod type(CubedSphereDecomposition) :: decomp integer, intent(in) :: dims(2) class(KeywordEnforcer), optional, intent(in) :: unusable @@ -57,6 +58,7 @@ end function new_CubedSphereDecomposition_petcount ! Keyword enforced to avoid ambiguity with '_petcount' interface module function new_CubedSphereDecomposition_topo(dims, unusable, topology) result(decomp) + use mapl_KeywordEnforcer_mod type(CubedSphereDecomposition) :: decomp integer, intent(in) :: dims(2) class(KeywordEnforcer), optional, intent(in) :: unusable @@ -102,5 +104,5 @@ end function not_equal_to end interface -end module mapl_CubedSphereDecomposition +end module mapl_CubedSphereDecomposition_mod diff --git a/infrastructure/geom/geom/CubedSphere/CubedSphereDecomposition_smod.F90 b/infrastructure/geom/geom/CubedSphere/CubedSphereDecomposition_smod.F90 index dd0067aa2cd..f6e86ff717b 100644 --- a/infrastructure/geom/geom/CubedSphere/CubedSphereDecomposition_smod.F90 +++ b/infrastructure/geom/geom/CubedSphere/CubedSphereDecomposition_smod.F90 @@ -1,9 +1,9 @@ #include "MAPL.h" -submodule (mapl_CubedSphereDecomposition) CubedSphereDecomposition_smod +submodule (mapl_CubedSphereDecomposition_mod) CubedSphereDecomposition_smod - use mapl_Partition - use mapl_ErrorHandlingMod + use mapl_Partition_mod + use mapl_ErrorHandling_mod implicit none @@ -19,7 +19,7 @@ module function new_CubedSphereDecomposition_basic(x_distribution, y_distributio end function new_CubedSphereDecomposition_basic module function new_CubedSphereDecomposition_petcount(dims, unusable, petCount) result(decomp) - use mapl_KeywordEnforcer + use mapl_KeywordEnforcer_mod type(CubedSphereDecomposition) :: decomp integer, intent(in) :: dims(2) class(KeywordEnforcer), optional, intent(in) :: unusable @@ -42,7 +42,7 @@ module function new_CubedSphereDecomposition_petcount(dims, unusable, petCount) end function new_CubedSphereDecomposition_petcount module function new_CubedSphereDecomposition_topo(dims, unusable, topology) result(decomp) - use mapl_KeywordEnforcer + use mapl_KeywordEnforcer_mod type(CubedSphereDecomposition) :: decomp integer, intent(in) :: dims(2) class(KeywordEnforcer), optional, intent(in) :: unusable diff --git a/infrastructure/geom/geom/CubedSphere/CubedSphereGeomFactory.F90 b/infrastructure/geom/geom/CubedSphere/CubedSphereGeomFactory.F90 index c5805994805..7bf62bfa93e 100644 --- a/infrastructure/geom/geom/CubedSphere/CubedSphereGeomFactory.F90 +++ b/infrastructure/geom/geom/CubedSphere/CubedSphereGeomFactory.F90 @@ -1,12 +1,12 @@ #include "MAPL.h" -module mapl_CubedSphereGeomFactory - use mapl_GeomSpec - use mapl_GeomFactory - use mapl_CubedSphereGeomSpec - use mapl_KeywordEnforcerMod +module mapl_CubedSphereGeomFactory_mod + use mapl_GeomSpec_mod + use mapl_GeomFactory_mod + use mapl_CubedSphereGeomSpec_mod + use mapl_KeywordEnforcer_mod use gftl2_StringVector - use mapl_StringDictionary + use mapl_StringDictionary_mod use pfio use esmf implicit none @@ -35,7 +35,7 @@ module mapl_CubedSphereGeomFactory interface module function make_geom_spec_from_hconfig(this, hconfig, rc) result(geom_spec) - use mapl_GeomSpec, only: GeomSpec + use mapl_GeomSpec_mod, only: GeomSpec use esmf, only: ESMF_HConfig class(GeomSpec), allocatable :: geom_spec class(CubedSphereGeomFactory), intent(in) :: this @@ -45,7 +45,7 @@ end function make_geom_spec_from_hconfig module function make_geom_spec_from_metadata(this, file_metadata, rc) result(geom_spec) - use mapl_GeomSpec, only: GeomSpec + use mapl_GeomSpec_mod, only: GeomSpec use pfio, only: FileMetadata class(GeomSpec), allocatable :: geom_spec class(CubedSphereGeomFactory), intent(in) :: this @@ -55,7 +55,7 @@ end function make_geom_spec_from_metadata logical module function supports_spec(this, geom_spec) result(supports) - use mapl_GeomSpec, only: GeomSpec + use mapl_GeomSpec_mod, only: GeomSpec class(CubedSphereGeomFactory), intent(in) :: this class(GeomSpec), intent(in) :: geom_spec end function supports_spec @@ -77,7 +77,7 @@ end function supports_metadata module function make_geom(this, geom_spec, rc) result(geom) - use mapl_GeomSpec, only: GeomSpec + use mapl_GeomSpec_mod, only: GeomSpec use esmf, only: ESMF_Geom type(ESMF_Geom) :: geom class(CubedSphereGeomFactory), intent(in) :: this @@ -87,7 +87,7 @@ end function make_geom module function create_basic_grid(spec, unusable, name, rc) result(grid) - use mapl_KeywordEnforcer + use mapl_KeywordEnforcer_mod type(ESMF_Grid) :: grid type(CubedSphereGeomSpec), intent(in) :: spec class(KeywordEnforcer), optional, intent(in) :: unusable @@ -110,7 +110,7 @@ module function make_variable_attributes(this, geom_spec, rc) result(variable_at end function make_variable_attributes module function make_file_metadata(this, geom_spec, unusable, chunksizes, rc) result(file_metadata) - use mapl_KeywordEnforcerMod + use mapl_KeywordEnforcer_mod type(FileMetadata) :: file_metadata class(CubedSphereGeomFactory), intent(in) :: this class(GeomSpec), intent(in) :: geom_spec @@ -120,5 +120,5 @@ module function make_file_metadata(this, geom_spec, unusable, chunksizes, rc) re end function make_file_metadata end interface -end module mapl_CubedSphereGeomFactory +end module mapl_CubedSphereGeomFactory_mod diff --git a/infrastructure/geom/geom/CubedSphere/CubedSphereGeomFactory_smod.F90 b/infrastructure/geom/geom/CubedSphere/CubedSphereGeomFactory_smod.F90 index ad75a5da082..274f456a42b 100644 --- a/infrastructure/geom/geom/CubedSphere/CubedSphereGeomFactory_smod.F90 +++ b/infrastructure/geom/geom/CubedSphere/CubedSphereGeomFactory_smod.F90 @@ -1,20 +1,20 @@ #include "MAPL.h" -submodule (mapl_CubedSphereGeomFactory) CubedSphereGeomFactory_smod - - use mapl_GeomSpec - use mapl_LonAxis - use mapl_LatAxis - use mapl_CubedSphereDecomposition - use mapl_CubedSphereGeomSpec - use mapl_MinMaxMod - use mapl_ErrorHandlingMod - use mapl_Constants +submodule (mapl_CubedSphereGeomFactory_mod) CubedSphereGeomFactory_smod + + use mapl_GeomSpec_mod + use mapl_LonAxis_mod + use mapl_LatAxis_mod + use mapl_CubedSphereDecomposition_mod + use mapl_CubedSphereGeomSpec_mod + use mapl_MinMax_mod + use mapl_ErrorHandling_mod + use MAPL_Constants use pFIO use gFTL2_StringVector - use mapl_StringDictionary + use mapl_StringDictionary_mod use esmf - use mapl_KeywordEnforcer, only: KE => KeywordEnforcer + use mapl_KeywordEnforcer_mod, only: KE => KeywordEnforcer implicit none(type,external) @@ -125,6 +125,7 @@ function typesafe_make_geom(spec, rc) result(geom) end function typesafe_make_geom module function create_basic_grid(spec, unusable, name, rc) result(grid) + use mapl_KeywordEnforcer_mod type(ESMF_Grid) :: grid type(CubedSphereGeomSpec), intent(in) :: spec class(KE), optional, intent(in) :: unusable @@ -209,6 +210,7 @@ module function make_variable_attributes(this, geom_spec, rc) result(variable_at end function make_variable_attributes module function make_file_metadata(this, geom_spec, unusable, chunksizes, rc) result(file_metadata) + use mapl_KeywordEnforcer_mod type(FileMetadata) :: file_metadata class(CubedSphereGeomFactory), intent(in) :: this class(KE), optional, intent(in) :: unusable diff --git a/infrastructure/geom/geom/CubedSphere/CubedSphereGeomSpec.F90 b/infrastructure/geom/geom/CubedSphere/CubedSphereGeomSpec.F90 index 2d869a6b587..90e7d6263ef 100644 --- a/infrastructure/geom/geom/CubedSphere/CubedSphereGeomSpec.F90 +++ b/infrastructure/geom/geom/CubedSphere/CubedSphereGeomSpec.F90 @@ -1,8 +1,8 @@ #include "MAPL.h" -module mapl_CubedSphereGeomSpec - use mapl_GeomSpec - use mapl_CubedSphereDecomposition +module mapl_CubedSphereGeomSpec_mod + use mapl_GeomSpec_mod + use mapl_CubedSphereDecomposition_mod use esmf, only: ESMF_KIND_R4, ESMF_KIND_R8, ESMF_CubedSphereTransform_Args implicit none real(kind=ESMF_KIND_R8) :: undef_schmidt = 1d15 @@ -137,4 +137,4 @@ end subroutine get_horz_ij_index_r8 end interface -end module mapl_CubedSphereGeomSpec +end module mapl_CubedSphereGeomSpec_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 index e52c40ef969..a415bc2be0c 100644 --- a/infrastructure/geom/geom/CubedSphere/CubedSphereGeomSpec/get_horz_ij_index.F90 +++ b/infrastructure/geom/geom/CubedSphere/CubedSphereGeomSpec/get_horz_ij_index.F90 @@ -1,9 +1,9 @@ #include "MAPL.h" -submodule (mapl_CubedSphereGeomSpec) CubedSphereGeomSpec_get_horz_ij_index_smod +submodule (mapl_CubedSphereGeomSpec_mod) CubedSphereGeomSpec_get_horz_ij_index_smod use MAPL_Constants, only: MAPL_PI_R8 - use mapl_ErrorHandling + 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 index a8274e00ac2..6ce8531e2c0 100644 --- a/infrastructure/geom/geom/CubedSphere/CubedSphereGeomSpec_smod.F90 +++ b/infrastructure/geom/geom/CubedSphere/CubedSphereGeomSpec_smod.F90 @@ -1,13 +1,13 @@ #include "MAPL.h" -submodule (mapl_CubedSphereGeomSpec) CubedSphereGeomSpec_smod +submodule (mapl_CubedSphereGeomSpec_mod) CubedSphereGeomSpec_smod - use mapl_CoordinateAxis - use mapl_GeomSpec + use mapl_CoordinateAxis_mod + use mapl_GeomSpec_mod use pfio - use MAPL_RangeMod - use mapl_ErrorHandling - use mapl_Constants + use mapl_Range_mod + use mapl_ErrorHandling_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 index 6a3bd9a0564..c3d7f29b791 100644 --- a/infrastructure/geom/geom/CubedSphere/CubedSphereGetGlobalHorzIJIndex.F90 +++ b/infrastructure/geom/geom/CubedSphere/CubedSphereGetGlobalHorzIJIndex.F90 @@ -11,14 +11,14 @@ #include "MAPL.h" -module mapl_CubedSphereGetGlobalHorzIJIndex +module mapl_CubedSphereGetGlobalHorzIJIndex_mod use ESMF, only: ESMF_Grid, ESMF_Info, ESMF_KIND_R8, & ESMF_InfoGetFromHost, ESMF_InfoIsPresent, ESMF_InfoGet, & ESMF_GridGet, ESMF_STAGGERLOC_CENTER, ESMF_MAXDIM - use mapl_GridAccessors, only: GridGet + use mapl_GridAccessors_mod, only: GridGet use MAPL_Constants, only: MAPL_PI_R8, MAPL_DEGREES_TO_RADIANS_R8 - use MAPL_ErrorHandling + use mapl_ErrorHandling_mod implicit none(type, external) private @@ -305,4 +305,4 @@ logical function grid_is_ok_(grid, stretched, IM_WORLD, dalpha, alpha, shift) re end function grid_is_ok_ -end module mapl_CubedSphereGetGlobalHorzIJIndex +end module mapl_CubedSphereGetGlobalHorzIJIndex_mod diff --git a/infrastructure/geom/geom/EASE/EASEConversion.F90 b/infrastructure/geom/geom/EASE/EASEConversion.F90 index f10858bf0c3..d9f13c337a0 100644 --- a/infrastructure/geom/geom/EASE/EASEConversion.F90 +++ b/infrastructure/geom/geom/EASE/EASEConversion.F90 @@ -1,6 +1,6 @@ #include "MAPL.h" -module mapl_EASEConversion +module mapl_EASEConversion_mod ! ===================================================================================== ! Fortran routines for conversion of Equal-Area Scalable Earth (EASE) grid coordinates @@ -12,7 +12,7 @@ module mapl_EASEConversion ! ===================================================================================== use, intrinsic :: iso_fortran_env, only: REAL64 - use mapl_ErrorHandlingMod + use mapl_ErrorHandling_mod implicit none private @@ -373,4 +373,4 @@ subroutine easeV2_get_params(grid, map_scale_m, cols, rows, r0, s0, rc) _RETURN(_SUCCESS) end subroutine easeV2_get_params -end module mapl_EASEConversion +end module mapl_EASEConversion_mod diff --git a/infrastructure/geom/geom/EASE/EASECoords.F90 b/infrastructure/geom/geom/EASE/EASECoords.F90 index 5fa617293b2..be54ad2fa7d 100644 --- a/infrastructure/geom/geom/EASE/EASECoords.F90 +++ b/infrastructure/geom/geom/EASE/EASECoords.F90 @@ -1,13 +1,13 @@ #include "MAPL.h" -module mapl_EASECoords +module mapl_EASECoords_mod ! Private helper module: coordinate computation for EASE grids. ! Used by EASEGeomFactory submodules; not part of the public API. - use mapl_EASEConversion - use mapl_EASEGeomSpec - use mapl_KeywordEnforcer, only: KE => KeywordEnforcer - use mapl_ErrorHandlingMod + use mapl_EASEConversion_mod + use mapl_EASEGeomSpec_mod + use mapl_KeywordEnforcer_mod, only: KE => KeywordEnforcer + use mapl_ErrorHandling_mod use, intrinsic :: iso_fortran_env, only: REAL64 implicit none @@ -89,4 +89,4 @@ subroutine compute_lats(spec, unusable, centers, corners, rc) _UNUSED_DUMMY(unusable) end subroutine compute_lats -end module mapl_EASECoords +end module mapl_EASECoords_mod diff --git a/infrastructure/geom/geom/EASE/EASEDecomposition.F90 b/infrastructure/geom/geom/EASE/EASEDecomposition.F90 index 1a31278f805..4359be24aae 100644 --- a/infrastructure/geom/geom/EASE/EASEDecomposition.F90 +++ b/infrastructure/geom/geom/EASE/EASEDecomposition.F90 @@ -1,10 +1,10 @@ #include "MAPL.h" -module mapl_EASEDecomposition +module mapl_EASEDecomposition_mod - use mapl_Partition - use mapl_KeywordEnforcer, only: KE => KeywordEnforcer - use mapl_ErrorHandling + use mapl_Partition_mod + use mapl_KeywordEnforcer_mod, only: KE => KeywordEnforcer + use mapl_ErrorHandling_mod use esmf implicit none @@ -137,4 +137,4 @@ elemental function not_equal_to(a, b) result(neq) neq = .not. (a == b) end function not_equal_to -end module mapl_EASEDecomposition +end module mapl_EASEDecomposition_mod diff --git a/infrastructure/geom/geom/EASE/EASEGeomFactory.F90 b/infrastructure/geom/geom/EASE/EASEGeomFactory.F90 index d9e009135a2..5a218e3c7d3 100644 --- a/infrastructure/geom/geom/EASE/EASEGeomFactory.F90 +++ b/infrastructure/geom/geom/EASE/EASEGeomFactory.F90 @@ -1,17 +1,17 @@ #include "MAPL.h" -module mapl_EASEGeomFactory +module mapl_EASEGeomFactory_mod - use mapl_GeomSpec - use mapl_GeomFactory - use mapl_EASEGeomSpec - use mapl_KeywordEnforcerMod - use mapl_ErrorHandlingMod + use mapl_GeomSpec_mod + use mapl_GeomFactory_mod + use mapl_EASEGeomSpec_mod + use mapl_KeywordEnforcer_mod + use mapl_ErrorHandling_mod use gftl2_StringVector - use mapl_StringDictionary + use mapl_StringDictionary_mod use pfio use esmf - use mapl_KeywordEnforcer, only: KE => KeywordEnforcer + use mapl_KeywordEnforcer_mod, only: KE => KeywordEnforcer implicit none private @@ -36,7 +36,7 @@ module mapl_EASEGeomFactory interface module function make_geom(this, geom_spec, rc) result(geom) - use mapl_GeomSpec, only: GeomSpec + use mapl_GeomSpec_mod, only: GeomSpec use esmf, only: ESMF_Geom type(ESMF_Geom) :: geom class(EASEGeomFactory), intent(in) :: this @@ -45,7 +45,7 @@ module function make_geom(this, geom_spec, rc) result(geom) end function make_geom module function create_basic_grid(spec, unusable, name, rc) result(grid) - use mapl_KeywordEnforcer + use mapl_KeywordEnforcer_mod type(ESMF_Grid) :: grid type(EASEGeomSpec), intent(in) :: spec class(KeywordEnforcer), optional, intent(in) :: unusable @@ -54,7 +54,7 @@ module function create_basic_grid(spec, unusable, name, rc) result(grid) end function create_basic_grid module subroutine fill_coordinates(spec, grid, unusable, rc) - use mapl_KeywordEnforcer + use mapl_KeywordEnforcer_mod type(EASEGeomSpec), intent(in) :: spec type(ESMF_Grid), intent(inout) :: grid class(KeywordEnforcer), optional, intent(in) :: unusable @@ -76,6 +76,7 @@ module function make_variable_attributes(this, geom_spec, rc) result(variable_at end function make_variable_attributes module function make_file_metadata(this, geom_spec, unusable, chunksizes, rc) result(file_metadata) + use mapl_KeywordEnforcer_mod type(FileMetadata) :: file_metadata class(EASEGeomFactory), intent(in) :: this class(GeomSpec), intent(in) :: geom_spec @@ -85,6 +86,7 @@ module function make_file_metadata(this, geom_spec, unusable, chunksizes, rc) re end function make_file_metadata module function typesafe_make_file_metadata(geom_spec, unusable, chunksizes, rc) result(file_metadata) + use mapl_KeywordEnforcer_mod type(FileMetadata) :: file_metadata type(EASEGeomSpec), intent(in) :: geom_spec class(KE), optional, intent(in) :: unusable @@ -169,4 +171,4 @@ logical function supports_spec(this, geom_spec) result(supports) _UNUSED_DUMMY(this) end function supports_spec -end module mapl_EASEGeomFactory +end module mapl_EASEGeomFactory_mod diff --git a/infrastructure/geom/geom/EASE/EASEGeomFactory/create_basic_grid.F90 b/infrastructure/geom/geom/EASE/EASEGeomFactory/create_basic_grid.F90 index 14bbdd73a34..cfe5b8f475d 100644 --- a/infrastructure/geom/geom/EASE/EASEGeomFactory/create_basic_grid.F90 +++ b/infrastructure/geom/geom/EASE/EASEGeomFactory/create_basic_grid.F90 @@ -1,12 +1,12 @@ #include "MAPL.h" -submodule (mapl_EASEGeomFactory) create_basic_grid_smod - use mapl_GeomSpec - use mapl_EASEGeomSpec - use mapl_EASEDecomposition - use mapl_ErrorHandlingMod +submodule (mapl_EASEGeomFactory_mod) create_basic_grid_smod + use mapl_GeomSpec_mod + use mapl_EASEGeomSpec_mod + use mapl_EASEDecomposition_mod + use mapl_ErrorHandling_mod use esmf - use mapl_KeywordEnforcer, only: KE => KeywordEnforcer + use mapl_KeywordEnforcer_mod, only: KE => KeywordEnforcer implicit none (type, external) contains @@ -17,6 +17,7 @@ ! - Have no poles ('XY': poles outside the grid domain) ! - Need 2D coordinate arrays (coordDep1/2 = [1,2]) module function create_basic_grid(spec, unusable, name, rc) result(grid) + use mapl_KeywordEnforcer_mod type(ESMF_Grid) :: grid type(EASEGeomSpec), intent(in) :: spec class(KE), optional, intent(in) :: unusable diff --git a/infrastructure/geom/geom/EASE/EASEGeomFactory/fill_coordinates.F90 b/infrastructure/geom/geom/EASE/EASEGeomFactory/fill_coordinates.F90 index d10808c4483..17c3b19a79c 100644 --- a/infrastructure/geom/geom/EASE/EASEGeomFactory/fill_coordinates.F90 +++ b/infrastructure/geom/geom/EASE/EASEGeomFactory/fill_coordinates.F90 @@ -1,11 +1,11 @@ #include "MAPL.h" -submodule (mapl_EASEGeomFactory) fill_coordinates_smod - use mapl_GeomSpec - use mapl_EASEGeomSpec - use mapl_EASECoords - use mapl_ErrorHandlingMod - use mapl_KeywordEnforcer, only: KE => KeywordEnforcer +submodule (mapl_EASEGeomFactory_mod) fill_coordinates_smod + use mapl_GeomSpec_mod + use mapl_EASEGeomSpec_mod + use mapl_EASECoords_mod + use mapl_ErrorHandling_mod + use mapl_KeywordEnforcer_mod, only: KE => KeywordEnforcer use esmf use, intrinsic :: iso_fortran_env, only: REAL64 implicit none (type, external) @@ -16,6 +16,7 @@ ! EASE grids store 2D coordinates (coordDep1/2 = [1,2]), so both ! lon and lat arrays are 2D even though they vary only along one axis. module subroutine fill_coordinates(spec, grid, unusable, rc) + use mapl_KeywordEnforcer_mod type(EASEGeomSpec), intent(in) :: spec type(ESMF_Grid), intent(inout) :: grid class(KE), optional, intent(in) :: unusable diff --git a/infrastructure/geom/geom/EASE/EASEGeomFactory/make_file_metadata.F90 b/infrastructure/geom/geom/EASE/EASEGeomFactory/make_file_metadata.F90 index 2fd3d3baba4..fc4fd523a22 100644 --- a/infrastructure/geom/geom/EASE/EASEGeomFactory/make_file_metadata.F90 +++ b/infrastructure/geom/geom/EASE/EASEGeomFactory/make_file_metadata.F90 @@ -1,16 +1,17 @@ #include "MAPL.h" -submodule (mapl_EASEGeomFactory) make_file_metadata_smod - use mapl_GeomSpec - use mapl_EASEGeomSpec - use mapl_ErrorHandlingMod +submodule (mapl_EASEGeomFactory_mod) make_file_metadata_smod + use mapl_GeomSpec_mod + use mapl_EASEGeomSpec_mod + use mapl_ErrorHandling_mod use pfio - use mapl_KeywordEnforcer, only: KE => KeywordEnforcer + use mapl_KeywordEnforcer_mod, only: KE => KeywordEnforcer implicit none (type, external) contains module function make_file_metadata(this, geom_spec, unusable, chunksizes, rc) result(file_metadata) + use mapl_KeywordEnforcer_mod type(FileMetadata) :: file_metadata class(EASEGeomFactory), intent(in) :: this class(GeomSpec), intent(in) :: geom_spec diff --git a/infrastructure/geom/geom/EASE/EASEGeomFactory/make_geom.F90 b/infrastructure/geom/geom/EASE/EASEGeomFactory/make_geom.F90 index b9341a594d8..b870830ab8f 100644 --- a/infrastructure/geom/geom/EASE/EASEGeomFactory/make_geom.F90 +++ b/infrastructure/geom/geom/EASE/EASEGeomFactory/make_geom.F90 @@ -1,9 +1,9 @@ #include "MAPL.h" -submodule (mapl_EASEGeomFactory) make_geom_smod - use mapl_GeomSpec - use mapl_EASEGeomSpec - use mapl_ErrorHandlingMod +submodule (mapl_EASEGeomFactory_mod) make_geom_smod + use mapl_GeomSpec_mod + use mapl_EASEGeomSpec_mod + use mapl_ErrorHandling_mod use esmf implicit none (type, external) diff --git a/infrastructure/geom/geom/EASE/EASEGeomFactory/make_gridded_dims.F90 b/infrastructure/geom/geom/EASE/EASEGeomFactory/make_gridded_dims.F90 index aa03a5161e3..b4acca93fa6 100644 --- a/infrastructure/geom/geom/EASE/EASEGeomFactory/make_gridded_dims.F90 +++ b/infrastructure/geom/geom/EASE/EASEGeomFactory/make_gridded_dims.F90 @@ -1,9 +1,9 @@ #include "MAPL.h" -submodule (mapl_EASEGeomFactory) make_gridded_dims_smod - use mapl_GeomSpec - use mapl_EASEGeomSpec - use mapl_ErrorHandlingMod +submodule (mapl_EASEGeomFactory_mod) make_gridded_dims_smod + use mapl_GeomSpec_mod + use mapl_EASEGeomSpec_mod + use mapl_ErrorHandling_mod use gFTL2_StringVector implicit none (type, external) diff --git a/infrastructure/geom/geom/EASE/EASEGeomFactory/make_variable_attributes.F90 b/infrastructure/geom/geom/EASE/EASEGeomFactory/make_variable_attributes.F90 index 534aed63180..f493cbd5b21 100644 --- a/infrastructure/geom/geom/EASE/EASEGeomFactory/make_variable_attributes.F90 +++ b/infrastructure/geom/geom/EASE/EASEGeomFactory/make_variable_attributes.F90 @@ -1,10 +1,10 @@ #include "MAPL.h" -submodule (mapl_EASEGeomFactory) make_variable_attributes_smod - use mapl_GeomSpec - use mapl_EASEGeomSpec - use mapl_ErrorHandlingMod - use mapl_StringDictionary +submodule (mapl_EASEGeomFactory_mod) make_variable_attributes_smod + use mapl_GeomSpec_mod + use mapl_EASEGeomSpec_mod + use mapl_ErrorHandling_mod + use mapl_StringDictionary_mod implicit none (type, external) contains diff --git a/infrastructure/geom/geom/EASE/EASEGeomFactory/typesafe_make_file_metadata.F90 b/infrastructure/geom/geom/EASE/EASEGeomFactory/typesafe_make_file_metadata.F90 index c3f7985a7e8..b62f6bb7e8c 100644 --- a/infrastructure/geom/geom/EASE/EASEGeomFactory/typesafe_make_file_metadata.F90 +++ b/infrastructure/geom/geom/EASE/EASEGeomFactory/typesafe_make_file_metadata.F90 @@ -1,18 +1,19 @@ #include "MAPL.h" -submodule (mapl_EASEGeomFactory) typesafe_make_file_metadata_smod - use mapl_GeomSpec - use mapl_EASEGeomSpec - use mapl_EASECoords - use mapl_ErrorHandlingMod +submodule (mapl_EASEGeomFactory_mod) typesafe_make_file_metadata_smod + use mapl_GeomSpec_mod + use mapl_EASEGeomSpec_mod + use mapl_EASECoords_mod + use mapl_ErrorHandling_mod use pfio - use mapl_KeywordEnforcer, only: KE => KeywordEnforcer + use mapl_KeywordEnforcer_mod, only: KE => KeywordEnforcer use, intrinsic :: iso_fortran_env, only: REAL64 implicit none (type, external) contains module function typesafe_make_file_metadata(geom_spec, unusable, chunksizes, rc) result(file_metadata) + use mapl_KeywordEnforcer_mod type(FileMetadata) :: file_metadata type(EASEGeomSpec), intent(in) :: geom_spec class(KE), optional, intent(in) :: unusable diff --git a/infrastructure/geom/geom/EASE/EASEGeomFactory/typesafe_make_geom.F90 b/infrastructure/geom/geom/EASE/EASEGeomFactory/typesafe_make_geom.F90 index aea3228edde..4e11bd49be5 100644 --- a/infrastructure/geom/geom/EASE/EASEGeomFactory/typesafe_make_geom.F90 +++ b/infrastructure/geom/geom/EASE/EASEGeomFactory/typesafe_make_geom.F90 @@ -1,9 +1,9 @@ #include "MAPL.h" -submodule (mapl_EASEGeomFactory) typesafe_make_geom_smod - use mapl_GeomSpec - use mapl_EASEGeomSpec - use mapl_ErrorHandlingMod +submodule (mapl_EASEGeomFactory_mod) typesafe_make_geom_smod + use mapl_GeomSpec_mod + use mapl_EASEGeomSpec_mod + use mapl_ErrorHandling_mod use esmf implicit none (type, external) diff --git a/infrastructure/geom/geom/EASE/EASEGeomSpec.F90 b/infrastructure/geom/geom/EASE/EASEGeomSpec.F90 index c4f502eaf2c..ba06d16367c 100644 --- a/infrastructure/geom/geom/EASE/EASEGeomSpec.F90 +++ b/infrastructure/geom/geom/EASE/EASEGeomSpec.F90 @@ -1,11 +1,11 @@ #include "MAPL.h" -module mapl_EASEGeomSpec +module mapl_EASEGeomSpec_mod - use mapl_GeomSpec - use mapl_EASEConversion - use mapl_EASEDecomposition - use mapl_ErrorHandlingMod + use mapl_GeomSpec_mod + use mapl_EASEConversion_mod + use mapl_EASEDecomposition_mod + use mapl_ErrorHandling_mod use esmf, only: ESMF_KIND_R4, ESMF_KIND_R8 implicit none @@ -158,4 +158,4 @@ integer function get_jm_world(this, rc) _RETURN(_SUCCESS) end function get_jm_world -end module mapl_EASEGeomSpec +end module mapl_EASEGeomSpec_mod diff --git a/infrastructure/geom/geom/EASE/EASEGeomSpec/equal_to.F90 b/infrastructure/geom/geom/EASE/EASEGeomSpec/equal_to.F90 index fe27d1f029e..66112fb4a5f 100644 --- a/infrastructure/geom/geom/EASE/EASEGeomSpec/equal_to.F90 +++ b/infrastructure/geom/geom/EASE/EASEGeomSpec/equal_to.F90 @@ -1,8 +1,8 @@ #include "MAPL.h" -submodule (mapl_EASEGeomSpec) equal_to_smod - use mapl_GeomSpec - use mapl_EASEDecomposition +submodule (mapl_EASEGeomSpec_mod) equal_to_smod + use mapl_GeomSpec_mod + use mapl_EASEDecomposition_mod implicit none (type, external) contains diff --git a/infrastructure/geom/geom/EASE/EASEGeomSpec/get_horz_ij_index.F90 b/infrastructure/geom/geom/EASE/EASEGeomSpec/get_horz_ij_index.F90 index f101fc61946..757737ecd3a 100644 --- a/infrastructure/geom/geom/EASE/EASEGeomSpec/get_horz_ij_index.F90 +++ b/infrastructure/geom/geom/EASE/EASEGeomSpec/get_horz_ij_index.F90 @@ -1,10 +1,10 @@ #include "MAPL.h" -submodule (mapl_EASEGeomSpec) get_horz_ij_index_smod +submodule (mapl_EASEGeomSpec_mod) get_horz_ij_index_smod - use mapl_EASEConversion + use mapl_EASEConversion_mod use MAPL_Constants, only: MAPL_RADIANS_TO_DEGREES - use mapl_ErrorHandling + use mapl_ErrorHandling_mod implicit none (type, external) diff --git a/infrastructure/geom/geom/EASE/EASEGeomSpec/make_EASEGeomSpec_from_hconfig.F90 b/infrastructure/geom/geom/EASE/EASEGeomSpec/make_EASEGeomSpec_from_hconfig.F90 index 8498e969da1..20713dadbe7 100644 --- a/infrastructure/geom/geom/EASE/EASEGeomSpec/make_EASEGeomSpec_from_hconfig.F90 +++ b/infrastructure/geom/geom/EASE/EASEGeomSpec/make_EASEGeomSpec_from_hconfig.F90 @@ -1,10 +1,10 @@ #include "MAPL.h" -submodule (mapl_EASEGeomSpec) make_EASEGeomSpec_from_hconfig_smod - use mapl_GeomSpec - use mapl_EASEConversion - use mapl_EASEDecomposition - use mapl_ErrorHandling +submodule (mapl_EASEGeomSpec_mod) make_EASEGeomSpec_from_hconfig_smod + use mapl_GeomSpec_mod + use mapl_EASEConversion_mod + use mapl_EASEDecomposition_mod + use mapl_ErrorHandling_mod use esmf implicit none (type, external) diff --git a/infrastructure/geom/geom/EASE/EASEGeomSpec/make_EASEGeomSpec_from_metadata.F90 b/infrastructure/geom/geom/EASE/EASEGeomSpec/make_EASEGeomSpec_from_metadata.F90 index 841d652b889..35cf0b10dd8 100644 --- a/infrastructure/geom/geom/EASE/EASEGeomSpec/make_EASEGeomSpec_from_metadata.F90 +++ b/infrastructure/geom/geom/EASE/EASEGeomSpec/make_EASEGeomSpec_from_metadata.F90 @@ -1,11 +1,11 @@ #include "MAPL.h" -submodule (mapl_EASEGeomSpec) make_EASEGeomSpec_from_metadata_smod - use mapl_GeomSpec - use mapl_EASEConversion - use mapl_EASEDecomposition +submodule (mapl_EASEGeomSpec_mod) make_EASEGeomSpec_from_metadata_smod + use mapl_GeomSpec_mod + use mapl_EASEConversion_mod + use mapl_EASEDecomposition_mod use pfio - use mapl_ErrorHandling + use mapl_ErrorHandling_mod use esmf implicit none (type, external) diff --git a/infrastructure/geom/geom/EASE/EASEGeomSpec/supports_hconfig.F90 b/infrastructure/geom/geom/EASE/EASEGeomSpec/supports_hconfig.F90 index f7df4866d13..b221a3c116a 100644 --- a/infrastructure/geom/geom/EASE/EASEGeomSpec/supports_hconfig.F90 +++ b/infrastructure/geom/geom/EASE/EASEGeomSpec/supports_hconfig.F90 @@ -1,8 +1,8 @@ #include "MAPL.h" -submodule (mapl_EASEGeomSpec) supports_hconfig_smod - use mapl_GeomSpec - use mapl_ErrorHandling +submodule (mapl_EASEGeomSpec_mod) supports_hconfig_smod + use mapl_GeomSpec_mod + use mapl_ErrorHandling_mod use esmf implicit none (type, external) diff --git a/infrastructure/geom/geom/EASE/EASEGeomSpec/supports_metadata.F90 b/infrastructure/geom/geom/EASE/EASEGeomSpec/supports_metadata.F90 index ef21ef8819e..d9110de317c 100644 --- a/infrastructure/geom/geom/EASE/EASEGeomSpec/supports_metadata.F90 +++ b/infrastructure/geom/geom/EASE/EASEGeomSpec/supports_metadata.F90 @@ -1,10 +1,10 @@ #include "MAPL.h" -submodule (mapl_EASEGeomSpec) supports_metadata_smod - use mapl_GeomSpec - use mapl_EASEConversion +submodule (mapl_EASEGeomSpec_mod) supports_metadata_smod + use mapl_GeomSpec_mod + use mapl_EASEConversion_mod use pfio - use mapl_ErrorHandling + use mapl_ErrorHandling_mod implicit none (type, external) contains diff --git a/infrastructure/geom/geom/GeomFactory.F90 b/infrastructure/geom/geom/GeomFactory.F90 index 63067d3b7ac..781fa68d7da 100644 --- a/infrastructure/geom/geom/GeomFactory.F90 +++ b/infrastructure/geom/geom/GeomFactory.F90 @@ -1,6 +1,6 @@ #include "MAPL.h" -module mapl_GeomFactory +module mapl_GeomFactory_mod implicit none private @@ -31,7 +31,7 @@ module mapl_GeomFactory function I_make_geom_spec_from_hconfig(this, hconfig, rc) result(spec) use esmf, only: ESMF_HConfig - use mapl_GeomSpec + use mapl_GeomSpec_mod import GeomFactory implicit none @@ -43,7 +43,7 @@ end function I_make_geom_spec_from_hconfig function I_make_geom_spec_from_metadata(this, file_metadata, rc) result(spec) use pfio_FileMetadataMod - use mapl_GeomSpec + use mapl_GeomSpec_mod import GeomFactory implicit none @@ -55,7 +55,7 @@ end function I_make_geom_spec_from_metadata function I_make_geom(this, geom_spec, rc) result(geom) use esmf, only: ESMF_Geom - use mapl_GeomSpec + use mapl_GeomSpec_mod import GeomFactory implicit none @@ -66,9 +66,9 @@ function I_make_geom(this, geom_spec, rc) result(geom) end function I_make_geom function I_make_file_metadata(this, geom_spec, unusable, chunksizes, rc) result(file_metadata) - use mapl_GeomSpec + use mapl_GeomSpec_mod use pfio_FileMetadataMod - use mapl_KeywordEnforcerMod + use mapl_KeywordEnforcer_mod import GeomFactory implicit none @@ -81,7 +81,7 @@ function I_make_file_metadata(this, geom_spec, unusable, chunksizes, rc) result( end function I_make_file_metadata function I_make_gridded_dims(this, geom_spec, rc) result(gridded_dims) - use mapl_GeomSpec + use mapl_GeomSpec_mod use gFTL2_StringVector import GeomFactory implicit none @@ -93,8 +93,8 @@ function I_make_gridded_dims(this, geom_spec, rc) result(gridded_dims) end function I_make_gridded_dims function I_make_variable_attributes(this, geom_spec, rc) result(variable_attributes) - use mapl_GeomSpec - use mapl_StringDictionary + use mapl_GeomSpec_mod + use mapl_StringDictionary_mod import GeomFactory implicit none @@ -105,7 +105,7 @@ function I_make_variable_attributes(this, geom_spec, rc) result(variable_attribu end function I_make_variable_attributes logical function I_supports_spec(this, geom_spec) result(supports) - use mapl_GeomSpec + use mapl_GeomSpec_mod import GeomFactory class(GeomFactory), intent(in) :: this class(GeomSpec), intent(in) :: geom_spec @@ -129,5 +129,5 @@ end function I_supports_metadata end interface -end module mapl_GeomFactory +end module mapl_GeomFactory_mod diff --git a/infrastructure/geom/geom/GeomFactoryVector.F90 b/infrastructure/geom/geom/GeomFactoryVector.F90 index 38824438b2b..bdfffbae8ca 100644 --- a/infrastructure/geom/geom/GeomFactoryVector.F90 +++ b/infrastructure/geom/geom/GeomFactoryVector.F90 @@ -1,5 +1,5 @@ -module mapl_GeomFactoryVector - use mapl_GeomFactory +module mapl_GeomFactoryVector_mod + use mapl_GeomFactory_mod #define T GeomFactory #define T_polymorphic @@ -13,4 +13,4 @@ module mapl_GeomFactoryVector #undef T_polymorphic #undef T -end module mapl_GeomFactoryVector +end module mapl_GeomFactoryVector_mod diff --git a/infrastructure/geom/geom/GeomGet.F90 b/infrastructure/geom/geom/GeomGet.F90 index 343283b15a1..b11ccd2964f 100644 --- a/infrastructure/geom/geom/GeomGet.F90 +++ b/infrastructure/geom/geom/GeomGet.F90 @@ -7,13 +7,13 @@ ! because single-public-symbol modules whose name matches their sole public ! symbol trigger Intel Fortran error #6450 when renamed via USE aliases. ! -module mapl_GeomAccessors +module mapl_GeomAccessors_mod - use mapl_KeywordEnforcer - use mapl_ErrorHandling - use mapl_MaplGeom, only: MaplGeom - use mapl_GeomSpec, only: GeomSpec - use mapl_GeomManager, only: get_mapl_geom + use mapl_KeywordEnforcer_mod + use mapl_ErrorHandling_mod + use mapl_MaplGeom_mod, only: MaplGeom + use mapl_GeomSpec_mod, only: GeomSpec + use mapl_GeomManager_mod, only: get_mapl_geom use esmf implicit none (type,external) @@ -140,4 +140,4 @@ subroutine grid_get_horz_ij_index_stub(npts, ii, jj, lon, lat, lonR8, latR8, gri _UNUSED_DUMMY(grid) end subroutine grid_get_horz_ij_index_stub -end module mapl_GeomAccessors +end module mapl_GeomAccessors_mod diff --git a/infrastructure/geom/geom/GeomManager.F90 b/infrastructure/geom/geom/GeomManager.F90 index eb314698b46..5ed0cc5f499 100644 --- a/infrastructure/geom/geom/GeomManager.F90 +++ b/infrastructure/geom/geom/GeomManager.F90 @@ -1,15 +1,15 @@ #include "MAPL.h" -module mapl_GeomManager - - use mapl_GeomSpec - use mapl_NullGeomSpec - use mapl_MaplGeom - use mapl_GeomFactory - use mapl_GeomFactoryVector - use mapl_GeomSpecVector - use mapl_IntegerMaplGeomMap - use mapl_ErrorHandlingMod +module mapl_GeomManager_mod + + use mapl_GeomSpec_mod + use mapl_NullGeomSpec_mod + use mapl_MaplGeom_mod + use mapl_GeomFactory_mod + use mapl_GeomFactoryVector_mod + use mapl_GeomSpecVector_mod + use mapl_IntegerMaplGeomMap_mod + use mapl_ErrorHandling_mod use pfio_FileMetadataMod use esmf use gftl2_IntegerVector @@ -160,7 +160,7 @@ end function make_geom_spec_from_hconfig module function make_mapl_geom_from_spec(this, spec, rc) result(mapl_geom) use gftl2_StringVector - use mapl_StringDictionary + use mapl_StringDictionary_mod type(MaplGeom) :: mapl_geom class(GeomManager), target, intent(inout) :: this class(GeomSpec), intent(in) :: spec @@ -192,4 +192,4 @@ module function find_factory(factories, predicate, rc) result(factory) end function find_factory end interface -end module mapl_GeomManager +end module mapl_GeomManager_mod diff --git a/infrastructure/geom/geom/GeomManager/add_factory.F90 b/infrastructure/geom/geom/GeomManager/add_factory.F90 index 496a9c2e031..148890fa624 100644 --- a/infrastructure/geom/geom/GeomManager/add_factory.F90 +++ b/infrastructure/geom/geom/GeomManager/add_factory.F90 @@ -1,6 +1,6 @@ #include "MAPL.h" -submodule (mapl_GeomManager) add_factory_smod +submodule (mapl_GeomManager_mod) add_factory_smod implicit none diff --git a/infrastructure/geom/geom/GeomManager/add_mapl_geom.F90 b/infrastructure/geom/geom/GeomManager/add_mapl_geom.F90 index e2d5ff827f9..e38980edf37 100644 --- a/infrastructure/geom/geom/GeomManager/add_mapl_geom.F90 +++ b/infrastructure/geom/geom/GeomManager/add_mapl_geom.F90 @@ -1,6 +1,6 @@ #include "MAPL.h" -submodule (mapl_GeomManager) add_mapl_geom_smod +submodule (mapl_GeomManager_mod) add_mapl_geom_smod implicit none diff --git a/infrastructure/geom/geom/GeomManager/delete_mapl_geom.F90 b/infrastructure/geom/geom/GeomManager/delete_mapl_geom.F90 index d8249bab856..bc0a511b797 100644 --- a/infrastructure/geom/geom/GeomManager/delete_mapl_geom.F90 +++ b/infrastructure/geom/geom/GeomManager/delete_mapl_geom.F90 @@ -1,6 +1,6 @@ #include "MAPL.h" -submodule (mapl_GeomManager) delete_mapl_geom_smod +submodule (mapl_GeomManager_mod) delete_mapl_geom_smod implicit none diff --git a/infrastructure/geom/geom/GeomManager/find_factory.F90 b/infrastructure/geom/geom/GeomManager/find_factory.F90 index 08787d29674..07f06057cb5 100644 --- a/infrastructure/geom/geom/GeomManager/find_factory.F90 +++ b/infrastructure/geom/geom/GeomManager/find_factory.F90 @@ -1,6 +1,6 @@ #include "MAPL.h" -submodule (mapl_GeomManager) find_factory_smod +submodule (mapl_GeomManager_mod) find_factory_smod implicit none diff --git a/infrastructure/geom/geom/GeomManager/get_geom_from_id.F90 b/infrastructure/geom/geom/GeomManager/get_geom_from_id.F90 index ab9ec7ffe3a..9afbb8b3477 100644 --- a/infrastructure/geom/geom/GeomManager/get_geom_from_id.F90 +++ b/infrastructure/geom/geom/GeomManager/get_geom_from_id.F90 @@ -1,6 +1,6 @@ #include "MAPL.h" -submodule (mapl_GeomManager) get_geom_from_id_smod +submodule (mapl_GeomManager_mod) get_geom_from_id_smod implicit none diff --git a/infrastructure/geom/geom/GeomManager/get_geom_manager.F90 b/infrastructure/geom/geom/GeomManager/get_geom_manager.F90 index 2784b682d62..fe3db7be4ad 100644 --- a/infrastructure/geom/geom/GeomManager/get_geom_manager.F90 +++ b/infrastructure/geom/geom/GeomManager/get_geom_manager.F90 @@ -1,6 +1,6 @@ #include "MAPL.h" -submodule (mapl_GeomManager) get_geom_manager_smod +submodule (mapl_GeomManager_mod) get_geom_manager_smod contains diff --git a/infrastructure/geom/geom/GeomManager/get_mapl_geom.F90 b/infrastructure/geom/geom/GeomManager/get_mapl_geom.F90 index 32dc8e6c9a0..45d8be2fdbb 100644 --- a/infrastructure/geom/geom/GeomManager/get_mapl_geom.F90 +++ b/infrastructure/geom/geom/GeomManager/get_mapl_geom.F90 @@ -1,8 +1,8 @@ #include "MAPL.h" -submodule (mapl_GeomManager) get_mapl_geom_smod +submodule (mapl_GeomManager_mod) get_mapl_geom_smod - use mapl_GeomUtilities, only: MAPL_GeomGetId + use mapl_GeomUtilities_mod, only: MAPL_GeomGetId implicit none diff --git a/infrastructure/geom/geom/GeomManager/get_mapl_geom_from_hconfig.F90 b/infrastructure/geom/geom/GeomManager/get_mapl_geom_from_hconfig.F90 index 9e05d82e063..92ee694c53e 100644 --- a/infrastructure/geom/geom/GeomManager/get_mapl_geom_from_hconfig.F90 +++ b/infrastructure/geom/geom/GeomManager/get_mapl_geom_from_hconfig.F90 @@ -1,6 +1,6 @@ #include "MAPL.h" -submodule (mapl_GeomManager) get_mapl_geom_from_hconfig_smod +submodule (mapl_GeomManager_mod) get_mapl_geom_from_hconfig_smod implicit none diff --git a/infrastructure/geom/geom/GeomManager/get_mapl_geom_from_id.F90 b/infrastructure/geom/geom/GeomManager/get_mapl_geom_from_id.F90 index 6f544078721..4bf9317b1b2 100644 --- a/infrastructure/geom/geom/GeomManager/get_mapl_geom_from_id.F90 +++ b/infrastructure/geom/geom/GeomManager/get_mapl_geom_from_id.F90 @@ -1,6 +1,6 @@ #include "MAPL.h" -submodule (mapl_GeomManager) get_mapl_geom_from_id_smod +submodule (mapl_GeomManager_mod) get_mapl_geom_from_id_smod implicit none diff --git a/infrastructure/geom/geom/GeomManager/get_mapl_geom_from_metadata.F90 b/infrastructure/geom/geom/GeomManager/get_mapl_geom_from_metadata.F90 index 8c02291a51d..443eabf8bac 100644 --- a/infrastructure/geom/geom/GeomManager/get_mapl_geom_from_metadata.F90 +++ b/infrastructure/geom/geom/GeomManager/get_mapl_geom_from_metadata.F90 @@ -1,6 +1,6 @@ #include "MAPL.h" -submodule (mapl_GeomManager) get_mapl_geom_from_metadata_smod +submodule (mapl_GeomManager_mod) get_mapl_geom_from_metadata_smod implicit none(type,external) contains diff --git a/infrastructure/geom/geom/GeomManager/get_mapl_geom_from_spec.F90 b/infrastructure/geom/geom/GeomManager/get_mapl_geom_from_spec.F90 index 1f7db475ec8..c5d5a7d024e 100644 --- a/infrastructure/geom/geom/GeomManager/get_mapl_geom_from_spec.F90 +++ b/infrastructure/geom/geom/GeomManager/get_mapl_geom_from_spec.F90 @@ -1,6 +1,6 @@ #include "MAPL.h" -submodule (mapl_GeomManager) get_mapl_geom_from_spec_smod +submodule (mapl_GeomManager_mod) get_mapl_geom_from_spec_smod implicit none diff --git a/infrastructure/geom/geom/GeomManager/initialize.F90 b/infrastructure/geom/geom/GeomManager/initialize.F90 index d4bd5e799da..84839592ff2 100644 --- a/infrastructure/geom/geom/GeomManager/initialize.F90 +++ b/infrastructure/geom/geom/GeomManager/initialize.F90 @@ -1,16 +1,16 @@ #include "MAPL.h" -submodule (mapl_GeomManager) initialize_smod +submodule (mapl_GeomManager_mod) initialize_smod implicit none contains module subroutine initialize(this) - use mapl_LatLonGeomFactory - use mapl_CubedSphereGeomFactory - use mapl_XYGeomFactory - use mapl_EASEGeomFactory + use mapl_LatLonGeomFactory_mod + use mapl_CubedSphereGeomFactory_mod + use mapl_XYGeomFactory_mod + use mapl_EASEGeomFactory_mod class(GeomManager), intent(inout) :: this ! Load default factories diff --git a/infrastructure/geom/geom/GeomManager/make_geom_spec_from_hconfig.F90 b/infrastructure/geom/geom/GeomManager/make_geom_spec_from_hconfig.F90 index ba0890b4f57..68f98c73e9c 100644 --- a/infrastructure/geom/geom/GeomManager/make_geom_spec_from_hconfig.F90 +++ b/infrastructure/geom/geom/GeomManager/make_geom_spec_from_hconfig.F90 @@ -1,7 +1,7 @@ #include "MAPL.h" -submodule (mapl_GeomManager) make_geom_spec_from_hconfig_smod - use mapl_NullGeomSpec, only: NULL_GEOM_SPEC +submodule (mapl_GeomManager_mod) make_geom_spec_from_hconfig_smod + use mapl_NullGeomSpec_mod, only: NULL_GEOM_SPEC implicit none(type,external) contains diff --git a/infrastructure/geom/geom/GeomManager/make_geom_spec_from_metadata.F90 b/infrastructure/geom/geom/GeomManager/make_geom_spec_from_metadata.F90 index b85a3ce039c..03c59f86912 100644 --- a/infrastructure/geom/geom/GeomManager/make_geom_spec_from_metadata.F90 +++ b/infrastructure/geom/geom/GeomManager/make_geom_spec_from_metadata.F90 @@ -1,7 +1,7 @@ #include "MAPL.h" -submodule (mapl_GeomManager) make_geom_spec_from_metadata_smod - use mapl_NullGeomSpec, only: NULL_GEOM_SPEC +submodule (mapl_GeomManager_mod) make_geom_spec_from_metadata_smod + use mapl_NullGeomSpec_mod, only: NULL_GEOM_SPEC implicit none(type,external) contains diff --git a/infrastructure/geom/geom/GeomManager/make_mapl_geom_from_spec.F90 b/infrastructure/geom/geom/GeomManager/make_mapl_geom_from_spec.F90 index 830171442de..128960165aa 100644 --- a/infrastructure/geom/geom/GeomManager/make_mapl_geom_from_spec.F90 +++ b/infrastructure/geom/geom/GeomManager/make_mapl_geom_from_spec.F90 @@ -1,6 +1,6 @@ #include "MAPL.h" -submodule (mapl_GeomManager) make_mapl_geom_from_spec_smod +submodule (mapl_GeomManager_mod) make_mapl_geom_from_spec_smod implicit none @@ -8,7 +8,7 @@ module function make_mapl_geom_from_spec(this, spec, rc) result(mapl_geom) use gftl2_StringVector - use mapl_StringDictionary + use mapl_StringDictionary_mod type(MaplGeom) :: mapl_geom class(GeomManager), target, intent(inout) :: this class(GeomSpec), intent(in) :: spec diff --git a/infrastructure/geom/geom/GeomManager/new_GeomManager.F90 b/infrastructure/geom/geom/GeomManager/new_GeomManager.F90 index 755dec8a2d0..f9f2a200481 100644 --- a/infrastructure/geom/geom/GeomManager/new_GeomManager.F90 +++ b/infrastructure/geom/geom/GeomManager/new_GeomManager.F90 @@ -1,16 +1,16 @@ #include "MAPL.h" -submodule (mapl_GeomManager) new_GeomManager_smod +submodule (mapl_GeomManager_mod) new_GeomManager_smod implicit none contains module function new_GeomManager() result(mgr) - use mapl_LatLonGeomFactory - use mapl_CubedSphereGeomFactory - use mapl_LocStreamGeomFactory - use mapl_XYGeomFactory + use mapl_LatLonGeomFactory_mod + use mapl_CubedSphereGeomFactory_mod + use mapl_LocStreamGeomFactory_mod + use mapl_XYGeomFactory_mod type(GeomManager) :: mgr type(LatLonGeomFactory) :: latlon_factory diff --git a/infrastructure/geom/geom/GeomSpec.F90 b/infrastructure/geom/geom/GeomSpec.F90 index 009fb11d5a3..18a4cb0e6d0 100644 --- a/infrastructure/geom/geom/GeomSpec.F90 +++ b/infrastructure/geom/geom/GeomSpec.F90 @@ -1,6 +1,6 @@ #include "MAPL.h" -module mapl_GeomSpec +module mapl_GeomSpec_mod use ESMF, only: ESMF_KIND_R4, ESMF_KIND_R8 @@ -75,4 +75,4 @@ logical function has_name(this) has_name = allocated(this%name) end function has_name -end module mapl_GeomSpec +end module mapl_GeomSpec_mod diff --git a/infrastructure/geom/geom/GeomSpecVector.F90 b/infrastructure/geom/geom/GeomSpecVector.F90 index 52c17893eea..4a10b95456b 100644 --- a/infrastructure/geom/geom/GeomSpecVector.F90 +++ b/infrastructure/geom/geom/GeomSpecVector.F90 @@ -1,5 +1,5 @@ -module mapl_GeomSpecVector - use mapl_GeomSpec +module mapl_GeomSpecVector_mod + use mapl_GeomSpec_mod #define T GeomSpec #define T_EQ(a,b) a==b @@ -14,4 +14,4 @@ module mapl_GeomSpecVector #undef T_polymorphic #undef T -end module mapl_GeomSpecVector +end module mapl_GeomSpecVector_mod diff --git a/infrastructure/geom/geom/GeomUtilities.F90 b/infrastructure/geom/geom/GeomUtilities.F90 index 5603e16ff6b..23063eae456 100644 --- a/infrastructure/geom/geom/GeomUtilities.F90 +++ b/infrastructure/geom/geom/GeomUtilities.F90 @@ -1,8 +1,8 @@ #include "MAPL.h" -module mapl_GeomUtilities +module mapl_GeomUtilities_mod use esmf - use mapl_ErrorHandlingMod + use mapl_ErrorHandling_mod implicit none private @@ -71,4 +71,4 @@ logical function same_geom(geom_a, geom_b) end function same_geom -end module mapl_GeomUtilities +end module mapl_GeomUtilities_mod diff --git a/infrastructure/geom/geom/GridGet.F90 b/infrastructure/geom/geom/GridGet.F90 index 10e3b92ff54..eb6ec486f30 100644 --- a/infrastructure/geom/geom/GridGet.F90 +++ b/infrastructure/geom/geom/GridGet.F90 @@ -1,10 +1,10 @@ #include "MAPL.h" -module mapl_GridAccessors +module mapl_GridAccessors_mod use esmf - use mapl_KeywordEnforcer - use mapl_ErrorHandling + use mapl_KeywordEnforcer_mod + use mapl_ErrorHandling_mod implicit none(type, external) private @@ -175,4 +175,4 @@ subroutine grid_get_coordinates_r8ptr(grid, longitudes, latitudes, rc) _RETURN(_SUCCESS) end subroutine grid_get_coordinates_r8ptr -end module mapl_GridAccessors +end module mapl_GridAccessors_mod diff --git a/infrastructure/geom/geom/GridGet/grid_get_centers.F90 b/infrastructure/geom/geom/GridGet/grid_get_centers.F90 index 18211875065..336b1db5142 100644 --- a/infrastructure/geom/geom/GridGet/grid_get_centers.F90 +++ b/infrastructure/geom/geom/GridGet/grid_get_centers.F90 @@ -1,8 +1,8 @@ #include "MAPL.h" -submodule (mapl_GridAccessors) grid_get_centers_smod +submodule (mapl_GridAccessors_mod) grid_get_centers_smod - use mapl_VectorBasis, only: GridGetCoords + use mapl_VectorBasis_mod, only: GridGetCoords implicit none(type, external) diff --git a/infrastructure/geom/geom/GridGet/grid_get_corners.F90 b/infrastructure/geom/geom/GridGet/grid_get_corners.F90 index a9b10d2bb4d..ba1ae51e71e 100644 --- a/infrastructure/geom/geom/GridGet/grid_get_corners.F90 +++ b/infrastructure/geom/geom/GridGet/grid_get_corners.F90 @@ -1,8 +1,8 @@ #include "MAPL.h" -submodule (mapl_GridAccessors) grid_get_corners_smod +submodule (mapl_GridAccessors_mod) grid_get_corners_smod - use mapl_Constants + use MAPL_Constants use esmf implicit none(type, external) diff --git a/infrastructure/geom/geom/GridGet/grid_get_interior.F90 b/infrastructure/geom/geom/GridGet/grid_get_interior.F90 index cd548fef04a..85e442b6929 100644 --- a/infrastructure/geom/geom/GridGet/grid_get_interior.F90 +++ b/infrastructure/geom/geom/GridGet/grid_get_interior.F90 @@ -1,8 +1,8 @@ #include "MAPL.h" -submodule (mapl_GridAccessors) grid_get_interior_smod +submodule (mapl_GridAccessors_mod) grid_get_interior_smod - use mapl_DistGridGet, only: DistGridGet + use mapl_DistGridGet_mod, only: DistGridGet implicit none(type, external) diff --git a/infrastructure/geom/geom/GridGetGlobal.F90 b/infrastructure/geom/geom/GridGetGlobal.F90 index ffbe612bd03..4b4ed65c410 100644 --- a/infrastructure/geom/geom/GridGetGlobal.F90 +++ b/infrastructure/geom/geom/GridGetGlobal.F90 @@ -1,9 +1,9 @@ #include "MAPL.h" -module mapl_GridGetGlobal +module mapl_GridGetGlobal_mod use esmf - use mapl_ErrorHandling + use mapl_ErrorHandling_mod implicit none(type, external) private @@ -46,4 +46,4 @@ subroutine grid_get_global_cell_count_per_dim(grid, globalCellCountPerDim, rc) _RETURN(_SUCCESS) end subroutine grid_get_global_cell_count_per_dim -end module mapl_GridGetGlobal +end module mapl_GridGetGlobal_mod diff --git a/infrastructure/geom/geom/IntegerMaplGeomMap.F90 b/infrastructure/geom/geom/IntegerMaplGeomMap.F90 index d566d70e96b..30333e25d99 100644 --- a/infrastructure/geom/geom/IntegerMaplGeomMap.F90 +++ b/infrastructure/geom/geom/IntegerMaplGeomMap.F90 @@ -1,5 +1,5 @@ -module mapl_IntegerMaplGeomMap - use mapl_MaplGeom +module mapl_IntegerMaplGeomMap_mod + use mapl_MaplGeom_mod #define Key __INTEGER #define T MaplGeom @@ -13,4 +13,4 @@ module mapl_IntegerMaplGeomMap #undef Key #undef T -end module mapl_IntegerMaplGeomMap +end module mapl_IntegerMaplGeomMap_mod diff --git a/infrastructure/geom/geom/LatLon/LatAxis.F90 b/infrastructure/geom/geom/LatLon/LatAxis.F90 index 16724c4eb58..cc08382c7fd 100644 --- a/infrastructure/geom/geom/LatLon/LatAxis.F90 +++ b/infrastructure/geom/geom/LatLon/LatAxis.F90 @@ -1,5 +1,5 @@ -module mapl_LatAxis - use mapl_CoordinateAxis +module mapl_LatAxis_mod + use mapl_CoordinateAxis_mod use pfio use esmf implicit none @@ -107,4 +107,4 @@ elemental logical function not_equal_to(a, b) not_equal_to = .not. (a == b) end function not_equal_to -end module mapl_LatAxis +end module mapl_LatAxis_mod diff --git a/infrastructure/geom/geom/LatLon/LatAxis/fix_bad_pole.F90 b/infrastructure/geom/geom/LatLon/LatAxis/fix_bad_pole.F90 index d2331736841..27174588343 100755 --- a/infrastructure/geom/geom/LatLon/LatAxis/fix_bad_pole.F90 +++ b/infrastructure/geom/geom/LatLon/LatAxis/fix_bad_pole.F90 @@ -1,10 +1,10 @@ #include "MAPL.h" -submodule (mapl_LatAxis) fix_bad_pole_smod - use mapl_RangeMod +submodule (mapl_LatAxis_mod) fix_bad_pole_smod + use mapl_Range_mod ! use hconfig3g use esmf - use mapl_ErrorHandling + use mapl_ErrorHandling_mod implicit none (type, external) integer, parameter :: R8 = ESMF_KIND_R8 diff --git a/infrastructure/geom/geom/LatLon/LatAxis/get_lat_corners.F90 b/infrastructure/geom/geom/LatLon/LatAxis/get_lat_corners.F90 index 5ce363513c7..a4a2337f5d4 100755 --- a/infrastructure/geom/geom/LatLon/LatAxis/get_lat_corners.F90 +++ b/infrastructure/geom/geom/LatLon/LatAxis/get_lat_corners.F90 @@ -1,10 +1,10 @@ #include "MAPL.h" -submodule (mapl_LatAxis) get_lat_corners_smod - use mapl_RangeMod +submodule (mapl_LatAxis_mod) get_lat_corners_smod + use mapl_Range_mod ! use hconfig3g use esmf - use mapl_ErrorHandling + use mapl_ErrorHandling_mod implicit none (type, external) integer, parameter :: R8 = ESMF_KIND_R8 diff --git a/infrastructure/geom/geom/LatLon/LatAxis/get_lat_range.F90 b/infrastructure/geom/geom/LatLon/LatAxis/get_lat_range.F90 index 7dc2bf14665..06a3ff96c5a 100755 --- a/infrastructure/geom/geom/LatLon/LatAxis/get_lat_range.F90 +++ b/infrastructure/geom/geom/LatLon/LatAxis/get_lat_range.F90 @@ -1,10 +1,10 @@ #include "MAPL.h" -submodule (mapl_LatAxis) get_lat_range_smod - use mapl_RangeMod +submodule (mapl_LatAxis_mod) get_lat_range_smod + use mapl_Range_mod ! use hconfig3g use esmf - use mapl_ErrorHandling + use mapl_ErrorHandling_mod implicit none (type, external) integer, parameter :: R8 = ESMF_KIND_R8 diff --git a/infrastructure/geom/geom/LatLon/LatAxis/make_LatAxis_from_hconfig.F90 b/infrastructure/geom/geom/LatLon/LatAxis/make_LatAxis_from_hconfig.F90 index a1bbd04e802..a91b4709066 100755 --- a/infrastructure/geom/geom/LatLon/LatAxis/make_LatAxis_from_hconfig.F90 +++ b/infrastructure/geom/geom/LatLon/LatAxis/make_LatAxis_from_hconfig.F90 @@ -1,10 +1,10 @@ #include "MAPL.h" -submodule (mapl_LatAxis) make_LatAxis_from_hconfig_smod - use mapl_RangeMod +submodule (mapl_LatAxis_mod) make_LatAxis_from_hconfig_smod + use mapl_Range_mod ! use hconfig3g use esmf - use mapl_ErrorHandling + use mapl_ErrorHandling_mod implicit none (type, external) integer, parameter :: R8 = ESMF_KIND_R8 diff --git a/infrastructure/geom/geom/LatLon/LatAxis/make_lataxis_from_metadata.F90 b/infrastructure/geom/geom/LatLon/LatAxis/make_lataxis_from_metadata.F90 index 798d66b98cd..acc1f8928c0 100755 --- a/infrastructure/geom/geom/LatLon/LatAxis/make_lataxis_from_metadata.F90 +++ b/infrastructure/geom/geom/LatLon/LatAxis/make_lataxis_from_metadata.F90 @@ -1,10 +1,10 @@ #include "MAPL.h" -submodule (mapl_LatAxis) make_lataxis_from_metadata_smod - use mapl_RangeMod +submodule (mapl_LatAxis_mod) make_lataxis_from_metadata_smod + use mapl_Range_mod ! use hconfig3g use esmf - use mapl_ErrorHandling + use mapl_ErrorHandling_mod implicit none (type, external) integer, parameter :: R8 = ESMF_KIND_R8 diff --git a/infrastructure/geom/geom/LatLon/LatAxis/supports_hconfig.F90 b/infrastructure/geom/geom/LatLon/LatAxis/supports_hconfig.F90 index 7b4f189b216..2ae4c5dfdd0 100755 --- a/infrastructure/geom/geom/LatLon/LatAxis/supports_hconfig.F90 +++ b/infrastructure/geom/geom/LatLon/LatAxis/supports_hconfig.F90 @@ -1,10 +1,10 @@ #include "MAPL.h" -submodule (mapl_LatAxis) supports_hconfig_smod - use mapl_RangeMod +submodule (mapl_LatAxis_mod) supports_hconfig_smod + use mapl_Range_mod ! use hconfig3g use esmf - use mapl_ErrorHandling + use mapl_ErrorHandling_mod implicit none (type, external) integer, parameter :: R8 = ESMF_KIND_R8 diff --git a/infrastructure/geom/geom/LatLon/LatAxis/supports_metadata.F90 b/infrastructure/geom/geom/LatLon/LatAxis/supports_metadata.F90 index 7e52ce94e60..5294822f49b 100755 --- a/infrastructure/geom/geom/LatLon/LatAxis/supports_metadata.F90 +++ b/infrastructure/geom/geom/LatLon/LatAxis/supports_metadata.F90 @@ -1,10 +1,10 @@ #include "MAPL.h" -submodule (mapl_LatAxis) supports_metadata_smod - use mapl_RangeMod +submodule (mapl_LatAxis_mod) supports_metadata_smod + use mapl_Range_mod ! use hconfig3g use esmf - use mapl_ErrorHandling + use mapl_ErrorHandling_mod implicit none (type, external) integer, parameter :: R8 = ESMF_KIND_R8 diff --git a/infrastructure/geom/geom/LatLon/LatLonDecomposition.F90 b/infrastructure/geom/geom/LatLon/LatLonDecomposition.F90 index 89dc098310f..e54086d50bc 100644 --- a/infrastructure/geom/geom/LatLon/LatLonDecomposition.F90 +++ b/infrastructure/geom/geom/LatLon/LatLonDecomposition.F90 @@ -1,11 +1,11 @@ #include "MAPL.h" -module mapl_LatLonDecomposition +module mapl_LatLonDecomposition_mod - use mapl_LonAxis - use mapl_LatAxis - use mapl_Partition - use mapl_KeywordEnforcer + use mapl_LonAxis_mod + use mapl_LatAxis_mod + use mapl_Partition_mod + use mapl_KeywordEnforcer_mod use esmf implicit none @@ -101,7 +101,7 @@ end subroutine get_idx_range contains function new_LatLonDecomposition_basic(lon_distribution, lat_distribution) result(decomp) - use mapl_KeywordEnforcer + use mapl_KeywordEnforcer_mod type(LatLonDecomposition) :: decomp integer, intent(in) :: lon_distribution(:) integer, intent(in) :: lat_distribution(:) @@ -111,7 +111,7 @@ function new_LatLonDecomposition_basic(lon_distribution, lat_distribution) resul end function new_LatLonDecomposition_basic function new_LatLonDecomposition_petcount(dims, unusable, petCount) result(decomp) - use mapl_KeywordEnforcer + use mapl_KeywordEnforcer_mod type(LatLonDecomposition) :: decomp integer, intent(in) :: dims(2) class(KeywordEnforcer), optional, intent(in) :: unusable @@ -134,7 +134,7 @@ function new_LatLonDecomposition_petcount(dims, unusable, petCount) result(decom end function new_LatLonDecomposition_petcount function new_LatLonDecomposition_topo(dims, unusable, topology) result(decomp) - use mapl_KeywordEnforcer + use mapl_KeywordEnforcer_mod type(LatLonDecomposition) :: decomp integer, intent(in) :: dims(2) class(KeywordEnforcer), optional, intent(in) :: unusable @@ -167,5 +167,5 @@ elemental function not_equal_to(decomp1, decomp2) not_equal_to = .not. (decomp1 == decomp2) end function not_equal_to -end module mapl_LatLonDecomposition +end module mapl_LatLonDecomposition_mod diff --git a/infrastructure/geom/geom/LatLon/LatLonDecomposition/equal_to.F90 b/infrastructure/geom/geom/LatLon/LatLonDecomposition/equal_to.F90 index 625b453cb3a..697bccd6234 100755 --- a/infrastructure/geom/geom/LatLon/LatLonDecomposition/equal_to.F90 +++ b/infrastructure/geom/geom/LatLon/LatLonDecomposition/equal_to.F90 @@ -1,7 +1,7 @@ #include "MAPL.h" -submodule (mapl_LatLonDecomposition) equal_to_smod - use mapl_ErrorHandlingMod +submodule (mapl_LatLonDecomposition_mod) equal_to_smod + use mapl_ErrorHandling_mod implicit none (type, external) contains diff --git a/infrastructure/geom/geom/LatLon/LatLonDecomposition/get_idx_range.F90 b/infrastructure/geom/geom/LatLon/LatLonDecomposition/get_idx_range.F90 index aa1693be191..fcaca1900cb 100755 --- a/infrastructure/geom/geom/LatLon/LatLonDecomposition/get_idx_range.F90 +++ b/infrastructure/geom/geom/LatLon/LatLonDecomposition/get_idx_range.F90 @@ -1,7 +1,7 @@ #include "MAPL.h" -submodule (mapl_LatLonDecomposition) get_idx_range_smod - use mapl_ErrorHandlingMod +submodule (mapl_LatLonDecomposition_mod) get_idx_range_smod + use mapl_ErrorHandling_mod implicit none contains diff --git a/infrastructure/geom/geom/LatLon/LatLonDecomposition/get_lat_subset.F90 b/infrastructure/geom/geom/LatLon/LatLonDecomposition/get_lat_subset.F90 index 219b19ab866..87bef365dc0 100755 --- a/infrastructure/geom/geom/LatLon/LatLonDecomposition/get_lat_subset.F90 +++ b/infrastructure/geom/geom/LatLon/LatLonDecomposition/get_lat_subset.F90 @@ -1,7 +1,7 @@ #include "MAPL.h" -submodule (mapl_LatLonDecomposition) get_lat_subset_smod - use mapl_ErrorHandlingMod +submodule (mapl_LatLonDecomposition_mod) get_lat_subset_smod + use mapl_ErrorHandling_mod implicit none (type, external) contains diff --git a/infrastructure/geom/geom/LatLon/LatLonDecomposition/get_lon_subset.F90 b/infrastructure/geom/geom/LatLon/LatLonDecomposition/get_lon_subset.F90 index ad33a1d8222..135b0a5188a 100755 --- a/infrastructure/geom/geom/LatLon/LatLonDecomposition/get_lon_subset.F90 +++ b/infrastructure/geom/geom/LatLon/LatLonDecomposition/get_lon_subset.F90 @@ -1,7 +1,7 @@ #include "MAPL.h" -submodule (mapl_LatLonDecomposition) get_lon_subset_smod - use mapl_ErrorHandlingMod +submodule (mapl_LatLonDecomposition_mod) get_lon_subset_smod + use mapl_ErrorHandling_mod implicit none (type, external) contains diff --git a/infrastructure/geom/geom/LatLon/LatLonDecomposition/get_subset.F90 b/infrastructure/geom/geom/LatLon/LatLonDecomposition/get_subset.F90 index 8a82ee71b72..fd922ad09cf 100755 --- a/infrastructure/geom/geom/LatLon/LatLonDecomposition/get_subset.F90 +++ b/infrastructure/geom/geom/LatLon/LatLonDecomposition/get_subset.F90 @@ -1,7 +1,7 @@ #include "MAPL.h" -submodule (mapl_LatLonDecomposition) get_subset_smod - use mapl_ErrorHandlingMod +submodule (mapl_LatLonDecomposition_mod) get_subset_smod + use mapl_ErrorHandling_mod implicit none contains diff --git a/infrastructure/geom/geom/LatLon/LatLonDecomposition/make_LatLonDecomposition_current_vm.F90 b/infrastructure/geom/geom/LatLon/LatLonDecomposition/make_LatLonDecomposition_current_vm.F90 index 1db1fe6116d..c289b43e167 100755 --- a/infrastructure/geom/geom/LatLon/LatLonDecomposition/make_LatLonDecomposition_current_vm.F90 +++ b/infrastructure/geom/geom/LatLon/LatLonDecomposition/make_LatLonDecomposition_current_vm.F90 @@ -1,7 +1,7 @@ #include "MAPL.h" -submodule (mapl_LatLonDecomposition) make_LatLonDecomposition_current_vm_smod - use mapl_ErrorHandlingMod +submodule (mapl_LatLonDecomposition_mod) make_LatLonDecomposition_current_vm_smod + use mapl_ErrorHandling_mod implicit none (type, external) contains diff --git a/infrastructure/geom/geom/LatLon/LatLonDecomposition/make_LatLonDecomposition_vm.F90 b/infrastructure/geom/geom/LatLon/LatLonDecomposition/make_LatLonDecomposition_vm.F90 index 82a39870c9a..f7fab442635 100755 --- a/infrastructure/geom/geom/LatLon/LatLonDecomposition/make_LatLonDecomposition_vm.F90 +++ b/infrastructure/geom/geom/LatLon/LatLonDecomposition/make_LatLonDecomposition_vm.F90 @@ -1,7 +1,7 @@ #include "MAPL.h" -submodule (mapl_LatLonDecomposition) make_LatLonDecomposition_vm_smod - use mapl_ErrorHandlingMod +submodule (mapl_LatLonDecomposition_mod) make_LatLonDecomposition_vm_smod + use mapl_ErrorHandling_mod implicit none (type, external) contains diff --git a/infrastructure/geom/geom/LatLon/LatLonGeomFactory.F90 b/infrastructure/geom/geom/LatLon/LatLonGeomFactory.F90 index 402b6207fd0..2b067131aac 100644 --- a/infrastructure/geom/geom/LatLon/LatLonGeomFactory.F90 +++ b/infrastructure/geom/geom/LatLon/LatLonGeomFactory.F90 @@ -1,17 +1,17 @@ #include "MAPL.h" -module mapl_LatLonGeomFactory +module mapl_LatLonGeomFactory_mod - use mapl_GeomSpec - use mapl_GeomFactory - use mapl_LatLonGeomSpec - use mapl_KeywordEnforcerMod - use mapl_ErrorHandlingMod + use mapl_GeomSpec_mod + use mapl_GeomFactory_mod + use mapl_LatLonGeomSpec_mod + use mapl_KeywordEnforcer_mod + use mapl_ErrorHandling_mod use gftl2_StringVector - use mapl_StringDictionary + use mapl_StringDictionary_mod use pfio use esmf - use mapl_KeywordEnforcer, only: KE => KeywordEnforcer + use mapl_KeywordEnforcer_mod, only: KE => KeywordEnforcer implicit none private @@ -37,7 +37,7 @@ module mapl_LatLonGeomFactory interface module function make_geom(this, geom_spec, rc) result(geom) - use mapl_GeomSpec, only: GeomSpec + use mapl_GeomSpec_mod, only: GeomSpec use esmf, only: ESMF_Geom type(ESMF_Geom) :: geom class(LatLonGeomFactory), intent(in) :: this @@ -46,7 +46,7 @@ module function make_geom(this, geom_spec, rc) result(geom) end function make_geom module function create_basic_grid(spec, unusable, name, rc) result(grid) - use mapl_KeywordEnforcer + use mapl_KeywordEnforcer_mod type(ESMF_Grid) :: grid type(LatLonGeomSpec), intent(in) :: spec class(KeywordEnforcer), optional, intent(in) :: unusable @@ -55,6 +55,7 @@ module function create_basic_grid(spec, unusable, name, rc) result(grid) end function create_basic_grid module subroutine fill_coordinates(spec, grid, unusable, rc) + use mapl_KeywordEnforcer_mod type(LatLonGeomSpec), intent(in) :: spec type(ESMF_Grid), intent(inout) :: grid class(KeywordEnforcer), optional, intent(in) :: unusable @@ -76,7 +77,7 @@ module function make_variable_attributes(this, geom_spec, rc) result(variable_at end function make_variable_attributes module function make_file_metadata(this, geom_spec, unusable, chunksizes, rc) result(file_metadata) - use mapl_KeywordEnforcerMod + use mapl_KeywordEnforcer_mod type(FileMetadata) :: file_metadata class(LatLonGeomFactory), intent(in) :: this class(GeomSpec), intent(in) :: geom_spec @@ -86,6 +87,7 @@ module function make_file_metadata(this, geom_spec, unusable, chunksizes, rc) re end function make_file_metadata module function typesafe_make_file_metadata(geom_spec, unusable, chunksizes, rc) result(file_metadata) + use mapl_KeywordEnforcer_mod type(FileMetadata) :: file_metadata type(LatLonGeomSpec), intent(in) :: geom_spec class(KE), optional, intent(in) :: unusable @@ -170,5 +172,5 @@ logical function supports_spec(this, geom_spec) result(supports) _UNUSED_DUMMY(this) end function supports_spec -end module mapl_LatLonGeomFactory +end module mapl_LatLonGeomFactory_mod diff --git a/infrastructure/geom/geom/LatLon/LatLonGeomFactory/create_basic_grid.F90 b/infrastructure/geom/geom/LatLon/LatLonGeomFactory/create_basic_grid.F90 index e0632fc7466..b127e6768d1 100755 --- a/infrastructure/geom/geom/LatLon/LatLonGeomFactory/create_basic_grid.F90 +++ b/infrastructure/geom/geom/LatLon/LatLonGeomFactory/create_basic_grid.F90 @@ -1,23 +1,24 @@ #include "MAPL.h" -submodule (mapl_LatLonGeomFactory) create_basic_grid_smod - use mapl_GeomSpec - use mapl_LonAxis - use mapl_LatAxis - use mapl_LatLonDecomposition - use mapl_LatLonGeomSpec - use mapl_MinMaxMod - use mapl_ErrorHandlingMod - use mapl_Constants +submodule (mapl_LatLonGeomFactory_mod) create_basic_grid_smod + use mapl_GeomSpec_mod + use mapl_LonAxis_mod + use mapl_LatAxis_mod + use mapl_LatLonDecomposition_mod + use mapl_LatLonGeomSpec_mod + use mapl_MinMax_mod + use mapl_ErrorHandling_mod + use MAPL_Constants use pFIO use gFTL2_StringVector use esmf - use mapl_KeywordEnforcer, only: KE => KeywordEnforcer + use mapl_KeywordEnforcer_mod, only: KE => KeywordEnforcer implicit none (type, external) contains module function create_basic_grid(spec, unusable, name, rc) result(grid) + use mapl_KeywordEnforcer_mod type(ESMF_Grid) :: grid type(LatLonGeomSpec), intent(in) :: spec class(KE), optional, intent(in) :: unusable diff --git a/infrastructure/geom/geom/LatLon/LatLonGeomFactory/fill_coordinates.F90 b/infrastructure/geom/geom/LatLon/LatLonGeomFactory/fill_coordinates.F90 index fb355f27758..d142529c5cb 100755 --- a/infrastructure/geom/geom/LatLon/LatLonGeomFactory/fill_coordinates.F90 +++ b/infrastructure/geom/geom/LatLon/LatLonGeomFactory/fill_coordinates.F90 @@ -1,23 +1,24 @@ #include "MAPL.h" -submodule (mapl_LatLonGeomFactory) fill_coordinates_smod - use mapl_GeomSpec - use mapl_LonAxis - use mapl_LatAxis - use mapl_LatLonDecomposition - use mapl_LatLonGeomSpec - use mapl_MinMaxMod - use mapl_ErrorHandlingMod - use mapl_Constants +submodule (mapl_LatLonGeomFactory_mod) fill_coordinates_smod + use mapl_GeomSpec_mod + use mapl_LonAxis_mod + use mapl_LatAxis_mod + use mapl_LatLonDecomposition_mod + use mapl_LatLonGeomSpec_mod + use mapl_MinMax_mod + use mapl_ErrorHandling_mod + use MAPL_Constants use pFIO use gFTL2_StringVector use esmf - use mapl_KeywordEnforcer, only: KE => KeywordEnforcer + use mapl_KeywordEnforcer_mod, only: KE => KeywordEnforcer implicit none (type, external) contains module subroutine fill_coordinates(spec, grid, unusable, rc) + use mapl_KeywordEnforcer_mod type(LatLonGeomSpec), intent(in) :: spec type(ESMF_Grid), intent(inout) :: grid class(KE), optional, intent(in) :: unusable diff --git a/infrastructure/geom/geom/LatLon/LatLonGeomFactory/make_file_metadata.F90 b/infrastructure/geom/geom/LatLon/LatLonGeomFactory/make_file_metadata.F90 index 71745e60bd6..9911981fe71 100755 --- a/infrastructure/geom/geom/LatLon/LatLonGeomFactory/make_file_metadata.F90 +++ b/infrastructure/geom/geom/LatLon/LatLonGeomFactory/make_file_metadata.F90 @@ -1,25 +1,26 @@ #include "MAPL.h" -submodule (mapl_LatLonGeomFactory) make_file_metadata_smod - - use mapl_GeomSpec - use mapl_LonAxis - use mapl_LatAxis - use mapl_LatLonDecomposition - use mapl_LatLonGeomSpec - use mapl_MinMaxMod - use mapl_ErrorHandlingMod - use mapl_Constants +submodule (mapl_LatLonGeomFactory_mod) make_file_metadata_smod + + use mapl_GeomSpec_mod + use mapl_LonAxis_mod + use mapl_LatAxis_mod + use mapl_LatLonDecomposition_mod + use mapl_LatLonGeomSpec_mod + use mapl_MinMax_mod + use mapl_ErrorHandling_mod + use MAPL_Constants use pFIO use gFTL2_StringVector use esmf - use mapl_KeywordEnforcer, only: KE => KeywordEnforcer + use mapl_KeywordEnforcer_mod, only: KE => KeywordEnforcer implicit none (type, external) contains module function make_file_metadata(this, geom_spec, unusable, chunksizes, rc) result(file_metadata) + use mapl_KeywordEnforcer_mod type(FileMetadata) :: file_metadata class(LatLonGeomFactory), intent(in) :: this class(KE), optional, intent(in) :: unusable diff --git a/infrastructure/geom/geom/LatLon/LatLonGeomFactory/make_geom.F90 b/infrastructure/geom/geom/LatLon/LatLonGeomFactory/make_geom.F90 index 4f146afe805..179d8dfa987 100755 --- a/infrastructure/geom/geom/LatLon/LatLonGeomFactory/make_geom.F90 +++ b/infrastructure/geom/geom/LatLon/LatLonGeomFactory/make_geom.F90 @@ -1,19 +1,19 @@ #include "MAPL.h" -submodule (mapl_LatLonGeomFactory) make_geom_smod - - use mapl_GeomSpec - use mapl_LonAxis - use mapl_LatAxis - use mapl_LatLonDecomposition - use mapl_LatLonGeomSpec - use mapl_MinMaxMod - use mapl_ErrorHandlingMod - use mapl_Constants +submodule (mapl_LatLonGeomFactory_mod) make_geom_smod + + use mapl_GeomSpec_mod + use mapl_LonAxis_mod + use mapl_LatAxis_mod + use mapl_LatLonDecomposition_mod + use mapl_LatLonGeomSpec_mod + use mapl_MinMax_mod + use mapl_ErrorHandling_mod + use MAPL_Constants use pFIO use gFTL2_StringVector use esmf - use mapl_KeywordEnforcer, only: KE => KeywordEnforcer + use mapl_KeywordEnforcer_mod, only: KE => KeywordEnforcer implicit none (type, external) diff --git a/infrastructure/geom/geom/LatLon/LatLonGeomFactory/make_gridded_dims.F90 b/infrastructure/geom/geom/LatLon/LatLonGeomFactory/make_gridded_dims.F90 index 7e5a26d09b2..07fca645501 100755 --- a/infrastructure/geom/geom/LatLon/LatLonGeomFactory/make_gridded_dims.F90 +++ b/infrastructure/geom/geom/LatLon/LatLonGeomFactory/make_gridded_dims.F90 @@ -1,19 +1,19 @@ #include "MAPL.h" -submodule (mapl_LatLonGeomFactory) make_gridded_dims_smod - - use mapl_GeomSpec - use mapl_LonAxis - use mapl_LatAxis - use mapl_LatLonDecomposition - use mapl_LatLonGeomSpec - use mapl_MinMaxMod - use mapl_ErrorHandlingMod - use mapl_Constants +submodule (mapl_LatLonGeomFactory_mod) make_gridded_dims_smod + + use mapl_GeomSpec_mod + use mapl_LonAxis_mod + use mapl_LatAxis_mod + use mapl_LatLonDecomposition_mod + use mapl_LatLonGeomSpec_mod + use mapl_MinMax_mod + use mapl_ErrorHandling_mod + use MAPL_Constants use pFIO use gFTL2_StringVector use esmf - use mapl_KeywordEnforcer, only: KE => KeywordEnforcer + use mapl_KeywordEnforcer_mod, only: KE => KeywordEnforcer implicit none (type, external) diff --git a/infrastructure/geom/geom/LatLon/LatLonGeomFactory/make_variable_attributes.F90 b/infrastructure/geom/geom/LatLon/LatLonGeomFactory/make_variable_attributes.F90 index 11053934a7c..7ffc49c2561 100755 --- a/infrastructure/geom/geom/LatLon/LatLonGeomFactory/make_variable_attributes.F90 +++ b/infrastructure/geom/geom/LatLon/LatLonGeomFactory/make_variable_attributes.F90 @@ -1,19 +1,19 @@ #include "MAPL.h" -submodule (mapl_LatLonGeomFactory) make_variable_attributes_smod - - use mapl_GeomSpec - use mapl_LonAxis - use mapl_LatAxis - use mapl_LatLonDecomposition - use mapl_LatLonGeomSpec - use mapl_MinMaxMod - use mapl_ErrorHandlingMod - use mapl_Constants +submodule (mapl_LatLonGeomFactory_mod) make_variable_attributes_smod + + use mapl_GeomSpec_mod + use mapl_LonAxis_mod + use mapl_LatAxis_mod + use mapl_LatLonDecomposition_mod + use mapl_LatLonGeomSpec_mod + use mapl_MinMax_mod + use mapl_ErrorHandling_mod + use MAPL_Constants use pFIO - use mapl_StringDictionary + use mapl_StringDictionary_mod use esmf - use mapl_KeywordEnforcer, only: KE => KeywordEnforcer + use mapl_KeywordEnforcer_mod, only: KE => KeywordEnforcer implicit none (type, external) diff --git a/infrastructure/geom/geom/LatLon/LatLonGeomFactory/typesafe_make_file_metadata.F90 b/infrastructure/geom/geom/LatLon/LatLonGeomFactory/typesafe_make_file_metadata.F90 index 7cc3cfd55fd..c77c28b6b80 100755 --- a/infrastructure/geom/geom/LatLon/LatLonGeomFactory/typesafe_make_file_metadata.F90 +++ b/infrastructure/geom/geom/LatLon/LatLonGeomFactory/typesafe_make_file_metadata.F90 @@ -1,23 +1,24 @@ #include "MAPL.h" -submodule (mapl_LatLonGeomFactory) typesafe_make_file_metadata_smod - use mapl_GeomSpec - use mapl_LonAxis - use mapl_LatAxis - use mapl_LatLonDecomposition - use mapl_LatLonGeomSpec - use mapl_MinMaxMod - use mapl_ErrorHandlingMod - use mapl_Constants +submodule (mapl_LatLonGeomFactory_mod) typesafe_make_file_metadata_smod + use mapl_GeomSpec_mod + use mapl_LonAxis_mod + use mapl_LatAxis_mod + use mapl_LatLonDecomposition_mod + use mapl_LatLonGeomSpec_mod + use mapl_MinMax_mod + use mapl_ErrorHandling_mod + use MAPL_Constants use pFIO use gFTL2_StringVector use esmf - use mapl_KeywordEnforcer, only: KE => KeywordEnforcer + use mapl_KeywordEnforcer_mod, only: KE => KeywordEnforcer implicit none (type, external) contains module function typesafe_make_file_metadata(geom_spec, unusable, chunksizes, rc) result(file_metadata) + use mapl_KeywordEnforcer_mod type(FileMetadata) :: file_metadata type(LatLonGeomSpec), intent(in) :: geom_spec class(KE), optional, intent(in) :: unusable diff --git a/infrastructure/geom/geom/LatLon/LatLonGeomFactory/typesafe_make_geom.F90 b/infrastructure/geom/geom/LatLon/LatLonGeomFactory/typesafe_make_geom.F90 index b130b607e6f..09062852c89 100755 --- a/infrastructure/geom/geom/LatLon/LatLonGeomFactory/typesafe_make_geom.F90 +++ b/infrastructure/geom/geom/LatLon/LatLonGeomFactory/typesafe_make_geom.F90 @@ -1,17 +1,17 @@ #include "MAPL.h" -submodule (mapl_LatLonGeomFactory) typesafe_make_geom_smod - use mapl_GeomSpec - use mapl_LonAxis - use mapl_LatAxis - use mapl_LatLonDecomposition - use mapl_LatLonGeomSpec - use mapl_MinMaxMod - use mapl_ErrorHandlingMod - use mapl_Constants +submodule (mapl_LatLonGeomFactory_mod) typesafe_make_geom_smod + use mapl_GeomSpec_mod + use mapl_LonAxis_mod + use mapl_LatAxis_mod + use mapl_LatLonDecomposition_mod + use mapl_LatLonGeomSpec_mod + use mapl_MinMax_mod + use mapl_ErrorHandling_mod + use MAPL_Constants use pFIO use gFTL2_StringVector use esmf - use mapl_KeywordEnforcer, only: KE => KeywordEnforcer + use mapl_KeywordEnforcer_mod, only: KE => KeywordEnforcer implicit none (type, external) diff --git a/infrastructure/geom/geom/LatLon/LatLonGeomSpec.F90 b/infrastructure/geom/geom/LatLon/LatLonGeomSpec.F90 index ca32fd11b9d..724d730075c 100644 --- a/infrastructure/geom/geom/LatLon/LatLonGeomSpec.F90 +++ b/infrastructure/geom/geom/LatLon/LatLonGeomSpec.F90 @@ -1,11 +1,11 @@ #include "MAPL.h" -module mapl_LatLonGeomSpec +module mapl_LatLonGeomSpec_mod - use mapl_GeomSpec - use mapl_LatLonDecomposition - use mapl_LonAxis - use mapl_LatAxis + use mapl_GeomSpec_mod + use mapl_LatLonDecomposition_mod + use mapl_LonAxis_mod + use mapl_LatAxis_mod use esmf, only: ESMF_KIND_R4, ESMF_KIND_R8, ESMF_HConfig implicit none @@ -169,6 +169,6 @@ pure function get_lon_axis(spec) result(axis) axis = spec%lon_axis end function get_lon_axis -end module mapl_LatLonGeomSpec +end module mapl_LatLonGeomSpec_mod diff --git a/infrastructure/geom/geom/LatLon/LatLonGeomSpec/equal_to.F90 b/infrastructure/geom/geom/LatLon/LatLonGeomSpec/equal_to.F90 index fe938ca8273..a6f51cf5c76 100755 --- a/infrastructure/geom/geom/LatLon/LatLonGeomSpec/equal_to.F90 +++ b/infrastructure/geom/geom/LatLon/LatLonGeomSpec/equal_to.F90 @@ -1,10 +1,10 @@ #include "MAPL.h" -submodule (mapl_LatLonGeomSpec) equal_to_smod - use mapl_CoordinateAxis - use mapl_GeomSpec +submodule (mapl_LatLonGeomSpec_mod) equal_to_smod + use mapl_CoordinateAxis_mod + use mapl_GeomSpec_mod use pfio - use mapl_ErrorHandling + use mapl_ErrorHandling_mod use esmf implicit none (type, external) diff --git a/infrastructure/geom/geom/LatLon/LatLonGeomSpec/get_horz_ij_index.F90 b/infrastructure/geom/geom/LatLon/LatLonGeomSpec/get_horz_ij_index.F90 index 984605e9cb3..53d5aae9c88 100644 --- a/infrastructure/geom/geom/LatLon/LatLonGeomSpec/get_horz_ij_index.F90 +++ b/infrastructure/geom/geom/LatLon/LatLonGeomSpec/get_horz_ij_index.F90 @@ -1,9 +1,9 @@ #include "MAPL.h" -submodule (mapl_LatLonGeomSpec) get_horz_ij_index_smod +submodule (mapl_LatLonGeomSpec_mod) get_horz_ij_index_smod use MAPL_Constants, only: MAPL_RADIANS_TO_DEGREES - use mapl_ErrorHandling + use mapl_ErrorHandling_mod implicit none (type, external) diff --git a/infrastructure/geom/geom/LatLon/LatLonGeomSpec/make_LatLonGeomSpec_from_hconfig.F90 b/infrastructure/geom/geom/LatLon/LatLonGeomSpec/make_LatLonGeomSpec_from_hconfig.F90 index 11fdda71a56..b2fd75f6d15 100755 --- a/infrastructure/geom/geom/LatLon/LatLonGeomSpec/make_LatLonGeomSpec_from_hconfig.F90 +++ b/infrastructure/geom/geom/LatLon/LatLonGeomSpec/make_LatLonGeomSpec_from_hconfig.F90 @@ -1,9 +1,9 @@ #include "MAPL.h" -submodule (mapl_LatLonGeomSpec) make_LatLonGeomSpec_from_hconfig_smod - use mapl_CoordinateAxis - use mapl_GeomSpec - use mapl_ErrorHandling +submodule (mapl_LatLonGeomSpec_mod) make_LatLonGeomSpec_from_hconfig_smod + use mapl_CoordinateAxis_mod + use mapl_GeomSpec_mod + use mapl_ErrorHandling_mod use esmf implicit none (type, external) diff --git a/infrastructure/geom/geom/LatLon/LatLonGeomSpec/make_LatLonGeomSpec_from_metadata.F90 b/infrastructure/geom/geom/LatLon/LatLonGeomSpec/make_LatLonGeomSpec_from_metadata.F90 index c6a66ab58f9..c01fd17619e 100755 --- a/infrastructure/geom/geom/LatLon/LatLonGeomSpec/make_LatLonGeomSpec_from_metadata.F90 +++ b/infrastructure/geom/geom/LatLon/LatLonGeomSpec/make_LatLonGeomSpec_from_metadata.F90 @@ -1,10 +1,10 @@ #include "MAPL.h" -submodule (mapl_LatLonGeomSpec) make_LatLonGeomSpec_from_metadata_smod - use mapl_CoordinateAxis - use mapl_GeomSpec +submodule (mapl_LatLonGeomSpec_mod) make_LatLonGeomSpec_from_metadata_smod + use mapl_CoordinateAxis_mod + use mapl_GeomSpec_mod use pfio - use mapl_ErrorHandling + use mapl_ErrorHandling_mod use esmf implicit none (type, external) diff --git a/infrastructure/geom/geom/LatLon/LatLonGeomSpec/make_decomposition.F90 b/infrastructure/geom/geom/LatLon/LatLonGeomSpec/make_decomposition.F90 index e1ff0312160..e9d3d0c319a 100755 --- a/infrastructure/geom/geom/LatLon/LatLonGeomSpec/make_decomposition.F90 +++ b/infrastructure/geom/geom/LatLon/LatLonGeomSpec/make_decomposition.F90 @@ -1,10 +1,10 @@ #include "MAPL.h" -submodule (mapl_LatLonGeomSpec) make_decomposition_smod - use mapl_CoordinateAxis - use mapl_GeomSpec +submodule (mapl_LatLonGeomSpec_mod) make_decomposition_smod + use mapl_CoordinateAxis_mod + use mapl_GeomSpec_mod use pfio - use mapl_ErrorHandling + use mapl_ErrorHandling_mod use esmf implicit none (type, external) diff --git a/infrastructure/geom/geom/LatLon/LatLonGeomSpec/supports_hconfig.F90 b/infrastructure/geom/geom/LatLon/LatLonGeomSpec/supports_hconfig.F90 index 5e052d6f85c..c75431fe5c2 100755 --- a/infrastructure/geom/geom/LatLon/LatLonGeomSpec/supports_hconfig.F90 +++ b/infrastructure/geom/geom/LatLon/LatLonGeomSpec/supports_hconfig.F90 @@ -1,11 +1,11 @@ #include "MAPL.h" -submodule (mapl_LatLonGeomSpec) supports_hconfig_smod +submodule (mapl_LatLonGeomSpec_mod) supports_hconfig_smod - use mapl_CoordinateAxis - use mapl_GeomSpec + use mapl_CoordinateAxis_mod + use mapl_GeomSpec_mod use pfio - use mapl_ErrorHandling + use mapl_ErrorHandling_mod use esmf implicit none (type, external) diff --git a/infrastructure/geom/geom/LatLon/LatLonGeomSpec/supports_metadata.F90 b/infrastructure/geom/geom/LatLon/LatLonGeomSpec/supports_metadata.F90 index b0f378f05f7..51b3807fc1d 100755 --- a/infrastructure/geom/geom/LatLon/LatLonGeomSpec/supports_metadata.F90 +++ b/infrastructure/geom/geom/LatLon/LatLonGeomSpec/supports_metadata.F90 @@ -1,11 +1,11 @@ #include "MAPL.h" -submodule (mapl_LatLonGeomSpec) supports_metadata_smod +submodule (mapl_LatLonGeomSpec_mod) supports_metadata_smod - use mapl_CoordinateAxis - use mapl_GeomSpec + use mapl_CoordinateAxis_mod + use mapl_GeomSpec_mod use pfio - use mapl_ErrorHandling + use mapl_ErrorHandling_mod use esmf implicit none (type, external) diff --git a/infrastructure/geom/geom/LatLon/LonAxis.F90 b/infrastructure/geom/geom/LatLon/LonAxis.F90 index abf3d863d49..067747728c6 100644 --- a/infrastructure/geom/geom/LatLon/LonAxis.F90 +++ b/infrastructure/geom/geom/LatLon/LonAxis.F90 @@ -1,5 +1,5 @@ -module mapl_LonAxis - use mapl_CoordinateAxis +module mapl_LonAxis_mod + use mapl_CoordinateAxis_mod use pfio use esmf implicit none @@ -104,5 +104,5 @@ elemental logical function not_equal_to(a, b) not_equal_to = .not. (a == b) end function not_equal_to -end module mapl_LonAxis +end module mapl_LonAxis_mod diff --git a/infrastructure/geom/geom/LatLon/LonAxis/get_lon_corners.F90 b/infrastructure/geom/geom/LatLon/LonAxis/get_lon_corners.F90 index 51ad31d11a6..f01241a72a9 100755 --- a/infrastructure/geom/geom/LatLon/LonAxis/get_lon_corners.F90 +++ b/infrastructure/geom/geom/LatLon/LonAxis/get_lon_corners.F90 @@ -1,8 +1,8 @@ #include "MAPL.h" -submodule (mapl_LonAxis) get_lon_corners_smod - use mapl_RangeMod - use mapl_ErrorHandling +submodule (mapl_LonAxis_mod) get_lon_corners_smod + use mapl_Range_mod + use mapl_ErrorHandling_mod use esmf implicit none (type, external) integer, parameter :: R8 = ESMF_KIND_R8 diff --git a/infrastructure/geom/geom/LatLon/LonAxis/get_lon_range.F90 b/infrastructure/geom/geom/LatLon/LonAxis/get_lon_range.F90 index c845d142b32..e0124ff757d 100755 --- a/infrastructure/geom/geom/LatLon/LonAxis/get_lon_range.F90 +++ b/infrastructure/geom/geom/LatLon/LonAxis/get_lon_range.F90 @@ -1,8 +1,8 @@ #include "MAPL.h" -submodule (mapl_LonAxis) get_lon_range_smod - use mapl_RangeMod - use mapl_ErrorHandling +submodule (mapl_LonAxis_mod) get_lon_range_smod + use mapl_Range_mod + use mapl_ErrorHandling_mod use esmf implicit none (type, external) integer, parameter :: R8 = ESMF_KIND_R8 diff --git a/infrastructure/geom/geom/LatLon/LonAxis/make_LonAxis_from_hconfig.F90 b/infrastructure/geom/geom/LatLon/LonAxis/make_LonAxis_from_hconfig.F90 index 9ccb9284b56..13d15eda981 100755 --- a/infrastructure/geom/geom/LatLon/LonAxis/make_LonAxis_from_hconfig.F90 +++ b/infrastructure/geom/geom/LatLon/LonAxis/make_LonAxis_from_hconfig.F90 @@ -1,8 +1,8 @@ #include "MAPL.h" -submodule (mapl_LonAxis) make_LonAxis_from_hconfig_smod - use mapl_RangeMod - use mapl_ErrorHandling +submodule (mapl_LonAxis_mod) make_LonAxis_from_hconfig_smod + use mapl_Range_mod + use mapl_ErrorHandling_mod use esmf implicit none (type, external) integer, parameter :: R8 = ESMF_KIND_R8 diff --git a/infrastructure/geom/geom/LatLon/LonAxis/make_LonAxis_from_metadata.F90 b/infrastructure/geom/geom/LatLon/LonAxis/make_LonAxis_from_metadata.F90 index af0bd2670f0..341d659bb96 100755 --- a/infrastructure/geom/geom/LatLon/LonAxis/make_LonAxis_from_metadata.F90 +++ b/infrastructure/geom/geom/LatLon/LonAxis/make_LonAxis_from_metadata.F90 @@ -1,8 +1,8 @@ #include "MAPL.h" -submodule (mapl_LonAxis) make_LonAxis_from_metadata_smod - use mapl_RangeMod - use mapl_ErrorHandling +submodule (mapl_LonAxis_mod) make_LonAxis_from_metadata_smod + use mapl_Range_mod + use mapl_ErrorHandling_mod use esmf implicit none (type, external) integer, parameter :: R8 = ESMF_KIND_R8 diff --git a/infrastructure/geom/geom/LatLon/LonAxis/supports_hconfig.F90 b/infrastructure/geom/geom/LatLon/LonAxis/supports_hconfig.F90 index a895c08310a..0dbab43b731 100755 --- a/infrastructure/geom/geom/LatLon/LonAxis/supports_hconfig.F90 +++ b/infrastructure/geom/geom/LatLon/LonAxis/supports_hconfig.F90 @@ -1,8 +1,8 @@ #include "MAPL.h" -submodule (mapl_LonAxis) supports_hconfig_smod - use mapl_RangeMod - use mapl_ErrorHandling +submodule (mapl_LonAxis_mod) supports_hconfig_smod + use mapl_Range_mod + use mapl_ErrorHandling_mod use esmf implicit none (type, external) integer, parameter :: R8 = ESMF_KIND_R8 diff --git a/infrastructure/geom/geom/LatLon/LonAxis/supports_metadata.F90 b/infrastructure/geom/geom/LatLon/LonAxis/supports_metadata.F90 index c50f112caec..bb71a140d13 100755 --- a/infrastructure/geom/geom/LatLon/LonAxis/supports_metadata.F90 +++ b/infrastructure/geom/geom/LatLon/LonAxis/supports_metadata.F90 @@ -1,8 +1,8 @@ #include "MAPL.h" -submodule (mapl_LonAxis) supports_metadata_smod - use mapl_RangeMod - use mapl_ErrorHandling +submodule (mapl_LonAxis_mod) supports_metadata_smod + use mapl_Range_mod + use mapl_ErrorHandling_mod use esmf implicit none (type, external) integer, parameter :: R8 = ESMF_KIND_R8 diff --git a/infrastructure/geom/geom/LocStream/LocStreamDecomposition.F90 b/infrastructure/geom/geom/LocStream/LocStreamDecomposition.F90 index 17c0f11162c..49dcb0423c0 100644 --- a/infrastructure/geom/geom/LocStream/LocStreamDecomposition.F90 +++ b/infrastructure/geom/geom/LocStream/LocStreamDecomposition.F90 @@ -1,9 +1,9 @@ #include "MAPL_ErrLog.h" -module mapl_LocStreamDecomposition +module mapl_LocStreamDecomposition_mod - use mapl_Partition - use mapl_KeywordEnforcer + use mapl_Partition_mod + use mapl_KeywordEnforcer_mod use esmf implicit none @@ -82,7 +82,7 @@ function new_LocStreamDecomposition_basic(point_distribution) result(decomp) end function new_LocStreamDecomposition_basic function new_LocStreamDecomposition_petcount(npoints, unusable, petCount) result(decomp) - use mapl_KeywordEnforcer + use mapl_KeywordEnforcer_mod type(LocStreamDecomposition) :: decomp integer, intent(in) :: npoints class(KeywordEnforcer), optional, intent(in) :: unusable @@ -109,4 +109,4 @@ elemental function not_equal_to(decomp1, decomp2) not_equal_to = .not. (decomp1 == decomp2) end function not_equal_to -end module mapl_LocStreamDecomposition +end module mapl_LocStreamDecomposition_mod diff --git a/infrastructure/geom/geom/LocStream/LocStreamDecomposition/equal_to.F90 b/infrastructure/geom/geom/LocStream/LocStreamDecomposition/equal_to.F90 index c4495ef7224..78e90afcd94 100644 --- a/infrastructure/geom/geom/LocStream/LocStreamDecomposition/equal_to.F90 +++ b/infrastructure/geom/geom/LocStream/LocStreamDecomposition/equal_to.F90 @@ -1,6 +1,6 @@ #include "MAPL_ErrLog.h" -submodule (mapl_LocStreamDecomposition) equal_to_smod +submodule (mapl_LocStreamDecomposition_mod) equal_to_smod implicit none (type, external) contains diff --git a/infrastructure/geom/geom/LocStream/LocStreamDecomposition/get_local_indices.F90 b/infrastructure/geom/geom/LocStream/LocStreamDecomposition/get_local_indices.F90 index 51b21785359..58994dbb6f5 100644 --- a/infrastructure/geom/geom/LocStream/LocStreamDecomposition/get_local_indices.F90 +++ b/infrastructure/geom/geom/LocStream/LocStreamDecomposition/get_local_indices.F90 @@ -1,6 +1,6 @@ #include "MAPL_ErrLog.h" -submodule (mapl_LocStreamDecomposition) get_local_indices_smod +submodule (mapl_LocStreamDecomposition_mod) get_local_indices_smod implicit none (type, external) contains diff --git a/infrastructure/geom/geom/LocStream/LocStreamDecomposition/make_LocStreamDecomposition_current_vm.F90 b/infrastructure/geom/geom/LocStream/LocStreamDecomposition/make_LocStreamDecomposition_current_vm.F90 index 4802e430f60..709f3c3bf74 100644 --- a/infrastructure/geom/geom/LocStream/LocStreamDecomposition/make_LocStreamDecomposition_current_vm.F90 +++ b/infrastructure/geom/geom/LocStream/LocStreamDecomposition/make_LocStreamDecomposition_current_vm.F90 @@ -1,7 +1,7 @@ #include "MAPL_ErrLog.h" -submodule (mapl_LocStreamDecomposition) make_LocStreamDecomposition_current_vm_smod - use mapl_ErrorHandlingMod +submodule (mapl_LocStreamDecomposition_mod) make_LocStreamDecomposition_current_vm_smod + use mapl_ErrorHandling_mod implicit none (type, external) contains diff --git a/infrastructure/geom/geom/LocStream/LocStreamDecomposition/make_LocStreamDecomposition_vm.F90 b/infrastructure/geom/geom/LocStream/LocStreamDecomposition/make_LocStreamDecomposition_vm.F90 index 85341fc7b20..a69f3c0f7ae 100644 --- a/infrastructure/geom/geom/LocStream/LocStreamDecomposition/make_LocStreamDecomposition_vm.F90 +++ b/infrastructure/geom/geom/LocStream/LocStreamDecomposition/make_LocStreamDecomposition_vm.F90 @@ -1,7 +1,7 @@ #include "MAPL_ErrLog.h" -submodule (mapl_LocStreamDecomposition) make_LocStreamDecomposition_vm_smod - use mapl_ErrorHandlingMod +submodule (mapl_LocStreamDecomposition_mod) make_LocStreamDecomposition_vm_smod + use mapl_ErrorHandling_mod implicit none (type, external) contains diff --git a/infrastructure/geom/geom/LocStream/LocStreamGeomFactory.F90 b/infrastructure/geom/geom/LocStream/LocStreamGeomFactory.F90 index 539793a8947..a6cb7b88dbc 100644 --- a/infrastructure/geom/geom/LocStream/LocStreamGeomFactory.F90 +++ b/infrastructure/geom/geom/LocStream/LocStreamGeomFactory.F90 @@ -1,15 +1,15 @@ #include "MAPL.h" -module mapl_LocStreamGeomFactory - use mapl_GeomSpec - use mapl_GeomFactory - use mapl_LocStreamGeomSpec - use mapl_LocStreamDecomposition - use mapl_CoordinateAxis, only: get_dim_name, get_coordinates - use mapl_ErrorHandlingMod - use mapl_StringUtilities, only: to_lower - use mapl_get_hconfig, only: get_hconfig - use mapl_hconfig_params, only: HConfigParams +module mapl_LocStreamGeomFactory_mod + use mapl_GeomSpec_mod + use mapl_GeomFactory_mod + use mapl_LocStreamGeomSpec_mod + use mapl_LocStreamDecomposition_mod + use mapl_CoordinateAxis_mod, only: get_dim_name, get_coordinates + use mapl_ErrorHandling_mod + use mapl_StringUtilities_mod, only: to_lower + use mapl_get_hconfig_mod, only: get_hconfig + use mapl_hconfig_params_mod, only: HConfigParams use pfio_FileMetadataMod, only: FileMetadata use pFIO_VariableMod, only: Variable use pFIO_AttributeMod, only: Attribute @@ -17,8 +17,8 @@ module mapl_LocStreamGeomFactory use pFIO_NetCDF4_FileFormatterMod, only: NetCDF4_FileFormatter use pFIO_ConstantsMod, only: pFIO_READ use gftl2_StringVector, only: StringVector - use mapl_StringDictionary, only: StringDictionary - use mapl_KeywordEnforcerMod, only: KeywordEnforcer + use mapl_StringDictionary_mod, only: StringDictionary + use mapl_KeywordEnforcer_mod, only: KeywordEnforcer use MAPL_Constants, only: MAPL_PI_R8 use esmf implicit none @@ -413,4 +413,4 @@ function make_variable_attributes(this, geom_spec, rc) result(variable_attribute _RETURN(_SUCCESS) end function make_variable_attributes -end module mapl_LocStreamGeomFactory +end module mapl_LocStreamGeomFactory_mod diff --git a/infrastructure/geom/geom/LocStream/LocStreamGeomSpec.F90 b/infrastructure/geom/geom/LocStream/LocStreamGeomSpec.F90 index cbfead61866..7495893c56f 100644 --- a/infrastructure/geom/geom/LocStream/LocStreamGeomSpec.F90 +++ b/infrastructure/geom/geom/LocStream/LocStreamGeomSpec.F90 @@ -1,11 +1,11 @@ #include "MAPL.h" -module mapl_LocStreamGeomSpec +module mapl_LocStreamGeomSpec_mod - use mapl_GeomSpec - use mapl_LocStreamDecomposition + use mapl_GeomSpec_mod + use mapl_LocStreamDecomposition_mod use esmf, only: ESMF_KIND_R4, ESMF_KIND_R8 - use mapl_ErrorHandling + use mapl_ErrorHandling_mod implicit none(type, external) private @@ -147,4 +147,4 @@ subroutine get_horz_ij_index_r8(this, lon, lat, ii, jj, rc) _UNUSED_DUMMY(lat) end subroutine get_horz_ij_index_r8 -end module mapl_LocStreamGeomSpec +end module mapl_LocStreamGeomSpec_mod diff --git a/infrastructure/geom/geom/MaplGeom.F90 b/infrastructure/geom/geom/MaplGeom.F90 index 6d6b91a47e3..cbaf3e2bd31 100644 --- a/infrastructure/geom/geom/MaplGeom.F90 +++ b/infrastructure/geom/geom/MaplGeom.F90 @@ -1,13 +1,13 @@ #include "MAPL.h" -module mapl_MaplGeom - use mapl_GeomSpec - use mapl_VectorBasis - use mapl_GeomFactory +module mapl_MaplGeom_mod + use mapl_GeomSpec_mod + use mapl_VectorBasis_mod + use mapl_GeomFactory_mod use pfio_FileMetadataMod, only: FileMetadata use ESMF, only: ESMF_Geom use gftl2_StringVector - use mapl_StringDictionary + use mapl_StringDictionary_mod implicit none private @@ -99,7 +99,7 @@ module function get_variable_attributes(this) result(variable_attributes) end function get_variable_attributes recursive module function get_basis(this, basis_kind, rc) result(basis) - use mapl_VectorBasisKind + use mapl_VectorBasisKind_mod type(VectorBasis), pointer :: basis class(MaplGeom), target, intent(inout) :: this type(VectorBasisKind), optional, intent(in) :: basis_kind @@ -108,6 +108,6 @@ end function get_basis end interface -end module mapl_MaplGeom +end module mapl_MaplGeom_mod diff --git a/infrastructure/geom/geom/MaplGeom/get_basis.F90 b/infrastructure/geom/geom/MaplGeom/get_basis.F90 index 332b4dc09b1..c99e2e5c03f 100644 --- a/infrastructure/geom/geom/MaplGeom/get_basis.F90 +++ b/infrastructure/geom/geom/MaplGeom/get_basis.F90 @@ -1,12 +1,12 @@ #include "MAPL.h" -submodule (mapl_MaplGeom) get_basis_smod +submodule (mapl_MaplGeom_mod) get_basis_smod -use mapl_GeomSpec - use mapl_VectorBasis - use mapl_VectorBasisKind - use mapl_GeomUtilities - use mapl_ErrorHandlingMod +use mapl_GeomSpec_mod + use mapl_VectorBasis_mod + use mapl_VectorBasisKind_mod + use mapl_GeomUtilities_mod + use mapl_ErrorHandling_mod use pfio_FileMetadataMod, only: FileMetadata use ESMF, only: ESMF_Info use ESMF, only: ESMF_InfoGetFromHost diff --git a/infrastructure/geom/geom/MaplGeom/get_factory.F90 b/infrastructure/geom/geom/MaplGeom/get_factory.F90 index 80dc9125300..fa76f585f35 100644 --- a/infrastructure/geom/geom/MaplGeom/get_factory.F90 +++ b/infrastructure/geom/geom/MaplGeom/get_factory.F90 @@ -1,10 +1,10 @@ #include "MAPL.h" -submodule (mapl_MaplGeom) get_factory_smod - use mapl_GeomSpec - use mapl_VectorBasis - use mapl_GeomUtilities - use mapl_ErrorHandlingMod +submodule (mapl_MaplGeom_mod) get_factory_smod + use mapl_GeomSpec_mod + use mapl_VectorBasis_mod + use mapl_GeomUtilities_mod + use mapl_ErrorHandling_mod use pfio_FileMetadataMod, only: FileMetadata use ESMF, only: ESMF_Info use ESMF, only: ESMF_InfoGetFromHost diff --git a/infrastructure/geom/geom/MaplGeom/get_file_metadata.F90 b/infrastructure/geom/geom/MaplGeom/get_file_metadata.F90 index 84c42bb1a71..f7c44444f39 100644 --- a/infrastructure/geom/geom/MaplGeom/get_file_metadata.F90 +++ b/infrastructure/geom/geom/MaplGeom/get_file_metadata.F90 @@ -1,10 +1,10 @@ #include "MAPL.h" -submodule (mapl_MaplGeom) get_file_metadata_smod - use mapl_GeomSpec - use mapl_VectorBasis - use mapl_GeomUtilities - use mapl_ErrorHandlingMod +submodule (mapl_MaplGeom_mod) get_file_metadata_smod + use mapl_GeomSpec_mod + use mapl_VectorBasis_mod + use mapl_GeomUtilities_mod + use mapl_ErrorHandling_mod use pfio_FileMetadataMod, only: FileMetadata use ESMF, only: ESMF_Info use ESMF, only: ESMF_InfoGetFromHost diff --git a/infrastructure/geom/geom/MaplGeom/get_geom.F90 b/infrastructure/geom/geom/MaplGeom/get_geom.F90 index 0d72836de60..3c8c4eb22ac 100644 --- a/infrastructure/geom/geom/MaplGeom/get_geom.F90 +++ b/infrastructure/geom/geom/MaplGeom/get_geom.F90 @@ -1,9 +1,9 @@ #include "MAPL.h" -submodule (mapl_MaplGeom) get_geom_smod - use mapl_GeomSpec - use mapl_GeomUtilities - use mapl_ErrorHandlingMod +submodule (mapl_MaplGeom_mod) get_geom_smod + use mapl_GeomSpec_mod + use mapl_GeomUtilities_mod + use mapl_ErrorHandling_mod use pfio_FileMetadataMod, only: FileMetadata use ESMF, only: ESMF_Info use ESMF, only: ESMF_InfoGetFromHost diff --git a/infrastructure/geom/geom/MaplGeom/get_gridded_dims.F90 b/infrastructure/geom/geom/MaplGeom/get_gridded_dims.F90 index 85f578ea5f2..29042dc0d71 100644 --- a/infrastructure/geom/geom/MaplGeom/get_gridded_dims.F90 +++ b/infrastructure/geom/geom/MaplGeom/get_gridded_dims.F90 @@ -1,10 +1,10 @@ #include "MAPL.h" -submodule (mapl_MaplGeom) get_gridded_dims_smod - use mapl_GeomSpec - use mapl_VectorBasis - use mapl_GeomUtilities - use mapl_ErrorHandlingMod +submodule (mapl_MaplGeom_mod) get_gridded_dims_smod + use mapl_GeomSpec_mod + use mapl_VectorBasis_mod + use mapl_GeomUtilities_mod + use mapl_ErrorHandling_mod use pfio_FileMetadataMod, only: FileMetadata use ESMF, only: ESMF_Info use ESMF, only: ESMF_InfoGetFromHost diff --git a/infrastructure/geom/geom/MaplGeom/get_spec.F90 b/infrastructure/geom/geom/MaplGeom/get_spec.F90 index 93da9c83b50..c34d1404541 100644 --- a/infrastructure/geom/geom/MaplGeom/get_spec.F90 +++ b/infrastructure/geom/geom/MaplGeom/get_spec.F90 @@ -1,10 +1,10 @@ #include "MAPL.h" -submodule (mapl_MaplGeom) get_spec_smod - use mapl_GeomSpec - use mapl_VectorBasis - use mapl_GeomUtilities - use mapl_ErrorHandlingMod +submodule (mapl_MaplGeom_mod) get_spec_smod + use mapl_GeomSpec_mod + use mapl_VectorBasis_mod + use mapl_GeomUtilities_mod + use mapl_ErrorHandling_mod use pfio_FileMetadataMod, only: FileMetadata use ESMF, only: ESMF_Info use ESMF, only: ESMF_InfoGetFromHost diff --git a/infrastructure/geom/geom/MaplGeom/get_variable_attributes.F90 b/infrastructure/geom/geom/MaplGeom/get_variable_attributes.F90 index 4e0becfbfc1..8e6655c72a2 100644 --- a/infrastructure/geom/geom/MaplGeom/get_variable_attributes.F90 +++ b/infrastructure/geom/geom/MaplGeom/get_variable_attributes.F90 @@ -1,10 +1,10 @@ #include "MAPL.h" -submodule (mapl_MaplGeom) get_variable_attributes_smod - use mapl_GeomSpec - use mapl_VectorBasis - use mapl_GeomUtilities - use mapl_ErrorHandlingMod +submodule (mapl_MaplGeom_mod) get_variable_attributes_smod + use mapl_GeomSpec_mod + use mapl_VectorBasis_mod + use mapl_GeomUtilities_mod + use mapl_ErrorHandling_mod use pfio_FileMetadataMod, only: FileMetadata use ESMF, only: ESMF_Info use ESMF, only: ESMF_InfoGetFromHost diff --git a/infrastructure/geom/geom/MaplGeom/new_MaplGeom.F90 b/infrastructure/geom/geom/MaplGeom/new_MaplGeom.F90 index 06e9e47a559..df7b0dd8c78 100644 --- a/infrastructure/geom/geom/MaplGeom/new_MaplGeom.F90 +++ b/infrastructure/geom/geom/MaplGeom/new_MaplGeom.F90 @@ -1,10 +1,10 @@ #include "MAPL.h" -submodule (mapl_MaplGeom) new_MaplGeom_smod - use mapl_GeomSpec - use mapl_VectorBasis - use mapl_GeomUtilities - use mapl_ErrorHandlingMod +submodule (mapl_MaplGeom_mod) new_MaplGeom_smod + use mapl_GeomSpec_mod + use mapl_VectorBasis_mod + use mapl_GeomUtilities_mod + use mapl_ErrorHandling_mod use pfio_FileMetadataMod, only: FileMetadata use ESMF, only: ESMF_Info use ESMF, only: ESMF_InfoGetFromHost diff --git a/infrastructure/geom/geom/MaplGeom/set_id.F90 b/infrastructure/geom/geom/MaplGeom/set_id.F90 index 073ceae948e..151dbaf0312 100644 --- a/infrastructure/geom/geom/MaplGeom/set_id.F90 +++ b/infrastructure/geom/geom/MaplGeom/set_id.F90 @@ -1,10 +1,10 @@ #include "MAPL.h" -submodule (mapl_MaplGeom) set_id_smod - use mapl_GeomSpec - use mapl_VectorBasis - use mapl_GeomUtilities - use mapl_ErrorHandlingMod +submodule (mapl_MaplGeom_mod) set_id_smod + use mapl_GeomSpec_mod + use mapl_VectorBasis_mod + use mapl_GeomUtilities_mod + use mapl_ErrorHandling_mod use pfio_FileMetadataMod, only: FileMetadata use ESMF, only: ESMF_Info use ESMF, only: ESMF_InfoGetFromHost diff --git a/infrastructure/geom/geom/Mesh/MeshDecomposition.F90 b/infrastructure/geom/geom/Mesh/MeshDecomposition.F90 index 26b752b5c23..d3008663c1d 100644 --- a/infrastructure/geom/geom/Mesh/MeshDecomposition.F90 +++ b/infrastructure/geom/geom/Mesh/MeshDecomposition.F90 @@ -1,9 +1,9 @@ #include "MAPL.h" -module mapl_MeshDecomposition +module mapl_MeshDecomposition_mod - use mapl_Partition - use mapl_KeywordEnforcer + use mapl_Partition_mod + use mapl_KeywordEnforcer_mod use esmf implicit none @@ -95,7 +95,7 @@ end function new_MeshDecomposition_basic ! Constructor with both element and node distribution arrays function new_MeshDecomposition_with_nodes(element_distribution, unusable, node_distribution) result(decomp) - use mapl_KeywordEnforcer + use mapl_KeywordEnforcer_mod type(MeshDecomposition) :: decomp integer, intent(in) :: element_distribution(:) class(KeywordEnforcer), optional, intent(in) :: unusable @@ -108,7 +108,7 @@ function new_MeshDecomposition_with_nodes(element_distribution, unusable, node_d end function new_MeshDecomposition_with_nodes function new_MeshDecomposition_petcount(npoints, unusable, petCount) result(decomp) - use mapl_KeywordEnforcer + use mapl_KeywordEnforcer_mod type(MeshDecomposition) :: decomp integer, intent(in) :: npoints class(KeywordEnforcer), optional, intent(in) :: unusable @@ -122,7 +122,7 @@ end function new_MeshDecomposition_petcount ! New constructor for Phase 3: support both element and node distribution function new_MeshDecomposition_full(nelements, nnodes, unusable, petCount) result(decomp) - use mapl_KeywordEnforcer + use mapl_KeywordEnforcer_mod type(MeshDecomposition) :: decomp integer, intent(in) :: nelements integer, intent(in) :: nnodes @@ -166,4 +166,4 @@ elemental function not_equal_to(decomp1, decomp2) not_equal_to = .not. (decomp1 == decomp2) end function not_equal_to -end module mapl_MeshDecomposition +end module mapl_MeshDecomposition_mod diff --git a/infrastructure/geom/geom/Mesh/MeshDecomposition_smod.F90 b/infrastructure/geom/geom/Mesh/MeshDecomposition_smod.F90 index 272cd447736..14483a308e5 100644 --- a/infrastructure/geom/geom/Mesh/MeshDecomposition_smod.F90 +++ b/infrastructure/geom/geom/Mesh/MeshDecomposition_smod.F90 @@ -1,9 +1,9 @@ #include "MAPL.h" -submodule (mapl_MeshDecomposition) MeshDecomposition_smod +submodule (mapl_MeshDecomposition_mod) MeshDecomposition_smod - use mapl_Partition - use mapl_ErrorHandlingMod + use mapl_Partition_mod + use mapl_ErrorHandling_mod implicit none diff --git a/infrastructure/geom/geom/Mesh/MeshGeomFactory.F90 b/infrastructure/geom/geom/Mesh/MeshGeomFactory.F90 index e96e6d02779..f0caac9bd0a 100644 --- a/infrastructure/geom/geom/Mesh/MeshGeomFactory.F90 +++ b/infrastructure/geom/geom/Mesh/MeshGeomFactory.F90 @@ -1,12 +1,12 @@ #include "MAPL.h" -module mapl_MeshGeomFactory - use mapl_GeomSpec - use mapl_GeomFactory - use mapl_MeshGeomSpec - use mapl_KeywordEnforcerMod, only: KeywordEnforcer +module mapl_MeshGeomFactory_mod + use mapl_GeomSpec_mod + use mapl_GeomFactory_mod + use mapl_MeshGeomSpec_mod + use mapl_KeywordEnforcer_mod, only: KeywordEnforcer use gftl2_StringVector, only: StringVector - use mapl_StringDictionary, only: StringDictionary + use mapl_StringDictionary_mod, only: StringDictionary use pfio_FileMetadataMod, only: FileMetadata use esmf implicit none @@ -74,6 +74,7 @@ end function make_geom ! File metadata generation module function make_file_metadata(this, geom_spec, unusable, chunksizes, rc) result(file_metadata) + use mapl_KeywordEnforcer_mod type(FileMetadata) :: file_metadata class(MeshGeomFactory), intent(in) :: this class(GeomSpec), intent(in) :: geom_spec @@ -99,4 +100,4 @@ end function make_variable_attributes end interface -end module mapl_MeshGeomFactory +end module mapl_MeshGeomFactory_mod diff --git a/infrastructure/geom/geom/Mesh/MeshGeomFactory_smod.F90 b/infrastructure/geom/geom/Mesh/MeshGeomFactory_smod.F90 index 7cbde9a3475..b201f7d6e8f 100644 --- a/infrastructure/geom/geom/Mesh/MeshGeomFactory_smod.F90 +++ b/infrastructure/geom/geom/Mesh/MeshGeomFactory_smod.F90 @@ -1,20 +1,20 @@ #include "MAPL.h" -submodule (mapl_MeshGeomFactory) MeshGeomFactory_smod - - use mapl_GeomSpec - use mapl_MeshGeomSpec - use mapl_MeshDecomposition - use mapl_ErrorHandlingMod - use mapl_Constants, only: MAPL_PI_R8 - use mapl_StringUtilities, only: to_lower - use mapl_get_hconfig, only: get_hconfig - use mapl_hconfig_params, only: HConfigParams +submodule (mapl_MeshGeomFactory_mod) MeshGeomFactory_smod + + use mapl_GeomSpec_mod + use mapl_MeshGeomSpec_mod + use mapl_MeshDecomposition_mod + use mapl_ErrorHandling_mod + 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 use pfio use gftl2_StringVector - use mapl_StringDictionary + use mapl_StringDictionary_mod use esmf - use mapl_KeywordEnforcer, only: KE => KeywordEnforcer + use mapl_KeywordEnforcer_mod, only: KE => KeywordEnforcer implicit none @@ -296,6 +296,7 @@ end function create_esmf_mesh ! Generate file metadata for mesh module function make_file_metadata(this, geom_spec, unusable, chunksizes, rc) result(file_metadata) + use mapl_KeywordEnforcer_mod type(FileMetadata) :: file_metadata class(MeshGeomFactory), intent(in) :: this class(GeomSpec), intent(in) :: geom_spec diff --git a/infrastructure/geom/geom/Mesh/MeshGeomSpec.F90 b/infrastructure/geom/geom/Mesh/MeshGeomSpec.F90 index b13d6447f74..cfad0c4bddd 100644 --- a/infrastructure/geom/geom/Mesh/MeshGeomSpec.F90 +++ b/infrastructure/geom/geom/Mesh/MeshGeomSpec.F90 @@ -1,10 +1,10 @@ #include "MAPL.h" -module mapl_MeshGeomSpec - use mapl_GeomSpec - use mapl_MeshDecomposition - use mapl_ErrorHandlingMod - use mapl_KeywordEnforcer +module mapl_MeshGeomSpec_mod + use mapl_GeomSpec_mod + use mapl_MeshDecomposition_mod + use mapl_ErrorHandling_mod + use mapl_KeywordEnforcer_mod use esmf, only: ESMF_KIND_R8, ESMF_HConfig, ESMF_KIND_R4 use pfio, only: FileMetadata implicit none(type,external) @@ -65,7 +65,7 @@ end function make_MeshGeomSpec_from_metadata ! New file-based constructor (in submodule) module function new_MeshGeomSpec_from_file(filename, unusable, decomposition, rc) result(spec) - use mapl_KeywordEnforcer + use mapl_KeywordEnforcer_mod type(MeshGeomSpec) :: spec character(len=*), intent(in) :: filename class(KeywordEnforcer), optional, intent(in) :: unusable @@ -198,4 +198,4 @@ subroutine get_horz_ij_index_r8(this, lon, lat, ii, jj, rc) _UNUSED_DUMMY(lat) end subroutine get_horz_ij_index_r8 -end module mapl_MeshGeomSpec +end module mapl_MeshGeomSpec_mod diff --git a/infrastructure/geom/geom/Mesh/MeshGeomSpec_smod.F90 b/infrastructure/geom/geom/Mesh/MeshGeomSpec_smod.F90 index 09669ad42c8..2649cf326c1 100644 --- a/infrastructure/geom/geom/Mesh/MeshGeomSpec_smod.F90 +++ b/infrastructure/geom/geom/Mesh/MeshGeomSpec_smod.F90 @@ -1,14 +1,14 @@ #include "MAPL.h" -submodule (mapl_MeshGeomSpec) MeshGeomSpec_smod - - use mapl_GeomSpec - use mapl_CoordinateAxis, only: get_dim_name, get_coordinates - use mapl_MeshDecomposition - use mapl_ErrorHandlingMod - use mapl_StringUtilities, only: to_lower - use mapl_get_hconfig, only: get_hconfig - use mapl_hconfig_params, only: HConfigParams +submodule (mapl_MeshGeomSpec_mod) MeshGeomSpec_smod + + use mapl_GeomSpec_mod + use mapl_CoordinateAxis_mod, only: get_dim_name, get_coordinates + use mapl_MeshDecomposition_mod + use mapl_ErrorHandling_mod + use mapl_StringUtilities_mod, only: to_lower + use mapl_get_hconfig_mod, only: get_hconfig + use mapl_hconfig_params_mod, only: HConfigParams use pfio use esmf use, intrinsic :: iso_fortran_env, only: REAL64, INT32 @@ -19,7 +19,7 @@ ! New file-based constructor that reads nnodes/nelements from file module function new_MeshGeomSpec_from_file(filename, unusable, decomposition, rc) result(spec) - use mapl_KeywordEnforcer + use mapl_KeywordEnforcer_mod type(MeshGeomSpec) :: spec character(len=*), intent(in) :: filename class(KeywordEnforcer), optional, intent(in) :: unusable diff --git a/infrastructure/geom/geom/Mesh/raster_to_mesh/Direction.F90 b/infrastructure/geom/geom/Mesh/raster_to_mesh/Direction.F90 index df84f541818..1b9ca61b75e 100644 --- a/infrastructure/geom/geom/Mesh/raster_to_mesh/Direction.F90 +++ b/infrastructure/geom/geom/Mesh/raster_to_mesh/Direction.F90 @@ -1,4 +1,4 @@ -module mapl_Direction +module mapl_Direction_mod implicit none(type,external) private @@ -47,4 +47,4 @@ function dir_string(dir) result(s) end select end function dir_string -end module mapl_Direction +end module mapl_Direction_mod diff --git a/infrastructure/geom/geom/Mesh/raster_to_mesh/Mesh.F90 b/infrastructure/geom/geom/Mesh/raster_to_mesh/Mesh.F90 index 106e9b9c567..775c98fabd1 100644 --- a/infrastructure/geom/geom/Mesh/raster_to_mesh/Mesh.F90 +++ b/infrastructure/geom/geom/Mesh/raster_to_mesh/Mesh.F90 @@ -1,13 +1,13 @@ #include "MAPL.h" -module mapl_Mesh - use mapl_Direction - use mapl_MeshVertex - use mapl_MeshVertexVector - use mapl_MeshElement - use mapl_MeshElementVector - use mapl_ErrorHandling - use mapl_constants, only: MAPL_DEGREES_TO_RADIANS_R8, MAPL_PI_R8 - use mapl_constants, only: MAPL_RADIANS_TO_DEGREES +module mapl_Mesh_mod + use mapl_Direction_mod + use mapl_MeshVertex_mod + use mapl_MeshVertexVector_mod + use mapl_MeshElement_mod + use mapl_MeshElementVector_mod + use mapl_ErrorHandling_mod + 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 @@ -1300,5 +1300,5 @@ subroutine reorder_vertices(vertices, nodes) end subroutine reorder_elements -end module mapl_Mesh +end module mapl_Mesh_mod diff --git a/infrastructure/geom/geom/Mesh/raster_to_mesh/MeshElement.F90 b/infrastructure/geom/geom/Mesh/raster_to_mesh/MeshElement.F90 index d2301ef4264..8350c6de335 100644 --- a/infrastructure/geom/geom/Mesh/raster_to_mesh/MeshElement.F90 +++ b/infrastructure/geom/geom/Mesh/raster_to_mesh/MeshElement.F90 @@ -1,7 +1,7 @@ #include "MAPL.h" -module mapl_MeshElement - use mapl_Direction - use mapl_Errorhandling +module mapl_MeshElement_mod + use mapl_Direction_mod + use mapl_ErrorHandling_mod use, intrinsic :: iso_fortran_env, only: INT32, INT64 implicit none(type,external) private @@ -150,4 +150,4 @@ integer function get_type(this) end function get_type -end module mapl_MeshElement +end module mapl_MeshElement_mod diff --git a/infrastructure/geom/geom/Mesh/raster_to_mesh/MeshElementVector.F90 b/infrastructure/geom/geom/Mesh/raster_to_mesh/MeshElementVector.F90 index b6a8d8e4b32..91b5f752c9f 100644 --- a/infrastructure/geom/geom/Mesh/raster_to_mesh/MeshElementVector.F90 +++ b/infrastructure/geom/geom/Mesh/raster_to_mesh/MeshElementVector.F90 @@ -1,5 +1,5 @@ -module mapl_MeshElementVector - use mapl_MeshElement +module mapl_MeshElementVector_mod + use mapl_MeshElement_mod #define T MeshElement #define Vector MeshElementVector @@ -10,4 +10,4 @@ module mapl_MeshElementVector #undef VectorIterator #undef Vector #undef T -end module mapl_MeshElementVector +end module mapl_MeshElementVector_mod diff --git a/infrastructure/geom/geom/Mesh/raster_to_mesh/MeshVertex.F90 b/infrastructure/geom/geom/Mesh/raster_to_mesh/MeshVertex.F90 index f6d062e087e..cd04818459f 100644 --- a/infrastructure/geom/geom/Mesh/raster_to_mesh/MeshVertex.F90 +++ b/infrastructure/geom/geom/Mesh/raster_to_mesh/MeshVertex.F90 @@ -1,7 +1,7 @@ #include "MAPL.h" -module mapl_MeshVertex - use mapl_Direction - use mapl_ErrorHandling +module mapl_MeshVertex_mod + use mapl_Direction_mod + use mapl_ErrorHandling_mod use gFTL2_IntegerVector use, intrinsic :: iso_fortran_env, only: INT64, REAL64 implicit none(type,external) @@ -132,4 +132,4 @@ subroutine replace_connection(this, iv, dir, rc) _RETURN(_SUCCESS) end subroutine replace_connection -end module mapl_MeshVertex +end module mapl_MeshVertex_mod diff --git a/infrastructure/geom/geom/Mesh/raster_to_mesh/MeshVertexVector.F90 b/infrastructure/geom/geom/Mesh/raster_to_mesh/MeshVertexVector.F90 index 80c2ab8445a..ba7c379350c 100644 --- a/infrastructure/geom/geom/Mesh/raster_to_mesh/MeshVertexVector.F90 +++ b/infrastructure/geom/geom/Mesh/raster_to_mesh/MeshVertexVector.F90 @@ -1,5 +1,5 @@ -module mapl_MeshVertexVector - use mapl_MeshVertex +module mapl_MeshVertexVector_mod + use mapl_MeshVertex_mod #define T MeshVertex #define Vector MeshVertexVector @@ -10,4 +10,4 @@ module mapl_MeshVertexVector #undef VectorIterator #undef Vector #undef T -end module mapl_MeshVertexVector +end module mapl_MeshVertexVector_mod diff --git a/infrastructure/geom/geom/Mesh/raster_to_mesh/mesh_benchmark.F90 b/infrastructure/geom/geom/Mesh/raster_to_mesh/mesh_benchmark.F90 index a1d051e934c..fbc36e8752a 100644 --- a/infrastructure/geom/geom/Mesh/raster_to_mesh/mesh_benchmark.F90 +++ b/infrastructure/geom/geom/Mesh/raster_to_mesh/mesh_benchmark.F90 @@ -2,8 +2,8 @@ #include "MAPL.h" program main - use mapl_Geom_API - use mapl_ErrorHandling + use mapl_Geom_API_mod + use mapl_ErrorHandling_mod use esmf use mpi use fargparse diff --git a/infrastructure/geom/geom/Mesh/raster_to_mesh/raster_to_mesh.F90 b/infrastructure/geom/geom/Mesh/raster_to_mesh/raster_to_mesh.F90 index 97dde4f6dab..9e1bdc97b3d 100644 --- a/infrastructure/geom/geom/Mesh/raster_to_mesh/raster_to_mesh.F90 +++ b/infrastructure/geom/geom/Mesh/raster_to_mesh/raster_to_mesh.F90 @@ -1,9 +1,9 @@ #define I_AM_MAIN #include "MAPL.h" program main - use mapl_ErrorHandling - use mapl_Mesh - use mapl_MeshElement + use mapl_ErrorHandling_mod + use mapl_Mesh_mod + use mapl_MeshElement_mod use pfio use esmf use mpi diff --git a/infrastructure/geom/geom/NullGeomSpec.F90 b/infrastructure/geom/geom/NullGeomSpec.F90 index 17b018a8348..6f5a0381e40 100644 --- a/infrastructure/geom/geom/NullGeomSpec.F90 +++ b/infrastructure/geom/geom/NullGeomSpec.F90 @@ -2,11 +2,11 @@ ! NullGeomSpec is used to return a concrete object fore failing ! factory methods that return GeomSpec objects. -module mapl_NullGeomSpec +module mapl_NullGeomSpec_mod - use mapl_GeomSpec + use mapl_GeomSpec_mod use esmf, only: ESMF_KIND_R4, ESMF_KIND_R8 - use mapl_ErrorHandling + use mapl_ErrorHandling_mod implicit none(type, external) private @@ -70,4 +70,4 @@ subroutine get_horz_ij_index_r8(this, lon, lat, ii, jj, rc) _UNUSED_DUMMY(lat) end subroutine get_horz_ij_index_r8 -end module mapl_NullGeomSpec +end module mapl_NullGeomSpec_mod diff --git a/infrastructure/geom/geom/StateGetGeom.F90 b/infrastructure/geom/geom/StateGetGeom.F90 index a0be5a3c01b..2a97e39d535 100644 --- a/infrastructure/geom/geom/StateGetGeom.F90 +++ b/infrastructure/geom/geom/StateGetGeom.F90 @@ -1,9 +1,9 @@ #include "MAPL.h" -module mapl_StateGetGeom +module mapl_StateGetGeom_mod use esmf - use mapl_ErrorHandling - use mapl_Geom_API + use mapl_ErrorHandling_mod + use mapl_Geom_API_mod implicit none(type,external) private @@ -89,4 +89,4 @@ recursive subroutine collect_geom(state, geom, found, rc) _RETURN(_SUCCESS) end subroutine collect_geom -end module mapl_StateGetGeom +end module mapl_StateGetGeom_mod diff --git a/infrastructure/geom/geom/Subgrid.F90 b/infrastructure/geom/geom/Subgrid.F90 index 0fa415cc2ee..c1e086bb064 100644 --- a/infrastructure/geom/geom/Subgrid.F90 +++ b/infrastructure/geom/geom/Subgrid.F90 @@ -1,10 +1,10 @@ #include "MAPL.h" -module mapl_Subgrid +module mapl_Subgrid_mod use ESMF - use mapl_GridAccessors, only: GridGet, GridGetCoordinates - use mapl_ErrorHandling - use mapl_KeywordEnforcer + use mapl_GridAccessors_mod, only: GridGet, GridGetCoordinates + use mapl_ErrorHandling_mod + use mapl_KeywordEnforcer_mod implicit none(type,external) private @@ -231,4 +231,4 @@ function make_subgrids_from_bounds(primary_grid, bounds, unusable, rc) result(su _UNUSED_DUMMY(unusable) end function make_subgrids_from_bounds -end module mapl_Subgrid +end module mapl_Subgrid_mod diff --git a/infrastructure/geom/geom/VectorBasis.F90 b/infrastructure/geom/geom/VectorBasis.F90 index 5076f96f2e6..c51966eca88 100644 --- a/infrastructure/geom/geom/VectorBasis.F90 +++ b/infrastructure/geom/geom/VectorBasis.F90 @@ -1,8 +1,8 @@ #include "MAPL.h" -module mapl_VectorBasis +module mapl_VectorBasis_mod use esmf - use mapl_ErrorHandlingMod + use mapl_ErrorHandling_mod implicit none(type, external) private @@ -117,6 +117,6 @@ end subroutine grid_get_coords_2d end interface -end module mapl_VectorBasis +end module mapl_VectorBasis_mod diff --git a/infrastructure/geom/geom/VectorBasis/MAPL_GeomGetCoords.F90 b/infrastructure/geom/geom/VectorBasis/MAPL_GeomGetCoords.F90 index 923a495124f..cc2bf2e4baa 100644 --- a/infrastructure/geom/geom/VectorBasis/MAPL_GeomGetCoords.F90 +++ b/infrastructure/geom/geom/VectorBasis/MAPL_GeomGetCoords.F90 @@ -1,6 +1,6 @@ #include "MAPL.h" -submodule (mapl_VectorBasis) MAPL_GeomGetCoords_smod +submodule (mapl_VectorBasis_mod) MAPL_GeomGetCoords_smod contains diff --git a/infrastructure/geom/geom/VectorBasis/create_fields.F90 b/infrastructure/geom/geom/VectorBasis/create_fields.F90 index 1222d30b05b..3a1066fcb93 100644 --- a/infrastructure/geom/geom/VectorBasis/create_fields.F90 +++ b/infrastructure/geom/geom/VectorBasis/create_fields.F90 @@ -1,6 +1,6 @@ #include "MAPL.h" -submodule (mapl_VectorBasis) create_fields_smod +submodule (mapl_VectorBasis_mod) create_fields_smod contains diff --git a/infrastructure/geom/geom/VectorBasis/destroy_fields.F90 b/infrastructure/geom/geom/VectorBasis/destroy_fields.F90 index 67bafa74505..d7a3c8cc062 100644 --- a/infrastructure/geom/geom/VectorBasis/destroy_fields.F90 +++ b/infrastructure/geom/geom/VectorBasis/destroy_fields.F90 @@ -1,6 +1,6 @@ #include "MAPL.h" -submodule (mapl_VectorBasis) destroy_field_smod +submodule (mapl_VectorBasis_mod) destroy_field_smod contains module subroutine destroy_fields(this) diff --git a/infrastructure/geom/geom/VectorBasis/get_unit_vector.F90 b/infrastructure/geom/geom/VectorBasis/get_unit_vector.F90 index adc8afa6260..66bebc611db 100644 --- a/infrastructure/geom/geom/VectorBasis/get_unit_vector.F90 +++ b/infrastructure/geom/geom/VectorBasis/get_unit_vector.F90 @@ -1,6 +1,6 @@ #include "MAPL.h" -submodule (mapl_VectorBasis) get_unit_vector_smod +submodule (mapl_VectorBasis_mod) get_unit_vector_smod contains diff --git a/infrastructure/geom/geom/VectorBasis/grid_get_coords_1d.F90 b/infrastructure/geom/geom/VectorBasis/grid_get_coords_1d.F90 index 4cb19a50331..b358dbb425c 100644 --- a/infrastructure/geom/geom/VectorBasis/grid_get_coords_1d.F90 +++ b/infrastructure/geom/geom/VectorBasis/grid_get_coords_1d.F90 @@ -1,6 +1,6 @@ #include "MAPL.h" -submodule (mapl_VectorBasis) grid_get_coords_1d_smod +submodule (mapl_VectorBasis_mod) grid_get_coords_1d_smod contains diff --git a/infrastructure/geom/geom/VectorBasis/grid_get_coords_2d.F90 b/infrastructure/geom/geom/VectorBasis/grid_get_coords_2d.F90 index 980e4717d90..61440861b10 100644 --- a/infrastructure/geom/geom/VectorBasis/grid_get_coords_2d.F90 +++ b/infrastructure/geom/geom/VectorBasis/grid_get_coords_2d.F90 @@ -1,6 +1,6 @@ #include "MAPL.h" -submodule (mapl_VectorBasis) grid_get_coords_2d_smod +submodule (mapl_VectorBasis_mod) grid_get_coords_2d_smod contains module subroutine grid_get_coords_2d(grid, longitudes, latitudes, rc) diff --git a/infrastructure/geom/geom/VectorBasis/latlon2xyz.F90 b/infrastructure/geom/geom/VectorBasis/latlon2xyz.F90 index 4d632d07db7..7f8be1d275a 100644 --- a/infrastructure/geom/geom/VectorBasis/latlon2xyz.F90 +++ b/infrastructure/geom/geom/VectorBasis/latlon2xyz.F90 @@ -1,6 +1,6 @@ #include "MAPL.h" -submodule (mapl_VectorBasis) latlon2xy_smod +submodule (mapl_VectorBasis_mod) latlon2xy_smod contains pure module function latlon2xyz(sph_coord,right_hand) result(xyz_coord) diff --git a/infrastructure/geom/geom/VectorBasis/mid_pt_sphere.F90 b/infrastructure/geom/geom/VectorBasis/mid_pt_sphere.F90 index 321c1efb32c..496abacc818 100644 --- a/infrastructure/geom/geom/VectorBasis/mid_pt_sphere.F90 +++ b/infrastructure/geom/geom/VectorBasis/mid_pt_sphere.F90 @@ -1,6 +1,6 @@ #include "MAPL.h" -submodule (mapl_VectorBasis) mid_pt_sphere_smod +submodule (mapl_VectorBasis_mod) mid_pt_sphere_smod contains diff --git a/infrastructure/geom/geom/VectorBasis/new_GridVectorBasis.F90 b/infrastructure/geom/geom/VectorBasis/new_GridVectorBasis.F90 index 56274657f02..c08da37fcbb 100644 --- a/infrastructure/geom/geom/VectorBasis/new_GridVectorBasis.F90 +++ b/infrastructure/geom/geom/VectorBasis/new_GridVectorBasis.F90 @@ -1,9 +1,9 @@ #include "MAPL.h" -submodule (mapl_VectorBasis) new_GridVectorBasis_smod +submodule (mapl_VectorBasis_mod) new_GridVectorBasis_smod - use mapl_GridAccessors, only: GridGet - use mapl_FieldPointerUtilities, only: assign_fptr + use mapl_GridAccessors_mod, only: GridGet + use mapl_FieldPointerUtilities_mod, only: assign_fptr implicit none(type, external) diff --git a/infrastructure/geom/geom/VectorBasis/new_NS_Basis.F90 b/infrastructure/geom/geom/VectorBasis/new_NS_Basis.F90 index 3b71f9431d3..afa6cf95c7f 100644 --- a/infrastructure/geom/geom/VectorBasis/new_NS_Basis.F90 +++ b/infrastructure/geom/geom/VectorBasis/new_NS_Basis.F90 @@ -1,8 +1,8 @@ #include "MAPL.h" -submodule (mapl_VectorBasis) new_NS_Basis_smod +submodule (mapl_VectorBasis_mod) new_NS_Basis_smod - use mapl_FieldPointerUtilities, only: assign_fptr + use mapl_FieldPointerUtilities_mod, only: assign_fptr contains diff --git a/infrastructure/geom/geom/VectorBasis/xyz2latlon.F90 b/infrastructure/geom/geom/VectorBasis/xyz2latlon.F90 index f8130719e11..864868bac84 100644 --- a/infrastructure/geom/geom/VectorBasis/xyz2latlon.F90 +++ b/infrastructure/geom/geom/VectorBasis/xyz2latlon.F90 @@ -1,6 +1,6 @@ #include "MAPL.h" -submodule (mapl_VectorBasis) xyz2latlon_smod +submodule (mapl_VectorBasis_mod) xyz2latlon_smod contains pure module function xyz2latlon(xyz_coord) result(sph_coord) diff --git a/infrastructure/geom/geom/XY/XYGeomFactory.F90 b/infrastructure/geom/geom/XY/XYGeomFactory.F90 index fa08b1dfe0c..4437bc1c13b 100644 --- a/infrastructure/geom/geom/XY/XYGeomFactory.F90 +++ b/infrastructure/geom/geom/XY/XYGeomFactory.F90 @@ -1,17 +1,17 @@ #include "MAPL.h" -module mapl_XYGeomFactory +module mapl_XYGeomFactory_mod - use mapl_GeomSpec - use mapl_GeomFactory - use mapl_XYGeomSpec - use mapl_KeywordEnforcerMod - use mapl_ErrorHandlingMod + use mapl_GeomSpec_mod + use mapl_GeomFactory_mod + use mapl_XYGeomSpec_mod + use mapl_KeywordEnforcer_mod + use mapl_ErrorHandling_mod use gftl2_StringVector - use mapl_StringDictionary + use mapl_StringDictionary_mod use pfio use esmf - use mapl_KeywordEnforcer, only: KE => KeywordEnforcer + use mapl_KeywordEnforcer_mod, only: KE => KeywordEnforcer implicit none private @@ -36,7 +36,7 @@ module mapl_XYGeomFactory interface module function make_geom(this, geom_spec, rc) result(geom) - use mapl_GeomSpec, only: GeomSpec + use mapl_GeomSpec_mod, only: GeomSpec use esmf, only: ESMF_Geom type(ESMF_Geom) :: geom class(XYGeomFactory), intent(in) :: this @@ -52,6 +52,7 @@ module function typesafe_make_geom(spec, rc) result(geom) end function typesafe_make_geom module function create_basic_grid(spec, unusable, rc) result(grid) + use mapl_KeywordEnforcer_mod use esmf, only: ESMF_Grid type(ESMF_Grid) :: grid type(XYGeomSpec), intent(in) :: spec @@ -60,6 +61,7 @@ module function create_basic_grid(spec, unusable, rc) result(grid) end function create_basic_grid module subroutine fill_coordinates(spec, grid, unusable, rc) + use mapl_KeywordEnforcer_mod use esmf, only: ESMF_Grid type(XYGeomSpec), intent(in) :: spec type(ESMF_Grid), intent(inout) :: grid @@ -68,6 +70,7 @@ module subroutine fill_coordinates(spec, grid, unusable, rc) end subroutine fill_coordinates module subroutine fill_coordinates_abi(spec, grid, unusable, rc) + use mapl_KeywordEnforcer_mod use esmf, only: ESMF_Grid type(XYGeomSpec), intent(in) :: spec type(ESMF_Grid), intent(inout) :: grid @@ -97,6 +100,7 @@ module function make_variable_attributes(this, geom_spec, rc) result(variable_at end function make_variable_attributes module function make_file_metadata(this, geom_spec, unusable, chunksizes, rc) result(file_metadata) + use mapl_KeywordEnforcer_mod type(FileMetadata) :: file_metadata class(XYGeomFactory), intent(in) :: this class(GeomSpec), intent(in) :: geom_spec @@ -106,6 +110,7 @@ module function make_file_metadata(this, geom_spec, unusable, chunksizes, rc) re end function make_file_metadata module function typesafe_make_file_metadata(spec, unusable, chunksizes, rc) result(file_metadata) + use mapl_KeywordEnforcer_mod type(FileMetadata) :: file_metadata type(XYGeomSpec), intent(in) :: spec class(KE), optional, intent(in) :: unusable @@ -184,4 +189,4 @@ logical function supports_spec(this, geom_spec) result(supports) _UNUSED_DUMMY(this) end function supports_spec -end module mapl_XYGeomFactory +end module mapl_XYGeomFactory_mod diff --git a/infrastructure/geom/geom/XY/XYGeomFactory/add_mask.F90 b/infrastructure/geom/geom/XY/XYGeomFactory/add_mask.F90 index 771dbeca8dc..6800b573fa1 100644 --- a/infrastructure/geom/geom/XY/XYGeomFactory/add_mask.F90 +++ b/infrastructure/geom/geom/XY/XYGeomFactory/add_mask.F90 @@ -1,8 +1,8 @@ #include "MAPL.h" -submodule (mapl_XYGeomFactory) add_mask_smod - use mapl_ErrorHandlingMod - use mapl_InternalConstants, only: MAPL_UNDEFINED_REAL64, MAPL_MASK_IN, MAPL_MASK_OUT, & +submodule (mapl_XYGeomFactory_mod) add_mask_smod + use mapl_ErrorHandling_mod + use mapl_InternalConstants_mod, only: MAPL_UNDEFINED_REAL64, MAPL_MASK_IN, MAPL_MASK_OUT, & MAPL_DESTINATIONMASK use esmf implicit none diff --git a/infrastructure/geom/geom/XY/XYGeomFactory/create_basic_grid.F90 b/infrastructure/geom/geom/XY/XYGeomFactory/create_basic_grid.F90 index 17e84379aeb..ef02de36c52 100644 --- a/infrastructure/geom/geom/XY/XYGeomFactory/create_basic_grid.F90 +++ b/infrastructure/geom/geom/XY/XYGeomFactory/create_basic_grid.F90 @@ -1,14 +1,15 @@ #include "MAPL.h" -submodule (mapl_XYGeomFactory) create_basic_grid_smod - use mapl_ErrorHandlingMod - use mapl_InternalConstants +submodule (mapl_XYGeomFactory_mod) create_basic_grid_smod + use mapl_ErrorHandling_mod + use mapl_InternalConstants_mod use esmf implicit none contains module function create_basic_grid(spec, unusable, rc) result(grid) + use mapl_KeywordEnforcer_mod type(ESMF_Grid) :: grid type(XYGeomSpec), intent(in) :: spec class(KE), optional, intent(in) :: unusable diff --git a/infrastructure/geom/geom/XY/XYGeomFactory/fill_coordinates.F90 b/infrastructure/geom/geom/XY/XYGeomFactory/fill_coordinates.F90 index a91ff9cbb82..d83ed409f1b 100644 --- a/infrastructure/geom/geom/XY/XYGeomFactory/fill_coordinates.F90 +++ b/infrastructure/geom/geom/XY/XYGeomFactory/fill_coordinates.F90 @@ -9,11 +9,11 @@ ! MPI_Bcast (ESMF_VMBroadcast has no R8 or 2-D interface), and each ! PET copies its local tile into the ESMF coordinate arrays. -submodule (mapl_XYGeomFactory) fill_coordinates_smod - use mapl_ErrorHandlingMod - use mapl_InternalConstants, only: MAPL_UNDEFINED_REAL64 - use mapl_Constants, only: MAPL_DEGREES_TO_RADIANS_R8 - use mapl_Comms, only: am_i_root, ROOT_PROCESS_ID +submodule (mapl_XYGeomFactory_mod) fill_coordinates_smod + use mapl_ErrorHandling_mod + use mapl_InternalConstants_mod, only: MAPL_UNDEFINED_REAL64 + use MAPL_Constants, only: MAPL_DEGREES_TO_RADIANS_R8 + use mapl_Comms_mod, only: am_i_root, ROOT_PROCESS_ID use NetCDF use esmf use mpi @@ -22,6 +22,7 @@ contains module subroutine fill_coordinates(spec, grid, unusable, rc) + use mapl_KeywordEnforcer_mod type(XYGeomSpec), intent(in) :: spec type(ESMF_Grid), intent(inout) :: grid class(KE), optional, intent(in) :: unusable diff --git a/infrastructure/geom/geom/XY/XYGeomFactory/fill_coordinates_abi.F90 b/infrastructure/geom/geom/XY/XYGeomFactory/fill_coordinates_abi.F90 index efd4145e286..5e083fd140f 100644 --- a/infrastructure/geom/geom/XY/XYGeomFactory/fill_coordinates_abi.F90 +++ b/infrastructure/geom/geom/XY/XYGeomFactory/fill_coordinates_abi.F90 @@ -8,11 +8,11 @@ ! ! Shmem optimisation is intentionally omitted (see issue #4685). -submodule (mapl_XYGeomFactory) fill_coordinates_abi_smod - use mapl_ErrorHandlingMod - use mapl_Constants, only: MAPL_DEGREES_TO_RADIANS_R8 - use mapl_Comms, only: am_i_root, ROOT_PROCESS_ID - use MAPL_EarthConstants, only: R_EQ => MAPL_SEMIMAJOR_AXIS, & +submodule (mapl_XYGeomFactory_mod) fill_coordinates_abi_smod + use mapl_ErrorHandling_mod + 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, & H_SAT => MAPL_GEO_ORBIT_RADIUS use NetCDF @@ -26,6 +26,7 @@ contains module subroutine fill_coordinates_abi(spec, grid, unusable, rc) + use mapl_KeywordEnforcer_mod type(XYGeomSpec), intent(in) :: spec type(ESMF_Grid), intent(inout) :: grid class(KE), optional, intent(in) :: unusable diff --git a/infrastructure/geom/geom/XY/XYGeomFactory/make_file_metadata.F90 b/infrastructure/geom/geom/XY/XYGeomFactory/make_file_metadata.F90 index a63452ebdae..5a38cdf3c3f 100644 --- a/infrastructure/geom/geom/XY/XYGeomFactory/make_file_metadata.F90 +++ b/infrastructure/geom/geom/XY/XYGeomFactory/make_file_metadata.F90 @@ -1,8 +1,8 @@ #include "MAPL.h" -submodule (mapl_XYGeomFactory) make_file_metadata_smod - use mapl_ErrorHandlingMod - use mapl_KeywordEnforcer, only: KE => KeywordEnforcer +submodule (mapl_XYGeomFactory_mod) make_file_metadata_smod + use mapl_ErrorHandling_mod + use mapl_KeywordEnforcer_mod, only: KE => KeywordEnforcer use pfio use esmf implicit none @@ -10,6 +10,7 @@ contains module function make_file_metadata(this, geom_spec, unusable, chunksizes, rc) result(file_metadata) + use mapl_KeywordEnforcer_mod type(FileMetadata) :: file_metadata class(XYGeomFactory), intent(in) :: this class(GeomSpec), intent(in) :: geom_spec diff --git a/infrastructure/geom/geom/XY/XYGeomFactory/make_geom.F90 b/infrastructure/geom/geom/XY/XYGeomFactory/make_geom.F90 index bb2ca59b6ca..0a595b1290a 100644 --- a/infrastructure/geom/geom/XY/XYGeomFactory/make_geom.F90 +++ b/infrastructure/geom/geom/XY/XYGeomFactory/make_geom.F90 @@ -1,7 +1,7 @@ #include "MAPL.h" -submodule (mapl_XYGeomFactory) make_geom_smod - use mapl_ErrorHandlingMod +submodule (mapl_XYGeomFactory_mod) make_geom_smod + use mapl_ErrorHandling_mod use esmf implicit none diff --git a/infrastructure/geom/geom/XY/XYGeomFactory/make_gridded_dims.F90 b/infrastructure/geom/geom/XY/XYGeomFactory/make_gridded_dims.F90 index 382fc35ab0a..3f81e53a602 100644 --- a/infrastructure/geom/geom/XY/XYGeomFactory/make_gridded_dims.F90 +++ b/infrastructure/geom/geom/XY/XYGeomFactory/make_gridded_dims.F90 @@ -1,7 +1,7 @@ #include "MAPL.h" -submodule (mapl_XYGeomFactory) make_gridded_dims_smod - use mapl_ErrorHandlingMod +submodule (mapl_XYGeomFactory_mod) make_gridded_dims_smod + use mapl_ErrorHandling_mod use gftl2_StringVector implicit none diff --git a/infrastructure/geom/geom/XY/XYGeomFactory/make_variable_attributes.F90 b/infrastructure/geom/geom/XY/XYGeomFactory/make_variable_attributes.F90 index cc94c534bcd..01c89bd7172 100644 --- a/infrastructure/geom/geom/XY/XYGeomFactory/make_variable_attributes.F90 +++ b/infrastructure/geom/geom/XY/XYGeomFactory/make_variable_attributes.F90 @@ -1,8 +1,8 @@ #include "MAPL.h" -submodule (mapl_XYGeomFactory) make_variable_attributes_smod - use mapl_ErrorHandlingMod - use mapl_StringDictionary +submodule (mapl_XYGeomFactory_mod) make_variable_attributes_smod + use mapl_ErrorHandling_mod + use mapl_StringDictionary_mod implicit none contains diff --git a/infrastructure/geom/geom/XY/XYGeomFactory/typesafe_make_file_metadata.F90 b/infrastructure/geom/geom/XY/XYGeomFactory/typesafe_make_file_metadata.F90 index f3790087238..f97eb14dfb2 100644 --- a/infrastructure/geom/geom/XY/XYGeomFactory/typesafe_make_file_metadata.F90 +++ b/infrastructure/geom/geom/XY/XYGeomFactory/typesafe_make_file_metadata.F90 @@ -1,7 +1,7 @@ #include "MAPL.h" -submodule (mapl_XYGeomFactory) typesafe_make_file_metadata_smod - use mapl_ErrorHandlingMod +submodule (mapl_XYGeomFactory_mod) typesafe_make_file_metadata_smod + use mapl_ErrorHandling_mod use pfio use esmf use, intrinsic :: iso_fortran_env, only: REAL64 @@ -10,6 +10,7 @@ contains module function typesafe_make_file_metadata(spec, unusable, chunksizes, rc) result(file_metadata) + use mapl_KeywordEnforcer_mod type(FileMetadata) :: file_metadata type(XYGeomSpec), intent(in) :: spec class(KE), optional, intent(in) :: unusable diff --git a/infrastructure/geom/geom/XY/XYGeomFactory/typesafe_make_geom.F90 b/infrastructure/geom/geom/XY/XYGeomFactory/typesafe_make_geom.F90 index 1c49881630a..75d15bf88f6 100644 --- a/infrastructure/geom/geom/XY/XYGeomFactory/typesafe_make_geom.F90 +++ b/infrastructure/geom/geom/XY/XYGeomFactory/typesafe_make_geom.F90 @@ -1,8 +1,8 @@ #include "MAPL.h" -submodule (mapl_XYGeomFactory) typesafe_make_geom_smod - use mapl_ErrorHandlingMod - use mapl_InternalConstants +submodule (mapl_XYGeomFactory_mod) typesafe_make_geom_smod + use mapl_ErrorHandling_mod + use mapl_InternalConstants_mod use esmf implicit none diff --git a/infrastructure/geom/geom/XY/XYGeomSpec.F90 b/infrastructure/geom/geom/XY/XYGeomSpec.F90 index 1f048525ff4..5f3adb52fcb 100644 --- a/infrastructure/geom/geom/XY/XYGeomSpec.F90 +++ b/infrastructure/geom/geom/XY/XYGeomSpec.F90 @@ -1,9 +1,9 @@ #include "MAPL.h" -module mapl_XYGeomSpec +module mapl_XYGeomSpec_mod - use mapl_GeomSpec - use MAPL_InternalConstants + use mapl_GeomSpec_mod + use mapl_InternalConstants_mod use esmf, only: ESMF_KIND_R4, ESMF_KIND_R8, ESMF_HConfig implicit none @@ -278,4 +278,4 @@ function get_att_name_proj(this) result(v) v = this%att_name_proj end function get_att_name_proj -end module mapl_XYGeomSpec +end module mapl_XYGeomSpec_mod diff --git a/infrastructure/geom/geom/XY/XYGeomSpec/equal_to.F90 b/infrastructure/geom/geom/XY/XYGeomSpec/equal_to.F90 index 24950443ef6..2c25d2ecd69 100644 --- a/infrastructure/geom/geom/XY/XYGeomSpec/equal_to.F90 +++ b/infrastructure/geom/geom/XY/XYGeomSpec/equal_to.F90 @@ -1,7 +1,7 @@ #include "MAPL.h" -submodule (mapl_XYGeomSpec) equal_to_smod - use mapl_ErrorHandlingMod +submodule (mapl_XYGeomSpec_mod) equal_to_smod + use mapl_ErrorHandling_mod implicit none contains diff --git a/infrastructure/geom/geom/XY/XYGeomSpec/get_horz_ij_index.F90 b/infrastructure/geom/geom/XY/XYGeomSpec/get_horz_ij_index.F90 index 13d82bf6e9e..375fe634313 100644 --- a/infrastructure/geom/geom/XY/XYGeomSpec/get_horz_ij_index.F90 +++ b/infrastructure/geom/geom/XY/XYGeomSpec/get_horz_ij_index.F90 @@ -1,7 +1,7 @@ #include "MAPL.h" -submodule (mapl_XYGeomSpec) get_horz_ij_index_smod - use mapl_ErrorHandlingMod +submodule (mapl_XYGeomSpec_mod) get_horz_ij_index_smod + use mapl_ErrorHandling_mod implicit none contains diff --git a/infrastructure/geom/geom/XY/XYGeomSpec/make_XYGeomSpec_from_hconfig.F90 b/infrastructure/geom/geom/XY/XYGeomSpec/make_XYGeomSpec_from_hconfig.F90 index 6660bec189d..56fa0c03151 100644 --- a/infrastructure/geom/geom/XY/XYGeomSpec/make_XYGeomSpec_from_hconfig.F90 +++ b/infrastructure/geom/geom/XY/XYGeomSpec/make_XYGeomSpec_from_hconfig.F90 @@ -1,9 +1,9 @@ #include "MAPL.h" -submodule (mapl_XYGeomSpec) make_XYGeomSpec_from_hconfig_smod - use mapl_ErrorHandlingMod - use mapl_InternalConstants - use mapl_Comms, only: am_i_root, ROOT_PROCESS_ID +submodule (mapl_XYGeomSpec_mod) make_XYGeomSpec_from_hconfig_smod + use mapl_ErrorHandling_mod + use mapl_InternalConstants_mod + use mapl_Comms_mod, only: am_i_root, ROOT_PROCESS_ID use NetCDF use esmf implicit none diff --git a/infrastructure/geom/geom/XY/XYGeomSpec/make_XYGeomSpec_from_metadata.F90 b/infrastructure/geom/geom/XY/XYGeomSpec/make_XYGeomSpec_from_metadata.F90 index ed72547d993..d24073e1687 100644 --- a/infrastructure/geom/geom/XY/XYGeomSpec/make_XYGeomSpec_from_metadata.F90 +++ b/infrastructure/geom/geom/XY/XYGeomSpec/make_XYGeomSpec_from_metadata.F90 @@ -1,9 +1,9 @@ #include "MAPL.h" -submodule (mapl_XYGeomSpec) make_XYGeomSpec_from_metadata_smod - use mapl_ErrorHandlingMod - use mapl_InternalConstants - use mapl_Comms, only: am_i_root, ROOT_PROCESS_ID +submodule (mapl_XYGeomSpec_mod) make_XYGeomSpec_from_metadata_smod + use mapl_ErrorHandling_mod + use mapl_InternalConstants_mod + use mapl_Comms_mod, only: am_i_root, ROOT_PROCESS_ID use NetCDF use pfio, only: FileMetadata use esmf diff --git a/infrastructure/geom/geom/XY/XYGeomSpec/supports_hconfig.F90 b/infrastructure/geom/geom/XY/XYGeomSpec/supports_hconfig.F90 index e9ef3e25038..e4059d3344d 100644 --- a/infrastructure/geom/geom/XY/XYGeomSpec/supports_hconfig.F90 +++ b/infrastructure/geom/geom/XY/XYGeomSpec/supports_hconfig.F90 @@ -1,7 +1,7 @@ #include "MAPL.h" -submodule (mapl_XYGeomSpec) supports_hconfig_smod - use mapl_ErrorHandlingMod +submodule (mapl_XYGeomSpec_mod) supports_hconfig_smod + use mapl_ErrorHandling_mod use esmf implicit none diff --git a/infrastructure/geom/geom/XY/XYGeomSpec/supports_metadata.F90 b/infrastructure/geom/geom/XY/XYGeomSpec/supports_metadata.F90 index 71ed675dff5..454f426c463 100644 --- a/infrastructure/geom/geom/XY/XYGeomSpec/supports_metadata.F90 +++ b/infrastructure/geom/geom/XY/XYGeomSpec/supports_metadata.F90 @@ -1,7 +1,7 @@ #include "MAPL.h" -submodule (mapl_XYGeomSpec) supports_metadata_smod - use mapl_ErrorHandlingMod +submodule (mapl_XYGeomSpec_mod) supports_metadata_smod + use mapl_ErrorHandling_mod use pfio, only: FileMetadata, Attribute implicit none diff --git a/infrastructure/geom/geom/tests/CMakeLists.txt b/infrastructure/geom/geom/tests/CMakeLists.txt index 41260653642..5c1b68a2baa 100644 --- a/infrastructure/geom/geom/tests/CMakeLists.txt +++ b/infrastructure/geom/geom/tests/CMakeLists.txt @@ -36,7 +36,7 @@ add_pfunit_ctest(MAPL.geom.tests OTHER_SOURCES ${OTHER_SRCS} LINK_LIBRARIES MAPL.geom MAPL.shared MAPL.pfunit EXTRA_INITIALIZE Initialize - EXTRA_USE MAPL_pFUnit_Initialize + EXTRA_USE mapl_pFUnit_Initialize_mod MAX_PES 8 ) diff --git a/infrastructure/geom/geom/tests/MeshTestHelper.F90 b/infrastructure/geom/geom/tests/MeshTestHelper.F90 index e36ef598dfe..882b328a432 100644 --- a/infrastructure/geom/geom/tests/MeshTestHelper.F90 +++ b/infrastructure/geom/geom/tests/MeshTestHelper.F90 @@ -1,8 +1,8 @@ #include "MAPL_ErrLog.h" -module mapl_MeshTestHelper +module mapl_MeshTestHelper_mod use pfio - use mapl_ErrorHandlingMod + use mapl_ErrorHandling_mod use, intrinsic :: iso_fortran_env, only: REAL64, INT32 implicit none private @@ -710,4 +710,4 @@ subroutine cleanup_test_file(filename, rc) _RETURN(_SUCCESS) end subroutine cleanup_test_file -end module mapl_MeshTestHelper +end module mapl_MeshTestHelper_mod diff --git a/infrastructure/geom/geom/tests/Test_CoordinateAxis.pf b/infrastructure/geom/geom/tests/Test_CoordinateAxis.pf index ea9f1a48066..7c4272b67e8 100644 --- a/infrastructure/geom/geom/tests/Test_CoordinateAxis.pf +++ b/infrastructure/geom/geom/tests/Test_CoordinateAxis.pf @@ -1,6 +1,6 @@ module Test_CoordinateAxis use funit - use mapl_CoordinateAxis + use mapl_CoordinateAxis_mod use esmf, only: ESMF_KIND_R8 use esmf, only: ESMF_HConfig use esmf, only: ESMF_HConfigCreate diff --git a/infrastructure/geom/geom/tests/Test_CubedSphereGeomFactory.pf b/infrastructure/geom/geom/tests/Test_CubedSphereGeomFactory.pf index 3cdd8add6ec..1b452ca9601 100644 --- a/infrastructure/geom/geom/tests/Test_CubedSphereGeomFactory.pf +++ b/infrastructure/geom/geom/tests/Test_CubedSphereGeomFactory.pf @@ -4,8 +4,8 @@ module Test_CubedSphereGeomFactory use pfunit use esmf_TestMethod_mod ! mapl - use mapl_GeomSpec - use mapl_CubedSphereGeomFactory + use mapl_GeomSpec_mod + use mapl_CubedSphereGeomFactory_mod use esmf implicit none diff --git a/infrastructure/geom/geom/tests/Test_CubedSphereGeomSpec.pf b/infrastructure/geom/geom/tests/Test_CubedSphereGeomSpec.pf index 31eee15d14d..46199aa4ce8 100644 --- a/infrastructure/geom/geom/tests/Test_CubedSphereGeomSpec.pf +++ b/infrastructure/geom/geom/tests/Test_CubedSphereGeomSpec.pf @@ -5,7 +5,7 @@ module Test_CubedSphereGeomSpec use pfunit use esmf_TestMethod_mod ! mapl - use mapl_CubedSphereGeomSpec + use mapl_CubedSphereGeomSpec_mod use MAPL_Constants, only: MAPL_PI, MAPL_PI_R8 use esmf diff --git a/infrastructure/geom/geom/tests/Test_EASEGeomFactory.pf b/infrastructure/geom/geom/tests/Test_EASEGeomFactory.pf index f1e780421f8..ead8d753f78 100644 --- a/infrastructure/geom/geom/tests/Test_EASEGeomFactory.pf +++ b/infrastructure/geom/geom/tests/Test_EASEGeomFactory.pf @@ -6,9 +6,9 @@ module Test_EASEGeomFactory use funit use gftl2_StringVector use esmf_TestMethod_mod - use mapl_GeomSpec - use mapl_EASEGeomSpec - use mapl_EASEGeomFactory + use mapl_GeomSpec_mod + use mapl_EASEGeomSpec_mod + use mapl_EASEGeomFactory_mod use esmf implicit none diff --git a/infrastructure/geom/geom/tests/Test_EASEGeomSpec.pf b/infrastructure/geom/geom/tests/Test_EASEGeomSpec.pf index 21aefb0698a..3f74d6962cb 100644 --- a/infrastructure/geom/geom/tests/Test_EASEGeomSpec.pf +++ b/infrastructure/geom/geom/tests/Test_EASEGeomSpec.pf @@ -5,8 +5,8 @@ module Test_EASEGeomSpec use pfunit use funit use esmf_TestMethod_mod - use mapl_EASEGeomSpec - use mapl_EASEDecomposition + use mapl_EASEGeomSpec_mod + use mapl_EASEDecomposition_mod use esmf implicit none diff --git a/infrastructure/geom/geom/tests/Test_GeomManager.pf b/infrastructure/geom/geom/tests/Test_GeomManager.pf index dea3a38a420..07da32138db 100644 --- a/infrastructure/geom/geom/tests/Test_GeomManager.pf +++ b/infrastructure/geom/geom/tests/Test_GeomManager.pf @@ -1,7 +1,7 @@ #include "MAPL_TestErr.h" module Test_GeomManager use pfunit - use mapl_Geom_API + use mapl_Geom_API_mod use esmf_TestMethod_mod ! mapl use esmf implicit none diff --git a/infrastructure/geom/geom/tests/Test_GridGet.pf b/infrastructure/geom/geom/tests/Test_GridGet.pf index 812ca5ba8b8..68e9fceba98 100644 --- a/infrastructure/geom/geom/tests/Test_GridGet.pf +++ b/infrastructure/geom/geom/tests/Test_GridGet.pf @@ -3,7 +3,7 @@ module Test_GridGet use pfunit - use mapl_Geom_API + use mapl_Geom_API_mod use esmf_TestMethod_mod ! mapl use esmf diff --git a/infrastructure/geom/geom/tests/Test_LatAxis.pf b/infrastructure/geom/geom/tests/Test_LatAxis.pf index 72b5aec23bf..e52cce7f449 100644 --- a/infrastructure/geom/geom/tests/Test_LatAxis.pf +++ b/infrastructure/geom/geom/tests/Test_LatAxis.pf @@ -1,6 +1,6 @@ module Test_LatAxis use funit - use mapl_LatAxis + use mapl_LatAxis_mod use esmf, only: ESMF_KIND_R8 use esmf, only: ESMF_HConfig use esmf, only: ESMF_HConfigCreate diff --git a/infrastructure/geom/geom/tests/Test_LatLonDecomposition.pf b/infrastructure/geom/geom/tests/Test_LatLonDecomposition.pf index 2d7d0825243..1df53556a94 100644 --- a/infrastructure/geom/geom/tests/Test_LatLonDecomposition.pf +++ b/infrastructure/geom/geom/tests/Test_LatLonDecomposition.pf @@ -1,5 +1,5 @@ module Test_LatLonDecomposition - use mapl_LatLonDecomposition + use mapl_LatLonDecomposition_mod use funit implicit none diff --git a/infrastructure/geom/geom/tests/Test_LatLonGeomFactory.pf b/infrastructure/geom/geom/tests/Test_LatLonGeomFactory.pf index 4ed022f14ca..66ea1cc3c56 100644 --- a/infrastructure/geom/geom/tests/Test_LatLonGeomFactory.pf +++ b/infrastructure/geom/geom/tests/Test_LatLonGeomFactory.pf @@ -4,8 +4,8 @@ module Test_LatLonGeomFactory use pfunit use esmf_TestMethod_mod ! mapl - use mapl_GeomSpec - use mapl_LatLonGeomFactory + use mapl_GeomSpec_mod + use mapl_LatLonGeomFactory_mod use esmf implicit none diff --git a/infrastructure/geom/geom/tests/Test_LatLonGeomSpec.pf b/infrastructure/geom/geom/tests/Test_LatLonGeomSpec.pf index 66bebe78b8f..85760192ed9 100644 --- a/infrastructure/geom/geom/tests/Test_LatLonGeomSpec.pf +++ b/infrastructure/geom/geom/tests/Test_LatLonGeomSpec.pf @@ -1,6 +1,6 @@ module Test_LatLonGeomSpec - use mapl_LatLonGeomSpec + use mapl_LatLonGeomSpec_mod use esmf use funit diff --git a/infrastructure/geom/geom/tests/Test_LocStreamDecomposition.pf b/infrastructure/geom/geom/tests/Test_LocStreamDecomposition.pf index 7af70e67dda..5a13db9d5d9 100644 --- a/infrastructure/geom/geom/tests/Test_LocStreamDecomposition.pf +++ b/infrastructure/geom/geom/tests/Test_LocStreamDecomposition.pf @@ -4,7 +4,7 @@ module Test_LocStreamDecomposition use pfunit use esmf_TestMethod_mod - use mapl_LocStreamDecomposition + use mapl_LocStreamDecomposition_mod use esmf implicit none @@ -140,8 +140,8 @@ contains @test(type=ESMF_TestMethod, npes=[1,2,4]) subroutine test_create_locstream_distributed(this) - use mapl_GeomManager, only: GeomManager - use mapl_MaplGeom, only: MaplGeom + use mapl_GeomManager_mod, only: GeomManager + use mapl_MaplGeom_mod, only: MaplGeom class(ESMF_TestMethod), intent(inout) :: this type(ESMF_HConfig) :: hconfig diff --git a/infrastructure/geom/geom/tests/Test_LocStreamGeomFactory.pf b/infrastructure/geom/geom/tests/Test_LocStreamGeomFactory.pf index 73da2424f2d..ece98cca2c2 100644 --- a/infrastructure/geom/geom/tests/Test_LocStreamGeomFactory.pf +++ b/infrastructure/geom/geom/tests/Test_LocStreamGeomFactory.pf @@ -4,8 +4,8 @@ module Test_LocStreamGeomFactory use pfunit use esmf_TestMethod_mod ! mapl - use mapl_Geom_API - use mapl_LocStreamGeomFactory, only: LocStreamGeomFactory + use mapl_Geom_API_mod + use mapl_LocStreamGeomFactory_mod, only: LocStreamGeomFactory use esmf implicit none diff --git a/infrastructure/geom/geom/tests/Test_LocStreamGeomFactory_Metadata.pf b/infrastructure/geom/geom/tests/Test_LocStreamGeomFactory_Metadata.pf index a9c4714f899..e92302f764e 100644 --- a/infrastructure/geom/geom/tests/Test_LocStreamGeomFactory_Metadata.pf +++ b/infrastructure/geom/geom/tests/Test_LocStreamGeomFactory_Metadata.pf @@ -6,7 +6,7 @@ module Test_LocStreamGeomFactory_Metadata use pfunit use esmf_TestMethod_mod ! mapl - use mapl_Geom_API + use mapl_Geom_API_mod use pFIO_FileMetadataMod use pFIO_VariableMod use pFIO_CoordinateVariableMod diff --git a/infrastructure/geom/geom/tests/Test_LonAxis.pf b/infrastructure/geom/geom/tests/Test_LonAxis.pf index 98352979ba4..e007f238be3 100644 --- a/infrastructure/geom/geom/tests/Test_LonAxis.pf +++ b/infrastructure/geom/geom/tests/Test_LonAxis.pf @@ -1,7 +1,7 @@ module Test_LonAxis use funit - use mapl_CoordinateAxis - use mapl_LonAxis + use mapl_CoordinateAxis_mod + use mapl_LonAxis_mod use esmf, only: ESMF_KIND_R8 use esmf, only: ESMF_HConfig use esmf, only: ESMF_HConfigCreate diff --git a/infrastructure/geom/geom/tests/Test_MeshDecomposition.pf b/infrastructure/geom/geom/tests/Test_MeshDecomposition.pf index 5d2c8bbe8cb..2c0988ba801 100644 --- a/infrastructure/geom/geom/tests/Test_MeshDecomposition.pf +++ b/infrastructure/geom/geom/tests/Test_MeshDecomposition.pf @@ -4,7 +4,7 @@ module Test_MeshDecomposition use pfunit use esmf_TestMethod_mod ! mapl - use mapl_MeshDecomposition + use mapl_MeshDecomposition_mod use esmf implicit none diff --git a/infrastructure/geom/geom/tests/Test_MeshGeomFactory.pf b/infrastructure/geom/geom/tests/Test_MeshGeomFactory.pf index 1b34ce18102..12bb77e7241 100644 --- a/infrastructure/geom/geom/tests/Test_MeshGeomFactory.pf +++ b/infrastructure/geom/geom/tests/Test_MeshGeomFactory.pf @@ -4,13 +4,13 @@ module Test_MeshGeomFactory use pfunit use esmf_TestMethod_mod ! mapl - use mapl_GeomSpec - use mapl_MeshGeomFactory - use mapl_MeshGeomSpec - use mapl_MeshDecomposition - use mapl_MeshTestHelper + use mapl_GeomSpec_mod + use mapl_MeshGeomFactory_mod + use mapl_MeshGeomSpec_mod + use mapl_MeshDecomposition_mod + use mapl_MeshTestHelper_mod use gftl2_StringVector - use mapl_StringDictionary + use mapl_StringDictionary_mod use esmf implicit none diff --git a/infrastructure/geom/geom/tests/Test_MeshGeomFactory_Distribution.pf b/infrastructure/geom/geom/tests/Test_MeshGeomFactory_Distribution.pf index e46e36f01e7..bbb1eabfd74 100644 --- a/infrastructure/geom/geom/tests/Test_MeshGeomFactory_Distribution.pf +++ b/infrastructure/geom/geom/tests/Test_MeshGeomFactory_Distribution.pf @@ -4,12 +4,12 @@ module Test_MeshGeomFactory_Distribution use pfunit use esmf_TestMethod_mod ! mapl - use mapl_MeshGeomFactory - use mapl_MeshGeomSpec - use mapl_MeshDecomposition - use mapl_GeomSpec - use mapl_MeshTestHelper - use mapl_ErrorHandlingMod + use mapl_MeshGeomFactory_mod + use mapl_MeshGeomSpec_mod + use mapl_MeshDecomposition_mod + use mapl_GeomSpec_mod + use mapl_MeshTestHelper_mod + use mapl_ErrorHandling_mod use pfio use esmf use, intrinsic :: iso_fortran_env, only: REAL64 @@ -276,7 +276,7 @@ contains !=========================================================================== subroutine create_ten_element_mesh_file(filename, rc) use pfio - use mapl_ErrorHandlingMod + use mapl_ErrorHandling_mod use, intrinsic :: iso_fortran_env, only: REAL64, INT32 character(len=*), intent(in) :: filename diff --git a/infrastructure/geom/geom/tests/Test_MeshGeomFactory_File.pf b/infrastructure/geom/geom/tests/Test_MeshGeomFactory_File.pf index a84611e5f6a..00162738151 100644 --- a/infrastructure/geom/geom/tests/Test_MeshGeomFactory_File.pf +++ b/infrastructure/geom/geom/tests/Test_MeshGeomFactory_File.pf @@ -4,12 +4,12 @@ module Test_MeshGeomFactory_File use pfunit use esmf_TestMethod_mod ! mapl - use mapl_MeshGeomFactory - use mapl_MeshGeomSpec - use mapl_MeshDecomposition - use mapl_GeomSpec - use mapl_MeshTestHelper - use mapl_ErrorHandlingMod + use mapl_MeshGeomFactory_mod + use mapl_MeshGeomSpec_mod + use mapl_MeshDecomposition_mod + use mapl_GeomSpec_mod + use mapl_MeshTestHelper_mod + use mapl_ErrorHandling_mod use pfio use esmf use, intrinsic :: iso_fortran_env, only: REAL64 diff --git a/infrastructure/geom/geom/tests/Test_MeshGeomFactory_Metadata.pf b/infrastructure/geom/geom/tests/Test_MeshGeomFactory_Metadata.pf index d3bcde67a63..38be6d551ba 100644 --- a/infrastructure/geom/geom/tests/Test_MeshGeomFactory_Metadata.pf +++ b/infrastructure/geom/geom/tests/Test_MeshGeomFactory_Metadata.pf @@ -4,11 +4,11 @@ module Test_MeshGeomFactory_Metadata use pfunit use esmf_TestMethod_mod ! mapl - use mapl_GeomSpec - use mapl_MeshGeomFactory - use mapl_MeshGeomSpec - use mapl_MeshDecomposition - use mapl_MeshTestHelper + use mapl_GeomSpec_mod + use mapl_MeshGeomFactory_mod + use mapl_MeshGeomSpec_mod + use mapl_MeshDecomposition_mod + use mapl_MeshTestHelper_mod use pfio use esmf implicit none diff --git a/infrastructure/geom/geom/tests/Test_MeshGeomSpec.pf b/infrastructure/geom/geom/tests/Test_MeshGeomSpec.pf index c0bd5e66718..d0bac56f43a 100644 --- a/infrastructure/geom/geom/tests/Test_MeshGeomSpec.pf +++ b/infrastructure/geom/geom/tests/Test_MeshGeomSpec.pf @@ -4,9 +4,9 @@ module Test_MeshGeomSpec use pfunit use esmf_TestMethod_mod ! mapl - use mapl_MeshGeomSpec - use mapl_MeshDecomposition - use mapl_MeshTestHelper + use mapl_MeshGeomSpec_mod + use mapl_MeshDecomposition_mod + use mapl_MeshTestHelper_mod use esmf implicit none diff --git a/infrastructure/geom/geom/tests/Test_StateGetGeom.pf b/infrastructure/geom/geom/tests/Test_StateGetGeom.pf index 14ed1ddf1d1..0462e2e804a 100644 --- a/infrastructure/geom/geom/tests/Test_StateGetGeom.pf +++ b/infrastructure/geom/geom/tests/Test_StateGetGeom.pf @@ -2,12 +2,12 @@ #include "unused_dummy.H" module Test_StateGetGeom - use mapl_StateGetGeomImpl - use mapl_Geom_API, only: get_geom_manager, GeomManager, MaplGeom + use mapl_StateGetGeomImpl_mod + use mapl_Geom_API_mod, only: get_geom_manager, GeomManager, MaplGeom use pfunit use ESMF_TestMethod_mod use esmf - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod implicit none(type, external) diff --git a/infrastructure/geom/geom/tests/Test_XYGeomFactory.pf b/infrastructure/geom/geom/tests/Test_XYGeomFactory.pf index 2a4e74f9d6a..5f4ba1f98b8 100644 --- a/infrastructure/geom/geom/tests/Test_XYGeomFactory.pf +++ b/infrastructure/geom/geom/tests/Test_XYGeomFactory.pf @@ -5,10 +5,10 @@ module Test_XYGeomFactory use pfunit use esmf_TestMethod_mod - use mapl_XYGeomFactory - use mapl_GeomSpec - use mapl_XYTestHelper - use mapl_ErrorHandlingMod + use mapl_XYGeomFactory_mod + use mapl_GeomSpec_mod + use mapl_XYTestHelper_mod + use mapl_ErrorHandling_mod use pfio, only: FileMetadata use esmf implicit none diff --git a/infrastructure/geom/geom/tests/Test_XYGeomSpec.pf b/infrastructure/geom/geom/tests/Test_XYGeomSpec.pf index c32a11196f5..376afce168b 100644 --- a/infrastructure/geom/geom/tests/Test_XYGeomSpec.pf +++ b/infrastructure/geom/geom/tests/Test_XYGeomSpec.pf @@ -5,9 +5,9 @@ module Test_XYGeomSpec use pfunit use esmf_TestMethod_mod - use mapl_XYGeomSpec - use mapl_XYTestHelper - use mapl_ErrorHandlingMod + use mapl_XYGeomSpec_mod + use mapl_XYTestHelper_mod + use mapl_ErrorHandling_mod use pfio, only: FileMetadata, Attribute use esmf implicit none diff --git a/infrastructure/geom/geom/tests/XYTestHelper.F90 b/infrastructure/geom/geom/tests/XYTestHelper.F90 index 02ce6e7c383..9254ab15da4 100644 --- a/infrastructure/geom/geom/tests/XYTestHelper.F90 +++ b/infrastructure/geom/geom/tests/XYTestHelper.F90 @@ -1,8 +1,8 @@ #include "MAPL_ErrLog.h" -module mapl_XYTestHelper +module mapl_XYTestHelper_mod use pfio - use mapl_ErrorHandlingMod + use mapl_ErrorHandling_mod use, intrinsic :: iso_fortran_env, only: REAL64 implicit none private @@ -139,7 +139,7 @@ end subroutine create_xy_file_with_corners ! As create_xy_file but sets some lons/lats to MAPL_UNDEFINED_REAL64 ! so that add_mask is exercised. subroutine create_xy_file_with_undef(filename, im, jm, rc) - use mapl_InternalConstants, only: MAPL_UNDEFINED_REAL64 + use mapl_InternalConstants_mod, only: MAPL_UNDEFINED_REAL64 character(len=*), intent(in) :: filename integer, intent(in) :: im, jm integer, optional, intent(out) :: rc @@ -190,4 +190,4 @@ subroutine create_xy_file_with_undef(filename, im, jm, rc) _RETURN(_SUCCESS) end subroutine create_xy_file_with_undef -end module mapl_XYTestHelper +end module mapl_XYTestHelper_mod diff --git a/infrastructure/geom/regridder_mgr/API.F90 b/infrastructure/geom/regridder_mgr/API.F90 index 9d1580ab924..63b2ebb8102 100644 --- a/infrastructure/geom/regridder_mgr/API.F90 +++ b/infrastructure/geom/regridder_mgr/API.F90 @@ -1,8 +1,8 @@ -module mapl_RegridderMgr_API - use mapl_Regridder, only: Regridder - use mapl_RegridderManager, only: RegridderManager, regridder_manager, get_regridder_manager - use mapl_RegridderSpec, only: RegridderSpec - use mapl_RegridderMethods, only: & +module mapl_RegridderMgr_API_mod + use mapl_Regridder_mod, only: Regridder + use mapl_RegridderManager_mod, only: RegridderManager, regridder_manager, get_regridder_manager + use mapl_RegridderSpec_mod, only: RegridderSpec + use mapl_RegridderMethods_mod, only: & REGRID_HINT_LOCAL, & REGRID_HINT_FILE_WEIGHTS, & REGRID_HINT_COMPUTE_TRANSPOSE, & @@ -47,4 +47,4 @@ module mapl_RegridderMgr_API public :: regrid_method_int_to_string public :: generate_esmf_regrid_param -end module mapl_RegridderMgr_API +end module mapl_RegridderMgr_API_mod diff --git a/infrastructure/geom/regridder_mgr/DynamicMask.F90 b/infrastructure/geom/regridder_mgr/DynamicMask.F90 index 23f5481b995..50327eb12ca 100644 --- a/infrastructure/geom/regridder_mgr/DynamicMask.F90 +++ b/infrastructure/geom/regridder_mgr/DynamicMask.F90 @@ -3,9 +3,9 @@ ! This module provides a wrapper for ESMF_DynamicMask ! to enable equality checking between instances. -module mapl_DynamicMask +module mapl_DynamicMask_mod use esmf - use mapl_ErrorHandlingMod + use mapl_ErrorHandling_mod implicit none private @@ -640,4 +640,4 @@ logical function match_r8(missing, b) end if end function match_r8 -end module mapl_DynamicMask +end module mapl_DynamicMask_mod diff --git a/infrastructure/geom/regridder_mgr/EsmfRegridder.F90 b/infrastructure/geom/regridder_mgr/EsmfRegridder.F90 index 824a1c95248..babe91f3c45 100644 --- a/infrastructure/geom/regridder_mgr/EsmfRegridder.F90 +++ b/infrastructure/geom/regridder_mgr/EsmfRegridder.F90 @@ -1,15 +1,15 @@ #include "MAPL.h" -module mapl_EsmfRegridder - - use mapl_RegridderParam - use mapl_RegridderSpec - use mapl_Regridder - use mapl_RoutehandleParam - use mapl_RoutehandleManager - use mapl_DynamicMask - use mapl_NullRegridder - use mapl_ErrorHandlingMod +module mapl_EsmfRegridder_mod + + use mapl_RegridderParam_mod + use mapl_RegridderSpec_mod + use mapl_Regridder_mod + use mapl_RoutehandleParam_mod + use mapl_RoutehandleManager_mod + use mapl_DynamicMask_mod + use mapl_NullRegridder_mod + use mapl_ErrorHandling_mod use esmf implicit none @@ -312,4 +312,4 @@ logical function is_conservative(this) is_conservative = this%routehandle_param%is_conservative() end function is_conservative -end module mapl_EsmfRegridder +end module mapl_EsmfRegridder_mod diff --git a/infrastructure/geom/regridder_mgr/EsmfRegridderFactory.F90 b/infrastructure/geom/regridder_mgr/EsmfRegridderFactory.F90 index 70988871326..89054224d92 100644 --- a/infrastructure/geom/regridder_mgr/EsmfRegridderFactory.F90 +++ b/infrastructure/geom/regridder_mgr/EsmfRegridderFactory.F90 @@ -1,16 +1,16 @@ #include "MAPL.h" -module mapl_EsmfRegridderFactory - use mapl_RegridderFactory - use mapl_Regridder - use mapl_RoutehandleParam - use mapl_RoutehandleSpec - use mapl_RoutehandleManager - use mapl_EsmfRegridder - use mapl_RegridderParam - use mapl_RegridderSpec - use mapl_NullRegridder - use mapl_ErrorHandlingMod +module mapl_EsmfRegridderFactory_mod + use mapl_RegridderFactory_mod + use mapl_Regridder_mod + use mapl_RoutehandleParam_mod + use mapl_RoutehandleSpec_mod + use mapl_RoutehandleManager_mod + use mapl_EsmfRegridder_mod + use mapl_RegridderParam_mod + use mapl_RegridderSpec_mod + use mapl_NullRegridder_mod + use mapl_ErrorHandling_mod implicit none private @@ -81,4 +81,4 @@ function make_regridder_typesafe(this, spec, rc) result(regriddr) _RETURN(_SUCCESS) end function make_regridder_typesafe -end module mapl_EsmfRegridderFactory +end module mapl_EsmfRegridderFactory_mod diff --git a/infrastructure/geom/regridder_mgr/NullRegridder.F90 b/infrastructure/geom/regridder_mgr/NullRegridder.F90 index c11309884e8..69a09f7980a 100644 --- a/infrastructure/geom/regridder_mgr/NullRegridder.F90 +++ b/infrastructure/geom/regridder_mgr/NullRegridder.F90 @@ -1,11 +1,11 @@ #include "MAPL.h" -module mapl_NullRegridder +module mapl_NullRegridder_mod use esmf - use mapl_Regridder - use mapl_RegridderSpec - use mapl_ErrorHandlingMod + use mapl_Regridder_mod + use mapl_RegridderSpec_mod + use mapl_ErrorHandling_mod implicit none private @@ -37,5 +37,5 @@ subroutine regrid_field(this, f_in, f_out, rc) _UNUSED_DUMMY(f_out) end subroutine regrid_field -end module mapl_NullRegridder +end module mapl_NullRegridder_mod diff --git a/infrastructure/geom/regridder_mgr/Regridder.F90 b/infrastructure/geom/regridder_mgr/Regridder.F90 index 24d44b7a7cd..612622f2d77 100644 --- a/infrastructure/geom/regridder_mgr/Regridder.F90 +++ b/infrastructure/geom/regridder_mgr/Regridder.F90 @@ -1,14 +1,14 @@ #include "MAPL.h" -module mapl_Regridder +module mapl_Regridder_mod use esmf use mapl_FieldUtils - use mapl_FieldBundle_API - use mapl_VectorBasisKind - use mapl_ErrorHandlingMod - use mapl_Geom_API - use mapl_RegridderSpec - use mapl_VectorBasis + use mapl_FieldBundle_API_mod + use mapl_VectorBasisKind_mod + use mapl_ErrorHandling_mod + use mapl_Geom_API_mod + use mapl_RegridderSpec_mod + use mapl_VectorBasis_mod use iso_fortran_env, only: REAL32, REAL64 implicit none(type,external) private @@ -617,5 +617,5 @@ subroutine regrid_array_4d_r8(this, q_in, q_out, rc) _RETURN(_SUCCESS) end subroutine regrid_array_4d_r8 -end module mapl_Regridder +end module mapl_Regridder_mod diff --git a/infrastructure/geom/regridder_mgr/RegridderFactory.F90 b/infrastructure/geom/regridder_mgr/RegridderFactory.F90 index 4a5c1dcdcf0..211421553a8 100644 --- a/infrastructure/geom/regridder_mgr/RegridderFactory.F90 +++ b/infrastructure/geom/regridder_mgr/RegridderFactory.F90 @@ -1,6 +1,6 @@ #include "MAPL.h" -module mapl_RegridderFactory +module mapl_RegridderFactory_mod implicit none private @@ -16,15 +16,15 @@ module mapl_RegridderFactory abstract interface logical function I_supports(this, param) - use mapl_RegridderParam + use mapl_RegridderParam_mod import :: RegridderFactory class(RegridderFactory), intent(in) :: this class(RegridderParam), intent(in) :: param end function I_supports function I_make_regridder_typesafe(this, spec, rc) result(regriddr) - use mapl_RegridderSpec - use mapl_Regridder + use mapl_RegridderSpec_mod + use mapl_Regridder_mod import :: RegridderFactory class(Regridder), allocatable :: regriddr class(RegridderFactory), intent(inout) :: this @@ -34,5 +34,5 @@ end function I_make_regridder_typesafe end interface -end module mapl_RegridderFactory +end module mapl_RegridderFactory_mod diff --git a/infrastructure/geom/regridder_mgr/RegridderFactoryVector.F90 b/infrastructure/geom/regridder_mgr/RegridderFactoryVector.F90 index 4d493b85ae2..a39ed52413f 100644 --- a/infrastructure/geom/regridder_mgr/RegridderFactoryVector.F90 +++ b/infrastructure/geom/regridder_mgr/RegridderFactoryVector.F90 @@ -1,5 +1,5 @@ -module mapl_RegridderFactoryVector - use mapl_RegridderFactory +module mapl_RegridderFactoryVector_mod + use mapl_RegridderFactory_mod #define T RegridderFactory #define T_polymorphic @@ -15,4 +15,4 @@ module mapl_RegridderFactoryVector #undef VectorIterator #undef VectorRIterator -end module mapl_RegridderFactoryVector +end module mapl_RegridderFactoryVector_mod diff --git a/infrastructure/geom/regridder_mgr/RegridderManager.F90 b/infrastructure/geom/regridder_mgr/RegridderManager.F90 index 2379229b626..221742c76f7 100644 --- a/infrastructure/geom/regridder_mgr/RegridderManager.F90 +++ b/infrastructure/geom/regridder_mgr/RegridderManager.F90 @@ -1,18 +1,18 @@ #include "MAPL.h" -module mapl_RegridderManager - - use mapl_Geom_API, only: GeomManager, get_geom_manager - use mapl_RegridderSpec - use mapl_Regridder - use mapl_NullRegridder - use mapl_RegridderFactory - use mapl_RegridderFactoryVector - use mapl_RegridderSpecVector - use mapl_RegridderVector - use mapl_EsmfRegridderFactory +module mapl_RegridderManager_mod + + use mapl_Geom_API_mod, only: GeomManager, get_geom_manager + use mapl_RegridderSpec_mod + use mapl_Regridder_mod + use mapl_NullRegridder_mod + use mapl_RegridderFactory_mod + use mapl_RegridderFactoryVector_mod + use mapl_RegridderSpecVector_mod + use mapl_RegridderVector_mod + use mapl_EsmfRegridderFactory_mod use ESMF, only: ESMF_GeomGet, ESMF_GeomType_Flag, ESMF_GEOMTYPE_LOCSTREAM - use mapl_ErrorHandlingMod + use mapl_ErrorHandling_mod implicit none private @@ -172,4 +172,4 @@ function get_regridder_manager() result(regridder_mgr) regridder_mgr => regridder_manager end function get_regridder_manager -end module mapl_RegridderManager +end module mapl_RegridderManager_mod diff --git a/infrastructure/geom/regridder_mgr/RegridderMethods.F90 b/infrastructure/geom/regridder_mgr/RegridderMethods.F90 index edd07bf21ab..5e06a516e34 100644 --- a/infrastructure/geom/regridder_mgr/RegridderMethods.F90 +++ b/infrastructure/geom/regridder_mgr/RegridderMethods.F90 @@ -1,10 +1,10 @@ #include "MAPL.h" -module mapl_RegridderMethods +module mapl_RegridderMethods_mod use ESMF - use mapl_DynamicMask - use mapl_ErrorHandlingMod + use mapl_DynamicMask_mod + use mapl_ErrorHandling_mod use MAPL_Constants, only: MAPL_UNDEFINED_REAL, MAPL_UNDEFINED_REAL64 - use mapl_EsmfRegridder, only: EsmfRegridderParam + use mapl_EsmfRegridder_mod, only: EsmfRegridderParam implicit none private @@ -211,4 +211,4 @@ function generate_esmf_regrid_param(regrid_method, typekind, rc) result(regrid_p end function -end module mapl_RegridderMethods +end module mapl_RegridderMethods_mod diff --git a/infrastructure/geom/regridder_mgr/RegridderParam.F90 b/infrastructure/geom/regridder_mgr/RegridderParam.F90 index f2a91f92ed4..2302ec69251 100644 --- a/infrastructure/geom/regridder_mgr/RegridderParam.F90 +++ b/infrastructure/geom/regridder_mgr/RegridderParam.F90 @@ -1,4 +1,4 @@ -module mapl_RegridderParam +module mapl_RegridderParam_mod implicit none private @@ -18,4 +18,4 @@ logical function I_equal_to(this, other) end function I_equal_to end interface -end module mapl_RegridderParam +end module mapl_RegridderParam_mod diff --git a/infrastructure/geom/regridder_mgr/RegridderSpec.F90 b/infrastructure/geom/regridder_mgr/RegridderSpec.F90 index b6f5f17c592..fe6d2383d13 100644 --- a/infrastructure/geom/regridder_mgr/RegridderSpec.F90 +++ b/infrastructure/geom/regridder_mgr/RegridderSpec.F90 @@ -1,9 +1,9 @@ #include "MAPL.h" -module mapl_RegridderSpec +module mapl_RegridderSpec_mod use esmf - use mapl_RegridderParam - use mapl_Geom_API, only: MAPL_SameGeom + use mapl_RegridderParam_mod + use mapl_Geom_API_mod, only: MAPL_SameGeom implicit none private @@ -104,4 +104,4 @@ logical function equal_to(this, other) result(eq) end function equal_to -end module mapl_RegridderSpec +end module mapl_RegridderSpec_mod diff --git a/infrastructure/geom/regridder_mgr/RegridderSpecVector.F90 b/infrastructure/geom/regridder_mgr/RegridderSpecVector.F90 index f5d457218e2..a277018c840 100644 --- a/infrastructure/geom/regridder_mgr/RegridderSpecVector.F90 +++ b/infrastructure/geom/regridder_mgr/RegridderSpecVector.F90 @@ -1,5 +1,5 @@ -module mapl_RegridderSpecVector - use mapl_RegridderSpec +module mapl_RegridderSpecVector_mod + use mapl_RegridderSpec_mod #define T RegridderSpec #define T_EQ(a,b) a==b @@ -15,4 +15,4 @@ module mapl_RegridderSpecVector #undef VectorIterator #undef VectorRIterator -end module mapl_RegridderSpecVector +end module mapl_RegridderSpecVector_mod diff --git a/infrastructure/geom/regridder_mgr/RegridderVector.F90 b/infrastructure/geom/regridder_mgr/RegridderVector.F90 index 0b04ce09e48..4f88447b16f 100644 --- a/infrastructure/geom/regridder_mgr/RegridderVector.F90 +++ b/infrastructure/geom/regridder_mgr/RegridderVector.F90 @@ -1,5 +1,5 @@ -module mapl_RegridderVector - use mapl_Regridder +module mapl_RegridderVector_mod + use mapl_Regridder_mod #define T Regridder #define T_polymorphic @@ -15,4 +15,4 @@ module mapl_RegridderVector #undef VectorIterator #undef VectorRIterator -end module mapl_RegridderVector +end module mapl_RegridderVector_mod diff --git a/infrastructure/geom/regridder_mgr/RoutehandleManager.F90 b/infrastructure/geom/regridder_mgr/RoutehandleManager.F90 index 2a457c14cf0..f81be40e50b 100644 --- a/infrastructure/geom/regridder_mgr/RoutehandleManager.F90 +++ b/infrastructure/geom/regridder_mgr/RoutehandleManager.F90 @@ -17,12 +17,12 @@ ! object in that derived type rather than use a global object. -module mapl_RoutehandleManager +module mapl_RoutehandleManager_mod use esmf - use mapl_RoutehandleSpec - use mapl_RoutehandleSpecVector - use mapl_RoutehandleVector - use mapl_ErrorHandlingMod + use mapl_RoutehandleSpec_mod + use mapl_RoutehandleSpecVector_mod + use mapl_RoutehandleVector_mod + use mapl_ErrorHandling_mod implicit none public :: RoutehandleManager @@ -116,4 +116,4 @@ subroutine delete_routehandle(this, spec, rc) _RETURN(_SUCCESS) end subroutine delete_routehandle -end module mapl_RoutehandleManager +end module mapl_RoutehandleManager_mod diff --git a/infrastructure/geom/regridder_mgr/RoutehandleParam.F90 b/infrastructure/geom/regridder_mgr/RoutehandleParam.F90 index 7b0c3c69aec..c231f076237 100644 --- a/infrastructure/geom/regridder_mgr/RoutehandleParam.F90 +++ b/infrastructure/geom/regridder_mgr/RoutehandleParam.F90 @@ -1,10 +1,10 @@ #include "MAPL.h" -module mapl_RoutehandleParam +module mapl_RoutehandleParam_mod use esmf - use mapl_Geom_API, only: MaplGeom, geom_manager, MAPL_SameGeom - use mapl_ErrorHandlingMod + use mapl_Geom_API_mod, only: MaplGeom, geom_manager, MAPL_SameGeom + use mapl_ErrorHandling_mod implicit none private @@ -345,4 +345,4 @@ logical function is_conservative(this) end do end function is_conservative -end module mapl_RoutehandleParam +end module mapl_RoutehandleParam_mod diff --git a/infrastructure/geom/regridder_mgr/RoutehandleSpec.F90 b/infrastructure/geom/regridder_mgr/RoutehandleSpec.F90 index ee02fedb2ae..eafea6d7f85 100644 --- a/infrastructure/geom/regridder_mgr/RoutehandleSpec.F90 +++ b/infrastructure/geom/regridder_mgr/RoutehandleSpec.F90 @@ -1,10 +1,10 @@ #include "MAPL.h" -module mapl_RoutehandleSpec +module mapl_RoutehandleSpec_mod use esmf - use mapl_RoutehandleParam - use mapl_ErrorHandlingMod - use mapl_Geom_API, only: MAPL_SameGeom + use mapl_RoutehandleParam_mod + use mapl_ErrorHandling_mod + use mapl_Geom_API_mod, only: MAPL_SameGeom implicit none private @@ -92,4 +92,4 @@ logical function equal_to(a, b) result(eq) end function equal_to -end module mapl_RoutehandleSpec +end module mapl_RoutehandleSpec_mod diff --git a/infrastructure/geom/regridder_mgr/RoutehandleSpecVector.F90 b/infrastructure/geom/regridder_mgr/RoutehandleSpecVector.F90 index 3cbea30bb89..09556aa25cf 100644 --- a/infrastructure/geom/regridder_mgr/RoutehandleSpecVector.F90 +++ b/infrastructure/geom/regridder_mgr/RoutehandleSpecVector.F90 @@ -1,5 +1,5 @@ -module mapl_RoutehandleSpecVector - use mapl_RoutehandleSpec +module mapl_RoutehandleSpecVector_mod + use mapl_RoutehandleSpec_mod #define T RoutehandleSpec #define T_EQ(a,b) a==b @@ -15,4 +15,4 @@ module mapl_RoutehandleSpecVector #undef VectorIterator #undef VectorRIterator -end module mapl_RoutehandleSpecVector +end module mapl_RoutehandleSpecVector_mod diff --git a/infrastructure/geom/regridder_mgr/RoutehandleVector.F90 b/infrastructure/geom/regridder_mgr/RoutehandleVector.F90 index 49af88e50ca..f30e813c722 100644 --- a/infrastructure/geom/regridder_mgr/RoutehandleVector.F90 +++ b/infrastructure/geom/regridder_mgr/RoutehandleVector.F90 @@ -1,4 +1,4 @@ -module mapl_RoutehandleVector +module mapl_RoutehandleVector_mod use esmf, only: ESMF_Routehandle #define T ESMF_Routehandle @@ -13,4 +13,4 @@ module mapl_RoutehandleVector #undef VectorIterator #undef VectorRIterator -end module mapl_RoutehandleVector +end module mapl_RoutehandleVector_mod diff --git a/infrastructure/geom/regridder_mgr/regridder_mgr.F90 b/infrastructure/geom/regridder_mgr/regridder_mgr.F90 index a85ef225742..0a42d7cebdd 100644 --- a/infrastructure/geom/regridder_mgr/regridder_mgr.F90 +++ b/infrastructure/geom/regridder_mgr/regridder_mgr.F90 @@ -1,7 +1,7 @@ module mapl_regridder_mgr - use mapl_RegridderManager - use mapl_RegridderSpec - use mapl_Regridder - use mapl_EsmfRegridder - use mapl_DynamicMask + use mapl_RegridderManager_mod + use mapl_RegridderSpec_mod + use mapl_Regridder_mod + use mapl_EsmfRegridder_mod + use mapl_DynamicMask_mod end module mapl_regridder_mgr diff --git a/infrastructure/geom/regridder_mgr/tests/CMakeLists.txt b/infrastructure/geom/regridder_mgr/tests/CMakeLists.txt index e7eab4c6565..e2adc12eae3 100644 --- a/infrastructure/geom/regridder_mgr/tests/CMakeLists.txt +++ b/infrastructure/geom/regridder_mgr/tests/CMakeLists.txt @@ -12,7 +12,7 @@ add_pfunit_ctest(${this} # OTHER_SOURCES ${SRCS} LINK_LIBRARIES MAPL.regridder_mgr MAPL.geom MAPL.shared MAPL.pfunit EXTRA_INITIALIZE Initialize - EXTRA_USE MAPL_pFUnit_Initialize + EXTRA_USE mapl_pFUnit_Initialize_mod MAX_PES 8 ) set_target_properties(${this} PROPERTIES Fortran_MODULE_DIRECTORY ${MODULE_DIRECTORY}) diff --git a/infrastructure/geom/regridder_mgr/tests/Test_RegridderArrayOverloads.pf b/infrastructure/geom/regridder_mgr/tests/Test_RegridderArrayOverloads.pf index c0744095614..2b8515fac66 100644 --- a/infrastructure/geom/regridder_mgr/tests/Test_RegridderArrayOverloads.pf +++ b/infrastructure/geom/regridder_mgr/tests/Test_RegridderArrayOverloads.pf @@ -3,7 +3,7 @@ module Test_RegridderArrayOverloads use pfunit use mapl_regridder_mgr - use mapl_Geom_API + use mapl_Geom_API_mod use esmf_TestMethod_mod ! mapl use esmf use, intrinsic :: iso_fortran_env, only: REAL32, REAL64 diff --git a/infrastructure/geom/regridder_mgr/tests/Test_RegridderManager.pf b/infrastructure/geom/regridder_mgr/tests/Test_RegridderManager.pf index f507d26956b..ecc68a9f81f 100644 --- a/infrastructure/geom/regridder_mgr/tests/Test_RegridderManager.pf +++ b/infrastructure/geom/regridder_mgr/tests/Test_RegridderManager.pf @@ -2,13 +2,13 @@ module Test_RegridderManager use pfunit - use mapl_FieldCreateImpl - use mapl_VerticalStaggerLoc - use mapl_VerticalGrid_API + use mapl_FieldCreateImpl_mod + use mapl_VerticalStaggerLoc_mod + use mapl_VerticalGrid_API_mod use mapl_regridder_mgr - use mapl_Geom_API - use mapl_FieldBundle_API - use mapl_Constants, only: MAPL_UNDEF, MAPL_UNDEFINED_REAL64 + use mapl_Geom_API_mod + use mapl_FieldBundle_API_mod + 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/geom/regridder_mgr/tests/Test_RouteHandleManager.pf b/infrastructure/geom/regridder_mgr/tests/Test_RouteHandleManager.pf index f9a4b96d9b1..972de9a8c38 100644 --- a/infrastructure/geom/regridder_mgr/tests/Test_RouteHandleManager.pf +++ b/infrastructure/geom/regridder_mgr/tests/Test_RouteHandleManager.pf @@ -6,7 +6,7 @@ module Test_RouteHandleManager use pfunit use mapl_regridder_mgr - use mapl_Geom_API + use mapl_Geom_API_mod use esmf_TestMethod_mod ! mapl use esmf implicit none diff --git a/infrastructure/vertical/vertical/CSR_SparseMatrix.F90 b/infrastructure/vertical/vertical/CSR_SparseMatrix.F90 index 248fd6b6824..61376d720ec 100644 --- a/infrastructure/vertical/vertical/CSR_SparseMatrix.F90 +++ b/infrastructure/vertical/vertical/CSR_SparseMatrix.F90 @@ -2,8 +2,8 @@ ! When generic procedures are available, this package should be ! redesigned. -module mapl_CSR_SparseMatrix - use mapl_KeywordEnforcer +module mapl_CSR_SparseMatrix_mod + use mapl_KeywordEnforcer_mod use, intrinsic :: iso_fortran_env, only: REAL32, REAL64 implicit none(type,external) private @@ -159,4 +159,4 @@ pure function CONCAT3(matmul_multi_vec_,kz,kx)(A, x) result(b) ;\ MATMUL_MULTI_VEC(dp,dp) -end module mapl_CSR_SparseMatrix +end module mapl_CSR_SparseMatrix_mod diff --git a/infrastructure/vertical/vertical/Eta2Eta.F90 b/infrastructure/vertical/vertical/Eta2Eta.F90 index 910294cc4bd..76dd3c2fe73 100644 --- a/infrastructure/vertical/vertical/Eta2Eta.F90 +++ b/infrastructure/vertical/vertical/Eta2Eta.F90 @@ -2,7 +2,7 @@ #define _UNUSED_DUMMY(x) if (.false.) then; associate (q____ => x); end associate; endif -module MAPL_Eta2EtaMod +module mapl_Eta2Eta_mod !implicit none private public gmap @@ -1937,4 +1937,4 @@ subroutine steepz(i1, i2, km, a4, df2, dm, dq, dp, d4) enddo end subroutine steepz -end module MAPL_Eta2EtaMod +end module mapl_Eta2Eta_mod diff --git a/infrastructure/vertical/vertical/VerticalConservativeMap.F90 b/infrastructure/vertical/vertical/VerticalConservativeMap.F90 index 6f8e8999da6..170390b451c 100644 --- a/infrastructure/vertical/vertical/VerticalConservativeMap.F90 +++ b/infrastructure/vertical/vertical/VerticalConservativeMap.F90 @@ -1,10 +1,10 @@ #include "MAPL.h" -module mapl_VerticalConservativeMap +module mapl_VerticalConservativeMap_mod - use mapl_ErrorHandling - use mapl_CSR_SparseMatrix, only: SparseMatrix_sp => CSR_SparseMatrix_sp - use mapl_CSR_SparseMatrix, only: add_row + use mapl_ErrorHandling_mod + use mapl_CSR_SparseMatrix_mod, only: SparseMatrix_sp => CSR_SparseMatrix_sp + use mapl_CSR_SparseMatrix_mod, only: add_row use, intrinsic :: iso_fortran_env, only: REAL32 implicit none(type,external) @@ -89,4 +89,4 @@ subroutine compute_conservative_map(src_interfaces, dst_interfaces, matrix, rc) _RETURN(_SUCCESS) end subroutine compute_conservative_map -end module mapl_VerticalConservativeMap +end module mapl_VerticalConservativeMap_mod diff --git a/infrastructure/vertical/vertical/VerticalCoordinate.F90 b/infrastructure/vertical/vertical/VerticalCoordinate.F90 index 1c7b1a0fed4..8cf7263235a 100644 --- a/infrastructure/vertical/vertical/VerticalCoordinate.F90 +++ b/infrastructure/vertical/vertical/VerticalCoordinate.F90 @@ -3,8 +3,8 @@ module VerticalCoordinateMod use PFIO - use MAPL_ExceptionHandling - use MAPL_FileMetadataUtilsMod + use mapl_ExceptionHandling_mod + use mapl_FileMetadataUtils_mod use MAPL_CommsMod use gFTL2_StringVector use udunits2f, UDUNITS_are_convertible => are_convertible, & diff --git a/infrastructure/vertical/vertical/VerticalLinearMap.F90 b/infrastructure/vertical/vertical/VerticalLinearMap.F90 index 63382ca6cb4..8957af2c698 100644 --- a/infrastructure/vertical/vertical/VerticalLinearMap.F90 +++ b/infrastructure/vertical/vertical/VerticalLinearMap.F90 @@ -1,10 +1,10 @@ #include "MAPL.h" -module mapl_VerticalLinearMap +module mapl_VerticalLinearMap_mod - use mapl_ErrorHandling - use mapl_CSR_SparseMatrix, only: SparseMatrix_sp => CSR_SparseMatrix_sp - use mapl_CSR_SparseMatrix, only: add_row + use mapl_ErrorHandling_mod + use mapl_CSR_SparseMatrix_mod, only: SparseMatrix_sp => CSR_SparseMatrix_sp + use mapl_CSR_SparseMatrix_mod, only: add_row use, intrinsic :: iso_fortran_env, only: REAL32 implicit none(type,external) @@ -139,4 +139,4 @@ logical function is_decreasing(array) end do end function is_decreasing -end module mapl_VerticalLinearMap +end module mapl_VerticalLinearMap_mod diff --git a/infrastructure/vertical/vertical/VerticalRegridConserveInterface.F90 b/infrastructure/vertical/vertical/VerticalRegridConserveInterface.F90 index 8b54d8fc9cf..a52d440ffbd 100644 --- a/infrastructure/vertical/vertical/VerticalRegridConserveInterface.F90 +++ b/infrastructure/vertical/vertical/VerticalRegridConserveInterface.F90 @@ -3,9 +3,9 @@ module VerticalRegridConserveInterfaceMod use PFIO - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod use MAPL_CommsMod - use MAPL_Eta2EtaMod + use mapl_Eta2Eta_mod 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/VerticalRegridMethod.F90 b/infrastructure/vertical/vertical/VerticalRegridMethod.F90 index d696e342930..48d50e996e4 100644 --- a/infrastructure/vertical/vertical/VerticalRegridMethod.F90 +++ b/infrastructure/vertical/vertical/VerticalRegridMethod.F90 @@ -1,6 +1,6 @@ #include "MAPL.h" -module mapl_VerticalRegridMethod +module mapl_VerticalRegridMethod_mod use esmf, only: ESMF_MAXSTR @@ -74,4 +74,4 @@ elemental logical function not_equal_to(a, b) not_equal_to = .not. (a==b) end function not_equal_to -end module mapl_VerticalRegridMethod +end module mapl_VerticalRegridMethod_mod diff --git a/infrastructure/vertical/vertical/VerticalRegridUtilities.F90 b/infrastructure/vertical/vertical/VerticalRegridUtilities.F90 index dfdc56b4c73..45174b41bc7 100644 --- a/infrastructure/vertical/vertical/VerticalRegridUtilities.F90 +++ b/infrastructure/vertical/vertical/VerticalRegridUtilities.F90 @@ -3,7 +3,7 @@ module VerticalRegridUtilitiesMod use PFIO - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod use MAPL_CommsMod use MAPL_Constants, only: MAPL_GRAV diff --git a/infrastructure/vertical/vertical_grid/API.F90 b/infrastructure/vertical/vertical_grid/API.F90 index c0ffe030e2d..7f71231b93f 100644 --- a/infrastructure/vertical/vertical_grid/API.F90 +++ b/infrastructure/vertical/vertical_grid/API.F90 @@ -1,16 +1,16 @@ -module mapl_VerticalGrid_API - use mapl_VerticalGrid, only: VerticalGrid - use mapl_VerticalGrid, only: VERTICAL_GRID_NOT_FOUND - use mapl_VerticalGridSpec, only: VerticalGridSpec - use mapl_VerticalGridFactory, only: VerticalGridFactory - use mapl_VerticalGridManager, only: VerticalGridManager - use mapl_VerticalGridManager, only: get_vertical_grid_manager - use mapl_IntegerPair, only: IntegerPair - use mapl_VerticalStaggerLoc - use mapl_VerticalAlignment - use mapl_BasicVerticalGrid, only: BasicVerticalGrid - use mapl_BasicVerticalGrid, only: BasicVerticalGridSpec - use mapl_BasicVerticalGrid, only: BasicVerticalGridFactory +module mapl_VerticalGrid_API_mod + use mapl_VerticalGrid_mod, only: VerticalGrid + use mapl_VerticalGrid_mod, only: VERTICAL_GRID_NOT_FOUND + use mapl_VerticalGridSpec_mod, only: VerticalGridSpec + use mapl_VerticalGridFactory_mod, only: VerticalGridFactory + use mapl_VerticalGridManager_mod, only: VerticalGridManager + use mapl_VerticalGridManager_mod, only: get_vertical_grid_manager + use mapl_IntegerPair_mod, only: IntegerPair + use mapl_VerticalStaggerLoc_mod + use mapl_VerticalAlignment_mod + use mapl_BasicVerticalGrid_mod, only: BasicVerticalGrid + use mapl_BasicVerticalGrid_mod, only: BasicVerticalGridSpec + use mapl_BasicVerticalGrid_mod, only: BasicVerticalGridFactory implicit none(type,external) private @@ -51,4 +51,4 @@ module mapl_VerticalGrid_API public :: VERTICAL_GRID_NOT_FOUND -end module mapl_VerticalGrid_API +end module mapl_VerticalGrid_API_mod diff --git a/infrastructure/vertical/vertical_grid/BasicVerticalGrid.F90 b/infrastructure/vertical/vertical_grid/BasicVerticalGrid.F90 index 141af21f1d5..ce07a99aa40 100644 --- a/infrastructure/vertical/vertical_grid/BasicVerticalGrid.F90 +++ b/infrastructure/vertical/vertical_grid/BasicVerticalGrid.F90 @@ -1,17 +1,17 @@ #include "MAPL.h" -module mapl_BasicVerticalGrid +module mapl_BasicVerticalGrid_mod - use mapl_VerticalGrid, only: VerticalGrid - use mapl_VerticalGridSpec, only: VerticalGridSpec - use mapl_VerticalGridFactory, only: VerticalGridFactory - use mapl_ComponentDriver, only: ComponentDriver + use mapl_VerticalGrid_mod, only: VerticalGrid + use mapl_VerticalGridSpec_mod, only: VerticalGridSpec + use mapl_VerticalGridFactory_mod, only: VerticalGridFactory + use mapl_ComponentDriver_mod, only: ComponentDriver !use pfio, only: FileMetadata use pfio use esmf - use mapl_VerticalStaggerLoc, only: VerticalStaggerLoc + use mapl_VerticalStaggerLoc_mod, only: VerticalStaggerLoc use gftl2_StringVector, only: StringVector - use mapl_ErrorHandling + use mapl_ErrorHandling_mod implicit none(type,external) private @@ -269,5 +269,5 @@ function create_grid_from_spec(this, spec, rc) result(grid) _UNUSED_DUMMY(this) end function create_grid_from_spec -end module mapl_BasicVerticalGrid +end module mapl_BasicVerticalGrid_mod diff --git a/infrastructure/vertical/vertical_grid/IntegerPair.F90 b/infrastructure/vertical/vertical_grid/IntegerPair.F90 index a14356a9902..ef348c36f2d 100644 --- a/infrastructure/vertical/vertical_grid/IntegerPair.F90 +++ b/infrastructure/vertical/vertical_grid/IntegerPair.F90 @@ -1,4 +1,4 @@ -module mapl_IntegerPair +module mapl_IntegerPair_mod implicit none(type,external) private @@ -32,4 +32,4 @@ pure function integer_pair_less_than(lhs, rhs) result(is_less) end if end function integer_pair_less_than -end module mapl_IntegerPair +end module mapl_IntegerPair_mod diff --git a/infrastructure/vertical/vertical_grid/IntegerVerticalGridMap.F90 b/infrastructure/vertical/vertical_grid/IntegerVerticalGridMap.F90 index 14d604cd275..40b4cb0eebf 100644 --- a/infrastructure/vertical/vertical_grid/IntegerVerticalGridMap.F90 +++ b/infrastructure/vertical/vertical_grid/IntegerVerticalGridMap.F90 @@ -1,5 +1,5 @@ -module mapl_IntegerVerticalGridMap - use mapl_VerticalGrid +module mapl_IntegerVerticalGridMap_mod + use mapl_VerticalGrid_mod #define Key __INTEGER #define T VerticalGrid @@ -15,4 +15,4 @@ module mapl_IntegerVerticalGridMap #undef T_polymorphic #undef T -end module mapl_IntegerVerticalGridMap +end module mapl_IntegerVerticalGridMap_mod diff --git a/infrastructure/vertical/vertical_grid/MirrorVerticalGrid.F90 b/infrastructure/vertical/vertical_grid/MirrorVerticalGrid.F90 index 7fa38635ab2..2d1f720ee9e 100644 --- a/infrastructure/vertical/vertical_grid/MirrorVerticalGrid.F90 +++ b/infrastructure/vertical/vertical_grid/MirrorVerticalGrid.F90 @@ -5,13 +5,13 @@ ! it should only be used with import stateIntent, and will be replaced ! by whatever source grid is connected to it. -module mapl_MirrorVerticalGrid +module mapl_MirrorVerticalGrid_mod - use mapl_ErrorHandling - use mapl_VerticalGrid - use mapl_ComponentDriver - use mapl_VerticalStaggerLoc - use mapl_ErrorHandling + use mapl_ErrorHandling_mod + use mapl_VerticalGrid_mod + use mapl_ComponentDriver_mod + use mapl_VerticalStaggerLoc_mod + use mapl_ErrorHandling_mod use gftl2_StringVector, only: StringVector use esmf, only: ESMF_TypeKind_Flag use esmf, only: ESMF_Field @@ -100,4 +100,4 @@ function matches(this, other) _UNUSED_DUMMY(other) end function matches -end module mapl_MirrorVerticalGrid +end module mapl_MirrorVerticalGrid_mod diff --git a/infrastructure/vertical/vertical_grid/VerticalAlignment.F90 b/infrastructure/vertical/vertical_grid/VerticalAlignment.F90 index 211ea5ade00..a8164111c4a 100644 --- a/infrastructure/vertical/vertical_grid/VerticalAlignment.F90 +++ b/infrastructure/vertical/vertical_grid/VerticalAlignment.F90 @@ -1,6 +1,6 @@ #include "MAPL.h" -module mapl_VerticalAlignment - use mapl_VerticalCoordinateDirection +module mapl_VerticalAlignment_mod + use mapl_VerticalCoordinateDirection_mod implicit none private @@ -134,4 +134,4 @@ elemental logical function are_not_equal(this, that) are_not_equal = .not. (this == that) end function are_not_equal -end module mapl_VerticalAlignment +end module mapl_VerticalAlignment_mod diff --git a/infrastructure/vertical/vertical_grid/VerticalCoordinateDirection.F90 b/infrastructure/vertical/vertical_grid/VerticalCoordinateDirection.F90 index 850db89eeff..99583d96ed5 100644 --- a/infrastructure/vertical/vertical_grid/VerticalCoordinateDirection.F90 +++ b/infrastructure/vertical/vertical_grid/VerticalCoordinateDirection.F90 @@ -1,5 +1,5 @@ #include "MAPL.h" -module mapl_VerticalCoordinateDirection +module mapl_VerticalCoordinateDirection_mod implicit none private @@ -106,4 +106,4 @@ elemental logical function are_not_equal(this, that) are_not_equal = .not. (this == that) end function are_not_equal -end module mapl_VerticalCoordinateDirection +end module mapl_VerticalCoordinateDirection_mod diff --git a/infrastructure/vertical/vertical_grid/VerticalGrid.F90 b/infrastructure/vertical/vertical_grid/VerticalGrid.F90 index 02f8c152736..b05a5a995f4 100644 --- a/infrastructure/vertical/vertical_grid/VerticalGrid.F90 +++ b/infrastructure/vertical/vertical_grid/VerticalGrid.F90 @@ -1,10 +1,10 @@ #include "MAPL.h" -module mapl_VerticalGrid +module mapl_VerticalGrid_mod use esmf, only: esmf_Field, esmf_Geom, esmf_TypeKind_Flag, ESMF_TYPEKIND_R4 - use mapl_VerticalStaggerLoc, only: VerticalStaggerLoc - use mapl_VerticalCoordinateDirection + use mapl_VerticalStaggerLoc_mod, only: VerticalStaggerLoc + use mapl_VerticalCoordinateDirection_mod use gftl2_StringVector, only: StringVector - use mapl_ErrorHandling + use mapl_ErrorHandling_mod implicit none(type,external) private @@ -34,7 +34,7 @@ module mapl_VerticalGrid ! Updated interface - accepts aspects as unlimited polymorphic to avoid circular dependencies ! Implementations should expect this to be type(AspectMap) from mapl_StateItemAspect function I_get_coordinate_field(this, physical_dimension, aspects, coupler, rc) result(field) - use mapl_ComponentDriver, only: ComponentDriver + use mapl_ComponentDriver_mod, only: ComponentDriver use esmf, only: esmf_Field import VerticalGrid implicit none @@ -138,5 +138,5 @@ subroutine set_primary_coordinate(this, primary_coordinate) this%primary_coordinate = primary_coordinate end subroutine set_primary_coordinate -end module mapl_VerticalGrid +end module mapl_VerticalGrid_mod diff --git a/infrastructure/vertical/vertical_grid/VerticalGridFactory.F90 b/infrastructure/vertical/vertical_grid/VerticalGridFactory.F90 index a2a5d552f73..ca5e4e11421 100644 --- a/infrastructure/vertical/vertical_grid/VerticalGridFactory.F90 +++ b/infrastructure/vertical/vertical_grid/VerticalGridFactory.F90 @@ -1,10 +1,10 @@ #include "MAPL.h" -module mapl_VerticalGridFactory +module mapl_VerticalGridFactory_mod use pfio, only: FileMetadata use esmf, only: esmf_HConfig - use mapl_VerticalGrid, only: VerticalGrid - use mapl_VerticalGridSpec, only: VerticalGridSpec - use mapl_ErrorHandling + use mapl_VerticalGrid_mod, only: VerticalGrid + use mapl_VerticalGridSpec_mod, only: VerticalGridSpec + use mapl_ErrorHandling_mod implicit none(type,external) private @@ -69,7 +69,7 @@ end function I_get_name function I_create_spec_from_config(this, config, rc) result(spec) use esmf, only: esmf_HConfig - use mapl_VerticalGridSpec, only: VerticalGridSpec + use mapl_VerticalGridSpec_mod, only: VerticalGridSpec import VerticalGridFactory implicit none class(VerticalGridSpec), allocatable :: spec @@ -80,7 +80,7 @@ end function I_create_spec_from_config function I_create_spec_from_file_metadata(this, file_metadata, rc) result(spec) use pfio, only: FileMetadata - use mapl_VerticalGridSpec, only: VerticalGridSpec + use mapl_VerticalGridSpec_mod, only: VerticalGridSpec import VerticalGridFactory implicit none class(VerticalGridSpec), allocatable :: spec @@ -90,8 +90,8 @@ function I_create_spec_from_file_metadata(this, file_metadata, rc) result(spec) end function I_create_spec_from_file_metadata function I_create_grid_from_spec(this, spec, rc) result(grid) - use mapl_VerticalGrid, only: VerticalGrid - use mapl_VerticalGridSpec, only: VerticalGridSpec + use mapl_VerticalGrid_mod, only: VerticalGrid + use mapl_VerticalGridSpec_mod, only: VerticalGridSpec import VerticalGridFactory implicit none class(VerticalGrid), allocatable :: grid @@ -138,4 +138,4 @@ function create_grid_from_file_metadata(this, file_metadata, rc) result(grid) _RETURN(_SUCCESS) end function create_grid_from_file_metadata -end module mapl_VerticalGridFactory +end module mapl_VerticalGridFactory_mod diff --git a/infrastructure/vertical/vertical_grid/VerticalGridFactoryMap.F90 b/infrastructure/vertical/vertical_grid/VerticalGridFactoryMap.F90 index 736ee8652cb..69f8b8a6702 100644 --- a/infrastructure/vertical/vertical_grid/VerticalGridFactoryMap.F90 +++ b/infrastructure/vertical/vertical_grid/VerticalGridFactoryMap.F90 @@ -1,5 +1,5 @@ -module mapl_VerticalGridFactoryMap - use mapl_VerticalGridFactory +module mapl_VerticalGridFactoryMap_mod + use mapl_VerticalGridFactory_mod #define Key __CHARACTER_DEFERRED #define T VerticalGridFactory @@ -15,4 +15,4 @@ module mapl_VerticalGridFactoryMap #undef T_polymorphic #undef T -end module mapl_VerticalGridFactoryMap +end module mapl_VerticalGridFactoryMap_mod diff --git a/infrastructure/vertical/vertical_grid/VerticalGridManager.F90 b/infrastructure/vertical/vertical_grid/VerticalGridManager.F90 index efcc62c862f..909f3231a4e 100644 --- a/infrastructure/vertical/vertical_grid/VerticalGridManager.F90 +++ b/infrastructure/vertical/vertical_grid/VerticalGridManager.F90 @@ -1,14 +1,14 @@ #include "MAPL.h" -module mapl_VerticalGridManager +module mapl_VerticalGridManager_mod - use mapl_IntegerVerticalGridMap - use mapl_VerticalGrid, only: VerticalGrid - use mapl_VerticalGridSpec, only: VerticalGridSpec - use mapl_VerticalGridFactory, only: VerticalGridFactory - use mapl_VerticalGridFactoryMap + use mapl_IntegerVerticalGridMap_mod + use mapl_VerticalGrid_mod, only: VerticalGrid + use mapl_VerticalGridSpec_mod, only: VerticalGridSpec + use mapl_VerticalGridFactory_mod, only: VerticalGridFactory + use mapl_VerticalGridFactoryMap_mod use pfio, only: FileMetadata - use mapl_ErrorHandling + use mapl_ErrorHandling_mod use esmf, only: esmf_HConfig, esmf_HConfigLog use gfTL2_StringVector @@ -65,7 +65,7 @@ function get_vertical_grid_manager(rc) result(manager) end function get_vertical_grid_manager subroutine initialize(this, rc) - use mapl_BasicVerticalGrid, only: BasicVerticalGridFactory + use mapl_BasicVerticalGrid_mod, only: BasicVerticalGridFactory class(VerticalGridManager), target, intent(inout) :: this integer, intent(out), optional :: rc @@ -398,4 +398,4 @@ function list_factories(this) result(names) end function list_factories -end module mapl_VerticalGridManager +end module mapl_VerticalGridManager_mod diff --git a/infrastructure/vertical/vertical_grid/VerticalGridSpec.F90 b/infrastructure/vertical/vertical_grid/VerticalGridSpec.F90 index 29ebcfdb454..f4d0dff5348 100644 --- a/infrastructure/vertical/vertical_grid/VerticalGridSpec.F90 +++ b/infrastructure/vertical/vertical_grid/VerticalGridSpec.F90 @@ -1,4 +1,4 @@ -module mapl_VerticalGridSpec +module mapl_VerticalGridSpec_mod implicit none(type,external) private @@ -8,5 +8,5 @@ module mapl_VerticalGridSpec private end type VerticalGridSpec -end module mapl_VerticalGridSpec +end module mapl_VerticalGridSpec_mod diff --git a/infrastructure/vertical/vertical_grid/VerticalStaggerLoc.F90 b/infrastructure/vertical/vertical_grid/VerticalStaggerLoc.F90 index f72633f1c73..bf29a91235e 100644 --- a/infrastructure/vertical/vertical_grid/VerticalStaggerLoc.F90 +++ b/infrastructure/vertical/vertical_grid/VerticalStaggerLoc.F90 @@ -1,5 +1,5 @@ #include "MAPL.h" -module mapl_VerticalStaggerLoc +module mapl_VerticalStaggerLoc_mod implicit none private @@ -167,4 +167,4 @@ integer function get_num_layers(this, num_levels) result(num_layers) end select end function get_num_layers -end module mapl_VerticalStaggerLoc +end module mapl_VerticalStaggerLoc_mod diff --git a/infrastructure/vertical/vertical_grid/tests/CMakeLists.txt b/infrastructure/vertical/vertical_grid/tests/CMakeLists.txt index 5d4d50637fa..d5e33a11a95 100644 --- a/infrastructure/vertical/vertical_grid/tests/CMakeLists.txt +++ b/infrastructure/vertical/vertical_grid/tests/CMakeLists.txt @@ -12,7 +12,7 @@ add_pfunit_ctest(MAPL.vertical_grid.tests # OTHER_SOURCES ${SRCS} LINK_LIBRARIES MAPL.vertical_grid MAPL.shared MAPL.pfunit EXTRA_INITIALIZE Initialize - EXTRA_USE MAPL_pFUnit_Initialize + EXTRA_USE mapl_pFUnit_Initialize_mod MAX_PES 8 ) set_target_properties(MAPL.vertical_grid.tests PROPERTIES Fortran_MODULE_DIRECTORY ${MODULE_DIRECTORY}) diff --git a/infrastructure/vertical/vertical_grid/tests/Test_BasicVerticalGrid.pf b/infrastructure/vertical/vertical_grid/tests/Test_BasicVerticalGrid.pf index 22b02d0feda..b64ea397ecd 100644 --- a/infrastructure/vertical/vertical_grid/tests/Test_BasicVerticalGrid.pf +++ b/infrastructure/vertical/vertical_grid/tests/Test_BasicVerticalGrid.pf @@ -1,10 +1,10 @@ module Test_BasicVerticalGrid use pfunit - use mapl_BasicVerticalGrid - use mapl_VerticalGridSpec, only: VerticalGridSpec - use mapl_VerticalGrid, only: VerticalGrid - use mapl_VerticalStaggerLoc, only: VERTICAL_STAGGER_CENTER, VERTICAL_STAGGER_EDGE - use mapl_VerticalCoordinateDirection + use mapl_BasicVerticalGrid_mod + use mapl_VerticalGridSpec_mod, only: VerticalGridSpec + use mapl_VerticalGrid_mod, only: VerticalGrid + use mapl_VerticalStaggerLoc_mod, only: VERTICAL_STAGGER_CENTER, VERTICAL_STAGGER_EDGE + use mapl_VerticalCoordinateDirection_mod use esmf, only: esmf_HConfig, ESMF_TYPEKIND_R4, ESMF_TYPEKIND_R8 use esmf, only: esmf_HConfigCreate, esmf_HConfigDestroy implicit none diff --git a/infrastructure/vertical/vertical_grid/tests/Test_FixedLevelsVerticalGrid.pf b/infrastructure/vertical/vertical_grid/tests/Test_FixedLevelsVerticalGrid.pf index 033c5180fd2..4581b70f49e 100644 --- a/infrastructure/vertical/vertical_grid/tests/Test_FixedLevelsVerticalGrid.pf +++ b/infrastructure/vertical/vertical_grid/tests/Test_FixedLevelsVerticalGrid.pf @@ -1,10 +1,10 @@ module Test_FixedLevelsVerticalGrid use pfunit - use mapl_FixedLevelsVerticalGrid - use mapl_VerticalGridSpec, only: VerticalGridSpec - use mapl_VerticalGrid, only: VerticalGrid - use mapl_VerticalStaggerLoc, only: VERTICAL_STAGGER_CENTER, VERTICAL_STAGGER_EDGE - use mapl_VerticalCoordinateDirection + use mapl_FixedLevelsVerticalGrid_mod + use mapl_VerticalGridSpec_mod, only: VerticalGridSpec + use mapl_VerticalGrid_mod, only: VerticalGrid + use mapl_VerticalStaggerLoc_mod, only: VERTICAL_STAGGER_CENTER, VERTICAL_STAGGER_EDGE + use mapl_VerticalCoordinateDirection_mod use esmf, only: esmf_HConfig, ESMF_TYPEKIND_R4 use esmf, only: esmf_HConfigCreate, esmf_HConfigDestroy implicit none diff --git a/infrastructure/vertical/vertical_grid/tests/Test_VerticalGridManager.pf b/infrastructure/vertical/vertical_grid/tests/Test_VerticalGridManager.pf index 902cd25c44a..f4e91792876 100644 --- a/infrastructure/vertical/vertical_grid/tests/Test_VerticalGridManager.pf +++ b/infrastructure/vertical/vertical_grid/tests/Test_VerticalGridManager.pf @@ -1,9 +1,9 @@ module Test_VerticalGridManager use pfunit - use mapl_VerticalGridManager, only: VerticalGridManager - use mapl_BasicVerticalGrid, only: BasicVerticalGridFactory - use mapl_VerticalGrid, only: VerticalGrid - use mapl_VerticalStaggerLoc, only: VERTICAL_STAGGER_CENTER, VerticalStaggerLoc + use mapl_VerticalGridManager_mod, only: VerticalGridManager + use mapl_BasicVerticalGrid_mod, only: BasicVerticalGridFactory + use mapl_VerticalGrid_mod, only: VerticalGrid + use mapl_VerticalStaggerLoc_mod, only: VERTICAL_STAGGER_CENTER, VerticalStaggerLoc use esmf, only: esmf_HConfig, esmf_Field, esmf_Geom use esmf, only: ESMF_TYPEKIND_R4 use gftl2_StringVector @@ -166,7 +166,7 @@ contains function mock_create_field(this, physical_dimension, aspects, coupler, rc) result(field) use esmf, only: esmf_Field, esmf_FieldEmptyCreate - use mapl_ComponentDriver, only: ComponentDriver + use mapl_ComponentDriver_mod, only: ComponentDriver type(esmf_Field) :: field class(MockVerticalGrid), intent(in) :: this character(len=*), intent(in) :: physical_dimension diff --git a/infrastructure/vertical/vertical_grid/tests/Test_VerticalStaggerLoc.pf b/infrastructure/vertical/vertical_grid/tests/Test_VerticalStaggerLoc.pf index c232fb38907..89983a5c92e 100644 --- a/infrastructure/vertical/vertical_grid/tests/Test_VerticalStaggerLoc.pf +++ b/infrastructure/vertical/vertical_grid/tests/Test_VerticalStaggerLoc.pf @@ -1,6 +1,6 @@ module Test_VerticalStaggerLoc use pfunit - use mapl_VerticalStaggerLoc + use mapl_VerticalStaggerLoc_mod implicit none contains diff --git a/mapl/CMakeLists.txt b/mapl/CMakeLists.txt index b3beb41d4b7..556c1e7b50d 100644 --- a/mapl/CMakeLists.txt +++ b/mapl/CMakeLists.txt @@ -7,7 +7,7 @@ set (srcs esma_add_library (${this} SRCS ${srcs} - DEPENDENCIES MAPL.generic3g MAPL.pfio MAPL.hconfig MAPL.vm MAPL.field MAPL.state MAPL.python_bridge MAPL.base3g MAPL.profiler MAPL.regridder_mgr MAPL.esmf MAPL.mp_utils ${EXTDATA_TARGET} + DEPENDENCIES MAPL.generic3g MAPL.pfio MAPL.hconfig MAPL.vm MAPL.field MAPL.state MAPL.python_bridge MAPL.base3g MAPL.profiler MAPL.regridder_mgr MAPL.esmf MAPL.mp_utils MAPL.GeomIO ${EXTDATA_TARGET} ESMF::ESMF NetCDF::NetCDF_Fortran MPI::MPI_Fortran PFLOGGER::pflogger TYPE SHARED ) diff --git a/mapl/MAPL.F90 b/mapl/MAPL.F90 index 914f1c1cfe4..b41bf04a382 100644 --- a/mapl/MAPL.F90 +++ b/mapl/MAPL.F90 @@ -1,52 +1,83 @@ ! Public interface (package) to MAPL module MAPL - use mapl_VM_API - use mapl_MaplFramework + use mapl_VM_API_mod + use mapl_MaplFramework_mod use generic3g - use mapl_State_API - use mapl_String - use mapl_StringUtilities - use mapl_FileSystemUtilities - use mapl_DSO_Utilities - use mapl_SplitCommunicatorMod - use mapl_SimpleCommSplitterMod - use mapl_SortMod - use mapl_ShmemMod - use mapl_ThrowMod - use mapl_RangeMod - use mapl_MinMaxMod - use mapl_LoadBalanceMod - use mapl_KeywordEnforcerMod - use mapl_InterpMod - use mapl_HashMod - use mapl_ErrorHandling - use mapl_DirPathMod - use mapl_Constants - use mapl_CommGroupDescriptionMod - use mapl_AbstractCommSplitterMod - use mapl_DownbitMod - use mapl_sleepMod + use mapl_State_API_mod + use mapl_String_mod + use mapl_StringUtilities_mod + use mapl_FileSystemUtilities_mod + use mapl_DSO_Utilities_mod + use mapl_SplitCommunicator_mod + use mapl_SimpleCommSplitter_mod + use mapl_Sort_mod + use mapl_Shmem_mod + use mapl_Throw_mod + use mapl_Range_mod + use mapl_MinMax_mod + use mapl_LoadBalance_mod + use mapl_KeywordEnforcer_mod + use mapl_Interp_mod + use mapl_Hash_mod + use mapl_ErrorHandling_mod + use mapl_DirPath_mod + use MAPL_Constants + use mapl_CommGroupDescription_mod + use mapl_AbstractCommSplitter_mod + use mapl_Downbit_mod + use mapl_Sleep_mod use pfio - use mapl_geom_API - use mapl_hconfig_API - use mapl_VerticalGrid_API - use mapl_EsmfUtils_API + use mapl_Geom_API_mod + use mapl_HConfig_API + use mapl_VerticalGrid_API_mod + use mapl_EsmfUtils_API_mod use mapl_Field_API - use mapl_FieldBundle_API + use mapl_FieldBundle_API_mod use mapl_mp_utils - use mapl_RegridderMgr_API - use mapl_Generic3g_API - use MAPL_PythonBridge - use mapl_base3g - use mapl_Profiler, initialize_profiler => initialize, finalize_profiler => finalize - use MAPL_FieldUtils - use MAPL_StateMaskMod - use MAPL_StateArithmeticParserMod - use MAPL_StateFilter - + use mapl_RegridderMgr_API_mod + use mapl_Generic3g_API_mod + use mapl_PythonBridge_mod + use mapl_base3g_mod + use mapl_Profiler_mod, initialize_profiler => initialize, finalize_profiler => finalize + use mapl_FieldUtils + use mapl_StateMask_mod + use mapl_StateArithmeticParser_mod + use mapl_StateFilter_mod + + ! Additional modules needed by gridcomps (issues #4958/#4959) + ! generic3g layer + use mapl_Generic_mod + ! mapl_GenericGridComp excluded: its public setServices conflicts with + ! the standalone setServices subroutines defined in gridcomp files. + ! Cap.F90 still uses it directly; address in a later increment. + use mapl_ComponentSpec_mod + use mapl_RestartHandler_mod + ! esmf layer + use mapl_ESMF_Time_Utilities_mod + use mapl_SimpleAlarm_mod + use mapl_StateItemImpl_mod + use mapl_FieldPointerUtilities_mod + use mapl_ExceptionHandling_mod + use mapl_ISO8601_DateTime_mod + ! regridder layer + use mapl_EsmfRegridder_mod + use mapl_RegridderMethods_mod + ! hconfig layer + use mapl_HConfigAs_mod + ! mp_utils layer + use mapl_StringTemplate_mod + ! base3g layer + use mapl_FileMetadataUtils_mod + ! utils layer + use mapl_os_mod + ! geom layer (transitively linked via regridder_mgr) + use mapl_GridGetGlobal_mod + ! GeomIO layer + use mapl_geomio + use mapl_CompressionSettings_mod + + ! We use default PUBLIC to avoid explicitly listing exports from + ! the other layers. When the dust settles and such micro + ! management become feasible, this can be reconsidered. - ! We use default PUBLIC to avoid explicitly listing exports from - ! the other layers. When the dust settles and such micro - ! management become feasible, this can be reconsidered. - end module MAPL diff --git a/mapl/MaplFramework.F90 b/mapl/MaplFramework.F90 index 2934c016ffd..5ad0c75a17e 100644 --- a/mapl/MaplFramework.F90 +++ b/mapl/MaplFramework.F90 @@ -5,18 +5,18 @@ ! at some later date if justified. -module mapl_MaplFramework +module mapl_MaplFramework_mod - use mapl_ErrorHandling - use mapl_KeywordEnforcerMod - use mapl_FieldFillDefault, only: & + use mapl_ErrorHandling_mod + use mapl_KeywordEnforcer_mod + use mapl_FieldFillDefault_mod, only: & field_fill_defaults_init => initialize_field_fill_defaults, & set_field_fill_defaults - use mapl_VerticalGrid_API - use mapl_FixedLevelsVerticalGrid - use mapl_ModelVerticalGrid - use mapl_FieldDictionary, only: load_field_dictionary - use mapl_profiler, only: profiler_initialize => initialize, profiler_finalize => finalize + use mapl_VerticalGrid_API_mod + use mapl_FixedLevelsVerticalGrid_mod + use mapl_ModelVerticalGrid_mod + use mapl_FieldDictionary_mod, only: load_field_dictionary + use mapl_Profiler_mod, only: profiler_initialize => initialize, profiler_finalize => finalize use pfio_DirectoryServiceMod, only: DirectoryService use pfio_ClientManagerMod use pfio_MpiServerMod, only: MpiServer @@ -203,7 +203,7 @@ end subroutine initialize_esmf subroutine initialize_pflogger(this, unusable, level_name, rc) use PFL_Formatter, only: get_sim_time use pflogger, only: pfl_initialize => initialize - use mapl_SimulationTime, only: fill_time_dict + use mapl_SimulationTime_mod, only: fill_time_dict class(MaplFramework), intent(inout) :: this class(KeywordEnforcer), optional, intent(in) :: unusable @@ -345,7 +345,7 @@ subroutine initialize_servers(this, unusable, is_model_pet, servers, rc) end subroutine initialize_servers function make_server_gridcomp(hconfig, petList, comms, rc) result(gridcomp) - use mapl_DSO_Utilities + use mapl_DSO_Utilities_mod type(ESMF_GridComp) :: gridcomp type(ESMF_HConfig), intent(in) :: hconfig integer, intent(in) :: petList(:) @@ -795,5 +795,5 @@ subroutine initialize_field_dictionary(this, rc) _RETURN(_SUCCESS) end subroutine initialize_field_dictionary -end module mapl_MaplFramework +end module mapl_MaplFramework_mod diff --git a/mp_utils/API.F90 b/mp_utils/API.F90 index 42e9ae5015d..5535a1eb326 100644 --- a/mp_utils/API.F90 +++ b/mp_utils/API.F90 @@ -3,12 +3,12 @@ ! by the top-level MAPL umbrella module. module mapl_mp_utils - use mapl_ArrayReductions, only: MAPL_MaxMin, MAPL_AreaMean - use mapl_MemInfo, only: MAPL_MemInfoWrite => MemInfoWrite - use mapl_TimeUtilities, only: MAPL_PackTime => PackTime, MAPL_UnpackTime => UnpackTime - use mapl_OSUtilities, only: MAPL_GetCheckpointSubdir => get_checkpoint_subdir - use MAPL_PackedTimeMod, only: PackedDateCreate, PackedTimeCreate, PackedDateTimeCreate - use MAPL_StringTemplate, only: StrTemplate + use mapl_ArrayReductions_mod, only: MAPL_MaxMin, MAPL_AreaMean + use mapl_MemInfo_mod, only: MAPL_MemInfoWrite => MemInfoWrite + use mapl_TimeUtilities_mod, only: MAPL_PackTime => PackTime, MAPL_UnpackTime => UnpackTime + use mapl_OSUtilities_mod, only: MAPL_GetCheckpointSubdir => get_checkpoint_subdir + use mapl_PackedTime_mod, only: PackedDateCreate, PackedTimeCreate, PackedDateTimeCreate + use mapl_StringTemplate_mod, only: StrTemplate ! We use default PUBLIC to avoid explicitly listing exports from ! the other layers. When the dust settles and such micro diff --git a/mp_utils/AbstractCommSplitter.F90 b/mp_utils/AbstractCommSplitter.F90 index 9b006299527..115f774749d 100644 --- a/mp_utils/AbstractCommSplitter.F90 +++ b/mp_utils/AbstractCommSplitter.F90 @@ -1,6 +1,6 @@ #include "MAPL.h" -module MAPL_AbstractCommSplitterMod +module mapl_AbstractCommSplitter_mod implicit none private @@ -19,8 +19,8 @@ module MAPL_AbstractCommSplitterMod abstract interface function split(this, unusable, rc) result(split_communicator) - use MAPL_KeywordEnforcerMod - use MAPL_SplitCommunicatorMod + use mapl_KeywordEnforcer_mod + use mapl_SplitCommunicator_mod import AbstractCommSplitter type (SplitCommunicator) :: split_communicator class (AbstractCommSplitter), intent(in) :: this @@ -49,4 +49,4 @@ subroutine set_shared_communicator(this, shared_communicator) end subroutine set_shared_communicator -end module MAPL_AbstractCommSplitterMod +end module mapl_AbstractCommSplitter_mod diff --git a/mp_utils/ArrayReductions.F90 b/mp_utils/ArrayReductions.F90 index 3b2038994ab..166eaa01206 100644 --- a/mp_utils/ArrayReductions.F90 +++ b/mp_utils/ArrayReductions.F90 @@ -24,12 +24,12 @@ #include "MAPL.h" -module mapl_ArrayReductions +module mapl_ArrayReductions_mod use mpi use, intrinsic :: iso_fortran_env, only: real32, real64 - use MAPL_ErrorHandling, only: MAPL_Verify, MAPL_Assert, MAPL_Return + use mapl_ErrorHandling_mod, only: MAPL_Verify, MAPL_Assert, MAPL_Return use MAPL_Constants, only: MAPL_UNDEFINED_REAL, MAPL_UNDEFINED_REAL64 implicit none @@ -198,4 +198,4 @@ function AreaMean_2d_r8(q, area, comm, rc) result(qmean) _RETURN(_SUCCESS) end function AreaMean_2d_r8 -end module mapl_ArrayReductions +end module mapl_ArrayReductions_mod diff --git a/mp_utils/CommGroupDescription.F90 b/mp_utils/CommGroupDescription.F90 index da2337bebf3..351141468db 100644 --- a/mp_utils/CommGroupDescription.F90 +++ b/mp_utils/CommGroupDescription.F90 @@ -1,7 +1,7 @@ #include "MAPL.h" -module MAPL_CommGroupDescriptionMod - use MAPL_ExceptionHandling - use MAPL_KeywordEnforcerMod +module mapl_CommGroupDescription_mod + use mapl_ExceptionHandling_mod + use mapl_KeywordEnforcer_mod implicit none private @@ -134,10 +134,10 @@ subroutine comm_group_range(this,my_node, my_rank, nodes_sizes, start_node, star _RETURN(_SUCCESS) end subroutine comm_group_range -end module MAPL_CommGroupDescriptionMod +end module mapl_CommGroupDescription_mod -module MAPL_CommGroupDescriptionVectorMod - use MAPL_CommGroupDescriptionMod +module mapl_CommGroupDescriptionVector_mod + use mapl_CommGroupDescription_mod #define _type type(CommGroupDescription) #define _vector CommGroupDescriptionVector @@ -148,5 +148,5 @@ module MAPL_CommGroupDescriptionVectorMod #undef _iterator #undef _vector #undef _type -end module MAPL_CommGroupDescriptionVectorMod +end module mapl_CommGroupDescriptionVector_mod diff --git a/mp_utils/DownBit.F90 b/mp_utils/DownBit.F90 index ff22013bfc6..e427e975ee5 100644 --- a/mp_utils/DownBit.F90 +++ b/mp_utils/DownBit.F90 @@ -1,8 +1,8 @@ #include "MAPL.h" -module MAPL_DownbitMod +module mapl_Downbit_mod use, intrinsic :: iso_c_binding, only: c_f_pointer, c_loc, c_ptr use mpi - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod implicit none private @@ -251,4 +251,4 @@ subroutine compute_min_max(array,min_value,max_value,undef_value,mpi_comm,rc) _RETURN(_SUCCESS) end subroutine -end module MAPL_DownbitMod +end module mapl_Downbit_mod diff --git a/mp_utils/LocalDisplacementEnsemble.F90 b/mp_utils/LocalDisplacementEnsemble.F90 index 1213c8d8460..a14f6bf78f7 100644 --- a/mp_utils/LocalDisplacementEnsemble.F90 +++ b/mp_utils/LocalDisplacementEnsemble.F90 @@ -1,8 +1,8 @@ #include "MAPL.h" -module mapl_LocalDisplacementEnsemble +module mapl_LocalDisplacementEnsemble_mod use mpi - use mapl_ErrorHandling, only: MAPL_Assert, MAPL_Verify, MAPL_Return + use mapl_ErrorHandling_mod, only: MAPL_Assert, MAPL_Verify, MAPL_Return use esmf use gftl2_integer64Set implicit none !(type,external) @@ -232,7 +232,7 @@ subroutine destroy(this, rc) _RETURN(_SUCCESS) end subroutine destroy -end module mapl_LocalDisplacementEnsemble +end module mapl_LocalDisplacementEnsemble_mod diff --git a/mp_utils/MAPL_LoadBalance.F90 b/mp_utils/MAPL_LoadBalance.F90 index 5188536c3ee..b5cffc13c28 100644 --- a/mp_utils/MAPL_LoadBalance.F90 +++ b/mp_utils/MAPL_LoadBalance.F90 @@ -6,11 +6,11 @@ !> !### MODULE: `MAPL_LoadBalanceMod` ! -module MAPL_LoadBalanceMod +module mapl_LoadBalance_mod use MAPL_Constants, only : MAPL_R8 - use MAPL_SortMod - use MAPL_ExceptionHandling + use mapl_Sort_mod + use mapl_ExceptionHandling_mod use mpi implicit none private @@ -542,4 +542,4 @@ subroutine MAPL_BalanceGet(Handle, BalLen, BufLen, Passes, Comm, rc) _RETURN(LDB_SUCCESS) end subroutine MAPL_BalanceGet -end module MAPL_LOADBALANCEMOD +end module mapl_LoadBalance_mod diff --git a/mp_utils/MAPL_MpiErrorHandling.F90 b/mp_utils/MAPL_MpiErrorHandling.F90 index 315c8eeb7a1..39ab1294542 100644 --- a/mp_utils/MAPL_MpiErrorHandling.F90 +++ b/mp_utils/MAPL_MpiErrorHandling.F90 @@ -2,9 +2,9 @@ ! Call MAPL_initialize_error_handling() once after MPI_Init to replace the ! serial (error stop) defaults with MPI-aware implementations. ! Serial programs do not need to call this. -module MAPL_MpiErrorHandlingMod - use MAPL_ThrowMod, only: MAPL_set_throw_method - use mapl_ErrorHandling, only: MAPL_set_abort_handler +module mapl_MpiErrorHandling_mod + use mapl_Throw_mod, only: MAPL_set_throw_method + use mapl_ErrorHandling_mod, only: MAPL_set_abort_handler implicit none private @@ -90,4 +90,4 @@ function get_base_name(filename) result(base_name) end function get_base_name -end module MAPL_MpiErrorHandlingMod +end module mapl_MpiErrorHandling_mod diff --git a/mp_utils/PackedTime.F90 b/mp_utils/PackedTime.F90 index a235351a388..23478731c79 100644 --- a/mp_utils/PackedTime.F90 +++ b/mp_utils/PackedTime.F90 @@ -13,9 +13,9 @@ !> arithmetic. The canonical representation of time in MAPL3 is ESMF_Time; !> the packed forms will be retired once all consumers have migrated. -module MAPL_PackedTimeMod +module mapl_PackedTime_mod use ESMF - use mapl_ErrorHandling, only: MAPL_Verify, MAPL_Return + use mapl_ErrorHandling_mod, only: MAPL_Verify, MAPL_Return implicit none(type, external) private @@ -212,4 +212,4 @@ function esmf_time_from_packed(nymd, nhms, rc) result(time) _RETURN(ESMF_SUCCESS) end function esmf_time_from_packed -end module MAPL_PackedTimeMod +end module mapl_PackedTime_mod diff --git a/mp_utils/Partition.F90 b/mp_utils/Partition.F90 index 88b942c57c8..a11d4bd0fbf 100644 --- a/mp_utils/Partition.F90 +++ b/mp_utils/Partition.F90 @@ -1,9 +1,9 @@ #include "MAPL.h" -module mapl_Partition +module mapl_Partition_mod - use mapl_KeywordEnforcerMod - use mapl_ErrorHandlingMod + use mapl_KeywordEnforcer_mod + use mapl_ErrorHandling_mod implicit none(type,external) private @@ -125,4 +125,4 @@ end function make_odd end function get_partition -end module mapl_Partition +end module mapl_Partition_mod diff --git a/mp_utils/SatVapor.F90 b/mp_utils/SatVapor.F90 index 323d4a6d51d..ecc712bf955 100644 --- a/mp_utils/SatVapor.F90 +++ b/mp_utils/SatVapor.F90 @@ -31,7 +31,7 @@ ! multiple threads. Most of these, however, will be benign. !@endbug ! -module MAPL_SatVaporMod +module mapl_SatVapor_mod ! !USES: ! @@ -905,5 +905,5 @@ end function QSATD3 #undef KIND_ -end module MAPL_SatVaporMod +end module mapl_SatVapor_mod diff --git a/mp_utils/Shmem/Shmem.F90 b/mp_utils/Shmem/Shmem.F90 index 019948b8f46..4992e80bb0c 100644 --- a/mp_utils/Shmem/Shmem.F90 +++ b/mp_utils/Shmem/Shmem.F90 @@ -1,7 +1,7 @@ #define SHM_SUCCESS 0 #include "MAPL.h" -module MAPL_Shmem +module mapl_Shmem_mod use, intrinsic :: ISO_C_BINDING use, intrinsic :: ISO_FORTRAN_ENV, only: REAL64, REAL32 @@ -542,9 +542,4 @@ integer module function MAPL_CoresPerNodeGet(comm, rc) integer, optional, intent( OUT) :: RC end function MAPL_CoresPerNodeGet end interface -end module MAPL_Shmem - -! For backwards compatibility -module MAPL_ShmemMod - use MAPL_Shmem -end module MAPL_ShmemMod +end module mapl_Shmem_mod diff --git a/mp_utils/Shmem/Shmem_implementation.F90 b/mp_utils/Shmem/Shmem_implementation.F90 index 195ef68de0b..83883a436d3 100644 --- a/mp_utils/Shmem/Shmem_implementation.F90 +++ b/mp_utils/Shmem/Shmem_implementation.F90 @@ -1,9 +1,9 @@ #define SHM_SUCCESS 0 #include "MAPL.h" -submodule (MAPL_Shmem) Shmem_implementation +submodule (mapl_Shmem_mod) Shmem_implementation use pflogger, only: logging, Logger - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod use MAPL_Constants implicit none @@ -1221,7 +1221,7 @@ end subroutine perror end procedure MAPL_GetNewRank module procedure getNodeComm - use MAPL_SortMod + use mapl_Sort_mod integer, allocatable :: colors(:), ranks(:) integer :: last diff --git a/mp_utils/SimpleCommSplitter.F90 b/mp_utils/SimpleCommSplitter.F90 index a9f6ab93df8..a82f878e58c 100644 --- a/mp_utils/SimpleCommSplitter.F90 +++ b/mp_utils/SimpleCommSplitter.F90 @@ -5,13 +5,13 @@ ! rank and npes in the shared communicator. Its subclasses can be ! tested in a serial context by parameterizing rank and npes. -module MAPL_SimpleCommSplitterMod - use MAPL_CommGroupDescriptionMod - use MAPL_CommGroupDescriptionVectorMod - use MAPL_ExceptionHandling - use MAPL_AbstractCommSplitterMod - use MAPL_KeywordEnforcerMod - use MAPL_SplitCommunicatorMod +module mapl_SimpleCommSplitter_mod + use mapl_CommGroupDescription_mod + use mapl_CommGroupDescriptionVector_mod + use mapl_ExceptionHandling_mod + use mapl_AbstractCommSplitter_mod + use mapl_KeywordEnforcer_mod + use mapl_SplitCommunicator_mod use MPI implicit none @@ -340,5 +340,5 @@ subroutine assign(this, from) end subroutine assign -end module MAPL_SimpleCommSplitterMod +end module mapl_SimpleCommSplitter_mod diff --git a/mp_utils/SimulationTime.F90 b/mp_utils/SimulationTime.F90 index 60a891dfca6..5bd4d5cb775 100644 --- a/mp_utils/SimulationTime.F90 +++ b/mp_utils/SimulationTime.F90 @@ -3,7 +3,7 @@ ! time. To accomplish this, the module hold a (shallow) copy ! of the clock in CapGridComp. -module mapl_SimulationTime +module mapl_SimulationTime_mod use gFTL2_StringUnlimitedMap, only: StringUnlimitedMap use ESMF implicit none(type,external) @@ -48,5 +48,5 @@ subroutine fill_time_dict(dict) end subroutine Fill_Time_Dict -end module mapl_SimulationTime +end module mapl_SimulationTime_mod diff --git a/mp_utils/SplitCommunicator.F90 b/mp_utils/SplitCommunicator.F90 index 9fb24ce2573..856488aec3e 100644 --- a/mp_utils/SplitCommunicator.F90 +++ b/mp_utils/SplitCommunicator.F90 @@ -1,4 +1,4 @@ -module MAPL_SplitCommunicatorMod +module mapl_SplitCommunicator_mod implicit none private @@ -55,6 +55,6 @@ function get_name(this) result(name) end function get_name -end module MAPL_SplitCommunicatorMod +end module mapl_SplitCommunicator_mod diff --git a/mp_utils/StringTemplate.F90 b/mp_utils/StringTemplate.F90 index 1d4ebcff6b9..af85e18a8df 100644 --- a/mp_utils/StringTemplate.F90 +++ b/mp_utils/StringTemplate.F90 @@ -1,10 +1,10 @@ #include "MAPL.h" -module MAPL_StringTemplate +module mapl_StringTemplate_mod use ESMF, only: ESMF_Calendar, ESMF_CalendarCreate, ESMF_CalendarDestroy, & ESMF_CALKIND_GREGORIAN, ESMF_KIND_I4, & ESMF_Time, ESMF_TimeGet, ESMF_TimeSet -use mapl_ErrorHandling, only: MAPL_Assert, MAPL_Verify, MAPL_Return -use MAPL_KeywordEnforcerMod, only: KeywordEnforcer +use mapl_ErrorHandling_mod, only: MAPL_Assert, MAPL_Verify, MAPL_Return +use mapl_KeywordEnforcer_mod, only: KeywordEnforcer implicit none(type,external) @@ -314,4 +314,4 @@ function skip_token(val,preserve) result(skip) end function skip_token -end module MAPL_StringTemplate +end module mapl_StringTemplate_mod diff --git a/mp_utils/TimeInterpolation.F90 b/mp_utils/TimeInterpolation.F90 index d55ede8631e..9a2823d81cd 100644 --- a/mp_utils/TimeInterpolation.F90 +++ b/mp_utils/TimeInterpolation.F90 @@ -1,8 +1,8 @@ #include "MAPL.h" -module MAPL_TimeInterpolation +module mapl_TimeInterpolation_mod use ESMF - use mapl_ErrorHandling, only: MAPL_Assert, MAPL_Verify, MAPL_Return + use mapl_ErrorHandling_mod, only: MAPL_Assert, MAPL_Verify, MAPL_Return implicit none private @@ -95,4 +95,4 @@ subroutine MAPL_ClimInterpFac(CLOCK, I1, I2, FAC, RC) end subroutine MAPL_ClimInterpFac -end module MAPL_TimeInterpolation +end module mapl_TimeInterpolation_mod diff --git a/mp_utils/profiler/AbstractGauge.F90 b/mp_utils/profiler/AbstractGauge.F90 index 5792cdffcf4..a17aff262c8 100644 --- a/mp_utils/profiler/AbstractGauge.F90 +++ b/mp_utils/profiler/AbstractGauge.F90 @@ -1,6 +1,6 @@ -module MAPL_AbstractGauge +module mapl_AbstractGauge_mod use, intrinsic :: iso_fortran_env, only: REAL64 - use MAPL_AbstractMeter + use mapl_AbstractMeter_mod implicit none private @@ -24,4 +24,4 @@ end function i_get_measurement end interface -end module MAPL_AbstractGauge +end module mapl_AbstractGauge_mod diff --git a/mp_utils/profiler/AbstractMeter.F90 b/mp_utils/profiler/AbstractMeter.F90 index e93847f3ac9..6bb17ffcce9 100644 --- a/mp_utils/profiler/AbstractMeter.F90 +++ b/mp_utils/profiler/AbstractMeter.F90 @@ -1,9 +1,9 @@ #include "unused_dummy.H" #include "MAPL_ErrLog.h" -module MAPL_AbstractMeter +module mapl_AbstractMeter_mod - use MAPL_ErrorHandlingMod + use mapl_ErrorHandling_mod use, intrinsic :: iso_fortran_env, only: REAL64 implicit none @@ -81,4 +81,4 @@ subroutine finalize(this, rc) _UNUSED_DUMMY(this) end subroutine finalize -end module MAPL_AbstractMeter +end module mapl_AbstractMeter_mod diff --git a/mp_utils/profiler/AbstractMeterFactory.F90 b/mp_utils/profiler/AbstractMeterFactory.F90 index 425d4b84083..57017bb605a 100644 --- a/mp_utils/profiler/AbstractMeterFactory.F90 +++ b/mp_utils/profiler/AbstractMeterFactory.F90 @@ -1,5 +1,5 @@ -module MAPL_AbstractMeterFactory - use MAPL_AbstractMeter +module mapl_AbstractMeterFactory_mod + use mapl_AbstractMeter_mod implicit none private @@ -19,5 +19,5 @@ function i_make_meter(this) result(meter) end function i_make_meter end interface -end module MAPL_AbstractMeterFactory +end module mapl_AbstractMeterFactory_mod diff --git a/mp_utils/profiler/AbstractMeterNode.F90 b/mp_utils/profiler/AbstractMeterNode.F90 index 0084c1d8bdb..35dce1db207 100644 --- a/mp_utils/profiler/AbstractMeterNode.F90 +++ b/mp_utils/profiler/AbstractMeterNode.F90 @@ -1,5 +1,5 @@ -module MAPL_AbstractMeterNode - use MAPL_AbstractMeter +module mapl_AbstractMeterNode_mod + use mapl_AbstractMeter_mod implicit none private @@ -163,4 +163,4 @@ end subroutine i_reset end interface -end module MAPL_AbstractMeterNode +end module mapl_AbstractMeterNode_mod diff --git a/mp_utils/profiler/AdvancedMeter.F90 b/mp_utils/profiler/AdvancedMeter.F90 index 7af138f2ba8..f43df60b2a7 100644 --- a/mp_utils/profiler/AdvancedMeter.F90 +++ b/mp_utils/profiler/AdvancedMeter.F90 @@ -1,9 +1,9 @@ #include "unused_dummy.H" -module MAPL_AdvancedMeter +module mapl_AdvancedMeter_mod use, intrinsic :: iso_fortran_env, only: REAL64 - use MAPL_AbstractMeter - use MAPL_AbstractGauge + use mapl_AbstractMeter_mod + use mapl_AbstractGauge_mod implicit none private @@ -292,4 +292,4 @@ subroutine accumulate(this, lap) end subroutine accumulate -end module MAPL_AdvancedMeter +end module mapl_AdvancedMeter_mod diff --git a/mp_utils/profiler/BaseProfiler.F90 b/mp_utils/profiler/BaseProfiler.F90 index db1ff152977..15234aedabe 100644 --- a/mp_utils/profiler/BaseProfiler.F90 +++ b/mp_utils/profiler/BaseProfiler.F90 @@ -1,15 +1,15 @@ #include "MAPL_ErrLog.h" #include "unused_dummy.H" -module mapl_BaseProfiler - use mapl_AdvancedMeter - use mapl_AbstractMeter - use mapl_AbstractMeterNode - use mapl_MeterNode - use mapl_MeterNodePtr - use mapl_MeterNodeStack - use mapl_ErrorHandlingMod - use mapl_KeywordEnforcerMod +module mapl_BaseProfiler_mod + use mapl_AdvancedMeter_mod + use mapl_AbstractMeter_mod + use mapl_AbstractMeterNode_mod + use mapl_MeterNode_mod + use mapl_MeterNodePtr_mod + use mapl_MeterNodeStack_mod + use mapl_ErrorHandling_mod + use mapl_KeywordEnforcer_mod implicit none private @@ -497,7 +497,7 @@ subroutine print_stack(s) end subroutine print_stack -end module mapl_BaseProfiler +end module mapl_BaseProfiler_mod diff --git a/mp_utils/profiler/DistributedMeter.F90 b/mp_utils/profiler/DistributedMeter.F90 index 77987eba51e..e2bfadc8926 100644 --- a/mp_utils/profiler/DistributedMeter.F90 +++ b/mp_utils/profiler/DistributedMeter.F90 @@ -1,12 +1,12 @@ #include "MAPL.h" -module MAPL_DistributedMeter +module mapl_DistributedMeter_mod use, intrinsic :: iso_fortran_env, only: REAL64 - use MAPL_ErrorHandlingMod - use MAPL_AbstractMeter - use MAPL_AdvancedMeter - use MAPL_AbstractGauge + use mapl_ErrorHandling_mod + use mapl_AbstractMeter_mod + use mapl_AdvancedMeter_mod + use mapl_AbstractGauge_mod use MPI implicit none @@ -359,4 +359,4 @@ subroutine true_reduce(invec, inoutvec, len, type) end do end subroutine true_reduce -end module MAPL_DistributedMeter +end module mapl_DistributedMeter_mod diff --git a/mp_utils/profiler/DistributedProfiler.F90 b/mp_utils/profiler/DistributedProfiler.F90 index b4841ad71c6..b07529a07f9 100644 --- a/mp_utils/profiler/DistributedProfiler.F90 +++ b/mp_utils/profiler/DistributedProfiler.F90 @@ -1,14 +1,14 @@ #include "MAPL.h" -module MAPL_DistributedProfiler - use MAPL_AbstractMeter - use MAPL_AbstractGauge - use MAPL_AbstractMeterNode - use MAPL_MeterNode - use MAPL_BaseProfiler - use Mapl_DistributedMeter - - use MAPL_AdvancedMeter - use MAPL_MpiTimerGauge +module mapl_DistributedProfiler_mod + use mapl_AbstractMeter_mod + use mapl_AbstractGauge_mod + use mapl_AbstractMeterNode_mod + use mapl_MeterNode_mod + use mapl_BaseProfiler_mod + use mapl_DistributedMeter_mod + + use mapl_AdvancedMeter_mod + use mapl_MpiTimerGauge_mod implicit none private @@ -92,4 +92,4 @@ subroutine reduce(this) end subroutine reduce -end module MAPL_DistributedProfiler +end module mapl_DistributedProfiler_mod diff --git a/mp_utils/profiler/FortranTimerGauge.F90 b/mp_utils/profiler/FortranTimerGauge.F90 index 02892bba453..67ab4dd1132 100644 --- a/mp_utils/profiler/FortranTimerGauge.F90 +++ b/mp_utils/profiler/FortranTimerGauge.F90 @@ -1,6 +1,6 @@ -module MAPL_FortranTimerGauge +module mapl_FortranTimerGauge_mod use, intrinsic :: iso_fortran_env, only: REAL64, INT64 - use MAPL_AbstractGauge + use mapl_AbstractGauge_mod implicit none private @@ -44,4 +44,4 @@ function get_measurement(this) result(measurement) end function get_measurement -end module MAPL_FortranTimerGauge +end module mapl_FortranTimerGauge_mod diff --git a/mp_utils/profiler/GlobalProfilers.F90 b/mp_utils/profiler/GlobalProfilers.F90 index ad0bf0782e9..79af3b25ac3 100644 --- a/mp_utils/profiler/GlobalProfilers.F90 +++ b/mp_utils/profiler/GlobalProfilers.F90 @@ -1,14 +1,14 @@ #include "MAPL_ErrLog.h" !#include "unused_dummy.H" -module mapl_GlobalProfilers - use mapl_AbstractGauge - use mapl_DistributedProfiler - use mapl_StubProfiler - use mapl_KeywordEnforcerMod - use mapl_ErrorHandlingMod - use mapl_MpiTimerGauge - use mapl_MallocGauge +module mapl_GlobalProfilers_mod + use mapl_AbstractGauge_mod + use mapl_DistributedProfiler_mod + use mapl_StubProfiler_mod + use mapl_KeywordEnforcer_mod + use mapl_ErrorHandling_mod + use mapl_MpiTimerGauge_mod + use mapl_MallocGauge_mod implicit none private @@ -95,4 +95,4 @@ subroutine initialize_global_profiler(profiler, gauge, name, unusable, comm, ena _UNUSED_DUMMY(unusable) end subroutine initialize_global_profiler -end module MAPL_GlobalProfilers +end module mapl_GlobalProfilers_mod diff --git a/mp_utils/profiler/MAPL_Profiler.F90 b/mp_utils/profiler/MAPL_Profiler.F90 index e3c3da6e23a..c06c6274502 100644 --- a/mp_utils/profiler/MAPL_Profiler.F90 +++ b/mp_utils/profiler/MAPL_Profiler.F90 @@ -1,56 +1,56 @@ #include "MAPL_ErrLog.h" ! Package exporter -module mapl_Profiler - use mapl_AbstractMeter - use mapl_AbstractMeterNode - use mapl_AbstractMeterFactory - use mapl_MeterNodeVector - use mapl_MeterNode - use mapl_BaseProfiler - - use mapl_AdvancedMeter - use mapl_MpiTimerGauge - use mapl_FortranTimerGauge - use mapl_RssMemoryGauge - use mapl_VmstatMemoryGauge - - use mapl_DistributedMeter - use mapl_DistributedProfiler - use mapl_TimeProfiler - use mapl_MemoryProfiler - - use mapl_ProfileReporter - use mapl_CsvProfileReporter - use mapl_AbstractColumn - use mapl_SimpleColumn - use mapl_TextColumn - use mapl_SimpleTextColumn - use mapl_FormattedTextColumn - use mapl_MemoryTextColumn - use mapl_NameColumn - use mapl_PlainNameColumn - use mapl_DepthColumn - use mapl_NumCyclesColumn - use mapl_InclusiveColumn - use mapl_ExclusiveColumn - use mapl_StdDevColumn - use mapl_MinCycleColumn - use mapl_MaxCycleColumn - use mapl_MeanCycleColumn - use mapl_PercentageColumn - use mapl_TextColumnVector - use mapl_MultiColumn - use mapl_SeparatorColumn - use mapl_GlobalProfilers +module mapl_Profiler_mod + use mapl_AbstractMeter_mod + use mapl_AbstractMeterNode_mod + use mapl_AbstractMeterFactory_mod + use mapl_MeterNodeVector_mod + use mapl_MeterNode_mod + use mapl_BaseProfiler_mod + + use mapl_AdvancedMeter_mod + use mapl_MpiTimerGauge_mod + use mapl_FortranTimerGauge_mod + use mapl_RssMemoryGauge_mod + use mapl_VmstatMemoryGauge_mod + + use mapl_DistributedMeter_mod + use mapl_DistributedProfiler_mod + use mapl_TimeProfiler_mod + use mapl_MemoryProfiler_mod + + use mapl_ProfileReporter_mod + use mapl_CsvProfileReporter_mod + use mapl_AbstractColumn_mod + use mapl_SimpleColumn_mod + use mapl_TextColumn_mod + use mapl_SimpleTextColumn_mod + use mapl_FormattedTextColumn_mod + use mapl_MemoryTextColumn_mod + use mapl_NameColumn_mod + use mapl_PlainNameColumn_mod + use mapl_DepthColumn_mod + use mapl_NumCyclesColumn_mod + use mapl_InclusiveColumn_mod + use mapl_ExclusiveColumn_mod + use mapl_StdDevColumn_mod + use mapl_MinCycleColumn_mod + use mapl_MaxCycleColumn_mod + use mapl_MeanCycleColumn_mod + use mapl_PercentageColumn_mod + use mapl_TextColumnVector_mod + use mapl_MultiColumn_mod + use mapl_SeparatorColumn_mod + use mapl_GlobalProfilers_mod implicit none contains subroutine initialize(comm, unusable, enable_global_timeprof, enable_global_memprof, rc) - use mapl_ErrorHandlingMod - use mapl_KeywordEnforcerMod + use mapl_ErrorHandling_mod + use mapl_KeywordEnforcer_mod integer, optional, intent(in) :: comm class(KeywordEnforcer), optional, intent(in) :: unusable logical, optional, intent(in) :: enable_global_timeprof @@ -67,8 +67,8 @@ subroutine initialize(comm, unusable, enable_global_timeprof, enable_global_memp end subroutine initialize subroutine finalize(unusable, rc) - use mapl_KeywordEnforcerMod - use mapl_ErrorHandlingMod + use mapl_KeywordEnforcer_mod + use mapl_ErrorHandling_mod class(KeywordEnforcer), optional, intent(in) :: unusable integer, optional, intent(out) :: rc @@ -89,8 +89,8 @@ subroutine finalize(unusable, rc) end subroutine finalize subroutine report_global_profiler(unusable,comm,rc) - use mapl_KeywordEnforcerMod - use mapl_ErrorHandlingMod + use mapl_KeywordEnforcer_mod + use mapl_ErrorHandling_mod use mpi use pflogger, only: logging use pflogger, only: Logger @@ -185,4 +185,4 @@ subroutine report_global_profiler(unusable,comm,rc) _UNUSED_DUMMY(unusable) end subroutine report_global_profiler -end module mapl_Profiler +end module mapl_Profiler_mod diff --git a/mp_utils/profiler/MallocGauge.F90 b/mp_utils/profiler/MallocGauge.F90 index 7a4d913807e..1f628b6e92f 100644 --- a/mp_utils/profiler/MallocGauge.F90 +++ b/mp_utils/profiler/MallocGauge.F90 @@ -1,10 +1,10 @@ #include "unused_dummy.H" -module MAPL_MallocGauge +module mapl_MallocGauge_mod use, intrinsic :: iso_fortran_env, only: REAL64, INT64 use, intrinsic :: iso_c_binding, only : C_INT - use MAPL_AbstractGauge + use mapl_AbstractGauge_mod implicit none private @@ -70,5 +70,5 @@ function mallinfo() result(info) info %uordblks = 0 end function mallinfo #endif -end module MAPL_MallocGauge +end module mapl_MallocGauge_mod diff --git a/mp_utils/profiler/MemoryProfiler.F90 b/mp_utils/profiler/MemoryProfiler.F90 index 0d67ee6ff67..2f3afc79a4d 100644 --- a/mp_utils/profiler/MemoryProfiler.F90 +++ b/mp_utils/profiler/MemoryProfiler.F90 @@ -1,14 +1,14 @@ #include "MAPL.h" -module MAPL_MemoryProfiler_private - use MAPL_BaseProfiler, only: BaseProfiler - use MAPL_BaseProfiler, only: MemoryProfilerIterator => BaseProfilerIterator - - use MAPL_MallocGauge - use MAPL_RssMemoryGauge - use MAPL_VmstatMemoryGauge - use MAPL_AdvancedMeter - use MAPL_AbstractMeter - use MAPL_MeterNode +module mapl_MemoryProfiler_private_mod + use mapl_BaseProfiler_mod, only: BaseProfiler + use mapl_BaseProfiler_mod, only: MemoryProfilerIterator => BaseProfilerIterator + + use mapl_MallocGauge_mod + use mapl_RssMemoryGauge_mod + use mapl_VmstatMemoryGauge_mod + use mapl_AdvancedMeter_mod + use mapl_AbstractMeter_mod + use mapl_MeterNode_mod implicit none private @@ -58,15 +58,15 @@ function make_meter(this) result(meter) end function make_meter -end module MAPL_MemoryProfiler_private +end module mapl_MemoryProfiler_private_mod -module MAPL_MemoryProfiler - use MAPL_BaseProfiler - use MAPL_MemoryProfiler_private - use mapl_KeywordEnforcerMod - use mapl_ErrorHandlingMod +module mapl_MemoryProfiler_mod + use mapl_BaseProfiler_mod + use mapl_MemoryProfiler_private_mod + use mapl_KeywordEnforcer_mod + use mapl_ErrorHandling_mod implicit none private @@ -76,4 +76,4 @@ module MAPL_MemoryProfiler contains -end module MAPL_MemoryProfiler +end module mapl_MemoryProfiler_mod diff --git a/mp_utils/profiler/MeterNode.F90 b/mp_utils/profiler/MeterNode.F90 index 9112545903c..3c6df6b3dbe 100644 --- a/mp_utils/profiler/MeterNode.F90 +++ b/mp_utils/profiler/MeterNode.F90 @@ -1,8 +1,8 @@ -module MAPL_MeterNode +module mapl_MeterNode_mod use, intrinsic :: iso_fortran_env, only: REAL64 - use MAPL_AbstractMeter - use MAPL_AbstractMeterNode - use MAPL_MeterNodeVector + use mapl_AbstractMeter_mod + use mapl_AbstractMeterNode_mod + use mapl_MeterNodeVector_mod implicit none private @@ -438,4 +438,4 @@ recursive subroutine accumulate(this, other) end subroutine accumulate -end module MAPL_MeterNode +end module mapl_MeterNode_mod diff --git a/mp_utils/profiler/MeterNodePtr.F90 b/mp_utils/profiler/MeterNodePtr.F90 index a3ad3dd6acf..1343de7a8d4 100644 --- a/mp_utils/profiler/MeterNodePtr.F90 +++ b/mp_utils/profiler/MeterNodePtr.F90 @@ -1,5 +1,5 @@ -module mapl_MeterNodePtr - use mapl_AbstractMeterNode +module mapl_MeterNodePtr_mod + use mapl_AbstractMeterNode_mod private public :: MeterNodePtr @@ -7,4 +7,4 @@ module mapl_MeterNodePtr class(AbstractMeterNode), pointer :: ptr end type MeterNodePtr -end module mapl_MeterNodePtr +end module mapl_MeterNodePtr_mod diff --git a/mp_utils/profiler/MeterNodeStack.F90 b/mp_utils/profiler/MeterNodeStack.F90 index a12dd4192e0..63b33fcd3d9 100644 --- a/mp_utils/profiler/MeterNodeStack.F90 +++ b/mp_utils/profiler/MeterNodeStack.F90 @@ -1,5 +1,5 @@ -module mapl_MeterNodeStack - use mapl_MeterNodePtr +module mapl_MeterNodeStack_mod + use mapl_MeterNodePtr_mod #define T MeterNodePtr @@ -12,4 +12,4 @@ module mapl_MeterNodeStack #undef Vector #undef T -end module mapl_MeterNodeStack +end module mapl_MeterNodeStack_mod diff --git a/mp_utils/profiler/MeterNodeVector.F90 b/mp_utils/profiler/MeterNodeVector.F90 index 43510845d62..74a5a2aa6cc 100644 --- a/mp_utils/profiler/MeterNodeVector.F90 +++ b/mp_utils/profiler/MeterNodeVector.F90 @@ -1,5 +1,5 @@ -module MAPL_MeterNodeVector - use MAPL_AbstractMeterNode +module mapl_MeterNodeVector_mod + use mapl_AbstractMeterNode_mod #define T AbstractMeterNode #define T_polymorphic @@ -13,4 +13,4 @@ module MAPL_MeterNodeVector #undef T_polymorphic #undef T -end module MAPL_MeterNodeVector +end module mapl_MeterNodeVector_mod diff --git a/mp_utils/profiler/MpiTimerGauge.F90 b/mp_utils/profiler/MpiTimerGauge.F90 index ed5413223e9..eb25866504c 100644 --- a/mp_utils/profiler/MpiTimerGauge.F90 +++ b/mp_utils/profiler/MpiTimerGauge.F90 @@ -1,9 +1,9 @@ #include "unused_dummy.H" -module MAPL_MpiTimerGauge +module mapl_MpiTimerGauge_mod use, intrinsic :: iso_fortran_env, only: REAL64 use MPI, only: MPI_Wtime - use MAPL_AbstractGauge + use mapl_AbstractGauge_mod implicit none private @@ -28,4 +28,4 @@ function get_measurement(this) result(measurement) end function get_measurement -end module MAPL_MpiTimerGauge +end module mapl_MpiTimerGauge_mod diff --git a/mp_utils/profiler/NullGauge.F90 b/mp_utils/profiler/NullGauge.F90 index f65acad176a..d3c39c71052 100644 --- a/mp_utils/profiler/NullGauge.F90 +++ b/mp_utils/profiler/NullGauge.F90 @@ -1,9 +1,9 @@ #include "unused_dummy.H" -module MAPL_NullGauge +module mapl_NullGauge_mod use, intrinsic :: iso_fortran_env, only: REAL64, INT64 - use MAPL_AbstractGauge + use mapl_AbstractGauge_mod implicit none private @@ -37,4 +37,4 @@ function get_measurement(this) result(measurement) _UNUSED_DUMMY(this) end function get_measurement -end module MAPL_NullGauge +end module mapl_NullGauge_mod diff --git a/mp_utils/profiler/RssMemoryGauge.F90 b/mp_utils/profiler/RssMemoryGauge.F90 index aee14fc3119..d40112c2876 100644 --- a/mp_utils/profiler/RssMemoryGauge.F90 +++ b/mp_utils/profiler/RssMemoryGauge.F90 @@ -1,8 +1,8 @@ #include "unused_dummy.H" -module MAPL_RssMemoryGauge +module mapl_RssMemoryGauge_mod use, intrinsic :: iso_fortran_env, only: REAL64, INT64 - use MAPL_AbstractGauge + use mapl_AbstractGauge_mod implicit none private @@ -73,7 +73,7 @@ function get_measurement(this) result(mem_use) end function get_measurement -end module MAPL_RssMemoryGauge +end module mapl_RssMemoryGauge_mod diff --git a/mp_utils/profiler/StubProfiler.F90 b/mp_utils/profiler/StubProfiler.F90 index 0aae581e083..7239defc186 100644 --- a/mp_utils/profiler/StubProfiler.F90 +++ b/mp_utils/profiler/StubProfiler.F90 @@ -1,16 +1,16 @@ #include "MAPL.h" -module MAPL_StubProfiler - - use MAPL_BaseProfiler, only: BaseProfiler - use MAPL_DistributedProfiler - use mapl_KeywordEnforcerMod - use mapl_NullGauge - use MAPL_AbstractMeter - use MAPL_AdvancedMeter - use MAPL_AbstractMeterNode - use MAPL_MeterNode - use mapl_ErrorHandlingMod +module mapl_StubProfiler_mod + + use mapl_BaseProfiler_mod, only: BaseProfiler + use mapl_DistributedProfiler_mod + use mapl_KeywordEnforcer_mod + use mapl_NullGauge_mod + use mapl_AbstractMeter_mod + use mapl_AdvancedMeter_mod + use mapl_AbstractMeterNode_mod + use mapl_MeterNode_mod + use mapl_ErrorHandling_mod implicit none private @@ -120,4 +120,4 @@ integer function get_num_nodes(this) result(num_nodes) _UNUSED_DUMMY(this) end function get_num_nodes -end module MAPL_StubProfiler +end module mapl_StubProfiler_mod diff --git a/mp_utils/profiler/TimeProfiler.F90 b/mp_utils/profiler/TimeProfiler.F90 index 181c9c36ecb..c14b7b62254 100644 --- a/mp_utils/profiler/TimeProfiler.F90 +++ b/mp_utils/profiler/TimeProfiler.F90 @@ -1,13 +1,13 @@ #include "MAPL.h" -module mapl_TimeProfiler_private - use mapl_BaseProfiler, only: BaseProfiler - use mapl_BaseProfiler, only: TimeProfilerIterator => BaseProfilerIterator - - use mapl_MpiTimerGauge - use mapl_AdvancedMeter - use mapl_AbstractMeter - use mapl_MeterNode +module mapl_TimeProfiler_private_mod + use mapl_BaseProfiler_mod, only: BaseProfiler + use mapl_BaseProfiler_mod, only: TimeProfilerIterator => BaseProfilerIterator + + use mapl_MpiTimerGauge_mod + use mapl_AdvancedMeter_mod + use mapl_AbstractMeter_mod + use mapl_MeterNode_mod implicit none private @@ -54,14 +54,14 @@ function make_meter(this) result(meter) meter = AdvancedMeter(MpiTimerGauge()) end function make_meter -end module mapl_TimeProfiler_Private +end module mapl_TimeProfiler_private_mod -module mapl_TimeProfiler +module mapl_TimeProfiler_mod use mpi - use mapl_BaseProfiler - use mapl_TimeProfiler_private - use mapl_KeywordEnforcerMod - use mapl_ErrorHandlingMod + use mapl_BaseProfiler_mod + use mapl_TimeProfiler_private_mod + use mapl_KeywordEnforcer_mod + use mapl_ErrorHandling_mod implicit none private @@ -71,4 +71,4 @@ module mapl_TimeProfiler contains -end module mapl_TimeProfiler +end module mapl_TimeProfiler_mod diff --git a/mp_utils/profiler/VmstatMemoryGauge.F90 b/mp_utils/profiler/VmstatMemoryGauge.F90 index 5fc0451de51..797e918d01f 100644 --- a/mp_utils/profiler/VmstatMemoryGauge.F90 +++ b/mp_utils/profiler/VmstatMemoryGauge.F90 @@ -1,9 +1,9 @@ #include "unused_dummy.H" #include "MAPL_ErrLog.h" -module MAPL_VmstatMemoryGauge - use MAPL_ErrorHandlingMod +module mapl_VmstatMemoryGauge_mod + use mapl_ErrorHandling_mod use, intrinsic :: iso_fortran_env, only: REAL64, INT64 - use MAPL_AbstractGauge + use mapl_AbstractGauge_mod implicit none private @@ -65,7 +65,7 @@ function get_measurement(this) result(mem_use) end function get_measurement -end module MAPL_VmstatMemoryGauge +end module mapl_VmstatMemoryGauge_mod diff --git a/mp_utils/profiler/examples/csv_demo.F90 b/mp_utils/profiler/examples/csv_demo.F90 index c4f5e700d1a..ac57e2f65cc 100644 --- a/mp_utils/profiler/examples/csv_demo.F90 +++ b/mp_utils/profiler/examples/csv_demo.F90 @@ -1,5 +1,5 @@ program csv_demo - use MAPL_Profiler + use mapl_Profiler_mod use gFTL2_StringVector use esmf, only: ESMF_HConfig, ESMF_HConfigCreate, ESMF_HConfigDestroy diff --git a/mp_utils/profiler/examples/demo.F90 b/mp_utils/profiler/examples/demo.F90 index e1045f0df1d..6a49bc72b99 100644 --- a/mp_utils/profiler/examples/demo.F90 +++ b/mp_utils/profiler/examples/demo.F90 @@ -4,8 +4,8 @@ program main use MPI - use MAPL_Profiler - use MAPL_ErrorHandlingMod + use mapl_Profiler_mod + use mapl_ErrorHandling_mod use gFTL2_StringVector implicit none diff --git a/mp_utils/profiler/examples/hybrid_demo.F90 b/mp_utils/profiler/examples/hybrid_demo.F90 index 4cdd92f6344..442b6a1d75b 100644 --- a/mp_utils/profiler/examples/hybrid_demo.F90 +++ b/mp_utils/profiler/examples/hybrid_demo.F90 @@ -3,8 +3,8 @@ program main - use mapl_Profiler - use MAPL_ErrorHandlingMod + use mapl_Profiler_mod + use mapl_ErrorHandling_mod use MPI use gFTL2_StringVector diff --git a/mp_utils/profiler/examples/mpi_demo.F90 b/mp_utils/profiler/examples/mpi_demo.F90 index 10bc69cc157..fc3ce395ba9 100644 --- a/mp_utils/profiler/examples/mpi_demo.F90 +++ b/mp_utils/profiler/examples/mpi_demo.F90 @@ -3,8 +3,8 @@ program main - use mapl_Profiler - use MAPL_ErrorHandlingMod + use mapl_Profiler_mod + use mapl_ErrorHandling_mod use MPI use gFTL2_StringVector diff --git a/mp_utils/profiler/reporting/AbstractColumn.F90 b/mp_utils/profiler/reporting/AbstractColumn.F90 index 7e872e0aa3f..2826fcb1dba 100644 --- a/mp_utils/profiler/reporting/AbstractColumn.F90 +++ b/mp_utils/profiler/reporting/AbstractColumn.F90 @@ -1,7 +1,7 @@ -module MAPL_AbstractColumn +module mapl_AbstractColumn_mod use GFTL_UnlimitedVector - use MAPL_AbstractMeterNode - use MAPL_DistributedMeter + use mapl_AbstractMeterNode_mod + use mapl_DistributedMeter_mod implicit none private @@ -86,4 +86,4 @@ subroutine fill_row_integer_stats(stats, option, row) end subroutine fill_row_integer_stats -end module MAPL_AbstractColumn +end module mapl_AbstractColumn_mod diff --git a/mp_utils/profiler/reporting/ColumnVector.F90 b/mp_utils/profiler/reporting/ColumnVector.F90 index 65842667219..db692ef91e5 100644 --- a/mp_utils/profiler/reporting/ColumnVector.F90 +++ b/mp_utils/profiler/reporting/ColumnVector.F90 @@ -1,5 +1,5 @@ -module MAPL_ColumnVector - use MAPL_AbstractColumn +module mapl_ColumnVector_mod + use mapl_AbstractColumn_mod #define _type class(AbstractColumn) #define _allocatable @@ -7,4 +7,4 @@ module MAPL_ColumnVector #define _iterator ColumnVectorIterator #include "templates/vector.inc" -end module MAPL_ColumnVector +end module mapl_ColumnVector_mod diff --git a/mp_utils/profiler/reporting/CsvProfileReporter.F90 b/mp_utils/profiler/reporting/CsvProfileReporter.F90 index 9c9c809617b..eaeddbda657 100644 --- a/mp_utils/profiler/reporting/CsvProfileReporter.F90 +++ b/mp_utils/profiler/reporting/CsvProfileReporter.F90 @@ -22,16 +22,16 @@ !! Note: The 'width' parameter is ignored for CSV output. The 'format' parameter !! controls numeric precision and output format. -module MAPL_CsvProfileReporter +module mapl_CsvProfileReporter_mod - use MAPL_AbstractMeterNode - use MAPL_AbstractColumn - use MAPL_TextColumn - use MAPL_TextColumnVector - use MAPL_BaseProfiler + use mapl_AbstractMeterNode_mod + use mapl_AbstractColumn_mod + use mapl_TextColumn_mod + use mapl_TextColumnVector_mod + use mapl_BaseProfiler_mod use gFTL2_StringVector, only: StringVector, StringVectorIterator, operator(/=) - use mapl_KeywordEnforcer - use mapl_ErrorHandling + use mapl_KeywordEnforcer_mod + use mapl_ErrorHandling_mod use esmf, only: ESMF_HConfig use esmf, only: ESMF_HConfigAsString, ESMF_HConfigAsI4 use esmf, only: ESMF_HConfigIsDefined, ESMF_HConfigIsSequence, ESMF_HConfigGetSize @@ -163,7 +163,7 @@ end subroutine add_column ! Helper to populate columns from config subroutine populate_columns(reporter, config, unusable, rc) - use MAPL_TextColumn + use mapl_TextColumn_mod type(CsvProfileReporter), intent(inout) :: reporter type(ESMF_HConfig), intent(in) :: config class(KeywordEnforcer), optional, intent(in) :: unusable @@ -265,17 +265,17 @@ end function extend_path ! Helper to create a column from config and extract its name subroutine column_from_config(column_config, col, column_name, unusable, rc) - use MAPL_PlainNameColumn - use MAPL_DepthColumn - use MAPL_NumCyclesColumn - use MAPL_InclusiveColumn - use MAPL_ExclusiveColumn - use MAPL_StdDevColumn - use MAPL_MinCycleColumn - use MAPL_MaxCycleColumn - use MAPL_MeanCycleColumn - use MAPL_PercentageColumn - use MAPL_FormattedTextColumn + use mapl_PlainNameColumn_mod + use mapl_DepthColumn_mod + use mapl_NumCyclesColumn_mod + use mapl_InclusiveColumn_mod + use mapl_ExclusiveColumn_mod + use mapl_StdDevColumn_mod + use mapl_MinCycleColumn_mod + use mapl_MaxCycleColumn_mod + use mapl_MeanCycleColumn_mod + use mapl_PercentageColumn_mod + use mapl_FormattedTextColumn_mod class(TextColumn), allocatable, intent(out) :: col character(:), allocatable, intent(out) :: column_name type(ESMF_HConfig), intent(in) :: column_config @@ -481,4 +481,4 @@ function quote_and_escape(str) result(escaped) escaped = escaped // '"' end function quote_and_escape -end module MAPL_CsvProfileReporter +end module mapl_CsvProfileReporter_mod diff --git a/mp_utils/profiler/reporting/DepthColumn.F90 b/mp_utils/profiler/reporting/DepthColumn.F90 index c3cd4b3cf16..f139c249ae9 100644 --- a/mp_utils/profiler/reporting/DepthColumn.F90 +++ b/mp_utils/profiler/reporting/DepthColumn.F90 @@ -1,6 +1,6 @@ -module MAPL_DepthColumn - use MAPL_AbstractMeterNode - use MAPL_SimpleTextColumn +module mapl_DepthColumn_mod + use mapl_AbstractMeterNode_mod + use mapl_SimpleTextColumn_mod implicit none private @@ -70,4 +70,4 @@ integer function get_num_rows_header(this) result(num_rows) num_rows = 1 + this%get_num_rows_separator() end function get_num_rows_header -end module MAPL_DepthColumn +end module mapl_DepthColumn_mod diff --git a/mp_utils/profiler/reporting/ExclusiveColumn.F90 b/mp_utils/profiler/reporting/ExclusiveColumn.F90 index 09118c36254..81cbd23bf0c 100644 --- a/mp_utils/profiler/reporting/ExclusiveColumn.F90 +++ b/mp_utils/profiler/reporting/ExclusiveColumn.F90 @@ -1,9 +1,9 @@ -module MAPL_ExclusiveColumn - use MAPL_AbstractColumn - use MAPL_SimpleColumn - use MAPL_AbstractMeterNode - use MAPL_AbstractMeter - use Mapl_DistributedMeter +module mapl_ExclusiveColumn_mod + use mapl_AbstractColumn_mod + use mapl_SimpleColumn_mod + use mapl_AbstractMeterNode_mod + use mapl_AbstractMeter_mod + use mapl_DistributedMeter_mod implicit none private @@ -67,6 +67,6 @@ subroutine get_row_dist(this, node, row) end subroutine get_row_dist -end module MAPL_ExclusiveColumn +end module mapl_ExclusiveColumn_mod diff --git a/mp_utils/profiler/reporting/FormattedTextColumn.F90 b/mp_utils/profiler/reporting/FormattedTextColumn.F90 index 925844bf2f0..5ec30bf3da4 100644 --- a/mp_utils/profiler/reporting/FormattedTextColumn.F90 +++ b/mp_utils/profiler/reporting/FormattedTextColumn.F90 @@ -1,8 +1,8 @@ -module MAPL_FormattedTextColumn +module mapl_FormattedTextColumn_mod use, intrinsic :: iso_fortran_env, only: REAL64 - use MAPL_AbstractColumn - use MAPL_AbstractMeterNode - use MAPL_TextColumn + use mapl_AbstractColumn_mod + use mapl_AbstractMeterNode_mod + use mapl_TextColumn_mod use GFTL_UnlimitedVector implicit none private @@ -95,7 +95,7 @@ end function get_num_rows_header subroutine get_rows(this, node, rows) - use MAPL_AbstractMeterNode + use mapl_AbstractMeterNode_mod class (FormattedTextColumn), intent(in) :: this class (AbstractMeterNode), target, intent(in) :: node character(:), allocatable, intent(out) :: rows(:) @@ -122,4 +122,4 @@ subroutine get_rows(this, node, rows) end subroutine get_rows -end module MAPL_FormattedTextColumn +end module mapl_FormattedTextColumn_mod diff --git a/mp_utils/profiler/reporting/InclusiveColumn.F90 b/mp_utils/profiler/reporting/InclusiveColumn.F90 index 7f4ecf97427..3a8e5e74ba5 100644 --- a/mp_utils/profiler/reporting/InclusiveColumn.F90 +++ b/mp_utils/profiler/reporting/InclusiveColumn.F90 @@ -1,9 +1,9 @@ -module MAPL_InclusiveColumn - use MAPL_AbstractColumn - use MAPL_SimpleColumn - use MAPL_AbstractMeterNode - use MAPL_AbstractMeter - use Mapl_DistributedMeter +module mapl_InclusiveColumn_mod + use mapl_AbstractColumn_mod + use mapl_SimpleColumn_mod + use mapl_AbstractMeterNode_mod + use mapl_AbstractMeter_mod + use mapl_DistributedMeter_mod implicit none private @@ -67,4 +67,4 @@ subroutine get_row_dist(this, node, row) end subroutine get_row_dist -end module MAPL_InclusiveColumn +end module mapl_InclusiveColumn_mod diff --git a/mp_utils/profiler/reporting/MaxCycleColumn.F90 b/mp_utils/profiler/reporting/MaxCycleColumn.F90 index fbd0c7f6d4a..17a65acbfb1 100644 --- a/mp_utils/profiler/reporting/MaxCycleColumn.F90 +++ b/mp_utils/profiler/reporting/MaxCycleColumn.F90 @@ -1,9 +1,9 @@ -module MAPL_MaxCycleColumn - use MAPL_SimpleColumn - use MAPL_AbstractMeterNode - use MAPL_AbstractMeter - use MAPL_AdvancedMeter - use Mapl_DistributedMeter +module mapl_MaxCycleColumn_mod + use mapl_SimpleColumn_mod + use mapl_AbstractMeterNode_mod + use mapl_AbstractMeter_mod + use mapl_AdvancedMeter_mod + use mapl_DistributedMeter_mod implicit none private @@ -73,6 +73,6 @@ subroutine get_row_dist(this, node, row) end subroutine get_row_dist -end module MAPL_MaxCycleColumn +end module mapl_MaxCycleColumn_mod diff --git a/mp_utils/profiler/reporting/MeanCycleColumn.F90 b/mp_utils/profiler/reporting/MeanCycleColumn.F90 index c108818b9c7..dfe9fa91c16 100644 --- a/mp_utils/profiler/reporting/MeanCycleColumn.F90 +++ b/mp_utils/profiler/reporting/MeanCycleColumn.F90 @@ -1,9 +1,9 @@ -module MAPL_MeanCycleColumn - use MAPL_SimpleColumn - use MAPL_AbstractMeterNode - use MAPL_AbstractMeter - use MAPL_AdvancedMeter - use Mapl_DistributedMeter +module mapl_MeanCycleColumn_mod + use mapl_SimpleColumn_mod + use mapl_AbstractMeterNode_mod + use mapl_AbstractMeter_mod + use mapl_AdvancedMeter_mod + use mapl_DistributedMeter_mod implicit none private @@ -73,7 +73,7 @@ subroutine get_row_dist(this, node, row) end subroutine get_row_dist -end module MAPL_MeanCycleColumn +end module mapl_MeanCycleColumn_mod diff --git a/mp_utils/profiler/reporting/MemoryTextColumn.F90 b/mp_utils/profiler/reporting/MemoryTextColumn.F90 index 1ff6fe6cc48..dbb584a8eab 100644 --- a/mp_utils/profiler/reporting/MemoryTextColumn.F90 +++ b/mp_utils/profiler/reporting/MemoryTextColumn.F90 @@ -1,8 +1,8 @@ -module MAPL_MemoryTextColumn +module mapl_MemoryTextColumn_mod use, intrinsic :: iso_fortran_env, only: REAL64, INT64 - use MAPL_AbstractColumn - use MAPL_AbstractMeterNode - use MAPL_TextColumn + use mapl_AbstractColumn_mod + use mapl_AbstractMeterNode_mod + use mapl_TextColumn_mod use GFTL_UnlimitedVector implicit none private @@ -88,7 +88,7 @@ end function get_num_rows_header subroutine get_rows(this, node, rows) - use MAPL_AbstractMeterNode + use mapl_AbstractMeterNode_mod class (MemoryTextColumn), intent(in) :: this class (AbstractMeterNode), target, intent(in) :: node character(:), allocatable, intent(out) :: rows(:) @@ -167,4 +167,4 @@ end function convert end subroutine get_rows -end module MAPL_MemoryTextColumn +end module mapl_MemoryTextColumn_mod diff --git a/mp_utils/profiler/reporting/MinCycleColumn.F90 b/mp_utils/profiler/reporting/MinCycleColumn.F90 index 1443c962b15..b65cd9251c2 100644 --- a/mp_utils/profiler/reporting/MinCycleColumn.F90 +++ b/mp_utils/profiler/reporting/MinCycleColumn.F90 @@ -1,9 +1,9 @@ -module MAPL_MinCycleColumn - use MAPL_SimpleColumn - use MAPL_AbstractMeterNode - use MAPL_AbstractMeter - use MAPL_AdvancedMeter - use Mapl_DistributedMeter +module mapl_MinCycleColumn_mod + use mapl_SimpleColumn_mod + use mapl_AbstractMeterNode_mod + use mapl_AbstractMeter_mod + use mapl_AdvancedMeter_mod + use mapl_DistributedMeter_mod implicit none private @@ -73,7 +73,7 @@ subroutine get_row_dist(this, node, row) end subroutine get_row_dist -end module MAPL_MinCycleColumn +end module mapl_MinCycleColumn_mod diff --git a/mp_utils/profiler/reporting/MultiColumn.F90 b/mp_utils/profiler/reporting/MultiColumn.F90 index 29b916ed3a2..679c5b85b6b 100644 --- a/mp_utils/profiler/reporting/MultiColumn.F90 +++ b/mp_utils/profiler/reporting/MultiColumn.F90 @@ -1,8 +1,8 @@ -module MAPL_MultiColumn - use MAPL_TextColumn - use MAPL_TextColumnVector - use MAPL_AbstractMeterNode - use MAPL_SeparatorColumn +module mapl_MultiColumn_mod + use mapl_TextColumn_mod + use mapl_TextColumnVector_mod + use mapl_AbstractMeterNode_mod + use mapl_SeparatorColumn_mod implicit none private @@ -176,4 +176,4 @@ integer function get_num_columns(this) result(num_cols) num_cols = this%columns%size() end function get_num_columns -end module MAPL_MultiColumn +end module mapl_MultiColumn_mod diff --git a/mp_utils/profiler/reporting/NameColumn.F90 b/mp_utils/profiler/reporting/NameColumn.F90 index a9ea6d8a26c..cf50021610a 100644 --- a/mp_utils/profiler/reporting/NameColumn.F90 +++ b/mp_utils/profiler/reporting/NameColumn.F90 @@ -1,6 +1,6 @@ -module MAPL_NameColumn - use MAPL_AbstractMeterNode - use MAPL_SimpleTextColumn +module mapl_NameColumn_mod + use mapl_AbstractMeterNode_mod + use mapl_SimpleTextColumn_mod implicit none private @@ -78,4 +78,4 @@ integer function get_num_rows_header(this) result(num_rows) end function get_num_rows_header -end module MAPL_NameColumn +end module mapl_NameColumn_mod diff --git a/mp_utils/profiler/reporting/NumCyclesColumn.F90 b/mp_utils/profiler/reporting/NumCyclesColumn.F90 index d6dc4ae6067..a24fe3a1f68 100644 --- a/mp_utils/profiler/reporting/NumCyclesColumn.F90 +++ b/mp_utils/profiler/reporting/NumCyclesColumn.F90 @@ -1,11 +1,11 @@ #include "unused_dummy.H" -module MAPL_NumCyclesColumn - use MAPL_AbstractColumn - use MAPL_SimpleColumn - use MAPL_AbstractMeterNode - use MAPL_AdvancedMeter - use MAPL_AbstractMeter +module mapl_NumCyclesColumn_mod + use mapl_AbstractColumn_mod + use mapl_SimpleColumn_mod + use mapl_AbstractMeterNode_mod + use mapl_AdvancedMeter_mod + use mapl_AbstractMeter_mod implicit none private @@ -41,4 +41,4 @@ function get_row(this, node) result(row) end function get_row -end module MAPL_NumCyclesColumn +end module mapl_NumCyclesColumn_mod diff --git a/mp_utils/profiler/reporting/PercentageColumn.F90 b/mp_utils/profiler/reporting/PercentageColumn.F90 index f198749c470..44a8902f5fa 100644 --- a/mp_utils/profiler/reporting/PercentageColumn.F90 +++ b/mp_utils/profiler/reporting/PercentageColumn.F90 @@ -1,9 +1,9 @@ #include "unused_dummy.H" -module MAPL_PercentageColumn +module mapl_PercentageColumn_mod use, intrinsic :: iso_fortran_env, only: REAL64 - use MAPL_AbstractMeterNode - use MAPL_AbstractColumn + use mapl_AbstractMeterNode_mod + use mapl_AbstractColumn_mod implicit none private @@ -96,4 +96,4 @@ function get_row(this, node) result(row) _UNUSED_DUMMY(node) end function get_row -end module MAPL_PercentageColumn +end module mapl_PercentageColumn_mod diff --git a/mp_utils/profiler/reporting/PlainNameColumn.F90 b/mp_utils/profiler/reporting/PlainNameColumn.F90 index 3a4f75807ca..3bd1879f846 100644 --- a/mp_utils/profiler/reporting/PlainNameColumn.F90 +++ b/mp_utils/profiler/reporting/PlainNameColumn.F90 @@ -1,6 +1,6 @@ -module MAPL_PlainNameColumn - use MAPL_AbstractMeterNode - use MAPL_SimpleTextColumn +module mapl_PlainNameColumn_mod + use mapl_AbstractMeterNode_mod + use mapl_SimpleTextColumn_mod implicit none private @@ -62,4 +62,4 @@ integer function get_num_rows_header(this) result(num_rows) num_rows = 1 + this%get_num_rows_separator() end function get_num_rows_header -end module MAPL_PlainNameColumn +end module mapl_PlainNameColumn_mod diff --git a/mp_utils/profiler/reporting/ProfileReporter.F90 b/mp_utils/profiler/reporting/ProfileReporter.F90 index aca381cfc6e..836dfbc2d5e 100644 --- a/mp_utils/profiler/reporting/ProfileReporter.F90 +++ b/mp_utils/profiler/reporting/ProfileReporter.F90 @@ -37,17 +37,17 @@ !! - multi: Group columns together with shared header (supports nesting) !! !! See profiler/profiler_report_config.yaml for a complete configuration example. -module MAPL_ProfileReporter - use MAPL_AbstractMeterNode - use MAPL_AbstractColumn - use MAPL_TextColumn - use MAPL_SeparatorColumn - use MAPL_TextColumnVector - use MAPL_MultiColumn - use MAPL_BaseProfiler +module mapl_ProfileReporter_mod + use mapl_AbstractMeterNode_mod + use mapl_AbstractColumn_mod + use mapl_TextColumn_mod + use mapl_SeparatorColumn_mod + use mapl_TextColumnVector_mod + use mapl_MultiColumn_mod + use mapl_BaseProfiler_mod use gFTL2_StringVector - use mapl_KeywordEnforcer - use mapl_ErrorHandling + use mapl_KeywordEnforcer_mod + use mapl_ErrorHandling_mod use esmf, only: ESMF_HConfig use esmf, only: ESMF_HConfigAsString, ESMF_HConfigAsI4 use esmf, only: ESMF_HConfigIsDefined, ESMF_HConfigIsSequence, ESMF_HConfigGetSize @@ -98,7 +98,7 @@ end function new_ProfileReporter_config ! Helper to populate a MultiColumn from config subroutine populate_columns(multi_col, config, unusable, rc) - use MAPL_TextColumn + use mapl_TextColumn_mod class(MultiColumn), intent(inout) :: multi_col type(ESMF_HConfig), intent(in) :: config class(KeywordEnforcer), optional, intent(in) :: unusable @@ -180,19 +180,19 @@ end function get_config_integer ! Factory: create a single column from config function column_from_config(column_config, unusable, rc) result(col) - use MAPL_TextColumn - use MAPL_NameColumn - use MAPL_DepthColumn - use MAPL_NumCyclesColumn - use MAPL_InclusiveColumn - use MAPL_ExclusiveColumn - use MAPL_StdDevColumn - use MAPL_MinCycleColumn - use MAPL_MaxCycleColumn - use MAPL_MeanCycleColumn - use MAPL_PercentageColumn - use MAPL_FormattedTextColumn - use MAPL_SeparatorColumn + use mapl_TextColumn_mod + use mapl_NameColumn_mod + use mapl_DepthColumn_mod + use mapl_NumCyclesColumn_mod + use mapl_InclusiveColumn_mod + use mapl_ExclusiveColumn_mod + use mapl_StdDevColumn_mod + use mapl_MinCycleColumn_mod + use mapl_MaxCycleColumn_mod + use mapl_MeanCycleColumn_mod + use mapl_PercentageColumn_mod + use mapl_FormattedTextColumn_mod + use mapl_SeparatorColumn_mod class(TextColumn), allocatable :: col type(ESMF_HConfig), intent(in) :: column_config class(KeywordEnforcer), optional, intent(in) :: unusable @@ -332,4 +332,4 @@ end function generate_report_profiler -end module MAPL_ProfileReporter +end module mapl_ProfileReporter_mod diff --git a/mp_utils/profiler/reporting/SeparatorColumn.F90 b/mp_utils/profiler/reporting/SeparatorColumn.F90 index 90a0a2f5587..a6be21b67ce 100644 --- a/mp_utils/profiler/reporting/SeparatorColumn.F90 +++ b/mp_utils/profiler/reporting/SeparatorColumn.F90 @@ -1,9 +1,9 @@ #include "unused_dummy.H" -module MAPL_SeparatorColumn - use MAPL_AbstractColumn - use MAPL_AbstractMeterNode - use Mapl_SimpleTextColumn +module mapl_SeparatorColumn_mod + use mapl_AbstractColumn_mod + use mapl_AbstractMeterNode_mod + use mapl_SimpleTextColumn_mod implicit none private @@ -69,5 +69,5 @@ integer function get_num_rows_header(this) result(num_rows) num_rows = 1 end function get_num_rows_header -end module MAPL_SeparatorColumn +end module mapl_SeparatorColumn_mod diff --git a/mp_utils/profiler/reporting/SimpleColumn.F90 b/mp_utils/profiler/reporting/SimpleColumn.F90 index ce4ed6add6c..5e027e54d8d 100644 --- a/mp_utils/profiler/reporting/SimpleColumn.F90 +++ b/mp_utils/profiler/reporting/SimpleColumn.F90 @@ -1,8 +1,8 @@ -module MAPL_SimpleColumn - use MAPL_AbstractColumn +module mapl_SimpleColumn_mod + use mapl_AbstractColumn_mod use GFTL_UnlimitedVector - use MAPL_AbstractMeterNode - use MAPL_DistributedMeter + use mapl_AbstractMeterNode_mod + use mapl_DistributedMeter_mod implicit none private @@ -56,4 +56,4 @@ function get_rows(this, node) result(rows) end function get_rows -end module MAPL_SimpleColumn +end module mapl_SimpleColumn_mod diff --git a/mp_utils/profiler/reporting/SimpleTextColumn.F90 b/mp_utils/profiler/reporting/SimpleTextColumn.F90 index b4780a0ff92..7a62ca85e83 100644 --- a/mp_utils/profiler/reporting/SimpleTextColumn.F90 +++ b/mp_utils/profiler/reporting/SimpleTextColumn.F90 @@ -1,6 +1,6 @@ -module MAPL_SimpleTextColumn - use MAPL_TextColumn - use MAPL_AbstractMeterNode +module mapl_SimpleTextColumn_mod + use mapl_TextColumn_mod + use mapl_AbstractMeterNode_mod implicit none private @@ -17,7 +17,7 @@ module MAPL_SimpleTextColumn abstract interface function i_get_row(this, node) result(row) - use MAPL_AbstractMeterNode + use mapl_AbstractMeterNode_mod import SimpleTextColumn character(:), allocatable :: row class (SimpleTextColumn), intent(in) :: this @@ -81,4 +81,4 @@ subroutine get_rows(this, node, rows) end subroutine get_rows -end module MAPL_SimpleTextColumn +end module mapl_SimpleTextColumn_mod diff --git a/mp_utils/profiler/reporting/StdDevColumn.F90 b/mp_utils/profiler/reporting/StdDevColumn.F90 index 6af428ce83d..bbedbc629f6 100644 --- a/mp_utils/profiler/reporting/StdDevColumn.F90 +++ b/mp_utils/profiler/reporting/StdDevColumn.F90 @@ -1,10 +1,10 @@ -module MAPL_StdDevColumn - use MAPL_AbstractColumn - use MAPL_SimpleColumn - use MAPL_AbstractMeterNode - use MAPL_AbstractMeter - use MAPL_AdvancedMeter - use Mapl_DistributedMeter +module mapl_StdDevColumn_mod + use mapl_AbstractColumn_mod + use mapl_SimpleColumn_mod + use mapl_AbstractMeterNode_mod + use mapl_AbstractMeter_mod + use mapl_AdvancedMeter_mod + use mapl_DistributedMeter_mod implicit none private @@ -85,6 +85,6 @@ subroutine get_row_dist(this, node, row) end select end subroutine get_row_dist -end module MAPL_StdDevColumn +end module mapl_StdDevColumn_mod diff --git a/mp_utils/profiler/reporting/TextColumn.F90 b/mp_utils/profiler/reporting/TextColumn.F90 index a96a3f5ec73..cc6574eb0ab 100644 --- a/mp_utils/profiler/reporting/TextColumn.F90 +++ b/mp_utils/profiler/reporting/TextColumn.F90 @@ -1,5 +1,5 @@ -module MAPL_TextColumn - use MAPL_AbstractMeterNode +module mapl_TextColumn_mod + use mapl_AbstractMeterNode_mod implicit none private @@ -31,7 +31,7 @@ subroutine i_get_header(this, header) end subroutine i_get_header subroutine i_get_rows(this, node, rows) - use MAPL_AbstractMeterNode + use mapl_AbstractMeterNode_mod import TextColumn class (TextColumn), intent(in) :: this class (AbstractMeterNode), target, intent(in) :: node @@ -129,4 +129,4 @@ integer function get_num_rows_separator(this) result(num_rows) end function get_num_rows_separator -end module MAPL_TextColumn +end module mapl_TextColumn_mod diff --git a/mp_utils/profiler/reporting/TextColumnVector.F90 b/mp_utils/profiler/reporting/TextColumnVector.F90 index 3c037acbd2a..ae882b09165 100644 --- a/mp_utils/profiler/reporting/TextColumnVector.F90 +++ b/mp_utils/profiler/reporting/TextColumnVector.F90 @@ -1,5 +1,5 @@ -module MAPL_TextColumnVector - use MAPL_TextColumn +module mapl_TextColumnVector_mod + use mapl_TextColumn_mod #define T TextColumn #define T_polymorphic @@ -11,4 +11,4 @@ module MAPL_TextColumnVector #undef Vector #undef T_polymorphic #undef T -end module MAPL_TextColumnVector +end module mapl_TextColumnVector_mod diff --git a/mp_utils/profiler/tests/CMakeLists.txt b/mp_utils/profiler/tests/CMakeLists.txt index d399b16b630..754f88ab2d3 100644 --- a/mp_utils/profiler/tests/CMakeLists.txt +++ b/mp_utils/profiler/tests/CMakeLists.txt @@ -19,7 +19,7 @@ add_pfunit_ctest ( TEST_SOURCES ${TEST_SRCS} LINK_LIBRARIES MAPL.profiler MAPL.pfunit EXTRA_INITIALIZE Initialize - EXTRA_USE MAPL_pFUnit_Initialize + EXTRA_USE mapl_pFUnit_Initialize_mod MAX_PES 8 ) set_target_properties(MAPL.profiler.tests PROPERTIES Fortran_MODULE_DIRECTORY ${MODULE_DIRECTORY}) diff --git a/mp_utils/profiler/tests/test_AdvancedMeter.pf b/mp_utils/profiler/tests/test_AdvancedMeter.pf index 348f0fdcad3..7d2b676468b 100644 --- a/mp_utils/profiler/tests/test_AdvancedMeter.pf +++ b/mp_utils/profiler/tests/test_AdvancedMeter.pf @@ -1,7 +1,7 @@ module test_AdvancedMeter use, intrinsic :: iso_fortran_env, only: REAL64 use funit - use MAPL_Profiler + use mapl_Profiler_mod implicit none contains diff --git a/mp_utils/profiler/tests/test_Column.pf b/mp_utils/profiler/tests/test_Column.pf index e7f948e0d7d..39cf95c5165 100644 --- a/mp_utils/profiler/tests/test_Column.pf +++ b/mp_utils/profiler/tests/test_Column.pf @@ -1,5 +1,5 @@ module test_Column - use MAPL_Profiler + use mapl_Profiler_mod use funit contains diff --git a/mp_utils/profiler/tests/test_CsvProfileReporter.pf b/mp_utils/profiler/tests/test_CsvProfileReporter.pf index 17e9678e08d..2978d5af1ff 100644 --- a/mp_utils/profiler/tests/test_CsvProfileReporter.pf +++ b/mp_utils/profiler/tests/test_CsvProfileReporter.pf @@ -1,5 +1,5 @@ module test_CsvProfileReporter - use MAPL_Profiler + use mapl_Profiler_mod use funit use gFTL2_StringVector use esmf, only: ESMF_HConfig, ESMF_HConfigCreate, ESMF_HConfigDestroy diff --git a/mp_utils/profiler/tests/test_DistributedMeter.pf b/mp_utils/profiler/tests/test_DistributedMeter.pf index b5bb9138452..875f2dc604a 100644 --- a/mp_utils/profiler/tests/test_DistributedMeter.pf +++ b/mp_utils/profiler/tests/test_DistributedMeter.pf @@ -1,7 +1,7 @@ module test_DistributedMeter use, intrinsic :: iso_fortran_env, only: REAL64 use pfunit - use MAPL_Profiler + use mapl_Profiler_mod implicit none contains diff --git a/mp_utils/profiler/tests/test_ExclusiveColumn.pf b/mp_utils/profiler/tests/test_ExclusiveColumn.pf index b6aca8a2297..92a2deef153 100644 --- a/mp_utils/profiler/tests/test_ExclusiveColumn.pf +++ b/mp_utils/profiler/tests/test_ExclusiveColumn.pf @@ -1,6 +1,6 @@ module test_ExclusiveColumn use funit - use MAPL_Profiler + use mapl_Profiler_mod use GFTL_UnlimitedVector contains diff --git a/mp_utils/profiler/tests/test_MeterNode.pf b/mp_utils/profiler/tests/test_MeterNode.pf index 28d97564998..1e8d4582977 100644 --- a/mp_utils/profiler/tests/test_MeterNode.pf +++ b/mp_utils/profiler/tests/test_MeterNode.pf @@ -1,7 +1,7 @@ module test_MeterNode use, intrinsic :: iso_fortran_env, only: REAL64 use funit - use MAPL_Profiler + use mapl_Profiler_mod implicit none diff --git a/mp_utils/profiler/tests/test_MeterNodeIterator.pf b/mp_utils/profiler/tests/test_MeterNodeIterator.pf index 77d8253353b..3acaec6c503 100644 --- a/mp_utils/profiler/tests/test_MeterNodeIterator.pf +++ b/mp_utils/profiler/tests/test_MeterNodeIterator.pf @@ -1,6 +1,6 @@ module test_MeterNodeIterator use, intrinsic :: iso_fortran_env, only: REAL64 - use MAPL_Profiler + use mapl_Profiler_mod use funit implicit none diff --git a/mp_utils/profiler/tests/test_NameColumn.pf b/mp_utils/profiler/tests/test_NameColumn.pf index 60f5319557f..a75155d85d0 100644 --- a/mp_utils/profiler/tests/test_NameColumn.pf +++ b/mp_utils/profiler/tests/test_NameColumn.pf @@ -1,6 +1,6 @@ module test_NameColumn use, intrinsic :: iso_fortran_env, only: REAL64 - use MAPL_Profiler + use mapl_Profiler_mod use funit contains diff --git a/mp_utils/profiler/tests/test_PercentageColumn.pf b/mp_utils/profiler/tests/test_PercentageColumn.pf index 39d7368e86e..6d62e1b0db0 100644 --- a/mp_utils/profiler/tests/test_PercentageColumn.pf +++ b/mp_utils/profiler/tests/test_PercentageColumn.pf @@ -1,6 +1,6 @@ module test_PercentageColumn use, intrinsic :: iso_fortran_env, only: REAL64 - use MAPL_Profiler + use mapl_Profiler_mod use funit use GFTL_UnlimitedVector diff --git a/mp_utils/profiler/tests/test_ProfileReporter.pf b/mp_utils/profiler/tests/test_ProfileReporter.pf index 284ee724822..8c0bc58cb6c 100644 --- a/mp_utils/profiler/tests/test_ProfileReporter.pf +++ b/mp_utils/profiler/tests/test_ProfileReporter.pf @@ -1,6 +1,6 @@ module test_ProfileReporter use funit - use MAPL_Profiler + use mapl_Profiler_mod use gFTL2_StringVector use esmf, only: ESMF_HConfig, ESMF_HConfigCreate, ESMF_HConfigDestroy implicit none diff --git a/mp_utils/profiler/tests/test_TimeProfiler.pf b/mp_utils/profiler/tests/test_TimeProfiler.pf index 72d23f06709..50ffacf606c 100644 --- a/mp_utils/profiler/tests/test_TimeProfiler.pf +++ b/mp_utils/profiler/tests/test_TimeProfiler.pf @@ -1,6 +1,6 @@ module test_TimeProfiler use funit - use MAPL_Profiler + use mapl_Profiler_mod implicit none diff --git a/pfio/AbstractCollectiveDataMessage.F90 b/pfio/AbstractCollectiveDataMessage.F90 index 4e0b13facc5..f90d98828c8 100644 --- a/pfio/AbstractCollectiveDataMessage.F90 +++ b/pfio/AbstractCollectiveDataMessage.F90 @@ -2,12 +2,12 @@ #include "unused_dummy.H" module pFIO_AbstractCollectiveDataMessageMod - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod use pFIO_AbstractMessageMod use pFIO_AbstractDataMessageMod use pFIO_UtilitiesMod use pFIO_AbstractDataReferenceMod - use mapl_KeywordEnforcerMod + use mapl_KeywordEnforcer_mod implicit none private diff --git a/pfio/AbstractDataMessage.F90 b/pfio/AbstractDataMessage.F90 index 3ee55f576ef..fed415db49a 100644 --- a/pfio/AbstractDataMessage.F90 +++ b/pfio/AbstractDataMessage.F90 @@ -2,11 +2,11 @@ #include "unused_dummy.H" module pFIO_AbstractDataMessageMod - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod use pFIO_AbstractMessageMod use pFIO_UtilitiesMod use pFIO_AbstractDataReferenceMod - use mapl_KeywordEnforcerMod + use mapl_KeywordEnforcer_mod implicit none private diff --git a/pfio/AbstractDataReference.F90 b/pfio/AbstractDataReference.F90 index 6ec0b0f235e..d1f1e2a72c7 100644 --- a/pfio/AbstractDataReference.F90 +++ b/pfio/AbstractDataReference.F90 @@ -12,7 +12,7 @@ module pFIO_AbstractDataReferenceMod use, intrinsic :: iso_fortran_env, only: REAL64 use pFIO_UtilitiesMod, only: word_size use pFIO_ConstantsMod - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod implicit none private diff --git a/pfio/AbstractDirectoryService.F90 b/pfio/AbstractDirectoryService.F90 index 86088b98c0c..97b0dcb8f53 100644 --- a/pfio/AbstractDirectoryService.F90 +++ b/pfio/AbstractDirectoryService.F90 @@ -1,5 +1,5 @@ module pFIO_AbstractDirectoryServiceMod - use mapl_KeywordEnforcerMod + use mapl_KeywordEnforcer_mod use pFIO_BaseServerMod use pFIO_AbstractSocketMod use pFIO_AbstractSocketVectorMod diff --git a/pfio/AbstractMessage.F90 b/pfio/AbstractMessage.F90 index 7c66a3c286b..ae2f80409be 100644 --- a/pfio/AbstractMessage.F90 +++ b/pfio/AbstractMessage.F90 @@ -2,7 +2,7 @@ #include "unused_dummy.H" module pFIO_AbstractMessageMod - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod implicit none private diff --git a/pfio/AbstractServer.F90 b/pfio/AbstractServer.F90 index 3507bb1e391..9f3c950fcfa 100644 --- a/pfio/AbstractServer.F90 +++ b/pfio/AbstractServer.F90 @@ -2,8 +2,8 @@ #include "unused_dummy.H" module pFIO_AbstractServerMod - use MAPL_Profiler - use MAPL_ExceptionHandling + use mapl_Profiler_mod + use mapl_ExceptionHandling_mod use pFIO_ConstantsMod use pFIO_AbstractDataReferenceMod use pFIO_AbstractDataReferenceVectorMod diff --git a/pfio/AddReadDataCollectionMessage.F90 b/pfio/AddReadDataCollectionMessage.F90 index 639fecb044f..cff06dc06c3 100644 --- a/pfio/AddReadDataCollectionMessage.F90 +++ b/pfio/AddReadDataCollectionMessage.F90 @@ -3,7 +3,7 @@ module pFIO_AddReadDataCollectionMessageMod - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod use pFIO_UtilitiesMod use pFIO_AbstractMessageMod implicit none diff --git a/pfio/AddWriteDataCollectionMessage.F90 b/pfio/AddWriteDataCollectionMessage.F90 index 69d8812bdf0..d0e3f22c19e 100644 --- a/pfio/AddWriteDataCollectionMessage.F90 +++ b/pfio/AddWriteDataCollectionMessage.F90 @@ -3,7 +3,7 @@ module pFIO_AddWriteDataCollectionMessageMod - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod use pFIO_UtilitiesMod use pFIO_AbstractMessageMod use pFIO_FileMetadataMod diff --git a/pfio/ArrayReference.F90 b/pfio/ArrayReference.F90 index eb5ca2f9879..962e753581e 100644 --- a/pfio/ArrayReference.F90 +++ b/pfio/ArrayReference.F90 @@ -8,7 +8,7 @@ module pFIO_ArrayReferenceMod use, intrinsic :: iso_fortran_env, only: INT64 use, intrinsic :: iso_fortran_env, only: REAL32 use, intrinsic :: iso_fortran_env, only: REAL64 - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod use pFIO_ConstantsMod use pFIO_AbstractDataReferenceMod diff --git a/pfio/Attribute.F90 b/pfio/Attribute.F90 index 67b10790733..001f7f6ce32 100644 --- a/pfio/Attribute.F90 +++ b/pfio/Attribute.F90 @@ -6,7 +6,7 @@ module pFIO_AttributeMod ! limit the dimesion to 0 or 1 ! use pFIO_UnlimitedEntityMod - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod implicit none private @@ -111,7 +111,7 @@ module pFIO_StringAttributeMapUtilMod use pFIO_UtilitiesMod use pFIO_AttributeMod use pFIO_StringAttributeMapMod - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod implicit none private diff --git a/pfio/BaseServer.F90 b/pfio/BaseServer.F90 index 479ffb8ce31..e0a4a8b2635 100644 --- a/pfio/BaseServer.F90 +++ b/pfio/BaseServer.F90 @@ -6,7 +6,7 @@ module pFIO_BaseServerMod use, intrinsic :: iso_c_binding, only: c_loc use, intrinsic :: iso_fortran_env, only: INT64 use, intrinsic :: iso_c_binding, only: c_f_pointer - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod use pFIO_UtilitiesMod, only: word_size, i_to_string use pFIO_ConstantsMod use pFIO_ServerThreadMod diff --git a/pfio/BaseThread.F90 b/pfio/BaseThread.F90 index 32a87029221..6b2ee9a3c4a 100644 --- a/pfio/BaseThread.F90 +++ b/pfio/BaseThread.F90 @@ -2,7 +2,7 @@ #include "unused_dummy.H" module pFIO_BaseThreadMod - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod use pFIO_AbstractSocketMod use pFIO_AbstractRequestHandleMod use pFIO_IntegerRequestMapMod diff --git a/pfio/ClientManager.F90 b/pfio/ClientManager.F90 index 9d9f67ee6f8..1f066ca7eae 100644 --- a/pfio/ClientManager.F90 +++ b/pfio/ClientManager.F90 @@ -3,9 +3,9 @@ module pFIO_ClientManagerMod - use MAPL_ExceptionHandling - use MAPL_SortMod - use mapl_KeywordEnforcerMod + use mapl_ExceptionHandling_mod + use mapl_Sort_mod + use mapl_KeywordEnforcer_mod use pFIO_AbstractDataReferenceMod use pFIO_FileMetadataMod use pFIO_ClientThreadMod diff --git a/pfio/ClientThread.F90 b/pfio/ClientThread.F90 index 018fbcd572e..125a6d8f4cf 100644 --- a/pfio/ClientThread.F90 +++ b/pfio/ClientThread.F90 @@ -3,7 +3,7 @@ module pFIO_ClientThreadMod - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod use pFIO_AbstractMessageMod use pFIO_AbstractSocketMod use pFIO_AbstractRequestHandleMod @@ -11,7 +11,7 @@ module pFIO_ClientThreadMod use pFIO_MessageVisitorMod use pFIO_BaseThreadMod use pFIO_AbstractDataReferenceMod - use mapl_KeywordEnforcerMod + use mapl_KeywordEnforcer_mod use pFIO_SimpleSocketMod use pFIO_FileMetadataMod diff --git a/pfio/CollectivePrefetchDataMessage.F90 b/pfio/CollectivePrefetchDataMessage.F90 index 99ed89fbb7b..27cf0425a60 100644 --- a/pfio/CollectivePrefetchDataMessage.F90 +++ b/pfio/CollectivePrefetchDataMessage.F90 @@ -3,7 +3,7 @@ module pFIO_CollectivePrefetchDataMessageMod use pFIO_AbstractCollectiveDataMessageMod use pFIO_UtilitiesMod use pFIO_AbstractDataReferenceMod - use mapl_KeywordEnforcerMod + use mapl_KeywordEnforcer_mod implicit none private diff --git a/pfio/CollectivePrefetchDoneMessage.F90 b/pfio/CollectivePrefetchDoneMessage.F90 index 4098a4442b7..98225b3b78a 100644 --- a/pfio/CollectivePrefetchDoneMessage.F90 +++ b/pfio/CollectivePrefetchDoneMessage.F90 @@ -2,7 +2,7 @@ #include "unused_dummy.H" module pFIO_CollectivePrefetchDoneMessageMod - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod use pFIO_AbstractMessageMod use, intrinsic :: iso_fortran_env, only: INT32 implicit none diff --git a/pfio/CollectiveStageDataMessage.F90 b/pfio/CollectiveStageDataMessage.F90 index 7607e136ca4..06142ea803c 100644 --- a/pfio/CollectiveStageDataMessage.F90 +++ b/pfio/CollectiveStageDataMessage.F90 @@ -3,7 +3,7 @@ module pFIO_CollectiveStageDataMessageMod use pFIO_AbstractCollectiveDataMessageMod use pFIO_UtilitiesMod use pFIO_AbstractDataReferenceMod - use mapl_KeywordEnforcerMod + use mapl_KeywordEnforcer_mod implicit none private diff --git a/pfio/CollectiveStageDoneMessage.F90 b/pfio/CollectiveStageDoneMessage.F90 index 76f09e0fbd8..cad1a76186c 100644 --- a/pfio/CollectiveStageDoneMessage.F90 +++ b/pfio/CollectiveStageDoneMessage.F90 @@ -2,7 +2,7 @@ #include "unused_dummy.H" module pFIO_CollectiveStageDoneMessageMod - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod use pFIO_AbstractMessageMod use, intrinsic :: iso_fortran_env, only: INT32 implicit none diff --git a/pfio/CoordinateVariable.F90 b/pfio/CoordinateVariable.F90 index 9ae8cade769..15c4e5dbeae 100644 --- a/pfio/CoordinateVariable.F90 +++ b/pfio/CoordinateVariable.F90 @@ -26,10 +26,10 @@ module pFIO_CoordinateVariableMod use, intrinsic :: iso_fortran_env, only: REAL32 use, intrinsic :: iso_fortran_env, only: REAL64 use pFIO_ConstantsMod - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod use pFIO_UtilitiesMod use pFIO_VariableMod - use mapl_KeywordEnforcerMod + use mapl_KeywordEnforcer_mod implicit none private diff --git a/pfio/DirectoryService.F90 b/pfio/DirectoryService.F90 index 20c8db0f203..da02371a5ef 100644 --- a/pfio/DirectoryService.F90 +++ b/pfio/DirectoryService.F90 @@ -14,8 +14,8 @@ module pFIO_DirectoryServiceMod use, intrinsic :: iso_c_binding, only: c_f_pointer, c_ptr, c_sizeof - use MAPL_ExceptionHandling - use mapl_KeywordEnforcerMod + use mapl_ExceptionHandling_mod + use mapl_KeywordEnforcer_mod use pFIO_AbstractServerMod use pFIO_ServerThreadMod use pFIO_BaseServerMod diff --git a/pfio/DoneMessage.F90 b/pfio/DoneMessage.F90 index 63606f4c06f..0e553244841 100644 --- a/pfio/DoneMessage.F90 +++ b/pfio/DoneMessage.F90 @@ -2,7 +2,7 @@ #include "unused_dummy.H" module pFIO_DoneMessageMod - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod use pFIO_AbstractMessageMod use, intrinsic :: iso_fortran_env, only: INT32 implicit none diff --git a/pfio/DummyMessage.F90 b/pfio/DummyMessage.F90 index 40fe1eec020..3e8dc637f6c 100644 --- a/pfio/DummyMessage.F90 +++ b/pfio/DummyMessage.F90 @@ -2,7 +2,7 @@ #include "unused_dummy.H" module pFIO_DummyMessageMod - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod use pFIO_AbstractMessageMod use, intrinsic :: iso_fortran_env, only: INT32 implicit none diff --git a/pfio/ExtDataCollection.F90 b/pfio/ExtDataCollection.F90 index 29552439476..8110dc0ff19 100644 --- a/pfio/ExtDataCollection.F90 +++ b/pfio/ExtDataCollection.F90 @@ -5,7 +5,7 @@ module pFIO_ExtDataCollectionMod use pFIO_NetCDF4_FileFormatterMod use pFIO_FormatterPtrVectorMod use pFIO_ConstantsMod - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod implicit none private diff --git a/pfio/FastClientThread.F90 b/pfio/FastClientThread.F90 index cdabbe83984..8dbd9b51022 100644 --- a/pfio/FastClientThread.F90 +++ b/pfio/FastClientThread.F90 @@ -2,12 +2,12 @@ #include "unused_dummy.H" module pFIO_FastClientThreadMod - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod use pFIO_AbstractMessageMod use pFIO_AbstractSocketMod use pFIO_AbstractDataReferenceMod use pFIO_LocalMemReferenceMod - use mapl_KeywordEnforcerMod + use mapl_KeywordEnforcer_mod use pFIO_ClientThreadMod use pFIO_StageDataMessageMod use pFIO_CollectiveStageDataMessageMod diff --git a/pfio/FileMetadata.F90 b/pfio/FileMetadata.F90 index d5ac70fa73d..64600d6f33d 100644 --- a/pfio/FileMetadata.F90 +++ b/pfio/FileMetadata.F90 @@ -3,12 +3,12 @@ module pFIO_FileMetadataMod - use mapl_KeywordEnforcerMod + use mapl_KeywordEnforcer_mod use gFTL2_StringIntegerMap use pFIO_StringIntegerMapUtilMod use pFIO_ConstantsMod use pFIO_UtilitiesMod - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod use pFIO_UnlimitedEntityMod use pFIO_AttributeMod use pFIO_VariableMod diff --git a/pfio/ForwardDataAndMessage.F90 b/pfio/ForwardDataAndMessage.F90 index 4edfcc44eb2..3bae0d41b44 100644 --- a/pfio/ForwardDataAndMessage.F90 +++ b/pfio/ForwardDataAndMessage.F90 @@ -2,11 +2,11 @@ #include "unused_dummy.H" module pFIO_ForwardDataAndMessageMod - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod use pFIO_AbstractMessageMod use pFIO_UtilitiesMod use pFIO_AbstractDataReferenceMod - use mapl_KeywordEnforcerMod + use mapl_KeywordEnforcer_mod use pFIO_AbstractDataMessageMod use pFIO_FileMetaDataMod use pFIO_MessageVectorMod diff --git a/pfio/ForwardDataMessage.F90 b/pfio/ForwardDataMessage.F90 index 5a1a0196977..6a43b781392 100644 --- a/pfio/ForwardDataMessage.F90 +++ b/pfio/ForwardDataMessage.F90 @@ -3,11 +3,11 @@ module pFIO_ForwardDataMessageMod use mpi - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod use pFIO_AbstractMessageMod use pFIO_UtilitiesMod use pFIO_AbstractDataReferenceMod - use mapl_KeywordEnforcerMod + use mapl_KeywordEnforcer_mod use pFIO_AbstractDataMessageMod implicit none private diff --git a/pfio/HandShakeMessage.F90 b/pfio/HandShakeMessage.F90 index 7f6cca084ab..504462d2f9d 100644 --- a/pfio/HandShakeMessage.F90 +++ b/pfio/HandShakeMessage.F90 @@ -2,7 +2,7 @@ #include "unused_dummy.H" module pFIO_HandShakeMessageMod - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod use pFIO_AbstractMessageMod use, intrinsic :: iso_fortran_env, only: INT32 implicit none diff --git a/pfio/HistoryCollection.F90 b/pfio/HistoryCollection.F90 index 87379455856..688a210b250 100644 --- a/pfio/HistoryCollection.F90 +++ b/pfio/HistoryCollection.F90 @@ -2,7 +2,7 @@ #include "unused_dummy.H" module pFIO_HistoryCollectionMod - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod use gFTL_StringIntegerMap use pFIO_NetCDF4_FileFormatterMod use pFIO_StringNetCDF4_FileFormatterMapMod diff --git a/pfio/IDMessage.F90 b/pfio/IDMessage.F90 index 47e5e34ff7f..6af9392ccf9 100644 --- a/pfio/IDMessage.F90 +++ b/pfio/IDMessage.F90 @@ -2,7 +2,7 @@ #include "unused_dummy.H" module pFIO_IDMessageMod - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod use pFIO_AbstractMessageMod use, intrinsic :: iso_fortran_env, only: INT32 implicit none diff --git a/pfio/IntArray.F90 b/pfio/IntArray.F90 index 7e3b76337e3..a8541fd9197 100644 --- a/pfio/IntArray.F90 +++ b/pfio/IntArray.F90 @@ -17,7 +17,7 @@ module pFIO_IntArrayMod use pFIO_ConstantsMod use pFIO_UtilitiesMod - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod use, intrinsic :: iso_fortran_env, only: INT32, INT64 use, intrinsic :: iso_fortran_env, only: REAL32, REAL64 diff --git a/pfio/LocalMemReference.F90 b/pfio/LocalMemReference.F90 index bae5ebfb3b0..03e47e5b1a0 100644 --- a/pfio/LocalMemReference.F90 +++ b/pfio/LocalMemReference.F90 @@ -9,7 +9,7 @@ module pFIO_LocalMemReferenceMod use, intrinsic :: iso_fortran_env, only: INT64 use, intrinsic :: iso_fortran_env, only: REAL32 use, intrinsic :: iso_fortran_env, only: REAL64 - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod use pFIO_UtilitiesMod, only: word_size use pFIO_ConstantsMod use pFIO_AbstractDataReferenceMod diff --git a/pfio/MessageVector.F90 b/pfio/MessageVector.F90 index 57885dd8d92..04dfcac271f 100644 --- a/pfio/MessageVector.F90 +++ b/pfio/MessageVector.F90 @@ -14,7 +14,7 @@ module pFIO_MessageVectorMod end module pFIO_MessageVectorMod module pFIO_MessageVectorUtilMod - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod use pFIO_AbstractMessageMod use pFIO_MessageVectorMod use pFIO_ProtocolParserMod diff --git a/pfio/MessageVisitor.F90 b/pfio/MessageVisitor.F90 index c7512e390fb..648a7d82f54 100644 --- a/pfio/MessageVisitor.F90 +++ b/pfio/MessageVisitor.F90 @@ -3,7 +3,7 @@ module pFIO_MessageVisitorMod - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod use pFIO_AbstractMessageMod use pFIO_DoneMessageMod use pFIO_PrefetchDoneMessageMod diff --git a/pfio/ModifyMetadataMessage.F90 b/pfio/ModifyMetadataMessage.F90 index b2f1f5a1af3..286241faafb 100644 --- a/pfio/ModifyMetadataMessage.F90 +++ b/pfio/ModifyMetadataMessage.F90 @@ -2,12 +2,12 @@ #include "unused_dummy.H" module pFIO_ModifyMetadataMessageMod - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod use pFIO_UtilitiesMod use pFIO_AbstractMessageMod use pFIO_StringVariableMapMod use pFIO_StringVariableMapUtilMod - use mapl_KeywordEnforcerMod + use mapl_KeywordEnforcer_mod implicit none private diff --git a/pfio/MpiMutex.F90 b/pfio/MpiMutex.F90 index 91453b4ac2e..ede0fcc6565 100644 --- a/pfio/MpiMutex.F90 +++ b/pfio/MpiMutex.F90 @@ -6,7 +6,7 @@ module pFIO_MpiMutexMod use mpi - use MAPL_ErrorHandlingMod + use mapl_ErrorHandling_mod use iso_c_binding, only: c_ptr, c_f_pointer implicit none diff --git a/pfio/MpiServer.F90 b/pfio/MpiServer.F90 index 2383b77feb1..6a1a00bc11f 100644 --- a/pfio/MpiServer.F90 +++ b/pfio/MpiServer.F90 @@ -1,8 +1,8 @@ #include "MAPL_ErrLog.h" module pFIO_MpiServerMod - use MAPL_ExceptionHandling - use MAPL_Profiler + use mapl_ExceptionHandling_mod + use mapl_Profiler_mod use pFIO_AbstractDirectoryServiceMod use pFIO_ServerThreadMod use pFIO_ServerThreadVectorMod diff --git a/pfio/MpiSocket.F90 b/pfio/MpiSocket.F90 index f5688190b6a..a50c0e52291 100644 --- a/pfio/MpiSocket.F90 +++ b/pfio/MpiSocket.F90 @@ -4,7 +4,7 @@ module pFIO_MpiSocketMod use iso_c_binding use, intrinsic :: iso_fortran_env, only: INT64 - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod use pFIO_AbstractSocketMod use pFIO_AbstractRequestHandleMod use pFIO_AbstractMessageMod diff --git a/pfio/MultiCommServer.F90 b/pfio/MultiCommServer.F90 index 696b71288d1..982e6e90c29 100644 --- a/pfio/MultiCommServer.F90 +++ b/pfio/MultiCommServer.F90 @@ -6,8 +6,8 @@ module pFIO_MultiCommServerMod use, intrinsic :: iso_c_binding, only: c_loc use, intrinsic :: iso_fortran_env, only: INT64 use, intrinsic :: iso_c_binding, only: c_f_pointer - use mapl_KeywordEnforcerMod - use MAPL_ErrorHandlingMod + use mapl_KeywordEnforcer_mod + use mapl_ErrorHandling_mod use pFIO_ConstantsMod use pFIO_CollectiveStageDataMessageMod use pFIO_UtilitiesMod @@ -35,8 +35,8 @@ module pFIO_MultiCommServerMod use pFIO_AttributeMod use pFIO_StringAttributeMapMod use pFIO_StringAttributeMapUtilMod - use MAPL_SplitCommunicatorMod - use MAPL_SimpleCommSplitterMod + use mapl_SplitCommunicator_mod + use mapl_SimpleCommSplitter_mod use pFIO_MpiSocketMod use mpi diff --git a/pfio/MultiGroupServer.F90 b/pfio/MultiGroupServer.F90 index 8808d80b061..87a6111c9ef 100644 --- a/pfio/MultiGroupServer.F90 +++ b/pfio/MultiGroupServer.F90 @@ -6,9 +6,9 @@ module pFIO_MultiGroupServerMod use, intrinsic :: iso_c_binding, only: c_loc use, intrinsic :: iso_fortran_env, only: REAL64, INT32, INT64 use, intrinsic :: iso_c_binding, only: c_f_pointer - use mapl_KeywordEnforcerMod - use MAPL_Profiler - use MAPL_ErrorHandlingMod + use mapl_KeywordEnforcer_mod + use mapl_Profiler_mod + use mapl_ErrorHandling_mod use pFIO_ConstantsMod use pFIO_CollectiveStageDataMessageMod use pFIO_UtilitiesMod @@ -37,8 +37,8 @@ module pFIO_MultiGroupServerMod use pFIO_BaseServerMod use pFIO_IntArrayMod use pFIO_StringIntArrayMapMod - use MAPL_SplitCommunicatorMod - use MAPL_SimpleCommSplitterMod + use mapl_SplitCommunicator_mod + use mapl_SimpleCommSplitter_mod use pFIO_MpiSocketMod use gFTL_IntegerVector use pFIO_AbstractRequestHandleMod diff --git a/pfio/MultiLayerServer.F90 b/pfio/MultiLayerServer.F90 index e61d1fe27ba..aac625bbc23 100644 --- a/pfio/MultiLayerServer.F90 +++ b/pfio/MultiLayerServer.F90 @@ -3,8 +3,8 @@ module pFIO_MultiLayerServerMod use, intrinsic :: iso_c_binding, only: c_f_pointer - use mapl_KeywordEnforcerMod - use MAPL_ErrorHandlingMod + use mapl_KeywordEnforcer_mod + use mapl_ErrorHandling_mod use pFIO_ConstantsMod use pFIO_CollectiveStageDataMessageMod use pFIO_UtilitiesMod diff --git a/pfio/NetCDF4_FileFormatter.F90 b/pfio/NetCDF4_FileFormatter.F90 index 8a7164c7ed3..7fe88fb9ab1 100644 --- a/pfio/NetCDF4_FileFormatter.F90 +++ b/pfio/NetCDF4_FileFormatter.F90 @@ -5,14 +5,14 @@ module pFIO_NetCDF4_FileFormatterMod use, intrinsic :: iso_fortran_env, only: INT16, INT32, INT64 use, intrinsic :: iso_fortran_env, only: REAL32, REAL64 use, intrinsic :: iso_fortran_env, only: error_unit - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod use pFIO_ConstantsMod use pFIO_UnlimitedEntityMod use pFIO_AttributeMod use pFIO_VariableMod use pFIO_CoordinateVariableMod use pFIO_FileMetadataMod - use mapl_KeywordEnforcerMod + use mapl_KeywordEnforcer_mod use gFTL2_StringVector use gFTL2_StringIntegerMap use pFIO_StringVariableMapMod diff --git a/pfio/PrefetchDataMessage.F90 b/pfio/PrefetchDataMessage.F90 index f73929f9298..128ff5185d1 100644 --- a/pfio/PrefetchDataMessage.F90 +++ b/pfio/PrefetchDataMessage.F90 @@ -2,7 +2,7 @@ module pFIO_PrefetchDataMessageMod use pFIO_AbstractMessageMod use pFIO_UtilitiesMod use pFIO_AbstractDataReferenceMod - use mapl_KeywordEnforcerMod + use mapl_KeywordEnforcer_mod use pFIO_AbstractDataMessageMod implicit none private diff --git a/pfio/PrefetchDoneMessage.F90 b/pfio/PrefetchDoneMessage.F90 index 7e47d7ab486..f0b4e9fb0ce 100644 --- a/pfio/PrefetchDoneMessage.F90 +++ b/pfio/PrefetchDoneMessage.F90 @@ -2,7 +2,7 @@ #include "unused_dummy.H" module pFIO_PrefetchDoneMessageMod - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod use pFIO_AbstractMessageMod use, intrinsic :: iso_fortran_env, only: INT32 implicit none diff --git a/pfio/RDMAReference.F90 b/pfio/RDMAReference.F90 index ce3c07b5954..b9b6f78bd4c 100644 --- a/pfio/RDMAReference.F90 +++ b/pfio/RDMAReference.F90 @@ -4,7 +4,7 @@ module pFIO_RDMAReferenceMod use, intrinsic :: iso_c_binding, only: c_sizeof use, intrinsic :: iso_fortran_env, only: INT64 - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod use pFIO_UtilitiesMod use pFIO_AbstractDataReferenceMod use mpi diff --git a/pfio/ReplaceMetadataMessage.F90 b/pfio/ReplaceMetadataMessage.F90 index 4c6f4e07c86..239148a2655 100644 --- a/pfio/ReplaceMetadataMessage.F90 +++ b/pfio/ReplaceMetadataMessage.F90 @@ -2,13 +2,13 @@ #include "unused_dummy.H" module pFIO_ReplaceMetadataMessageMod - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod use pFIO_UtilitiesMod use pFIO_FileMetadataMod use pFIO_AbstractMessageMod use pFIO_StringVariableMapMod use pFIO_StringVariableMapUtilMod - use mapl_KeywordEnforcerMod + use mapl_KeywordEnforcer_mod implicit none private diff --git a/pfio/ServerThread.F90 b/pfio/ServerThread.F90 index fde386c0c20..274253099b1 100644 --- a/pfio/ServerThread.F90 +++ b/pfio/ServerThread.F90 @@ -7,8 +7,8 @@ module pFIO_ServerThreadMod use, intrinsic :: iso_c_binding, only: c_loc use, intrinsic :: iso_fortran_env, only: REAL32, REAL64, INT32, INT64 use, intrinsic :: iso_c_binding, only: c_f_pointer - use MAPL_ExceptionHandling - use MAPL_Profiler + use mapl_ExceptionHandling_mod + use mapl_Profiler_mod use pFIO_UtilitiesMod, only: word_size, i_to_string use pFIO_AbstractSocketMod use pFIO_AbstractMessageMod diff --git a/pfio/ShmemReference.F90 b/pfio/ShmemReference.F90 index 3c2683bf4b9..ed3f20ffab1 100644 --- a/pfio/ShmemReference.F90 +++ b/pfio/ShmemReference.F90 @@ -3,7 +3,7 @@ module pFIO_ShmemReferenceMod use, intrinsic :: iso_fortran_env, only: INT64 - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod use pFIO_UtilitiesMod use pFIO_AbstractDataReferenceMod use mpi diff --git a/pfio/SimpleSocket.F90 b/pfio/SimpleSocket.F90 index 43795e6f479..5dd20f178d9 100644 --- a/pfio/SimpleSocket.F90 +++ b/pfio/SimpleSocket.F90 @@ -7,7 +7,7 @@ ! checking completion. module pFIO_SimpleSocketMod - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod use pFIO_AbstractSocketMod use pFIO_AbstractMessageMod use pFIO_DummyMessageMod diff --git a/pfio/StageDataMessage.F90 b/pfio/StageDataMessage.F90 index 19701070ebd..b6f9dac71ca 100644 --- a/pfio/StageDataMessage.F90 +++ b/pfio/StageDataMessage.F90 @@ -2,7 +2,7 @@ module pFIO_StageDataMessageMod use pFIO_AbstractMessageMod use pFIO_UtilitiesMod use pFIO_AbstractDataReferenceMod - use mapl_KeywordEnforcerMod + use mapl_KeywordEnforcer_mod use pFIO_AbstractDataMessageMod implicit none private diff --git a/pfio/StageDoneMessage.F90 b/pfio/StageDoneMessage.F90 index 00074975909..fd96f3e6edf 100644 --- a/pfio/StageDoneMessage.F90 +++ b/pfio/StageDoneMessage.F90 @@ -2,7 +2,7 @@ #include "unused_dummy.H" module pFIO_StageDoneMessageMod - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod use pFIO_AbstractMessageMod use, intrinsic :: iso_fortran_env, only: INT32 implicit none diff --git a/pfio/StringIntegerMapUtil.F90 b/pfio/StringIntegerMapUtil.F90 index 69257f02061..7ce9b324e7a 100644 --- a/pfio/StringIntegerMapUtil.F90 +++ b/pfio/StringIntegerMapUtil.F90 @@ -4,7 +4,7 @@ module pFIO_StringIntegerMapUtilMod use pFIO_UtilitiesMod use gFTL2_StringIntegerMap - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod implicit none private public :: StringIntegerMap_serialize diff --git a/pfio/StringVariableMap.F90 b/pfio/StringVariableMap.F90 index dd6f7f44256..9ec2f73f291 100644 --- a/pfio/StringVariableMap.F90 +++ b/pfio/StringVariableMap.F90 @@ -25,7 +25,7 @@ module pFIO_StringVariableMapMod end module pFIO_StringVariableMapMod module pFIO_StringVariableMapUtilMod - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod use pFIO_UtilitiesMod use pFIO_VariableMod use pFIO_CoordinateVariableMod diff --git a/pfio/StringVectorUtil.F90 b/pfio/StringVectorUtil.F90 index a9fe0471137..19ec34d966c 100644 --- a/pfio/StringVectorUtil.F90 +++ b/pfio/StringVectorUtil.F90 @@ -5,7 +5,7 @@ module pFIO_StringVectorUtilMod use pFIO_UtilitiesMod use pFIO_AttributeMod use gFTL2_StringVector - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod implicit none private public :: StringVector_serialize diff --git a/pfio/TerminateMessage.F90 b/pfio/TerminateMessage.F90 index d3c8fc71abb..e94db12c811 100644 --- a/pfio/TerminateMessage.F90 +++ b/pfio/TerminateMessage.F90 @@ -2,7 +2,7 @@ #include "unused_dummy.H" module pFIO_TerminateMessageMod - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod use pFIO_AbstractMessageMod use, intrinsic :: iso_fortran_env, only: INT32 implicit none diff --git a/pfio/UnlimitedEntity.F90 b/pfio/UnlimitedEntity.F90 index 30ef55e404e..fe52b9f5dfd 100644 --- a/pfio/UnlimitedEntity.F90 +++ b/pfio/UnlimitedEntity.F90 @@ -26,7 +26,7 @@ module pFIO_UnlimitedEntityMod use pFIO_ConstantsMod use pFIO_UtilitiesMod - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod use, intrinsic :: iso_fortran_env, only: INT32, INT64 use, intrinsic :: iso_fortran_env, only: REAL32, REAL64 @@ -726,7 +726,7 @@ module pFIO_StringUnlimitedEntityMapUtilMod use pFIO_UtilitiesMod use pFIO_UnlimitedEntityMod use pFIO_StringUnlimitedEntityMapMod - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod implicit none private diff --git a/pfio/Variable.F90 b/pfio/Variable.F90 index 8f52a7e8218..87ff11ac6b5 100644 --- a/pfio/Variable.F90 +++ b/pfio/Variable.F90 @@ -4,10 +4,10 @@ module pFIO_VariableMod use pFIO_UtilitiesMod - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod use gFTL2_StringVector use pFIO_StringVectorUtilMod - use mapl_KeywordEnforcerMod + use mapl_KeywordEnforcer_mod use pFIO_ConstantsMod use pFIO_UnlimitedEntityMod use pFIO_AttributeMod diff --git a/pfio/pFIO_Utilities.F90 b/pfio/pFIO_Utilities.F90 index fdc59be1b19..9b84d4ea529 100644 --- a/pfio/pFIO_Utilities.F90 +++ b/pfio/pFIO_Utilities.F90 @@ -5,7 +5,7 @@ module pFIO_UtilitiesMod use, intrinsic :: iso_c_binding, only: c_sizeof use, intrinsic :: iso_fortran_env, only: INT32,REAL32,INT64,REAL64 use pFIO_ConstantsMod - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod implicit none private diff --git a/pfio/pfio_base.F90 b/pfio/pfio_base.F90 index 19bb1ac45c2..355218c4438 100644 --- a/pfio/pfio_base.F90 +++ b/pfio/pfio_base.F90 @@ -1,7 +1,7 @@ #undef I_AM_MAIN #include "MAPL_ErrLog.h" module pfio_base - use MAPL_ErrorHandlingMod + use mapl_ErrorHandling_mod integer, save :: debug_unit = 0 contains diff --git a/pfio/programs/pfio_collective_demo.F90 b/pfio/programs/pfio_collective_demo.F90 index 1243970b6d3..9341f940250 100644 --- a/pfio/programs/pfio_collective_demo.F90 +++ b/pfio/programs/pfio_collective_demo.F90 @@ -5,7 +5,7 @@ #include "unused_dummy.H" module collective_demo_CLI - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod use gFTL2_StringVector implicit none private @@ -118,7 +118,7 @@ end module collective_demo_CLI #include "MAPL_ErrLog.h" module FakeExtDataMod_collective use, intrinsic :: iso_fortran_env, only: INT64 - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod use collective_demo_CLI use pFIO use gFTL2_StringVector @@ -302,7 +302,7 @@ end module FakeExtDataMod_collective program main use mpi use pFIO - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod use collective_demo_CLI use FakeExtDataMod_collective implicit none diff --git a/pfio/programs/pfio_open_close.F90 b/pfio/programs/pfio_open_close.F90 index d1116b9600f..3e7fb4de53a 100644 --- a/pfio/programs/pfio_open_close.F90 +++ b/pfio/programs/pfio_open_close.F90 @@ -3,7 +3,7 @@ #include "unused_dummy.H" program main - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod use pFIO implicit none diff --git a/pfio/programs/pfio_server_demo.F90 b/pfio/programs/pfio_server_demo.F90 index 69a37849fc9..373c16d0d3a 100644 --- a/pfio/programs/pfio_server_demo.F90 +++ b/pfio/programs/pfio_server_demo.F90 @@ -8,7 +8,7 @@ ! The variable should be 4d with lavel>=20 ! module server_demo_CLI - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod use gFTL2_StringVector implicit none private @@ -120,7 +120,7 @@ end module server_demo_CLI !#undef I_AM_MAIN #include "MAPL_ErrLog.h" module FakeExtDataMod_server - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod use server_demo_CLI use pFIO use gFTL2_StringVector @@ -274,7 +274,7 @@ program main use pFIO use server_demo_CLI use FakeExtDataMod_server - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod implicit none integer :: rank, npes, ierror, provided diff --git a/pfio/programs/pfio_writer.F90 b/pfio/programs/pfio_writer.F90 index d45550e4f58..5b7aec1892c 100644 --- a/pfio/programs/pfio_writer.F90 +++ b/pfio/programs/pfio_writer.F90 @@ -17,7 +17,7 @@ program main use pFIO_StringAttributeMapUtilMod use pFIO_NetCDF4_FileFormatterMod use pFIO_StringNetCDF4_FileFormatterMapMod - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod use pFIO_UtilitiesMod use mpi diff --git a/pfio/tests/CMakeLists.txt b/pfio/tests/CMakeLists.txt index 50e86f6af60..d1d0a30cba4 100644 --- a/pfio/tests/CMakeLists.txt +++ b/pfio/tests/CMakeLists.txt @@ -41,7 +41,7 @@ add_pfunit_ctest(MAPL.pfio.tests OTHER_SOURCES ${SRCS} LINK_LIBRARIES MAPL.pfio MAPL.pfunit EXTRA_INITIALIZE Initialize - EXTRA_USE MAPL_pFUnit_Initialize + EXTRA_USE mapl_pFUnit_Initialize_mod MAX_PES 8 ) set_target_properties(MAPL.pfio.tests PROPERTIES Fortran_MODULE_DIRECTORY ${MODULE_DIRECTORY}) diff --git a/pfio/tests/MockClientThread.F90 b/pfio/tests/MockClientThread.F90 index 1b32ed0e2ed..68150dae204 100644 --- a/pfio/tests/MockClientThread.F90 +++ b/pfio/tests/MockClientThread.F90 @@ -3,7 +3,7 @@ module pFIO_MockClientThreadMod - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod use pFIO_AbstractMessageMod use pFIO_AbstractSocketMod use pFIO_AbstractRequestHandleMod @@ -11,7 +11,7 @@ module pFIO_MockClientThreadMod use pFIO_MessageVisitorMod use pFIO_BaseThreadMod use pFIO_AbstractDataReferenceMod - use mapl_KeywordEnforcerMod + use mapl_KeywordEnforcer_mod use pFIO_SimpleSocketMod use pFIO_FileMetadataMod diff --git a/pfio/tests/MockServerThread.F90 b/pfio/tests/MockServerThread.F90 index a9c04d62575..1a7f71ab1b7 100644 --- a/pfio/tests/MockServerThread.F90 +++ b/pfio/tests/MockServerThread.F90 @@ -2,7 +2,7 @@ #include "unused_dummy.H" module MockServerThreadMod - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod use pFIO_ServerThreadMod use pFIO_AbstractMessageMod use pFIO_MessageVisitorMod diff --git a/pfio/tests/MockSocket.F90 b/pfio/tests/MockSocket.F90 index b8e5b5fc432..35f34800023 100644 --- a/pfio/tests/MockSocket.F90 +++ b/pfio/tests/MockSocket.F90 @@ -4,7 +4,7 @@ module MockSocketMod use, intrinsic :: iso_fortran_env, only: REAL32 use, intrinsic :: iso_c_binding, only: c_f_pointer - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod use pFIO_AbstractMessageMod use pFIO_AbstractRequestHandleMod use pFIO_MessageVectorMod diff --git a/pfio/tests/pfio_ctest_io.F90 b/pfio/tests/pfio_ctest_io.F90 index 358f9b17b27..1bc3e39e67f 100644 --- a/pfio/tests/pfio_ctest_io.F90 +++ b/pfio/tests/pfio_ctest_io.F90 @@ -5,7 +5,7 @@ #include "unused_dummy.H" module ctest_io_CLI - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod use pFIO use gFTL2_StringVector use gFTL2_StringIntegerMap @@ -144,7 +144,7 @@ end subroutine process_command_line end module ctest_io_CLI module FakeHistData0Mod - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod use ctest_io_CLI use pFIO use gFTL2_StringVector @@ -449,7 +449,7 @@ program main use mpi use pFIO use ctest_io_CLI - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod use FakeHistData0Mod use pFlogger, only: pflogger_init => initialize implicit none diff --git a/pfio/tests/pfio_read_write_string_example.F90 b/pfio/tests/pfio_read_write_string_example.F90 index 7891e06c134..3ae8fc692d0 100644 --- a/pfio/tests/pfio_read_write_string_example.F90 +++ b/pfio/tests/pfio_read_write_string_example.F90 @@ -1,5 +1,5 @@ program main - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod use pFIO use gFTL2_StringVector use gFTL_StringIntegerMap diff --git a/pfunit/MAPL_Initialize.F90 b/pfunit/MAPL_Initialize.F90 index b52950eacf5..01acb07f62c 100644 --- a/pfunit/MAPL_Initialize.F90 +++ b/pfunit/MAPL_Initialize.F90 @@ -1,12 +1,12 @@ #include "MAPL.h" -module MAPL_pFUnit_Initialize +module mapl_pFUnit_Initialize_mod implicit none(type,external) contains subroutine Initialize() use MAPL use fArgParse - use MAPL_ThrowMod, only: MAPL_set_throw_method + use mapl_Throw_mod, only: MAPL_set_throw_method use MAPL_pFUnit_ThrowMod use pflogger, only: pfl_initialize => initialize, WARNING, DEBUG use gFTL2_StringUnlimitedMap @@ -42,4 +42,4 @@ subroutine set_command_line_options() end subroutine set_command_line_options end subroutine Initialize -end module MAPL_pFUnit_Initialize +end module mapl_pFUnit_Initialize_mod diff --git a/pfunit/init_tests.F90 b/pfunit/init_tests.F90 index 904de2aedbe..dd55a93e67b 100644 --- a/pfunit/init_tests.F90 +++ b/pfunit/init_tests.F90 @@ -1,6 +1,6 @@ subroutine init_tests() use MAPL_pFUnit_ThrowMod, only: pFUnit_throw - use MAPL_ThrowMod + use mapl_Throw_mod implicit none call MAPL_set_throw_method(pfunit_throw) diff --git a/python/MAPL_PythonBridge/fortran2python/fortran_python_bridge.F90 b/python/MAPL_PythonBridge/fortran2python/fortran_python_bridge.F90 index 7ccb5c28ea3..a9ab9926cac 100644 --- a/python/MAPL_PythonBridge/fortran2python/fortran_python_bridge.F90 +++ b/python/MAPL_PythonBridge/fortran2python/fortran_python_bridge.F90 @@ -1,4 +1,4 @@ -module mapl_fortran_python_bridge +module mapl_fortran_python_bridge_mod ! - - - - - - - - - - - - - - -! ! @@ -61,4 +61,4 @@ end subroutine mapl_fortran_python_bridge_user_finalize end interface -end module mapl_fortran_python_bridge +end module mapl_fortran_python_bridge_mod diff --git a/python/MAPL_PythonBridge/python2fortran/python_fortran_bridge.F90 b/python/MAPL_PythonBridge/python2fortran/python_fortran_bridge.F90 index a7873144249..fd36ddcc69c 100644 --- a/python/MAPL_PythonBridge/python2fortran/python_fortran_bridge.F90 +++ b/python/MAPL_PythonBridge/python2fortran/python_fortran_bridge.F90 @@ -1,6 +1,6 @@ #include "MAPL.h" -module mapl_python_fortran_bridge +module mapl_python_fortran_bridge_mod use ESMF use Generic3g @@ -433,4 +433,4 @@ function MAPLPy_MAPL_GetNY(c_mapl_state) result(result) bind(c, name="MAPLPy_MAP end function -end module mapl_python_fortran_bridge +end module mapl_python_fortran_bridge_mod diff --git a/python/PythonBridge.F90 b/python/PythonBridge.F90 index bedfdbd31fd..c0f40139405 100644 --- a/python/PythonBridge.F90 +++ b/python/PythonBridge.F90 @@ -1,6 +1,6 @@ #include "MAPL.h" -module MAPL_PythonBridge +module mapl_PythonBridge_mod ! ----------------------------- ! Generic bridge mechanism to pull MAPL down to the python level @@ -12,12 +12,12 @@ module MAPL_PythonBridge use ESMF use Generic3g #ifdef PYTHONBRIDGE_INTEGRATION - use mapl_fortran_python_bridge, only: mapl_fortran_python_bridge_global_initialize - use mapl_fortran_python_bridge, only: mapl_fortran_python_bridge_user_init - use mapl_fortran_python_bridge, only: mapl_fortran_python_bridge_user_run - use mapl_fortran_python_bridge, only: mapl_fortran_python_bridge_user_run_with_internal - use mapl_fortran_python_bridge, only: mapl_fortran_python_bridge_user_finalize - use mapl_fortran_python_bridge, only: pygeosbridge_name_buffer + use mapl_fortran_python_bridge_mod, only: mapl_fortran_python_bridge_global_initialize + use mapl_fortran_python_bridge_mod, only: mapl_fortran_python_bridge_user_init + use mapl_fortran_python_bridge_mod, only: mapl_fortran_python_bridge_user_run + use mapl_fortran_python_bridge_mod, only: mapl_fortran_python_bridge_user_run_with_internal + use mapl_fortran_python_bridge_mod, only: mapl_fortran_python_bridge_user_finalize + use mapl_fortran_python_bridge_mod, only: pygeosbridge_name_buffer use ieee_exceptions, only: ieee_get_halting_mode, ieee_set_halting_mode use ieee_exceptions, only: ieee_overflow, ieee_invalid, ieee_support_halting use iso_c_binding, only: c_loc, C_NULL_CHAR @@ -154,4 +154,4 @@ subroutine MAPL_pybridge_gcfinalize(pypkg_name, mapl, import, export) #endif end subroutine MAPL_pybridge_gcfinalize -end module MAPL_PythonBridge +end module mapl_PythonBridge_mod diff --git a/superstructure/component/ComponentDriver.F90 b/superstructure/component/ComponentDriver.F90 index ece728b801a..47b06b81283 100644 --- a/superstructure/component/ComponentDriver.F90 +++ b/superstructure/component/ComponentDriver.F90 @@ -1,10 +1,10 @@ #include "MAPL.h" -module mapl_ComponentDriver - use mapl_MultiState - use mapl_ErrorHandlingMod - use mapl_KeywordEnforcer, only: KeywordEnforcer - use mapl_MultiState +module mapl_ComponentDriver_mod + use mapl_MultiState_mod + use mapl_ErrorHandling_mod + use mapl_KeywordEnforcer_mod, only: KeywordEnforcer + use mapl_MultiState_mod use :: esmf implicit none private @@ -32,7 +32,7 @@ module mapl_ComponentDriver abstract interface recursive subroutine I_run(this, unusable, phase_idx, rc) - use mapl_KeywordEnforcer, only: KeywordEnforcer + use mapl_KeywordEnforcer_mod, only: KeywordEnforcer import ComponentDriver class(ComponentDriver), target, intent(inout) :: this class(KeywordEnforcer), optional, intent(in) :: unusable @@ -72,4 +72,4 @@ recursive subroutine initialize_phases(this, unusable, phases, rc) _UNUSED_DUMMY(unusable) end subroutine initialize_phases -end module mapl_ComponentDriver +end module mapl_ComponentDriver_mod diff --git a/superstructure/component/ComponentDriverPtrVector.F90 b/superstructure/component/ComponentDriverPtrVector.F90 index 1b21bbc14b7..e699b65e4ac 100644 --- a/superstructure/component/ComponentDriverPtrVector.F90 +++ b/superstructure/component/ComponentDriverPtrVector.F90 @@ -1,5 +1,5 @@ -module mapl_ComponentDriverPtrVector - use mapl_ComponentDriver +module mapl_ComponentDriverPtrVector_mod + use mapl_ComponentDriver_mod #define T ComponentDriverPtr #define Vector ComponentDriverPtrVector @@ -11,4 +11,4 @@ module mapl_ComponentDriverPtrVector #undef Vector #undef T -end module mapl_ComponentDriverPtrVector +end module mapl_ComponentDriverPtrVector_mod diff --git a/superstructure/component/ComponentDriverVector.F90 b/superstructure/component/ComponentDriverVector.F90 index 8dbf482693a..8645be43a28 100644 --- a/superstructure/component/ComponentDriverVector.F90 +++ b/superstructure/component/ComponentDriverVector.F90 @@ -1,5 +1,5 @@ -module mapl_ComponentDriverVector - use mapl_ComponentDriver +module mapl_ComponentDriverVector_mod + use mapl_ComponentDriver_mod #define T ComponentDriver #define T_polymorphic @@ -13,4 +13,4 @@ module mapl_ComponentDriverVector #undef T_polymorphic #undef T -end module mapl_ComponentDriverVector +end module mapl_ComponentDriverVector_mod diff --git a/superstructure/component/GriddedComponentDriver.F90 b/superstructure/component/GriddedComponentDriver.F90 index ebbcbd4ef1f..562d73eae96 100644 --- a/superstructure/component/GriddedComponentDriver.F90 +++ b/superstructure/component/GriddedComponentDriver.F90 @@ -1,11 +1,11 @@ #include "MAPL.h" -module mapl_GriddedComponentDriver - use mapl_MultiState - use mapl_ComponentDriver - use mapl_ComponentDriverVector - use mapl_ErrorHandlingMod - use mapl_KeywordEnforcer, only: KE => KeywordEnforcer +module mapl_GriddedComponentDriver_mod + use mapl_MultiState_mod + use mapl_ComponentDriver_mod + use mapl_ComponentDriverVector_mod + use mapl_ErrorHandling_mod + use mapl_KeywordEnforcer_mod, only: KE => KeywordEnforcer use :: esmf implicit none private @@ -166,4 +166,4 @@ function new_GriddedComponentDriver_all(gridcomp, states, clock) result(driver) end function new_GriddedComponentDriver_all -end module mapl_GriddedComponentDriver +end module mapl_GriddedComponentDriver_mod diff --git a/superstructure/component/GriddedComponentDriver/add_export_coupler.F90 b/superstructure/component/GriddedComponentDriver/add_export_coupler.F90 index b14e6549a3a..92f0094892a 100644 --- a/superstructure/component/GriddedComponentDriver/add_export_coupler.F90 +++ b/superstructure/component/GriddedComponentDriver/add_export_coupler.F90 @@ -1,6 +1,6 @@ #include "MAPL.h" -submodule (mapl_GriddedComponentDriver) add_export_coupler_smod +submodule (mapl_GriddedComponentDriver_mod) add_export_coupler_smod implicit none contains diff --git a/superstructure/component/GriddedComponentDriver/add_import_coupler.F90 b/superstructure/component/GriddedComponentDriver/add_import_coupler.F90 index 1ce863e75ac..9a039e28299 100644 --- a/superstructure/component/GriddedComponentDriver/add_import_coupler.F90 +++ b/superstructure/component/GriddedComponentDriver/add_import_coupler.F90 @@ -1,6 +1,6 @@ #include "MAPL.h" -submodule (mapl_GriddedComponentDriver) add_import_coupler_smod +submodule (mapl_GriddedComponentDriver_mod) add_import_coupler_smod implicit none contains diff --git a/superstructure/component/GriddedComponentDriver/clock_advance.F90 b/superstructure/component/GriddedComponentDriver/clock_advance.F90 index 7e32a407378..c2fbd2968a0 100644 --- a/superstructure/component/GriddedComponentDriver/clock_advance.F90 +++ b/superstructure/component/GriddedComponentDriver/clock_advance.F90 @@ -1,7 +1,7 @@ #include "MAPL.h" -submodule(mapl_GriddedComponentDriver) clock_advance_smod - use mapl_ErrorHandling +submodule(mapl_GriddedComponentDriver_mod) clock_advance_smod + use mapl_ErrorHandling_mod implicit none(type,external) contains diff --git a/superstructure/component/GriddedComponentDriver/finalize.F90 b/superstructure/component/GriddedComponentDriver/finalize.F90 index a2b7283f9e7..bbe8f4ed4de 100644 --- a/superstructure/component/GriddedComponentDriver/finalize.F90 +++ b/superstructure/component/GriddedComponentDriver/finalize.F90 @@ -1,7 +1,7 @@ #include "MAPL.h" -submodule(mapl_GriddedComponentDriver) finalize_smod - use mapl_ErrorHandling +submodule(mapl_GriddedComponentDriver_mod) finalize_smod + use mapl_ErrorHandling_mod implicit none(type,external) contains diff --git a/superstructure/component/GriddedComponentDriver/get_clock.F90 b/superstructure/component/GriddedComponentDriver/get_clock.F90 index ce40bc04bdd..bc59bddcf08 100644 --- a/superstructure/component/GriddedComponentDriver/get_clock.F90 +++ b/superstructure/component/GriddedComponentDriver/get_clock.F90 @@ -1,7 +1,7 @@ #include "MAPL.h" -submodule(mapl_GriddedComponentDriver) get_clock_smod - use mapl_ErrorHandling +submodule(mapl_GriddedComponentDriver_mod) get_clock_smod + use mapl_ErrorHandling_mod implicit none(type,external) contains diff --git a/superstructure/component/GriddedComponentDriver/get_gridcomp.F90 b/superstructure/component/GriddedComponentDriver/get_gridcomp.F90 index 640738bc608..f9c4e60c229 100644 --- a/superstructure/component/GriddedComponentDriver/get_gridcomp.F90 +++ b/superstructure/component/GriddedComponentDriver/get_gridcomp.F90 @@ -1,6 +1,6 @@ #include "MAPL.h" -submodule (mapl_GriddedComponentDriver) get_gridcomp_smod +submodule (mapl_GriddedComponentDriver_mod) get_gridcomp_smod implicit none contains diff --git a/superstructure/component/GriddedComponentDriver/get_name.F90 b/superstructure/component/GriddedComponentDriver/get_name.F90 index 41cbaf1e096..305169232e2 100644 --- a/superstructure/component/GriddedComponentDriver/get_name.F90 +++ b/superstructure/component/GriddedComponentDriver/get_name.F90 @@ -1,6 +1,6 @@ #include "MAPL.h" -submodule (mapl_GriddedComponentDriver) get_name_smod +submodule (mapl_GriddedComponentDriver_mod) get_name_smod implicit none contains diff --git a/superstructure/component/GriddedComponentDriver/get_states.F90 b/superstructure/component/GriddedComponentDriver/get_states.F90 index 4951081adb6..0ef580edca6 100644 --- a/superstructure/component/GriddedComponentDriver/get_states.F90 +++ b/superstructure/component/GriddedComponentDriver/get_states.F90 @@ -1,7 +1,7 @@ #include "MAPL.h" -submodule(mapl_GriddedComponentDriver) get_states_smod - use mapl_ErrorHandling +submodule(mapl_GriddedComponentDriver_mod) get_states_smod + use mapl_ErrorHandling_mod implicit none(type,external) contains diff --git a/superstructure/component/GriddedComponentDriver/initialize.F90 b/superstructure/component/GriddedComponentDriver/initialize.F90 index 39b2d9290c3..6473b6d7f0e 100644 --- a/superstructure/component/GriddedComponentDriver/initialize.F90 +++ b/superstructure/component/GriddedComponentDriver/initialize.F90 @@ -1,7 +1,7 @@ #include "MAPL.h" -submodule(mapl_GriddedComponentDriver) initialize_smod - use mapl_ErrorHandling +submodule(mapl_GriddedComponentDriver_mod) initialize_smod + use mapl_ErrorHandling_mod implicit none(type,external) contains diff --git a/superstructure/component/GriddedComponentDriver/read_restart.F90 b/superstructure/component/GriddedComponentDriver/read_restart.F90 index 46b277af658..ace4a460f2c 100644 --- a/superstructure/component/GriddedComponentDriver/read_restart.F90 +++ b/superstructure/component/GriddedComponentDriver/read_restart.F90 @@ -1,7 +1,7 @@ #include "MAPL.h" -submodule(mapl_GriddedComponentDriver) read_restart_smod - use mapl_ErrorHandling +submodule(mapl_GriddedComponentDriver_mod) read_restart_smod + use mapl_ErrorHandling_mod implicit none(type,external) contains diff --git a/superstructure/component/GriddedComponentDriver/run.F90 b/superstructure/component/GriddedComponentDriver/run.F90 index ae5bc28c2cc..5a8466d88ba 100644 --- a/superstructure/component/GriddedComponentDriver/run.F90 +++ b/superstructure/component/GriddedComponentDriver/run.F90 @@ -1,7 +1,7 @@ #include "MAPL.h" -submodule(mapl_GriddedComponentDriver) run_smod - use mapl_ErrorHandling +submodule(mapl_GriddedComponentDriver_mod) run_smod + use mapl_ErrorHandling_mod implicit none(type,external) contains diff --git a/superstructure/component/GriddedComponentDriver/run_export_couplers.F90 b/superstructure/component/GriddedComponentDriver/run_export_couplers.F90 index 812216f53d8..4bb4bfd1361 100644 --- a/superstructure/component/GriddedComponentDriver/run_export_couplers.F90 +++ b/superstructure/component/GriddedComponentDriver/run_export_couplers.F90 @@ -1,9 +1,9 @@ #include "MAPL.h" -submodule(mapl_GriddedComponentDriver) run_export_couplers_smod +submodule(mapl_GriddedComponentDriver_mod) run_export_couplers_smod - use mapl_CouplerPhases - use mapl_ErrorHandling + use mapl_CouplerPhases_mod + use mapl_ErrorHandling_mod implicit none(type,external) contains diff --git a/superstructure/component/GriddedComponentDriver/run_import_couplers.F90 b/superstructure/component/GriddedComponentDriver/run_import_couplers.F90 index c6f7ee9ac34..0c43c51e9f2 100644 --- a/superstructure/component/GriddedComponentDriver/run_import_couplers.F90 +++ b/superstructure/component/GriddedComponentDriver/run_import_couplers.F90 @@ -1,8 +1,8 @@ #include "MAPL.h" -submodule(mapl_GriddedComponentDriver) run_import_couplers_smod - use mapl_CouplerPhases - use mapl_ErrorHandling +submodule(mapl_GriddedComponentDriver_mod) run_import_couplers_smod + use mapl_CouplerPhases_mod + use mapl_ErrorHandling_mod implicit none(type,external) contains diff --git a/superstructure/component/GriddedComponentDriver/set_clock.F90 b/superstructure/component/GriddedComponentDriver/set_clock.F90 index c21fc60e165..e47442e7f82 100644 --- a/superstructure/component/GriddedComponentDriver/set_clock.F90 +++ b/superstructure/component/GriddedComponentDriver/set_clock.F90 @@ -1,6 +1,6 @@ #include "MAPL.h" -submodule(mapl_GriddedComponentDriver) set_clock_smod +submodule(mapl_GriddedComponentDriver_mod) set_clock_smod implicit none(type,external) contains diff --git a/superstructure/component/GriddedComponentDriver/write_restart.F90 b/superstructure/component/GriddedComponentDriver/write_restart.F90 index 27a1266358f..a0d1437b69e 100644 --- a/superstructure/component/GriddedComponentDriver/write_restart.F90 +++ b/superstructure/component/GriddedComponentDriver/write_restart.F90 @@ -1,7 +1,7 @@ #include "MAPL.h" -submodule(mapl_GriddedComponentDriver) write_restart_smod - use mapl_ErrorHandling +submodule(mapl_GriddedComponentDriver_mod) write_restart_smod + use mapl_ErrorHandling_mod implicit none(type,external) contains diff --git a/superstructure/component/GriddedComponentDriverMap.F90 b/superstructure/component/GriddedComponentDriverMap.F90 index a6f2929b029..4d60bea9bf8 100644 --- a/superstructure/component/GriddedComponentDriverMap.F90 +++ b/superstructure/component/GriddedComponentDriverMap.F90 @@ -1,5 +1,5 @@ -module mapl_GriddedComponentDriverMap - use mapl_GriddedComponentDriver +module mapl_GriddedComponentDriverMap_mod + use mapl_GriddedComponentDriver_mod #define Key __CHARACTER_DEFERRED #define T GriddedComponentDriver @@ -15,4 +15,4 @@ module mapl_GriddedComponentDriverMap #undef T #undef Key -end module mapl_GriddedComponentDriverMap +end module mapl_GriddedComponentDriverMap_mod diff --git a/superstructure/component/GriddedComponentDriverVector.F90 b/superstructure/component/GriddedComponentDriverVector.F90 index 22ca044f8fb..515ecdd5d48 100644 --- a/superstructure/component/GriddedComponentDriverVector.F90 +++ b/superstructure/component/GriddedComponentDriverVector.F90 @@ -1,5 +1,5 @@ -module mapl_GriddedComponentDriverVector - use mapl_GriddedComponentDriver +module mapl_GriddedComponentDriverVector_mod + use mapl_GriddedComponentDriver_mod #define T GriddedComponentDriver #define Vector GriddedComponentDriverVector @@ -11,4 +11,4 @@ module mapl_GriddedComponentDriverVector #undef Vector #undef T -end module mapl_GriddedComponentDriverVector +end module mapl_GriddedComponentDriverVector_mod diff --git a/superstructure/component/MultiState.F90 b/superstructure/component/MultiState.F90 index 976c6282b33..089af13107a 100644 --- a/superstructure/component/MultiState.F90 +++ b/superstructure/component/MultiState.F90 @@ -1,9 +1,9 @@ #include "MAPL.h" -module mapl_MultiState - use mapl_ESMF_Utilities, only: write(formatted) - use mapl_KeywordEnforcer - use mapl_ErrorHandling +module mapl_MultiState_mod + use mapl_ESMF_Utilities_mod, only: write(formatted) + use mapl_KeywordEnforcer_mod + use mapl_ErrorHandling_mod use esmf implicit none private @@ -140,4 +140,4 @@ subroutine destroy(this, rc) _RETURN(_SUCCESS) end subroutine destroy - end module mapl_MultiState + end module mapl_MultiState_mod diff --git a/superstructure/generic/API.F90 b/superstructure/generic/API.F90 index c10390df615..12c207694c1 100644 --- a/superstructure/generic/API.F90 +++ b/superstructure/generic/API.F90 @@ -1,5 +1,5 @@ -module mapl_Generic3g_API - use mapl_UserSetServices, only: user_setservices, AbstractUserSetServices, DSOSetServices +module mapl_Generic3g_API_mod + use mapl_UserSetServices_mod, only: user_setservices, AbstractUserSetServices, DSOSetServices implicit none(type,external) private @@ -8,4 +8,4 @@ module mapl_Generic3g_API public :: AbstractUserSetServices public :: DSOSetServices -end module mapl_Generic3g_API +end module mapl_Generic3g_API_mod diff --git a/superstructure/generic/ComponentSpecParser.F90 b/superstructure/generic/ComponentSpecParser.F90 index effa113d600..a01a76b02b7 100644 --- a/superstructure/generic/ComponentSpecParser.F90 +++ b/superstructure/generic/ComponentSpecParser.F90 @@ -1,30 +1,30 @@ #include "MAPL.h" -module mapl_ComponentSpecParser - - use mapl_ComponentSpec - use mapl_ChildSpec - use mapl_ChildSpecMap - use mapl_UserSetServices - use mapl_ErrorHandling - use mapl_VariableSpec - use mapl_Connection - use mapl_ConnectionPt - use mapl_VirtualConnectionPt - use mapl_VariableSpecVector - use mapl_SimpleConnection - use mapl_MatchConnection - use mapl_ReexportConnection - use mapl_ConnectionVector - use mapl_VerticalStaggerLoc - use mapl_UngriddedDims - use mapl_UngriddedDim - use mapl_GeometrySpec - use mapl_Geom_API - use mapl_StateItemImpl - use mapl_ESMF_Utilities - use mapl_UserSetServices - use mapl_StateRegistry +module mapl_ComponentSpecParser_mod + + use mapl_ComponentSpec_mod + use mapl_ChildSpec_mod + use mapl_ChildSpecMap_mod + use mapl_UserSetServices_mod + use mapl_ErrorHandling_mod + use mapl_VariableSpec_mod + use mapl_Connection_mod + use mapl_ConnectionPt_mod + use mapl_VirtualConnectionPt_mod + use mapl_VariableSpecVector_mod + use mapl_SimpleConnection_mod + use mapl_MatchConnection_mod + use mapl_ReexportConnection_mod + use mapl_ConnectionVector_mod + use mapl_VerticalStaggerLoc_mod + use mapl_UngriddedDims_mod + use mapl_UngriddedDim_mod + use mapl_GeometrySpec_mod + use mapl_Geom_API_mod + use mapl_StateItemImpl_mod + use mapl_ESMF_Utilities_mod + use mapl_UserSetServices_mod + use mapl_StateRegistry_mod use gftl2_StringVector, only: StringVector use esmf @@ -141,4 +141,4 @@ end function to_itemtype END INTERFACE -end module mapl_ComponentSpecParser +end module mapl_ComponentSpecParser_mod diff --git a/superstructure/generic/ComponentSpecParser/parse_child.F90 b/superstructure/generic/ComponentSpecParser/parse_child.F90 index bb9b8a81c98..0a2bcfe7a38 100644 --- a/superstructure/generic/ComponentSpecParser/parse_child.F90 +++ b/superstructure/generic/ComponentSpecParser/parse_child.F90 @@ -1,6 +1,6 @@ #include "MAPL.h" -submodule (mapl_ComponentSpecParser) parse_child_smod +submodule (mapl_ComponentSpecParser_mod) parse_child_smod implicit none(type,external) contains diff --git a/superstructure/generic/ComponentSpecParser/parse_children.F90 b/superstructure/generic/ComponentSpecParser/parse_children.F90 index 8a7c06e3a47..4a36745cf71 100644 --- a/superstructure/generic/ComponentSpecParser/parse_children.F90 +++ b/superstructure/generic/ComponentSpecParser/parse_children.F90 @@ -1,6 +1,6 @@ #include "MAPL.h" -submodule (mapl_ComponentSpecParser) parse_children_smod +submodule (mapl_ComponentSpecParser_mod) parse_children_smod implicit none(type,external) diff --git a/superstructure/generic/ComponentSpecParser/parse_component_spec.F90 b/superstructure/generic/ComponentSpecParser/parse_component_spec.F90 index cbf12f5a97b..a2fa8fb4063 100644 --- a/superstructure/generic/ComponentSpecParser/parse_component_spec.F90 +++ b/superstructure/generic/ComponentSpecParser/parse_component_spec.F90 @@ -1,6 +1,6 @@ #include "MAPL.h" -submodule (mapl_ComponentSpecParser) parse_component_spec_smod +submodule (mapl_ComponentSpecParser_mod) parse_component_spec_smod implicit none(type,external) contains diff --git a/superstructure/generic/ComponentSpecParser/parse_connections.F90 b/superstructure/generic/ComponentSpecParser/parse_connections.F90 index 5499dbcb810..4dae9995759 100644 --- a/superstructure/generic/ComponentSpecParser/parse_connections.F90 +++ b/superstructure/generic/ComponentSpecParser/parse_connections.F90 @@ -1,6 +1,6 @@ #include "MAPL.h" -submodule (mapl_ComponentSpecParser) parse_connections_smod +submodule (mapl_ComponentSpecParser_mod) parse_connections_smod implicit none(type,external) diff --git a/superstructure/generic/ComponentSpecParser/parse_geometry_spec.F90 b/superstructure/generic/ComponentSpecParser/parse_geometry_spec.F90 index 5d04c5cdcc6..37c96602819 100644 --- a/superstructure/generic/ComponentSpecParser/parse_geometry_spec.F90 +++ b/superstructure/generic/ComponentSpecParser/parse_geometry_spec.F90 @@ -1,11 +1,11 @@ #include "MAPL.h" -submodule (mapl_ComponentSpecParser) parse_geometry_spec_smod +submodule (mapl_ComponentSpecParser_mod) parse_geometry_spec_smod - use mapl_VerticalGrid - use mapl_BasicVerticalGrid - use mapl_VerticalGrid_API - use mapl_ModelVerticalGrid + use mapl_VerticalGrid_mod + use mapl_BasicVerticalGrid_mod + use mapl_VerticalGrid_API_mod + use mapl_ModelVerticalGrid_mod implicit none(type,external) diff --git a/superstructure/generic/ComponentSpecParser/parse_setservices.F90 b/superstructure/generic/ComponentSpecParser/parse_setservices.F90 index e2150a56b00..0b2b553ea10 100644 --- a/superstructure/generic/ComponentSpecParser/parse_setservices.F90 +++ b/superstructure/generic/ComponentSpecParser/parse_setservices.F90 @@ -1,6 +1,6 @@ #include "MAPL.h" -submodule (mapl_ComponentSpecParser) parse_setservices_smod +submodule (mapl_ComponentSpecParser_mod) parse_setservices_smod implicit none(type,external) diff --git a/superstructure/generic/ComponentSpecParser/parse_timespec.F90 b/superstructure/generic/ComponentSpecParser/parse_timespec.F90 index ed9f75c6b8f..a8f6eda0c3c 100644 --- a/superstructure/generic/ComponentSpecParser/parse_timespec.F90 +++ b/superstructure/generic/ComponentSpecParser/parse_timespec.F90 @@ -1,6 +1,6 @@ #include "MAPL.h" -submodule (mapl_ComponentSpecParser) parse_timespec_smod +submodule (mapl_ComponentSpecParser_mod) parse_timespec_smod use mapl_HConfig_API implicit none(type,external) diff --git a/superstructure/generic/ComponentSpecParser/parse_var_specs.F90 b/superstructure/generic/ComponentSpecParser/parse_var_specs.F90 index b56f94e98b1..5fb8030444d 100644 --- a/superstructure/generic/ComponentSpecParser/parse_var_specs.F90 +++ b/superstructure/generic/ComponentSpecParser/parse_var_specs.F90 @@ -1,7 +1,7 @@ #include "MAPL.h" -submodule (mapl_ComponentSpecParser) parse_var_specs_smod - use mapl_VerticalGrid +submodule (mapl_ComponentSpecParser_mod) parse_var_specs_smod + use mapl_VerticalGrid_mod implicit none(type,external) contains @@ -168,7 +168,7 @@ subroutine val_to_float(x, attributes, key, rc) end subroutine val_to_float function to_typekind(attributes, rc) result(typekind) - use :: mapl_ESMF_Utilities, only: MAPL_TYPEKIND_MIRROR + use :: mapl_ESMF_Utilities_mod, only: MAPL_TYPEKIND_MIRROR type(ESMF_TypeKind_Flag) :: typekind type(ESMF_HConfig), intent(in) :: attributes integer, optional, intent(out) :: rc diff --git a/superstructure/generic/ComponentSpecParser/to_itemtype.F90 b/superstructure/generic/ComponentSpecParser/to_itemtype.F90 index 3859da6b09b..04dd1fcb6d4 100644 --- a/superstructure/generic/ComponentSpecParser/to_itemtype.F90 +++ b/superstructure/generic/ComponentSpecParser/to_itemtype.F90 @@ -1,6 +1,6 @@ #include "MAPL.h" -submodule (mapl_ComponentSpecParser) to_itemtype_smod +submodule (mapl_ComponentSpecParser_mod) to_itemtype_smod implicit none(type,external) contains diff --git a/superstructure/generic/EntryPointVector.F90 b/superstructure/generic/EntryPointVector.F90 index e86267ba493..f40280bb949 100644 --- a/superstructure/generic/EntryPointVector.F90 +++ b/superstructure/generic/EntryPointVector.F90 @@ -1,6 +1,6 @@ -module mapl_EntryPointVector +module mapl_EntryPointVector_mod - use mapl_RunEntryPoint + use mapl_RunEntryPoint_mod #define T runEntryPoint #define Vector entryPointVector @@ -12,4 +12,4 @@ module mapl_EntryPointVector #undef Vector #undef VectorIterator -end module mapl_EntryPointVector +end module mapl_EntryPointVector_mod diff --git a/superstructure/generic/Generic3g.F90 b/superstructure/generic/Generic3g.F90 index 4c6eded2d9d..9a26a72c759 100644 --- a/superstructure/generic/Generic3g.F90 +++ b/superstructure/generic/Generic3g.F90 @@ -1,22 +1,22 @@ module Generic3g - use mapl_ESMF_Subset - use mapl_Generic + use mapl_ESMF_Subset_mod + use mapl_Generic_mod use mapl_Field_API - use mapl_VariableSpec - use mapl_GenericPhases - use mapl_OuterMetaComponent - use mapl_GenericGridComp, only: MAPL_GridCompCreate - use mapl_VerticalGrid - use mapl_BasicVerticalGrid - use mapl_ModelVerticalGrid - use mapl_ESMF_Interfaces - use mapl_ComponentDriver - use mapl_GriddedComponentDriver - use mapl_ChildSpec - use mapl_UserSetServices - use mapl_ESMF_HConfigUtilities, only: MAPL_HConfigMatch - use mapl_VerticalStaggerLoc + use mapl_VariableSpec_mod + use mapl_GenericPhases_mod + use mapl_OuterMetaComponent_mod + use mapl_GenericGridComp_mod, only: MAPL_GridCompCreate + use mapl_VerticalGrid_mod + use mapl_BasicVerticalGrid_mod + use mapl_ModelVerticalGrid_mod + use mapl_ESMF_Interfaces_mod + use mapl_ComponentDriver_mod + use mapl_GriddedComponentDriver_mod + use mapl_ChildSpec_mod + use mapl_UserSetServices_mod + use mapl_ESMF_HConfigUtilities_mod, only: MAPL_HConfigMatch + use mapl_VerticalStaggerLoc_mod use mapl_geomio - use mapl_ESMF_Utilities - use mapl_OpenMP_Support + use mapl_ESMF_Utilities_mod + use mapl_OpenMP_Support_mod end module Generic3g diff --git a/superstructure/generic/GenericGridComp.F90 b/superstructure/generic/GenericGridComp.F90 index 9f6fc1f026d..58c71eb0db8 100644 --- a/superstructure/generic/GenericGridComp.F90 +++ b/superstructure/generic/GenericGridComp.F90 @@ -9,15 +9,15 @@ ! MAPL_ADVERTISE ! MAPL_REALIZE -module mapl_GenericGridComp - use :: mapl_OuterMetaComponent, only: OuterMetaComponent - use :: mapl_OuterMetaComponent, only: get_outer_meta - use :: mapl_OuterMetaComponent, only: attach_outer_meta - use :: mapl_GenericPhases - use :: mapl_GriddedComponentDriver +module mapl_GenericGridComp_mod + use :: mapl_OuterMetaComponent_mod, only: OuterMetaComponent + use :: mapl_OuterMetaComponent_mod, only: get_outer_meta + use :: mapl_OuterMetaComponent_mod, only: attach_outer_meta + use :: mapl_GenericPhases_mod + use :: mapl_GriddedComponentDriver_mod use esmf - use :: mapl_KeywordEnforcer, only: KeywordEnforcer - use :: mapl_ErrorHandling + use :: mapl_KeywordEnforcer_mod, only: KeywordEnforcer + use :: mapl_ErrorHandling_mod implicit none(type,external) private @@ -86,7 +86,7 @@ end subroutine setServices recursive type(ESMF_GridComp) function create_grid_comp_primary( & name, set_services, config, unusable, petlist, rc) result(gridcomp) - use :: mapl_UserSetServices, only: AbstractUserSetServices + use :: mapl_UserSetServices_mod, only: AbstractUserSetServices character(*), intent(in) :: name class(AbstractUserSetServices), intent(in) :: set_services @@ -276,4 +276,4 @@ subroutine set_is_generic(gridcomp, flag, rc) _RETURN(_SUCCESS) end subroutine set_is_generic -end module mapl_GenericGridComp +end module mapl_GenericGridComp_mod diff --git a/superstructure/generic/InnerMetaComponent.F90 b/superstructure/generic/InnerMetaComponent.F90 index dc37dc86bba..6ec5a822b01 100644 --- a/superstructure/generic/InnerMetaComponent.F90 +++ b/superstructure/generic/InnerMetaComponent.F90 @@ -1,10 +1,10 @@ #include "MAPL.h" -module mapl_InnerMetaComponent - use :: mapl_ErrorHandling +module mapl_InnerMetaComponent_mod + use :: mapl_ErrorHandling_mod use :: mapl3_GenericGrid - use :: mapl_ESMF_Interfaces, only: MAPL_UserCompGetInternalState - use :: mapl_ESMF_Interfaces, only: MAPL_UserCompSetInternalState + use :: mapl_ESMF_Interfaces_mod, only: MAPL_UserCompGetInternalState + use :: mapl_ESMF_Interfaces_mod, only: MAPL_UserCompSetInternalState use esmf implicit none(type,external) private @@ -114,5 +114,5 @@ subroutine set_outer_gridcomp(this, gc) end subroutine set_outer_gridcomp -end module mapl_InnerMetaComponent +end module mapl_InnerMetaComponent_mod diff --git a/superstructure/generic/MAPL3_Deprecated.F90 b/superstructure/generic/MAPL3_Deprecated.F90 index f05014123e1..9934e8c7300 100644 --- a/superstructure/generic/MAPL3_Deprecated.F90 +++ b/superstructure/generic/MAPL3_Deprecated.F90 @@ -3,11 +3,11 @@ #include "MAPL.h" -module mapl_Deprecated - use mapl_Generic, only: MAPL_Get => MAPL_GridCompGet +module mapl_Deprecated_mod + use mapl_Generic_mod, only: MAPL_Get => MAPL_GridCompGet implicit none(type,external) private public :: MAPL_Get -end module mapl_Deprecated +end module mapl_Deprecated_mod diff --git a/superstructure/generic/MAPL_Generic.F90 b/superstructure/generic/MAPL_Generic.F90 index da93528fced..2953de9fbd9 100644 --- a/superstructure/generic/MAPL_Generic.F90 +++ b/superstructure/generic/MAPL_Generic.F90 @@ -15,34 +15,34 @@ ! !--------------------------------------------------------------------- -module mapl_Generic - - use mapl_InnerMetaComponent, only: InnerMetaComponent - use mapl_InnerMetaComponent, only: get_inner_meta - use mapl_OuterMetaComponent, only: OuterMetaComponent - use mapl_OuterMetaComponent, only: get_outer_meta - use mapl_ChildSpec, only: ChildSpec - use mapl_ComponentSpec, only: ComponentSpec, CheckpointControls - use mapl_VariableSpec, only: VariableSpec, make_VariableSpec - use mapl_Validation, only: is_valid_name - use mapl_ESMF_Interfaces, only: I_Run - use mapl_StateItemSpec - use mapl_VerticalGrid - use mapl_VerticalStaggerLoc, only: VerticalStaggerLoc - use mapl_StateRegistry, only: StateRegistry - use mapl_HorizontalDimsSpec, only: HorizontalDimsSpec, HORIZONTAL_DIMS_NONE, HORIZONTAL_DIMS_GEOM - use mapl_UngriddedDim, only: UngriddedDim - use mapl_UngriddedDims, only: UngriddedDims - use mapl_StateItemImpl, only: MAPL_STATEITEM_STATE, MAPL_STATEITEM_FIELDBUNDLE - use mapl_StateItemImpl, only: MAPL_STATEITEM_SERVICE, MAPL_STATEITEM_VECTOR - use mapl_ESMF_Utilities, only: esmf_state_intent_to_string - use mapl_ESMF_Interfaces, only: MAPL_UserCompGetInternalState, MAPL_UserCompSetInternalState - use mapl_hconfig_get - use mapl_RestartModes, only: RestartMode - use mapl_ComponentSpecParser, only: parse_geometry_spec - use mapl_InternalConstants - use mapl_ErrorHandling - use mapl_KeywordEnforcer +module mapl_Generic_mod + + use mapl_InnerMetaComponent_mod, only: InnerMetaComponent + use mapl_InnerMetaComponent_mod, only: get_inner_meta + use mapl_OuterMetaComponent_mod, only: OuterMetaComponent + use mapl_OuterMetaComponent_mod, only: get_outer_meta + use mapl_ChildSpec_mod, only: ChildSpec + use mapl_ComponentSpec_mod, only: ComponentSpec, CheckpointControls + use mapl_VariableSpec_mod, only: VariableSpec, make_VariableSpec + use mapl_Validation_mod, only: is_valid_name + use mapl_ESMF_Interfaces_mod, only: I_Run + use mapl_StateItemSpec_mod + use mapl_VerticalGrid_mod + use mapl_VerticalStaggerLoc_mod, only: VerticalStaggerLoc + use mapl_StateRegistry_mod, only: StateRegistry + use mapl_HorizontalDimsSpec_mod, only: HorizontalDimsSpec, HORIZONTAL_DIMS_NONE, HORIZONTAL_DIMS_GEOM + use mapl_UngriddedDim_mod, only: UngriddedDim + use mapl_UngriddedDims_mod, only: UngriddedDims + use mapl_StateItemImpl_mod, only: MAPL_STATEITEM_STATE, MAPL_STATEITEM_FIELDBUNDLE + use mapl_StateItemImpl_mod, only: MAPL_STATEITEM_SERVICE, MAPL_STATEITEM_VECTOR + use mapl_ESMF_Utilities_mod, only: esmf_state_intent_to_string + use mapl_ESMF_Interfaces_mod, only: MAPL_UserCompGetInternalState, MAPL_UserCompSetInternalState + use mapl_hconfig_get_mod + use mapl_RestartModes_mod, only: RestartMode + use mapl_ComponentSpecParser_mod, only: parse_geometry_spec + use mapl_InternalConstants_mod + use mapl_ErrorHandling_mod + use mapl_KeywordEnforcer_mod use esmf, only: ESMF_Info, ESMF_InfoIsSet, ESMF_InfoGet, ESMF_InfoGetFromHost use esmf, only: ESMF_GridComp, ESMF_GridCompGet use esmf, only: ESMF_Geom, ESMF_GeomCreate, ESMF_GeomGet @@ -387,7 +387,7 @@ subroutine get_internal_state(gridcomp, internal_state, rc) end subroutine get_internal_state subroutine gridcomp_add_child_by_config_file(gridcomp, child_name, setservices, hconfig_file, unusable, timeStep, refTime_offset, rc) - use mapl_UserSetServices + use mapl_UserSetServices_mod type(ESMF_GridComp), intent(inout) :: gridcomp character(len=*), intent(in) :: child_name class(AbstractUserSetServices), intent(in) :: setservices @@ -416,7 +416,7 @@ subroutine gridcomp_add_child_by_config_file(gridcomp, child_name, setservices, end subroutine gridcomp_add_child_by_config_file subroutine gridcomp_add_child_by_config(gridcomp, child_name, setservices, hconfig, unusable, timeStep, refTime_offset, rc) - use mapl_UserSetServices + use mapl_UserSetServices_mod type(ESMF_GridComp), intent(inout) :: gridcomp character(len=*), intent(in) :: child_name class(AbstractUserSetServices), intent(in) :: setservices @@ -1036,9 +1036,9 @@ logical function gridcomp_is_user(gridcomp, rc) end function gridcomp_is_user subroutine gridcomp_set_geometry(gridcomp, state_intent, short_name, geom, vertical_grid, rc) - use mapl_VirtualConnectionPt - use mapl_ExtensionFamily - use mapl_StateItemSpec + use mapl_VirtualConnectionPt_mod + use mapl_ExtensionFamily_mod + use mapl_StateItemSpec_mod type(ESMF_GridComp), intent(inout) :: gridcomp type(Esmf_StateIntent_Flag), intent(in) :: state_intent character(*), intent(in) :: short_name @@ -1180,8 +1180,8 @@ end subroutine clock_get_dt subroutine method_add(state, label, userRoutine, rc) use esmf, only: ESMF_State, ESMF_MethodAdd - use mapl_ESMF_Interfaces, only: I_CallBackMethod - use mapl_StateAddMethodImpl, only: CallbackMap, CallbackMethodWrapper, get_callbacks + use mapl_ESMF_Interfaces_mod, only: I_CallBackMethod + use mapl_StateAddMethodImpl_mod, only: CallbackMap, CallbackMethodWrapper, get_callbacks type(ESMF_State), intent(inout) :: state character(len=*), intent(in) :: label procedure(I_CallBackMethod) :: userRoutine @@ -1199,4 +1199,4 @@ subroutine method_add(state, label, userRoutine, rc) _RETURN(_SUCCESS) end subroutine method_add -end module mapl_Generic +end module mapl_Generic_mod diff --git a/superstructure/generic/MethodPhasesMap.F90 b/superstructure/generic/MethodPhasesMap.F90 index 22288a3f39f..1a7e30b97ff 100644 --- a/superstructure/generic/MethodPhasesMap.F90 +++ b/superstructure/generic/MethodPhasesMap.F90 @@ -2,7 +2,7 @@ ! PhaseMethodMap? #include "MAPL.h" -module mapl_MethodPhasesMap_private +module mapl_MethodPhasesMap_private_mod use :: gFTL2_StringVector, only: StringVector use :: esmf, only: ESMF_Method_Flag @@ -60,13 +60,13 @@ end function find end function method_less -end module mapl_MethodPhasesMap_private +end module mapl_MethodPhasesMap_private_mod -module mapl_MethodPhasesMapUtils - use mapl_MethodPhasesMap_private - use mapl_ErrorHandling - use :: mapl_GenericPhases, only: GENERIC_RUN_OFFSET - use :: mapl_KeywordEnforcer +module mapl_MethodPhasesMapUtils_mod + use mapl_MethodPhasesMap_private_mod + use mapl_ErrorHandling_mod + use :: mapl_GenericPhases_mod, only: GENERIC_RUN_OFFSET + use :: mapl_KeywordEnforcer_mod use :: esmf, only: ESMF_Method_Flag, operator(==) use :: esmf, only: ESMF_METHOD_INITIALIZE use :: esmf, only: ESMF_METHOD_RUN @@ -160,11 +160,11 @@ function get_default_phase_name(method_flag, use_name) result(phase_name) end if end function get_default_phase_name -end module mapl_MethodPhasesMapUtils +end module mapl_MethodPhasesMapUtils_mod -module mapl_MethodPhasesMap - use mapl_MethodPhasesMap_private - use mapl_MethodPhasesMapUtils +module mapl_MethodPhasesMap_mod + use mapl_MethodPhasesMap_private_mod + use mapl_MethodPhasesMapUtils_mod implicit none(type,external) private public :: initialize_phases_map @@ -188,4 +188,4 @@ subroutine initialize_phases_map(phases_map) end subroutine initialize_phases_map -end module mapl_MethodPhasesMap +end module mapl_MethodPhasesMap_mod diff --git a/superstructure/generic/OpenMP_Support.F90 b/superstructure/generic/OpenMP_Support.F90 index 9a6d715f682..769570b58cc 100644 --- a/superstructure/generic/OpenMP_Support.F90 +++ b/superstructure/generic/OpenMP_Support.F90 @@ -1,14 +1,14 @@ #include "MAPL.h" -module mapl_OpenMP_Support +module mapl_OpenMP_Support_mod use ESMF - use mapl_ErrorHandling - use mapl_KeywordEnforcer - use mapl_GridAccessors, only: GridGet - use mapl_Subgrid, only: Interval, make_subgrids, find_bounds - use mapl_StateAddMethodImpl, only: CallbackMap, CallbackMapIterator, CallbackMethodWrapper, get_callbacks - use mapl_StateAddMethodImpl, only: operator(/=) - use mapl_ESMF_Interfaces, only: MAPL_UserCompGetInternalState, MAPL_UserCompSetInternalState + use mapl_ErrorHandling_mod + use mapl_KeywordEnforcer_mod + use mapl_GridAccessors_mod, only: GridGet + use mapl_Subgrid_mod, only: Interval, make_subgrids, find_bounds + use mapl_StateAddMethodImpl_mod, only: CallbackMap, CallbackMapIterator, CallbackMethodWrapper, get_callbacks + use mapl_StateAddMethodImpl_mod, only: operator(/=) + use mapl_ESMF_Interfaces_mod, only: MAPL_UserCompGetInternalState, MAPL_UserCompSetInternalState !$ use omp_lib implicit none(type,external) @@ -347,8 +347,8 @@ recursive function make_substates_from_num_grids(state, num_subgrids, unusable, end function make_substates_from_num_grids function make_subgridcomps(GridComp, run_entry_points, num_grids, unusable, rc) result(subgridcomps) - use mapl_RunEntryPoint - use mapl_EntryPointVector + use mapl_RunEntryPoint_mod + use mapl_EntryPointVector_mod type(ESMF_GridComp), allocatable :: subgridcomps(:) type(ESMF_GridComp), intent(in) :: GridComp type(entryPointVector), intent(in) :: run_entry_points @@ -456,4 +456,4 @@ subroutine copy_callbacks(state, multi_states, rc) end subroutine copy_callbacks - end module mapl_OpenMP_Support + end module mapl_OpenMP_Support_mod diff --git a/superstructure/generic/OuterMetaComponent.F90 b/superstructure/generic/OuterMetaComponent.F90 index bf27431f349..c40c261fd5e 100644 --- a/superstructure/generic/OuterMetaComponent.F90 +++ b/superstructure/generic/OuterMetaComponent.F90 @@ -1,24 +1,24 @@ #include "MAPL.h" -module mapl_OuterMetaComponent - - use mapl_UserSetServices, only: AbstractUserSetServices - use mapl_ComponentSpec - use mapl_VariableSpec - use mapl_ChildSpec - use mapl_InnerMetaComponent - use mapl_MethodPhasesMap - use mapl_StateRegistry - use mapl_ESMF_Interfaces, only: I_Run - use mapl_GriddedComponentDriver - use mapl_ComponentDriverVector - use mapl_GriddedComponentDriverMap, only: GriddedComponentDriverMap - use mapl_GriddedComponentDriverMap, only: operator(/=) - use mapl_VerticalGrid - use mapl_SimpleAlarm +module mapl_OuterMetaComponent_mod + + use mapl_UserSetServices_mod, only: AbstractUserSetServices + use mapl_ComponentSpec_mod + use mapl_VariableSpec_mod + use mapl_ChildSpec_mod + use mapl_InnerMetaComponent_mod + use mapl_MethodPhasesMap_mod + use mapl_StateRegistry_mod + use mapl_ESMF_Interfaces_mod, only: I_Run + use mapl_GriddedComponentDriver_mod + use mapl_ComponentDriverVector_mod + use mapl_GriddedComponentDriverMap_mod, only: GriddedComponentDriverMap + use mapl_GriddedComponentDriverMap_mod, only: operator(/=) + use mapl_VerticalGrid_mod + use mapl_SimpleAlarm_mod use gFTL2_StringVector - use mapl_keywordEnforcer, only: KE => KeywordEnforcer - use MAPL_Profiler, only: DistributedProfiler + use mapl_KeywordEnforcer_mod, only: KE => KeywordEnforcer + use mapl_Profiler_mod, only: DistributedProfiler use esmf use pflogger, only: Logger @@ -456,6 +456,7 @@ module subroutine connect_all(this, src_comp, dst_comp, rc) end subroutine connect_all module subroutine set_entry_point(this, method_flag, userProcedure, unusable, phase_name, rc) + use mapl_KeywordEnforcer_mod class(OuterMetaComponent), intent(inout) :: this type(ESMF_Method_Flag), intent(in) :: method_flag procedure(I_Run) :: userProcedure @@ -520,4 +521,4 @@ subroutine set_misc(this, unusable, activate_all_exports, activate_all_imports, _UNUSED_DUMMY(unusable) end subroutine set_misc -end module mapl_OuterMetaComponent +end module mapl_OuterMetaComponent_mod diff --git a/superstructure/generic/OuterMetaComponent/SetServices.F90 b/superstructure/generic/OuterMetaComponent/SetServices.F90 index c9f03a1bdfd..67a9a6685cc 100644 --- a/superstructure/generic/OuterMetaComponent/SetServices.F90 +++ b/superstructure/generic/OuterMetaComponent/SetServices.F90 @@ -1,13 +1,13 @@ #include "MAPL.h" -submodule (mapl_OuterMetaComponent) SetServices_smod - use mapl_ComponentSpecParser - use mapl_ChildSpec - use mapl_ChildSpecMap - use mapl_GenericGridComp - use mapl_BasicVerticalGrid - use mapl_GriddedComponentDriverMap - use mapl_ErrorHandling +submodule (mapl_OuterMetaComponent_mod) SetServices_smod + use mapl_ComponentSpecParser_mod + use mapl_ChildSpec_mod + use mapl_ChildSpecMap_mod + use mapl_GenericGridComp_mod + use mapl_BasicVerticalGrid_mod + use mapl_GriddedComponentDriverMap_mod + use mapl_ErrorHandling_mod use pflogger, only: logger_t => logger implicit none(type,external) @@ -27,7 +27,7 @@ !========================================================================= recursive module subroutine SetServices_(this, rc) - use mapl_GenericGridComp, only: generic_setservices => setservices + use mapl_GenericGridComp_mod, only: generic_setservices => setservices class(OuterMetaComponent), target, intent(inout) :: this integer, intent(out) :: rc diff --git a/superstructure/generic/OuterMetaComponent/add_child_by_spec.F90 b/superstructure/generic/OuterMetaComponent/add_child_by_spec.F90 index 882bd8c5378..d23c6ccab8a 100644 --- a/superstructure/generic/OuterMetaComponent/add_child_by_spec.F90 +++ b/superstructure/generic/OuterMetaComponent/add_child_by_spec.F90 @@ -1,16 +1,16 @@ #include "MAPL.h" -submodule (mapl_OuterMetaComponent) add_child_by_spec_smod - - use mapl_ComponentSpecParser - use mapl_GenericGridComp - use mapl_ChildSpec - use mapl_ChildSpecMap - use mapl_GenericGridComp - use mapl_Validation - use mapl_Multistate - use mapl_HConfigUtilities, only: merge_hconfig - use mapl_ErrorHandling +submodule (mapl_OuterMetaComponent_mod) add_child_by_spec_smod + + use mapl_ComponentSpecParser_mod + use mapl_GenericGridComp_mod + use mapl_ChildSpec_mod + use mapl_ChildSpecMap_mod + use mapl_GenericGridComp_mod + use mapl_Validation_mod + use mapl_MultiState_mod + use mapl_HConfigUtilities_mod, only: merge_hconfig + use mapl_ErrorHandling_mod use esmf implicit none(type,external) diff --git a/superstructure/generic/OuterMetaComponent/advertise_variable.F90 b/superstructure/generic/OuterMetaComponent/advertise_variable.F90 index cd980b00c8c..6d424044176 100644 --- a/superstructure/generic/OuterMetaComponent/advertise_variable.F90 +++ b/superstructure/generic/OuterMetaComponent/advertise_variable.F90 @@ -1,11 +1,11 @@ #include "MAPL.h" -submodule (mapl_OuterMetaComponent) advertise_var_spec_smod +submodule (mapl_OuterMetaComponent_mod) advertise_var_spec_smod use mapl_Field_API - use mapl_VariableSpec - use mapl_StateItemSpec - use mapl_VirtualConnectionPt - use mapl_ErrorHandling + use mapl_VariableSpec_mod + use mapl_StateItemSpec_mod + use mapl_VirtualConnectionPt_mod + use mapl_ErrorHandling_mod implicit none(type,external) contains diff --git a/superstructure/generic/OuterMetaComponent/apply_to_children_custom.F90 b/superstructure/generic/OuterMetaComponent/apply_to_children_custom.F90 index 21bd324b970..d3f5b9cac1b 100644 --- a/superstructure/generic/OuterMetaComponent/apply_to_children_custom.F90 +++ b/superstructure/generic/OuterMetaComponent/apply_to_children_custom.F90 @@ -1,8 +1,8 @@ #include "MAPL.h" -submodule (mapl_OuterMetaComponent) apply_to_children_custom_smod - use mapl_GriddedComponentDriverMap - use mapl_ErrorHandling +submodule (mapl_OuterMetaComponent_mod) apply_to_children_custom_smod + use mapl_GriddedComponentDriverMap_mod + use mapl_ErrorHandling_mod implicit none(type,external) contains diff --git a/superstructure/generic/OuterMetaComponent/attach_outer_meta.F90 b/superstructure/generic/OuterMetaComponent/attach_outer_meta.F90 index 6eb8ff5ccfe..c513756c533 100644 --- a/superstructure/generic/OuterMetaComponent/attach_outer_meta.F90 +++ b/superstructure/generic/OuterMetaComponent/attach_outer_meta.F90 @@ -1,8 +1,8 @@ #include "MAPL.h" -submodule (mapl_OuterMetaComponent) attach_outer_meta_smod - use mapl_ESMF_Interfaces, only: MAPL_UserCompSetInternalState - use mapl_ErrorHandling +submodule (mapl_OuterMetaComponent_mod) attach_outer_meta_smod + use mapl_ESMF_Interfaces_mod, only: MAPL_UserCompSetInternalState + use mapl_ErrorHandling_mod implicit none(type,external) contains diff --git a/superstructure/generic/OuterMetaComponent/connect_all.F90 b/superstructure/generic/OuterMetaComponent/connect_all.F90 index b3059e33dfd..07347f58d2e 100644 --- a/superstructure/generic/OuterMetaComponent/connect_all.F90 +++ b/superstructure/generic/OuterMetaComponent/connect_all.F90 @@ -1,11 +1,11 @@ #include "MAPL.h" -submodule (mapl_OuterMetaComponent) connect_all_smod - use mapl_Connection - use mapl_ConnectionPt - use mapl_VirtualConnectionPt - use mapl_MatchConnection - use mapl_ErrorHandling +submodule (mapl_OuterMetaComponent_mod) connect_all_smod + use mapl_Connection_mod + use mapl_ConnectionPt_mod + use mapl_VirtualConnectionPt_mod + use mapl_MatchConnection_mod + use mapl_ErrorHandling_mod implicit none(type,external) contains diff --git a/superstructure/generic/OuterMetaComponent/finalize.F90 b/superstructure/generic/OuterMetaComponent/finalize.F90 index c590eec6857..143fad18376 100644 --- a/superstructure/generic/OuterMetaComponent/finalize.F90 +++ b/superstructure/generic/OuterMetaComponent/finalize.F90 @@ -1,13 +1,13 @@ #include "MAPL.h" -submodule (mapl_OuterMetaComponent) finalize_smod - - use mapl_GriddedComponentDriverMap - use mapl_GenericPhases - use mapl_ErrorHandling - use MAPL_Profiler, only: ProfileReporter - use MAPL_Profiler, only: MultiColumn, NameColumn, FormattedTextColumn, PercentageColumn - use MAPL_Profiler, only: InclusiveColumn, ExclusiveColumn, SeparatorColumn, NumCyclesColumn +submodule (mapl_OuterMetaComponent_mod) finalize_smod + + use mapl_GriddedComponentDriverMap_mod + use mapl_GenericPhases_mod + use mapl_ErrorHandling_mod + use mapl_Profiler_mod, only: ProfileReporter + use mapl_Profiler_mod, only: MultiColumn, NameColumn, FormattedTextColumn, PercentageColumn + use mapl_Profiler_mod, only: InclusiveColumn, ExclusiveColumn, SeparatorColumn, NumCyclesColumn use pflogger, only: logger_t => logger, logging use gFTL2_StringVector diff --git a/superstructure/generic/OuterMetaComponent/free_outer_meta.F90 b/superstructure/generic/OuterMetaComponent/free_outer_meta.F90 index e98d9e4f2cf..26eff6c90e5 100644 --- a/superstructure/generic/OuterMetaComponent/free_outer_meta.F90 +++ b/superstructure/generic/OuterMetaComponent/free_outer_meta.F90 @@ -1,8 +1,8 @@ #include "MAPL.h" -submodule (mapl_OuterMetaComponent) free_outer_meta_smod - use mapl_ESMF_Interfaces, only: MAPL_UserCompGetInternalState - use mapl_ErrorHandling +submodule (mapl_OuterMetaComponent_mod) free_outer_meta_smod + use mapl_ESMF_Interfaces_mod, only: MAPL_UserCompGetInternalState + use mapl_ErrorHandling_mod implicit none(type,external) contains diff --git a/superstructure/generic/OuterMetaComponent/get_child_by_name.F90 b/superstructure/generic/OuterMetaComponent/get_child_by_name.F90 index 121076d4926..21473bd7e50 100644 --- a/superstructure/generic/OuterMetaComponent/get_child_by_name.F90 +++ b/superstructure/generic/OuterMetaComponent/get_child_by_name.F90 @@ -1,7 +1,7 @@ #include "MAPL.h" -submodule (mapl_OuterMetaComponent) get_child_by_name_smod - use mapl_ErrorHandling +submodule (mapl_OuterMetaComponent_mod) get_child_by_name_smod + use mapl_ErrorHandling_mod implicit none(type,external) contains diff --git a/superstructure/generic/OuterMetaComponent/get_child_name.F90 b/superstructure/generic/OuterMetaComponent/get_child_name.F90 index 6324680651b..6c86e125f15 100644 --- a/superstructure/generic/OuterMetaComponent/get_child_name.F90 +++ b/superstructure/generic/OuterMetaComponent/get_child_name.F90 @@ -1,9 +1,9 @@ #include "MAPL.h" -submodule (mapl_OuterMetaComponent) get_child_name_smod +submodule (mapl_OuterMetaComponent_mod) get_child_name_smod - use mapl_GriddedComponentDriverMap - use mapl_ErrorHandling + use mapl_GriddedComponentDriverMap_mod + use mapl_ErrorHandling_mod implicit none(type,external) diff --git a/superstructure/generic/OuterMetaComponent/get_component_spec.F90 b/superstructure/generic/OuterMetaComponent/get_component_spec.F90 index d4aa29d0551..1eb0019735d 100644 --- a/superstructure/generic/OuterMetaComponent/get_component_spec.F90 +++ b/superstructure/generic/OuterMetaComponent/get_component_spec.F90 @@ -1,6 +1,6 @@ #include "MAPL.h" -submodule (mapl_OuterMetaComponent) get_component_spec_smod +submodule (mapl_OuterMetaComponent_mod) get_component_spec_smod implicit none(type,external) contains diff --git a/superstructure/generic/OuterMetaComponent/get_geom.F90 b/superstructure/generic/OuterMetaComponent/get_geom.F90 index 5cd72728ca1..f42c12a4022 100644 --- a/superstructure/generic/OuterMetaComponent/get_geom.F90 +++ b/superstructure/generic/OuterMetaComponent/get_geom.F90 @@ -1,8 +1,8 @@ #include "MAPL.h" -submodule (mapl_OuterMetaComponent) get_geom_smod +submodule (mapl_OuterMetaComponent_mod) get_geom_smod - use mapl_ErrorHandling + use mapl_ErrorHandling_mod implicit none(type,external) contains diff --git a/superstructure/generic/OuterMetaComponent/get_gridcomp.F90 b/superstructure/generic/OuterMetaComponent/get_gridcomp.F90 index c0c62227f38..93927ce4176 100644 --- a/superstructure/generic/OuterMetaComponent/get_gridcomp.F90 +++ b/superstructure/generic/OuterMetaComponent/get_gridcomp.F90 @@ -1,6 +1,6 @@ #include "MAPL.h" -submodule (mapl_OuterMetaComponent) get_gridcomp_smod +submodule (mapl_OuterMetaComponent_mod) get_gridcomp_smod implicit none(type,external) contains diff --git a/superstructure/generic/OuterMetaComponent/get_hconfig.F90 b/superstructure/generic/OuterMetaComponent/get_hconfig.F90 index fd29edb0b8a..21f00f02de2 100644 --- a/superstructure/generic/OuterMetaComponent/get_hconfig.F90 +++ b/superstructure/generic/OuterMetaComponent/get_hconfig.F90 @@ -1,6 +1,6 @@ #include "MAPL.h" -submodule (mapl_OuterMetaComponent) get_hconfig_smod +submodule (mapl_OuterMetaComponent_mod) get_hconfig_smod implicit none(type,external) contains diff --git a/superstructure/generic/OuterMetaComponent/get_internal_state.F90 b/superstructure/generic/OuterMetaComponent/get_internal_state.F90 index 6c3defb0ca9..1e7cc898e85 100644 --- a/superstructure/generic/OuterMetaComponent/get_internal_state.F90 +++ b/superstructure/generic/OuterMetaComponent/get_internal_state.F90 @@ -1,7 +1,7 @@ #include "MAPL.h" -submodule (mapl_OuterMetaComponent) get_internal_state_smod - use mapl_Multistate +submodule (mapl_OuterMetaComponent_mod) get_internal_state_smod + use mapl_MultiState_mod implicit none(type,external) contains diff --git a/superstructure/generic/OuterMetaComponent/get_logger.F90 b/superstructure/generic/OuterMetaComponent/get_logger.F90 index 934d1e5f887..db66252ade9 100644 --- a/superstructure/generic/OuterMetaComponent/get_logger.F90 +++ b/superstructure/generic/OuterMetaComponent/get_logger.F90 @@ -1,6 +1,6 @@ #include "MAPL.h" -submodule (mapl_OuterMetaComponent) get_logger_smod +submodule (mapl_OuterMetaComponent_mod) get_logger_smod implicit none(type,external) contains diff --git a/superstructure/generic/OuterMetaComponent/get_name.F90 b/superstructure/generic/OuterMetaComponent/get_name.F90 index c88eabd4d0c..2067acf2beb 100644 --- a/superstructure/generic/OuterMetaComponent/get_name.F90 +++ b/superstructure/generic/OuterMetaComponent/get_name.F90 @@ -1,7 +1,7 @@ #include "MAPL.h" -submodule (mapl_OuterMetaComponent) get_name_smod - use mapl_ErrorHandling +submodule (mapl_OuterMetaComponent_mod) get_name_smod + use mapl_ErrorHandling_mod implicit none(type,external) contains diff --git a/superstructure/generic/OuterMetaComponent/get_num_children.F90 b/superstructure/generic/OuterMetaComponent/get_num_children.F90 index 607a6ce6594..66b0f04a170 100644 --- a/superstructure/generic/OuterMetaComponent/get_num_children.F90 +++ b/superstructure/generic/OuterMetaComponent/get_num_children.F90 @@ -1,9 +1,9 @@ #include "MAPL.h" -submodule (mapl_OuterMetaComponent) get_num_children_smod +submodule (mapl_OuterMetaComponent_mod) get_num_children_smod - use mapl_GriddedComponentDriverMap - use mapl_ErrorHandling + use mapl_GriddedComponentDriverMap_mod + use mapl_ErrorHandling_mod implicit none(type,external) diff --git a/superstructure/generic/OuterMetaComponent/get_outer_meta_from_outer_gc.F90 b/superstructure/generic/OuterMetaComponent/get_outer_meta_from_outer_gc.F90 index 536943fc789..3290469b92f 100644 --- a/superstructure/generic/OuterMetaComponent/get_outer_meta_from_outer_gc.F90 +++ b/superstructure/generic/OuterMetaComponent/get_outer_meta_from_outer_gc.F90 @@ -1,8 +1,8 @@ #include "MAPL.h" -submodule (mapl_OuterMetaComponent) get_outer_meta_from_outer_gc_smod - use mapl_ESMF_Interfaces, only: MAPL_UserCompGetInternalState - use mapl_ErrorHandling +submodule (mapl_OuterMetaComponent_mod) get_outer_meta_from_outer_gc_smod + use mapl_ESMF_Interfaces_mod, only: MAPL_UserCompGetInternalState + use mapl_ErrorHandling_mod implicit none(type,external) contains diff --git a/superstructure/generic/OuterMetaComponent/get_phases.F90 b/superstructure/generic/OuterMetaComponent/get_phases.F90 index 4ec4025d0e5..8bc6042e995 100644 --- a/superstructure/generic/OuterMetaComponent/get_phases.F90 +++ b/superstructure/generic/OuterMetaComponent/get_phases.F90 @@ -1,6 +1,6 @@ #include "MAPL.h" -submodule (mapl_OuterMetaComponent) get_phases_smod +submodule (mapl_OuterMetaComponent_mod) get_phases_smod implicit none(type,external) contains diff --git a/superstructure/generic/OuterMetaComponent/get_registry.F90 b/superstructure/generic/OuterMetaComponent/get_registry.F90 index a0835b4abb4..b297a9e24e6 100644 --- a/superstructure/generic/OuterMetaComponent/get_registry.F90 +++ b/superstructure/generic/OuterMetaComponent/get_registry.F90 @@ -1,6 +1,6 @@ #include "MAPL.h" -submodule (mapl_OuterMetaComponent) get_registry_smod +submodule (mapl_OuterMetaComponent_mod) get_registry_smod implicit none(type,external) contains diff --git a/superstructure/generic/OuterMetaComponent/get_user_gc_driver.F90 b/superstructure/generic/OuterMetaComponent/get_user_gc_driver.F90 index ada21ab51b1..938ee72603b 100644 --- a/superstructure/generic/OuterMetaComponent/get_user_gc_driver.F90 +++ b/superstructure/generic/OuterMetaComponent/get_user_gc_driver.F90 @@ -1,6 +1,6 @@ #include "MAPL.h" -submodule (mapl_OuterMetaComponent) get_user_gc_driver_smod +submodule (mapl_OuterMetaComponent_mod) get_user_gc_driver_smod implicit none(type,external) contains diff --git a/superstructure/generic/OuterMetaComponent/get_vertical_grid.F90 b/superstructure/generic/OuterMetaComponent/get_vertical_grid.F90 index 0001608038d..8dd93724750 100644 --- a/superstructure/generic/OuterMetaComponent/get_vertical_grid.F90 +++ b/superstructure/generic/OuterMetaComponent/get_vertical_grid.F90 @@ -1,6 +1,6 @@ #include "MAPL.h" -submodule (mapl_OuterMetaComponent) get_vertical_grid_smod +submodule (mapl_OuterMetaComponent_mod) get_vertical_grid_smod implicit none(type,external) diff --git a/superstructure/generic/OuterMetaComponent/has_geom.F90 b/superstructure/generic/OuterMetaComponent/has_geom.F90 index f1a13549071..f6938ed7339 100644 --- a/superstructure/generic/OuterMetaComponent/has_geom.F90 +++ b/superstructure/generic/OuterMetaComponent/has_geom.F90 @@ -1,6 +1,6 @@ #include "MAPL.h" -submodule (mapl_OuterMetaComponent) has_geom_smod +submodule (mapl_OuterMetaComponent_mod) has_geom_smod implicit none(type,external) diff --git a/superstructure/generic/OuterMetaComponent/init_meta.F90 b/superstructure/generic/OuterMetaComponent/init_meta.F90 index 29688046c06..73d4e78ce9c 100644 --- a/superstructure/generic/OuterMetaComponent/init_meta.F90 +++ b/superstructure/generic/OuterMetaComponent/init_meta.F90 @@ -1,7 +1,7 @@ #include "MAPL.h" -submodule (mapl_OuterMetaComponent) init_meta_smod - use mapl_ErrorHandling +submodule (mapl_OuterMetaComponent_mod) init_meta_smod + use mapl_ErrorHandling_mod use pFlogger, only: logging implicit none(type,external) diff --git a/superstructure/generic/OuterMetaComponent/initialize_advertise.F90 b/superstructure/generic/OuterMetaComponent/initialize_advertise.F90 index fa4dd5660f9..a0dfe1af671 100644 --- a/superstructure/generic/OuterMetaComponent/initialize_advertise.F90 +++ b/superstructure/generic/OuterMetaComponent/initialize_advertise.F90 @@ -1,19 +1,19 @@ #include "MAPL.h" -submodule (mapl_OuterMetaComponent) initialize_advertise_smod - use mapl_GenericPhases, only: GENERIC_INIT_ADVERTISE - use mapl_VirtualConnectionPt - use mapl_StateItemImpl - use mapl_VariableSpec - use mapl_VariableSpecVector, only: VariableSpecVectorIterator +submodule (mapl_OuterMetaComponent_mod) initialize_advertise_smod + use mapl_GenericPhases_mod, only: GENERIC_INIT_ADVERTISE + use mapl_VirtualConnectionPt_mod + use mapl_StateItemImpl_mod + use mapl_VariableSpec_mod + use mapl_VariableSpecVector_mod, only: VariableSpecVectorIterator use esmf, only: operator(==) - use mapl_Connection - use mapl_ConnectionVector, only: ConnectionVectorIterator - use mapl_ConnectionVector, only: operator(/=) - use mapl_VariableSpecVector, only: operator(/=) - use mapl_StateItemSpec - use mapl_Multistate - use mapl_ErrorHandling + use mapl_Connection_mod + use mapl_ConnectionVector_mod, only: ConnectionVectorIterator + use mapl_ConnectionVector_mod, only: operator(/=) + use mapl_VariableSpecVector_mod, only: operator(/=) + use mapl_StateItemSpec_mod + use mapl_MultiState_mod + use mapl_ErrorHandling_mod implicit none (type, external) diff --git a/superstructure/generic/OuterMetaComponent/initialize_geom_a.F90 b/superstructure/generic/OuterMetaComponent/initialize_geom_a.F90 index 5d119fb7570..a19b1cbcf28 100644 --- a/superstructure/generic/OuterMetaComponent/initialize_geom_a.F90 +++ b/superstructure/generic/OuterMetaComponent/initialize_geom_a.F90 @@ -1,13 +1,13 @@ #include "MAPL.h" -submodule (mapl_OuterMetaComponent) initialize_geom_a_smod +submodule (mapl_OuterMetaComponent_mod) initialize_geom_a_smod - use mapl_GenericPhases - use mapl_GeometrySpec - use mapl_Geom_API - use mapl_GriddedComponentDriver - use mapl_ErrorHandling - use MAPL_MpiTimerGauge, only: MpiTimerGauge + use mapl_GenericPhases_mod + use mapl_GeometrySpec_mod + use mapl_Geom_API_mod + use mapl_GriddedComponentDriver_mod + use mapl_ErrorHandling_mod + use mapl_MpiTimerGauge_mod, only: MpiTimerGauge implicit none(type,external) diff --git a/superstructure/generic/OuterMetaComponent/initialize_geom_b.F90 b/superstructure/generic/OuterMetaComponent/initialize_geom_b.F90 index 50fc96fc2cb..d8a66e6c774 100644 --- a/superstructure/generic/OuterMetaComponent/initialize_geom_b.F90 +++ b/superstructure/generic/OuterMetaComponent/initialize_geom_b.F90 @@ -1,9 +1,9 @@ #include "MAPL.h" -submodule (mapl_OuterMetaComponent) initialize_geom_b_smod - use mapl_GenericPhases - use mapl_GeometrySpec - use mapl_ErrorHandling +submodule (mapl_OuterMetaComponent_mod) initialize_geom_b_smod + use mapl_GenericPhases_mod + use mapl_GeometrySpec_mod + use mapl_ErrorHandling_mod implicit none(type,external) contains diff --git a/superstructure/generic/OuterMetaComponent/initialize_modify_advertised.F90 b/superstructure/generic/OuterMetaComponent/initialize_modify_advertised.F90 index ce0cca3c371..f73b191a261 100644 --- a/superstructure/generic/OuterMetaComponent/initialize_modify_advertised.F90 +++ b/superstructure/generic/OuterMetaComponent/initialize_modify_advertised.F90 @@ -1,12 +1,12 @@ #include "MAPL.h" -submodule (mapl_OuterMetaComponent) initialize_modify_advertised_smod - use mapl_GenericPhases - use mapl_MultiState - use mapl_Connection - use mapl_ConnectionVector, only: ConnectionVectorIterator - use mapl_ConnectionVector, only: operator(/=) - use mapl_ErrorHandling +submodule (mapl_OuterMetaComponent_mod) initialize_modify_advertised_smod + use mapl_GenericPhases_mod + use mapl_MultiState_mod + use mapl_Connection_mod + use mapl_ConnectionVector_mod, only: ConnectionVectorIterator + use mapl_ConnectionVector_mod, only: operator(/=) + use mapl_ErrorHandling_mod implicit none(type,external) contains diff --git a/superstructure/generic/OuterMetaComponent/initialize_read_restart.F90 b/superstructure/generic/OuterMetaComponent/initialize_read_restart.F90 index 15b35dced46..868c924f62c 100644 --- a/superstructure/generic/OuterMetaComponent/initialize_read_restart.F90 +++ b/superstructure/generic/OuterMetaComponent/initialize_read_restart.F90 @@ -1,12 +1,12 @@ #include "MAPL.h" -submodule (mapl_OuterMetaComponent) initialize_read_restart_smod +submodule (mapl_OuterMetaComponent_mod) initialize_read_restart_smod - use mapl_GenericPhases - use mapl_ErrorHandling - use mapl_MultiState - use mapl_RestartHandler, only: RestartHandler - use mapl_OS + use mapl_GenericPhases_mod + use mapl_ErrorHandling_mod + use mapl_MultiState_mod + use mapl_RestartHandler_mod, only: RestartHandler + use mapl_os_mod use mapl_mp_utils, only: MAPL_GetCheckpointSubdir implicit none(type,external) diff --git a/superstructure/generic/OuterMetaComponent/initialize_realize.F90 b/superstructure/generic/OuterMetaComponent/initialize_realize.F90 index 5bda3e6c453..be77af022d2 100644 --- a/superstructure/generic/OuterMetaComponent/initialize_realize.F90 +++ b/superstructure/generic/OuterMetaComponent/initialize_realize.F90 @@ -1,9 +1,9 @@ #include "MAPL.h" -submodule (mapl_OuterMetaComponent) initialize_realize_smod - use mapl_Multistate - use mapl_GenericPhases - use mapl_ErrorHandling +submodule (mapl_OuterMetaComponent_mod) initialize_realize_smod + use mapl_MultiState_mod + use mapl_GenericPhases_mod + use mapl_ErrorHandling_mod implicit none(type,external) contains diff --git a/superstructure/generic/OuterMetaComponent/initialize_set_clock.F90 b/superstructure/generic/OuterMetaComponent/initialize_set_clock.F90 index 035786e0c6a..d7debd72ae3 100644 --- a/superstructure/generic/OuterMetaComponent/initialize_set_clock.F90 +++ b/superstructure/generic/OuterMetaComponent/initialize_set_clock.F90 @@ -1,11 +1,11 @@ #include "MAPL.h" -submodule (mapl_OuterMetaComponent) initialize_set_clock_smod - use mapl_GenericPhases, only: GENERIC_INIT_SET_CLOCK - use mapl_ComponentDriver - use mapl_GriddedComponentDriverMap - use mapl_ESMF_Time_Utilities - use mapl_ErrorHandling +submodule (mapl_OuterMetaComponent_mod) initialize_set_clock_smod + use mapl_GenericPhases_mod, only: GENERIC_INIT_SET_CLOCK + use mapl_ComponentDriver_mod + use mapl_GriddedComponentDriverMap_mod + use mapl_ESMF_Time_Utilities_mod + use mapl_ErrorHandling_mod implicit none(type,external) contains diff --git a/superstructure/generic/OuterMetaComponent/initialize_user.F90 b/superstructure/generic/OuterMetaComponent/initialize_user.F90 index b3f5f04a5da..0e3ebc8d7f0 100644 --- a/superstructure/generic/OuterMetaComponent/initialize_user.F90 +++ b/superstructure/generic/OuterMetaComponent/initialize_user.F90 @@ -1,12 +1,12 @@ #include "MAPL.h" -submodule (mapl_OuterMetaComponent) initialize_user_smod +submodule (mapl_OuterMetaComponent_mod) initialize_user_smod - use mapl_GenericPhases - use mapl_ComponentDriver - use mapl_ComponentDriverPtrVector - use mapl_CouplerPhases, only: GENERIC_COUPLER_INITIALIZE - use mapl_ErrorHandling + use mapl_GenericPhases_mod + use mapl_ComponentDriver_mod + use mapl_ComponentDriverPtrVector_mod + use mapl_CouplerPhases_mod, only: GENERIC_COUPLER_INITIALIZE + use mapl_ErrorHandling_mod use pflogger, only: logger_t => logger implicit none(type,external) diff --git a/superstructure/generic/OuterMetaComponent/new_outer_meta.F90 b/superstructure/generic/OuterMetaComponent/new_outer_meta.F90 index 65100e50021..b83249acfdd 100644 --- a/superstructure/generic/OuterMetaComponent/new_outer_meta.F90 +++ b/superstructure/generic/OuterMetaComponent/new_outer_meta.F90 @@ -1,6 +1,6 @@ #include "MAPL.h" -submodule (mapl_OuterMetaComponent) new_outer_meta_smod +submodule (mapl_OuterMetaComponent_mod) new_outer_meta_smod implicit none(type,external) contains diff --git a/superstructure/generic/OuterMetaComponent/recurse.F90 b/superstructure/generic/OuterMetaComponent/recurse.F90 index 9df64b69d5d..572668f1006 100644 --- a/superstructure/generic/OuterMetaComponent/recurse.F90 +++ b/superstructure/generic/OuterMetaComponent/recurse.F90 @@ -1,8 +1,8 @@ #include "MAPL.h" -submodule (mapl_OuterMetaComponent) recurse_smod - use mapl_GriddedComponentDriverMap - use mapl_ErrorHandling +submodule (mapl_OuterMetaComponent_mod) recurse_smod + use mapl_GriddedComponentDriverMap_mod + use mapl_ErrorHandling_mod implicit none(type,external) contains diff --git a/superstructure/generic/OuterMetaComponent/run_child_by_name.F90 b/superstructure/generic/OuterMetaComponent/run_child_by_name.F90 index 476632aea39..aa0914eb32b 100644 --- a/superstructure/generic/OuterMetaComponent/run_child_by_name.F90 +++ b/superstructure/generic/OuterMetaComponent/run_child_by_name.F90 @@ -1,7 +1,7 @@ #include "MAPL.h" -submodule (mapl_OuterMetaComponent) run_child_by_name_smod - use mapl_ErrorHandling +submodule (mapl_OuterMetaComponent_mod) run_child_by_name_smod + use mapl_ErrorHandling_mod implicit none(type,external) contains diff --git a/superstructure/generic/OuterMetaComponent/run_children.F90 b/superstructure/generic/OuterMetaComponent/run_children.F90 index 13b61b6b3f4..a57685f52c7 100644 --- a/superstructure/generic/OuterMetaComponent/run_children.F90 +++ b/superstructure/generic/OuterMetaComponent/run_children.F90 @@ -1,8 +1,8 @@ #include "MAPL.h" -submodule (mapl_OuterMetaComponent) run_children_smod - use mapl_GriddedComponentDriverMap - use mapl_ErrorHandling +submodule (mapl_OuterMetaComponent_mod) run_children_smod + use mapl_GriddedComponentDriverMap_mod + use mapl_ErrorHandling_mod implicit none(type,external) contains diff --git a/superstructure/generic/OuterMetaComponent/run_clock_advance.F90 b/superstructure/generic/OuterMetaComponent/run_clock_advance.F90 index fc5240570c9..374a8f1e031 100644 --- a/superstructure/generic/OuterMetaComponent/run_clock_advance.F90 +++ b/superstructure/generic/OuterMetaComponent/run_clock_advance.F90 @@ -1,9 +1,9 @@ #include "MAPL.h" -submodule (mapl_OuterMetaComponent) run_clock_advance_smod - use mapl_GenericPhases - use mapl_GriddedComponentDriverMap - use mapl_ErrorHandling +submodule (mapl_OuterMetaComponent_mod) run_clock_advance_smod + use mapl_GenericPhases_mod + use mapl_GriddedComponentDriverMap_mod + use mapl_ErrorHandling_mod implicit none(type,external) contains diff --git a/superstructure/generic/OuterMetaComponent/run_custom.F90 b/superstructure/generic/OuterMetaComponent/run_custom.F90 index 46dd410e33b..ec38daa25a1 100644 --- a/superstructure/generic/OuterMetaComponent/run_custom.F90 +++ b/superstructure/generic/OuterMetaComponent/run_custom.F90 @@ -1,7 +1,7 @@ #include "MAPL.h" -submodule (mapl_OuterMetaComponent) run_custom_smod - use mapl_ErrorHandling +submodule (mapl_OuterMetaComponent_mod) run_custom_smod + use mapl_ErrorHandling_mod use esmf, only: operator(==) implicit none(type,external) diff --git a/superstructure/generic/OuterMetaComponent/run_user.F90 b/superstructure/generic/OuterMetaComponent/run_user.F90 index 7e6b9fbe2d9..ee418a828af 100644 --- a/superstructure/generic/OuterMetaComponent/run_user.F90 +++ b/superstructure/generic/OuterMetaComponent/run_user.F90 @@ -1,11 +1,11 @@ #include "MAPL.h" -submodule (mapl_OuterMetaComponent) run_user_smod +submodule (mapl_OuterMetaComponent_mod) run_user_smod - use mapl_ComponentDriver - use mapl_ComponentDriverPtrVector - use mapl_CouplerPhases, only: GENERIC_COUPLER_INVALIDATE, GENERIC_COUPLER_UPDATE - use mapl_ErrorHandling + use mapl_ComponentDriver_mod + use mapl_ComponentDriverPtrVector_mod + use mapl_CouplerPhases_mod, only: GENERIC_COUPLER_INVALIDATE, GENERIC_COUPLER_UPDATE + use mapl_ErrorHandling_mod use pflogger, only: logger_t => logger implicit none(type,external) diff --git a/superstructure/generic/OuterMetaComponent/set_entry_point.F90 b/superstructure/generic/OuterMetaComponent/set_entry_point.F90 index e88b7f47d54..065fe1b78d2 100644 --- a/superstructure/generic/OuterMetaComponent/set_entry_point.F90 +++ b/superstructure/generic/OuterMetaComponent/set_entry_point.F90 @@ -1,12 +1,13 @@ #include "MAPL.h" -submodule (mapl_OuterMetaComponent) set_entry_point_smod - use mapl_ErrorHandling +submodule (mapl_OuterMetaComponent_mod) set_entry_point_smod + use mapl_ErrorHandling_mod implicit none(type,external) contains module subroutine set_entry_point(this, method_flag, userProcedure, unusable, phase_name, rc) + use mapl_KeywordEnforcer_mod class(OuterMetaComponent), intent(inout) :: this type(ESMF_Method_Flag), intent(in) :: method_flag procedure(I_Run) :: userProcedure diff --git a/superstructure/generic/OuterMetaComponent/set_geom.F90 b/superstructure/generic/OuterMetaComponent/set_geom.F90 index 04a59d6609b..1c181a1db54 100644 --- a/superstructure/generic/OuterMetaComponent/set_geom.F90 +++ b/superstructure/generic/OuterMetaComponent/set_geom.F90 @@ -1,6 +1,6 @@ #include "MAPL.h" -submodule (mapl_OuterMetaComponent) set_geom_smod +submodule (mapl_OuterMetaComponent_mod) set_geom_smod implicit none(type,external) contains diff --git a/superstructure/generic/OuterMetaComponent/set_hconfig.F90 b/superstructure/generic/OuterMetaComponent/set_hconfig.F90 index 28e204dfa2f..edc3b300d09 100644 --- a/superstructure/generic/OuterMetaComponent/set_hconfig.F90 +++ b/superstructure/generic/OuterMetaComponent/set_hconfig.F90 @@ -1,6 +1,6 @@ #include "MAPL.h" -submodule (mapl_OuterMetaComponent) set_hconfig_smod +submodule (mapl_OuterMetaComponent_mod) set_hconfig_smod implicit none(type,external) contains diff --git a/superstructure/generic/OuterMetaComponent/set_vertical_grid.F90 b/superstructure/generic/OuterMetaComponent/set_vertical_grid.F90 index 04998a520d9..cb9ecdfc0ed 100644 --- a/superstructure/generic/OuterMetaComponent/set_vertical_grid.F90 +++ b/superstructure/generic/OuterMetaComponent/set_vertical_grid.F90 @@ -1,6 +1,6 @@ #include "MAPL.h" -submodule (mapl_OuterMetaComponent) set_vertical_grid_smod +submodule (mapl_OuterMetaComponent_mod) set_vertical_grid_smod implicit none(type,external) contains diff --git a/superstructure/generic/OuterMetaComponent/start_timer.F90 b/superstructure/generic/OuterMetaComponent/start_timer.F90 index 5d073295dea..5e535cb360f 100644 --- a/superstructure/generic/OuterMetaComponent/start_timer.F90 +++ b/superstructure/generic/OuterMetaComponent/start_timer.F90 @@ -1,8 +1,8 @@ #include "MAPL.h" -submodule (mapl_OuterMetaComponent) start_timer_smod +submodule (mapl_OuterMetaComponent_mod) start_timer_smod - use mapl_ErrorHandling + use mapl_ErrorHandling_mod implicit none(type,external) diff --git a/superstructure/generic/OuterMetaComponent/stop_timer.F90 b/superstructure/generic/OuterMetaComponent/stop_timer.F90 index 57e1bd88c16..a1403536bef 100644 --- a/superstructure/generic/OuterMetaComponent/stop_timer.F90 +++ b/superstructure/generic/OuterMetaComponent/stop_timer.F90 @@ -1,8 +1,8 @@ #include "MAPL.h" -submodule (mapl_OuterMetaComponent) stop_timer_smod +submodule (mapl_OuterMetaComponent_mod) stop_timer_smod - use mapl_ErrorHandling + use mapl_ErrorHandling_mod implicit none(type,external) diff --git a/superstructure/generic/OuterMetaComponent/write_restart.F90 b/superstructure/generic/OuterMetaComponent/write_restart.F90 index abf27b7590c..91a45c1a031 100644 --- a/superstructure/generic/OuterMetaComponent/write_restart.F90 +++ b/superstructure/generic/OuterMetaComponent/write_restart.F90 @@ -1,11 +1,11 @@ #include "MAPL.h" -submodule (mapl_OuterMetaComponent) write_restart_smod - use mapl_MultiState - use mapl_RestartHandler - use mapl_OS +submodule (mapl_OuterMetaComponent_mod) write_restart_smod + use mapl_MultiState_mod + use mapl_RestartHandler_mod + use mapl_os_mod use mapl_mp_utils, only: MAPL_GetCheckpointSubdir - use mapl_ErrorHandling + use mapl_ErrorHandling_mod implicit none(type,external) contains diff --git a/superstructure/generic/RestartHandler.F90 b/superstructure/generic/RestartHandler.F90 index 768b8ac08b3..ace35ca98de 100644 --- a/superstructure/generic/RestartHandler.F90 +++ b/superstructure/generic/RestartHandler.F90 @@ -1,14 +1,14 @@ #include "MAPL.h" -module mapl_RestartHandler +module mapl_RestartHandler_mod use esmf - use mapl_ErrorHandling, only: MAPL_Verify, MAPL_Return, MAPL_Assert + use mapl_ErrorHandling_mod, only: MAPL_Verify, MAPL_Return, MAPL_Assert use mapl_geomio, only: bundle_to_metadata, GeomPFIO, make_geom_pfio - use mapl_FieldInfo, only: FieldInfoGetInternal - use mapl_RestartModes, only: RestartMode, operator(==), MAPL_RESTART_SKIP + use mapl_FieldInfo_mod, only: FieldInfoGetInternal + use mapl_RestartModes_mod, only: RestartMode, operator(==), MAPL_RESTART_SKIP use mapl_Field_API, only: MAPL_FieldGet - use mapl_FieldBundle_API, only: MAPL_FieldBundleAdd, MAPL_FieldBundleGet + use mapl_FieldBundle_API_mod, only: MAPL_FieldBundleAdd, MAPL_FieldBundleGet use pFIO, only: PFIO_READ, FileMetaData, NetCDF4_FileFormatter use pFIO, only: i_Clients, o_Clients use pFlogger, only: logging, logger @@ -228,4 +228,4 @@ subroutine filter_fields_incomplete_(bundle, rc) _RETURN(_SUCCESS) end subroutine filter_fields_incomplete_ -end module mapl_RestartHandler +end module mapl_RestartHandler_mod diff --git a/superstructure/generic/RunEntryPoint.F90 b/superstructure/generic/RunEntryPoint.F90 index 9c7e90c683a..267a4757114 100644 --- a/superstructure/generic/RunEntryPoint.F90 +++ b/superstructure/generic/RunEntryPoint.F90 @@ -1,4 +1,4 @@ -module mapl_RunEntryPoint +module mapl_RunEntryPoint_mod implicit none(type,external) private @@ -8,4 +8,4 @@ module mapl_RunEntryPoint procedure(), pointer, nopass :: run_entry_point => null() end type runEntryPoint -end module mapl_RunEntryPoint +end module mapl_RunEntryPoint_mod diff --git a/superstructure/generic/UserSetServices.F90 b/superstructure/generic/UserSetServices.F90 index bd1536dec63..3bed8ce3843 100644 --- a/superstructure/generic/UserSetServices.F90 +++ b/superstructure/generic/UserSetServices.F90 @@ -12,12 +12,12 @@ ! ss = user_setservices(...) ! -module mapl_UserSetServices +module mapl_UserSetServices_mod use :: ESMF, only: ESMF_GridComp use :: ESMF, only: ESMF_GridCompSetServices use :: ESMF, only: ESMF_SUCCESS - use :: mapl_ESMF_Interfaces, only: I_SetServices - use :: mapl_ErrorHandling + use :: mapl_ESMF_Interfaces_mod, only: I_SetServices + use :: mapl_ErrorHandling_mod implicit none(type,external) private @@ -133,7 +133,7 @@ end subroutine write_formatted_proc ! Argument names correspond to ESMF arguments. function new_DSOSetServices(sharedObj, userRoutine) result(dso_setservices) - use mapl_DSO_Utilities + use mapl_DSO_Utilities_mod type(DSOSetServices) :: dso_setservices character(len=*), intent(in) :: sharedObj character(len=*), optional, intent(in) :: userRoutine @@ -149,7 +149,7 @@ function new_DSOSetServices(sharedObj, userRoutine) result(dso_setservices) end function new_DSOSetServices subroutine run_DSOSetServices(this, gridcomp, rc) - use mapl_DSO_Utilities + use mapl_DSO_Utilities_mod class(DSOSetservices), intent(in) :: this type(ESMF_GridComp) :: GridComp integer, intent(out) :: rc @@ -232,4 +232,4 @@ end function not_equal_DSOSetServices -end module mapl_UserSetServices +end module mapl_UserSetServices_mod diff --git a/superstructure/generic/connection/ActualConnectionPt.F90 b/superstructure/generic/connection/ActualConnectionPt.F90 index 8ccbdb861fb..1f2dcefd656 100644 --- a/superstructure/generic/connection/ActualConnectionPt.F90 +++ b/superstructure/generic/connection/ActualConnectionPt.F90 @@ -1,8 +1,8 @@ #include "MAPL.h" -module mapl_ActualConnectionPt - use mapl_VirtualConnectionPt - use mapl_KeywordEnforcer +module mapl_ActualConnectionPt_mod + use mapl_VirtualConnectionPt_mod + use mapl_KeywordEnforcer_mod implicit none(type,external) private @@ -251,4 +251,4 @@ logical function is_represented_in(this, mode) end function is_represented_in -end module mapl_ActualConnectionPt +end module mapl_ActualConnectionPt_mod diff --git a/superstructure/generic/connection/Connection.F90 b/superstructure/generic/connection/Connection.F90 index 70cb99a0130..e4c00e569d8 100644 --- a/superstructure/generic/connection/Connection.F90 +++ b/superstructure/generic/connection/Connection.F90 @@ -1,4 +1,4 @@ -module mapl_Connection +module mapl_Connection_mod implicit none(type,external) private @@ -17,14 +17,14 @@ module mapl_Connection abstract interface function I_get(this) result(source) - use mapl_ConnectionPt + use mapl_ConnectionPt_mod import Connection type(ConnectionPt) :: source class(Connection), intent(in) :: this end function I_get subroutine I_activate(this, registry, rc) - use mapl_StateRegistry + use mapl_StateRegistry_mod import Connection class(Connection), target, intent(in) :: this type(StateRegistry), target, intent(inout) :: registry @@ -32,7 +32,7 @@ subroutine I_activate(this, registry, rc) end subroutine I_activate subroutine I_connect(this, registry, rc) - use mapl_StateRegistry + use mapl_StateRegistry_mod import Connection class(Connection), target, intent(inout) :: this type(StateRegistry), target, intent(inout) :: registry @@ -42,4 +42,4 @@ end subroutine I_connect end interface -end module mapl_Connection +end module mapl_Connection_mod diff --git a/superstructure/generic/connection/ConnectionPt.F90 b/superstructure/generic/connection/ConnectionPt.F90 index 9546851de7a..05170d76294 100644 --- a/superstructure/generic/connection/ConnectionPt.F90 +++ b/superstructure/generic/connection/ConnectionPt.F90 @@ -1,5 +1,5 @@ -module mapl_ConnectionPt - use mapl_VirtualConnectionPt +module mapl_ConnectionPt_mod + use mapl_VirtualConnectionPt_mod implicit none(type,external) private @@ -115,4 +115,4 @@ logical function is_internal(this) is_internal = (this%get_state_intent() == 'internal') end function is_internal -end module mapl_ConnectionPt +end module mapl_ConnectionPt_mod diff --git a/superstructure/generic/connection/ConnectionPtVector.F90 b/superstructure/generic/connection/ConnectionPtVector.F90 index 3ece477d8ed..54570ad400f 100644 --- a/superstructure/generic/connection/ConnectionPtVector.F90 +++ b/superstructure/generic/connection/ConnectionPtVector.F90 @@ -1,5 +1,5 @@ -module mapl_ConnectionPtVector - use mapl_ConnectionPt +module mapl_ConnectionPtVector_mod + use mapl_ConnectionPt_mod #define T ConnectionPt #define Vector ConnectionPtVector @@ -11,4 +11,4 @@ module mapl_ConnectionPtVector #undef Vector #undef VectorIterator -end module mapl_ConnectionPtVector +end module mapl_ConnectionPtVector_mod diff --git a/superstructure/generic/connection/ConnectionVector.F90 b/superstructure/generic/connection/ConnectionVector.F90 index 66672070dc0..c1d8a4ef238 100644 --- a/superstructure/generic/connection/ConnectionVector.F90 +++ b/superstructure/generic/connection/ConnectionVector.F90 @@ -1,5 +1,5 @@ -module mapl_ConnectionVector - use mapl_Connection +module mapl_ConnectionVector_mod + use mapl_Connection_mod #define T Connection #define T_polymorphic @@ -13,4 +13,4 @@ module mapl_ConnectionVector #undef Vector #undef VectorIterator -end module mapl_ConnectionVector +end module mapl_ConnectionVector_mod diff --git a/superstructure/generic/connection/MatchConnection.F90 b/superstructure/generic/connection/MatchConnection.F90 index 79a70050430..a3794addb16 100644 --- a/superstructure/generic/connection/MatchConnection.F90 +++ b/superstructure/generic/connection/MatchConnection.F90 @@ -1,19 +1,19 @@ #include "MAPL.h" -module mapl_MatchConnection - use mapl_StateItemSpec - use mapl_Connection - use mapl_ConnectionPt - use mapl_StateRegistry - use mapl_SimpleConnection - use mapl_VirtualConnectionPt - use mapl_VirtualConnectionPtVector - use mapl_ActualConnectionPt - use mapl_ActualPtVec_Map - use mapl_ActualPtVector - use mapl_StateItemSpec - use mapl_KeywordEnforcer - use mapl_ErrorHandling +module mapl_MatchConnection_mod + use mapl_StateItemSpec_mod + use mapl_Connection_mod + use mapl_ConnectionPt_mod + use mapl_StateRegistry_mod + use mapl_SimpleConnection_mod + use mapl_VirtualConnectionPt_mod + use mapl_VirtualConnectionPtVector_mod + use mapl_ActualConnectionPt_mod + use mapl_ActualPtVec_Map_mod + use mapl_ActualPtVector_mod + use mapl_StateItemSpec_mod + use mapl_KeywordEnforcer_mod + use mapl_ErrorHandling_mod use esmf implicit none(type,external) @@ -175,4 +175,4 @@ recursive subroutine connect(this, registry, rc) end subroutine connect -end module mapl_MatchConnection +end module mapl_MatchConnection_mod diff --git a/superstructure/generic/connection/ReexportConnection.F90 b/superstructure/generic/connection/ReexportConnection.F90 index 2b881479e72..9cfb1b22af8 100644 --- a/superstructure/generic/connection/ReexportConnection.F90 +++ b/superstructure/generic/connection/ReexportConnection.F90 @@ -1,17 +1,17 @@ #include "MAPL.h" -module mapl_ReexportConnection - use mapl_StateItemSpec - use mapl_ExtensionFamily - use mapl_Connection - use mapl_ConnectionPt - use mapl_StateRegistry - use mapl_VirtualConnectionPt - use mapl_ActualConnectionPt - use mapl_ActualPtVec_Map - use mapl_ActualPtVector - use mapl_KeywordEnforcer - use mapl_ErrorHandling +module mapl_ReexportConnection_mod + use mapl_StateItemSpec_mod + use mapl_ExtensionFamily_mod + use mapl_Connection_mod + use mapl_ConnectionPt_mod + use mapl_StateRegistry_mod + use mapl_VirtualConnectionPt_mod + use mapl_ActualConnectionPt_mod + use mapl_ActualPtVec_Map_mod + use mapl_ActualPtVector_mod + use mapl_KeywordEnforcer_mod + use mapl_ErrorHandling_mod use esmf implicit none(type,external) @@ -93,7 +93,7 @@ end subroutine connect ! Non-sibling connection: just propagate pointer "up" subroutine connect_export_to_export(this, dst_registry, src_registry, unusable, rc) - use mapl_ExtensionFamily + use mapl_ExtensionFamily_mod class(ReexportConnection), intent(in) :: this type(StateRegistry), intent(inout) :: dst_registry type(StateRegistry), intent(in) :: src_registry @@ -135,5 +135,5 @@ end function str_replace end subroutine connect_export_to_export - end module mapl_ReexportConnection + end module mapl_ReexportConnection_mod diff --git a/superstructure/generic/connection/SimpleConnection.F90 b/superstructure/generic/connection/SimpleConnection.F90 index 0e835fcf515..27a6d5575db 100644 --- a/superstructure/generic/connection/SimpleConnection.F90 +++ b/superstructure/generic/connection/SimpleConnection.F90 @@ -1,22 +1,22 @@ #include "MAPL.h" -module mapl_SimpleConnection - - use mapl_StateItemSpec - use mapl_Connection - use mapl_ConnectionPt - use mapl_StateRegistry - use mapl_VirtualConnectionPt - use mapl_VirtualConnectionPtVector - use mapl_ActualConnectionPt - use mapl_ActualPtVec_Map - use mapl_GriddedComponentDriver - use mapl_StateItemSpec - use mapl_StateItemSpecVector - use mapl_StateItemSpecPtrVector - use mapl_MultiState - use mapl_KeywordEnforcer - use mapl_ErrorHandling +module mapl_SimpleConnection_mod + + use mapl_StateItemSpec_mod + use mapl_Connection_mod + use mapl_ConnectionPt_mod + use mapl_StateRegistry_mod + use mapl_VirtualConnectionPt_mod + use mapl_VirtualConnectionPtVector_mod + use mapl_ActualConnectionPt_mod + use mapl_ActualPtVec_Map_mod + use mapl_GriddedComponentDriver_mod + use mapl_StateItemSpec_mod + use mapl_StateItemSpecVector_mod + use mapl_StateItemSpecPtrVector_mod + use mapl_MultiState_mod + use mapl_KeywordEnforcer_mod + use mapl_ErrorHandling_mod use gFTL2_StringVector, only: StringVector use esmf @@ -219,5 +219,5 @@ subroutine activate_dependencies(extension, registry, rc) _RETURN(_SUCCESS) end subroutine activate_dependencies -end module mapl_SimpleConnection +end module mapl_SimpleConnection_mod diff --git a/superstructure/generic/connection/VirtualConnectionPt.F90 b/superstructure/generic/connection/VirtualConnectionPt.F90 index bad0c5b9402..3ba9f7a91e3 100644 --- a/superstructure/generic/connection/VirtualConnectionPt.F90 +++ b/superstructure/generic/connection/VirtualConnectionPt.F90 @@ -1,7 +1,7 @@ #include "MAPL.h" -module mapl_VirtualConnectionPt - use mapl_KeywordEnforcer +module mapl_VirtualConnectionPt_mod + use mapl_KeywordEnforcer_mod use esmf use, intrinsic :: iso_c_binding, only: C_NULL_CHAR implicit none(type,external) @@ -245,4 +245,4 @@ logical function matches(this, item) end function matches -end module mapl_VirtualConnectionPt +end module mapl_VirtualConnectionPt_mod diff --git a/superstructure/generic/connection/VirtualConnectionPtVector.F90 b/superstructure/generic/connection/VirtualConnectionPtVector.F90 index a2aeb136787..60f79ec5828 100644 --- a/superstructure/generic/connection/VirtualConnectionPtVector.F90 +++ b/superstructure/generic/connection/VirtualConnectionPtVector.F90 @@ -1,5 +1,5 @@ -module mapl_VirtualConnectionPtVector - use mapl_VirtualConnectionPt +module mapl_VirtualConnectionPtVector_mod + use mapl_VirtualConnectionPt_mod #define T VirtualConnectionPt #define Vector VirtualConnectionPtVector @@ -11,4 +11,4 @@ module mapl_VirtualConnectionPtVector #undef Vector #undef VectorIterator -end module mapl_VirtualConnectionPtVector +end module mapl_VirtualConnectionPtVector_mod diff --git a/superstructure/generic/registry/AbstractRegistry.F90 b/superstructure/generic/registry/AbstractRegistry.F90 index fcf8f14b15b..2ecece20270 100644 --- a/superstructure/generic/registry/AbstractRegistry.F90 +++ b/superstructure/generic/registry/AbstractRegistry.F90 @@ -1,4 +1,4 @@ -module mapl_AbstractRegistry +module mapl_AbstractRegistry_mod implicit none(type,external) private @@ -8,4 +8,4 @@ module mapl_AbstractRegistry private end type AbstractRegistry -end module mapl_AbstractRegistry +end module mapl_AbstractRegistry_mod diff --git a/superstructure/generic/registry/ActualPtComponentDriverMap.F90 b/superstructure/generic/registry/ActualPtComponentDriverMap.F90 index 66ad4f510b8..5c59d3c3500 100644 --- a/superstructure/generic/registry/ActualPtComponentDriverMap.F90 +++ b/superstructure/generic/registry/ActualPtComponentDriverMap.F90 @@ -1,6 +1,6 @@ -module mapl_ActualPtComponentDriverMap - use mapl_ActualConnectionPt - use mapl_GriddedComponentDriver +module mapl_ActualPtComponentDriverMap_mod + use mapl_ActualConnectionPt_mod + use mapl_GriddedComponentDriver_mod #define Key ActualConnectionPt #define Key_LT(a,b) (a < b) @@ -19,4 +19,4 @@ module mapl_ActualPtComponentDriverMap #undef Key #undef Key_LT -end module mapl_ActualPtComponentDriverMap +end module mapl_ActualPtComponentDriverMap_mod diff --git a/superstructure/generic/registry/ActualPtSpecPtrMap.F90 b/superstructure/generic/registry/ActualPtSpecPtrMap.F90 index 26712d7db7a..b90857dfe08 100644 --- a/superstructure/generic/registry/ActualPtSpecPtrMap.F90 +++ b/superstructure/generic/registry/ActualPtSpecPtrMap.F90 @@ -1,6 +1,6 @@ -module mapl_ActualPtSpecPtrMap - use mapl_ActualConnectionPt - use mapl_StateItemSpec +module mapl_ActualPtSpecPtrMap_mod + use mapl_ActualConnectionPt_mod + use mapl_StateItemSpec_mod #define Key ActualConnectionPt #define Key_LT(a,b) (a < b) @@ -20,4 +20,4 @@ module mapl_ActualPtSpecPtrMap #undef T #undef Key -end module mapl_ActualPtSpecPtrMap +end module mapl_ActualPtSpecPtrMap_mod diff --git a/superstructure/generic/registry/ActualPtStateItemSpecMap.F90 b/superstructure/generic/registry/ActualPtStateItemSpecMap.F90 index 57019a066be..f53b7112be5 100644 --- a/superstructure/generic/registry/ActualPtStateItemSpecMap.F90 +++ b/superstructure/generic/registry/ActualPtStateItemSpecMap.F90 @@ -1,6 +1,6 @@ -module mapl_ActualPtStateItemSpecMap - use mapl_ActualConnectionPt - use mapl_StateItemSpec, only: StateItemSpec +module mapl_ActualPtStateItemSpecMap_mod + use mapl_ActualConnectionPt_mod + use mapl_StateItemSpec_mod, only: StateItemSpec #define Key ActualConnectionPt #define Key_LT(a,b) (a < b) @@ -20,4 +20,4 @@ module mapl_ActualPtStateItemSpecMap #undef T #undef Key -end module mapl_ActualPtStateItemSpecMap +end module mapl_ActualPtStateItemSpecMap_mod diff --git a/superstructure/generic/registry/ActualPtVec_Map.F90 b/superstructure/generic/registry/ActualPtVec_Map.F90 index 1313e90a922..067f5f26820 100644 --- a/superstructure/generic/registry/ActualPtVec_Map.F90 +++ b/superstructure/generic/registry/ActualPtVec_Map.F90 @@ -1,6 +1,6 @@ -module mapl_ActualPtVec_Map - use mapl_VirtualConnectionPt - use mapl_ActualPtVector +module mapl_ActualPtVec_Map_mod + use mapl_VirtualConnectionPt_mod + use mapl_ActualPtVector_mod #define Key VirtualConnectionPt #define Key_LT(a,b) (a < b) @@ -19,4 +19,4 @@ module mapl_ActualPtVec_Map #undef Key #undef Key_LT -end module mapl_ActualPtVec_Map +end module mapl_ActualPtVec_Map_mod diff --git a/superstructure/generic/registry/ActualPtVector.F90 b/superstructure/generic/registry/ActualPtVector.F90 index 780c050b4bf..cab1cf67ba3 100644 --- a/superstructure/generic/registry/ActualPtVector.F90 +++ b/superstructure/generic/registry/ActualPtVector.F90 @@ -1,5 +1,5 @@ -module mapl_ActualPtVector - use mapl_ActualConnectionPt +module mapl_ActualPtVector_mod + use mapl_ActualConnectionPt_mod #define T ActualConnectionPt #define Vector ActualPtVector @@ -11,4 +11,4 @@ module mapl_ActualPtVector #undef Vector #undef VectorIterator -end module mapl_ActualPtVector +end module mapl_ActualPtVector_mod diff --git a/superstructure/generic/registry/ExtensionFamily.F90 b/superstructure/generic/registry/ExtensionFamily.F90 index 472a62f9495..ceb84399af6 100644 --- a/superstructure/generic/registry/ExtensionFamily.F90 +++ b/superstructure/generic/registry/ExtensionFamily.F90 @@ -5,12 +5,12 @@ ! in objects of type ExtensionFamily. -module mapl_ExtensionFamily - use mapl_StateItemSpec - use mapl_StateItemSpecPtrVector - use mapl_AspectId - use mapl_StateItemAspect - use mapl_ErrorHandling +module mapl_ExtensionFamily_mod + use mapl_StateItemSpec_mod + use mapl_StateItemSpecPtrVector_mod + use mapl_AspectId_mod + use mapl_StateItemAspect_mod + use mapl_ErrorHandling_mod use gFTL2_StringVector implicit none(type,external) private @@ -212,5 +212,5 @@ function get_primary_spec(this, rc) result(spec) _RETURN(_SUCCESS) end function get_primary_spec -end module mapl_ExtensionFamily +end module mapl_ExtensionFamily_mod diff --git a/superstructure/generic/registry/RegistryPtr.F90 b/superstructure/generic/registry/RegistryPtr.F90 index 9eb9ca2f30d..8af66362d24 100644 --- a/superstructure/generic/registry/RegistryPtr.F90 +++ b/superstructure/generic/registry/RegistryPtr.F90 @@ -1,5 +1,5 @@ -module mapl_RegistryPtr - use mapl_AbstractRegistry +module mapl_RegistryPtr_mod + use mapl_AbstractRegistry_mod implicit none(type,external) private @@ -11,4 +11,4 @@ module mapl_RegistryPtr contains -end module mapl_RegistryPtr +end module mapl_RegistryPtr_mod diff --git a/superstructure/generic/registry/RegistryPtrMap.F90 b/superstructure/generic/registry/RegistryPtrMap.F90 index e8da0182dc4..23bf3fdadeb 100644 --- a/superstructure/generic/registry/RegistryPtrMap.F90 +++ b/superstructure/generic/registry/RegistryPtrMap.F90 @@ -1,5 +1,5 @@ -module mapl_RegistryPtrMap - use mapl_RegistryPtr +module mapl_RegistryPtrMap_mod + use mapl_RegistryPtr_mod #define Key __CHARACTER_DEFERRED #define T RegistryPtr @@ -16,4 +16,4 @@ module mapl_RegistryPtrMap #undef T #undef Key -end module mapl_RegistryPtrMap +end module mapl_RegistryPtrMap_mod diff --git a/superstructure/generic/registry/StateItemVector.F90 b/superstructure/generic/registry/StateItemVector.F90 index 0cf58d62573..d05389861b4 100644 --- a/superstructure/generic/registry/StateItemVector.F90 +++ b/superstructure/generic/registry/StateItemVector.F90 @@ -1,5 +1,5 @@ -module mapl_StateItemVector - use mapl_StateItemSpec, only: StateItemSpec +module mapl_StateItemVector_mod + use mapl_StateItemSpec_mod, only: StateItemSpec #define T StateItemSpec #define T_polymorphic @@ -13,4 +13,4 @@ module mapl_StateItemVector #undef Vector #undef VectorIterator -end module mapl_StateItemVector +end module mapl_StateItemVector_mod diff --git a/superstructure/generic/registry/StateRegistry.F90 b/superstructure/generic/registry/StateRegistry.F90 index bc8f798e6d1..2f6eb6b34d2 100644 --- a/superstructure/generic/registry/StateRegistry.F90 +++ b/superstructure/generic/registry/StateRegistry.F90 @@ -1,25 +1,25 @@ #include "MAPL.h" -module mapl_StateRegistry +module mapl_StateRegistry_mod use mapl_Field_API - use mapl_AbstractRegistry - use mapl_RegistryPtr - use mapl_RegistryPtrMap - use mapl_VirtualConnectionPt - use mapl_VirtualConnectionPtVector - use mapl_ConnectionPt - use mapl_StateItemSpec - use mapl_StateItemSpecVector - use mapl_StateItemSpecPtrVector - use mapl_ExtensionFamily - use mapl_VirtualPtFamilyMap - use mapl_StateItemVector - use mapl_ComponentDriver - use mapl_ComponentDriverVector - use mapl_ComponentDriverPtrVector - use mapl_GriddedComponentDriver - use mapl_VerticalGrid - use mapl_ErrorHandling + use mapl_AbstractRegistry_mod + use mapl_RegistryPtr_mod + use mapl_RegistryPtrMap_mod + use mapl_VirtualConnectionPt_mod + use mapl_VirtualConnectionPtVector_mod + use mapl_ConnectionPt_mod + use mapl_StateItemSpec_mod + use mapl_StateItemSpecVector_mod + use mapl_StateItemSpecPtrVector_mod + use mapl_ExtensionFamily_mod + use mapl_VirtualPtFamilyMap_mod + use mapl_StateItemVector_mod + use mapl_ComponentDriver_mod + use mapl_ComponentDriverVector_mod + use mapl_ComponentDriverPtrVector_mod + use mapl_GriddedComponentDriver_mod + use mapl_VerticalGrid_mod + use mapl_ErrorHandling_mod use esmf, only: ESMF_Geom, ESMF_TimeInterval implicit none(type,external) @@ -262,7 +262,7 @@ module subroutine propagate_exports_subregistry(this, subregistry, rc) end subroutine propagate_exports_subregistry module subroutine propagate_exports_virtual_pt(this, subregistry_name, iter, rc) - use mapl_VirtualPtFamilyMap, only: VirtualPtFamilyMapIterator + use mapl_VirtualPtFamilyMap_mod, only: VirtualPtFamilyMapIterator class(StateRegistry), target, intent(inout) :: this character(*), intent(in) :: subregistry_name type(VirtualPtFamilyMapIterator), intent(in) :: iter @@ -276,7 +276,7 @@ module subroutine allocate_items(this, rc) end subroutine allocate_items module subroutine add_to_states(this, multi_state, mode, rc) - use mapl_MultiState + use mapl_MultiState_mod class(StateRegistry), target, intent(inout) :: this type(MultiState), intent(inout) :: multi_state character(*), intent(in) :: mode @@ -301,4 +301,4 @@ end function get_import_couplers end interface -end module mapl_StateRegistry +end module mapl_StateRegistry_mod diff --git a/superstructure/generic/registry/StateRegistry_Actions_smod.F90 b/superstructure/generic/registry/StateRegistry_Actions_smod.F90 index ca31cc1c192..d524403c2df 100644 --- a/superstructure/generic/registry/StateRegistry_Actions_smod.F90 +++ b/superstructure/generic/registry/StateRegistry_Actions_smod.F90 @@ -7,10 +7,10 @@ ! - get_export_couplers: Get couplers that produce exports ! - get_import_couplers: Get couplers that consume imports -submodule (mapl_StateRegistry) StateRegistry_Actions_smod - use mapl_MultiState - use mapl_ActualConnectionPt - use mapl_VirtualPtFamilyMap, only: VirtualPtFamilyMapIterator +submodule (mapl_StateRegistry_mod) StateRegistry_Actions_smod + use mapl_MultiState_mod + use mapl_ActualConnectionPt_mod + use mapl_VirtualPtFamilyMap_mod, only: VirtualPtFamilyMapIterator use esmf implicit none(type,external) diff --git a/superstructure/generic/registry/StateRegistry_Extensions_smod.F90 b/superstructure/generic/registry/StateRegistry_Extensions_smod.F90 index b1ee6e4d20a..90448d5d431 100644 --- a/superstructure/generic/registry/StateRegistry_Extensions_smod.F90 +++ b/superstructure/generic/registry/StateRegistry_Extensions_smod.F90 @@ -13,9 +13,9 @@ ! - extend: Recursively extend family to match goal spec ! - item_is_deferred: Check if item is deferred -submodule (mapl_StateRegistry) StateRegistry_Extensions_smod - use mapl_MultiState - use mapl_ActualConnectionPt, only: ActualConnectionPt +submodule (mapl_StateRegistry_mod) StateRegistry_Extensions_smod + use mapl_MultiState_mod + use mapl_ActualConnectionPt_mod, only: ActualConnectionPt implicit none(type,external) contains diff --git a/superstructure/generic/registry/StateRegistry_Hierarchy_smod.F90 b/superstructure/generic/registry/StateRegistry_Hierarchy_smod.F90 index 122a923f7b2..b138ec7a802 100644 --- a/superstructure/generic/registry/StateRegistry_Hierarchy_smod.F90 +++ b/superstructure/generic/registry/StateRegistry_Hierarchy_smod.F90 @@ -6,7 +6,7 @@ ! - get_subregistry_by_name: Retrieve subregistry by name ! - get_subregistry_by_conn_pt: Retrieve subregistry by connection point -submodule (mapl_StateRegistry) StateRegistry_Hierarchy_smod +submodule (mapl_StateRegistry_mod) StateRegistry_Hierarchy_smod implicit none(type,external) contains diff --git a/superstructure/generic/registry/StateRegistry_Lifecycle_smod.F90 b/superstructure/generic/registry/StateRegistry_Lifecycle_smod.F90 index c6ce5140062..b2b68ae1b75 100644 --- a/superstructure/generic/registry/StateRegistry_Lifecycle_smod.F90 +++ b/superstructure/generic/registry/StateRegistry_Lifecycle_smod.F90 @@ -7,8 +7,8 @@ ! - num_owned_items: Count owned items ! - write_formatted: Formatted output for debugging -submodule (mapl_StateRegistry) StateRegistry_Lifecycle_smod - use mapl_VirtualPtFamilyMap, only: VirtualPtFamilyMapIterator +submodule (mapl_StateRegistry_mod) StateRegistry_Lifecycle_smod + use mapl_VirtualPtFamilyMap_mod, only: VirtualPtFamilyMapIterator implicit none(type,external) contains diff --git a/superstructure/generic/registry/StateRegistry_Propagation_smod.F90 b/superstructure/generic/registry/StateRegistry_Propagation_smod.F90 index c86e594c3b1..a09fe4ff4b4 100644 --- a/superstructure/generic/registry/StateRegistry_Propagation_smod.F90 +++ b/superstructure/generic/registry/StateRegistry_Propagation_smod.F90 @@ -8,9 +8,9 @@ ! - propagate_exports_subregistry: Propagate exports from one subregistry ! - propagate_exports_virtual_pt: Propagate exports for one virtual point -submodule (mapl_StateRegistry) StateRegistry_Propagation_smod - use mapl_RegistryPtrMap, only: RegistryPtrMapIterator - use mapl_VirtualPtFamilyMap, only: VirtualPtFamilyMapIterator +submodule (mapl_StateRegistry_mod) StateRegistry_Propagation_smod + use mapl_RegistryPtrMap_mod, only: RegistryPtrMapIterator + use mapl_VirtualPtFamilyMap_mod, only: VirtualPtFamilyMapIterator implicit none(type,external) contains diff --git a/superstructure/generic/registry/VirtualPtFamilyMap.F90 b/superstructure/generic/registry/VirtualPtFamilyMap.F90 index 3d337096699..2e725cb778b 100644 --- a/superstructure/generic/registry/VirtualPtFamilyMap.F90 +++ b/superstructure/generic/registry/VirtualPtFamilyMap.F90 @@ -1,6 +1,6 @@ - module mapl_VirtualPtFamilyMap - use mapl_VirtualConnectionPt - use mapl_ExtensionFamily + module mapl_VirtualPtFamilyMap_mod + use mapl_VirtualConnectionPt_mod + use mapl_ExtensionFamily_mod #define Key VirtualConnectionPt #define Key_LT(a,b) (a < b) @@ -18,4 +18,4 @@ module mapl_VirtualPtFamilyMap #undef T #undef Key -end module mapl_VirtualPtFamilyMap +end module mapl_VirtualPtFamilyMap_mod diff --git a/superstructure/generic/registry/VirtualPtStateItemPtrMap.F90 b/superstructure/generic/registry/VirtualPtStateItemPtrMap.F90 index 7c6ac1c9e7e..f360fd739d9 100644 --- a/superstructure/generic/registry/VirtualPtStateItemPtrMap.F90 +++ b/superstructure/generic/registry/VirtualPtStateItemPtrMap.F90 @@ -1,6 +1,6 @@ -module mapl_VirtualPtStateItemPtrMap - use mapl_VirtualConnectionPt - use mapl_StateItemSpec +module mapl_VirtualPtStateItemPtrMap_mod + use mapl_VirtualConnectionPt_mod + use mapl_StateItemSpec_mod #define Key VirtualConnectionPt #define Key_LT(a,b) (a < b) @@ -20,4 +20,4 @@ module mapl_VirtualPtStateItemPtrMap #undef T #undef Key -end module mapl_VirtualPtStateItemPtrMap +end module mapl_VirtualPtStateItemPtrMap_mod diff --git a/superstructure/generic/registry/VirtualPtStateItemSpecMap.F90 b/superstructure/generic/registry/VirtualPtStateItemSpecMap.F90 index e10d850f0c9..688a391a626 100644 --- a/superstructure/generic/registry/VirtualPtStateItemSpecMap.F90 +++ b/superstructure/generic/registry/VirtualPtStateItemSpecMap.F90 @@ -1,6 +1,6 @@ -module mapl_VirtualPtStateItemSpecMap - use mapl_VirtualConnectionPt - use mapl_StateItemSpec, only: StateItemSpec +module mapl_VirtualPtStateItemSpecMap_mod + use mapl_VirtualConnectionPt_mod + use mapl_StateItemSpec_mod, only: StateItemSpec #define Key VirtualConnectionPt #define Key_LT(a,b) (a < b) @@ -20,4 +20,4 @@ module mapl_VirtualPtStateItemSpecMap #undef T #undef Key -end module mapl_VirtualPtStateItemSpecMap +end module mapl_VirtualPtStateItemSpecMap_mod diff --git a/superstructure/generic/specs/ActualPtFieldAspectMap.F90 b/superstructure/generic/specs/ActualPtFieldAspectMap.F90 index d2b43c67958..cc9147d9a16 100644 --- a/superstructure/generic/specs/ActualPtFieldAspectMap.F90 +++ b/superstructure/generic/specs/ActualPtFieldAspectMap.F90 @@ -1,6 +1,6 @@ -module mapl_ActualPtFieldAspectMap - use mapl_FieldClassAspect - use mapl_ActualConnectionPt +module mapl_ActualPtFieldAspectMap_mod + use mapl_FieldClassAspect_mod + use mapl_ActualConnectionPt_mod #define MAPL_DEBUG @@ -21,4 +21,4 @@ module mapl_ActualPtFieldAspectMap #undef T #undef Key #undef Key_LT -end module mapl_ActualPtFieldAspectMap +end module mapl_ActualPtFieldAspectMap_mod diff --git a/superstructure/generic/specs/AspectId.F90 b/superstructure/generic/specs/AspectId.F90 index 48fea3fae29..14141998b40 100644 --- a/superstructure/generic/specs/AspectId.F90 +++ b/superstructure/generic/specs/AspectId.F90 @@ -1,4 +1,4 @@ -module mapl_AspectId +module mapl_AspectId_mod implicit none(type, external) private @@ -106,4 +106,4 @@ logical function less_than(a, b) less_than = a%id < b%id end function less_than -end module mapl_AspectId +end module mapl_AspectId_mod diff --git a/superstructure/generic/specs/AttributesAspect.F90 b/superstructure/generic/specs/AttributesAspect.F90 index db1bf6530da..506faec61c2 100644 --- a/superstructure/generic/specs/AttributesAspect.F90 +++ b/superstructure/generic/specs/AttributesAspect.F90 @@ -4,13 +4,13 @@ ! specifies as a shared attribute. Some attributes of the export may ! be unused and/or correspond to attributes needed by other imports. -module mapl_AttributesAspect - use mapl_ActualConnectionPt - use mapl_AspectId - use mapl_StateItemAspect - use mapl_ExtensionTransform - use mapl_NullTransform - use mapl_ErrorHandling +module mapl_AttributesAspect_mod + use mapl_ActualConnectionPt_mod + use mapl_AspectId_mod + use mapl_StateItemAspect_mod + use mapl_ExtensionTransform_mod + use mapl_NullTransform_mod + use mapl_ErrorHandling_mod use gftl2_StringVector use esmf, only: esmf_FIeld, esmf_FieldBundle, esmf_State implicit none @@ -172,4 +172,4 @@ subroutine update_payload(this, field, bundle, state, rc) _UNUSED_DUMMY(state) end subroutine update_payload -end module mapl_AttributesAspect +end module mapl_AttributesAspect_mod diff --git a/superstructure/generic/specs/BracketClassAspect.F90 b/superstructure/generic/specs/BracketClassAspect.F90 index 02e2014a5dc..03b801a4b77 100644 --- a/superstructure/generic/specs/BracketClassAspect.F90 +++ b/superstructure/generic/specs/BracketClassAspect.F90 @@ -1,37 +1,37 @@ #include "MAPL.h" -module mapl_BracketClassAspect +module mapl_BracketClassAspect_mod use mapl_Field_API - use mapl_FieldBundle_API - use mapl_ActualConnectionPt - use mapl_AspectId - use mapl_StateItemAspect - use mapl_GeomAspect - use mapl_ClassAspect - use mapl_FieldClassAspect - use mapl_GeomAspect - use mapl_VerticalGridAspect - use mapl_UnitsAspect - use mapl_TypekindAspect - use mapl_UngriddedDimsAspect - use mapl_FieldBundleInfo, only: FieldBundleInfoSetInternal - - use mapl_VerticalGrid - use mapl_VerticalStaggerLoc - use mapl_UngriddedDims - - use mapl_NullTransform - use mapl_TimeInterpolateTransform - use mapl_ExtensionTransform - use mapl_MultiState - use mapl_ESMF_Utilities, only: get_substate - - use mapl_FieldCreateImpl - use mapl_FieldUtilities - - use mapl_ErrorHandling - use mapl_KeywordEnforcer + use mapl_FieldBundle_API_mod + use mapl_ActualConnectionPt_mod + use mapl_AspectId_mod + use mapl_StateItemAspect_mod + use mapl_GeomAspect_mod + use mapl_ClassAspect_mod + use mapl_FieldClassAspect_mod + use mapl_GeomAspect_mod + use mapl_VerticalGridAspect_mod + use mapl_UnitsAspect_mod + use mapl_TypekindAspect_mod + use mapl_UngriddedDimsAspect_mod + use mapl_FieldBundleInfo_mod, only: FieldBundleInfoSetInternal + + use mapl_VerticalGrid_mod + use mapl_VerticalStaggerLoc_mod + use mapl_UngriddedDims_mod + + use mapl_NullTransform_mod + use mapl_TimeInterpolateTransform_mod + use mapl_ExtensionTransform_mod + use mapl_MultiState_mod + use mapl_ESMF_Utilities_mod, only: get_substate + + use mapl_FieldCreateImpl_mod + use mapl_FieldUtilities_mod + + use mapl_ErrorHandling_mod + use mapl_KeywordEnforcer_mod use esmf implicit none(type,external) @@ -389,4 +389,4 @@ subroutine get_payload(this, unusable, field, bundle, state, rc) _UNUSED_DUMMY(state) end subroutine get_payload -end module mapl_BracketClassAspect +end module mapl_BracketClassAspect_mod diff --git a/superstructure/generic/specs/CMakeLists.txt b/superstructure/generic/specs/CMakeLists.txt index 922d4f93524..6ddadc8717d 100644 --- a/superstructure/generic/specs/CMakeLists.txt +++ b/superstructure/generic/specs/CMakeLists.txt @@ -19,7 +19,6 @@ target_sources(MAPL.generic3g PRIVATE AttributesAspect.F90 GeomAspect.F90 TypekindAspect.F90 - VerticalAlignment.F90 VerticalGridAspect.F90 UngriddedDimsAspect.F90 UnitsAspect.F90 diff --git a/superstructure/generic/specs/ChildSpec.F90 b/superstructure/generic/specs/ChildSpec.F90 index 20bc2009022..546e6c24e79 100644 --- a/superstructure/generic/specs/ChildSpec.F90 +++ b/superstructure/generic/specs/ChildSpec.F90 @@ -1,8 +1,8 @@ #include "MAPL.h" -module mapl_ChildSpec - use mapl_UserSetServices - use mapl_KeywordEnforcer +module mapl_ChildSpec_mod + use mapl_UserSetServices_mod + use mapl_KeywordEnforcer_mod use esmf implicit none private @@ -142,4 +142,4 @@ subroutine write_formatted(this, unit, iotype, v_list, iostat, iomsg) end subroutine write_formatted -end module mapl_ChildSpec +end module mapl_ChildSpec_mod diff --git a/superstructure/generic/specs/ChildSpecMap.F90 b/superstructure/generic/specs/ChildSpecMap.F90 index ff620d7f01b..73223a2c02d 100644 --- a/superstructure/generic/specs/ChildSpecMap.F90 +++ b/superstructure/generic/specs/ChildSpecMap.F90 @@ -1,5 +1,5 @@ -module mapl_ChildSpecMap - use mapl_ChildSpec +module mapl_ChildSpecMap_mod + use mapl_ChildSpec_mod #define Key __CHARACTER_DEFERRED #define T ChildSpec @@ -15,4 +15,4 @@ module mapl_ChildSpecMap #undef T #undef Key -end module mapl_ChildSpecMap +end module mapl_ChildSpecMap_mod diff --git a/superstructure/generic/specs/ClassAspect.F90 b/superstructure/generic/specs/ClassAspect.F90 index 0ccc03950a3..9e9d43c3e56 100644 --- a/superstructure/generic/specs/ClassAspect.F90 +++ b/superstructure/generic/specs/ClassAspect.F90 @@ -1,11 +1,11 @@ #include "MAPL.h" -module mapl_ClassAspect - use mapl_AspectId - use mapl_StateItemAspect - use mapl_MultiState - use mapl_ErrorHandling - use mapl_ActualConnectionPt +module mapl_ClassAspect_mod + use mapl_AspectId_mod + use mapl_StateItemAspect_mod + use mapl_MultiState_mod + use mapl_ErrorHandling_mod + use mapl_ActualConnectionPt_mod use esmf, only: esmf_FIeld, esmf_FieldBundle, esmf_State implicit none private @@ -38,7 +38,7 @@ module mapl_ClassAspect abstract interface function I_get_aspect_order(this, goal_aspects, rc) result(aspect_ids) - use mapl_StateItemAspect + use mapl_StateItemAspect_mod import ClassAspect, AspectId type(AspectId), allocatable :: aspect_ids(:) class(ClassAspect), intent(in) :: this @@ -48,7 +48,7 @@ end function I_get_aspect_order ! Will use ESMF so cannot be PURE subroutine I_create(this, other_aspects, rc) - use mapl_StateItemAspect + use mapl_StateItemAspect_mod import ClassAspect class(ClassAspect), intent(inout) :: this type(AspectMap), intent(in) :: other_aspects @@ -77,8 +77,8 @@ subroutine I_allocate(this, other_aspects, rc) end subroutine I_allocate subroutine I_add_to_state(this, multi_state, actual_pt, rc) - use mapl_MultiState - use mapl_ActualConnectionPt + use mapl_MultiState_mod + use mapl_ActualConnectionPt_mod import ClassAspect class(ClassAspect), intent(in) :: this type(MultiState), intent(inout) :: multi_state @@ -87,7 +87,7 @@ subroutine I_add_to_state(this, multi_state, actual_pt, rc) end subroutine I_add_to_state subroutine I_get_payload(this, unusable, field, bundle, state, rc) - use mapl_KeywordEnforcer + use mapl_KeywordEnforcer_mod use esmf import ClassAspect class(ClassAspect), intent(in) :: this @@ -171,4 +171,4 @@ subroutine update_payload(this, field, bundle, state, rc) _UNUSED_DUMMY(state) end subroutine update_payload -end module mapl_ClassAspect +end module mapl_ClassAspect_mod diff --git a/superstructure/generic/specs/ComponentSpec.F90 b/superstructure/generic/specs/ComponentSpec.F90 index 1ad0a975fd2..a5f3aaff959 100644 --- a/superstructure/generic/specs/ComponentSpec.F90 +++ b/superstructure/generic/specs/ComponentSpec.F90 @@ -1,20 +1,20 @@ #include "MAPL.h" -module mapl_ComponentSpec - - use mapl_Connection - use mapl_SimpleConnection - use mapl_ReexportConnection - use mapl_ConnectionVector - use mapl_ConnectionPt - use mapl_VirtualConnectionPt - use mapl_VariableSpec - use mapl_VariableSpecVector - use mapl_ChildSpecMap - use mapl_GeometrySpec - use mapl_ErrorHandling - use mapl_KeywordEnforcer - use mapl_stringutilities +module mapl_ComponentSpec_mod + + use mapl_Connection_mod + use mapl_SimpleConnection_mod + use mapl_ReexportConnection_mod + use mapl_ConnectionVector_mod + use mapl_ConnectionPt_mod + use mapl_VirtualConnectionPt_mod + use mapl_VariableSpec_mod + use mapl_VariableSpecVector_mod + use mapl_ChildSpecMap_mod + use mapl_GeometrySpec_mod + use mapl_ErrorHandling_mod + use mapl_KeywordEnforcer_mod + use mapl_StringUtilities_mod use gftl2_StringVector use ESMF @@ -162,4 +162,4 @@ subroutine reexport(this, unusable, src_comp, src_name, src_intent, new_name, rc _UNUSED_DUMMY(unusable) end subroutine reexport -end module mapl_ComponentSpec +end module mapl_ComponentSpec_mod diff --git a/superstructure/generic/specs/ConservationAspect.F90 b/superstructure/generic/specs/ConservationAspect.F90 index 3063a414909..71d3d1e5db3 100644 --- a/superstructure/generic/specs/ConservationAspect.F90 +++ b/superstructure/generic/specs/ConservationAspect.F90 @@ -1,20 +1,20 @@ #include "MAPL.h" -module mapl_ConservationAspect - - use mapl_ActualConnectionPt - use mapl_AspectId - use mapl_StateItemAspect - use mapl_ExtensionTransform - use mapl_NullTransform - use mapl_ConservationType - use mapl_ConservationMetadata - use mapl_QuantityType - use mapl_QuantityTypeMetadata +module mapl_ConservationAspect_mod + + use mapl_ActualConnectionPt_mod + use mapl_AspectId_mod + use mapl_StateItemAspect_mod + use mapl_ExtensionTransform_mod + use mapl_NullTransform_mod + use mapl_ConservationType_mod + use mapl_ConservationMetadata_mod + use mapl_QuantityType_mod + use mapl_QuantityTypeMetadata_mod use mapl_Field_API - use mapl_FieldBundle_API - use mapl_KeywordEnforcer - use mapl_ErrorHandling + use mapl_FieldBundle_API_mod + use mapl_KeywordEnforcer_mod + use mapl_ErrorHandling_mod use esmf implicit none @@ -336,4 +336,4 @@ subroutine print_aspect(this, file, line, rc) _RETURN(_SUCCESS) end subroutine print_aspect -end module mapl_ConservationAspect +end module mapl_ConservationAspect_mod diff --git a/superstructure/generic/specs/ExpressionClassAspect.F90 b/superstructure/generic/specs/ExpressionClassAspect.F90 index bd670df03be..3739213f159 100644 --- a/superstructure/generic/specs/ExpressionClassAspect.F90 +++ b/superstructure/generic/specs/ExpressionClassAspect.F90 @@ -1,42 +1,42 @@ #include "MAPL.h" -module mapl_ExpressionClassAspect - - use mapl_AspectId - use mapl_StateItemAspect - use mapl_ClassAspect - use mapl_FieldClassAspect - use mapl_GeomAspect - use mapl_HorizontalDimsSpec - use mapl_VerticalGridAspect - use mapl_UnitsAspect - use mapl_TypekindAspect - use mapl_UngriddedDimsAspect - - use mapl_StateRegistry - use mapl_EvalTransform - use mapl_NullTransform - use mapl_ComponentDriver - use mapl_ComponentDriver - use mapl_ComponentDriverVector - use mapl_ExtensionTransform - use mapl_MultiState - use mapl_ESMF_Utilities, only: get_substate - - use mapl_VirtualConnectionPt - use mapl_VirtualConnectionPtVector - use mapl_ActualConnectionPt - use mapl_StateItemSpec - use mapl_StateItemSpec +module mapl_ExpressionClassAspect_mod + + use mapl_AspectId_mod + use mapl_StateItemAspect_mod + use mapl_ClassAspect_mod + use mapl_FieldClassAspect_mod + use mapl_GeomAspect_mod + use mapl_HorizontalDimsSpec_mod + use mapl_VerticalGridAspect_mod + use mapl_UnitsAspect_mod + use mapl_TypekindAspect_mod + use mapl_UngriddedDimsAspect_mod + + use mapl_StateRegistry_mod + use mapl_EvalTransform_mod + use mapl_NullTransform_mod + use mapl_ComponentDriver_mod + use mapl_ComponentDriver_mod + use mapl_ComponentDriverVector_mod + use mapl_ExtensionTransform_mod + use mapl_MultiState_mod + use mapl_ESMF_Utilities_mod, only: get_substate + + use mapl_VirtualConnectionPt_mod + use mapl_VirtualConnectionPtVector_mod + use mapl_ActualConnectionPt_mod + use mapl_StateItemSpec_mod + use mapl_StateItemSpec_mod use mapl_Field_API - use mapl_FieldInfo - use mapl_FieldUtilities - use MAPL_StateArithmeticParserMod + use mapl_FieldInfo_mod + use mapl_FieldUtilities_mod + use mapl_StateArithmeticParser_mod use gftl2_StringVector - use mapl_ErrorHandling - use mapl_KeywordEnforcer + use mapl_ErrorHandling_mod + use mapl_KeywordEnforcer_mod use esmf implicit none(type,external) @@ -388,4 +388,4 @@ subroutine get_payload(this, unusable, field, bundle, state, rc) _UNUSED_DUMMY(state) end subroutine get_payload -end module mapl_ExpressionClassAspect +end module mapl_ExpressionClassAspect_mod diff --git a/superstructure/generic/specs/FieldBundleClassAspect.F90 b/superstructure/generic/specs/FieldBundleClassAspect.F90 index 7bc21ace3fa..b75595548ed 100644 --- a/superstructure/generic/specs/FieldBundleClassAspect.F90 +++ b/superstructure/generic/specs/FieldBundleClassAspect.F90 @@ -1,22 +1,22 @@ #include "MAPL.h" -module mapl_FieldBundleClassAspect - - use mapl_ActualConnectionPt - use mapl_AspectId - use mapl_StateItemAspect - use mapl_ClassAspect - use mapl_WildcardClassAspect - use mapl_NullTransform - use mapl_ExtensionTransform - use mapl_MultiState - use mapl_ESMF_Utilities, only: get_substate +module mapl_FieldBundleClassAspect_mod + + use mapl_ActualConnectionPt_mod + use mapl_AspectId_mod + use mapl_StateItemAspect_mod + use mapl_ClassAspect_mod + use mapl_WildcardClassAspect_mod + use mapl_NullTransform_mod + use mapl_ExtensionTransform_mod + use mapl_MultiState_mod + use mapl_ESMF_Utilities_mod, only: get_substate use mapl_Field_API - use mapl_FieldBundle_API, only: MAPL_FieldBundleCreate, MAPL_FieldBundleInfoSetInternal - use mapl_FieldBundle_API, only: MAPL_FieldBundlesAreAliased - use mapl_FieldBundleInfo, only: FieldBundleInfoSetInternal - use mapl_KeywordEnforcer - use mapl_ErrorHandling + use mapl_FieldBundle_API_mod, only: MAPL_FieldBundleCreate, MAPL_FieldBundleInfoSetInternal + use mapl_FieldBundle_API_mod, only: MAPL_FieldBundlesAreAliased + use mapl_FieldBundleInfo_mod, only: FieldBundleInfoSetInternal + use mapl_KeywordEnforcer_mod + use mapl_ErrorHandling_mod use esmf implicit none(type,external) @@ -310,4 +310,4 @@ function matches_a(src, dst) result(matches) _UNUSED_DUMMY(src) end function matches_a -end module mapl_FieldBundleClassAspect +end module mapl_FieldBundleClassAspect_mod diff --git a/superstructure/generic/specs/FieldClassAspect.F90 b/superstructure/generic/specs/FieldClassAspect.F90 index 60b0b676cb1..09d69174147 100644 --- a/superstructure/generic/specs/FieldClassAspect.F90 +++ b/superstructure/generic/specs/FieldClassAspect.F90 @@ -1,36 +1,36 @@ #include "MAPL.h" -module mapl_FieldClassAspect - - use mapl_ActualConnectionPt - use mapl_AspectId - use mapl_StateItemAspect - use mapl_ClassAspect - use mapl_GeomAspect - use mapl_HorizontalDimsSpec - use mapl_VerticalGridAspect - use mapl_UnitsAspect - use mapl_TypekindAspect - use mapl_UngriddedDimsAspect - - use mapl_VerticalGrid - use mapl_VerticalStaggerLoc - use mapl_VerticalStaggerLoc - use mapl_UngriddedDims - - use mapl_NullTransform - use mapl_ExtensionTransform - use mapl_MultiState - use mapl_ESMF_Utilities, only: get_substate +module mapl_FieldClassAspect_mod + + use mapl_ActualConnectionPt_mod + use mapl_AspectId_mod + use mapl_StateItemAspect_mod + use mapl_ClassAspect_mod + use mapl_GeomAspect_mod + use mapl_HorizontalDimsSpec_mod + use mapl_VerticalGridAspect_mod + use mapl_UnitsAspect_mod + use mapl_TypekindAspect_mod + use mapl_UngriddedDimsAspect_mod + + use mapl_VerticalGrid_mod + use mapl_VerticalStaggerLoc_mod + use mapl_VerticalStaggerLoc_mod + use mapl_UngriddedDims_mod + + use mapl_NullTransform_mod + use mapl_ExtensionTransform_mod + use mapl_MultiState_mod + use mapl_ESMF_Utilities_mod, only: get_substate use mapl_Field_API - use mapl_FieldBundle_API - use mapl_FieldInfo, only: FieldInfoSetInternal - use mapl_RestartModes, only: RestartMode + use mapl_FieldBundle_API_mod + use mapl_FieldInfo_mod, only: FieldInfoSetInternal + use mapl_RestartModes_mod, only: RestartMode - use mapl_FieldUtilities - use mapl_ErrorHandling - use mapl_KeywordEnforcer + use mapl_FieldUtilities_mod + use mapl_ErrorHandling_mod + use mapl_KeywordEnforcer_mod use esmf use pflogger @@ -416,4 +416,4 @@ function get_aspect_id() result(aspect_id) aspect_id = CLASS_ASPECT_ID end function get_aspect_id -end module mapl_FieldClassAspect +end module mapl_FieldClassAspect_mod diff --git a/superstructure/generic/specs/FieldClassAspect_smod.F90 b/superstructure/generic/specs/FieldClassAspect_smod.F90 index 32f6f2f486a..88f84a43cfb 100644 --- a/superstructure/generic/specs/FieldClassAspect_smod.F90 +++ b/superstructure/generic/specs/FieldClassAspect_smod.F90 @@ -1,7 +1,7 @@ #include "MAPL.h" -submodule (mapl_FieldClassAspect) FieldClassAspect_smod - use mapl_WildcardClassAspect +submodule (mapl_FieldClassAspect_mod) FieldClassAspect_smod + use mapl_WildcardClassAspect_mod implicit none(type,external) contains diff --git a/superstructure/generic/specs/GeomAspect.F90 b/superstructure/generic/specs/GeomAspect.F90 index 773edf27de0..33250e59c2e 100644 --- a/superstructure/generic/specs/GeomAspect.F90 +++ b/superstructure/generic/specs/GeomAspect.F90 @@ -1,26 +1,26 @@ #include "MAPL.h" -module mapl_GeomAspect +module mapl_GeomAspect_mod - use mapl_ActualConnectionPt - use mapl_AspectId - use mapl_HorizontalDimsSpec - use mapl_StateItemAspect - use mapl_Geom_API, only: MAPL_SameGeom + use mapl_ActualConnectionPt_mod + use mapl_AspectId_mod + use mapl_HorizontalDimsSpec_mod + use mapl_StateItemAspect_mod + use mapl_Geom_API_mod, only: MAPL_SameGeom use mapl_regridder_mgr, only: EsmfRegridderParam - use mapl_ExtensionTransform - use mapl_ExtendTransform - use mapl_RegridTransform - use mapl_NullTransform + use mapl_ExtensionTransform_mod + use mapl_ExtendTransform_mod + use mapl_RegridTransform_mod + use mapl_NullTransform_mod use mapl_Field_API - use mapl_FieldBundle_API - use mapl_EsmfRegridder - use mapl_NormalizationAspect, only: NormalizationAspect, to_NormalizationAspect - use mapl_NormalizationMetadata, only: NormalizationMetadata - use mapl_NormalizationType, only: NormalizationType - use mapl_VerticalGrid - use mapl_ComponentDriver, only: ComponentDriver - use mapl_ErrorHandling + use mapl_FieldBundle_API_mod + use mapl_EsmfRegridder_mod + use mapl_NormalizationAspect_mod, only: NormalizationAspect, to_NormalizationAspect + use mapl_NormalizationMetadata_mod, only: NormalizationMetadata + use mapl_NormalizationType_mod, only: NormalizationType + use mapl_VerticalGrid_mod + use mapl_ComponentDriver_mod, only: ComponentDriver + use mapl_ErrorHandling_mod use ESMF, only: esmf_Geom use ESMF, only: esmf_Field, esmf_FieldBundle, esmf_State use ESMF, only: esmf_Info @@ -327,4 +327,4 @@ subroutine print_aspect(this, file, line, rc) _RETURN(_SUCCESS) end subroutine print_aspect -end module mapl_GeomAspect +end module mapl_GeomAspect_mod diff --git a/superstructure/generic/specs/GeomAspect/make_transform.F90 b/superstructure/generic/specs/GeomAspect/make_transform.F90 index d0b2b017163..cdac589dd7a 100644 --- a/superstructure/generic/specs/GeomAspect/make_transform.F90 +++ b/superstructure/generic/specs/GeomAspect/make_transform.F90 @@ -1,10 +1,10 @@ #include "MAPL.h" -submodule (mapl_GeomAspect) make_transform_smod +submodule (mapl_GeomAspect_mod) make_transform_smod - use mapl_VerticalGridAspect - use mapl_VerticalStaggerLoc - use mapl_NormalizationType, only: NORMALIZE_NONE, operator(==) + use mapl_VerticalGridAspect_mod + use mapl_VerticalStaggerLoc_mod + use mapl_NormalizationType_mod, only: NORMALIZE_NONE, operator(==) implicit none(type,external) contains diff --git a/superstructure/generic/specs/GeometrySpec.F90 b/superstructure/generic/specs/GeometrySpec.F90 index a981ca3ae5d..d65fe99dbab 100644 --- a/superstructure/generic/specs/GeometrySpec.F90 +++ b/superstructure/generic/specs/GeometrySpec.F90 @@ -1,8 +1,8 @@ #include "MAPL.h" -module mapl_GeometrySpec - use mapl_Geom_API, only: GeomSpec - use mapl_VerticalGrid +module mapl_GeometrySpec_mod + use mapl_Geom_API_mod, only: GeomSpec + use mapl_VerticalGrid_mod implicit none private @@ -61,4 +61,4 @@ end function new_GeometryProvider -end module mapl_GeometrySpec +end module mapl_GeometrySpec_mod diff --git a/superstructure/generic/specs/GridSpec.F90 b/superstructure/generic/specs/GridSpec.F90 index a86d099e3e6..309292ddbd2 100644 --- a/superstructure/generic/specs/GridSpec.F90 +++ b/superstructure/generic/specs/GridSpec.F90 @@ -1,4 +1,4 @@ -module mapl_GridSpec +module mapl_GridSpec_mod implicit none private @@ -38,4 +38,4 @@ function GridSpec_simple(origin) result(grid_spec) end function GridSpec_simple -end module mapl_GridSpec +end module mapl_GridSpec_mod diff --git a/superstructure/generic/specs/NormalizationAspect.F90 b/superstructure/generic/specs/NormalizationAspect.F90 index 613d8eb3ee0..02d24bc393d 100644 --- a/superstructure/generic/specs/NormalizationAspect.F90 +++ b/superstructure/generic/specs/NormalizationAspect.F90 @@ -1,19 +1,19 @@ #include "MAPL.h" -module mapl_NormalizationAspect - - use mapl_ActualConnectionPt - use mapl_AspectId - use mapl_StateItemAspect - use mapl_ExtensionTransform - use mapl_NullTransform - use mapl_QuantityTypeAspect - use mapl_NormalizationType - use mapl_NormalizationMetadata +module mapl_NormalizationAspect_mod + + use mapl_ActualConnectionPt_mod + use mapl_AspectId_mod + use mapl_StateItemAspect_mod + use mapl_ExtensionTransform_mod + use mapl_NullTransform_mod + use mapl_QuantityTypeAspect_mod + use mapl_NormalizationType_mod + use mapl_NormalizationMetadata_mod use mapl_Field_API - use mapl_FieldBundle_API - use mapl_KeywordEnforcer - use mapl_ErrorHandling + use mapl_FieldBundle_API_mod + use mapl_KeywordEnforcer_mod + use mapl_ErrorHandling_mod use esmf implicit none @@ -542,4 +542,4 @@ subroutine compute_normalized_units(source_units, normalization_type, scale, tar _UNUSED_DUMMY(scale) end subroutine compute_normalized_units -end module mapl_NormalizationAspect +end module mapl_NormalizationAspect_mod diff --git a/superstructure/generic/specs/QuantityTypeAspect.F90 b/superstructure/generic/specs/QuantityTypeAspect.F90 index 27b3c7e0c86..85cdf3628d1 100644 --- a/superstructure/generic/specs/QuantityTypeAspect.F90 +++ b/superstructure/generic/specs/QuantityTypeAspect.F90 @@ -1,20 +1,20 @@ #include "MAPL.h" -module mapl_QuantityTypeAspect - - use mapl_ActualConnectionPt - use mapl_AspectId - use mapl_StateItemAspect - use mapl_ExtensionTransform - use mapl_NullTransform - use mapl_QuantityType - use mapl_QuantityTypeMetadata - use mapl_NormalizationType - use mapl_NormalizationMetadata +module mapl_QuantityTypeAspect_mod + + use mapl_ActualConnectionPt_mod + use mapl_AspectId_mod + use mapl_StateItemAspect_mod + use mapl_ExtensionTransform_mod + use mapl_NullTransform_mod + use mapl_QuantityType_mod + use mapl_QuantityTypeMetadata_mod + use mapl_NormalizationType_mod + use mapl_NormalizationMetadata_mod use mapl_Field_API - use mapl_FieldBundle_API - use mapl_KeywordEnforcer - use mapl_ErrorHandling + use mapl_FieldBundle_API_mod + use mapl_KeywordEnforcer_mod + use mapl_ErrorHandling_mod use esmf implicit none @@ -495,4 +495,4 @@ subroutine print_aspect(this, file, line, rc) _RETURN(_SUCCESS) end subroutine print_aspect -end module mapl_QuantityTypeAspect +end module mapl_QuantityTypeAspect_mod diff --git a/superstructure/generic/specs/ServiceClassAspect.F90 b/superstructure/generic/specs/ServiceClassAspect.F90 index 03a9babce1f..f4b8b6ff053 100644 --- a/superstructure/generic/specs/ServiceClassAspect.F90 +++ b/superstructure/generic/specs/ServiceClassAspect.F90 @@ -1,27 +1,27 @@ #include "MAPL.h" -module mapl_ServiceClassAspect - - use mapl_FieldBundle_API - use mapl_AspectId - use mapl_StateItemAspect - use mapl_StateItemAllocation - use mapl_ClassAspect - use mapl_FieldClassAspect - use mapl_StateRegistry - use mapl_StateItemSpec - use mapl_Multistate - use mapl_VirtualConnectionPt - use mapl_ActualConnectionPt - use mapl_ExtensionTransform - use mapl_StateItemSpec - use mapl_NullTransform - use mapl_ESMF_Utilities, only: get_substate - use mapl_KeywordEnforcer - use mapl_ErrorHandling +module mapl_ServiceClassAspect_mod + + use mapl_FieldBundle_API_mod + use mapl_AspectId_mod + use mapl_StateItemAspect_mod + use mapl_StateItemAllocation_mod + use mapl_ClassAspect_mod + use mapl_FieldClassAspect_mod + use mapl_StateRegistry_mod + use mapl_StateItemSpec_mod + use mapl_MultiState_mod + use mapl_VirtualConnectionPt_mod + use mapl_ActualConnectionPt_mod + use mapl_ExtensionTransform_mod + use mapl_StateItemSpec_mod + use mapl_NullTransform_mod + use mapl_ESMF_Utilities_mod, only: get_substate + use mapl_KeywordEnforcer_mod + use mapl_ErrorHandling_mod use gftl2_StringVector use esmf - use mapl_FieldBundleType_Flag + use mapl_FieldBundleType_Flag_mod implicit none(type,external) private @@ -325,4 +325,4 @@ subroutine get_payload(this, unusable, field, bundle, state, rc) _UNUSED_DUMMY(state) end subroutine get_payload -end module mapl_ServiceClassAspect +end module mapl_ServiceClassAspect_mod diff --git a/superstructure/generic/specs/StateClassAspect.F90 b/superstructure/generic/specs/StateClassAspect.F90 index 8ecff5e9e9e..2735de821df 100644 --- a/superstructure/generic/specs/StateClassAspect.F90 +++ b/superstructure/generic/specs/StateClassAspect.F90 @@ -1,19 +1,19 @@ #include "MAPL.h" -module mapl_StateClassAspect - - use mapl_ActualConnectionPt - use mapl_AspectId - use mapl_StateItemAspect - use mapl_ClassAspect - use mapl_WildcardClassAspect - use mapl_NullTransform - use mapl_ExtensionTransform - use mapl_MultiState - use mapl_ESMF_Utilities, only: get_substate +module mapl_StateClassAspect_mod + + use mapl_ActualConnectionPt_mod + use mapl_AspectId_mod + use mapl_StateItemAspect_mod + use mapl_ClassAspect_mod + use mapl_WildcardClassAspect_mod + use mapl_NullTransform_mod + use mapl_ExtensionTransform_mod + use mapl_MultiState_mod + use mapl_ESMF_Utilities_mod, only: get_substate ! use mapl_State_API, only: MAPL_StateCreate, MAPL_StateInfoSetInternal - use mapl_KeywordEnforcer - use mapl_ErrorHandling + use mapl_KeywordEnforcer_mod + use mapl_ErrorHandling_mod use esmf implicit none(type,external) @@ -297,4 +297,4 @@ function matches_a(src, dst) result(matches) _UNUSED_DUMMY(src) end function matches_a -end module mapl_StateClassAspect +end module mapl_StateClassAspect_mod diff --git a/superstructure/generic/specs/StateItemAspect.F90 b/superstructure/generic/specs/StateItemAspect.F90 index 91ba2a2ff89..b20a1f102ae 100644 --- a/superstructure/generic/specs/StateItemAspect.F90 +++ b/superstructure/generic/specs/StateItemAspect.F90 @@ -38,10 +38,10 @@ !------------------------------------------------- -module mapl_StateItemAspect +module mapl_StateItemAspect_mod use iso_fortran_env, only: INT64 - use mapl_AspectId - use mapl_ErrorHandling + use mapl_AspectId_mod + use mapl_ErrorHandling_mod use esmf, only: esmf_Field, esmf_FieldBundle, esmf_State #define Key AspectId @@ -119,7 +119,7 @@ function I_get_aspect_id() result(aspect_id) end function I_get_aspect_id function I_make_transform(src, dst, other_aspects, rc) result(transform) - use mapl_ExtensionTransform + use mapl_ExtensionTransform_mod import :: StateItemAspect import :: AspectMap class(ExtensionTransform), allocatable :: transform @@ -130,7 +130,7 @@ function I_make_transform(src, dst, other_aspects, rc) result(transform) end function I_make_transform subroutine I_connect_to_export(this, export, actual_pt, rc) - use mapl_ActualConnectionPt + use mapl_ActualConnectionPt_mod import :: StateItemAspect class(StateItemAspect), intent(inout) :: this class(StateItemAspect), intent(in) :: export @@ -291,7 +291,7 @@ end subroutine print_aspect #undef T #undef Key #undef KEY_LT -end module mapl_StateItemAspect +end module mapl_StateItemAspect_mod diff --git a/superstructure/generic/specs/StateItemSpec.F90 b/superstructure/generic/specs/StateItemSpec.F90 index 2a686aa21a5..55b3b6df857 100644 --- a/superstructure/generic/specs/StateItemSpec.F90 +++ b/superstructure/generic/specs/StateItemSpec.F90 @@ -1,23 +1,23 @@ #include "MAPL.h" -module mapl_StateItemSpec - use mapl_AspectId - use mapl_ActualConnectionPt - use mapl_VirtualConnectionPtVector - use mapl_ExtensionTransform - use mapl_MultiState - use mapl_StateItemAspect - use mapl_GeomAspect - use mapl_VerticalGridAspect - use mapl_ClassAspect - use mapl_VerticalGrid - use mapl_ErrorHandling +module mapl_StateItemSpec_mod + use mapl_AspectId_mod + use mapl_ActualConnectionPt_mod + use mapl_VirtualConnectionPtVector_mod + use mapl_ExtensionTransform_mod + use mapl_MultiState_mod + use mapl_StateItemAspect_mod + use mapl_GeomAspect_mod + use mapl_VerticalGridAspect_mod + use mapl_ClassAspect_mod + use mapl_VerticalGrid_mod + use mapl_ErrorHandling_mod use mapl_Field_API - use mapl_FieldBundle_API - use mapl_ComponentDriver - use mapl_GriddedComponentDriver - use mapl_ComponentDriverVector - use mapl_GenericCoupler + use mapl_FieldBundle_API_mod + use mapl_ComponentDriver_mod + use mapl_GriddedComponentDriver_mod + use mapl_ComponentDriverVector_mod + use mapl_GenericCoupler_mod use esmf use gftl2_stringvector implicit none @@ -815,7 +815,7 @@ function get_consumers(this) result(consumers) end function get_consumers function add_consumer(this, consumer, rc) result(reference) - use mapl_GenericCoupler + use mapl_GenericCoupler_mod class(ComponentDriver), pointer :: reference class(StateItemSpec), target, intent(inout) :: this type(GriddedComponentDriver), intent(in) :: consumer @@ -832,4 +832,4 @@ function add_consumer(this, consumer, rc) result(reference) _RETURN(_SUCCESS) end function add_consumer -end module mapl_StateItemSpec +end module mapl_StateItemSpec_mod diff --git a/superstructure/generic/specs/StateItemSpecMap.F90 b/superstructure/generic/specs/StateItemSpecMap.F90 index 0fa723f4d92..bc2fbf141b9 100644 --- a/superstructure/generic/specs/StateItemSpecMap.F90 +++ b/superstructure/generic/specs/StateItemSpecMap.F90 @@ -1,5 +1,5 @@ -module mapl_StateItemSpecMap - use mapl_StateItemSpec +module mapl_StateItemSpecMap_mod + use mapl_StateItemSpec_mod #define MAPL_DEBUG @@ -20,4 +20,4 @@ module mapl_StateItemSpecMap #undef T #undef Key -end module mapl_StateItemSpecMap +end module mapl_StateItemSpecMap_mod diff --git a/superstructure/generic/specs/StateItemSpecPtrVector.F90 b/superstructure/generic/specs/StateItemSpecPtrVector.F90 index c44ee0d089f..2a48148c478 100644 --- a/superstructure/generic/specs/StateItemSpecPtrVector.F90 +++ b/superstructure/generic/specs/StateItemSpecPtrVector.F90 @@ -1,5 +1,5 @@ -module mapl_StateItemSpecPtrVector - use mapl_StateItemSpec +module mapl_StateItemSpecPtrVector_mod + use mapl_StateItemSpec_mod #define T StateItemSpecPtr #define Vector StateItemSpecPtrVector @@ -11,4 +11,4 @@ module mapl_StateItemSpecPtrVector #undef Vector #undef VectorIterator -end module mapl_StateItemSpecPtrVector +end module mapl_StateItemSpecPtrVector_mod diff --git a/superstructure/generic/specs/StateItemSpecVector.F90 b/superstructure/generic/specs/StateItemSpecVector.F90 index a8f68e2c80a..b1212818d6b 100644 --- a/superstructure/generic/specs/StateItemSpecVector.F90 +++ b/superstructure/generic/specs/StateItemSpecVector.F90 @@ -1,5 +1,5 @@ -module mapl_StateItemSpecVector - use mapl_StateItemSpec, only: StateItemSpec +module mapl_StateItemSpecVector_mod + use mapl_StateItemSpec_mod, only: StateItemSpec #define T StateItemSpec #define T_deferred @@ -13,4 +13,4 @@ module mapl_StateItemSpecVector #undef Vector #undef VectorIterator -end module mapl_StateItemSpecVector +end module mapl_StateItemSpecVector_mod diff --git a/superstructure/generic/specs/TypekindAspect.F90 b/superstructure/generic/specs/TypekindAspect.F90 index a91ccfb192b..ca712aed23d 100644 --- a/superstructure/generic/specs/TypekindAspect.F90 +++ b/superstructure/generic/specs/TypekindAspect.F90 @@ -1,17 +1,17 @@ #include "MAPL.h" -module mapl_TypekindAspect - - use mapl_ActualConnectionPt - use mapl_AspectId - use mapl_StateItemAspect - use mapl_CopyTransform - use mapl_ExtensionTransform - use mapl_NullTransform +module mapl_TypekindAspect_mod + + use mapl_ActualConnectionPt_mod + use mapl_AspectId_mod + use mapl_StateItemAspect_mod + use mapl_CopyTransform_mod + use mapl_ExtensionTransform_mod + use mapl_NullTransform_mod use mapl_Field_API - use mapl_FieldBundle_API - use mapl_ErrorHandling - use mapl_ESMF_Utilities, only: MAPL_TYPEKIND_MIRROR + use mapl_FieldBundle_API_mod + use mapl_ErrorHandling_mod + use mapl_ESMF_Utilities_mod, only: MAPL_TYPEKIND_MIRROR use esmf implicit none(type,external) @@ -220,4 +220,4 @@ subroutine update_payload(this, field, bundle, state, rc) _UNUSED_DUMMY(state) end subroutine update_payload -end module mapl_TypekindAspect +end module mapl_TypekindAspect_mod diff --git a/superstructure/generic/specs/UngriddedDimsAspect.F90 b/superstructure/generic/specs/UngriddedDimsAspect.F90 index 27aa4089c4e..688bf8c1cdd 100644 --- a/superstructure/generic/specs/UngriddedDimsAspect.F90 +++ b/superstructure/generic/specs/UngriddedDimsAspect.F90 @@ -1,17 +1,17 @@ #include "MAPL.h" -module mapl_UngriddedDimsAspect - - use mapl_ActualConnectionPt - use mapl_AspectId - use mapl_StateItemAspect - use mapl_ExtensionTransform - use mapl_UngriddedDims - use mapl_NullTransform - use mapl_Field_Api - use mapl_FieldBundle_Api - use mapl_KeywordEnforcer - use mapl_ErrorHandling +module mapl_UngriddedDimsAspect_mod + + use mapl_ActualConnectionPt_mod + use mapl_AspectId_mod + use mapl_StateItemAspect_mod + use mapl_ExtensionTransform_mod + use mapl_UngriddedDims_mod + use mapl_NullTransform_mod + use mapl_Field_API + use mapl_FieldBundle_API_mod + use mapl_KeywordEnforcer_mod + use mapl_ErrorHandling_mod use esmf implicit none @@ -222,4 +222,4 @@ subroutine update_payload(this, field, bundle, state, rc) end subroutine update_payload -end module mapl_UngriddedDimsAspect +end module mapl_UngriddedDimsAspect_mod diff --git a/superstructure/generic/specs/UnitsAspect.F90 b/superstructure/generic/specs/UnitsAspect.F90 index 1c2e5ed4383..7df407b0c14 100644 --- a/superstructure/generic/specs/UnitsAspect.F90 +++ b/superstructure/generic/specs/UnitsAspect.F90 @@ -1,17 +1,17 @@ #include "MAPL.h" -module mapl_UnitsAspect - - use mapl_ActualConnectionPt - use mapl_AspectId - use mapl_StateItemAspect - use mapl_ExtensionTransform - use mapl_ConvertUnitsTransform - use mapl_NullTransform +module mapl_UnitsAspect_mod + + use mapl_ActualConnectionPt_mod + use mapl_AspectId_mod + use mapl_StateItemAspect_mod + use mapl_ExtensionTransform_mod + use mapl_ConvertUnitsTransform_mod + use mapl_NullTransform_mod use mapl_Field_API - use mapl_FieldBundle_API - use mapl_KeywordEnforcer - use mapl_ErrorHandling + use mapl_FieldBundle_API_mod + use mapl_KeywordEnforcer_mod + use mapl_ErrorHandling_mod use udunits2f, only: are_convertible use esmf @@ -263,4 +263,4 @@ subroutine print_aspect(this, file, line, rc) _RETURN(_SUCCESS) end subroutine print_aspect -end module mapl_UnitsAspect +end module mapl_UnitsAspect_mod diff --git a/superstructure/generic/specs/VariableSpec.F90 b/superstructure/generic/specs/VariableSpec.F90 index e10bef68d1b..e792f5bbecb 100644 --- a/superstructure/generic/specs/VariableSpec.F90 +++ b/superstructure/generic/specs/VariableSpec.F90 @@ -1,55 +1,55 @@ #include "MAPL.h" -module mapl_VariableSpec - - use mapl_StateItemSpec - use mapl_StateItemAspect - use mapl_GeomAspect - - use mapl_ClassAspect - use mapl_FieldClassAspect - use mapl_FieldBundleClassAspect - use mapl_StateClassAspect - use mapl_VectorClassAspect - use mapl_BracketClassAspect - use mapl_VectorBracketClassAspect - use mapl_WildcardClassAspect - use mapl_ServiceClassAspect - use mapl_ExpressionClassAspect - - use mapl_UnitsAspect - use mapl_AttributesAspect - use mapl_UngriddedDimsAspect - use mapl_VerticalGridAspect - use mapl_VerticalAlignment - use mapl_VerticalRegridMethod - use mapl_TypekindAspect - use mapl_QuantityTypeAspect - use mapl_ConservationAspect - use mapl_NormalizationAspect - use mapl_NormalizationType - use mapl_UngriddedDims - use mapl_VerticalStaggerLoc - use mapl_VectorBasisKind - use mapl_HorizontalDimsSpec - use mapl_VirtualConnectionPt - use mapl_ActualConnectionPt - use mapl_VerticalGrid - use mapl_VirtualConnectionPtVector - use mapl_ErrorHandling +module mapl_VariableSpec_mod + + use mapl_StateItemSpec_mod + use mapl_StateItemAspect_mod + use mapl_GeomAspect_mod + + use mapl_ClassAspect_mod + use mapl_FieldClassAspect_mod + use mapl_FieldBundleClassAspect_mod + use mapl_StateClassAspect_mod + use mapl_VectorClassAspect_mod + use mapl_BracketClassAspect_mod + use mapl_VectorBracketClassAspect_mod + use mapl_WildcardClassAspect_mod + use mapl_ServiceClassAspect_mod + use mapl_ExpressionClassAspect_mod + + use mapl_UnitsAspect_mod + use mapl_AttributesAspect_mod + use mapl_UngriddedDimsAspect_mod + use mapl_VerticalGridAspect_mod + use mapl_VerticalAlignment_mod + use mapl_VerticalRegridMethod_mod + use mapl_TypekindAspect_mod + use mapl_QuantityTypeAspect_mod + use mapl_ConservationAspect_mod + use mapl_NormalizationAspect_mod + use mapl_NormalizationType_mod + use mapl_UngriddedDims_mod + use mapl_VerticalStaggerLoc_mod + use mapl_VectorBasisKind_mod + use mapl_HorizontalDimsSpec_mod + use mapl_VirtualConnectionPt_mod + use mapl_ActualConnectionPt_mod + use mapl_VerticalGrid_mod + use mapl_VirtualConnectionPtVector_mod + use mapl_ErrorHandling_mod use pflogger, only: logging, logger_t => logger - use mapl_StateRegistry - use mapl_StateItemImpl - use mapl_AspectId - use mapl_EsmfRegridder, only: EsmfRegridderParam - use mapl_FieldDictionary - use mapl_FieldDictionaryItem, only: FieldDictionaryItem - use mapl_KeywordEnforcerMod - use mapl_RestartModes, only: RestartMode + use mapl_StateRegistry_mod + use mapl_StateItemImpl_mod + use mapl_AspectId_mod + use mapl_EsmfRegridder_mod, only: EsmfRegridderParam + use mapl_FieldDictionary_mod + use mapl_FieldDictionaryItem_mod, only: FieldDictionaryItem + use mapl_KeywordEnforcer_mod + use mapl_RestartModes_mod, only: RestartMode use esmf use gFTL2_StringVector use nuopc - use mapl_VariableSpec_private + use mapl_VariableSpec_private_mod implicit none private @@ -731,4 +731,4 @@ end subroutine verify_deferred_items_have_export_intent end subroutine verify_variable_spec -end module mapl_VariableSpec +end module mapl_VariableSpec_mod diff --git a/superstructure/generic/specs/VariableSpecVector.F90 b/superstructure/generic/specs/VariableSpecVector.F90 index df024684c5f..fc9b03f135c 100644 --- a/superstructure/generic/specs/VariableSpecVector.F90 +++ b/superstructure/generic/specs/VariableSpecVector.F90 @@ -1,5 +1,5 @@ -module mapl_VariableSpecVector - use mapl_VariableSpec +module mapl_VariableSpecVector_mod + use mapl_VariableSpec_mod #define T VariableSpec #define Vector VariableSpecVector @@ -11,4 +11,4 @@ module mapl_VariableSpecVector #undef Vector #undef VectorIterator -end module mapl_VariableSpecVector +end module mapl_VariableSpecVector_mod diff --git a/superstructure/generic/specs/VariableSpec_private.F90 b/superstructure/generic/specs/VariableSpec_private.F90 index 3288d6c58e6..c2afcf5e7bf 100644 --- a/superstructure/generic/specs/VariableSpec_private.F90 +++ b/superstructure/generic/specs/VariableSpec_private.F90 @@ -1,14 +1,14 @@ #include "MAPL.h" -module mapl_VariableSpec_private +module mapl_VariableSpec_private_mod use esmf, only: ESMF_KIND_R4, ESMF_RegridMethod_Flag use esmf, only: ESMF_StateItem_Flag, ESMF_StateIntent_Flag use esmf, only: ESMF_STATEITEM_FIELD, ESMF_STATEITEM_FIELDBUNDLE use esmf, only: ESMF_STATEINTENT_UNSPECIFIED use esmf, only: operator(==), operator(/=) - use mapl_EsmfRegridder, only: EsmfRegridderParam + use mapl_EsmfRegridder_mod, only: EsmfRegridderParam use gFTL2_StringVector - use mapl_ErrorHandling + use mapl_ErrorHandling_mod implicit none(type, external) private @@ -129,4 +129,4 @@ subroutine verify_regrid(p, f, rc) end subroutine verify_regrid -end module mapl_VariableSpec_private +end module mapl_VariableSpec_private_mod diff --git a/superstructure/generic/specs/VectorBracketClassAspect.F90 b/superstructure/generic/specs/VectorBracketClassAspect.F90 index 17a17f9bc14..62981ea3779 100644 --- a/superstructure/generic/specs/VectorBracketClassAspect.F90 +++ b/superstructure/generic/specs/VectorBracketClassAspect.F90 @@ -1,38 +1,38 @@ #include "MAPL.h" -module mapl_VectorBracketClassAspect +module mapl_VectorBracketClassAspect_mod use mapl_Field_API - use mapl_FieldBundle_API - use mapl_ActualConnectionPt - use mapl_AspectId - use mapl_StateItemAspect - use mapl_GeomAspect - use mapl_ClassAspect - use mapl_FieldClassAspect - use mapl_VectorClassAspect - use mapl_GeomAspect - use mapl_VerticalGridAspect - use mapl_UnitsAspect - use mapl_TypekindAspect - use mapl_UngriddedDimsAspect - use mapl_FieldBundleInfo, only: FieldBundleInfoSetInternal - use mapl_VectorBasisKind - - use mapl_VerticalGrid - use mapl_VerticalStaggerLoc - use mapl_UngriddedDims - - use mapl_NullTransform - use mapl_TimeInterpolateTransform - use mapl_ExtensionTransform - use mapl_MultiState - use mapl_ESMF_Utilities, only: get_substate - - use mapl_FieldCreateImpl - use mapl_FieldUtilities - - use mapl_KeywordEnforcer - use mapl_ErrorHandling + use mapl_FieldBundle_API_mod + use mapl_ActualConnectionPt_mod + use mapl_AspectId_mod + use mapl_StateItemAspect_mod + use mapl_GeomAspect_mod + use mapl_ClassAspect_mod + use mapl_FieldClassAspect_mod + use mapl_VectorClassAspect_mod + use mapl_GeomAspect_mod + use mapl_VerticalGridAspect_mod + use mapl_UnitsAspect_mod + use mapl_TypekindAspect_mod + use mapl_UngriddedDimsAspect_mod + use mapl_FieldBundleInfo_mod, only: FieldBundleInfoSetInternal + use mapl_VectorBasisKind_mod + + use mapl_VerticalGrid_mod + use mapl_VerticalStaggerLoc_mod + use mapl_UngriddedDims_mod + + use mapl_NullTransform_mod + use mapl_TimeInterpolateTransform_mod + use mapl_ExtensionTransform_mod + use mapl_MultiState_mod + use mapl_ESMF_Utilities_mod, only: get_substate + + use mapl_FieldCreateImpl_mod + use mapl_FieldUtilities_mod + + use mapl_KeywordEnforcer_mod + use mapl_ErrorHandling_mod use esmf implicit none(type,external) private @@ -399,4 +399,4 @@ subroutine get_payload(this, unusable, field, bundle, state, rc) _UNUSED_DUMMY(state) end subroutine get_payload -end module mapl_VectorBracketClassAspect +end module mapl_VectorBracketClassAspect_mod diff --git a/superstructure/generic/specs/VectorClassAspect.F90 b/superstructure/generic/specs/VectorClassAspect.F90 index 6f729d84067..022de010e74 100644 --- a/superstructure/generic/specs/VectorClassAspect.F90 +++ b/superstructure/generic/specs/VectorClassAspect.F90 @@ -1,37 +1,37 @@ #include "MAPL.h" -module mapl_VectorClassAspect +module mapl_VectorClassAspect_mod use mapl_Field_API - use mapl_FieldBundle_API - use mapl_ActualConnectionPt - use mapl_AspectId - use mapl_StateItemAspect - use mapl_ClassAspect - use mapl_FieldClassAspect - use mapl_GeomAspect - use mapl_VerticalGridAspect - use mapl_UnitsAspect - use mapl_TypekindAspect - use mapl_UngriddedDimsAspect - use mapl_VectorBasisKind - use mapl_FieldBundleInfo, only: FieldBundleInfoSetInternal - - use mapl_VerticalGrid - use mapl_VerticalStaggerLoc - use mapl_VerticalStaggerLoc - use mapl_UngriddedDims - - use mapl_NullTransform - use mapl_ExtensionTransform - use mapl_MultiState - use mapl_ESMF_Utilities, only: get_substate - - use mapl_FieldCreateImpl - use mapl_FieldUtilities - - use mapl_KeywordEnforcer - use mapl_ErrorHandling + use mapl_FieldBundle_API_mod + use mapl_ActualConnectionPt_mod + use mapl_AspectId_mod + use mapl_StateItemAspect_mod + use mapl_ClassAspect_mod + use mapl_FieldClassAspect_mod + use mapl_GeomAspect_mod + use mapl_VerticalGridAspect_mod + use mapl_UnitsAspect_mod + use mapl_TypekindAspect_mod + use mapl_UngriddedDimsAspect_mod + use mapl_VectorBasisKind_mod + use mapl_FieldBundleInfo_mod, only: FieldBundleInfoSetInternal + + use mapl_VerticalGrid_mod + use mapl_VerticalStaggerLoc_mod + use mapl_VerticalStaggerLoc_mod + use mapl_UngriddedDims_mod + + use mapl_NullTransform_mod + use mapl_ExtensionTransform_mod + use mapl_MultiState_mod + use mapl_ESMF_Utilities_mod, only: get_substate + + use mapl_FieldCreateImpl_mod + use mapl_FieldUtilities_mod + + use mapl_KeywordEnforcer_mod + use mapl_ErrorHandling_mod use gftl2_StringVector use esmf @@ -356,4 +356,4 @@ function get_aspect_id() result(aspect_id) aspect_id = CLASS_ASPECT_ID end function get_aspect_id -end module mapl_VectorClassAspect +end module mapl_VectorClassAspect_mod diff --git a/superstructure/generic/specs/VerticalAlignment.F90 b/superstructure/generic/specs/VerticalAlignment.F90 deleted file mode 100644 index 211ea5ade00..00000000000 --- a/superstructure/generic/specs/VerticalAlignment.F90 +++ /dev/null @@ -1,137 +0,0 @@ -#include "MAPL.h" -module mapl_VerticalAlignment - use mapl_VerticalCoordinateDirection - implicit none - private - - public :: VerticalAlignment - public :: VALIGN_WITH_GRID - public :: VALIGN_UP - public :: VALIGN_DOWN - public :: VALIGN_INVALID - - public :: operator(==) - public :: operator(/=) - - enum, bind(c) - enumerator :: WITH_GRID=0 - enumerator :: ALIGN_UP=1 - enumerator :: ALIGN_DOWN=2 - enumerator :: ALIGN_INVALID=-1 - end enum - - ! Enum-like type for field vertical alignment - ! Specifies how a field aligns with its vertical grid - type :: VerticalAlignment - private - integer :: id = WITH_GRID ! Default to with_grid - character(32) :: name = "VALIGN_WITH_GRID" - contains - procedure :: to_string - procedure :: resolve - end type VerticalAlignment - - interface VerticalAlignment - procedure :: new_VerticalAlignment - end interface VerticalAlignment - - interface operator(==) - procedure are_equal - end interface operator(==) - - interface operator(/=) - procedure are_not_equal - end interface operator(/=) - - type(VerticalAlignment), parameter :: VALIGN_WITH_GRID = & - VerticalAlignment(WITH_GRID, "VALIGN_WITH_GRID") - type(VerticalAlignment), parameter :: VALIGN_UP = & - VerticalAlignment(ALIGN_UP, "VALIGN_UP") - type(VerticalAlignment), parameter :: VALIGN_DOWN = & - VerticalAlignment(ALIGN_DOWN, "VALIGN_DOWN") - type(VerticalAlignment), parameter :: VALIGN_INVALID = & - VerticalAlignment(ALIGN_INVALID, "VALIGN_INVALID") - -contains - - ! Constructor that accepts optional string representations - ! Supports full names and shortcuts (U/D) - ! Returns with_grid (default) if no argument provided - function new_VerticalAlignment(str) result(alignment) - type(VerticalAlignment) :: alignment - character(*), optional, intent(in) :: str - - if (.not. present(str)) then - alignment = VALIGN_WITH_GRID - return - end if - - select case (trim(str)) - case ('upward', 'UPWARD', 'U', 'u', 'UP', 'up') - alignment = VALIGN_UP - case ('downward', 'DOWNWARD', 'D', 'd', 'DOWN', 'down') - alignment = VALIGN_DOWN - case ('with_grid', 'WITH_GRID', 'with-grid', 'WITH-GRID') - alignment = VALIGN_WITH_GRID - case (VALIGN_UP%name) - alignment = VALIGN_UP - case (VALIGN_DOWN%name) - alignment = VALIGN_DOWN - case (VALIGN_WITH_GRID%name) - alignment = VALIGN_WITH_GRID - case default - alignment = VALIGN_INVALID - end select - end function new_VerticalAlignment - - function to_string(this) result(s) - character(:), allocatable :: s - class(VerticalAlignment), intent(in) :: this - - select case(this%id) - case (ALIGN_UP) - s = "upward" - case (ALIGN_DOWN) - s = "downward" - case (WITH_GRID) - s = "with_grid" - case default - s = "invalid" - end select - end function to_string - - ! Resolve alignment to actual coordinate direction - ! If alignment is WITH_GRID, return the grid's coordinate direction - ! Otherwise return the alignment as a coordinate direction - function resolve(this, grid_direction) result(direction) - type(VerticalCoordinateDirection) :: direction - class(VerticalAlignment), intent(in) :: this - type(VerticalCoordinateDirection), intent(in) :: grid_direction - - select case(this%id) - case (WITH_GRID) - direction = grid_direction - case (ALIGN_UP) - direction = VCOORD_DIRECTION_UP - case (ALIGN_DOWN) - direction = VCOORD_DIRECTION_DOWN - case default - direction = VCOORD_DIRECTION_INVALID - end select - end function resolve - - elemental logical function are_equal(this, that) - type(VerticalAlignment), intent(in) :: this - type(VerticalAlignment), intent(in) :: that - - are_equal = (this%id == that%id) - end function are_equal - - elemental logical function are_not_equal(this, that) - type(VerticalAlignment), intent(in) :: this - type(VerticalAlignment), intent(in) :: that - - are_not_equal = .not. (this == that) - end function are_not_equal - -end module mapl_VerticalAlignment diff --git a/superstructure/generic/specs/VerticalGridAspect.F90 b/superstructure/generic/specs/VerticalGridAspect.F90 index 9b40fb8ee6f..7c270f0374d 100644 --- a/superstructure/generic/specs/VerticalGridAspect.F90 +++ b/superstructure/generic/specs/VerticalGridAspect.F90 @@ -1,29 +1,29 @@ #include "MAPL.h" -module mapl_VerticalGridAspect - use mapl_ActualConnectionPt - use mapl_AspectId +module mapl_VerticalGridAspect_mod + use mapl_ActualConnectionPt_mod + use mapl_AspectId_mod use mapl_Field_API - use mapl_FieldBundle_API - use mapl_StateItemAspect - use mapl_ExtensionTransform - use mapl_ExtendTransform - use mapl_VerticalGrid - use mapl_VerticalCoordinateDirection - use mapl_VerticalAlignment - use mapl_NullTransform - use mapl_VerticalRegridTransform - use mapl_GeomAspect - use mapl_TypekindAspect - use mapl_UnitsAspect - use mapl_NormalizationAspect - use mapl_NormalizationType - use mapl_VerticalRegridMethod - use mapl_VerticalStaggerLoc - use mapl_VerticalRegridMethod - use mapl_ComponentDriver - use mapl_MirrorVerticalGrid, only: MirrorVerticalGrid - use mapl_ErrorHandling + use mapl_FieldBundle_API_mod + use mapl_StateItemAspect_mod + use mapl_ExtensionTransform_mod + use mapl_ExtendTransform_mod + use mapl_VerticalGrid_mod + use mapl_VerticalCoordinateDirection_mod + use mapl_VerticalAlignment_mod + use mapl_NullTransform_mod + use mapl_VerticalRegridTransform_mod + use mapl_GeomAspect_mod + use mapl_TypekindAspect_mod + use mapl_UnitsAspect_mod + use mapl_NormalizationAspect_mod + use mapl_NormalizationType_mod + use mapl_VerticalRegridMethod_mod + use mapl_VerticalStaggerLoc_mod + use mapl_VerticalRegridMethod_mod + use mapl_ComponentDriver_mod + use mapl_MirrorVerticalGrid_mod, only: MirrorVerticalGrid + use mapl_ErrorHandling_mod use esmf use gftl2_StringVector implicit none(type,external) @@ -532,4 +532,4 @@ subroutine update_payload(this, field, bundle, state, rc) _UNUSED_DUMMY(state) end subroutine update_payload -end module mapl_VerticalGridAspect +end module mapl_VerticalGridAspect_mod diff --git a/superstructure/generic/specs/WildcardClassAspect.F90 b/superstructure/generic/specs/WildcardClassAspect.F90 index a59f2b3233e..9f5ae563cbc 100644 --- a/superstructure/generic/specs/WildcardClassAspect.F90 +++ b/superstructure/generic/specs/WildcardClassAspect.F90 @@ -1,18 +1,18 @@ #include "MAPL.h" -module mapl_WildcardClassAspect - use mapl_ActualPtFieldAspectMap - use mapl_ActualConnectionPt - use mapl_StateItemSpec - use mapl_AspectId - use mapl_StateItemAspect - use mapl_ClassAspect - use mapl_FieldClassAspect - use mapl_ExtensionTransform - use mapl_NullTransform - use mapl_MultiState - use mapl_ErrorHandling - use mapl_KeywordEnforcer +module mapl_WildcardClassAspect_mod + use mapl_ActualPtFieldAspectMap_mod + use mapl_ActualConnectionPt_mod + use mapl_StateItemSpec_mod + use mapl_AspectId_mod + use mapl_StateItemAspect_mod + use mapl_ClassAspect_mod + use mapl_FieldClassAspect_mod + use mapl_ExtensionTransform_mod + use mapl_NullTransform_mod + use mapl_MultiState_mod + use mapl_ErrorHandling_mod + use mapl_KeywordEnforcer_mod use esmf implicit none(type,external) private @@ -256,4 +256,4 @@ subroutine get_payload(this, unusable, field, bundle, state, rc) _UNUSED_DUMMY(state) end subroutine get_payload -end module mapl_WildcardClassAspect +end module mapl_WildcardClassAspect_mod diff --git a/superstructure/generic/tests/CMakeLists.txt b/superstructure/generic/tests/CMakeLists.txt index 6d9f4997e03..e701a77a3a6 100644 --- a/superstructure/generic/tests/CMakeLists.txt +++ b/superstructure/generic/tests/CMakeLists.txt @@ -41,7 +41,7 @@ add_pfunit_ctest( TEST_SOURCES ${scenarios_test_srcs} LINK_LIBRARIES ${COMMON_LINK_LIBRARIES} EXTRA_INITIALIZE Initialize - EXTRA_USE MAPL_pFUnit_Initialize + EXTRA_USE mapl_pFUnit_Initialize_mod WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} MAX_PES 4 ) @@ -67,7 +67,7 @@ add_pfunit_ctest( TEST_SOURCES ${transforms_test_srcs} LINK_LIBRARIES ${COMMON_LINK_LIBRARIES} EXTRA_INITIALIZE Initialize - EXTRA_USE MAPL_pFUnit_Initialize + EXTRA_USE mapl_pFUnit_Initialize_mod WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} MAX_PES 4 ) @@ -87,7 +87,7 @@ add_pfunit_ctest( TEST_SOURCES ${vertical_test_srcs} LINK_LIBRARIES ${COMMON_LINK_LIBRARIES} EXTRA_INITIALIZE Initialize - EXTRA_USE MAPL_pFUnit_Initialize + EXTRA_USE mapl_pFUnit_Initialize_mod WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} MAX_PES 4 ) @@ -115,7 +115,7 @@ add_pfunit_ctest( TEST_SOURCES ${aspects_test_srcs} LINK_LIBRARIES ${COMMON_LINK_LIBRARIES} EXTRA_INITIALIZE Initialize - EXTRA_USE MAPL_pFUnit_Initialize + EXTRA_USE mapl_pFUnit_Initialize_mod WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} MAX_PES 4 ) @@ -138,7 +138,7 @@ add_pfunit_ctest( TEST_SOURCES ${components_test_srcs} LINK_LIBRARIES ${COMMON_LINK_LIBRARIES} EXTRA_INITIALIZE Initialize - EXTRA_USE MAPL_pFUnit_Initialize + EXTRA_USE mapl_pFUnit_Initialize_mod WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} MAX_PES 4 ) @@ -169,7 +169,7 @@ add_pfunit_ctest( TEST_SOURCES ${core_test_srcs} LINK_LIBRARIES ${COMMON_LINK_LIBRARIES} EXTRA_INITIALIZE Initialize - EXTRA_USE MAPL_pFUnit_Initialize + EXTRA_USE mapl_pFUnit_Initialize_mod WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} MAX_PES 4 ) diff --git a/superstructure/generic/tests/MockAspect.F90 b/superstructure/generic/tests/MockAspect.F90 index 17d98c3bb51..a6991aa4acc 100644 --- a/superstructure/generic/tests/MockAspect.F90 +++ b/superstructure/generic/tests/MockAspect.F90 @@ -1,24 +1,24 @@ #include "MAPL.h" module MockAspect_mod - use mapl_AspectId - use mapl_VariableSpec - use mapl_ActualConnectionPt - use mapl_AspectId - use mapl_StateItemSpec - use mapl_StateItemAspect - use mapl_StateRegistry - use mapl_StateItemSpec - use mapl_StateItemAllocation - use mapl_ExtensionTransform - use mapl_FieldInfo, only: FieldInfoSetInternal + use mapl_AspectId_mod + use mapl_VariableSpec_mod + use mapl_ActualConnectionPt_mod + use mapl_AspectId_mod + use mapl_StateItemSpec_mod + use mapl_StateItemAspect_mod + use mapl_StateRegistry_mod + use mapl_StateItemSpec_mod + use mapl_StateItemAllocation_mod + use mapl_ExtensionTransform_mod + use mapl_FieldInfo_mod, only: FieldInfoSetInternal use mapl_Field_API, only: mapl_FieldSet, mapl_FieldGet - use mapl_ClassAspect - use mapl_NullTransform - use mapl_MultiState - use mapl_VirtualConnectionPtVector - use mapl_KeywordEnforcer - use mapl_ErrorHandling + use mapl_ClassAspect_mod + use mapl_NullTransform_mod + use mapl_MultiState_mod + use mapl_VirtualConnectionPtVector_mod + use mapl_KeywordEnforcer_mod + use mapl_ErrorHandling_mod use esmf implicit none private diff --git a/superstructure/generic/tests/MockUserGridComp.F90 b/superstructure/generic/tests/MockUserGridComp.F90 index 516160708a7..31de2ae7b71 100644 --- a/superstructure/generic/tests/MockUserGridComp.F90 +++ b/superstructure/generic/tests/MockUserGridComp.F90 @@ -8,7 +8,7 @@ module MockUserGridComp !!$ use esmf, only: ESMF_METHOD_READRESTART !!$ use esmf, only: ESMF_METHOD_WRITERESTART use esmf, only: ESMF_SUCCESS - use mapl_ErrorHandling + use mapl_ErrorHandling_mod implicit none(type,external) private diff --git a/superstructure/generic/tests/Test_2DConservativeRegrid.pf b/superstructure/generic/tests/Test_2DConservativeRegrid.pf index 0e1e58fc365..4b9b8248041 100644 --- a/superstructure/generic/tests/Test_2DConservativeRegrid.pf +++ b/superstructure/generic/tests/Test_2DConservativeRegrid.pf @@ -1,14 +1,14 @@ #include "MAPL_TestErr.h" module Test_2DConservativeRegrid - use mapl_QuantityType - use mapl_QuantityTypeMetadata - use mapl_NormalizationType - use mapl_NormalizationMetadata + use mapl_QuantityType_mod + use mapl_QuantityTypeMetadata_mod + use mapl_NormalizationType_mod + use mapl_NormalizationMetadata_mod use mapl_Field_API use mapl_regridder_mgr, only: EsmfRegridderParam - use mapl_RoutehandleParam, only: RoutehandleParam - use mapl_ErrorHandling + use mapl_RoutehandleParam_mod, only: RoutehandleParam + use mapl_ErrorHandling_mod use esmf use funit implicit none diff --git a/superstructure/generic/tests/Test_3DConservativeMixingRatio.pf b/superstructure/generic/tests/Test_3DConservativeMixingRatio.pf index d02a41cf0d7..8eea769e384 100644 --- a/superstructure/generic/tests/Test_3DConservativeMixingRatio.pf +++ b/superstructure/generic/tests/Test_3DConservativeMixingRatio.pf @@ -2,22 +2,22 @@ #include "unused_dummy.H" module Test_3DConservativeMixingRatio - use mapl_VerticalRegridTransform - use mapl_VerticalRegridMethod - use mapl_VerticalStaggerLoc - use mapl_VerticalCoordinateDirection - use mapl_VerticalAlignment - use mapl_ExtensionTransform, only: COUPLER_IMPORT_NAME, COUPLER_EXPORT_NAME, ExtensionTransform - use mapl_FieldCreateImpl, only: MAPL_FieldCreate - use mapl_QuantityType - use mapl_QuantityTypeMetadata - use mapl_NormalizationType - use mapl_NormalizationMetadata + use mapl_VerticalRegridTransform_mod + use mapl_VerticalRegridMethod_mod + use mapl_VerticalStaggerLoc_mod + use mapl_VerticalCoordinateDirection_mod + use mapl_VerticalAlignment_mod + use mapl_ExtensionTransform_mod, only: COUPLER_IMPORT_NAME, COUPLER_EXPORT_NAME, ExtensionTransform + use mapl_FieldCreateImpl_mod, only: MAPL_FieldCreate + use mapl_QuantityType_mod + use mapl_QuantityTypeMetadata_mod + use mapl_NormalizationType_mod + use mapl_NormalizationMetadata_mod use mapl_Field_API - use mapl_RegridTransform + use mapl_RegridTransform_mod use mapl_regridder_mgr, only: EsmfRegridderParam - use mapl_Geom_API - use mapl_ErrorHandling + use mapl_Geom_API_mod + use mapl_ErrorHandling_mod use esmf use pfunit use ESMF_TestMethod_mod diff --git a/superstructure/generic/tests/Test_AspectMap.pf b/superstructure/generic/tests/Test_AspectMap.pf index 5caed3cfa76..7fd7c58a9f7 100644 --- a/superstructure/generic/tests/Test_AspectMap.pf +++ b/superstructure/generic/tests/Test_AspectMap.pf @@ -1,14 +1,14 @@ module Test_AspectMap - use mapl_AspectId - use mapl_StateItemAspect - use mapl_GeomAspect - use mapl_UnitsAspect - use mapl_UngriddedDimsAspect - use mapl_TypekindAspect - use mapl_VerticalGridAspect - use mapl_AttributesAspect - use mapl_ClassAspect - use mapl_FieldClassAspect + use mapl_AspectId_mod + use mapl_StateItemAspect_mod + use mapl_GeomAspect_mod + use mapl_UnitsAspect_mod + use mapl_UngriddedDimsAspect_mod + use mapl_TypekindAspect_mod + use mapl_VerticalGridAspect_mod + use mapl_AttributesAspect_mod + use mapl_ClassAspect_mod + use mapl_FieldClassAspect_mod use funit contains diff --git a/superstructure/generic/tests/Test_Aspects.pf b/superstructure/generic/tests/Test_Aspects.pf index 808cd0e406c..f0a64700a48 100644 --- a/superstructure/generic/tests/Test_Aspects.pf +++ b/superstructure/generic/tests/Test_Aspects.pf @@ -2,21 +2,21 @@ module Test_Aspects use funit - use mapl_Geom_API - use mapl_StateItemAspect - use mapl_TypekindAspect - use mapl_UnitsAspect - use mapl_AttributesAspect - use mapl_UngriddedDimsAspect - use mapl_FieldClassAspect - use mapl_BracketClassAspect - use mapl_AspectId - use mapl_GeomAspect - use mapl_UngriddedDims - use mapl_UngriddedDim - use mapl_UngriddedDimVector - use mapl_BasicVerticalGrid - use mapl_ESMF_Utilities, only: MAPL_TYPEKIND_MIRROR + use mapl_Geom_API_mod + use mapl_StateItemAspect_mod + use mapl_TypekindAspect_mod + use mapl_UnitsAspect_mod + use mapl_AttributesAspect_mod + use mapl_UngriddedDimsAspect_mod + use mapl_FieldClassAspect_mod + use mapl_BracketClassAspect_mod + use mapl_AspectId_mod + use mapl_GeomAspect_mod + use mapl_UngriddedDims_mod + use mapl_UngriddedDim_mod + use mapl_UngriddedDimVector_mod + use mapl_BasicVerticalGrid_mod + use mapl_ESMF_Utilities_mod, only: MAPL_TYPEKIND_MIRROR use gftl2_StringVector use esmf implicit none diff --git a/superstructure/generic/tests/Test_BaseAspect.pf b/superstructure/generic/tests/Test_BaseAspect.pf index d905c2eac75..9db478b898c 100644 --- a/superstructure/generic/tests/Test_BaseAspect.pf +++ b/superstructure/generic/tests/Test_BaseAspect.pf @@ -2,7 +2,7 @@ module Test_BaseAspect use MockAspect_mod - use mapl_StateItemAspect + use mapl_StateItemAspect_mod use funit, expectation_shadow => expectation implicit none diff --git a/superstructure/generic/tests/Test_BracketClassAspect.pf b/superstructure/generic/tests/Test_BracketClassAspect.pf index 10514073a05..3daa8084a92 100644 --- a/superstructure/generic/tests/Test_BracketClassAspect.pf +++ b/superstructure/generic/tests/Test_BracketClassAspect.pf @@ -1,17 +1,17 @@ #include "MAPL_TestErr.h" module Test_BracketClassAspect - use mapl_StateItemImpl - use mapl_AspectId - use mapl_StateItemSpec - use mapl_BracketClassAspect - use mapl_VerticalGridAspect - use mapl_VerticalGrid_API - use mapl_VariableSpec - use mapl_StateItemAspect - use mapl_StateRegistry - use mapl_Geom_API - use mapl_FieldBundle_API - use MAPL_FieldUtils + use mapl_StateItemImpl_mod + use mapl_AspectId_mod + use mapl_StateItemSpec_mod + use mapl_BracketClassAspect_mod + use mapl_VerticalGridAspect_mod + use mapl_VerticalGrid_API_mod + use mapl_VariableSpec_mod + use mapl_StateItemAspect_mod + use mapl_StateRegistry_mod + use mapl_Geom_API_mod + use mapl_FieldBundle_API_mod + use mapl_FieldUtils use funit use esmf implicit none diff --git a/superstructure/generic/tests/Test_BracketSpec.pf b/superstructure/generic/tests/Test_BracketSpec.pf index b0149edde72..d8d1f1b0624 100644 --- a/superstructure/generic/tests/Test_BracketSpec.pf +++ b/superstructure/generic/tests/Test_BracketSpec.pf @@ -2,16 +2,16 @@ module Test_BracketSpec use funit - use mapl_BracketSpec - use mapl_FieldSpec - use mapl_UngriddedDims - use mapl_VerticalDimSpec - use mapl_VerticalGrid - use mapl_BasicVerticalGrid - use mapl_ActualConnectionPt - use mapl_StateItemSpec - use mapl_ESMF_Utilities, only: MAPL_TYPEKIND_MIRROR - use mapl_Geom_API + use mapl_BracketSpec_mod + use mapl_FieldSpec_mod + use mapl_UngriddedDims_mod + use mapl_VerticalDimSpec_mod + use mapl_VerticalGrid_mod + use mapl_BasicVerticalGrid_mod + use mapl_ActualConnectionPt_mod + use mapl_StateItemSpec_mod + use mapl_ESMF_Utilities_mod, only: MAPL_TYPEKIND_MIRROR + use mapl_Geom_API_mod use gftl2_StringVector use esmf implicit none diff --git a/superstructure/generic/tests/Test_CSR_SparseMatrix.pf b/superstructure/generic/tests/Test_CSR_SparseMatrix.pf index b0b063682ed..11f371c60d0 100644 --- a/superstructure/generic/tests/Test_CSR_SparseMatrix.pf +++ b/superstructure/generic/tests/Test_CSR_SparseMatrix.pf @@ -1,5 +1,5 @@ module Test_CSR_SparseMatrix - use mapl_CSR_SparseMatrix + use mapl_CSR_SparseMatrix_mod use funit use, intrinsic :: iso_fortran_env implicit none diff --git a/superstructure/generic/tests/Test_ClockGet.pf b/superstructure/generic/tests/Test_ClockGet.pf index a9ecc4895d4..99c46c3f2a8 100644 --- a/superstructure/generic/tests/Test_ClockGet.pf +++ b/superstructure/generic/tests/Test_ClockGet.pf @@ -3,7 +3,7 @@ module Test_ClockGet use esmf - use mapl_generic, only: MAPL_ClockGet + use mapl_generic_mod, only: MAPL_ClockGet use pfunit implicit none diff --git a/superstructure/generic/tests/Test_ComponentSpec.pf b/superstructure/generic/tests/Test_ComponentSpec.pf index e9f60e9652a..29f4e65e817 100644 --- a/superstructure/generic/tests/Test_ComponentSpec.pf +++ b/superstructure/generic/tests/Test_ComponentSpec.pf @@ -1,8 +1,8 @@ module Test_ComponentSpec use pfunit - use mapl_ComponentSpec - use mapl_ChildSpec - use mapl_ChildSpecMap + use mapl_ComponentSpec_mod + use mapl_ChildSpec_mod + use mapl_ChildSpecMap_mod implicit none (type,external) contains diff --git a/superstructure/generic/tests/Test_ComponentSpecParser.pf b/superstructure/generic/tests/Test_ComponentSpecParser.pf index 9b216d43bbb..c81c6559c41 100644 --- a/superstructure/generic/tests/Test_ComponentSpecParser.pf +++ b/superstructure/generic/tests/Test_ComponentSpecParser.pf @@ -6,12 +6,12 @@ #include "MAPL_ErrLog.h" module Test_ComponentSpecParser use funit - use mapl_StateItemImpl - use mapl_UserSetServices - use mapl_ComponentSpecParser - use mapl_ChildSpec - use mapl_ChildSpecMap - use mapl_ErrorHandling + use mapl_StateItemImpl_mod + use mapl_UserSetServices_mod + use mapl_ComponentSpecParser_mod + use mapl_ChildSpec_mod + use mapl_ChildSpecMap_mod + use mapl_ErrorHandling_mod use esmf implicit none(type,external) diff --git a/superstructure/generic/tests/Test_ConfigurableGridComp.pf b/superstructure/generic/tests/Test_ConfigurableGridComp.pf index b7e18ee7f44..265ff15bb56 100644 --- a/superstructure/generic/tests/Test_ConfigurableGridComp.pf +++ b/superstructure/generic/tests/Test_ConfigurableGridComp.pf @@ -2,18 +2,18 @@ module Test_ConfigurableGridComp - use mapl_GenericPhases - use mapl_Generic - use mapl_UserSetServices - use mapl_GenericGridComp, only: MAPL_GridCompCreate - use mapl_GenericGridComp, only: setServices - use mapl_GriddedComponentDriver - use mapl_OuterMetaComponent, only: OuterMetaComponent - use mapl_OuterMetaComponent, only: get_outer_meta - use mapl_MultiState - use mapl_GriddedComponentDriver - use mapl_VerticalGrid_API - use mapl_KeywordEnforcer + use mapl_GenericPhases_mod + use mapl_Generic_mod + use mapl_UserSetServices_mod + use mapl_GenericGridComp_mod, only: MAPL_GridCompCreate + use mapl_GenericGridComp_mod, only: setServices + use mapl_GriddedComponentDriver_mod + use mapl_OuterMetaComponent_mod, only: OuterMetaComponent + use mapl_OuterMetaComponent_mod, only: get_outer_meta + use mapl_MultiState_mod + use mapl_GriddedComponentDriver_mod + use mapl_VerticalGrid_API_mod + use mapl_KeywordEnforcer_mod use esmf use nuopc use pFunit @@ -370,7 +370,7 @@ contains end subroutine test_parent_outer_items_created subroutine get_child_user_states(states, outer_meta, child_name, rc) - use mapl_GriddedComponentDriver + use mapl_GriddedComponentDriver_mod type(MultiState), intent(out) :: states type(OuterMetaComponent), target, intent(in) :: outer_meta character(*), intent(in) :: child_name diff --git a/superstructure/generic/tests/Test_ConnectionPt.pf b/superstructure/generic/tests/Test_ConnectionPt.pf index e07bfd20d55..4e0b342ebe6 100644 --- a/superstructure/generic/tests/Test_ConnectionPt.pf +++ b/superstructure/generic/tests/Test_ConnectionPt.pf @@ -1,7 +1,7 @@ module Test_ConnectionPt use funit - use mapl_ConnectionPt - use mapl_VirtualConnectionPt + use mapl_ConnectionPt_mod + use mapl_VirtualConnectionPt_mod implicit none contains diff --git a/superstructure/generic/tests/Test_ConservationAspect.pf b/superstructure/generic/tests/Test_ConservationAspect.pf index 3a64ee6f341..46b70dab9dc 100644 --- a/superstructure/generic/tests/Test_ConservationAspect.pf +++ b/superstructure/generic/tests/Test_ConservationAspect.pf @@ -3,12 +3,12 @@ module Test_ConservationAspect use funit - use mapl_ConservationAspect - use mapl_ConservationType + use mapl_ConservationAspect_mod + use mapl_ConservationType_mod use mapl_Field_API - use mapl_FieldBundle_API - use mapl_ActualConnectionPt - use mapl_ErrorHandling + use mapl_FieldBundle_API_mod + use mapl_ActualConnectionPt_mod + use mapl_ErrorHandling_mod use esmf use ESMF_TestMethod_mod implicit none diff --git a/superstructure/generic/tests/Test_ConservationType.pf b/superstructure/generic/tests/Test_ConservationType.pf index de3895fa6b0..86112e72fd4 100644 --- a/superstructure/generic/tests/Test_ConservationType.pf +++ b/superstructure/generic/tests/Test_ConservationType.pf @@ -1,6 +1,6 @@ #include "MAPL_TestErr.h" module Test_ConservationType - use mapl_ConservationType + use mapl_ConservationType_mod use funit implicit none diff --git a/superstructure/generic/tests/Test_ConvertUnitsTransform.pf b/superstructure/generic/tests/Test_ConvertUnitsTransform.pf index ee52eb3e02c..df04d3a4b2a 100644 --- a/superstructure/generic/tests/Test_ConvertUnitsTransform.pf +++ b/superstructure/generic/tests/Test_ConvertUnitsTransform.pf @@ -2,12 +2,12 @@ #include "unused_dummy.H" module Test_ConvertUnitsTransform - use mapl_ConvertUnitsTransform - use mapl_ExtensionTransform - use mapl_StateItemImpl + use mapl_ConvertUnitsTransform_mod + use mapl_ExtensionTransform_mod + use mapl_StateItemImpl_mod use esmf - use MAPL_FieldUtils - use mapl_FieldBundle_API + use mapl_FieldUtils + use mapl_FieldBundle_API_mod use pfunit use ESMF_TestMethod_mod implicit none diff --git a/superstructure/generic/tests/Test_CopyTransform.pf b/superstructure/generic/tests/Test_CopyTransform.pf index 84e175c01db..f05b7827afe 100644 --- a/superstructure/generic/tests/Test_CopyTransform.pf +++ b/superstructure/generic/tests/Test_CopyTransform.pf @@ -2,10 +2,10 @@ #include "unused_dummy.H" module Test_CopyTransform - use mapl_CopyTransform - use mapl_StateItemImpl - use mapl_ExtensionTransform, only: COUPLER_IMPORT_NAME, COUPLER_EXPORT_NAME - use mapl_FieldBundle_API + use mapl_CopyTransform_mod + use mapl_StateItemImpl_mod + use mapl_ExtensionTransform_mod, only: COUPLER_IMPORT_NAME, COUPLER_EXPORT_NAME + use mapl_FieldBundle_API_mod use pfunit use esmf use ESMF_TestMethod_mod diff --git a/superstructure/generic/tests/Test_Couplers.pf b/superstructure/generic/tests/Test_Couplers.pf index 97c87c23c7c..02dd87eeefc 100644 --- a/superstructure/generic/tests/Test_Couplers.pf +++ b/superstructure/generic/tests/Test_Couplers.pf @@ -2,17 +2,17 @@ #include "unused_dummy.H" module Test_Couplers - use mapl_StateItemAspect, only: StateItemAspect - use mapl_TypekindAspect, only: TypekindAspect, to_TypekindAspect - use mapl_UnitsAspect, only: UnitsAspect, to_UnitsAspect - use mapl_StateItemImpl - use mapl_VariableSpec, only: VariableSpec, make_VariableSpec - use mapl_StateItemSpec, only: StateItemSpec - use mapl_StateRegistry, only: StateRegistry - use mapl_VirtualConnectionPt, only: VirtualConnectionPt - use mapl_AspectId - use mapl_Geom_API - use mapl_VerticalGrid_API + use mapl_StateItemAspect_mod, only: StateItemAspect + use mapl_TypekindAspect_mod, only: TypekindAspect, to_TypekindAspect + use mapl_UnitsAspect_mod, only: UnitsAspect, to_UnitsAspect + use mapl_StateItemImpl_mod + use mapl_VariableSpec_mod, only: VariableSpec, make_VariableSpec + use mapl_StateItemSpec_mod, only: StateItemSpec + use mapl_StateRegistry_mod, only: StateRegistry + use mapl_VirtualConnectionPt_mod, only: VirtualConnectionPt + use mapl_AspectId_mod + use mapl_Geom_API_mod + use mapl_VerticalGrid_API_mod use pfunit use ESMF_TestMethod_mod use esmf diff --git a/superstructure/generic/tests/Test_ExtensionFamily.pf b/superstructure/generic/tests/Test_ExtensionFamily.pf index 666e739924b..1888a425299 100644 --- a/superstructure/generic/tests/Test_ExtensionFamily.pf +++ b/superstructure/generic/tests/Test_ExtensionFamily.pf @@ -2,10 +2,10 @@ #include "unused_dummy.H" module Test_ExtensionFamily - use mapl_ExtensionFamily - use mapl_StateRegistry - use mapl_VirtualConnectionPt - use mapl_StateItemSpec + use mapl_ExtensionFamily_mod + use mapl_StateRegistry_mod + use mapl_VirtualConnectionPt_mod + use mapl_StateItemSpec_mod use MockAspect_mod use esmf use funit diff --git a/superstructure/generic/tests/Test_ExtensionTransform.pf b/superstructure/generic/tests/Test_ExtensionTransform.pf index 19598951ca5..bb9a8531eb6 100644 --- a/superstructure/generic/tests/Test_ExtensionTransform.pf +++ b/superstructure/generic/tests/Test_ExtensionTransform.pf @@ -1,7 +1,7 @@ #include "MAPL_TestErr.h" module Test_ExtensionTransform - use mapl_ExtensionTransform - use mapl_NullTransform + use mapl_ExtensionTransform_mod + use mapl_NullTransform_mod use pfunit use ESMF_TestMethod_mod implicit none diff --git a/superstructure/generic/tests/Test_ExtensionTransformUtils.pf b/superstructure/generic/tests/Test_ExtensionTransformUtils.pf index baa916b6ac4..84341515d5a 100644 --- a/superstructure/generic/tests/Test_ExtensionTransformUtils.pf +++ b/superstructure/generic/tests/Test_ExtensionTransformUtils.pf @@ -2,8 +2,8 @@ #include "unused_dummy.H" module Test_ExtensionTransformUtils - use mapl_ExtensionTransformUtils - use mapl_FieldBundle_API + use mapl_ExtensionTransformUtils_mod + use mapl_FieldBundle_API_mod use pfunit use esmf, only: ESMF_FieldBundle, ESMF_FieldBundleCreate, ESMF_FieldBundleDestroy use ESMF_TestMethod_mod diff --git a/superstructure/generic/tests/Test_FieldDictIntegration.pf b/superstructure/generic/tests/Test_FieldDictIntegration.pf index fbf47b63c6b..220cf640815 100644 --- a/superstructure/generic/tests/Test_FieldDictIntegration.pf +++ b/superstructure/generic/tests/Test_FieldDictIntegration.pf @@ -13,9 +13,9 @@ module Test_FieldDictIntegration use funit use esmf - use mapl_FieldDictionary - use mapl_VariableSpec - use mapl_ErrorHandling + use mapl_FieldDictionary_mod + use mapl_VariableSpec_mod + use mapl_ErrorHandling_mod implicit none(type, external) ! Mini field-dictionary YAML used by most tests. diff --git a/superstructure/generic/tests/Test_FieldDictionary.pf b/superstructure/generic/tests/Test_FieldDictionary.pf index e9c067b90db..84318c2c36b 100644 --- a/superstructure/generic/tests/Test_FieldDictionary.pf +++ b/superstructure/generic/tests/Test_FieldDictionary.pf @@ -2,12 +2,12 @@ module Test_FieldDictionary use funit use esmf - use mapl_FieldDictionary - use mapl_FieldDictionaryItem - use mapl_FieldDictionaryConfig - use mapl_ValidationMode - use mapl_VerificationStatus - use mapl_StateItemImpl + use mapl_FieldDictionary_mod + use mapl_FieldDictionaryItem_mod + use mapl_FieldDictionaryConfig_mod + use mapl_ValidationMode_mod + use mapl_VerificationStatus_mod + use mapl_StateItemImpl_mod implicit none contains diff --git a/superstructure/generic/tests/Test_FixedLevelsVerticalGrid.pf b/superstructure/generic/tests/Test_FixedLevelsVerticalGrid.pf index 79517a30215..0e970144d19 100644 --- a/superstructure/generic/tests/Test_FixedLevelsVerticalGrid.pf +++ b/superstructure/generic/tests/Test_FixedLevelsVerticalGrid.pf @@ -1,5 +1,5 @@ module Test_FixedLevelsVerticalGrid - use mapl_FixedLevelsVerticalGrid + use mapl_FixedLevelsVerticalGrid_mod ! testing framework use ESMF_TestMethod_mod use funit diff --git a/superstructure/generic/tests/Test_GenericGridComp.pf b/superstructure/generic/tests/Test_GenericGridComp.pf index 6480ff8d345..47cd32abc14 100644 --- a/superstructure/generic/tests/Test_GenericGridComp.pf +++ b/superstructure/generic/tests/Test_GenericGridComp.pf @@ -2,8 +2,8 @@ #include "unused_dummy.H" module Test_GenericGridComp - use mapl_UserSetServices - use mapl_GenericGridComp + use mapl_UserSetServices_mod + use mapl_GenericGridComp_mod use ESMF use pfunit implicit none diff --git a/superstructure/generic/tests/Test_GeomAspect.pf b/superstructure/generic/tests/Test_GeomAspect.pf index 54d6604e2d8..38d02d35318 100644 --- a/superstructure/generic/tests/Test_GeomAspect.pf +++ b/superstructure/generic/tests/Test_GeomAspect.pf @@ -2,12 +2,12 @@ #include "unused_dummy.H" ! type(ESMF_GeomMatch_Flag) module Test_GeomAspect - use mapl_GeomAspect, only: GeomAspect + use mapl_GeomAspect_mod, only: GeomAspect use mapl_Field_API, only: MAPL_FieldSet, MAPL_FieldGet - use mapl_FieldBundle_API, only: MAPL_FieldBundleSet, MAPL_FieldBundleGet - use mapl_HorizontalDimsSpec, only: HorizontalDimsSpec, operator(==) - use mapl_HorizontalDimsSpec, only: HORIZONTAL_DIMS_NONE, HORIZONTAL_DIMS_GEOM - use mapl_EsmfRegridder, only: EsmfRegridderParam + use mapl_FieldBundle_API_mod, only: MAPL_FieldBundleSet, MAPL_FieldBundleGet + use mapl_HorizontalDimsSpec_mod, only: HorizontalDimsSpec, operator(==) + use mapl_HorizontalDimsSpec_mod, only: HORIZONTAL_DIMS_NONE, HORIZONTAL_DIMS_GEOM + use mapl_EsmfRegridder_mod, only: EsmfRegridderParam use ESMF, only: ESMF_TypeKind_Flag, ESMF_TYPEKIND_R4 use ESMF, only: ESMF_Field, ESMF_FieldBundle, ESMF_Grid, ESMF_Geom use ESMF, only: ESMF_GridCreate, ESMF_GeomCreate, ESMF_GridDestroy diff --git a/superstructure/generic/tests/Test_HConfigMatch.pf b/superstructure/generic/tests/Test_HConfigMatch.pf index abeebbdfb6c..76200772d5e 100644 --- a/superstructure/generic/tests/Test_HConfigMatch.pf +++ b/superstructure/generic/tests/Test_HConfigMatch.pf @@ -2,7 +2,7 @@ module Test_HConfigMatch use funit use esmf - use mapl_ESMF_HConfigUtilities + use mapl_ESMF_HConfigUtilities_mod implicit none contains diff --git a/superstructure/generic/tests/Test_IntegratedNormalization.pf b/superstructure/generic/tests/Test_IntegratedNormalization.pf index ddd836aadde..b4551154407 100644 --- a/superstructure/generic/tests/Test_IntegratedNormalization.pf +++ b/superstructure/generic/tests/Test_IntegratedNormalization.pf @@ -2,24 +2,24 @@ #include "unused_dummy.H" module Test_IntegratedNormalization - use mapl_RegridTransform - use mapl_VerticalRegridTransform - use mapl_VerticalRegridMethod - use mapl_VerticalStaggerLoc - use mapl_VerticalCoordinateDirection - use mapl_VerticalAlignment - use mapl_VerticalGrid_API - use mapl_ExtensionTransform, only: COUPLER_IMPORT_NAME, COUPLER_EXPORT_NAME, ExtensionTransform - use mapl_FieldCreateImpl, only: MAPL_FieldCreate - use mapl_QuantityType - use mapl_QuantityTypeMetadata - use mapl_NormalizationType - use mapl_NormalizationMetadata + use mapl_RegridTransform_mod + use mapl_VerticalRegridTransform_mod + use mapl_VerticalRegridMethod_mod + use mapl_VerticalStaggerLoc_mod + use mapl_VerticalCoordinateDirection_mod + use mapl_VerticalAlignment_mod + use mapl_VerticalGrid_API_mod + use mapl_ExtensionTransform_mod, only: COUPLER_IMPORT_NAME, COUPLER_EXPORT_NAME, ExtensionTransform + use mapl_FieldCreateImpl_mod, only: MAPL_FieldCreate + use mapl_QuantityType_mod + use mapl_QuantityTypeMetadata_mod + use mapl_NormalizationType_mod + use mapl_NormalizationMetadata_mod use mapl_Field_API use mapl_regridder_mgr, only: EsmfRegridderParam - use mapl_RoutehandleParam, only: RoutehandleParam - use mapl_Geom_API - use mapl_ErrorHandling + use mapl_RoutehandleParam_mod, only: RoutehandleParam + use mapl_Geom_API_mod + use mapl_ErrorHandling_mod use esmf use pfunit use ESMF_TestMethod_mod @@ -339,15 +339,15 @@ contains !=========================================================================== @Test(type=ESMF_TestMethod, npes=[1]) subroutine test_normalization_mismatch(this) - use mapl_StateRegistry - use mapl_StateItemSpec - use mapl_StateItemSpecPtrVector - use mapl_VirtualConnectionPt - use mapl_ConnectionPt - use mapl_ExtensionFamily - use mapl_SimpleConnection - use mapl_NormalizationAspect - use mapl_AspectId + use mapl_StateRegistry_mod + use mapl_StateItemSpec_mod + use mapl_StateItemSpecPtrVector_mod + use mapl_VirtualConnectionPt_mod + use mapl_ConnectionPt_mod + use mapl_ExtensionFamily_mod + use mapl_SimpleConnection_mod + use mapl_NormalizationAspect_mod + use mapl_AspectId_mod use MockAspect_mod class(ESMF_TestMethod), intent(inout) :: this @@ -407,13 +407,13 @@ contains !=========================================================================== @Test(type=ESMF_TestMethod, npes=[1]) subroutine test_memory_efficiency_matching_grids(this) - use mapl_StateRegistry - use mapl_VariableSpec, only: VariableSpec, make_VariableSpec - use mapl_StateItemSpec - use mapl_VirtualConnectionPt - use mapl_ConnectionPt - use mapl_SimpleConnection - use mapl_ExtensionFamily + use mapl_StateRegistry_mod + use mapl_VariableSpec_mod, only: VariableSpec, make_VariableSpec + use mapl_StateItemSpec_mod + use mapl_VirtualConnectionPt_mod + use mapl_ConnectionPt_mod + use mapl_SimpleConnection_mod + use mapl_ExtensionFamily_mod class(ESMF_TestMethod), intent(inout) :: this type(StateRegistry), target :: parent_registry, src_registry, dst_registry @@ -479,13 +479,13 @@ contains !=========================================================================== @Test(type=ESMF_TestMethod, npes=[1]) subroutine test_memory_efficiency_different_grids(this) - use mapl_StateRegistry - use mapl_VariableSpec, only: VariableSpec, make_VariableSpec - use mapl_StateItemSpec - use mapl_VirtualConnectionPt - use mapl_ConnectionPt - use mapl_SimpleConnection - use mapl_ExtensionFamily + use mapl_StateRegistry_mod + use mapl_VariableSpec_mod, only: VariableSpec, make_VariableSpec + use mapl_StateItemSpec_mod + use mapl_VirtualConnectionPt_mod + use mapl_ConnectionPt_mod + use mapl_SimpleConnection_mod + use mapl_ExtensionFamily_mod class(ESMF_TestMethod), intent(inout) :: this type(StateRegistry), target :: parent_registry, src_registry, dst_registry diff --git a/superstructure/generic/tests/Test_ModelVerticalGrid.pf b/superstructure/generic/tests/Test_ModelVerticalGrid.pf index de6d8b88122..1211c146bbf 100644 --- a/superstructure/generic/tests/Test_ModelVerticalGrid.pf +++ b/superstructure/generic/tests/Test_ModelVerticalGrid.pf @@ -8,35 +8,35 @@ module Test_ModelVerticalGrid - use mapl_ErrorHandling - use mapl_VerticalStaggerLoc - use mapl_VerticalGrid_API - use mapl_ModelVerticalGrid - use mapl_StateRegistry - use mapl_VariableSpec - use mapl_VirtualConnectionPt - use mapl_ActualConnectionPt - use mapl_StateItemSpec - use mapl_StateItemAspect - use mapl_AspectId - use mapl_ComponentDriver - use mapl_ComponentDriver - use mapl_ComponentDriverVector - use mapl_ComponentDriverPtrVector - use mapl_MultiState - use mapl_Geom_API - use mapl_CouplerPhases, only: GENERIC_COUPLER_UPDATE - use mapl_GeomAspect - use mapl_TypekindAspect - use mapl_UnitsAspect - use mapl_UngriddedDimsAspect - use mapl_UngriddedDims - use mapl_AttributesAspect - use mapl_FieldClassAspect - use mapl_QuantityTypeAspect - use mapl_ConservationAspect - use mapl_NormalizationAspect - use mapl_NormalizationType + use mapl_ErrorHandling_mod + use mapl_VerticalStaggerLoc_mod + use mapl_VerticalGrid_API_mod + use mapl_ModelVerticalGrid_mod + use mapl_StateRegistry_mod + use mapl_VariableSpec_mod + use mapl_VirtualConnectionPt_mod + use mapl_ActualConnectionPt_mod + use mapl_StateItemSpec_mod + use mapl_StateItemAspect_mod + use mapl_AspectId_mod + use mapl_ComponentDriver_mod + use mapl_ComponentDriver_mod + use mapl_ComponentDriverVector_mod + use mapl_ComponentDriverPtrVector_mod + use mapl_MultiState_mod + use mapl_Geom_API_mod + use mapl_CouplerPhases_mod, only: GENERIC_COUPLER_UPDATE + use mapl_GeomAspect_mod + use mapl_TypekindAspect_mod + use mapl_UnitsAspect_mod + use mapl_UngriddedDimsAspect_mod + use mapl_UngriddedDims_mod + use mapl_AttributesAspect_mod + use mapl_FieldClassAspect_mod + use mapl_QuantityTypeAspect_mod + use mapl_ConservationAspect_mod + use mapl_NormalizationAspect_mod + use mapl_NormalizationType_mod use gFTL2_StringVector use esmf ! testing framework diff --git a/superstructure/generic/tests/Test_NormalizationAspect.pf b/superstructure/generic/tests/Test_NormalizationAspect.pf index ed4b3886aa1..43aa3571549 100644 --- a/superstructure/generic/tests/Test_NormalizationAspect.pf +++ b/superstructure/generic/tests/Test_NormalizationAspect.pf @@ -3,12 +3,12 @@ module Test_NormalizationAspect use funit - use mapl_NormalizationAspect - use mapl_NormalizationType - use mapl_StateItemAspect - use mapl_ActualConnectionPt - use mapl_ExtensionTransform - use mapl_ErrorHandling + use mapl_NormalizationAspect_mod + use mapl_NormalizationType_mod + use mapl_StateItemAspect_mod + use mapl_ActualConnectionPt_mod + use mapl_ExtensionTransform_mod + use mapl_ErrorHandling_mod use esmf use ESMF_TestMethod_mod implicit none diff --git a/superstructure/generic/tests/Test_NormalizationTransform.pf b/superstructure/generic/tests/Test_NormalizationTransform.pf index aca7d457312..5b6ecbdaacd 100644 --- a/superstructure/generic/tests/Test_NormalizationTransform.pf +++ b/superstructure/generic/tests/Test_NormalizationTransform.pf @@ -2,12 +2,12 @@ #include "unused_dummy.H" module Test_NormalizationTransform - use mapl_NormalizationTransform - use mapl_ExtensionTransform - use mapl_StateItemImpl + use mapl_NormalizationTransform_mod + use mapl_ExtensionTransform_mod + use mapl_StateItemImpl_mod use esmf - use MAPL_FieldUtils - use mapl_FieldBundle_API + use mapl_FieldUtils + use mapl_FieldBundle_API_mod use pfunit use ESMF_TestMethod_mod implicit none diff --git a/superstructure/generic/tests/Test_PolymorphicSetMirror.pf b/superstructure/generic/tests/Test_PolymorphicSetMirror.pf index fc5327489b9..fd3b0cb131a 100644 --- a/superstructure/generic/tests/Test_PolymorphicSetMirror.pf +++ b/superstructure/generic/tests/Test_PolymorphicSetMirror.pf @@ -3,9 +3,9 @@ module Test_PolymorphicSetMirror use funit - use mapl_NormalizationAspect - use mapl_StateItemAspect - use mapl_ErrorHandling + use mapl_NormalizationAspect_mod + use mapl_StateItemAspect_mod + use mapl_ErrorHandling_mod use esmf use ESMF_TestMethod_mod implicit none diff --git a/superstructure/generic/tests/Test_QuantityType.pf b/superstructure/generic/tests/Test_QuantityType.pf index cbf6f7f5e7f..9971560b2ef 100644 --- a/superstructure/generic/tests/Test_QuantityType.pf +++ b/superstructure/generic/tests/Test_QuantityType.pf @@ -1,7 +1,7 @@ #include "MAPL_TestErr.h" module Test_QuantityType - use mapl_QuantityType - use mapl_NormalizationType + use mapl_QuantityType_mod + use mapl_NormalizationType_mod use funit implicit none diff --git a/superstructure/generic/tests/Test_QuantityTypeAspect.pf b/superstructure/generic/tests/Test_QuantityTypeAspect.pf index 9dc31004d96..e172bdfbd04 100644 --- a/superstructure/generic/tests/Test_QuantityTypeAspect.pf +++ b/superstructure/generic/tests/Test_QuantityTypeAspect.pf @@ -3,13 +3,13 @@ module Test_QuantityTypeAspect use funit - use mapl_QuantityTypeAspect - use mapl_QuantityType - use mapl_NormalizationType + use mapl_QuantityTypeAspect_mod + use mapl_QuantityType_mod + use mapl_NormalizationType_mod use mapl_Field_API - use mapl_FieldBundle_API - use mapl_ActualConnectionPt - use mapl_ErrorHandling + use mapl_FieldBundle_API_mod + use mapl_ActualConnectionPt_mod + use mapl_ErrorHandling_mod use esmf use ESMF_TestMethod_mod implicit none diff --git a/superstructure/generic/tests/Test_RegridTransform.pf b/superstructure/generic/tests/Test_RegridTransform.pf index fd122851c66..917e27d50e8 100644 --- a/superstructure/generic/tests/Test_RegridTransform.pf +++ b/superstructure/generic/tests/Test_RegridTransform.pf @@ -2,13 +2,13 @@ #include "unused_dummy.H" module Test_RegridTransform - use mapl_RegridTransform - use mapl_ExtensionTransform, only: COUPLER_IMPORT_NAME, COUPLER_EXPORT_NAME, ExtensionTransform - use mapl_FieldCreateImpl, only: MAPL_FieldCreate + use mapl_RegridTransform_mod + use mapl_ExtensionTransform_mod, only: COUPLER_IMPORT_NAME, COUPLER_EXPORT_NAME, ExtensionTransform + use mapl_FieldCreateImpl_mod, only: MAPL_FieldCreate use mapl_regridder_mgr, only: EsmfRegridderParam - use mapl_RoutehandleParam, only: RoutehandleParam - use mapl_Geom_API - use mapl_ErrorHandling + use mapl_RoutehandleParam_mod, only: RoutehandleParam + use mapl_Geom_API_mod + use mapl_ErrorHandling_mod use esmf use pfunit use ESMF_TestMethod_mod diff --git a/superstructure/generic/tests/Test_Scenarios.pf b/superstructure/generic/tests/Test_Scenarios.pf index 8dcb151d7a9..5ac30c4c2e7 100644 --- a/superstructure/generic/tests/Test_Scenarios.pf +++ b/superstructure/generic/tests/Test_Scenarios.pf @@ -2,15 +2,15 @@ module Test_Scenarios - use mapl_Generic - use mapl_GenericPhases - use mapl_MultiState - use mapl_OuterMetaComponent - use mapl_GriddedComponentDriver - use mapl_GenericGridComp, generic_setservices => setservices - use mapl_UserSetServices - use mapl_ESMF_Utilities - use mapl_Geom_API, only: mapl_GeomGet + use mapl_Generic_mod + use mapl_GenericPhases_mod + use mapl_MultiState_mod + use mapl_OuterMetaComponent_mod + use mapl_GriddedComponentDriver_mod + use mapl_GenericGridComp_mod, generic_setservices => setservices + use mapl_UserSetServices_mod + use mapl_ESMF_Utilities_mod + use mapl_Geom_API_mod, only: mapl_GeomGet use esmf use nuopc ! testing framework @@ -857,7 +857,7 @@ contains end subroutine check_fieldCount recursive subroutine get_substates(gc, states, component_path, substates, rc) - use mapl_GriddedComponentDriver + use mapl_GriddedComponentDriver_mod type(ESMF_GridComp), target, intent(inout) :: gc type(MultiState), intent(in) :: states character(*), intent(in) :: component_path diff --git a/superstructure/generic/tests/Test_StateRegistry.pf b/superstructure/generic/tests/Test_StateRegistry.pf index e768e8e609d..f28088e839c 100644 --- a/superstructure/generic/tests/Test_StateRegistry.pf +++ b/superstructure/generic/tests/Test_StateRegistry.pf @@ -2,17 +2,17 @@ #include "unused_dummy.H" module Test_StateRegistry - use mapl_StateItemSpec - use mapl_StateItemSpecPtrVector - use mapl_StateRegistry - use mapl_MultiState - use mapl_ConnectionPt - use mapl_VirtualConnectionPt - use mapl_ExtensionFamily - use mapl_SimpleConnection - use mapl_StateItemAspect - use mapl_FieldClassAspect - use mapl_AspectId + use mapl_StateItemSpec_mod + use mapl_StateItemSpecPtrVector_mod + use mapl_StateRegistry_mod + use mapl_MultiState_mod + use mapl_ConnectionPt_mod + use mapl_VirtualConnectionPt_mod + use mapl_ExtensionFamily_mod + use mapl_SimpleConnection_mod + use mapl_StateItemAspect_mod + use mapl_FieldClassAspect_mod + use mapl_AspectId_mod use MockAspect_mod use ESMF_TestMethod_mod use esmf diff --git a/superstructure/generic/tests/Test_TimeInterpolateTransform.pf b/superstructure/generic/tests/Test_TimeInterpolateTransform.pf index 7f3e284b361..6f68645e8df 100644 --- a/superstructure/generic/tests/Test_TimeInterpolateTransform.pf +++ b/superstructure/generic/tests/Test_TimeInterpolateTransform.pf @@ -1,10 +1,10 @@ #include "MAPL_TestErr.h" module Test_TimeInterpolateTransform - use mapl_ExtensionTransform - use mapl_TimeInterpolateTransform - use mapl_InfoUtilities - use MAPL_FieldPointerUtilities - use mapl_FieldBundle_API + use mapl_ExtensionTransform_mod + use mapl_TimeInterpolateTransform_mod + use mapl_InfoUtilities_mod + use mapl_FieldPointerUtilities_mod + use mapl_FieldBundle_API_mod use ESMF_TestMethod_mod use MAPL_Constants, only: MAPL_UNDEFINED_REAL, MAPL_UNDEFINED_REAL64 use esmf diff --git a/superstructure/generic/tests/Test_TypekindAspect.pf b/superstructure/generic/tests/Test_TypekindAspect.pf index cdc1597a1f6..ac5314563f4 100644 --- a/superstructure/generic/tests/Test_TypekindAspect.pf +++ b/superstructure/generic/tests/Test_TypekindAspect.pf @@ -2,11 +2,11 @@ module Test_TypekindAspect use funit - use mapl_TypekindAspect + use mapl_TypekindAspect_mod use mapl_Field_API - use mapl_FieldBundle_API - use mapl_ESMF_Utilities, only: MAPL_TYPEKIND_MIRROR - use mapl_ErrorHandling + use mapl_FieldBundle_API_mod + use mapl_ESMF_Utilities_mod, only: MAPL_TYPEKIND_MIRROR + use mapl_ErrorHandling_mod use esmf use ESMF_TestMethod_mod implicit none diff --git a/superstructure/generic/tests/Test_UngriddedDimsAspect.pf b/superstructure/generic/tests/Test_UngriddedDimsAspect.pf index 395451b3874..a639eea07b4 100644 --- a/superstructure/generic/tests/Test_UngriddedDimsAspect.pf +++ b/superstructure/generic/tests/Test_UngriddedDimsAspect.pf @@ -3,12 +3,12 @@ module Test_UngriddedDimsAspect use funit - use mapl_UngriddedDimsAspect - use mapl_UngriddedDims - use mapl_UngriddedDim + use mapl_UngriddedDimsAspect_mod + use mapl_UngriddedDims_mod + use mapl_UngriddedDim_mod use mapl_Field_API - use mapl_FieldBundle_API - use mapl_ErrorHandling + use mapl_FieldBundle_API_mod + use mapl_ErrorHandling_mod use esmf use ESMF_TestMethod_mod implicit none diff --git a/superstructure/generic/tests/Test_UnitsAspect.pf b/superstructure/generic/tests/Test_UnitsAspect.pf index 09f50e4d55c..4b02a14855b 100644 --- a/superstructure/generic/tests/Test_UnitsAspect.pf +++ b/superstructure/generic/tests/Test_UnitsAspect.pf @@ -3,10 +3,10 @@ module Test_UnitsAspect use funit - use mapl_UnitsAspect + use mapl_UnitsAspect_mod use mapl_Field_API - use mapl_FieldBundle_API - use mapl_ErrorHandling + use mapl_FieldBundle_API_mod + use mapl_ErrorHandling_mod use esmf use ESMF_TestMethod_mod implicit none diff --git a/superstructure/generic/tests/Test_VariableSpec_private.pf b/superstructure/generic/tests/Test_VariableSpec_private.pf index d71e22f3c94..94b3d69acf9 100644 --- a/superstructure/generic/tests/Test_VariableSpec_private.pf +++ b/superstructure/generic/tests/Test_VariableSpec_private.pf @@ -1,10 +1,10 @@ #include "MAPL_TestErr.h" module Test_VariableSpec_private - use mapl_VariableSpec_private + use mapl_VariableSpec_private_mod use esmf use pfunit use ESMF_TestMethod_mod - use mapl_EsmfRegridder, only: EsmfRegridderParam + use mapl_EsmfRegridder_mod, only: EsmfRegridderParam implicit none(type,external) character(len=*), parameter :: NONZERO = 'Non-zero status returned' diff --git a/superstructure/generic/tests/Test_VectorBasisKind.pf b/superstructure/generic/tests/Test_VectorBasisKind.pf index 0e2cda9e9ce..28392bbafc4 100644 --- a/superstructure/generic/tests/Test_VectorBasisKind.pf +++ b/superstructure/generic/tests/Test_VectorBasisKind.pf @@ -1,14 +1,14 @@ #include "MAPL_TestErr.h" module Test_VectorBasisKind - use mapl_VectorBasisKind - use mapl_VariableSpec - use mapl_StateItemSpec - use mapl_StateItemImpl - use mapl_StateRegistry - use mapl_Geom_API - use mapl_VerticalGrid_API - use mapl_StateItemAspect - use mapl_FieldBundle_API + use mapl_VectorBasisKind_mod + use mapl_VariableSpec_mod + use mapl_StateItemSpec_mod + use mapl_StateItemImpl_mod + use mapl_StateRegistry_mod + use mapl_Geom_API_mod + use mapl_VerticalGrid_API_mod + use mapl_StateItemAspect_mod + use mapl_FieldBundle_API_mod use esmf use funit implicit none diff --git a/superstructure/generic/tests/Test_VectorBracketClassAspect.pf b/superstructure/generic/tests/Test_VectorBracketClassAspect.pf index 8a9c0fcec78..1ce5302273e 100644 --- a/superstructure/generic/tests/Test_VectorBracketClassAspect.pf +++ b/superstructure/generic/tests/Test_VectorBracketClassAspect.pf @@ -1,17 +1,17 @@ #include "MAPL_TestErr.h" module Test_VectorBracketClassAspect - use mapl_StateItemImpl - use mapl_AspectId - use mapl_StateItemSpec - use mapl_VectorBracketClassAspect - use mapl_VerticalGridAspect - use mapl_VerticalGrid_API - use mapl_VariableSpec - use mapl_StateItemAspect - use mapl_StateRegistry - use mapl_Geom_API - use mapl_FieldBundle_API - use MAPL_FieldUtils + use mapl_StateItemImpl_mod + use mapl_AspectId_mod + use mapl_StateItemSpec_mod + use mapl_VectorBracketClassAspect_mod + use mapl_VerticalGridAspect_mod + use mapl_VerticalGrid_API_mod + use mapl_VariableSpec_mod + use mapl_StateItemAspect_mod + use mapl_StateRegistry_mod + use mapl_Geom_API_mod + use mapl_FieldBundle_API_mod + use mapl_FieldUtils use funit use esmf implicit none diff --git a/superstructure/generic/tests/Test_VerticalConservativeMap.pf b/superstructure/generic/tests/Test_VerticalConservativeMap.pf index 2ad62788e5f..6ee18650849 100644 --- a/superstructure/generic/tests/Test_VerticalConservativeMap.pf +++ b/superstructure/generic/tests/Test_VerticalConservativeMap.pf @@ -2,8 +2,8 @@ module Test_VerticalConservativeMap - use mapl_CSR_SparseMatrix, only: SparseMatrix_sp => CSR_SparseMatrix_sp, matmul - use mapl_VerticalConservativeMap, only: compute_conservative_map + use mapl_CSR_SparseMatrix_mod, only: SparseMatrix_sp => CSR_SparseMatrix_sp, matmul + use mapl_VerticalConservativeMap_mod, only: compute_conservative_map use funit use, intrinsic :: iso_fortran_env, only: REAL32 diff --git a/superstructure/generic/tests/Test_VerticalGridAspect.pf b/superstructure/generic/tests/Test_VerticalGridAspect.pf index 7da409bf743..ae55beb803c 100644 --- a/superstructure/generic/tests/Test_VerticalGridAspect.pf +++ b/superstructure/generic/tests/Test_VerticalGridAspect.pf @@ -2,13 +2,13 @@ #include "unused_dummy.H" module Test_VerticalGridAspect - use mapl_StateItemAspect - use mapl_VerticalGridAspect - use mapl_VerticalRegridMethod - use mapl_VerticalGrid_API + use mapl_StateItemAspect_mod + use mapl_VerticalGridAspect_mod + use mapl_VerticalRegridMethod_mod + use mapl_VerticalGrid_API_mod use mapl_Field_API - use mapl_FieldBundle_API - use mapl_ErrorHandling + use mapl_FieldBundle_API_mod + use mapl_ErrorHandling_mod use esmf use funit use ESMF_TestMethod_mod diff --git a/superstructure/generic/tests/Test_VerticalLinearMap.pf b/superstructure/generic/tests/Test_VerticalLinearMap.pf index b7bc23282df..2f89a18dac0 100644 --- a/superstructure/generic/tests/Test_VerticalLinearMap.pf +++ b/superstructure/generic/tests/Test_VerticalLinearMap.pf @@ -2,9 +2,9 @@ module Test_VerticalLinearMap - use mapl_CSR_SparseMatrix, only: SparseMatrix_sp => CSR_SparseMatrix_sp, matmul - use mapl_VerticalLinearMap, only: compute_linear_map, find_bracket, compute_weights - use mapl_VerticalLinearMap, only: IndexValuePair + use mapl_CSR_SparseMatrix_mod, only: SparseMatrix_sp => CSR_SparseMatrix_sp, matmul + use mapl_VerticalLinearMap_mod, only: compute_linear_map, find_bracket, compute_weights + use mapl_VerticalLinearMap_mod, only: IndexValuePair use funit use, intrinsic :: iso_fortran_env, only: REAL32 diff --git a/superstructure/generic/tests/Test_VerticalRegridTransform.pf b/superstructure/generic/tests/Test_VerticalRegridTransform.pf index 2163bc74fe7..1d2f50dd789 100644 --- a/superstructure/generic/tests/Test_VerticalRegridTransform.pf +++ b/superstructure/generic/tests/Test_VerticalRegridTransform.pf @@ -2,15 +2,15 @@ #include "unused_dummy.H" module Test_VerticalRegridTransform - use mapl_VerticalRegridTransform - use mapl_ExtensionTransform, only: COUPLER_IMPORT_NAME, COUPLER_EXPORT_NAME - use mapl_VerticalRegridMethod - use mapl_VerticalStaggerLoc - use mapl_VerticalCoordinateDirection - use mapl_VerticalAlignment - use mapl_FieldCreateImpl, only: MAPL_FieldCreate - use mapl_VerticalGrid_API - use mapl_StateItemImpl + use mapl_VerticalRegridTransform_mod + use mapl_ExtensionTransform_mod, only: COUPLER_IMPORT_NAME, COUPLER_EXPORT_NAME + use mapl_VerticalRegridMethod_mod + use mapl_VerticalStaggerLoc_mod + use mapl_VerticalCoordinateDirection_mod + use mapl_VerticalAlignment_mod + use mapl_FieldCreateImpl_mod, only: MAPL_FieldCreate + use mapl_VerticalGrid_API_mod + use mapl_StateItemImpl_mod use pfunit use esmf use ESMF_TestMethod_mod diff --git a/superstructure/generic/tests/Test_VirtualConnectionPt.pf b/superstructure/generic/tests/Test_VirtualConnectionPt.pf index ae9c63fb31b..d64d5f578a3 100644 --- a/superstructure/generic/tests/Test_VirtualConnectionPt.pf +++ b/superstructure/generic/tests/Test_VirtualConnectionPt.pf @@ -1,6 +1,6 @@ module Test_VirtualConnectionPt use funit - use mapl_VirtualConnectionPt + use mapl_VirtualConnectionPt_mod use esmf implicit none diff --git a/superstructure/generic/tests/Test_WriteYaml.pf b/superstructure/generic/tests/Test_WriteYaml.pf index aa7f7facca2..7cf9f6276f4 100644 --- a/superstructure/generic/tests/Test_WriteYaml.pf +++ b/superstructure/generic/tests/Test_WriteYaml.pf @@ -2,7 +2,7 @@ module Test_WriteYaml use funit use esmf - use mapl_ESMF_HConfigUtilities, only: write(formatted) + use mapl_ESMF_HConfigUtilities_mod, only: write(formatted) implicit none private diff --git a/superstructure/generic/tests/Test_propagate_time_varying.pf b/superstructure/generic/tests/Test_propagate_time_varying.pf index 4239c996601..73d0c578d0d 100644 --- a/superstructure/generic/tests/Test_propagate_time_varying.pf +++ b/superstructure/generic/tests/Test_propagate_time_varying.pf @@ -2,18 +2,18 @@ module Test_propagate_time_varying use mapl_regridder_mgr, only: EsmfRegridderParam - use mapl_GriddedComponentDriver - use mapl_CouplerPhases - use mapl_ExtensionTransform - use mapl_RegridTransform - use mapl_CopyTransform - use mapl_TimeInterpolateTransform - use mapl_MultiState - use mapl_Geom_API + use mapl_GriddedComponentDriver_mod + use mapl_CouplerPhases_mod + use mapl_ExtensionTransform_mod + use mapl_RegridTransform_mod + use mapl_CopyTransform_mod + use mapl_TimeInterpolateTransform_mod + use mapl_MultiState_mod + use mapl_Geom_API_mod use mapl_Field_API - use mapl_FieldInfo - use mapl_GenericCoupler - use mapl_FieldBundle_API + use mapl_FieldInfo_mod + use mapl_GenericCoupler_mod + use mapl_FieldBundle_API_mod use funit use ESMF_TestMethod_mod use esmf diff --git a/superstructure/generic/tests/Test_timestep_propagation.pf b/superstructure/generic/tests/Test_timestep_propagation.pf index 5c2a7db5e8b..46d392d2dfd 100644 --- a/superstructure/generic/tests/Test_timestep_propagation.pf +++ b/superstructure/generic/tests/Test_timestep_propagation.pf @@ -1,16 +1,16 @@ #include "MAPL_TestErr.h" module Test_timestep_propagation - use mapl_Generic - use mapl_ComponentSpecParser - use mapl_ChildSpec - use mapl_GenericPhases - use mapl_GenericGridComp, generic_setservices => setServices - use mapl_ComponentDriver - use mapl_GriddedComponentDriver - use mapl_UserSetServices - use mapl_MultiState - use mapl_ErrorHandling + use mapl_Generic_mod + use mapl_ComponentSpecParser_mod + use mapl_ChildSpec_mod + use mapl_GenericPhases_mod + use mapl_GenericGridComp_mod, generic_setservices => setServices + use mapl_ComponentDriver_mod + use mapl_GriddedComponentDriver_mod + use mapl_UserSetServices_mod + use mapl_MultiState_mod + use mapl_ErrorHandling_mod use esmf use funit implicit none(type,external) diff --git a/superstructure/generic/tests/gridcomps/ProtoExtDataGC.F90 b/superstructure/generic/tests/gridcomps/ProtoExtDataGC.F90 index df73dd299e5..26aad8f2bcf 100644 --- a/superstructure/generic/tests/gridcomps/ProtoExtDataGC.F90 +++ b/superstructure/generic/tests/gridcomps/ProtoExtDataGC.F90 @@ -4,18 +4,18 @@ module ProtoExtDataGC - use mapl_ErrorHandling - use mapl_OuterMetaComponent - use mapl_Generic - use mapl_UserSetServices - use mapl_StateRegistry, only: StateRegistry - use mapl_VirtualConnectionPt - use mapl_ActualConnectionPt - use mapl_ConnectionPt - use mapl_SimpleConnection - use mapl_StateItemSpec, only: StateItemSpec, StateItemSpecPtr - use mapl_ESMF_Subset - use MAPL_FieldUtils + use mapl_ErrorHandling_mod + use mapl_OuterMetaComponent_mod + use mapl_Generic_mod + use mapl_UserSetServices_mod + use mapl_StateRegistry_mod, only: StateRegistry + use mapl_VirtualConnectionPt_mod + use mapl_ActualConnectionPt_mod + use mapl_ConnectionPt_mod + use mapl_SimpleConnection_mod + use mapl_StateItemSpec_mod, only: StateItemSpec, StateItemSpecPtr + use mapl_ESMF_Subset_mod + use mapl_FieldUtils use esmf, only: ESMF_StateGet, ESMF_FieldGet implicit none(type,external) @@ -27,7 +27,7 @@ module ProtoExtDataGC contains subroutine setservices(gc, rc) - use mapl_Generic, only: MAPL_GridCompSetEntryPoint + use mapl_Generic_mod, only: MAPL_GridCompSetEntryPoint type(ESMF_GridComp) :: gc integer, intent(out) :: rc @@ -245,7 +245,7 @@ end module ProtoExtDataGC subroutine setServices(gc, rc) use esmf, only: ESMF_GridComp use esmf, only: ESMF_SUCCESS - use mapl_ErrorHandling + use mapl_ErrorHandling_mod use ProtoExtDataGC, only: inner_setservices => setservices type(ESMF_GridComp) :: gc integer, intent(out) :: rc diff --git a/superstructure/generic/tests/gridcomps/ProtoStatGridComp.F90 b/superstructure/generic/tests/gridcomps/ProtoStatGridComp.F90 index aa27dbc7849..c2a3efc1782 100644 --- a/superstructure/generic/tests/gridcomps/ProtoStatGridComp.F90 +++ b/superstructure/generic/tests/gridcomps/ProtoStatGridComp.F90 @@ -2,12 +2,12 @@ ! See external setservices() procedure at end of file module ProtoStatGridComp - use mapl_State_API + use mapl_State_API_mod use mapl_Field_API - use mapl_Generic - use mapl_esmf_subset - use mapl_VerticalStaggerLoc - use mapl_ErrorHandling + use mapl_Generic_mod + use mapl_ESMF_Subset_mod + use mapl_VerticalStaggerLoc_mod + use mapl_ErrorHandling_mod use esmf implicit none(type,external) private @@ -18,7 +18,7 @@ module ProtoStatGridComp contains subroutine setservices(gc, rc) - use mapl_Generic, only: MAPL_GridCompSetEntryPoint + use mapl_Generic_mod, only: MAPL_GridCompSetEntryPoint type(ESMF_GridComp) :: gc integer, intent(out) :: rc @@ -113,7 +113,7 @@ end module ProtoStatGridComp subroutine setServices(gc, rc) use esmf, only: ESMF_GridComp use esmf, only: ESMF_SUCCESS - use mapl_ErrorHandling + use mapl_ErrorHandling_mod use ProtoStatGridComp, only: inner_setservices => setServices type(ESMF_GridComp) :: gc integer, intent(out) :: rc diff --git a/superstructure/generic/to_itemtype.F90 b/superstructure/generic/to_itemtype.F90 index db71892ec27..c4a9d0f3ca7 100644 --- a/superstructure/generic/to_itemtype.F90 +++ b/superstructure/generic/to_itemtype.F90 @@ -1,6 +1,6 @@ #include "MAPL.h" -submodule (mapl_ComponentSpecParser) to_itemtype_smod +submodule (mapl_ComponentSpecParser_mod) to_itemtype_smod implicit none(type,external) contains diff --git a/superstructure/generic/transforms/ConvertUnitsTransform.F90 b/superstructure/generic/transforms/ConvertUnitsTransform.F90 index a2579ff50de..6192e3f1e71 100644 --- a/superstructure/generic/transforms/ConvertUnitsTransform.F90 +++ b/superstructure/generic/transforms/ConvertUnitsTransform.F90 @@ -1,15 +1,15 @@ #include "MAPL.h" -module mapl_ConvertUnitsTransform - use mapl_TransformId - use mapl_StateItemImpl - use mapl_ExtensionTransform - use mapl_ExtensionTransformUtils, only: bundle_types_valid +module mapl_ConvertUnitsTransform_mod + use mapl_TransformId_mod + use mapl_StateItemImpl_mod + use mapl_ExtensionTransform_mod + use mapl_ExtensionTransformUtils_mod, only: bundle_types_valid use udunits2f, only: UDUNITS_Converter => Converter use udunits2f, only: UDUNITS_GetConverter => get_converter use udunits2f, only: UDUNITS_Initialize => Initialize - use MAPL_FieldUtils - use mapl_ErrorHandling + use mapl_FieldUtils + use mapl_ErrorHandling_mod use esmf implicit none(type,external) @@ -157,4 +157,4 @@ function get_transformId(this) result(id) end function get_transformId -end module mapl_ConvertUnitsTransform +end module mapl_ConvertUnitsTransform_mod diff --git a/superstructure/generic/transforms/CopyTransform.F90 b/superstructure/generic/transforms/CopyTransform.F90 index 34937990ff4..264a6700904 100644 --- a/superstructure/generic/transforms/CopyTransform.F90 +++ b/superstructure/generic/transforms/CopyTransform.F90 @@ -2,15 +2,15 @@ ! A copy might be between different kinds and precisions, so is really ! a converter. But ... what is a better name. -module mapl_CopyTransform - use mapl_TransformId - use mapl_ExtensionTransform - use mapl_ExtensionTransformUtils - use mapl_StateItemImpl - use mapl_ErrorHandling +module mapl_CopyTransform_mod + use mapl_TransformId_mod + use mapl_ExtensionTransform_mod + use mapl_ExtensionTransformUtils_mod + use mapl_StateItemImpl_mod + use mapl_ErrorHandling_mod use esmf - use MAPL_FieldUtils - use mapl_FieldBundleCopyImpl, only: FieldBundleCopy + use mapl_FieldUtils + use mapl_FieldBundleCopyImpl_mod, only: FieldBundleCopy implicit none(type,external) private @@ -108,4 +108,4 @@ function get_transformId(this) result(id) end function get_transformId -end module mapl_CopyTransform +end module mapl_CopyTransform_mod diff --git a/superstructure/generic/transforms/CouplerMetaComponent.F90 b/superstructure/generic/transforms/CouplerMetaComponent.F90 index 5dfd7a41662..6b9d6354c1f 100644 --- a/superstructure/generic/transforms/CouplerMetaComponent.F90 +++ b/superstructure/generic/transforms/CouplerMetaComponent.F90 @@ -1,20 +1,20 @@ #include "MAPL.h" -module mapl_CouplerMetaComponent - - use mapl_TransformId - use mapl_esmf_info_keys, only: INFO_SHARED_NAMESPACE - use mapl_CouplerPhases - use mapl_ComponentDriver, only: ComponentDriver, ComponentDriverPtr - use mapl_GriddedComponentDriver, only: GriddedComponentDriver - use mapl_ComponentDriverVector, only: ComponentDriverVector - use mapl_ComponentDriverPtrVector, only: ComponentDriverPtrVector - use mapl_ExtensionTransform - use mapl_VerticalRegridTransform - use mapl_ErrorHandlingMod - use mapl_ESMF_Interfaces +module mapl_CouplerMetaComponent_mod + + use mapl_TransformId_mod + use mapl_esmf_info_keys_mod, only: INFO_SHARED_NAMESPACE + use mapl_CouplerPhases_mod + use mapl_ComponentDriver_mod, only: ComponentDriver, ComponentDriverPtr + use mapl_GriddedComponentDriver_mod, only: GriddedComponentDriver + use mapl_ComponentDriverVector_mod, only: ComponentDriverVector + use mapl_ComponentDriverPtrVector_mod, only: ComponentDriverPtrVector + use mapl_ExtensionTransform_mod + use mapl_VerticalRegridTransform_mod + use mapl_ErrorHandling_mod + use mapl_ESMF_Interfaces_mod use mapl_Field_API - use mapl_FieldBundle_API + use mapl_FieldBundle_API_mod use esmf implicit none(type,external) @@ -574,4 +574,4 @@ subroutine get_info(state, itemName, info, rc) _RETURN(_SUCCESS) end subroutine get_info -end module mapl_CouplerMetaComponent +end module mapl_CouplerMetaComponent_mod diff --git a/superstructure/generic/transforms/EvalTransform.F90 b/superstructure/generic/transforms/EvalTransform.F90 index 4dc0ff2b3bf..50047923ff5 100644 --- a/superstructure/generic/transforms/EvalTransform.F90 +++ b/superstructure/generic/transforms/EvalTransform.F90 @@ -1,14 +1,14 @@ #include "MAPL.h" -module mapl_EvalTransform - use mapl_ExtensionTransform - use mapl_TransformId - use mapl_StateItemImpl - use mapl_ComponentDriver - use mapl_ComponentDriverVector - use mapl_CouplerPhases, only: GENERIC_COUPLER_UPDATE, GENERIC_COUPLER_INITIALIZE - use mapl_ErrorHandling - use MAPL_StateArithmeticParserMod +module mapl_EvalTransform_mod + use mapl_ExtensionTransform_mod + use mapl_TransformId_mod + use mapl_StateItemImpl_mod + use mapl_ComponentDriver_mod + use mapl_ComponentDriverVector_mod + use mapl_CouplerPhases_mod, only: GENERIC_COUPLER_UPDATE, GENERIC_COUPLER_INITIALIZE + use mapl_ErrorHandling_mod + use mapl_StateArithmeticParser_mod use esmf implicit none(type,external) @@ -145,4 +145,4 @@ function get_transformId(this) result(id) _UNUSED_DUMMY(this) end function get_transformId -end module mapl_EvalTransform +end module mapl_EvalTransform_mod diff --git a/superstructure/generic/transforms/ExtendTransform.F90 b/superstructure/generic/transforms/ExtendTransform.F90 index cbef081378a..c3a300c8529 100644 --- a/superstructure/generic/transforms/ExtendTransform.F90 +++ b/superstructure/generic/transforms/ExtendTransform.F90 @@ -10,10 +10,10 @@ ! extensions for each. -module mapl_ExtendTransform - use mapl_TransformId - use mapl_ExtensionTransform - use mapl_ErrorHandling +module mapl_ExtendTransform_mod + use mapl_TransformId_mod + use mapl_ExtensionTransform_mod + use mapl_ErrorHandling_mod implicit none(type,external) private @@ -67,4 +67,4 @@ function get_transformId(this) result(id) _UNUSED_DUMMY(this) end function get_transformId -end module mapl_ExtendTransform +end module mapl_ExtendTransform_mod diff --git a/superstructure/generic/transforms/ExtensionTransform.F90 b/superstructure/generic/transforms/ExtensionTransform.F90 index e6f8ca4d1b5..d345f547e9a 100644 --- a/superstructure/generic/transforms/ExtensionTransform.F90 +++ b/superstructure/generic/transforms/ExtensionTransform.F90 @@ -1,8 +1,8 @@ #include "MAPL.h" -module mapl_ExtensionTransform - use mapl_TransformId - use mapl_AspectId - use mapl_ErrorHandling +module mapl_ExtensionTransform_mod + use mapl_TransformId_mod + use mapl_AspectId_mod + use mapl_ErrorHandling_mod use ESMF implicit none(type,external) private @@ -71,4 +71,4 @@ logical function runs_invalidate(this) _UNUSED_DUMMY(this) end function runs_invalidate -end module mapl_ExtensionTransform +end module mapl_ExtensionTransform_mod diff --git a/superstructure/generic/transforms/ExtensionTransformUtils.F90 b/superstructure/generic/transforms/ExtensionTransformUtils.F90 index 5797ade6235..acb3582e1a8 100644 --- a/superstructure/generic/transforms/ExtensionTransformUtils.F90 +++ b/superstructure/generic/transforms/ExtensionTransformUtils.F90 @@ -1,8 +1,8 @@ #include "MAPL.h" -module mapl_ExtensionTransformUtils - use mapl_FieldBundle_API - use mapl_ErrorHandling +module mapl_ExtensionTransformUtils_mod + use mapl_FieldBundle_API_mod + use mapl_ErrorHandling_mod use esmf, only: ESMF_FieldBundle implicit none(type,external) private @@ -34,4 +34,4 @@ subroutine bundle_types_valid(b1, b2, rc) end subroutine bundle_types_valid -end module mapl_ExtensionTransformUtils +end module mapl_ExtensionTransformUtils_mod diff --git a/superstructure/generic/transforms/GenericCoupler.F90 b/superstructure/generic/transforms/GenericCoupler.F90 index f68ffa8e819..e5a08194972 100644 --- a/superstructure/generic/transforms/GenericCoupler.F90 +++ b/superstructure/generic/transforms/GenericCoupler.F90 @@ -1,14 +1,14 @@ #include "MAPL.h" -module mapl_GenericCoupler - use mapl_CouplerPhases - use mapl_CouplerMetaComponent - use mapl_ExtensionTransform - use mapl_TransformId - use mapl_VerticalRegridTransform - use mapl_ComponentDriver - use mapl_GriddedComponentDriver - use mapl_ErrorHandlingMod +module mapl_GenericCoupler_mod + use mapl_CouplerPhases_mod + use mapl_CouplerMetaComponent_mod + use mapl_ExtensionTransform_mod + use mapl_TransformId_mod + use mapl_VerticalRegridTransform_mod + use mapl_ComponentDriver_mod + use mapl_GriddedComponentDriver_mod + use mapl_ErrorHandling_mod use esmf implicit none(type,external) @@ -169,4 +169,4 @@ subroutine mapl_CouplerAddConsumer(this, consumer, rc) _RETURN(_SUCCESS) end subroutine mapl_CouplerAddConsumer -end module mapl_GenericCoupler +end module mapl_GenericCoupler_mod diff --git a/superstructure/generic/transforms/NormalizationTransform.F90 b/superstructure/generic/transforms/NormalizationTransform.F90 index e07758eac02..82e19cea2aa 100644 --- a/superstructure/generic/transforms/NormalizationTransform.F90 +++ b/superstructure/generic/transforms/NormalizationTransform.F90 @@ -21,13 +21,13 @@ !! - Handles case where auxiliary field is itself an extension (e.g., regridded) !! - See VerticalGridAspect::make_transform and VerticalRegridTransform pattern !! -module mapl_NormalizationTransform - use mapl_TransformId - use mapl_StateItemImpl - use mapl_ExtensionTransform - use mapl_ExtensionTransformUtils, only: bundle_types_valid - use MAPL_FieldUtils - use mapl_ErrorHandling +module mapl_NormalizationTransform_mod + use mapl_TransformId_mod + use mapl_StateItemImpl_mod + use mapl_ExtensionTransform_mod + use mapl_ExtensionTransformUtils_mod, only: bundle_types_valid + use mapl_FieldUtils + use mapl_ErrorHandling_mod use esmf implicit none(type,external) @@ -247,4 +247,4 @@ function get_transformId(this) result(id) end function get_transformId -end module mapl_NormalizationTransform +end module mapl_NormalizationTransform_mod diff --git a/superstructure/generic/transforms/NullTransform.F90 b/superstructure/generic/transforms/NullTransform.F90 index 6ad3d113c7e..e446d98d4ac 100644 --- a/superstructure/generic/transforms/NullTransform.F90 +++ b/superstructure/generic/transforms/NullTransform.F90 @@ -4,10 +4,10 @@ ! ExtensionTransform can allocate its return value in the presence of ! error conditions. -module mapl_NullTransform - use mapl_TransformId - use mapl_ExtensionTransform - use mapl_ErrorHandling +module mapl_NullTransform_mod + use mapl_TransformId_mod + use mapl_ExtensionTransform_mod + use mapl_ErrorHandling_mod implicit none(type,external) private @@ -59,4 +59,4 @@ function get_transformId(this) result(id) _UNUSED_DUMMY(this) end function get_transformId -end module mapl_NullTransform +end module mapl_NullTransform_mod diff --git a/superstructure/generic/transforms/RegridTransform.F90 b/superstructure/generic/transforms/RegridTransform.F90 index 6b68a2b91ed..3b1244356ef 100644 --- a/superstructure/generic/transforms/RegridTransform.F90 +++ b/superstructure/generic/transforms/RegridTransform.F90 @@ -1,20 +1,20 @@ #include "MAPL.h" -module mapl_RegridTransform - use mapl_TransformId +module mapl_RegridTransform_mod + use mapl_TransformId_mod use mapl_Field_API, only: MAPL_FieldClone, MAPL_FieldGet - use mapl_FieldBundle_API - use mapl_ExtensionTransform - use mapl_TransformId + use mapl_FieldBundle_API_mod + use mapl_ExtensionTransform_mod + use mapl_TransformId_mod use mapl_regridder_mgr - use mapl_StateItemImpl - use mapl_ExtensionTransformUtils, only: bundle_types_valid - use mapl_NormalizationMetadata - use mapl_NormalizationType - use mapl_ComponentDriver, only: ComponentDriver - use mapl_CouplerPhases, only: GENERIC_COUPLER_UPDATE - use mapl_ErrorHandling - use mapl_FieldCondensedArray, only: assign_fptr_condensed_array + use mapl_StateItemImpl_mod + use mapl_ExtensionTransformUtils_mod, only: bundle_types_valid + use mapl_NormalizationMetadata_mod + use mapl_NormalizationType_mod + use mapl_ComponentDriver_mod, only: ComponentDriver + use mapl_CouplerPhases_mod, only: GENERIC_COUPLER_UPDATE + use mapl_ErrorHandling_mod + use mapl_FieldCondensedArray_mod, only: assign_fptr_condensed_array use esmf implicit none(type,external) @@ -460,4 +460,4 @@ function get_transformId(this) result(id) _UNUSED_DUMMY(this) end function get_transformId -end module mapl_RegridTransform +end module mapl_RegridTransform_mod diff --git a/superstructure/generic/transforms/TimeInterpolateTransform.F90 b/superstructure/generic/transforms/TimeInterpolateTransform.F90 index f3cd39ad008..d67e477cbaf 100644 --- a/superstructure/generic/transforms/TimeInterpolateTransform.F90 +++ b/superstructure/generic/transforms/TimeInterpolateTransform.F90 @@ -1,15 +1,15 @@ #include "MAPL.h" -module mapl_TimeInterpolateTransform - use mapl_TransformId - use mapl_ExtensionTransform +module mapl_TimeInterpolateTransform_mod + use mapl_TransformId_mod + use mapl_ExtensionTransform_mod use mapl_regridder_mgr - use mapl_FieldBundle_API - use mapl_InfoUtilities - use mapl_StateItemImpl - use MAPL_FieldUtils + use mapl_FieldBundle_API_mod + use mapl_InfoUtilities_mod + use mapl_StateItemImpl_mod + use mapl_FieldUtils use MAPL_Constants, only: MAPL_UNDEFINED_REAL, MAPL_UNDEFINED_REAL64 - use mapl_ErrorHandling + use mapl_ErrorHandling_mod use esmf implicit none(type,external) @@ -248,4 +248,4 @@ function get_transformId(this) result(id) _UNUSED_DUMMY(this) end function get_transformId -end module mapl_TimeInterpolateTransform +end module mapl_TimeInterpolateTransform_mod diff --git a/superstructure/generic/transforms/TransformId.F90 b/superstructure/generic/transforms/TransformId.F90 index b62e9c5f781..35615d7a224 100644 --- a/superstructure/generic/transforms/TransformId.F90 +++ b/superstructure/generic/transforms/TransformId.F90 @@ -1,4 +1,4 @@ -module mapl_TransformId +module mapl_TransformId_mod implicit none(type,external) private @@ -99,4 +99,4 @@ elemental logical function less_than(a, b) less_than = a%id < b%id end function less_than -end module mapl_TransformId +end module mapl_TransformId_mod diff --git a/superstructure/generic/transforms/TransformVector.F90 b/superstructure/generic/transforms/TransformVector.F90 index c67a24b6ea8..27ca11adfa5 100644 --- a/superstructure/generic/transforms/TransformVector.F90 +++ b/superstructure/generic/transforms/TransformVector.F90 @@ -1,5 +1,5 @@ -module mapl_TransformVector - use mapl_ExtensionTransform +module mapl_TransformVector_mod + use mapl_ExtensionTransform_mod #define T ExtensionTransform #define T_polymorphic @@ -13,5 +13,5 @@ module mapl_TransformVector #undef Vector #undef VectorIterator -end module mapl_TransformVector +end module mapl_TransformVector_mod diff --git a/superstructure/generic/transforms/VerticalRegridTransform.F90 b/superstructure/generic/transforms/VerticalRegridTransform.F90 index 6c48f467956..ab96d5e76de 100644 --- a/superstructure/generic/transforms/VerticalRegridTransform.F90 +++ b/superstructure/generic/transforms/VerticalRegridTransform.F90 @@ -1,21 +1,21 @@ #include "MAPL.h" -module mapl_VerticalRegridTransform - use mapl_TransformId +module mapl_VerticalRegridTransform_mod + use mapl_TransformId_mod use mapl_Field_API - use mapl_ErrorHandling - use mapl_FieldBundle_API - use mapl_StateItemImpl - use mapl_ExtensionTransform - use mapl_ComponentDriver - use mapl_CouplerPhases, only: GENERIC_COUPLER_UPDATE - use mapl_VerticalRegridMethod - use mapl_VerticalStaggerLoc - use mapl_VerticalLinearMap, only: compute_linear_map - use mapl_VerticalConservativeMap, only: compute_conservative_map - use mapl_CSR_SparseMatrix, only: SparseMatrix_sp => CSR_SparseMatrix_sp, matmul - use mapl_FieldCondensedArray, only: assign_fptr_condensed_array - use mapl_VerticalCoordinateDirection + use mapl_ErrorHandling_mod + use mapl_FieldBundle_API_mod + use mapl_StateItemImpl_mod + use mapl_ExtensionTransform_mod + use mapl_ComponentDriver_mod + use mapl_CouplerPhases_mod, only: GENERIC_COUPLER_UPDATE + use mapl_VerticalRegridMethod_mod + use mapl_VerticalStaggerLoc_mod + use mapl_VerticalLinearMap_mod, only: compute_linear_map + use mapl_VerticalConservativeMap_mod, only: compute_conservative_map + use mapl_CSR_SparseMatrix_mod, only: SparseMatrix_sp => CSR_SparseMatrix_sp, matmul + use mapl_FieldCondensedArray_mod, only: assign_fptr_condensed_array + use mapl_VerticalCoordinateDirection_mod use esmf implicit none(type,external) @@ -675,4 +675,4 @@ subroutine copy_field_flipped_(f_in, f_out, rc) _RETURN(_SUCCESS) end subroutine copy_field_flipped_ -end module mapl_VerticalRegridTransform +end module mapl_VerticalRegridTransform_mod diff --git a/superstructure/generic/vertical/FixedLevelsVerticalGrid.F90 b/superstructure/generic/vertical/FixedLevelsVerticalGrid.F90 index 034bd4c99e2..cef9930d512 100644 --- a/superstructure/generic/vertical/FixedLevelsVerticalGrid.F90 +++ b/superstructure/generic/vertical/FixedLevelsVerticalGrid.F90 @@ -1,19 +1,19 @@ #include "MAPL.h" -module mapl_FixedLevelsVerticalGrid +module mapl_FixedLevelsVerticalGrid_mod use mapl_Field_API - use mapl_VerticalGrid, only: VerticalGrid - use mapl_VerticalGridSpec, only: VerticalGridSpec - use mapl_VerticalGridFactory, only: VerticalGridFactory - use mapl_BasicVerticalGrid - use mapl_ComponentDriver - use mapl_FieldCondensedArray, only: assign_fptr_condensed_array + use mapl_VerticalGrid_mod, only: VerticalGrid + use mapl_VerticalGridSpec_mod, only: VerticalGridSpec + use mapl_VerticalGridFactory_mod, only: VerticalGridFactory + use mapl_BasicVerticalGrid_mod + use mapl_ComponentDriver_mod + use mapl_FieldCondensedArray_mod, only: assign_fptr_condensed_array use pfio use esmf, only: esmf_HConfig, esmf_HConfigIsDefined, esmf_HConfigAsString, esmf_HConfigAsR4Seq use esmf, only: esmf_Field, esmf_Geom, esmf_TypeKind_Flag use esmf, only: ESMF_KIND_R4, ESMF_TYPEKIND_R4 - use mapl_VerticalStaggerLoc + use mapl_VerticalStaggerLoc_mod use gftl2_StringVector, only: StringVector - use mapl_ErrorHandling + use mapl_ErrorHandling_mod implicit none(type,external) private @@ -116,8 +116,8 @@ function get_num_layers(this) result(num_layers) end function get_num_layers function get_coordinate_field(this, physical_dimension, aspects, coupler, rc) result(field) - use mapl_StateItemAspect, only: AspectMap - use mapl_GeomAspect, only: GeomAspect, to_GeomAspect + use mapl_StateItemAspect_mod, only: AspectMap + use mapl_GeomAspect_mod, only: GeomAspect, to_GeomAspect type(esmf_Field) :: field class(FixedLevelsVerticalGrid), intent(in) :: this character(len=*), intent(in) :: physical_dimension @@ -340,5 +340,5 @@ function get_default_units(physical_dimension) result(units) end select end function get_default_units -end module mapl_FixedLevelsVerticalGrid +end module mapl_FixedLevelsVerticalGrid_mod diff --git a/superstructure/generic/vertical/ModelVerticalGrid.F90 b/superstructure/generic/vertical/ModelVerticalGrid.F90 index 73826608e86..72069fa26f9 100644 --- a/superstructure/generic/vertical/ModelVerticalGrid.F90 +++ b/superstructure/generic/vertical/ModelVerticalGrid.F90 @@ -1,32 +1,32 @@ #include "MAPL.h" -module mapl_ModelVerticalGrid +module mapl_ModelVerticalGrid_mod - use mapl_ErrorHandling - use mapl_KeywordEnforcer - use mapl_VerticalGrid_API + use mapl_ErrorHandling_mod + use mapl_KeywordEnforcer_mod + use mapl_VerticalGrid_API_mod use mapl_Field_API - use mapl_StateRegistry - use mapl_VirtualConnectionPt - use mapl_StateItemSpec - use mapl_StateItemSpec - use mapl_UngriddedDims - use mapl_StateItemSpec - use mapl_ExtensionFamily - use mapl_ComponentDriver - use mapl_VerticalStaggerLoc - use mapl_AspectId - use mapl_StateItemAspect - use mapl_ClassAspect - use mapl_FieldClassAspect - use mapl_GeomAspect - use mapl_UnitsAspect - use mapl_UngriddedDimsAspect - use mapl_AttributesAspect - use mapl_TypekindAspect - use mapl_QuantityTypeAspect - use mapl_NormalizationAspect - use mapl_VerticalGridAspect + use mapl_StateRegistry_mod + use mapl_VirtualConnectionPt_mod + use mapl_StateItemSpec_mod + use mapl_StateItemSpec_mod + use mapl_UngriddedDims_mod + use mapl_StateItemSpec_mod + use mapl_ExtensionFamily_mod + use mapl_ComponentDriver_mod + use mapl_VerticalStaggerLoc_mod + use mapl_AspectId_mod + use mapl_StateItemAspect_mod + use mapl_ClassAspect_mod + use mapl_FieldClassAspect_mod + use mapl_GeomAspect_mod + use mapl_UnitsAspect_mod + use mapl_UngriddedDimsAspect_mod + use mapl_AttributesAspect_mod + use mapl_TypekindAspect_mod + use mapl_QuantityTypeAspect_mod + use mapl_NormalizationAspect_mod + use mapl_VerticalGridAspect_mod use pfio use esmf use gftl2_StringVector, only: StringVector @@ -488,4 +488,4 @@ function get_default_units(physical_dimension) result(units) end select end function get_default_units -end module mapl_ModelVerticalGrid +end module mapl_ModelVerticalGrid_mod diff --git a/tests/GetHorzIJIndex/create_stretched_cs_grid.F90 b/tests/GetHorzIJIndex/create_stretched_cs_grid.F90 index 89d24a53f90..e5ce2ee0891 100644 --- a/tests/GetHorzIJIndex/create_stretched_cs_grid.F90 +++ b/tests/GetHorzIJIndex/create_stretched_cs_grid.F90 @@ -7,7 +7,7 @@ program create_stretched_cs_grid use MAPL_BaseMod, only: MAPL_GetHorzIJIndex, MAPL_GridGetCorners use mapl_MaplGrid, only: MAPL_GridGet use MAPL_CubedSphereGridFactoryMod, only: CubedSphereGridFactory - use MAPL_ExceptionHandling + use mapl_ExceptionHandling_mod use MAPL_Constants, only: MAPL_DEGREES_TO_RADIANS_R8 use, intrinsic :: iso_fortran_env, only: REAL32, REAL64 diff --git a/utils/Constants/Constants.F90 b/utils/Constants/Constants.F90 index fe7ff7e4c5a..e72f6b76e4b 100644 --- a/utils/Constants/Constants.F90 +++ b/utils/Constants/Constants.F90 @@ -1,10 +1,10 @@ module MAPL_Constants - use MAPL_InternalConstants - use MAPL_MathConstants - use MAPL_PhysicalConstants - use MAPL_EarthConstants - use MAPL_EarthAtmosphericConstants + use mapl_InternalConstants_mod + use mapl_MathConstants_mod + use mapl_PhysicalConstants_mod + use mapl_EarthConstants_mod + use mapl_EarthAtmosphericConstants_mod contains diff --git a/utils/Constants/EarthAtmosphericConstants.F90 b/utils/Constants/EarthAtmosphericConstants.F90 index 5fd86e65478..a03eaa109bc 100644 --- a/utils/Constants/EarthAtmosphericConstants.F90 +++ b/utils/Constants/EarthAtmosphericConstants.F90 @@ -1,6 +1,6 @@ -module MAPL_EarthAtmosphericConstants +module mapl_EarthAtmosphericConstants_mod - use MAPL_PhysicalConstants, only: MAPL_UNIVERSAL_GAS_CONSTANT + use mapl_PhysicalConstants_mod, only: MAPL_UNIVERSAL_GAS_CONSTANT implicit none @@ -94,4 +94,4 @@ module MAPL_EarthAtmosphericConstants real, parameter :: MAPL_KARMAN = MAPL_VON_KARMAN ! DEPRECATED real, parameter :: MAPL_USMIN = MAPL_MINIMUM_WIND_SPEED ! DEPRECATED -end module MAPL_EarthAtmosphericConstants +end module mapl_EarthAtmosphericConstants_mod diff --git a/utils/Constants/EarthConstants.F90 b/utils/Constants/EarthConstants.F90 index f929404fe0b..c275afbe9dc 100644 --- a/utils/Constants/EarthConstants.F90 +++ b/utils/Constants/EarthConstants.F90 @@ -1,7 +1,7 @@ -module MAPL_EarthConstants +module mapl_EarthConstants_mod use, intrinsic :: iso_fortran_env, only: REAL64, REAL32 - use MAPL_MathConstants, only: MAPL_PI_R8, MAPL_PI, & + use mapl_MathConstants_mod, only: MAPL_PI_R8, MAPL_PI, & MAPL_RADIANS_TO_DEGREES, MAPL_DEGREES_TO_RADIANS_R8 implicit none @@ -38,4 +38,4 @@ module MAPL_EarthConstants real(kind=REAL64), parameter :: MAPL_KM_PER_DEG = MAPL_KM_PER_DEGREE ! DEPRECATED real(kind=REAL64), parameter :: MAPL_DEG_PER_KM = MAPL_DEGREE_PER_KM ! DEPRECATED -end module MAPL_EarthConstants +end module mapl_EarthConstants_mod diff --git a/utils/Constants/InternalConstants.F90 b/utils/Constants/InternalConstants.F90 index 12c6c2dff64..303dd350ca8 100644 --- a/utils/Constants/InternalConstants.F90 +++ b/utils/Constants/InternalConstants.F90 @@ -1,4 +1,4 @@ -module MAPL_InternalConstants +module mapl_InternalConstants_mod use, intrinsic :: iso_fortran_env, only: REAL64, REAL32 @@ -204,5 +204,5 @@ module MAPL_InternalConstants integer, parameter :: MAPL_FILETYPE_BIN = 2 integer, parameter :: MAPL_FILETYPE_UNK = -1 -end module MAPL_InternalConstants +end module mapl_InternalConstants_mod diff --git a/utils/Constants/MathConstants.F90 b/utils/Constants/MathConstants.F90 index 695449697ec..e1bf811fc18 100644 --- a/utils/Constants/MathConstants.F90 +++ b/utils/Constants/MathConstants.F90 @@ -1,4 +1,4 @@ -module MAPL_MathConstants +module mapl_MathConstants_mod use, intrinsic :: iso_fortran_env, only: REAL64, REAL32 @@ -10,5 +10,5 @@ module MAPL_MathConstants real(kind=REAL32), parameter :: MAPL_DEGREES_TO_RADIANS = MAPL_PI / 180. real(kind=REAL64), parameter :: MAPL_RADIANS_TO_DEGREES = 180.d0 / MAPL_PI_R8 -end module MAPL_MathConstants +end module mapl_MathConstants_mod diff --git a/utils/Constants/PhysicalConstants.F90 b/utils/Constants/PhysicalConstants.F90 index f058264aefa..ab96a37a79d 100644 --- a/utils/Constants/PhysicalConstants.F90 +++ b/utils/Constants/PhysicalConstants.F90 @@ -1,4 +1,4 @@ -module MAPL_PhysicalConstants +module mapl_PhysicalConstants_mod implicit none @@ -25,4 +25,4 @@ module MAPL_PhysicalConstants real, parameter :: MAPL_AVOGAD = MAPL_AVOGADRO ! DEPRECATED: use MAPL_AVOGADRO real, parameter :: MAPL_RUNIV = MAPL_UNIVERSAL_GAS_CONSTANT ! DEPRECATED: use MAPL_UNIVERSAL_GAS_CONSTANT -end module MAPL_PhysicalConstants +end module mapl_PhysicalConstants_mod diff --git a/utils/DSO_Utilities.F90 b/utils/DSO_Utilities.F90 index 6dfc6370a7f..c7f0df10299 100644 --- a/utils/DSO_Utilities.F90 +++ b/utils/DSO_Utilities.F90 @@ -1,5 +1,5 @@ -module mapl_DSO_Utilities - use mapl_FileSystemUtilities +module mapl_DSO_Utilities_mod + use mapl_FileSystemUtilities_mod implicit none public :: is_valid_dso_name @@ -95,4 +95,4 @@ pure function get_dso_extension(name) result(extension) end if end function get_dso_extension -end module mapl_DSO_Utilities +end module mapl_DSO_Utilities_mod diff --git a/utils/ErrorHandling.F90 b/utils/ErrorHandling.F90 index f0f0fa30e9f..95c99533a37 100644 --- a/utils/ErrorHandling.F90 +++ b/utils/ErrorHandling.F90 @@ -1,7 +1,7 @@ #include "MAPL.h" -module mapl_ErrorHandling - use MAPL_ThrowMod +module mapl_ErrorHandling_mod + use mapl_Throw_mod implicit none private @@ -338,10 +338,7 @@ end subroutine initialize_err end function get_error_message -end module mapl_ErrorHandling -module mapl_ErrorHandlingMod - use mapl_ErrorHandling -end module mapl_ErrorHandlingMod -module MAPL_ExceptionHandling - use mapl_ErrorHandling -end module MAPL_ExceptionHandling +end module mapl_ErrorHandling_mod +module mapl_ExceptionHandling_mod + use mapl_ErrorHandling_mod +end module mapl_ExceptionHandling_mod diff --git a/utils/FileSystemUtilities.F90 b/utils/FileSystemUtilities.F90 index bc07f6fb56c..ad701be0f96 100644 --- a/utils/FileSystemUtilities.F90 +++ b/utils/FileSystemUtilities.F90 @@ -1,4 +1,4 @@ -module mapl_FileSystemUtilities +module mapl_FileSystemUtilities_mod implicit none private @@ -44,4 +44,4 @@ pure function get_file_basename(filename) result(basename) end if end function get_file_basename -end module Mapl_FileSystemUtilities +end module mapl_FileSystemUtilities_mod diff --git a/utils/Interp/Interp.F90 b/utils/Interp/Interp.F90 index f6c2c0a28b6..3685e6683a3 100644 --- a/utils/Interp/Interp.F90 +++ b/utils/Interp/Interp.F90 @@ -1,4 +1,4 @@ -module MAPL_InterpMod +module mapl_Interp_mod use, intrinsic :: iso_fortran_env, only: REAL64 @@ -121,4 +121,4 @@ module subroutine INTERP_LIN_3321_2( OY, OX, IY, IX) real(kind=REAL64), intent(IN ) :: IX(:) end subroutine INTERP_LIN_3321_2 end interface -end module MAPL_InterpMod +end module mapl_Interp_mod diff --git a/utils/Interp/Interp_implementation.F90 b/utils/Interp/Interp_implementation.F90 index db084d1d8ea..d8af4cd08a0 100644 --- a/utils/Interp/Interp_implementation.F90 +++ b/utils/Interp/Interp_implementation.F90 @@ -1,5 +1,5 @@ -submodule (MAPL_InterpMod) Interp_implementation +submodule (mapl_Interp_mod) Interp_implementation implicit none diff --git a/utils/KeywordEnforcer.F90 b/utils/KeywordEnforcer.F90 index e085e222707..0306c0035fa 100644 --- a/utils/KeywordEnforcer.F90 +++ b/utils/KeywordEnforcer.F90 @@ -21,7 +21,7 @@ ! ABSTRACT extensions can be created, but do not circumvent the ! keyword enforcement. -module mapl_KeywordEnforcer +module mapl_KeywordEnforcer_mod implicit none private @@ -37,8 +37,4 @@ subroutine nonimplementable() end subroutine nonimplementable end interface -end module mapl_KeywordEnforcer - -module mapl_KeywordEnforcerMod - use mapl_KeywordEnforcer -end module mapl_KeywordEnforcerMod +end module mapl_KeywordEnforcer_mod diff --git a/utils/MAPL_CF_Time.F90 b/utils/MAPL_CF_Time.F90 index cb145c90f63..373847903d4 100644 --- a/utils/MAPL_CF_Time.F90 +++ b/utils/MAPL_CF_Time.F90 @@ -1,10 +1,10 @@ #include "MAPL.h" -module MAPL_CF_Time +module mapl_CF_Time_mod use, intrinsic :: iso_fortran_env, only : R64 => real64 - use MAPL_KeywordEnforcerMod - use MAPL_ExceptionHandling - use MAPL_DateTime_Parsing + use mapl_KeywordEnforcer_mod + use mapl_ExceptionHandling_mod + use mapl_DateTime_Parsing_mod implicit none @@ -501,4 +501,4 @@ function strip_zero(string, back) result(stripped) end function strip_zero -end module MAPL_CF_Time +end module mapl_CF_Time_mod diff --git a/utils/MAPL_DateTime_Parsing.F90 b/utils/MAPL_DateTime_Parsing.F90 index 39df32fa2fb..d81e3bb4b63 100644 --- a/utils/MAPL_DateTime_Parsing.F90 +++ b/utils/MAPL_DateTime_Parsing.F90 @@ -35,9 +35,9 @@ ! Fully-formed time with time zone. Local time not-supported !