Merge branch 'develop' into feature/ygyu/PR_swath_2_epoch

GEOS-ESM · Dec 1, 2023 · af8e6a6 · af8e6a6
2 parents 4f21f0f + 5f9e2e6
commit af8e6a6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -16,8 +16,8 @@ parameters:
 
 # Anchors to prevent forgetting to update a version
 os_version: &os_version ubuntu20
-baselibs_version: &baselibs_version v7.14.0
-bcs_version: &bcs_version v11.2.0
+baselibs_version: &baselibs_version v7.17.0
+bcs_version: &bcs_version v11.3.0
 tag_build_arg_name: &tag_build_arg_name maplversion
 
 orbs:

diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -17,7 +17,7 @@ jobs:
     name: Build and Test MAPL GNU
     runs-on: ubuntu-latest
     container:
-      image: gmao/ubuntu20-geos-env-mkl:v7.14.0-openmpi_4.1.4-gcc_12.1.0
+      image: gmao/ubuntu20-geos-env-mkl:v7.17.0-openmpi_4.1.4-gcc_12.1.0
       # Per https://github.com/actions/virtual-environments/issues/1445#issuecomment-713861495
       # It seems like we might not need secrets on GitHub Actions which is good for forked
       # pull requests
@@ -77,7 +77,7 @@ jobs:
     name: Build and Test MAPL Intel
     runs-on: ubuntu-latest
     container:
-      image: gmao/ubuntu20-geos-env:v7.14.0-intelmpi_2021.6.0-intel_2022.1.0
+      image: gmao/ubuntu20-geos-env:v7.17.0-intelmpi_2021.6.0-intel_2022.1.0
       # Per https://github.com/actions/virtual-environments/issues/1445#issuecomment-713861495
       # It seems like we might not need secrets on GitHub Actions which is good for forked
       # pull requests

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Swath grid step 1: allow for destroying and regenerating swath grid and regenerating regridder route handle, and creating
   allocatable metadata in griddedIO. Modifications are made to GriddedIO.F90, MAPL_AbstractRegridder.F90, and MAPL_EsmfRegridder.F90.
 - Swath grid step 2: add control keywords for swath grid. Allow for filename template with '*' and DOY. Allow for missing obs files. Specify index_name_lon/lat, var_name_lon/lat/time, tunit, obs_file_begin/end/interval, Epoch and Epoch_init.
+- Update CI to Baselibs 7.17.0 (for future MAPL3 work) and the BCs v11.3.0 (to fix coupled run)
+- Update `components.yaml`
+  - ESMA_env v4.22.0 (Baselibs 7.15.1)
 
 ### Fixed
 

diff --git a/components.yaml b/components.yaml
@@ -5,7 +5,7 @@ MAPL:
 ESMA_env:
   local: ./ESMA_env
   remote: ../ESMA_env.git
-  tag: v4.20.5
+  tag: v4.22.0
   develop: main
 
 ESMA_cmake: