Merge branch 'develop' into feature/wjiang/read_string_attribute

.github/workflows/cron-stale.yml

@@ -0,0 +1,51 @@
+# Based on examples from the stale action site:
+# https://github.com/actions/stale
+
+name: 'Close stale issues and PR'
+on:
+  schedule:
+    - cron: '30 1 * * *'
+
+permissions:
+  contents: read
+  issues: write
+  pull-requests: write
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@v9
+        with:
+          days-before-issue-stale: 60
+          stale-issue-message: >
+            This issue has been automatically marked as stale because it
+            has not had activity in the last 60 days. If there are no
+            updates within 7 days, it will be closed.  You can add the
+            ":hourglass: Long Term" label to prevent the stale action
+            from closing this issue.
+          days-before-issue-close: 7
+          close-issue-message: >
+            This issue was closed because it has been stalled for 7 days with no activity.
+            You can reopen this issue if you are still working on it.
+          stale-issue-label: ':snowflake: Stale'
+          exempt-issue-labels: ':hourglass: Long Term,:exclamation: High Priority'
+
+          days-before-pr-stale: 60
+          stale-pr-message: >
+            This PR has been automatically marked as stale because it
+            has not had activity in the last 60 days. If there are no
+            updates within 7 days, it will be closed.  You can add the
+            ":hourglass: Long Term" label to prevent the stale action
+            from closing this issue.
+          days-before-pr-close: 30
+          close-pr-message: >
+            This PR was closed because it has been stalled for 30 days with no activity.
+            You can reopen this PR if you are still working on it.
+          stale-pr-label: ':snowflake: Stale'
+          exempt-pr-labels: ':hourglass: Long Term,:exclamation: High Priority'
+
+          labels-to-remove-when-unstale: ':snowflake: Stale'
+          remove-stale-when-updated: true
+
+

CHANGELOG.md

@@ -11,7 +11,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+
 - Added ability to read the attribute with explicit type "string" of a netcdf variable. 
+- Start implementing changes for vertical regridding in ExtData
 - Add ability to connect export of the MAPL hierachy to ExtData via CAP.rc file
 - Added new driver, CapDriver.x, to excerise the MAPL_Cap with the configuratable component also used by ExtDataDriver.x
 - Added Fortran interface to UDUNITS2
@@ -22,7 +24,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - Update to circleci-tools orb v4
     - This adds the ability to do an `ifx` test along with the `ifort` test (though `ifx` is not yet enabled)
 - Update `components.yaml`
-  - ESMA_env v4.30.0
+  - ESMA_env v4.30.1
     - Update to Baselibs 7.25.0
       - ESMF 8.6.1
       - GFE v1.16.0
@@ -37,11 +39,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
     - Move to use Intel ifort 2021.13 at NCCS SLES15, NAS, and GMAO Desktops
     - Move to use Intel MPI at NCCS SLES15 and GMAO Desktops
     - Move to GEOSpyD Min24.4.4 Python 3.11
-  - ESMA_cmake v3.50.0
+    - Fix for csh at NAS
+  - ESMA_cmake v3.51.0
     - Update `esma_add_fortran_submodules` function
     - Move MPI detection out of FindBaselibs
     - Add SMOD to submodule generator
     - NAG OpenMP Workaround
+    - Support for Jemalloc and LLVM Flang
 - Add support for preliminary CF Conventions quantization properties
   - Add new quantization keyword `granular_bitround` to History. This will be the preferred keyword for quantization in the future
     replacing `GranularBR`

components.yaml

@@ -5,13 +5,13 @@ MAPL:
 ESMA_env:
   local: ./ESMA_env
   remote: ../ESMA_env.git
-  tag: v4.30.0
+  tag: v4.30.1
   develop: main
 
 ESMA_cmake:
   local: ./ESMA_cmake
   remote: ../ESMA_cmake.git
-  tag: v3.50.0
+  tag: v3.51.0
   develop: develop
 
 ecbuild:

gridcomps/ExtData2G/CMakeLists.txt

@@ -20,6 +20,8 @@ set (srcs
      ExtData_IOBundleMod.F90
      ExtData_IOBundleVectorMod.F90
      ExtDataMasking.F90
+     ExtDataPrimaryExportVector.F90
+     ExtDataDerivedExportVector.F90
     )
 
 

gridcomps/ExtData2G/ExtDataDerivedExportVector.F90

@@ -0,0 +1,13 @@
+module MAPL_ExtDataDerivedExportVectorMod
+   use MAPL_ExtDataTypeDef
+#define T DerivedExport
+#define Vector DerivedExportVector
+#define VectorIterator DerivedExportVectorIterator
+
+#include "vector/template.inc"
+
+#undef T
+#undef Vector
+#undef VectorIterator
+
+end module MAPL_ExtDataDerivedExportVectorMod