From 44fc362b3aab09f64cbd99bb9a4d3acec1f6475b Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 22 Jul 2024 13:36:54 -0400 Subject: [PATCH 1/9] Update to GOCART sdr_v2.3.0 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5d26a570..363767d4 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ | [GFDL_atmos_cubed_sphere](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere) | [geos/v2.9.0](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere/releases/tag/geos%2Fv2.9.0) | | [GMI](https://github.com/GEOS-ESM/GMI) | [v1.3.0](https://github.com/GEOS-ESM/GMI/releases/tag/v1.3.0) | | [GMAO_Shared](https://github.com/GEOS-ESM/GMAO_Shared) | [v1.9.7](https://github.com/GEOS-ESM/GMAO_Shared/releases/tag/v1.9.7) | -| [GOCART](https://github.com/GEOS-ESM/GOCART) | [sdr_v2.2.1.2](https://github.com/GEOS-ESM/GOCART/releases/tag/sdr_v2.2.1.2) | +| [GOCART](https://github.com/GEOS-ESM/GOCART) | [sdr_v2.3.0](https://github.com/GEOS-ESM/GOCART/releases/tag/sdr_v2.3.0) | | [HEMCO](https://github.com/GEOS-ESM/HEMCO) | [geos/v2.2.3](https://github.com/GEOS-ESM/HEMCO/releases/tag/geos%2Fv2.2.3) | | [Icepack](https://github.com/GEOS-ESM/Icepack) | [geos/v0.3.0](https://github.com/GEOS-ESM/Icepack/releases/tag/geos%2Fv0.3.0) | | [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.47.0](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.47.0) | diff --git a/components.yaml b/components.yaml index 5b93ebe7..2986dd78 100644 --- a/components.yaml +++ b/components.yaml @@ -91,7 +91,7 @@ geos-chem: GOCART: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@GOCART remote: ../GOCART.git - tag: sdr_v2.2.1.2 + tag: sdr_v2.3.0 develop: develop QuickChem: From dc8fc782561f90419a197d75a5d107718fde08e0 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 30 Oct 2024 15:47:03 -0400 Subject: [PATCH 2/9] Updates to allow use of new code --- components.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components.yaml b/components.yaml index a501c2e2..85546015 100644 --- a/components.yaml +++ b/components.yaml @@ -56,7 +56,7 @@ FMS: GEOSgcm_GridComp: local: ./src/Components/@GEOSgcm_GridComp remote: ../GEOSgcm_GridComp.git - tag: v2.6.2 + branch: feature/mmanyin/two_imports_for_chem sparse: ./config/GEOSgcm_GridComp.sparse develop: develop @@ -75,7 +75,7 @@ fvdycore: GEOSchem_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp remote: ../GEOSchem_GridComp.git - tag: v1.14.0 + branch: develop develop: develop HEMCO: From 5e2c8cc9d171e643e72bdfc78f2338cc3d865e7a Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 30 Oct 2024 15:47:37 -0400 Subject: [PATCH 3/9] update readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 824b5350..beb058c0 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ | [geos-chem](https://github.com/GEOS-ESM/geos-chem) | [geos/v13.0.0-rc1](https://github.com/GEOS-ESM/geos-chem/releases/tag/geos%2Fv13.0.0-rc1) | | [GEOS_OceanGridComp](https://github.com/GEOS-ESM/GEOS_OceanGridComp) | [v2.3.0](https://github.com/GEOS-ESM/GEOS_OceanGridComp/releases/tag/v2.3.0) | | [GEOS_Util](https://github.com/GEOS-ESM/GEOS_Util) | [v2.1.3](https://github.com/GEOS-ESM/GEOS_Util/releases/tag/v2.1.3) | -| [GEOSchem_GridComp](https://github.com/GEOS-ESM/GEOSchem_GridComp) | [v1.14.0](https://github.com/GEOS-ESM/GEOSchem_GridComp/releases/tag/v1.14.0) | +| [GEOSchem_GridComp](https://github.com/GEOS-ESM/GEOSchem_GridComp) | [v1.15.0](https://github.com/GEOS-ESM/GEOSchem_GridComp/releases/tag/v1.15.0) | | [GEOSgcm_App](https://github.com/GEOS-ESM/GEOSgcm_App) | [v2.3.5](https://github.com/GEOS-ESM/GEOSgcm_App/releases/tag/v2.3.5) | | [GEOSgcm_GridComp](https://github.com/GEOS-ESM/GEOSgcm_GridComp) | [v2.6.2](https://github.com/GEOS-ESM/GEOSgcm_GridComp/releases/tag/v2.6.2) | | [GEOSradiation_GridComp](https://github.com/GEOS-ESM/GEOSradiation_GridComp) | [v1.9.0](https://github.com/GEOS-ESM/GEOSradiation_GridComp/releases/tag/v1.9.0) | From 27ae0a9b9a46c45c7062c671804731d3dce1af4f Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 6 Dec 2024 11:08:41 -0500 Subject: [PATCH 4/9] Update to develop gcm GC --- components.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components.yaml b/components.yaml index d4dde5ee..8b21cbca 100644 --- a/components.yaml +++ b/components.yaml @@ -56,7 +56,7 @@ FMS: GEOSgcm_GridComp: local: ./src/Components/@GEOSgcm_GridComp remote: ../GEOSgcm_GridComp.git - branch: feature/mmanyin/two_imports_for_chem + branch: develop sparse: ./config/GEOSgcm_GridComp.sparse develop: develop From 618bccb0bbac5cbc6426408c6fc14e25aa0c363f Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 6 Dec 2024 11:10:52 -0500 Subject: [PATCH 5/9] Update readme in advance --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3636bb2e..21b48560 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ | [GEOS_Util](https://github.com/GEOS-ESM/GEOS_Util) | [v2.1.3](https://github.com/GEOS-ESM/GEOS_Util/releases/tag/v2.1.3) | | [GEOSchem_GridComp](https://github.com/GEOS-ESM/GEOSchem_GridComp) | [v1.15.0](https://github.com/GEOS-ESM/GEOSchem_GridComp/releases/tag/v1.15.0) | | [GEOSgcm_App](https://github.com/GEOS-ESM/GEOSgcm_App) | [v2.3.5](https://github.com/GEOS-ESM/GEOSgcm_App/releases/tag/v2.3.5) | -| [GEOSgcm_GridComp](https://github.com/GEOS-ESM/GEOSgcm_GridComp) | [v2.6.2](https://github.com/GEOS-ESM/GEOSgcm_GridComp/releases/tag/v2.6.2) | +| [GEOSgcm_GridComp](https://github.com/GEOS-ESM/GEOSgcm_GridComp) | [v2.7.0](https://github.com/GEOS-ESM/GEOSgcm_GridComp/releases/tag/v2.7.0) | | [GEOSradiation_GridComp](https://github.com/GEOS-ESM/GEOSradiation_GridComp) | [v1.10.0](https://github.com/GEOS-ESM/GEOSradiation_GridComp/releases/tag/v1.10.0) | | [GFDL_atmos_cubed_sphere](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere) | [geos/v2.9.1](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere/releases/tag/geos%2Fv2.9.1) | | [GMI](https://github.com/GEOS-ESM/GMI) | [v1.3.0](https://github.com/GEOS-ESM/GMI/releases/tag/v1.3.0) | From 09c84cf3b83cf91e369f1517ec1625cd392c6c50 Mon Sep 17 00:00:00 2001 From: Scott Rabenhorst <53346946+sdrabenh@users.noreply.github.com> Date: Fri, 10 Jan 2025 09:53:15 -0500 Subject: [PATCH 6/9] Update CHANGELOG.md --- CHANGELOG.md | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6729c9cb..a92edf10 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,40 @@ ## Unreleased +## [11.6.3] - 2025-01-10 + +### Zero-diff to Previous Release: YES +### Restart Changes: YES (metadata only) + +### Major Zero-Diff Changes: + +* Added new Gigatraj grid comp to calculate particle trajectories. By default, this feature not built, but can be using the cmake option `-DBUILD_WITH_GIGATRAJ=ON` [#954](https://github.com/GEOS-ESM/GEOSgcm_GridComp/pull/954) [#820](https://github.com/GEOS-ESM/GEOSgcm_GridComp/pull/820) [#665](https://github.com/GEOS-ESM/GEOSgcm_App/pull/665) +* Adding Data Atmosphere from S2S to mainline gcm [#668](https://github.com/GEOS-ESM/GEOSgcm_App/pull/668) +* Fixed DataAtmosphere with corrections to `SW`, `SH` and `EVAP` etc. [#1040](https://github.com/GEOS-ESM/GEOSgcm_GridComp/pull/1040) +* Prevent `SURFSTATE` from terminating when CICE6 is running [#1030](https://github.com/GEOS-ESM/GEOSgcm_GridComp/pull/1030) +* Updated refresh method registration: enables CICE6 rewind through MAPL using a new flag [#1022](https://github.com/GEOS-ESM/GEOSgcm_GridComp/pull/1022) +* Added yaml file for JRA55-DO dataset [#1038](https://github.com/GEOS-ESM/GEOSgcm_GridComp/pull/1038) +* Updated `LONG_NAME` attributes to match M21C file specs; conservative regridding of (obs) `PRECIP_FILE` inputs [#1032](https://github.com/GEOS-ESM/GEOSgcm_GridComp/pull/1032) +* Updated land-related collections in `HISTORY.rc.tmpl` to match M21C file specs [#663](https://github.com/GEOS-ESM/GEOSgcm_App/pull/663) +* Convert gcm setup template `>>>`-vars to `@`-vars. This change is consistent with DAS conventions of prefixing setup variables with `@` and runtime variables with `>>><<<` [#666](https://github.com/GEOS-ESM/GEOSgcm_App/pull/666) +* Satisfy CHEM imports for Lopez LFR scheme [#1021](https://github.com/GEOS-ESM/GEOSgcm_GridComp/pull/1021) +* Add dependency to `fms_r4` because of the way FV3 is built as `r4` but links to the `r8` version of FMS [#1037](https://github.com/GEOS-ESM/GEOSgcm_GridComp/pull/1037) +* Initial prototype of a CFFI-based fortran/python bridge for MKIAU [#1034](https://github.com/GEOS-ESM/GEOSgcm_GridComp/pull/1034) +* Fixes for SCM [#676](https://github.com/GEOS-ESM/GEOSgcm_App/pull/676) +* Updates to enable jemalloc build [#568](https://github.com/GEOS-ESM/GEOSgcm_App/pull/568) + +### Fixture Changes: +* ESMA_env [v4.29.1 => v4.29.2](https://github.com/GEOS-ESM/ESMA_env/compare/v4.29.1...v4.29.2) +* ESMA_cmake [v3.52.0 => v3.56.0](https://github.com/GEOS-ESM/ESMA_cmake/compare/v3.52.0...v3.56.0) +* MAPL [v2.50.1 => v2.51.2](https://github.com/GEOS-ESM/MAPL/compare/v2.50.1...v2.51.2) +* GEOSgcm_GridComp [v2.6.2 => v2.6.3](https://github.com/GEOS-ESM/GEOSgcm_GridComp/compare/v2.6.2...v2.6.3) +* GigaTraj [NEW v1.0.0](https://github.com/GEOS-ESM/gigatraj/releases/tag/geos%2Fv1.0.0) +* FVdycoreCubed_GridComp [v2.12.0 => v2.13.0](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/compare/v2.12.0...v2.13.0) +* fvdycore [v2.9.0 => v2.9.1](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere/compare/geos/v2.9.0...geos/v2.9.1) +* GEOSradiation_GridComp [v1.9.0 => v1.10.0](https://github.com/GEOS-ESM/GEOSradiation_GridComp/compare/v1.9.0...v1.10.0) +* GEOSgcm_App [v2.3.5 => v2.3.7](https://github.com/GEOS-ESM/GEOSgcm_App/compare/v2.3.5...v2.3.7) + + ## [11.6.2] - 2024-10-23 ### Zero-diff to Previous Release: YES From edcac33598d7d4765ac8a1895a9b6db7e33fe86d Mon Sep 17 00:00:00 2001 From: Scott Rabenhorst <53346946+sdrabenh@users.noreply.github.com> Date: Fri, 10 Jan 2025 09:54:34 -0500 Subject: [PATCH 7/9] Update CMakeLists.txt --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a60e9d20..c7a7ffa5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_policy (SET CMP0054 NEW) project ( GEOSgcm - VERSION 11.6.2 + VERSION 11.6.3 LANGUAGES Fortran CXX C) # Note - CXX is required for ESMF if ("${PROJECT_SOURCE_DIR}" STREQUAL "${PROJECT_BINARY_DIR}") From afc250ff0a96514d30a823aea8a4dd4f8439cbcb Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 16 Jan 2025 11:43:59 -0500 Subject: [PATCH 8/9] Update to GOCART v2.3.0 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 38053574..1ebc0ae2 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ | [gigatraj](https://github.com/GEOS-ESM/gigatraj) | [geos/v1.0.0](https://github.com/GEOS-ESM/gigatraj/releases/tag/geos%2Fv1.0.0) | | [GMI](https://github.com/GEOS-ESM/GMI) | [v1.3.0](https://github.com/GEOS-ESM/GMI/releases/tag/v1.3.0) | | [GMAO_Shared](https://github.com/GEOS-ESM/GMAO_Shared) | [v1.9.9](https://github.com/GEOS-ESM/GMAO_Shared/releases/tag/v1.9.9) | -| [GOCART](https://github.com/GEOS-ESM/GOCART) | [sdr_v2.3.0](https://github.com/GEOS-ESM/GOCART/releases/tag/sdr_v2.3.0) | +| [GOCART](https://github.com/GEOS-ESM/GOCART) | [v2.3.0](https://github.com/GEOS-ESM/GOCART/releases/tag/v2.3.0) | | [HEMCO](https://github.com/GEOS-ESM/HEMCO) | [geos/v2.2.3](https://github.com/GEOS-ESM/HEMCO/releases/tag/geos%2Fv2.2.3) | | [Icepack](https://github.com/GEOS-ESM/Icepack) | [geos/v0.3.0](https://github.com/GEOS-ESM/Icepack/releases/tag/geos%2Fv0.3.0) | | [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.51.2](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.51.2) | diff --git a/components.yaml b/components.yaml index 3bef73c5..fcdbecc3 100644 --- a/components.yaml +++ b/components.yaml @@ -99,7 +99,7 @@ geos-chem: GOCART: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@GOCART remote: ../GOCART.git - tag: sdr_v2.3.0 + tag: v2.3.0 develop: develop QuickChem: From 95005ad8603bc531e9ee39c3e8ffbae5dee6d3e0 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 16 Jan 2025 11:58:01 -0500 Subject: [PATCH 9/9] Update to GEOSchem_GridComp v1.15.0 --- components.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components.yaml b/components.yaml index fcdbecc3..a88b2bcb 100644 --- a/components.yaml +++ b/components.yaml @@ -81,7 +81,7 @@ fvdycore: GEOSchem_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp remote: ../GEOSchem_GridComp.git - branch: develop + tag: v1.15.0 develop: develop HEMCO: