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

Add CEDS 0.1 x 0.1 degree emissions #2171

Draft
wants to merge 9 commits into
base: dev/14.5.0
Choose a base branch
from

Conversation

yantosca
Copy link
Contributor

Name and Institution (Required)

Name: Bob Yantosca
Institution: Harvard + GCST

Confirm you have reviewed the following documentation

Describe the update

This is the companion PR to #1745.

Expected changes

As described in #1745

Related Github Issue(s)

Tagging @msulprizio

@yantosca yantosca self-assigned this Feb 29, 2024
@yantosca yantosca changed the title Edit HEMCO_Config.rc.fullchem for CEDS 0.1 degree emisisons Add CEDS 0.1 x 0.1 degree emissions Feb 29, 2024
@yantosca yantosca added category: Feature Request New feature or request topic: Input Data Related to input data topic: Configuration Files Related to GEOS-Chem configuration files labels Feb 29, 2024
@yantosca yantosca added this to the 14.4.0 milestone Feb 29, 2024
@yantosca yantosca added deferred Issues/PRs that we cannot work on right away help needed: Request Input From Community We need GC community to provide a fix/update and removed deferred Issues/PRs that we cannot work on right away labels Mar 20, 2024
@yantosca yantosca linked an issue Mar 20, 2024 that may be closed by this pull request
@yantosca
Copy link
Contributor Author

@1Dandan @Ruijun-Dang: Just wanted to tag #1745 (comment) on this PR. Will await your feedback before proceeding.

@yantosca yantosca removed this from the 14.4.0 milestone Mar 20, 2024
@yantosca yantosca added the deferred Issues/PRs that we cannot work on right away label Mar 22, 2024
@yantosca yantosca deleted the branch dev/14.5.0 May 30, 2024 18:55
@yantosca yantosca closed this May 30, 2024
@msulprizio msulprizio reopened this May 30, 2024
@msulprizio msulprizio changed the base branch from dev/14.4.0 to main May 30, 2024 19:16
@1Dandan
Copy link
Contributor

1Dandan commented Jun 21, 2024

Hi @yantosca @msulprizio, the seasonality problem as mentioned in #1745 should be fixed in the new version of v2024-06. File names remain the same as those in v2023-04, and thus all v2023-04 can be replaced by v2024-06 for HEMCO_Config.rc and ExtData.rc templates. Let me know if you want other inputs from me.

run/GCClassic/HEMCO_Config.rc.templates/HEMCO_Config.rc.fullchem
run/GCHP/HEMCO_Config.rc.templates/HEMCO_Config.rc.fullchem
- Added entries for CEDS 0.1 x 0.1 degree emissions.
  NOTE: ExtData.rc.fullchem will be updated later.

CHANGELOG.md
- Updated accordingly

Signed-off-by: Bob Yantosca <[email protected]>
run/GCClassic/HEMCO_Config.rc.templates/HEMCO_Config.rc.fullchem
- CEDS01 comment update "1750-2019" -> "1980-2019"
- Also updated header comments

run/GCClassic/HEMCO_Config.rc.templates/HEMCO_Config.rc.aerosol
run/GCClassic/HEMCO_Config.rc.templates/HEMCO_Config.rc.carbon
run/GCClassic/HEMCO_Config.rc.templates/HEMCO_Config.rc.TransportTracers
run/GCHP/HEMCO_Config.rc.templates/HEMCO_Config.rc.carbon
run/GCHP/HEMCO_Config.rc.templates/HEMCO_Config.rc.TransportTracers
run/GCHP/HEMCO_Config.rc.templates/HEMCO_Config.rc.fullchem
run/GCHP/ExtData.rc.templates/ExtData.rc.carbon
run/GCHP/ExtData.rc.templates/ExtData.rc.fullchem
run/GCHP/ExtData.rc.templates/ExtData.rc.TransportTracers
- Added entries for CEDS_01x01 as the default
- Now make CEDSv2 an option

Signed-off-by: Bob Yantosca <[email protected]>
run/GCClassic/HEMCO_Config.rc.templates/HEMCO_Config.rc.fullchem
run/GCHP/HEMCO_Config.rc.templates/HEMCO_Config.rc.fullchem
- For container "CEDS01_TOLU_WST", added scale factor=26, cat=1, hier=5.
  This had been omitted due to a cut-n-paste error.

Signed-off-by: Bob Yantosca <[email protected]>
run/GCHP/ExtData.rc.TransportTracers
- Fixed typo: "shoul'd" -> "should

Signed-off-by: Bob Yantosca <[email protected]>
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]>
@yantosca yantosca changed the base branch from main to dev/14.5.0 August 12, 2024 20:08
@1Dandan
Copy link
Contributor

1Dandan commented Aug 12, 2024

Hi @yantosca, I noticed that the CEDS 0.1 version is still v2023-04, which needs to be changed to v2024-06.
Also, I deleted all files at CEDS/v2023-04 at http://geoschemdata.wustl.edu/ExtData/HEMCO/CEDS/ to avoid any confusion as v2024-06 should be used instead.

@yantosca
Copy link
Contributor Author

Thanks @1Dandan, yes I just rebased the existing code atop of dev/14.5.0. I'll push another commit to update the directory paths.

@yantosca yantosca added topic: Emissions Related to emissions inventories used in GEOS-Chem and removed help needed: Request Input From Community We need GC community to provide a fix/update deferred Issues/PRs that we cannot work on right away labels Aug 12, 2024
Updated the following configuration files to read CEDS 0.1 x 0.1
degree emissions data from the HEMCO/CEDS/v2024-06 folder:

run/GCClassic/HEMCO_Config.rc.templates/HEMCO_Config.rc.aerosol
run/GCClassic/HEMCO_Config.rc.templates/HEMCO_Config.rc.carbon
run/GCClassic/HEMCO_Config.rc.templates/HEMCO_Config.rc.fullchem
run/GCClassic/HEMCO_Config.rc.templates/HEMCO_Config.rc.tagCO
run/GCClassic/HEMCO_Config.rc.templates/HEMCO_Config.rc.TransportTracers
run/GCHP/ExtData.rc.templates/ExtData.rc.carbon
run/GCHP/ExtData.rc.templates/ExtData.rc.fullchem
run/GCHP/ExtData.rc.templates/ExtData.rc.TransportTracers

Also updated the CHANGELOG.md accordingly.

Signed-off-by: Bob Yantosca <[email protected]>
CHANGELOG.md
- Edited previous comment to note that the CEDS data are in v2024-06

Signed-off-by: Bob Yantosca <[email protected]>
@yantosca
Copy link
Contributor Author

@1Dandan: DIrectory paths updated in commit 91acc1a. Will start integration testing and fix any further issues that arise.

run/GCClassic/HEMCO_Config.rc.templates/HEMCO_Config.rc.fullchem
- Fixed mismatching brackets for CEDS_01x01_SHIP for NO emissions

Signed-off-by: Bob Yantosca <[email protected]>
@yantosca
Copy link
Contributor Author

All GEOS-Chem integration tests passed:

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

GCClassic #0c22a3a GEOS-Chem submod update: PR #2352 post-merge fix (rebuild KPP files)
GEOS-Chem #769698837 Fix mismatching brackets in HEMCO_Config.rc template
HEMCO     #e68ebae HEMCO 3.9.2 release

Using 24 OpenMP threads
Number of execution tests: 28

Submitted as SLURM job: 43586737
==============================================================================

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

run/GCHP/ExtData.rc.templates/ExtData.rc.carbon
- Change climatology data entries from e.g "2009 Y" to "Y Y F2009-..."
- Remove slug left over from Git merge

Signed-off-by: Bob Yantosca <[email protected]>
@viral211
Copy link
Contributor

Hi @yantosca and @1Dandan, CEDS also identifies their versions with the release date (https://github.com/JGCRI/CEDS/releases) and users can confuse that with the folder names in our CEDS data directory. For example, CEDS had a new version called v_2024_04_01, but I think our folder v2024-06 has CEDS version v_2021_4_21 data. Could we display the CEDS version prominently to avoid any confusion? Thanks.

@1Dandan
Copy link
Contributor

1Dandan commented Sep 26, 2024

Thanks @viral211 for the suggestion. I agree that it is confusing as our processed version may conflict with the releasing date of the original version. I add a line in the README of This is a seasonality fixed version based on the original released version of v2021_4_21_Release (https://data.pnnl.gov/group/nodes/dataset/13488). Would you @viral211 @yantosca have further suggestions to make it clear?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category: Feature Request New feature or request topic: Configuration Files Related to GEOS-Chem configuration files topic: Emissions Related to emissions inventories used in GEOS-Chem topic: Input Data Related to input data
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Adding CEDS at 0.1 degree as a global emission inventory
4 participants