Merge PR #2042 (Fix HEMCO_Config.rc for CH4 and carbon simulations)

This merge brings PR #2042 (Add fixes to HEMCO_Config.rc for CH4 and carbon simulations, by @msulprizio) to the "no-diff-to-benchmark" development stream. This PR does the following: - Removes METDIR from HEMCO_Config.rc, so that we rely only on the METDIR in HEMCO_Config.rc.{gmao,gcap2}.metfields files. - Moves the OH_pert_factor scale factor out of the (((EMISSIONS block - Removes the use of .and. in HEMCO_Config.rc files (it isn't supported) Signed-off-by: Bob Yantosca <[email protected]>
geoschem · Nov 20, 2023 · 78c1b7d · 78c1b7d
2 parents 54e8cda + d5889ae
commit 78c1b7d
Show file tree

Hide file tree

Showing 18 changed files with 357 additions and 257 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,21 +4,26 @@ This file documents all notable changes to the GEOS-Chem repository starting in
 
 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]
+## [Unreleased] - TBD
 ### 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
+- Change GCHP grid resolution threshold for lowering timesteps from C180 inclusive to C180 exclusive
 
 ### Fixed
 - Prevent `POAEMISS` from being assigned a value if not allocated (in `carbon_mod.F90`)
 - Changed incorrect comment about static H2O option in `GeosCore/input_mod.F90`
 - Fixed typos (`GCClassic` -> `GCHP`) written to GCHP integration test log files
+- Add fix to properly read GHGI v2 express extension emissions in CH4 and carbon simulations
+- Move OH perturbation scale factor to outside EMISSIONS logical bracket in HEMCO_Config.rc files for CH4 and carbon simulations
+
+### Removed
+- Remove definition of METDIR from primary HEMCO_Config.rc files to ensure use of the definition in the HEMCO_Config.rc.*_metfields files
 
 ## [14.2.2] - 2023-10-23
 ### Changed
 - Updated sample restart files for fullchem and TransportTracers simulations to files saved out from the 14.2.0 1-year benchmarks
-- Change GCHP grid resolution threshold for lowering timesteps from C180 inclusive to C180 exclusive
 
 ## [14.2.1] - 2023-10-10
 ### Added

diff --git a/run/GCClassic/HEMCO_Config.rc.templates/HEMCO_Config.rc.CH4 b/run/GCClassic/HEMCO_Config.rc.templates/HEMCO_Config.rc.CH4
@@ -27,7 +27,6 @@
 ###############################################################################
 
 ROOT:                        ${RUNDIR_DATA_ROOT}/HEMCO
-METDIR:                      ${RUNDIR_MET_DIR}
 GCAPSCENARIO:                ${RUNDIR_GCAP2_SCENARIO}
 GCAPVERTRES:                 ${RUNDIR_GCAP2_VERTRES}
 Logfile:                     *
@@ -207,7 +206,8 @@ VerboseOnCores:              root       # Accepted values: root all
 #   dataset to quickly incorporate more recent national methane emission estimates.
 # - Emissions for years after 2018 follow the 2018 spatial patterns.
 #=======================================================================================
-(((GHGI_v2_Express_Ext.and..not.GHGI_v2
+(((GHGI_v2_Express_Ext
+(((.not.GHGI_v2
 ### Oil ###
 0 GHGI_EE_OIL_EXPLORATION  $ROOT/CH4/v2023-07/Gridded_GHGI_v2/Express_Extension_Gridded_GHGI_Methane_v2_$YYYY.nc  emi_ch4_1B2a_Petroleum_Systems_Exploration   2012-2020/1-12/1/0 C xy molec/cm2/s CH4 51/1008 1 100
 0 GHGI_EE_OIL_PRODUCTION   $ROOT/CH4/v2023-07/Gridded_GHGI_v2/Express_Extension_Gridded_GHGI_Methane_v2_$YYYY.nc  emi_ch4_1B2a_Petroleum_Systems_Production    2012-2020/1-12/1/0 C xy molec/cm2/s CH4 52/1008 1 100
@@ -277,7 +277,8 @@ VerboseOnCores:              root       # Accepted values: root all
 0 GHGI_EE_COAST_OTHER__FIND      $ROOT/CH4/v2023-07/Gridded_GHGI_v2/Express_Extension_Gridded_GHGI_Methane_v2_$YYYY.nc  emi_ch4_2C2_Industry_Ferroalloy              2012-2020/1/1/0    C xy molec/cm2/s CH4 1009    8 1
 0 GHGI_EE_COAST_OTHER__BURN      $ROOT/CH4/v2023-07/Gridded_GHGI_v2/Express_Extension_Gridded_GHGI_Methane_v2_$YYYY.nc  emi_ch4_3F_Field_Burning                     2012-2020/1-12/1/0 C xy molec/cm2/s CH4 59/1009 8 1
 0 GHGI_EE_COAST_OTHER__ABOG      $ROOT/CH4/v2023-07/Gridded_GHGI_v2/Express_Extension_Gridded_GHGI_Methane_v2_$YYYY.nc  emi_ch4_1B2ab_Abandoned_Oil_Gas              2012-2020/1/1/0    C xy molec/cm2/s CH4 1009    8 1
-)))GHGI_v2_Express_Ext.and..not.GHGI_v2
+))).not.GHGI_v2
+)))GHGI_v2_Express_Ext
 
 #==============================================================================
 # --- Mexico emissions (Scarpelli et. al, Environ. Res. Lett., 2020) ---
@@ -349,7 +350,8 @@ VerboseOnCores:              root       # Accepted values: root all
 #==============================================================================
 # --- EDGAR v6.0 emissions ---
 #==============================================================================
-(((EDGARv6.and..not.EDGARv7
+(((EDGARv6
+(((.not.EDGARv7
 ### Oil ###
 0 EDGAR6_CH4_OIL__1B2a          $ROOT/CH4/v2022-11/EDGARv6/$YYYY/v6.0_CH4_$YYYY_PRO_OIL.0.1x0.1.nc          emi_ch4 2000-2018/1-12/1/0 C xy kg/m2/s CH4 - 1 1
 0 EDGAR6_CH4_OTHER__1A1_1B1_1B2 $ROOT/CH4/v2022-11/EDGARv6/$YYYY/v6.0_CH4_$YYYY_REF_TRF.0.1x0.1.nc          emi_ch4 2000-2018/1-12/1/0 C xy kg/m2/s CH4 - 1 1
@@ -387,7 +389,8 @@ VerboseOnCores:              root       # Accepted values: root all
 0 EDGAR6_CH4_OTHER__2C          $ROOT/CH4/v2022-11/EDGARv6/$YYYY/v6.0_CH4_$YYYY_IRO.0.1x0.1.nc              emi_ch4 2000-2018/1-12/1/0 C xy kg/m2/s CH4 - 8 1
 0 EDGAR6_CH4_OTHER__4F          $ROOT/CH4/v2022-11/EDGARv6/$YYYY/v6.0_CH4_$YYYY_AWB.0.1x0.1.nc              emi_ch4 2000-2018/1-12/1/0 C xy kg/m2/s CH4 - 8 1
 0 EDGAR6_CH4_OTHER__6C          $ROOT/CH4/v2022-11/EDGARv6/$YYYY/v6.0_CH4_$YYYY_SWD_INC.0.1x0.1.nc          emi_ch4 2000-2018/1-12/1/0 C xy kg/m2/s CH4 - 8 1
-)))EDGARv6.and..not.EDGARv7
+))).not.EDGARv7
+)))EDGARv6
 
 #==============================================================================
 # --- EDGAR v7.0 emissions ---
@@ -875,8 +878,6 @@ ${RUNDIR_GLOBAL_Cl}
 
 # ScalID Name sourceFile sourceVar sourceTime C/R/E SrcDim SrcUnit Oper
 
-(((EMISSIONS
-
 #==============================================================================
 # --- Soil absorption scale factors ---
 #
@@ -892,6 +893,8 @@ ${RUNDIR_GLOBAL_Cl}
 #==============================================================================
 2 OH_pert_factor  1.0 - - - xy 1 1
 
+(((EMISSIONS
+
 #==============================================================================
 # --- Seasonal scaling factors ----
 #==============================================================================

diff --git a/run/GCClassic/HEMCO_Config.rc.templates/HEMCO_Config.rc.CO2 b/run/GCClassic/HEMCO_Config.rc.templates/HEMCO_Config.rc.CO2
@@ -27,7 +27,6 @@
 ###############################################################################
 
 ROOT:                        ${RUNDIR_DATA_ROOT}/HEMCO
-METDIR:                      ${RUNDIR_MET_DIR}
 GCAPSCENARIO:                ${RUNDIR_GCAP2_SCENARIO}
 GCAPVERTRES:                 ${RUNDIR_GCAP2_VERTRES}
 Logfile:                     *

diff --git a/run/GCClassic/HEMCO_Config.rc.templates/HEMCO_Config.rc.Hg b/run/GCClassic/HEMCO_Config.rc.templates/HEMCO_Config.rc.Hg
@@ -27,7 +27,6 @@
 ###############################################################################
 
 ROOT:                        ${RUNDIR_DATA_ROOT}/HEMCO
-METDIR:                      ${RUNDIR_MET_DIR}
 GCAPSCENARIO:                ${RUNDIR_GCAP2_SCENARIO}
 GCAPVERTRES:                 ${RUNDIR_GCAP2_VERTRES}
 Logfile:                     *

diff --git a/run/GCClassic/HEMCO_Config.rc.templates/HEMCO_Config.rc.POPs b/run/GCClassic/HEMCO_Config.rc.templates/HEMCO_Config.rc.POPs
@@ -27,7 +27,6 @@
 ###############################################################################
 
 ROOT:                        ${RUNDIR_DATA_ROOT}/HEMCO
-METDIR:                      ${RUNDIR_MET_DIR}
 GCAPSCENARIO:                ${RUNDIR_GCAP2_SCENARIO}
 GCAPVERTRES:                 ${RUNDIR_GCAP2_VERTRES}
 Logfile:                     *

diff --git a/run/GCClassic/HEMCO_Config.rc.templates/HEMCO_Config.rc.TransportTracers b/run/GCClassic/HEMCO_Config.rc.templates/HEMCO_Config.rc.TransportTracers
@@ -27,7 +27,6 @@
 ###############################################################################
 
 ROOT:                        ${RUNDIR_DATA_ROOT}/HEMCO
-METDIR:                      ${RUNDIR_MET_DIR}
 GCAPSCENARIO:                ${RUNDIR_GCAP2_SCENARIO}
 GCAPVERTRES:                 ${RUNDIR_GCAP2_VERTRES}
 Logfile:                     *

diff --git a/run/GCClassic/HEMCO_Config.rc.templates/HEMCO_Config.rc.aerosol b/run/GCClassic/HEMCO_Config.rc.templates/HEMCO_Config.rc.aerosol
@@ -27,7 +27,6 @@
 ###############################################################################
 
 ROOT:                        ${RUNDIR_DATA_ROOT}/HEMCO
-METDIR:                      ${RUNDIR_MET_DIR}
 GCAPSCENARIO:                ${RUNDIR_GCAP2_SCENARIO}
 GCAPVERTRES:                 ${RUNDIR_GCAP2_VERTRES}
 Logfile:                     *
@@ -1173,9 +1172,11 @@ VerboseOnCores:              root       # Accepted values: root all
 >>>include $ROOT/CEDS/v2020-08/HEMCO_Config.CEDS_GBDMAPS.rc
 )))CEDS_GBDMAPS
 (((CEDS_GBDMAPS_byFuelType
-(((.not.CEDS_GBDMAPS.and..not.CEDSv2
+(((.not.CEDS_GBDMAPS
+(((.not.CEDSv2
 >>>include $ROOT/CEDS/v2020-08/HEMCO_Config.CEDS_GBDMAPS_byFuelType.rc
-))).not.CEDS_GBDMAPS.and..not.CEDSv2
+))).not.CEDSv2
+))).not.CEDS_GBDMAPS
 )))CEDS_GBDMAPS_byFuelType
 
 #==============================================================================
@@ -1538,9 +1539,11 @@ VerboseOnCores:              root       # Accepted values: root all
 )))CEDS_GBDMAPS_SHIP
 
 (((CEDS_SHIP_byFuelType
-(((.not.CEDS_GBDMAPS_SHIP.and..not.CEDSv2_SHIP
+(((.not.CEDS_GBDMAPS_SHIP
+(((.not.CEDSv2_SHIP
 >>>include $ROOT/CEDS/v2020-08/HEMCO_Config.CEDS_GBDMAPS_SHIP_byFuelType.rc
-))).not.CEDS_GBDMAPS_SHIP.and..not.CEDSv2_SHIP
+))).not.CEDSv2_SHIP
+))).not.CEDS_GBDMAPS_SHIP
 )))CEDS_SHIP_byFuelType
 
 #==============================================================================

diff --git a/run/GCClassic/HEMCO_Config.rc.templates/HEMCO_Config.rc.carbon b/run/GCClassic/HEMCO_Config.rc.templates/HEMCO_Config.rc.carbon
@@ -27,7 +27,6 @@
 ###############################################################################
 
 ROOT:                        ${RUNDIR_DATA_ROOT}/HEMCO
-METDIR:                      ${RUNDIR_MET_DIR}
 GCAPSCENARIO:                ${RUNDIR_GCAP2_SCENARIO}
 GCAPVERTRES:                 ${RUNDIR_GCAP2_VERTRES}
 Logfile:                     *
@@ -249,7 +248,8 @@ Mask fractions:              false
 #   dataset to quickly incorporate more recent national methane emission estimates.
 # - Emissions for years after 2018 follow the 2018 spatial patterns.
 #=======================================================================================
-(((GHGI_v2_Express_Ext.and..not.GHGI_v2
+(((GHGI_v2_Express_Ext
+(((.not.GHGI_v2
 ### Oil ###
 0 GHGI_EE_OIL_EXPLORATION  $ROOT/CH4/v2023-07/Gridded_GHGI_v2/Express_Extension_Gridded_GHGI_Methane_v2_$YYYY.nc  emi_ch4_1B2a_Petroleum_Systems_Exploration   2012-2020/1-12/1/0 C xy molec/cm2/s CH4 51/1008 1 100
 0 GHGI_EE_OIL_PRODUCTION   $ROOT/CH4/v2023-07/Gridded_GHGI_v2/Express_Extension_Gridded_GHGI_Methane_v2_$YYYY.nc  emi_ch4_1B2a_Petroleum_Systems_Production    2012-2020/1-12/1/0 C xy molec/cm2/s CH4 52/1008 1 100
@@ -319,7 +319,8 @@ Mask fractions:              false
 0 GHGI_EE_COAST_OTHER__FIND      $ROOT/CH4/v2023-07/Gridded_GHGI_v2/Express_Extension_Gridded_GHGI_Methane_v2_$YYYY.nc  emi_ch4_2C2_Industry_Ferroalloy              2012-2020/1/1/0    C xy molec/cm2/s CH4 1009    8 1
 0 GHGI_EE_COAST_OTHER__BURN      $ROOT/CH4/v2023-07/Gridded_GHGI_v2/Express_Extension_Gridded_GHGI_Methane_v2_$YYYY.nc  emi_ch4_3F_Field_Burning                     2012-2020/1-12/1/0 C xy molec/cm2/s CH4 59/1009 8 1
 0 GHGI_EE_COAST_OTHER__ABOG      $ROOT/CH4/v2023-07/Gridded_GHGI_v2/Express_Extension_Gridded_GHGI_Methane_v2_$YYYY.nc  emi_ch4_1B2ab_Abandoned_Oil_Gas              2012-2020/1/1/0    C xy molec/cm2/s CH4 1009    8 1
-)))GHGI_v2_Express_Ext.and..not.GHGI_v2
+))).not.GHGI_v2
+)))GHGI_v2_Express_Ext
 
 #==============================================================================
 # --- CH4: Mexico emissions (Scarpelli et. al, Environ. Res. Lett., 2020) ---
@@ -391,7 +392,8 @@ Mask fractions:              false
 #==============================================================================
 # --- CH4: EDGAR v6.0 emissions ---
 #==============================================================================
-(((EDGARv6.and..not.EDGARv7
+(((EDGARv6
+(((.not.EDGARv7
 0 EDGAR6_CH4_OIL__1B2a          $ROOT/CH4/v2022-11/EDGARv6/$YYYY/v6.0_CH4_$YYYY_PRO_OIL.0.1x0.1.nc          emi_ch4 2000-2018/1-12/1/0 C xy kg/m2/s CH4 - 1 1
 0 EDGAR6_CH4_OTHER__1A1_1B1_1B2 $ROOT/CH4/v2022-11/EDGARv6/$YYYY/v6.0_CH4_$YYYY_REF_TRF.0.1x0.1.nc          emi_ch4 2000-2018/1-12/1/0 C xy kg/m2/s CH4 - 1 1
 0 EDGAR6_CH4_OIL__1B2c          $ROOT/CH4/v2022-11/EDGARv6/$YYYY/v6.0_CH4_$YYYY_PRO_GAS.0.1x0.1.nc          emi_ch4 2000-2018/1-12/1/0 C xy kg/m2/s CH4 - 2 1
@@ -414,7 +416,8 @@ Mask fractions:              false
 0 EDGAR6_CH4_OTHER__2C          $ROOT/CH4/v2022-11/EDGARv6/$YYYY/v6.0_CH4_$YYYY_IRO.0.1x0.1.nc              emi_ch4 2000-2018/1-12/1/0 C xy kg/m2/s CH4 - 8 1
 0 EDGAR6_CH4_OTHER__4F          $ROOT/CH4/v2022-11/EDGARv6/$YYYY/v6.0_CH4_$YYYY_AWB.0.1x0.1.nc              emi_ch4 2000-2018/1-12/1/0 C xy kg/m2/s CH4 - 8 1
 0 EDGAR6_CH4_OTHER__6C          $ROOT/CH4/v2022-11/EDGARv6/$YYYY/v6.0_CH4_$YYYY_SWD_INC.0.1x0.1.nc          emi_ch4 2000-2018/1-12/1/0 C xy kg/m2/s CH4 - 8 1
-)))EDGARv6.and..not.EDGARv7
+))).not.EDGARv7
+)))EDGARv6
 
 #==============================================================================
 # --- EDGAR v7.0 emissions ---
@@ -702,10 +705,13 @@ Mask fractions:              false
 (((CEDS_GBDMAPS
 >>>include $ROOT/CEDS/v2020-08/HEMCO_Config.CEDS_GBD-MAPS.rc
 )))CEDS_GBDMAPS
+
 (((CEDS_GBDMAPS_byFuelType
-(((.not.CEDS_GBDMAPS.and..not.CEDSv2
+(((.not.CEDS_GBDMAPS
+(((.not.CEDSv2
 >>>include $ROOT/CEDS/v2020-08/HEMCO_Config.CEDS_GBD-MAPS_byFuelType.rc
-))).not.CEDS_GBDMAPS.and..not.CEDSv2
+))).not.CEDSv2
+))).not.CEDS_GBDMAPS
 )))CEDS_GBDMAPS_byFuelType
 
 #==============================================================================
@@ -1300,9 +1306,11 @@ Mask fractions:              false
 )))GLOBAL_OH_GCv5
 
 # --- OH from the last 10-yr benchmark [mol/mol dry air] ---
-(((GLOBAL_OH_GC14.and..not.GLOBAL_OH_GCv5
+(((GLOBAL_OH_GC14
+(((.not.GLOBAL_OH_GCv5
 ${RUNDIR_GLOBAL_OH}
-)))GLOBAL_OH_GC14.and..not.GLOBAL_OH_GCv5
+))).not.GLOBAL_OH_GCv5
+)))GLOBAL_OH_GC14
 
 #------------------------------------------------------------------------------
 # --- Quantities needed for CH4 chemistry ---
@@ -1369,8 +1377,6 @@ ${RUNDIR_CO2_COPROD}
 
 # ScalID Name sourceFile sourceVar sourceTime C/R/E SrcDim SrcUnit Oper
 
-(((EMISSIONS
-
 #==============================================================================
 # --- Multiply by -1 to get a "negative" flux.
 #==============================================================================
@@ -1384,6 +1390,8 @@ ${RUNDIR_CO2_COPROD}
 #==============================================================================
 2 OH_pert_factor  1.0 - - - xy 1 1
 
+(((EMISSIONS
+
 #==============================================================================
 # --- Seasonal scaling factors ----
 #==============================================================================

diff --git a/run/GCClassic/HEMCO_Config.rc.templates/HEMCO_Config.rc.fullchem b/run/GCClassic/HEMCO_Config.rc.templates/HEMCO_Config.rc.fullchem
@@ -26,7 +26,6 @@
 ###############################################################################
 
 ROOT:                        ${RUNDIR_DATA_ROOT}/HEMCO
-METDIR:                      ${RUNDIR_MET_DIR}
 GCAPSCENARIO:                ${RUNDIR_GCAP2_SCENARIO}
 GCAPVERTRES:                 ${RUNDIR_GCAP2_VERTRES}
 Logfile:                     *
@@ -1634,10 +1633,13 @@ VerboseOnCores:              root       # Accepted values: root all
 (((CEDS_GBDMAPS
 >>>include $ROOT/CEDS/v2020-08/HEMCO_Config.CEDS_GBDMAPS.rc
 )))CEDS_GBDMAPS
+
 (((CEDS_GBDMAPS_byFuelType
-(((.not.CEDS_GBDMAPS.and..not.CEDSv2
+(((.not.CEDS_GBDMAPS
+(((.not.CEDSv2
 >>>include $ROOT/CEDS/v2020-08/HEMCO_Config.CEDS_GBDMAPS_byFuelType.rc
-))).not.CEDS_GBDMAPS.and..not.CEDSv2
+))).not.CEDSv2
+))).not.CEDS_GBDMAPS
 )))CEDS_GBDMAPS_byFuelType
 
 #==============================================================================
@@ -2650,9 +2652,11 @@ VerboseOnCores:              root       # Accepted values: root all
 )))CEDS_GBDMAPS_SHIP
 
 (((CEDS_SHIP_byFuelType
-(((.not.CEDS_GBDMAPS_SHIP.and..not.CEDSv2_SHIP
+(((.not.CEDS_GBDMAPS_SHIP
+(((.not.CEDSv2_SHIP
 >>>include $ROOT/CEDS/v2020-08/HEMCO_Config.CEDS_GBD-MAPS_SHIP_byFuelType.rc
-))).not.CEDS_GBDMAPS_SHIP.and..not.CEDSv2_SHIP
+))).not.CEDSv2_SHIP
+))).not.CEDS_GBDMAPS_SHIP
 )))CEDS_SHIP_byFuelType
 
 #==============================================================================

diff --git a/run/GCClassic/HEMCO_Config.rc.templates/HEMCO_Config.rc.metals b/run/GCClassic/HEMCO_Config.rc.templates/HEMCO_Config.rc.metals
@@ -27,7 +27,6 @@
 ###############################################################################
 
 ROOT:                        ${RUNDIR_DATA_ROOT}/HEMCO
-METDIR:                      ${RUNDIR_MET_DIR}
 GCAPSCENARIO:                ${RUNDIR_GCAP2_SCENARIO}
 GCAPVERTRES:                 ${RUNDIR_GCAP2_VERTRES}
 Logfile:                     *