Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix merge conflict that emitted CEDS C6H14 emissions into ALK4 instead of ALK6; Also emit C6H14 into ALK6 in CMIP6 and HTAP3 inventories #2696

Merged
merged 1 commit into from
Jan 22, 2025

Conversation

yantosca
Copy link
Contributor

@yantosca yantosca commented Jan 21, 2025

Name and Institution (Required)

Name: Bob Yantosca
Institution: Harvard + GCST

Describe the update

This PR does the following:

  1. Fixes a merge conflict from PR Add CEDS 0.1 x 0.1 degree emissions #2171 that resulted in CEDS C6H14 (hexanes) emissions being emitted into ALK4 instead of ALK6.
  2. Updated entries for CMIP6 and HTAPv3 inventories to emit C6H14 into ALK6 (i.e. reflecting what we already do in CEDS).

NOTE: The ALK6 species was added in the Travis et al 2024 emissions updates from @kelvinhb for CEDS only, but we never made the corresponding edits in HEMCO_Config.rc for the CMIP6 and HTAPv3 inventories. This is now resolved.

Expected changes

This will fix an issue where ALK4 recieved almost double the emissions that it should have and ALK6 received about half the emissions that it should have.

Related Github Issue

run/GCClassic/HEMCO_Config.rc.templates/HEMCO_Config.rc.fullchem
run/GCHP/HEMCO_Config.rc.templates/HEMCO_Config.rc.fullchem
- Add C6H14 (hexane) emissions into the ALK6 species.  This was done
  for CEDS in 14.5.0 when the ALK6 species was added.  But the emissions
  entries for C6H14 in the other inventories (CMIP6, HTAPv3, etc) were
  not adjusted at that time.  This is now fixed.
- ALSO NOTE: A merge conflict clobbered the CEDS C6H14 emissions
  so these emissions went into ALK4 instead.  This caused large
  differences when comparing to 14.6.0-alpha.2  This has now been fixed.

Signed-off-by: Bob Yantosca <[email protected]>
@yantosca yantosca added topic: Configuration Files Related to GEOS-Chem configuration files category: Bug Fix Fixes a previously-reported bug topic: Emissions Related to emissions inventories used in GEOS-Chem labels Jan 21, 2025
@yantosca yantosca added this to the 14.6.0 milestone Jan 21, 2025
@yantosca yantosca self-assigned this Jan 21, 2025
@yantosca
Copy link
Contributor Author

Integration tests are running.

@yantosca
Copy link
Contributor Author

All GEOS-Chem Classic integration tests passed:

==============================================================================
GEOS-Chem Classic: Execution Test Results

CodeDir   : ed0c344 GEOS-Chem update: Merge PR #2181 (CEDS 0.1 x 0.1 emissions)
GEOS-Chem : 5b21ce3d5 Add C6H14 emissions into ALK6 species for CEDS & other inventories
HEMCO     : 0ae25d2 HEMCO 3.10.1 release
Cloud-J   : f8a2b7f Update version number for 8.0.1 release
HETP      : 2a99b24 Merge pull request #2 from geoschem/bugfix/initialize_local_variables

Using 24 OpenMP threads
Number of execution tests: 30

Submitted as SLURM job: 301464
==============================================================================

%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%  All execution tests passed!  %%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

All GCHP integration tests passed as well:

==============================================================================
GCHP: Execution Test Results

CodeDir       : c6fd08b GEOS-Chem update: Merge PR #2181 (CEDS 0.1 x 0.1 emissions)
MAPL          : 9ad63ae Merge PR #37 containing update to vertically flip imports with dimensionless pressure proxy lev coordinates
GMAO_Shared   : 4ddb3ec Merge pull request #2 from geoschem/feature/mapl-upgrade
ESMA_cmake    : ad5deba Added ecbuild as a submodule of ESMA_cmake
gFTL-shared   : 4b82492 Merge branch 'upstream_v1.5.0' into feature/v1.5.0
FMS           : 259759d Merge pull request #3 from geoschem/feature/update_gmao_libs
FVdycoreCubed : af42462 Merge PR #8 (Add PLEadv diagnostic for offline advection in GCHP)
geos-chem     : 5b21ce3d5 Add C6H14 emissions into ALK6 species for CEDS & other inventories
HEMCO         : 0ae25d2 HEMCO 3.10.1 release
yaFyaml       : 19afe50 Merge branch 'upstream_v1.0.4' into feature/v1.0.4
pFlogger      : 2c4b724 Merge branch 'upstream_v1.9.1' into feature/v1.9.1
Cloud-J       : f8a2b7f Update version number for 8.0.1 release
HETP          : 2a99b24 Merge pull request #2 from geoschem/bugfix/initialize_local_variables

Number of execution tests: 12

Submitted as SLURM job: 301673
==============================================================================

%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%  All execution tests passed!  %%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

@yantosca yantosca requested a review from msulprizio January 21, 2025 23:02
@yantosca yantosca marked this pull request as ready for review January 21, 2025 23:02
@yantosca yantosca changed the base branch from main to dev/14.6.0 January 21, 2025 23:09
@yantosca yantosca merged commit e62520f into dev/14.6.0 Jan 22, 2025
@yantosca yantosca deleted the bugfix/c6h14-into-alk6 branch January 22, 2025 21:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category: Bug Fix Fixes a previously-reported bug topic: Configuration Files Related to GEOS-Chem configuration files topic: Emissions Related to emissions inventories used in GEOS-Chem
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants