diff --git a/.circleci/config.yml b/.circleci/config.yml index 9f25aed2..6fe732b7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,11 +1,11 @@ version: 2.1 # Anchors in case we need to override the defaults from the orb -#baselibs_version: &baselibs_version v7.17.0 -#bcs_version: &bcs_version v11.3.0 +#baselibs_version: &baselibs_version v7.27.0 +#bcs_version: &bcs_version v11.6.0 orbs: - ci: geos-esm/circleci-tools@2 + ci: geos-esm/circleci-tools@4 workflows: build-and-test: diff --git a/.github/workflows/validate_yaml_files.yml b/.github/workflows/validate_yaml_files.yml index dfefbd9a..449db6e6 100644 --- a/.github/workflows/validate_yaml_files.yml +++ b/.github/workflows/validate_yaml_files.yml @@ -15,7 +15,7 @@ jobs: validate-YAML: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - id: yaml-lint name: yaml-lint uses: ibiqlik/action-yamllint@v3 diff --git a/CHANGELOG.md b/CHANGELOG.md index 603bbf49..de7d2753 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -76,13 +76,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Add `soil_drylimit_factor` to the DU2G_instance_DU.rc and DU2G_GridCompMod.F90 files for FENGSHA - Moved process library macros to header file. +## [v2.3.0] - 2025-01-16 + +### Changed + +- Filepath for CEDS has been updated in the ExtData yaml and rc files. Note the old version had an incorrect seasonal cycle. +- State Spec RC files for GOCART2G, CA, DU, NI, SU, and SS were updated such that the long names for AOD are more intuitive +- Updated CI to use v4 orb +- Update components.yaml to match GEOSgcm `main` as of 2025-01-16 + ## [v2.2.1] - 2023-05-30 ### Fixed - In dust and sea-salt, changed dimensions back to `globalCellCountPerDim` since these are needed to determine emission tuning parameters, not to allocate arrays. - ## [v2.2.0] - 2023-05-18 ### Fixed diff --git a/CMakeLists.txt b/CMakeLists.txt index c06a9802..48670f7a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,7 +29,7 @@ endif() if (GOCART_STANDALONE) project ( GOCART - VERSION 2.2.1 + VERSION 2.3.0 LANGUAGES Fortran CXX C) # Note - CXX is required for ESMF if ("${PROJECT_SOURCE_DIR}" STREQUAL "${PROJECT_BINARY_DIR}") diff --git a/ESMF/GOCART2G_GridComp/CA2G_GridComp/CMakeLists.txt b/ESMF/GOCART2G_GridComp/CA2G_GridComp/CMakeLists.txt index 7b97c2dc..83bb6024 100644 --- a/ESMF/GOCART2G_GridComp/CA2G_GridComp/CMakeLists.txt +++ b/ESMF/GOCART2G_GridComp/CA2G_GridComp/CMakeLists.txt @@ -6,7 +6,9 @@ esma_add_library (${this} mapl_acg (${this} CA2G_StateSpecs.rc IMPORT_SPECS EXPORT_SPECS INTERNAL_SPECS - GET_POINTERS DECLARE_POINTERS) + GET_POINTERS DECLARE_POINTERS + LONG_NAME_PREFIX "GCsuffix") + file (GLOB_RECURSE rc_files CONFIGURE_DEPENDS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.rc *.yaml) foreach ( file ${rc_files} ) diff --git a/ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_StateSpecs.rc b/ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_StateSpecs.rc index ddcdf0b2..8df2e6f1 100644 --- a/ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_StateSpecs.rc +++ b/ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_StateSpecs.rc @@ -98,7 +98,7 @@ category: EXPORT SUEXTTAU | 1 | xy | N | size(self%wavelengths_vertint) | SO4 Aerosol Optical Depth SUSTEXTTAU | 1 | xy | N | size(self%wavelengths_vertint) | SO4 Stratospheric Aerosol Optical Thickness SUSCATAU | 1 | xy | N | size(self%wavelengths_vertint) | SO4 Aerosol Optical Depth Due to Scattering - SUSTSCATAU | 1 | xy | N | size(self%wavelengths_vertint) | SO4 Stratospheric Aerosol Optical Thickness Due to Scattering + SUSTSCATAU | 1 | xy | N | size(self%wavelengths_vertint) | SO4 Stratospheric Aerosol Optical Depth Due to Scattering SO4SAREA | m2 m-3 | xyz | C | | SO4 Surface Area Density SO4SNUM | m-3 | xyz | C | | SO4 Number Density @@ -111,8 +111,8 @@ category: INTERNAL DMS |kg kg-1| xyz | C | MAPL_RestartOptional | T | DYNAMICS:TURBULENCE:MOIST | Dimethylsulphide SO2 |kg kg-1| xyz | C | MAPL_RestartOptional | T | DYNAMICS:TURBULENCE:MOIST | Sulphur dioxide SO4 |kg kg-1| xyz | C | MAPL_RestartOptional | T | DYNAMICS:TURBULENCE:MOIST | Sulphate aerosol - MSA |kg kg-1| xyz | C | MAPL_RestartOptional | T | DYNAMICS:TURBULENCE:MOIST | Methanesulphonic acid - H2O2_INIT |kg kg-1| xyz | C | | F | | private H2O2 that is saved and used to initialize + MSA |kg kg-1| xyz | C | MAPL_RestartOptional | T | DYNAMICS:TURBULENCE:MOIST | Methanesulphonic acid + H2O2_INIT |kg kg-1| xyz | C | | F | | private H2O2 that is saved and used to initialize #******************************************************** diff --git a/components.yaml b/components.yaml index 5330f040..a77d6198 100644 --- a/components.yaml +++ b/components.yaml @@ -5,19 +5,19 @@ GOCART: env: local: ./env@ remote: ../ESMA_env.git - tag: v4.29.0 + tag: v4.29.2 develop: main cmake: local: ./cmake@ remote: ../ESMA_cmake.git - tag: v3.48.0 + tag: v3.56.0 develop: develop ecbuild: local: ./cmake@/ecbuild@ remote: ../ecbuild.git - tag: geos/v1.3.0 + tag: geos/v1.4.0 HEMCO: local: ./ESMF/HEMCO_GridComp@ @@ -28,12 +28,12 @@ HEMCO: GMAO_Shared: local: ./ESMF/Shared/GMAO_Shared@ remote: ../GMAO_Shared.git - tag: v1.9.8 + tag: v1.9.9 sparse: ./config/GMAO_Shared.sparse develop: main MAPL: local: ./ESMF/Shared/MAPL@ remote: ../MAPL.git - tag: v2.47.1 + tag: v2.51.2 develop: develop