Add CEDS 0.1 x 0.1 degree emissions #2171

yantosca · 2024-02-29T22:47:40Z

Name and Institution (Required)

Name: Bob Yantosca
Institution: Harvard + GCST

Confirm you have reviewed the following documentation

Contributing guidelines

Describe the update

This is the companion PR to #1745.

Expected changes

As described in #1745

Related Github Issue(s)

Closes Adding CEDS at 0.1 degree as a global emission inventory #1745

Tagging @msulprizio

run/GCHP/ExtData.rc.templates/ExtData.rc.TransportTracers

run/GCClassic/HEMCO_Config.rc.templates/HEMCO_Config.rc.fullchem

yantosca · 2024-03-20T21:02:00Z

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

1Dandan · 2024-06-21T16:24:26Z

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]>

1Dandan · 2024-08-12T20:22:08Z

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 · 2024-08-12T20:32:29Z

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 · 2025-01-15T22:06:30Z

Merged 14.6.0-alpha.2 into this branch and am running integration tests.

yantosca · 2025-01-16T16:00:23Z

After merging 14.6.0-alpha.2 into this branch, all GEOS-Chem Classic integration tests passed:

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

CodeDir   : b7e6523 GEOS-Chem update: Merge PR #2683 (Restore clobbered TMB updates)
GEOS-Chem : b474a7efb Fix typos in HEMCO_Config.rc.carbon for GCClassic & GCHP
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: 66516782
==============================================================================

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

yantosca · 2025-01-16T16:01:17Z

After merging 14.6.0-alpha.2 into this branch, all GCHP integration tests passed:

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

CodeDir       : 3089c38 GEOS-Chem update: Merge PR #2683 (Restore clobbered TMB updates)
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     : 98b088078 Merge 14.6.0-alpha.2 into feature/ceds-0.1-degree
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: 66509840
==============================================================================


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

run/GCClassic/HEMCO_Config.rc.templates/HEMCO_Config.rc.tagCO

run/GCHP/ExtData.rc.templates/ExtData.rc.TransportTracers

run/GCClassic/HEMCO_Config.rc.templates/HEMCO_Config.rc.carbon

run/GCHP/ExtData.rc.templates/ExtData.rc.TransportTracers

run/GCHP/ExtData.rc.templates/ExtData.rc.fullchem

run/GCHP/HEMCO_Config.rc.templates/HEMCO_Config.rc.carbon

msulprizio · 2025-01-16T17:01:30Z

@yantosca There also seem to be some fixes for the GCHP carbon simulation in this PR (see acf8ff8) that are unrelated to the CEDS update. Do you know if this impacts the GCHP carbon simulation or if they're zero-diff updates? Should we remove those updates from this branch/PR and make a separate PR for them?

run/GCClassic/HEMCO_Config.rc.templates/HEMCO_Config.rc.carbon run/GCClassic/HEMCO_Config.rc.templates/HEMCO_Config.rc.tagCO run/GCHP/HEMCO_Config.rc.templates/HEMCO_Config.rc.carbon - Change CEDS_01x01 from ${RUNDIR_USE_CEDS} to true - Change CEDS_01x01_SHIP from ${RUNDIR_USE_CEDS} to true run/GCHP/ExtData/ExtData.rc.templates/ExtData.rc.TransportTracers run/GCHP/ExtData/ExtData.rc.templates/ExtData.rc.fullchem - Updated comments "CEDSv2" -> "CEDS_01x01" Signed-off-by: Bob Yantosca <[email protected]>

run/GCHP/ExtData.rc.templates/ExtData.rc.carbon - Restored modifications that were made specifically in the feature/ceds-0.1-degree branch back to what they were in dev/14.6.0. Signed-off-by: Bob Yantosca <[email protected]>

yantosca · 2025-01-16T17:52:14Z

@yantosca There also seem to be some fixes for the GCHP carbon simulation in this PR (see acf8ff8) that are unrelated to the CEDS update. Do you know if this impacts the GCHP carbon simulation or if they're zero-diff updates? Should we remove those updates from this branch/PR and make a separate PR for them?

@msulprizio: I restored the updates in question to what they were in the dev/14.6.0 branch. This was done in commit 6693d46

run/GCHP/ExtData.rc.templates/ExtData.rc.TransportTracers

run/GCHP/ExtData.rc.templates/ExtData.rc.carbon

run/GCHP/ExtData.rc.templates/ExtData.rc.TransportTracers - Fixed typo in entries for CEDS_CO_25 filenames ("CEDS_CO2_0.1x0.1_%y4.nc" -> "CEDS_CO_0.1x0.1_%y4.nc") run/GCHP/ExtData.rc.templates/ExtData.rc.carbon - Removed RCP and ICOADS_SHIP entries (leftover from merge up) Signed-off-by: Bob Yantosca <[email protected]>

@yantosca

These changes were originally introduced by Bob Yantosca (@yantosca) in commit acf8ff8 in PR #2171 (CEDS 0.1x0.1 emissions) but they should be in their own PR. The fixes have now been added on top of 14.5.1 which also included many fixes to ExtData.carbon. Fixes here include: - Change climatology data entries from e.g "2009 Y" to "Y Y F2009-..." - For CO2_WEEKLY, use %d2 to ensure daily update Signed-off-by: Melissa Sulprizio <[email protected]>

msulprizio

Thanks @yantosca. All of my comments have been addressed. Good to merge!

yantosca · 2025-01-16T18:50:19Z

I have merged this into the dev/14.6.0 branch (locally) and am running integration tests. Stay tuned for results.

CHANGELOG.md

@lizziel

CHANGELOG.md - Updated based on comments by @lizziel on PR #2171 Signed-off-by: Bob Yantosca <[email protected]>

run/GCHP/ExtData.rc.templates/ExtData.rc.carbon - Restored several entries for the CEDS_01x01 CO emissions, which appear to have been clobbered during a merge. Signed-off-by: Bob Yantosca <[email protected]>

yantosca · 2025-01-17T19:00:21Z

@lizziel: Missing entries in the ExtData.rc.carbon file was causing the integration tests to fail. These were probably clobbered in the merge. They've been restored in 4e663f7. I will ask for a re-review if the GCHP integration tests pass.

yantosca · 2025-01-17T19:10:35Z

GEOS-Chem Classic integration tests all passed after having made the fixes discussed above:

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

CodeDir   : b7e6523 GEOS-Chem update: Merge PR #2683 (Restore clobbered TMB updates)
GEOS-Chem : c5a667abe Merge PR #2683 (Restore updates for TMB emissions)
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: 66868886
==============================================================================

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

yantosca · 2025-01-17T20:47:35Z

After having made all the fixes discussed above, GCHP integration tests also passed:

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

CodeDir       : 3089c38 GEOS-Chem update: Merge PR #2683 (Restore clobbered TMB updates)
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     : 4e663f76a Bug fix: restore missing CEDS_CO entries in ExtData.rc.carbon
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: 66890631
==============================================================================
 
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%  All execution tests passed!  %%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

@yantosca

This merge brings PR # (Fix merge conflict that emitted CEDS C6H14 emissions into ALK4 instead of ALK6; Also emit C6H14 into ALK6 in CMIP6 and HTAP3 inventories, by @yantosca) into the GEOS-Chem 14.6.0 development stream. This PR does the following: 1. Restores updates to HEMCO_Config.rc.fullchem templates that were clobbered in the merge of PR #2171 2. Emits C6H14 (hexanes) from CMIP6 and HTAPv3 inventories into ALK6, to be consistent with what we alreadyd do for CEDS. Signed-off-by: Bob Yantosca <[email protected]>

yantosca self-assigned this Feb 29, 2024

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 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 added this to the 14.4.0 milestone Feb 29, 2024

yantosca mentioned this pull request Mar 1, 2024

"Too many nested brackets" error in HEMCO 3.8.0 geoschem/HEMCO#261

Closed

4 tasks

msulprizio reviewed Mar 4, 2024

View reviewed changes

run/GCHP/ExtData.rc.templates/ExtData.rc.TransportTracers Outdated Show resolved Hide resolved

run/GCHP/ExtData.rc.templates/ExtData.rc.TransportTracers Outdated Show resolved Hide resolved

run/GCClassic/HEMCO_Config.rc.templates/HEMCO_Config.rc.fullchem Outdated Show resolved Hide resolved

yantosca mentioned this pull request Mar 12, 2024

Allow up to 10 nested brackets in the HEMCO_Config.rc file geoschem/HEMCO#262

Merged

1 task

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 linked an issue Mar 20, 2024 that may be closed by this pull request

Adding CEDS at 0.1 degree as a global emission inventory #1745

Open

yantosca removed this from the 14.4.0 milestone Mar 20, 2024

yantosca added the deferred Issues/PRs that we cannot work on right away label Mar 22, 2024

yantosca deleted the branch dev/14.6.0 May 30, 2024 18:55

yantosca closed this May 30, 2024

msulprizio reopened this May 30, 2024

msulprizio changed the base branch from dev/14.4.0 to main May 30, 2024 19:16

yantosca added 5 commits August 12, 2024 15:26

Fixed typo in ExtData.rc.TransportTracers

012639a

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

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

34f8f67

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 force-pushed the feature/ceds-0.1-degree branch from 5b9946e to 34f8f67 Compare August 12, 2024 20:07

yantosca changed the base branch from main to dev/14.5.0 August 12, 2024 20:08

yantosca marked this pull request as ready for review January 16, 2025 16:01

msulprizio requested changes Jan 16, 2025

View reviewed changes

yantosca added 2 commits January 16, 2025 12:35

Restored updates in ExtData.rc.carbon

6693d46

run/GCHP/ExtData.rc.templates/ExtData.rc.carbon - Restored modifications that were made specifically in the feature/ceds-0.1-degree branch back to what they were in dev/14.6.0. Signed-off-by: Bob Yantosca <[email protected]>

yantosca requested a review from msulprizio January 16, 2025 17:52

msulprizio requested changes Jan 16, 2025

View reviewed changes

run/GCHP/ExtData.rc.templates/ExtData.rc.TransportTracers Outdated Show resolved Hide resolved

run/GCHP/ExtData.rc.templates/ExtData.rc.carbon Outdated Show resolved Hide resolved

run/GCHP/ExtData.rc.templates/ExtData.rc.carbon Outdated Show resolved Hide resolved

yantosca force-pushed the feature/ceds-0.1-degree branch from 13703fe to 6de9ca5 Compare January 16, 2025 18:39

yantosca requested a review from msulprizio January 16, 2025 18:40

msulprizio approved these changes Jan 16, 2025

View reviewed changes

lizziel requested changes Jan 17, 2025

View reviewed changes

CHANGELOG.md Outdated Show resolved Hide resolved

CHANGELOG.md Outdated Show resolved Hide resolved

Changelog updates for PR #2171

0fd18bd

CHANGELOG.md - Updated based on comments by @lizziel on PR #2171 Signed-off-by: Bob Yantosca <[email protected]>

yantosca requested a review from lizziel January 17, 2025 16:33

lizziel approved these changes Jan 17, 2025

View reviewed changes

Bug fix: restore missing CEDS_CO entries in ExtData.rc.carbon

4e663f7

run/GCHP/ExtData.rc.templates/ExtData.rc.carbon - Restored several entries for the CEDS_01x01 CO emissions, which appear to have been clobbered during a merge. Signed-off-by: Bob Yantosca <[email protected]>

yantosca requested a review from lizziel January 17, 2025 18:58

yantosca merged commit 9aeb0da into dev/14.6.0 Jan 17, 2025

yantosca deleted the feature/ceds-0.1-degree branch January 17, 2025 20:55

yantosca mentioned this pull request Jan 21, 2025

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add CEDS 0.1 x 0.1 degree emissions #2171

Add CEDS 0.1 x 0.1 degree emissions #2171

yantosca commented Feb 29, 2024

yantosca commented Mar 20, 2024

1Dandan commented Jun 21, 2024

1Dandan commented Aug 12, 2024

yantosca commented Aug 12, 2024

yantosca commented Jan 15, 2025

yantosca commented Jan 16, 2025

yantosca commented Jan 16, 2025

msulprizio commented Jan 16, 2025

yantosca commented Jan 16, 2025

msulprizio left a comment

yantosca commented Jan 16, 2025

yantosca commented Jan 17, 2025

yantosca commented Jan 17, 2025

yantosca commented Jan 17, 2025

Add CEDS 0.1 x 0.1 degree emissions #2171

Add CEDS 0.1 x 0.1 degree emissions #2171

Conversation

yantosca commented Feb 29, 2024

Name and Institution (Required)

Confirm you have reviewed the following documentation

Describe the update

Expected changes

Related Github Issue(s)

yantosca commented Mar 20, 2024

1Dandan commented Jun 21, 2024

1Dandan commented Aug 12, 2024

yantosca commented Aug 12, 2024

yantosca commented Jan 15, 2025

yantosca commented Jan 16, 2025

yantosca commented Jan 16, 2025

msulprizio commented Jan 16, 2025

yantosca commented Jan 16, 2025

msulprizio left a comment

Choose a reason for hiding this comment

yantosca commented Jan 16, 2025

yantosca commented Jan 17, 2025

yantosca commented Jan 17, 2025

yantosca commented Jan 17, 2025