Rebased PR #2171 (CEDS 0.1 degree) atop of PR #2352

This rebase merge brings PR #2171 (CEDS 0.1 x 0.1 emissions) atop PR #2352 (ALK4 & R4N2 chemistry updates) Signed-off-by: Bob Yantosca <[email protected]>
geoschem · Aug 12, 2024 · 34f8f67 · 34f8f67
1 parent 012639a
commit 34f8f67
Show file tree

Hide file tree

Showing 12 changed files with 1,098 additions and 2,305 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,10 +15,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ### Changed
 - Copy values from `State_Chm%KPP_AbsTol` to `ATOL` and `State_Chm%KPP_RelTol` to `RTOL` for fullchem and Hg simulations
 - Change previously zero Ca2, K, and Mg cation values passed to HETP to scaled SALA species concentrations
+- CEDS 0.1 x 0.1 degree emissions are now the default instead of CEDSv2
 
 ### Fixed
 - Simplified SOA representations and fixed related AOD and TotalOA/OC calculations in benchmark.
 
+### Removed
+- `CEDSv2`, `CEDS_GBDMAPS`, `CEDS_GBDMAPSbyFuelType` emissions entries from HEMCO and ExtData template files
+
 ## [14.4.2] - 2024-07-24
 ### Added
 - Added number of levels with clouds for photolysis to geoschem_config.yml and Input_Opt to pass to Cloud-J
@@ -95,7 +99,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Switch from fixed to monthly timezones, which account for daylight savings time more accurately when computing emissions
 - Updated NOAA GMD surface CH4 boundary conditions through 2022
 - Rename `NITs_Jscale_JHNO3` to `NITs_Jscale` and `NIT_Jscale_JHNO2` to `NIT_Jscale` in `geoschem_config.yml` templates
-<<<<<<< HEAD
 - Updated volcano emissions from GMAO v202005 product to v202401 which extends to the end of 2024
 - Use local scale height and level thickness to determine the PBL to determine the PBL top level and PBL pressure thickness
 - Update drydep mean diameters of aerosols to account for size distribution
@@ -109,9 +112,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Use new mask files at 0.1 x 0.1 degree resoluiton for CH4/tagCH4/carbon simulations to avoid I/O bottlenecks
 - Update config files for CH4/carbon simulations to avoid reading the same variable multiple times
 - Converted Github issue templates to issue forms using YAML definition files
-=======
-- CEDS 0.1 x 0.1 degree emissions are now the default instead of CEDSv2
->>>>>>> f8c9e3535 (Edit HEMCO_Config.rc.fullchem for CEDS 0.1 degree emisisons)
 
 ### Fixed
 - Corrected the formula for 1st order heterogeneous chemical loss on stratospheric aerosol for NO2, NO3, and VOC.
@@ -187,7 +187,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ### Removed
 - Removed MPI broadcasts in CESM-only photolysis code; will read on all cores
-- Removed State_Chm%CH4_EMIS
+- Removed `State_Chm%CH4_EMIS`
 
 ## [14.3.0] - 2024-02-07
 ### Added

diff --git a/run/GCClassic/HEMCO_Config.rc.templates/HEMCO_Config.rc.TransportTracers b/run/GCClassic/HEMCO_Config.rc.templates/HEMCO_Config.rc.TransportTracers
@@ -57,7 +57,6 @@ VerboseOnCores:              root       # Accepted values: root all
     --> EDGARv42_SF6           :       true     # 1970-2008
     --> OCEAN_CH3I             :       true
     --> CEDS_01x01             :       true     # 1980-2019
-    --> CEDSv2                 :       false    # 1750-2019
     --> EDGARv43               :       false    # 1970-2010
     --> HTAP                   :       false    # 2008-2010
     --> UNIFORM_CO             :       true
@@ -100,42 +99,23 @@ VerboseOnCores:              root       # Accepted values: root all
 #
 # Choose CEDS, EDGAR, or HTAP
 #==============================================================================
-(((CEDSv2
-0 CEDS_CO_25_AGR     $ROOT/CEDS/v2021-06/$YYYY/CO-em-anthro_CMIP_CEDS_$YYYY.nc  CO_agr  1750-2019/1-12/1/0 C xy kg/m2/s CO_25 26 1 5
-0 CEDS_CO_50_AGR     -                                                          -       -                  - -  -       CO_50 26 1 5
-0 CEDS_CO_25_ENE     $ROOT/CEDS/v2021-06/$YYYY/CO-em-anthro_CMIP_CEDS_$YYYY.nc  CO_ene  1750-2019/1-12/1/0 C xy kg/m2/s CO_25 26 1 5
-0 CEDS_CO_50_ENE     -                                                          -       -                  - -  -       CO_50 26 1 5
-0 CEDS_CO_25_IND     $ROOT/CEDS/v2021-06/$YYYY/CO-em-anthro_CMIP_CEDS_$YYYY.nc  CO_ind  1750-2019/1-12/1/0 C xy kg/m2/s CO_25 26 1 5
-0 CEDS_CO_50_IND     -                                                          -       -                  - -  -       CO_50 26 1 5
-0 CEDS_CO_25_TRA     $ROOT/CEDS/v2021-06/$YYYY/CO-em-anthro_CMIP_CEDS_$YYYY.nc  CO_tra  1750-2019/1-12/1/0 C xy kg/m2/s CO_25 26 1 5
-0 CEDS_CO_50_TRA     -                                                          -       -                  - -  -       CO_50 26 1 5
-0 CEDS_CO_25_RCO     $ROOT/CEDS/v2021-06/$YYYY/CO-em-anthro_CMIP_CEDS_$YYYY.nc  CO_rco  1750-2019/1-12/1/0 C xy kg/m2/s CO_25 26 1 5
-0 CEDS_CO_50_RCO     -                                                          -       -                  - -  -       CO_50 26 1 5
-0 CEDS_CO_25_SLV     $ROOT/CEDS/v2021-06/$YYYY/CO-em-anthro_CMIP_CEDS_$YYYY.nc  CO_slv  1750-2019/1-12/1/0 C xy kg/m2/s CO_25 26 1 5
-0 CEDS_CO_50_SLV     -                                                          -       -                  - -  -       CO_50 26 1 5
-0 CEDS_CO_25_WST     $ROOT/CEDS/v2021-06/$YYYY/CO-em-anthro_CMIP_CEDS_$YYYY.nc  CO_wst  1750-2019/1-12/1/0 C xy kg/m2/s CO_25 26 1 5
-0 CEDS_CO_50_WST     -                                                          -       -                  - -  -       CO_50 26 1 5
-0 CEDS_CO_25_SHP     $ROOT/CEDS/v2021-06/$YYYY/CO-em-anthro_CMIP_CEDS_$YYYY.nc  CO_shp  1750-2019/1-12/1/0 C xy kg/m2/s CO_25 26 1 5
-0 CEDS_CO_50_SHP     -                                                          -       -                  - -  -       CO_50 26 1 5
-)))CEDSv2
-
 (((CEDS_01x01
-0 CEDS01_CO_25_AGR   $ROOT/CEDS/v2023-04/$YYYY/CEDS_CO_0.1x0.1_$YYYY.nc  CO_agr  1980-2019/1-12/1/0 C xy kg/m2/s CO_25 26 1 5
-0 CEDS01_CO_50_AGR   -                                                   -       -                  - -  -       CO_50 26 1 5
-0 CEDS01_CO_25_ENE   $ROOT/CEDS/v2023-04/$YYYY/CEDS_CO_0.1x0.1_$YYYY.nc  CO_ene  1980-2019/1-12/1/0 C xy kg/m2/s CO_25 26 1 5
-0 CEDS01_CO_50_ENE   -                                                   -       -                  - -  -       CO_50 26 1 5
-0 CEDS01_CO_25_IND   $ROOT/CEDS/v2023-04/$YYYY/CEDS_CO_0.1x0.1_$YYYY.nc  CO_ind  1980-2019/1-12/1/0 C xy kg/m2/s CO_25 26 1 5
-0 CEDS01_CO_50_IND   -                                                   -       -                  - -  -       CO_50 26 1 5
-0 CEDS01_CO_25_TRA   $ROOT/CEDS/v2023-04/$YYYY/CEDS_CO_0.1x0.1_$YYYY.nc  CO_tra  1980-2019/1-12/1/0 C xy kg/m2/s CO_25 26 1 5
-0 CEDS01_CO_50_TRA   -                                                   -       -                  - -  -       CO_50 26 1 5
-0 CEDS01_CO_25_RCO   $ROOT/CEDS/v2023-04/$YYYY/CEDS_CO_0.1x0.1_$YYYY.nc  CO_rco  1980-2019/1-12/1/0 C xy kg/m2/s CO_25 26 1 5
-0 CEDS01_CO_50_RCO   -                                                   -       -                  - -  -       CO_50 26 1 5
-0 CEDS01_CO_25_SLV   $ROOT/CEDS/v2023-04/$YYYY/CEDS_CO_0.1x0.1_$YYYY.nc  CO_slv  1980-2019/1-12/1/0 C xy kg/m2/s CO_25 26 1 5
-0 CEDS01_CO_50_SLV   -                                                   -       -                  - -  -       CO_50 26 1 5
-0 CEDS01_CO_25_WST   $ROOT/CEDS/v2023-04/$YYYY/CEDS_CO_0.1x0.1_$YYYY.nc  CO_wst  1980-2019/1-12/1/0 C xy kg/m2/s CO_25 26 1 5
-0 CEDS01_CO_50_WST   -                                                   -       -                  - -  -       CO_50 26 1 5
-0 CEDS01_CO_25_SHP   $ROOT/CEDS/v2023-04/$YYYY/CEDS_CO_0.1x0.1_$YYYY.nc  CO_shp  1980-2019/1-12/1/0 C xy kg/m2/s CO_25 26 1 5
-0 CEDS01_CO_50_SHP   -                                                   -       -                  - -  -       CO_50 26 1 5
+0 CEDS_CO_25_AGR   $ROOT/CEDS/v2023-04/$YYYY/CEDS_CO_0.1x0.1_$YYYY.nc  CO_agr  1980-2019/1-12/1/0 C xy kg/m2/s CO_25 26 1 5
+0 CEDS_CO_50_AGR   -                                                   -       -                  - -  -       CO_50 26 1 5
+0 CEDS_CO_25_ENE   $ROOT/CEDS/v2023-04/$YYYY/CEDS_CO_0.1x0.1_$YYYY.nc  CO_ene  1980-2019/1-12/1/0 C xy kg/m2/s CO_25 26 1 5
+0 CEDS_CO_50_ENE   -                                                   -       -                  - -  -       CO_50 26 1 5
+0 CEDS_CO_25_IND   $ROOT/CEDS/v2023-04/$YYYY/CEDS_CO_0.1x0.1_$YYYY.nc  CO_ind  1980-2019/1-12/1/0 C xy kg/m2/s CO_25 26 1 5
+0 CEDS_CO_50_IND   -                                                   -       -                  - -  -       CO_50 26 1 5
+0 CEDS_CO_25_TRA   $ROOT/CEDS/v2023-04/$YYYY/CEDS_CO_0.1x0.1_$YYYY.nc  CO_tra  1980-2019/1-12/1/0 C xy kg/m2/s CO_25 26 1 5
+0 CEDS_CO_50_TRA   -                                                   -       -                  - -  -       CO_50 26 1 5
+0 CEDS_CO_25_RCO   $ROOT/CEDS/v2023-04/$YYYY/CEDS_CO_0.1x0.1_$YYYY.nc  CO_rco  1980-2019/1-12/1/0 C xy kg/m2/s CO_25 26 1 5
+0 CEDS_CO_50_RCO   -                                                   -       -                  - -  -       CO_50 26 1 5
+0 CEDS_CO_25_SLV   $ROOT/CEDS/v2023-04/$YYYY/CEDS_CO_0.1x0.1_$YYYY.nc  CO_slv  1980-2019/1-12/1/0 C xy kg/m2/s CO_25 26 1 5
+0 CEDS_CO_50_SLV   -                                                   -       -                  - -  -       CO_50 26 1 5
+0 CEDS_CO_25_WST   $ROOT/CEDS/v2023-04/$YYYY/CEDS_CO_0.1x0.1_$YYYY.nc  CO_wst  1980-2019/1-12/1/0 C xy kg/m2/s CO_25 26 1 5
+0 CEDS_CO_50_WST   -                                                   -       -                  - -  -       CO_50 26 1 5
+0 CEDS_CO_25_SHP   $ROOT/CEDS/v2023-04/$YYYY/CEDS_CO_0.1x0.1_$YYYY.nc  CO_shp  1980-2019/1-12/1/0 C xy kg/m2/s CO_25 26 1 5
+0 CEDS_CO_50_SHP   -                                                   -       -                  - -  -       CO_50 26 1 5
 )))CEDS_01x01
 
 (((EDGARv43