From 2d1bc440a6f76311592206735ae83a265d347a5d Mon Sep 17 00:00:00 2001 From: Bob Yantosca Date: Thu, 25 Jul 2024 17:09:38 -0400 Subject: [PATCH 1/9] GEOS-Chem submod update: Merge PR #2394 (Add GCAP int test) This commit informs the GCHP superproject about the following commits that were pushed to the GitHub geoschem/geos-chem repository: 38b5bfe0d Merge PR #2394 (Add int ModelE2.1 (GCAP 2.0) integration test) This PR adds an GEOS-Chem Classic integration test using ModelE2.1 meteorology. Signed-off-by: Bob Yantosca --- src/GCHP_GridComp/GEOSChem_GridComp/geos-chem | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem b/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem index 6a26a6bab..38b5bfe0d 160000 --- a/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem +++ b/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem @@ -1 +1 @@ -Subproject commit 6a26a6bab094dd8230247aeeb9a252b53c543417 +Subproject commit 38b5bfe0dfb0a109480450c0d5c9772ba0627e67 From 8a9c15e2f80a7dcac94a01fd6eb0df01ab158dcc Mon Sep 17 00:00:00 2001 From: Bob Yantosca Date: Fri, 26 Jul 2024 14:56:02 -0400 Subject: [PATCH 2/9] Hotfix: Fix invalid YAML syntax in .github/workflows/stale.yml .github/workflows/stale.yml - Add brackets around the list for `exempt-issue-labels`. Verified this syntax with the YAML linter yamllint.com. CHANGELOG.md - Updated accordingly Signed-off-by: Bob Yantosca --- .github/workflows/stale.yml | 2 +- CHANGELOG.md | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index c4ba4f38f..c5b8f3e1e 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -22,7 +22,7 @@ jobs: with: repo-token: ${{ secrets.GITHUB_TOKEN }} stale-issue-label: 'stale' - exempt-issue-labels: 'category: Discussion','category: Feature Request','deferred','help needed: Open Research Problem','help needed: Request Input from Community','never stale','TODO: Documentation' + exempt-issue-labels: ['category: Discussion','category: Feature Request','deferred','help needed: Open Research Problem','help needed: Request Input from Community','never stale','TODO: Documentation'] days-before-issue-stale: 30 days-before-issue-close: 7 stale-issue-message: 'This issue has been automatically marked as stale because it has not had recent activity. If there are no updates within 7 days it will be closed. You can add the "never stale" tag to prevent the issue from closing this issue.' diff --git a/CHANGELOG.md b/CHANGELOG.md index 68de2b11b..da2cd4958 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,10 @@ This file documents all notable changes to the GCHP wrapper repository starting The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [Unreleased] - TBD +### Fixed +- Added brackets around `exempt-issue-labels` list in `.github/workflows/stale.yml` + ## [14.4.2] - 2024-07-24 ### Changed - Updated Cloud-J submodule to 7.7.2 From f4c3860de964ee532119d47f4b33cb6d082555ff Mon Sep 17 00:00:00 2001 From: Bob Yantosca Date: Thu, 1 Aug 2024 16:22:05 -0400 Subject: [PATCH 3/9] GEOS-Chem submod update: Merge PR #2399 (Add "alldiags" int tests) This commit informs the GCHP superproject about the following commits that were pushed to the GitHub geoschem/geos-chem repository: 3e0f6cef4 Merge PR #2399 (Add "alldiags" integration test) 53568d107 Hotfix: Fix invalid YAML syntax in .github/workflows/stale.yml This PR adds GCHP and GCClassic integration tests (based on the fullchem_benchmark test) with all diagnostics turned on. Several minor issues revealed by these tests have also been fixed. Signed-off-by: Bob Yantosca --- src/GCHP_GridComp/GEOSChem_GridComp/geos-chem | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem b/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem index 38b5bfe0d..3e0f6cef4 160000 --- a/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem +++ b/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem @@ -1 +1 @@ -Subproject commit 38b5bfe0dfb0a109480450c0d5c9772ba0627e67 +Subproject commit 3e0f6cef48c8d1adc818495dbe1da9a21f1c8aaf From 78566d97ca1726ea52ce27585d03c108a772e534 Mon Sep 17 00:00:00 2001 From: Bob Yantosca Date: Mon, 5 Aug 2024 17:44:07 -0400 Subject: [PATCH 4/9] GEOS-Chem submod update: Merge PR #2410 (TROPP in SatDiagn) This commit informs the GCHP superproject about the following commits that were pushed to the GitHub geoschem/geos-chem repository: 7d3f442e7 (HEAD -> dev/no-diff-to-benchmark, origin/dev/no-diff-to-benchmark) Merge PR #2410 (Add Trop Pressure to SatDiagn collection) This PR adds an extra field (TROPP) to the existing SatDiagn collection. Signed-off-by: Bob Yantosca --- src/GCHP_GridComp/GEOSChem_GridComp/geos-chem | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem b/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem index 3e0f6cef4..7d3f442e7 160000 --- a/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem +++ b/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem @@ -1 +1 @@ -Subproject commit 3e0f6cef48c8d1adc818495dbe1da9a21f1c8aaf +Subproject commit 7d3f442e7607a794672575aea768fb4d95ce573c From 987da5600812159d05a839c5e96b92c1a9a613a9 Mon Sep 17 00:00:00 2001 From: Bob Yantosca Date: Tue, 6 Aug 2024 09:49:44 -0400 Subject: [PATCH 5/9] GEOS-Chem submod update: Merge PR #2397 (Global 0.5 deg TransportTracers runs) This commit informs the GCHP superproject about the following commits that were pushed to the GitHub geoschem/geos-chem repository: 07884955e Merge PR #2397 (Add GCC global TransportTracer 0.5 degree run w/ GEOS-IT) This PR updates the GC-Classic create run directory script. It now offers the option of a global 1/2-degree run using the transport tracer simulation with GEOS-IT meteorology fields. Signed-off-by: Bob Yantosca --- src/GCHP_GridComp/GEOSChem_GridComp/geos-chem | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem b/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem index 7d3f442e7..07884955e 160000 --- a/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem +++ b/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem @@ -1 +1 @@ -Subproject commit 7d3f442e7607a794672575aea768fb4d95ce573c +Subproject commit 07884955e31ffc125907540a4e4e4182824e5ef1 From 4cadc0d1cf4cec583528e92096d3457e3ba097a9 Mon Sep 17 00:00:00 2001 From: Bob Yantosca Date: Mon, 12 Aug 2024 10:59:18 -0400 Subject: [PATCH 6/9] GEOS-Chem submod update: Merge PR #2413 (Fix unit conv in aerosol sim) This commit informs the GCHP superproject about the following commits that were pushed to the GitHub geoschem/geos-chem repository: cd3857ade Merge PR #2413 (Fix unit conversion in aerosol-only sim) This PR fixes a longstanding unit conversion issue in the aerosol-only simulation. Signed-off-by: Bob Yantosca --- src/GCHP_GridComp/GEOSChem_GridComp/geos-chem | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem b/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem index 07884955e..cd3857ade 160000 --- a/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem +++ b/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem @@ -1 +1 @@ -Subproject commit 07884955e31ffc125907540a4e4e4182824e5ef1 +Subproject commit cd3857ade14a3c2ec6993e9305f70643ed3de33e From 000ab6de03943be2ea1196fa3cd5d267199b5d95 Mon Sep 17 00:00:00 2001 From: Bob Yantosca Date: Mon, 12 Aug 2024 14:45:19 -0400 Subject: [PATCH 7/9] GEOS-Chem submod update: Merge PR #2402 (Fixes for HEMCO_Diagn.rc) This commit informs the GCHP superproject about the following commits that were pushed to the GitHub geoschem/geos-chem repository: 34507531 Merge PR #2402 (Fixes for HEMCO_Diagn.rc) This PR adds 2 fixes: 1. Use offline biogenic MOH emissions (except for the benchmark simulation, which uses online emissions by default) 2. Auto-set GCHP emissions sources in HEMCO_Diagn.rc based on HEMCO_Config.rc. Signed-off-by: Bob Yantosca --- src/GCHP_GridComp/GEOSChem_GridComp/geos-chem | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem b/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem index cd3857ade..034507531 160000 --- a/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem +++ b/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem @@ -1 +1 @@ -Subproject commit cd3857ade14a3c2ec6993e9305f70643ed3de33e +Subproject commit 034507531334f502934e7ad74cb2519044c3f363 From ddb880ea90aa273513e50d667e4e130fddb75372 Mon Sep 17 00:00:00 2001 From: Bob Yantosca Date: Mon, 12 Aug 2024 16:54:41 -0400 Subject: [PATCH 8/9] Cloud-J submod update: Update to version 7.7.3 This commit informs the GCClassic superproject about the following commits that were pushed to the GitHub geoschem/Cloud-J repository: d20050f Update version to 7.7.3 441f325 Merge pull request #23 from geoschem/feature/improve_speed_by_reducing_error_checks c4e500c Remove gcc 11 and add gcc 14 to mac workflows Cloud-J 7.7.3 contains these fixes & features: - Minimized usage and checks of error codes to speed up the model - Removed safety initialization of outputs where assigning all values is obvious to improve performance - Replaced GCC 11 with GCC 14 in GitHub actions to build Cloud-J standalone on MacOS. (GCC 11 was deprecated.) Signed-off-by: Bob Yantosca --- src/GCHP_GridComp/GEOSChem_GridComp/Cloud-J | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/GCHP_GridComp/GEOSChem_GridComp/Cloud-J b/src/GCHP_GridComp/GEOSChem_GridComp/Cloud-J index 37a4ece35..d20050f1e 160000 --- a/src/GCHP_GridComp/GEOSChem_GridComp/Cloud-J +++ b/src/GCHP_GridComp/GEOSChem_GridComp/Cloud-J @@ -1 +1 @@ -Subproject commit 37a4ece3580a9a8ce64d9fbd03c699cd116c6d80 +Subproject commit d20050f1ef9e3895d58f3041efd2da59ce1ed421 From 91079c654f7c087891a49e9ddbb9cd6025088abf Mon Sep 17 00:00:00 2001 From: Bob Yantosca Date: Tue, 13 Aug 2024 15:11:08 -0400 Subject: [PATCH 9/9] Submod updates: GEOS-Chem 14.4.3 and HEMCO 3.9.3 releases This commit informs the GCHP superproject about the following commits that were pushed to the GitHub geoschem/geos-chem and geoschem/HEMCO repositories: bef56c605 GEOS-Chem (science codebase) 14.4.3 release 7b4b8087e Merge "no-diff-to-benchmark" updates into main for 14.4.3 release 41605bd HEMCO 3.9.3 release 5e72223 Merge "no-diff-to-benchmark" updates into main for HEMCO 3.9.3 This PR updates the superproject to the GEOS-Chem 14.4.3 and HEMCO 3.9.3 releases in preparation for the GCClassic 14.4.3 release. Signed-off-by: Bob Yantosca --- src/GCHP_GridComp/GEOSChem_GridComp/HEMCO/HEMCO | 2 +- src/GCHP_GridComp/GEOSChem_GridComp/geos-chem | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/GCHP_GridComp/GEOSChem_GridComp/HEMCO/HEMCO b/src/GCHP_GridComp/GEOSChem_GridComp/HEMCO/HEMCO index e68ebae6e..41605bda8 160000 --- a/src/GCHP_GridComp/GEOSChem_GridComp/HEMCO/HEMCO +++ b/src/GCHP_GridComp/GEOSChem_GridComp/HEMCO/HEMCO @@ -1 +1 @@ -Subproject commit e68ebae6ed8286e09f3a18fd505873bce074edfa +Subproject commit 41605bda8a89d96f441cb8eb90f3d3c8b21f2b71 diff --git a/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem b/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem index 034507531..bef56c605 160000 --- a/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem +++ b/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem @@ -1 +1 @@ -Subproject commit 034507531334f502934e7ad74cb2519044c3f363 +Subproject commit bef56c605e018eecbd91646a51ce82c7cd77f56a