Merge release/2.18.0 branch into main for release

.circleci/config.yml

@@ -1,7 +1,7 @@
 version: 2.1
 
 orbs:
-  circleci-tools: geos-esm/circleci-tools@0.5.0
+  circleci-tools: geos-esm/circleci-tools@0.11.0
 
 workflows:
   build-and-test:
@@ -13,6 +13,13 @@ workflows:
               compiler: [gfortran, ifort]
           context:
             - docker-hub-creds
+      - build-UFS-MAPL:
+          name: build-UFS-MAPL-on-<< matrix.compiler >>
+          matrix:
+            parameters:
+              compiler: [ifort]
+          context:
+            - docker-hub-creds
       - build-GEOSgcm:
           name: build-GEOSgcm-on-<< matrix.compiler >>
           matrix:
@@ -47,15 +54,13 @@ workflows:
               compiler: [gfortran, ifort]
           context:
             - docker-hub-creds
-      #####################################################
-      # - build-GEOSadas:                                 #
-      #     name: build-GEOSadas-on-<< matrix.compiler >> #
-      #     matrix:                                       #
-      #       parameters:                                 #
-      #         compiler: [ifort]                         #
-      #     context:                                      #
-      #       - docker-hub-creds                          #
-      #####################################################
+      - build-GEOSadas:
+          name: build-GEOSadas-on-<< matrix.compiler >>
+          matrix:
+            parameters:
+              compiler: [ifort]
+          context:
+            - docker-hub-creds
 
 jobs:
   build-and-test-MAPL:
@@ -81,7 +86,40 @@ jobs:
           command: |
             cd ${CIRCLE_WORKING_DIRECTORY}/workspace/build-MAPL
             make -j"$(nproc)" build-tests |& tee /logfiles/build-tests.log
-            #MEDIUM# make -j4 build-tests |& tee /logfiles/build-tests.log
+      - run:
+          name: "Run MAPL Unit Tests"
+          command: |
+            cd ${CIRCLE_WORKING_DIRECTORY}/workspace/build-MAPL
+            # skip Performance tests (maybe doable on CircleCI?)
+            ctest -R MAPL -LE PERFORMANCE --output-on-failure |& tee /logfiles/ctest.log
+      - circleci-tools/compress_artifacts
+      - store_artifacts:
+          path: /logfiles
+
+  build-UFS-MAPL:
+    parameters:
+      compiler:
+        type: string
+    executor: circleci-tools/<< parameters.compiler >>
+    working_directory: /root/project
+    steps:
+      - checkout:
+          path: MAPL
+      - circleci-tools/versions:
+          compiler: << parameters.compiler >>
+      - circleci-tools/mepoclone:
+          repo: MAPL
+      - circleci-tools/cmake:
+          repo: MAPL
+          compiler: << parameters.compiler >>
+          extra_cmake_options: "-DBUILD_WITH_FLAP=OFF -DBUILD_WITH_PFLOGGER=OFF -DBUILD_SHARED_MAPL=OFF"
+      - circleci-tools/buildinstall:
+          repo: MAPL
+      - run:
+          name: "Build MAPL Unit Tests"
+          command: |
+            cd ${CIRCLE_WORKING_DIRECTORY}/workspace/build-MAPL
+            make -j"$(nproc)" build-tests |& tee /logfiles/build-tests.log
       - run:
           name: "Run MAPL Unit Tests"
           command: |
@@ -148,23 +186,36 @@ jobs:
     parameters:
       compiler:
         type: string
-    executor: circleci-tools/<< parameters.compiler >>
-    resource_class: xlarge
+    executor:
+      name: circleci-tools/<< parameters.compiler >>
+      resource_class: xlarge
     working_directory: /root/project
     steps:
       - circleci-tools/checkout_fixture:
           repo: GEOSadas
-      - circleci-tools/mepoclone:
+      - circleci-tools/checkout_branch_on_fixture:
           repo: GEOSadas
-      - circleci-tools/mepodevelop:
+          branch: develop
+      - circleci-tools/mepoclone:
           repo: GEOSadas
       - circleci-tools/checkout_mapl_branch:
           repo: GEOSadas
+      # Until GEOSadas is closer to modern GEOSgcm, we need to update the ESMA_cmake
+      - circleci-tools/checkout_branch_on_subrepo:
+          repo: GEOSadas
+          branch: develop
+          subrepo: cmake
+      # There is currently an issue building GEOSadas with Debug Intel.
+      - circleci-tools/checkout_branch_on_subrepo:
+          repo: GEOSadas
+          branch: develop
+          subrepo: GEOSana_GridComp
       - circleci-tools/cmake:
           repo: GEOSadas
           compiler: << parameters.compiler >>
       - circleci-tools/buildinstall:
           repo: GEOSadas
+          rebuild_procs: 8
       - circleci-tools/compress_artifacts
       - store_artifacts:
           path: /logfiles

CHANGELOG.md

@@ -17,8 +17,38 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Deprecated
 
+## [2.18.0] - 2022-02-23
+
+### Fixed
+
+- Fixed issue in `CMakePresets.json` where Ninja presets were broken
+- Fixed io profiler report format
+- Fixed issue on macOS where enabling memutils caused crash
+
+### Added
+
+- Option to force integer time variable in History output via the History.rc file (IntegerTime: .true./.false. default .false.) rather than the default float time variable if allowed by frequency of output
+- Added mapl_StubComponent to MAPL package
+- Updates to CircleCI
+  - Added GEOSadas CI ifort build test
+  - Add "like-UFS" build to CI. This is no FLAP and pFlogger, and static build
+
+### Changed
+
+- Changed the naming convention for the split name(s): we now take the entries from the field alias(es) without appending any digits. Also allowing the user to specify more entries in the alias, so that HISTORY.rc does not need to change when running GOCART with more wavelengths
+- A small performance improvement. cycle => exit in MAPL_Generic.F90
+- Made history global metadata configurable. This can be done in two ways
+  1. Globally for all collections by setting `COMMENT:`, `CONTACT:`, `CONVENTION:`, `INSTITUTION:`, `REFERENCES:`, and `SOURCE:` at the top of `HISTORY.rc` like `EXPDSC:`
+  2. On a per-collection bases by setting `collection.comment:`, `collection.contact:`, `collection.convention:`, `collection.institution:`, `collection.references:`, and `collection.source:`
+  - The default settings for these are to match that of MAPL 2.17.0
+- Updated `components.yaml`. These changes are to support using Spack to build MAPL
+  - ESMA_cmake v3.10.0 (add `FindESMF.cmake` from NOAA-EMC)
+  - ecbuild geos/v1.2.0 (updat `FindNetCDF.cmake` to that from NOAA-EMC)
+
 ## [2.17.2] - 2022-02-16
 
+### Fixed
+
 - Fixes for Global Attributes to match FP 5.27
   - Changed `lev` variable `standard_name` to `model_layers`
   - Changed global attribute `Convention` to `Conventions`

CMakeLists.txt

@@ -4,7 +4,7 @@ cmake_policy (SET CMP0054 NEW)
 
 project (
   MAPL
-  VERSION 2.17.2
+  VERSION 2.18.0
   LANGUAGES Fortran CXX C)  # Note - CXX is required for ESMF
 
 # Set the default build type to release

CMakePresets.json

@@ -14,8 +14,7 @@
       "binaryDir": "${sourceDir}/build-${presetName}",
       "cacheVariables": {
         "BASEDIR": "$env{BASEDIR}",
-        "CMAKE_INSTALL_PREFIX": "${sourceDir}/install-${presetName}",
-        "CMAKE_BUILD_TYPE": "${presetName}"
+        "CMAKE_INSTALL_PREFIX": "${sourceDir}/install-${presetName}"
       }
     },
     {
@@ -38,37 +37,55 @@
       "name": "Release",
       "inherits": "base-gnu",
       "displayName": "Release Configure",
-      "description": "Release build using GNU Make generator"
+      "description": "Release build using GNU Make generator",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Release"
+      }
     },
     {
       "name": "Debug",
       "inherits": "base-gnu",
       "displayName": "Debug Configure",
-      "description": "Debug build using GNU Make generator"
+      "description": "Debug build using GNU Make generator",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Debug"
+      }
     },
     {
       "name": "Aggressive",
       "inherits": "base-gnu",
       "displayName": "Aggressive Configure",
-      "description": "Aggressive build using GNU Make generator"
+      "description": "Aggressive build using GNU Make generator",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Aggressive"
+      }
     },
     {
       "name": "Release-Ninja",
       "inherits": "base-ninja",
       "displayName": "Release Ninja Configure",
-      "description": "Release build using Ninja generator"
+      "description": "Release build using Ninja generator",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Release"
+      }
     },
     {
       "name": "Debug-Ninja",
       "inherits": "base-ninja",
       "displayName": "Debug Ninja Configure",
-      "description": "Debug build using Ninja generator"
+      "description": "Debug build using Ninja generator",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Debug"
+      }
     },
     {
       "name": "Aggressive-Ninja",
       "inherits": "base-ninja",
       "displayName": "Aggressive Ninja Configure",
-      "description": "Aggressive build using Ninja generator"
+      "description": "Aggressive build using Ninja generator",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Aggressive"
+      }
     }
   ],
   "buildPresets": [

MAPL/MAPL.F90

@@ -8,6 +8,7 @@ module MAPL
    use ESMF_CFIOMod
    use pFIO
    use MAPL_GridCompsMod
+   use mapl_StubComponent
    implicit none
 end module MAPL
 

base/Base/Base_Base_implementation.F90

@@ -1,3 +1,4 @@
+#include "MAPL_Exceptions.h"
 #include "MAPL_ErrLog.h"
 #include "unused_dummy.H"
 
@@ -3662,45 +3663,56 @@ subroutine genAlias(name, n, splitNameArray, aliasName, rc)
 
       integer :: i, k
       integer :: k1, k2, kk, count
+      integer :: nn
+      character(len=ESMF_MAXSTR), allocatable :: tmp(:)
+      character(len=ESMF_MAXSTR) :: aliasName_
+
+      if (present(aliasName)) then
+         aliasName_ = aliasName
+      else
+         aliasName_ = name
+      end if
+
       allocate(splitNameArray(n), stat=status)
       _VERIFY(status)
-      if (present(aliasName)) then
-         ! count the separators (";") in aliasName
-         ! if they match n (i.e. the count = n-1) use each
-         ! else if count is 0, append 00i to aliasName
-         ! else return an error
-
-         ! parse the aliasName
-         count = 0
-         k1 = 1
-         kk = len_trim(aliasName)
-         do k=1,kk
-            if (aliasName(k:k) == ";") then
-               count = count+1
-               k2=k-1
-               _ASSERT(count < n, 'Too many split separators')
-               splitNameArray(count) = aliasName(k1:k2)
-               k1 = k+1
-            end if
-         end do
-         if (count == 0) then
-            do i=1,n
-               write(splitNameArray(i),'(A,I3.3)') trim(aliasName), i
-            end do
-         else if(count == n-1) then
-            k2 = kk
+
+      ! parse the aliasName
+      ! count the separators (";") in aliasName
+      count = 0
+      k1 = 1
+      kk = len_trim(aliasName_)
+      do k=1,kk
+         if (aliasName_(k:k) == ";") then
             count = count+1
-            splitNameArray(count) = aliasName(k1:k2)
-         else
-            _ASSERT(.false.,'Inconsistent number of split separators')
          end if
+      end do
+      nn = count+1
+      allocate(tmp(nn), __STAT__)
 
-      else
-         do i=1,n
-            write(splitNameArray(i),'(A,I3.3)') trim(name), i
-         end do
-      end if
+      count = 0
+      do k=1,kk
+         if (aliasName_(k:k) == ";") then
+            count = count+1
+            k2=k-1
+            if (count > n) exit ! use atmost n of the aliases
+            tmp(count) = aliasName_(k1:k2)
+            k1 = k+1
+         end if
+      end do
+      count = count+1
+      k2 = kk
+      tmp(count) = aliasName_(k1:k2)
 
+      do i=1,min(nn,n)
+         splitNameArray(i) = tmp(i)
+      end do
+      deallocate(tmp)
+      ! if the user did no supply enough separated alias field names,
+      ! append 00i to the original field name
+      do i=nn+1,n
+         write(splitNameArray(i),'(A,I3.3)') trim(name), i
+      end do
+
       _RETURN(ESMF_SUCCESS)
     end subroutine GenAlias
   end subroutine MAPL_FieldSplit

base/MAPL_MemUtils.F90

@@ -60,7 +60,12 @@ module MAPL_MemUtilsMod
 #ifdef _CRAYT90
   public :: stklen
 #endif
+
+#ifdef sysDarwin
+  logical,    save :: DISABLED  = .true.
+#else
   logical,    save :: DISABLED  = .false.
+#endif
 
   integer, public, parameter :: MAPL_MemUtilsModeNode = 2
   integer, public, parameter :: MAPL_MemUtilsModeFull = 1