From f67d47f2596a71241b8299314c731c4e1565442b Mon Sep 17 00:00:00 2001 From: Lizzie Lundgren Date: Thu, 16 Nov 2023 16:23:06 -0500 Subject: [PATCH 1/2] Improve instructions in missing methane emissions error message Signed-off-by: Lizzie Lundgren --- GeosCore/set_global_ch4_mod.F90 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/GeosCore/set_global_ch4_mod.F90 b/GeosCore/set_global_ch4_mod.F90 index 14ca1dda3..baf2779ec 100644 --- a/GeosCore/set_global_ch4_mod.F90 +++ b/GeosCore/set_global_ch4_mod.F90 @@ -169,7 +169,9 @@ SUBROUTINE Set_CH4( Input_Opt, State_Chm, State_Diag, State_Grid, & ErrMsg = 'Cannot retrieve data for NOAA_GMD_CH4, CMIP6_Sfc_CH4, or ' // & 'SfcVMR_CH4 from HEMCO! Make sure the data source ' // & 'corresponds to your emissions year in HEMCO_Config.rc ' // & - '(NOAA GMD for 1978 and later; else CMIP6).' + '(NOAA GMD for 1978 and later; else CMIP6). To use the last year ' // & + 'available you can change the time cycle flag in HEMCO_Config.rc for ' // & + 'the inventory from RY to CY.' CALL GC_Error( ErrMsg, RC, ThisLoc ) RETURN ENDIF From d3f1b1e97de241ddfcec75006948bf0b9863dbb0 Mon Sep 17 00:00:00 2001 From: Bob Yantosca Date: Mon, 20 Nov 2023 14:37:06 -0500 Subject: [PATCH 2/2] Update CHANGELOG.md for PR #2039 CHANGELOG.md - Add note about how the error message for missing surface CH4 emissions now contains instructions on how to resolve the issue Signed-off-by: Bob Yantosca --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a8815333b..cf434252f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ### Changed - Added the `-n` aka `--no-bootstrap` option to integration tests to disable bootstrapping missing species in restart files - Use integer parameters for species units instead of strings (for computational efficiency) +- Update error message for missing surface CH4 emissions with instructions on how to resolve the problem ### Fixed - Prevent `POAEMISS` from being assigned a value if not allocated (in `carbon_mod.F90`)