-
Notifications
You must be signed in to change notification settings - Fork 175
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
Merge GEOS-Chem 14.5.2 into dev/14.6.0 #2730
Merged
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
The Global Rice Patty Inventory (GRPI) as documented in Z. Chen et al. (2025) is added as the default global rice emissions inventory in CH4 and carbon simulations. The GHGI_v2 (US) and Scarpelli_Mexico rice emissions will still be used over the US and Mexico. GRPI emissions are monthly and provided at 0.1x0.1 resolution. They are based on Landsat satellite inundation data. Reference: Chen, Z., Lin, H., Balasus, N., Hardy, A., East. J.D., Zhang, Y., Runkle, B.R.K., Hancock, S.E., Taylor, C.A., Du, X., Sander, B.O., Jacob, D. J. , Global Rice Paddy Inventory (GRPI): a high-resolution inventory of methane emissions from rice agriculture based on Landsat satellite inundation data, submitted to Earth's Future, https://doi.org/10.31223/X5941Z, 2025. Signed-off-by: Melissa Sulprizio <mpayer@seas.harvard.edu>
Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
.zenodo.json - Added this JSON file, which will auto-populate the various fields for auto-generation of DOIs at Zenodo for each version release. CHANGELOG.md - Updated accordingly Signed-off-by: Bob Yantosca <yantosca@seas.harvard.edu>
This merge brings PR # (Add .zenodo.json to auto-populate DOI fields upon version releases, by @yantosca) into the GEOS-Chem "no-diff-to-benchmark" development stream. This PR adds a .zenodo.json file to the GEOS-Chem "science codebase" repo for automatic DOI generation. Signed-off-by: Bob Yantosca <yantosca@seas.harvard.edu>
This merge brings PR # (Fix CO2 weekly scale factors entry in GCHP ExtData.rc for carbon simulation #2684, by @lizziel) into the GEOS-Chem "no-diff-to-benchmark" development stream. This PR fixes a typo in the ExtData.rc.carbon file so that the CO2 weekly scale factors are read and applied properly. Signed-off-by: Bob Yantosca <yantosca@seas.harvard.edu>
- The change of scaling factors will go into a separate PR
Met pressure unit and scaling are hard-coded for ExtData.rc and do not need to be specified as a variable setting the met-specific text files. Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
This merge brings PR #2673 which implements GRPI CH4 rice emissions for use instead of EDGAR in CH4 and carbon simulations into the 14.5.2 development stream. Signed-off-by: Melissa Sulprizio <mpayer@seas.harvard.edu>
Add run directory creation support for processed cubed-sphere GEOS-IT meteorology
Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
…scover Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
GEOS_IT should be GEOS_IT_Raw on discover. Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
…d_run_scripts Add env and run scripts for MSU Orion cluster and update for NASA discover
run/GCClassic/createRunDir.sh run/GCHP/createRunDir.sh - If the simulation is fullchem, then ask user (after asking whether to backup the rundir with Git) if they wish to build the KPP-Standalone executable. - If the answer is yes, then copy run/shared/kpp_standalone_interface.yml to the run directory and print a reminder to use -DKPPSA=y when configuring and building. test/integration/GCClassic test/integration/GCHP test/parallel/GCClassic - Add an extra "n\n" at the end of the input strings to the create_rundir function for all fullchem run directories. This will tell the rundir creation to ignore building the KPP-Standalone. CHANGELOG.md - Updated accordingly Signed-off-by: Bob Yantosca <yantosca@seas.harvard.edu>
This merge brings PR #2712 (Do not build KPP-Standalone executable unless specifically requested at compile time, by @yantosca) into the GEOS-Chem "no-diff-to-benchmark" development stream. This PR now asks the user if they wish to build the KPP-Standalone executable at run directory creation time. A reminder will be printed to configure with -DKPPSA=y, and the kpp_standalone_interface.yml file will be copies to the run directory. Signed-off-by: Bob Yantosca <yantosca@seas.harvard.edu>
This merge brings updates from the "no-diff-to-benchmark" development stream into the release/14.5.2 branch, in anticipation of the GEOS-Chem (science codebase) 14.5.2 release. Signed-off-by: Bob Yantosca <yantosca@seas.harvard.edu>
CHANGELOG.md - Updated version number to 14.5.2 and added release date Signed-off-by: Bob Yantosca <yantosca@seas.harvard.edu>
Updated version numbers in: - CHANGELOG.md Please see CHANGELOG.md for updates added to this version. Signed-off-by: Bob Yantosca <yantosca@seas.harvard.edu>
msulprizio
approved these changes
Feb 14, 2025
All GEOS-Chem Classic integration tests passed: ==============================================================================
GEOS-Chem Classic: Execution Test Results
CodeDir : 71b86c6 Merge GCClassic 14.5.2 into dev/14.6.0
GEOS-Chem : b07fab7d7 Merge GEOS-Chem 14.5.2 into dev/14.6.0
HEMCO : 2423647 Merge PR #279 (Use USTAR from met in DustDEAD extension)
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: 3855867
==============================================================================
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%% All execution tests passed! %%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% All tests were zero-diff w/r/t 14.5.0-alpha.5 except:
|
All GCHP integration tests passed: ==============================================================================
GCHP: Execution Test Results
CodeDir : 503fe2c Merge GCHP 14.5.2 into dev/14.6.0
MAPL : 6207fd0 Merge pull request #38 from geoschem/bugfix/intel_build_error_in_AbstractComponent
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 : b07fab7d7 Merge GEOS-Chem 14.5.2 into dev/14.6.0
HEMCO : 2423647 Merge PR #279 (Use USTAR from met in DustDEAD extension)
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: 3856235
==============================================================================
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%% All execution tests passed! %%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% All tests were zero-diff w/r/t 14.6.0-alpha.6 except for:
|
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
no-diff-to-benchmark
This update will not change the results of fullchem benchmark simulations
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: Bob Yantosca
Institution: Harvard + GCST
Describe the update
This PR seeks to merge the updates from GEOS-Chem 14.5.2 into the GEOS-Chem 14.6.0 development stream (branch dev/14.6.0).
Expected changes
This will be a zero-diff update as 14.5.2 did not contain any updates that change benchmark simulations.
Related Github Issue