Merge pull request #2518 from GEOS-ESM/feature/mathomp4/add-missing-i…

…nterfaces

Restore missing interfaces

CHANGELOG.md

@@ -26,6 +26,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- Restore missing submodule interfaces
 - Explictly `use` some `iso_c_binding` types previously pulled in through ESMF. This is fixed in future ESMF versions (8.7+) and so
   we anticipate this here
 - Add explicit `Fortran_MODULE_DIRECTORY` to `CMakeLists.txt` in benchmarks to avoid race condition in Ninja builds

base/Base/Base_Base.F90

@@ -43,6 +43,7 @@ module MAPL_Base
   public MAPL_LatLonGridCreate   ! Creates regular Lat/Lon ESMF Grids
   public MAPL_Nhmsf
   public MAPL_NSECF
+  public MAPL_Nsecf2
   public MAPL_PackTime
   public MAPL_PackDateTime
   public MAPL_RemapBounds
@@ -291,6 +292,10 @@ integer module function MAPL_nsecf(nhms)
        integer, intent(in) :: nhms
      end function MAPL_nsecf
 
+     integer module function MAPL_nsecf2 (nhhmmss,nmmdd,nymd)
+       integer :: nhhmmss, nmmdd, nymd
+     end function MAPL_nsecf2
+
      module subroutine MAPL_tick (nymd,nhms,ndt)
        integer nymd,nhms,ndt
      end subroutine MAPL_tick

base/Base/Base_Base_implementation.F90

@@ -303,7 +303,7 @@ module subroutine MAPL_FieldAllocCommit(field, dims, location, typekind, &
              call ESMF_FieldGet(FIELD, farrayPtr=VAR_4D, _RC)
              VAR_4D = INIT_VALUE
           case default
-             _ASSERT(.false., 'only up to 4D are supported')
+             _FAIL('only up to 4D are supported')
           end select RankCase2d
        else
           select case (rank)
@@ -334,11 +334,11 @@ module subroutine MAPL_FieldAllocCommit(field, dims, location, typekind, &
           call ESMF_FieldGet(FIELD, farrayPtr=VR8_4D, _RC)
           VR8_4D = INIT_VALUE
           case default
-             _ASSERT(.false., 'only up to 4D are supported')
+             _FAIL('only up to 4D are supported')
           end select
        end if
 
-       ! Horz + Vert       
+       ! Horz + Vert
        ! -----------
     case(MAPL_DimsHorzVert)
        lb1 = 1-HW
@@ -2776,7 +2776,7 @@ module subroutine MAPL_GetGlobalHorzIJIndex(npts,II,JJ,lon,lat,lonR8,latR8,Grid,
     endif
 
     if ( .not. present(grid)) then
-      _ASSERT(.false., "need a cubed-sphere grid")
+      _FAIL("need a cubed-sphere grid")
     endif
     call MAPL_GridGet(grid, globalCellCountPerDim=dims,_RC)
     IM_World = dims(1)
@@ -3237,7 +3237,7 @@ module subroutine MAPL_FieldSplit(field, fields, aliasName, rc)
 
     k1 = localMinIndex(fieldRank)
     k2 = localMaxIndex(fieldRank)
-    deallocate(localMinIndex,localMaxIndex) 
+    deallocate(localMinIndex,localMaxIndex)
 
     n = k2 - k1 + 1