From 8bdae2cac33946e8b5763faf9fd641b1d4bde255 Mon Sep 17 00:00:00 2001 From: Lizzie Lundgren Date: Tue, 12 Oct 2021 14:55:20 -0400 Subject: [PATCH 01/15] Update GCHP.rc to avoid FV3 ESMF error; re-enable printing ESMF error logs Signed-off-by: Lizzie Lundgren --- src/GCHP_GridComp/GEOSChem_GridComp/geos-chem | 2 +- src/GCHPctm.F90 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem b/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem index 1dfdd769d..2b3b2b304 160000 --- a/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem +++ b/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem @@ -1 +1 @@ -Subproject commit 1dfdd769d3e65f950228cee317fee7d64c12b355 +Subproject commit 2b3b2b304abd092231c7d33718015e7b995ad277 diff --git a/src/GCHPctm.F90 b/src/GCHPctm.F90 index b294024c3..b7442b7da 100644 --- a/src/GCHPctm.F90 +++ b/src/GCHPctm.F90 @@ -26,7 +26,7 @@ Program GCHPctm_Main cap_options = MAPL_CapOptions(cap_rc_file='CAP.rc') cap_options%logging_config = 'logging.yml' - ! cap_options%esmf_logging_mode = ESMF_LOGKIND_MULTI_ON_ERROR + cap_options%esmf_logging_mode = ESMF_LOGKIND_MULTI_ON_ERROR cap = MAPL_CAP('GCHP', ROOT_SetServices, cap_options=cap_options) call cap%run(_RC) _VERIFY(status) From 46b52fa36b3a8520400ea4e24379b77928c84834 Mon Sep 17 00:00:00 2001 From: Liam Bindle Date: Fri, 15 Oct 2021 18:20:30 +0000 Subject: [PATCH 02/15] Fixes GCHP #162. Update MAPL submodule to cherry-pick GEOS-ESM/MAPL#1088. Fixes incorrect file timestamp with freq=1hr and duration=24hr. --- src/MAPL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/MAPL b/src/MAPL index 0143f79ee..66e1c2799 160000 --- a/src/MAPL +++ b/src/MAPL @@ -1 +1 @@ -Subproject commit 0143f79ee30ace8c2afa92b292ae5b6a714f5f2e +Subproject commit 66e1c27994de63b28df6401c2d75522f040ba1a3 From 366c2c4d9b7876f1015ae99f5a4a4bc7c8b752f3 Mon Sep 17 00:00:00 2001 From: Melissa Sulprizio Date: Tue, 19 Oct 2021 12:33:51 -0400 Subject: [PATCH 03/15] Add fix for GEOS-Chem timers Signed-off-by: Melissa Sulprizio --- 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 2b3b2b304..10d8b4faf 160000 --- a/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem +++ b/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem @@ -1 +1 @@ -Subproject commit 2b3b2b304abd092231c7d33718015e7b995ad277 +Subproject commit 10d8b4faf6047243765aaaeed18328a545bde739 From 93b657456579389fd6f44c7df1dc3a89d4d4be21 Mon Sep 17 00:00:00 2001 From: Melissa Sulprizio Date: Thu, 21 Oct 2021 13:02:51 -0400 Subject: [PATCH 04/15] Add bug fix for ProdLoss diagnostic units in GEOS-Chem Signed-off-by: Melissa Sulprizio --- 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 10d8b4faf..b1f020693 160000 --- a/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem +++ b/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem @@ -1 +1 @@ -Subproject commit 10d8b4faf6047243765aaaeed18328a545bde739 +Subproject commit b1f020693b84efba303ba85ef642af65c69562c4 From 44e3853fd9ad098fbfbb3bfc2794c722ab62a5f0 Mon Sep 17 00:00:00 2001 From: Melissa Sulprizio Date: Thu, 21 Oct 2021 13:04:39 -0400 Subject: [PATCH 05/15] Add fix for file path to TOMAS data in GEOS-Chem Signed-off-by: Melissa Sulprizio --- 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 b1f020693..8af9c9896 160000 --- a/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem +++ b/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem @@ -1 +1 @@ -Subproject commit b1f020693b84efba303ba85ef642af65c69562c4 +Subproject commit 8af9c9896b6db85d42f99a0a1280651fae315ca5 From e74ddd3f414912875fa3166de6cbfa2cd43c6127 Mon Sep 17 00:00:00 2001 From: Melissa Sulprizio Date: Wed, 27 Oct 2021 12:58:24 -0400 Subject: [PATCH 06/15] Add fix for species indexing in HEMCO sea salt extension Signed-off-by: Melissa Sulprizio --- src/GCHP_GridComp/HEMCO_GridComp/HEMCO | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/GCHP_GridComp/HEMCO_GridComp/HEMCO b/src/GCHP_GridComp/HEMCO_GridComp/HEMCO index 792f28a76..42a6c1826 160000 --- a/src/GCHP_GridComp/HEMCO_GridComp/HEMCO +++ b/src/GCHP_GridComp/HEMCO_GridComp/HEMCO @@ -1 +1 @@ -Subproject commit 792f28a76a1dd21bd4210f1a033b8fa1f988e58e +Subproject commit 42a6c1826a454adc2e6d28a8754fa50fb094beb2 From b039c498813dacd2bd677e3486c5c612c427b8d1 Mon Sep 17 00:00:00 2001 From: Melissa Sulprizio Date: Wed, 27 Oct 2021 12:58:46 -0400 Subject: [PATCH 07/15] Update GCHP version to 13.3.1 in CMakeLists.txt Signed-off-by: Melissa Sulprizio --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3199470a9..fbe8dd459 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required (VERSION 3.13) project (gchp_ctm - VERSION 13.3.0 + VERSION 13.3.1 LANGUAGES Fortran CXX C ) From a2dd9cab6fe9a23d9fb1c9767212f1fd775fb6a7 Mon Sep 17 00:00:00 2001 From: Bob Yantosca Date: Wed, 27 Oct 2021 14:05:14 -0400 Subject: [PATCH 08/15] GEOS-Chem submod update: Now allow collection names containing "_" This commit informs the GCClassic superproject about the following commits that were pushed to the Github geoschem/geos-chem repository: 0da64c2e9 Add fixes to diaglist_mod.F90 to permit collection names with "_" This fixes the issue reported in geoschem/geos-chem #901. 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 8af9c9896..0da64c2e9 160000 --- a/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem +++ b/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem @@ -1 +1 @@ -Subproject commit 8af9c9896b6db85d42f99a0a1280651fae315ca5 +Subproject commit 0da64c2e9c06e2d48e128e837c839338e83b5172 From 9486b20d0242cf0dd9b47e06b50247a988fba691 Mon Sep 17 00:00:00 2001 From: Bob Yantosca Date: Thu, 28 Oct 2021 10:41:15 -0400 Subject: [PATCH 09/15] GEOS-Chem submod update: Remove Convert_Spc_Units calls in planeflight_mod This commit informs the GCHP superproject about the following commits that were pushed to the Github geoschem/geos-chem/ repository: 52eb7fb0f Remove calls to Convert_Spc_Units in planeflight_mod.F90 This resolves the issue that was raised in geoschem/geos-chem #959. 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 0da64c2e9..52eb7fb0f 160000 --- a/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem +++ b/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem @@ -1 +1 @@ -Subproject commit 0da64c2e9c06e2d48e128e837c839338e83b5172 +Subproject commit 52eb7fb0faa927ee324ac27b4e42eaff0f5e918a From 61269bf51658e611ac9823cd2d01cb875362158b Mon Sep 17 00:00:00 2001 From: Bob Yantosca Date: Tue, 2 Nov 2021 15:45:40 -0400 Subject: [PATCH 10/15] GEOS-Chem submod update: Remove GCHP logs; Graceful exit from KPP This commit informs the GCHP superproject about the following commits that were pushed to the Github geoschem/geos-chem repository: 4585ef766 Merge branch 'bugfix/remove_GCHP_logs' into patch/13.3.1 901ecbd26 Update run/shared/cleanRunDir.sh to remove additional GCHP logs 556ca290d Bug fix: restore #ifndef NO_OMP in fullchem_mod.F90 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 52eb7fb0f..4585ef766 160000 --- a/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem +++ b/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem @@ -1 +1 @@ -Subproject commit 52eb7fb0faa927ee324ac27b4e42eaff0f5e918a +Subproject commit 4585ef766ea756a675bdab22de5af12870614343 From b8dc027e8fe6aa9f4636bcc042ed140393a92acf Mon Sep 17 00:00:00 2001 From: Bob Yantosca Date: Fri, 5 Nov 2021 11:11:21 -0400 Subject: [PATCH 11/15] GEOS-Chem submod update: Remove second "_" from State_Chm Hg fields This commit informs the GCHP superproject about the following commits that were pushed to the Github geoschem/geos-chem repository: 51fa20914 Bug fix: Remove second underscore from state_chm Hg fields This fixes the issue reported in geoschem/geos-chem #957 Signed-off-by: Bob Yantosca GEOS-Chem submod update: Remove second "_" from State_Chm Hg fields This commit informs the GCHP superproject about the following commits that were pushed to the Github geoschem/geos-chem repository: 51fa20914 Bug fix: Remove second underscore from state_chm Hg fields This fixes the issue reported in geoschem/geos-chem #957 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 4585ef766..51fa20914 160000 --- a/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem +++ b/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem @@ -1 +1 @@ -Subproject commit 4585ef766ea756a675bdab22de5af12870614343 +Subproject commit 51fa209141a075c0b39c2ef0622137e9ae11e886 From 886486c3d7d43ec440f037914461eaf8a8950f9d Mon Sep 17 00:00:00 2001 From: Liam Bindle Date: Fri, 12 Nov 2021 10:43:07 -0600 Subject: [PATCH 12/15] Update report-a-bug-or-technical-issue.md --- .github/ISSUE_TEMPLATE/report-a-bug-or-technical-issue.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/ISSUE_TEMPLATE/report-a-bug-or-technical-issue.md b/.github/ISSUE_TEMPLATE/report-a-bug-or-technical-issue.md index a466848d7..9022b1888 100644 --- a/.github/ISSUE_TEMPLATE/report-a-bug-or-technical-issue.md +++ b/.github/ISSUE_TEMPLATE/report-a-bug-or-technical-issue.md @@ -7,6 +7,9 @@ assignees: '' --- +### What institution are you from? +Please tell us what institution you are from. + ### Description of the problem Describe your problem problem here. From ebcbabbb8d1d800c589a967d363be1546b816800 Mon Sep 17 00:00:00 2001 From: Bob Yantosca Date: Fri, 12 Nov 2021 15:43:32 -0500 Subject: [PATCH 13/15] GEOS-Chem submod update: Use standard timesteps for 0.5 x 0.625 simulations This commit informs the GCHP superproject about the following commits that were pushed to the Github geoschem/geos-chem repository: b443a36ce Only 0.25x0.3125 degree nested-grid runs will use reduced timesteps 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 51fa20914..b443a36ce 160000 --- a/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem +++ b/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem @@ -1 +1 @@ -Subproject commit 51fa209141a075c0b39c2ef0622137e9ae11e886 +Subproject commit b443a36ceae26b07c78cbe4c7150f2e6cd660cdf From d05d241c067f2e76781a7023213ec129b1852a27 Mon Sep 17 00:00:00 2001 From: Bob Yantosca Date: Fri, 12 Nov 2021 15:50:47 -0500 Subject: [PATCH 14/15] GEOS-Chem submod update: Updated issue template for geoschem/geos-chem This commit informs the GCHP superproject about the following commits that were pushed to the Github geoschem/geos-chem repository: e80f9956a Merge branch 'feature/updated-issue-template' into patch/13.3.1 The new issue template now asks users to provide which institute they are from when submitting a Github issue to geoschem/geos-chem. Signed-off-by: Bob Yantosca e80f9956a (HEAD -> patch/13.3.1, origin/patch/13.3.1) Merge branch 'feature/updated-issue-template' into patch/13.3.1 --- 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 b443a36ce..e80f9956a 160000 --- a/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem +++ b/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem @@ -1 +1 @@ -Subproject commit b443a36ceae26b07c78cbe4c7150f2e6cd660cdf +Subproject commit e80f9956afa17728842330d2ce7e9bd32c172eda From 5ca554a76e82524f9b01166cab2935f8ffe4d128 Mon Sep 17 00:00:00 2001 From: Bob Yantosca Date: Fri, 12 Nov 2021 17:38:02 -0500 Subject: [PATCH 15/15] GEOS-Chem submod update: 0.5x0.625 CH4 simulations use 300s/600s timesteps This commit informs the GCHP superproject about the following GEOS-Chem submod update: 0.5x0.625 CH4 simulations use 300s/600s timesteps This commit informs the GCClassic superproject about the following commits that were pushed to the Github geoschem/geos-chem repository: abca1a549 Bug fix: 0.5 x 0.625 nested CH4 simulations will use 300/600 sec timesteps This fixes an issue that was discovered during GC Classic integration tests, where an error trap was triggered due to the 300s/600s timesteps for CH4 nested-grid simulations. 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 e80f9956a..abca1a549 160000 --- a/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem +++ b/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem @@ -1 +1 @@ -Subproject commit e80f9956afa17728842330d2ce7e9bd32c172eda +Subproject commit abca1a549cadf2b3c21ba1e02d902b5e58df261c