-
Notifications
You must be signed in to change notification settings - Fork 171
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 CO2, CO, and OCS single-tracer carbon simulations to the integration tests #2236
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ation tests The carbon simulation will soon replace the existing CO2, CH4, and tagCO specialty simulations. We now add single-tracer carbon simulations for CO2, CO, and OCS (CH4 was added previously) to the GCClassic and GCHP integration tests. Signed-off-by: Melissa Sulprizio <[email protected]>
The additional CO, CO2, and OCS integration tests all pass for GCClassic.
They are failing for GCHP as discussed in #2237. |
run/shared/singleCarbonSpecies.sh - Now also remove lines from HISTORY.rc with a space after the species name (such as '_CO ') - Disable the Emissions collection for OCS-only simulations (as we do not yet have OCS emissions). This is only relevant for GCHP. Signed-off-by: Bob Yantosca <[email protected]>
run/shared/singleCarbonSpecies.sh - Now use the regexp "[ \t]*" to remove an arbitrary number of tabs and spaces when removing lines from the HISTORY.rc file. Signed-off-by: Bob Yantosca <[email protected]>
run/shared/singleCarbonSpecies.sh - Bug fix: Remove lines beginning with EDGAR8 from ExtData.rc for carbon simulations that do not include CH4. This is now necessary since EDGARv8 replaces EDGARv7 in carbon simulations. CHANGELOG.md - Updated accordingly Signed-off-by: Bob Yantosca <[email protected]>
run/GCHP/HISTORY.rc.carbon - Add ", 'GCHPchem"," column to each of the fields in the Metrics collection. This causes an issue in parsing the file. - Removed "#" separators in the Budget collection Signed-off-by: Bob Yantosca <[email protected]>
run/shared/singleCarbonSpecies.sh - Add sed commands to remove CH4_SEEPS, CH4_RES_DAM, CH4_RES_SFC, CH4_TERMITES, and CH4_SOILABSORB individually. The previous command to remove anything starting with "CH4_" was removing the CH4_LOSS entry of ExtData.rc, which is needed as an input to the chemistry mechanism. Signed-off-by: Bob Yantosca <[email protected]>
The following fixes were added to address carbon simulations with CO, CO2, or OCS from crashing as discussed in #2237. 1. Add trailing whitespace after species names in HISTORY.rc.carbon to allow for differentiating between CO and CO2. 2. Modify function updateHistory.rc in run/shared/singleCarbonSpecies.sh to restore Collection.fields lines that are removed when CH4 is not included in the carbon simulation. Signed-off-by: Melissa Sulprizio <[email protected]> # Conflicts: # run/shared/singleCarbonSpecies.sh
GCHP integration tests now all pass:
|
yantosca
approved these changes
Apr 10, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks @msulprizio! Good to merge!
yantosca
added a commit
that referenced
this pull request
May 1, 2024
This merge grings PR #2236 (Parameterized Effective Radius for SNA and OM, by @Haihui-Zhu) atop the PR #2272 (CH4/carbon simulation fixes). PR #2236 implements a parameterized effective radius for SNA and OM and updates AOD calculation to account for the spatial and temporal variation in dry effective radius. Signed-off-by: Bob Yantosca <[email protected]>
yantosca
added a commit
that referenced
this pull request
May 1, 2024
GeosCore/aerosol_mod.F90 - Added the "g" index variable to !$OMP PRIVATE clause run/GCClassic/geoschem_config.yml.templates/geoschem_config.yml.aerosol run/GCClassic/geoschem_config.yml.templates/geoschem.config.yml.fullchem run/GCHP/geoschem_config.yml.templates/geoschem_config.yml.fullchem - Now set fastj_input_dir from FAST_JX/v2021-10 to FAST_JX/v2024-05, as this folder now has updated org.dat and so4.dat files that correspond with the updates in PR #2236. CHANGELOG.md - Updated accordingly Signed-off-by: Bob Yantosca <[email protected]>
yantosca
added a commit
that referenced
this pull request
May 2, 2024
This merge brings PR #2236 (Parameterized Effective Radius for SNA and OM, by @Haihui-Zhu) into the GEOS-Chem 14.4.0 development stream. This PR (1) Implements a parameterized effective radius for SNA and OMU, and (2) Updates AOD calculation to account for the spatial and temporal variation in dry effective radius. New org.dat and so4.dat files with updated aerosol parameters are now in ExtData/CHEM_INPUTS/FAST_JX/v2024-05. Signed-off-by: Bob Yantosca <[email protected]>
yantosca
added a commit
that referenced
this pull request
May 2, 2024
run/GCClassic/geoschem_config.yml.templates/geoschem_config.yml.Hg - Change fastjx_input_dir to CHEM_INPUTS/FAST_JX/v2024-05-Hg/ - Change cloudj_input_dir to CHEM_INPUTS/FAST_JX/v2024-05/ CHANGELOG.md - Updated accordingly Signed-off-by: Bob Yantosca <[email protected]>
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: Benchmarking and Testing
Related to CI, integration tests, or scientific benchmarking
topic: Carbon Gases Simulations
Related to simulations with carbon gases (carbon, CO2, CH4, tagCH4, tagCO)
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Name and Institution (Required)
Name: Melissa Sulprizio
Institution: Harvard
Describe the update
The carbon simulation will soon replace the existing CO2, CH4, and tagCO specialty simulations. We now add single-tracer carbon simulations for CO2, CO, and OCS (CH4 was added previously) to the GCClassic and GCHP integration tests.
Expected changes
This is a zero difference update with respect to the full-chemistry benchmark simulation.