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

Merge GEOS-Chem 14.4.3 into the 14.5.0 development branch #2425

Merged
merged 40 commits into from
Aug 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
2c89108
Add ModelE2.1 (GCAP 2.0) simulation to GCClassic integration tests
msulprizio Jul 19, 2024
2f52b06
Add half-degree global simulation option for GEOS-IT with transport t…
lizziel Jun 17, 2024
dcc1afe
Shorten ModelE2.1 simulation in GCClassic integration tests from 1 ho…
msulprizio Jul 24, 2024
f6dc400
Add full-chemistry simulation with all diagnostics turned on in HISTO…
msulprizio Jul 24, 2024
39df8a6
Change HISTORY.rc duration to 20mins for ModelE2.1 int tests
yantosca Jul 25, 2024
38b5bfe
Merge PR #2394 (Add int ModelE2.1 (GCAP 2.0) integration test)
yantosca Jul 25, 2024
1fe1dec
Add missing fields for UVFlux collection in HISTORY.rc.fullchem
yantosca Jul 26, 2024
d67ff08
Update logic to reset of frequency & declaration in HISTORY.rc files
yantosca Jul 26, 2024
866a7c0
Use a function to print submodule hashes in integration tests
yantosca Jul 26, 2024
1f97c9e
Tweak the display of submod head commits for GCHP int tests
yantosca Jul 26, 2024
0f3997d
Remove debug exit statement from GCHP integrationTestCreate.sh
yantosca Jul 26, 2024
53568d1
Hotfix: Fix invalid YAML syntax in .github/workflows/stale.yml
yantosca Jul 26, 2024
3681777
Add gchp_merra2_fullchem_alldiags integration test
yantosca Jul 26, 2024
f609171
Enable planeflight output in gc_4x5_merra2_fullchem_alldiags tests
yantosca Jul 29, 2024
3efd4d5
Rename ObsPack input file name in geoschem_config.yml templates
yantosca Jul 29, 2024
3a90c77
Also print superproject hash to integration test logs
yantosca Jul 29, 2024
3735779
Bug fix: Copy proper obspack file to alldiags test directory
yantosca Jul 29, 2024
03a25c3
Bug fix: Use ${HOME} instead of ~ in grep command
yantosca Jul 29, 2024
dc61470
Bug fix: GCHP budget diagnostic now uses SO4 instead of O3
yantosca Jul 30, 2024
5ab0237
GCHP integration tests now reset cap_restart time to 000000 UTC
yantosca Jul 30, 2024
023508a
Compare tag names in uppercase in routine Get_UVFlux_Bin
yantosca Jul 30, 2024
3f3929f
Disable the StratBM collection for the GCHP alldiags test
yantosca Jul 30, 2024
dcc8809
Add missing "_" to GCHP DryDep collection entries
yantosca Jul 30, 2024
9d766c4
Fix issues in GCHP emissions collection; disable UVFlux in alldiags test
yantosca Jul 31, 2024
ee5a477
Add an extra "#" to commented-out emission diagnostics
yantosca Jul 31, 2024
dae4956
Edit CHANGELOG.md to mention that GCHP "alldiags" test were added
yantosca Aug 1, 2024
3e0f6ce
Merge PR #2399 (Add "alldiags" integration test)
yantosca Aug 1, 2024
0c36abc
Rebase "feature/trop-prs-in-satdiagn" atop PR #2399
Aug 2, 2024
afeb197
Update CHANGELOG.md: Tropopause pressure in satdiagn
yantosca Aug 5, 2024
7d3f442
Merge PR #2410 (Add Trop Pressure to SatDiagn collection)
yantosca Aug 5, 2024
0788495
Merge PR #2397 (Add GCC global TransportTracer 0.5 degree run w/ GEOS…
yantosca Aug 5, 2024
d288a95
Fix unit conversion error in CHEM_H2O2 for aerosol-only simulation
yantosca Aug 6, 2024
6987c2a
Fix typo in !$OMP PARALLEL loop in Chem_H2O2 routine
yantosca Aug 6, 2024
ce46f08
Update HEMCO_Diagn.rc templates to use offline MOH biogenic emissions
lizziel Jul 30, 2024
cc374fd
Auto-set GCHP emissions sources in HEMCO_Diagn.rc based on HEMCO_Conf…
lizziel Jul 30, 2024
ee4b30d
Update changelog
lizziel Aug 9, 2024
cd3857a
Merge PR #2413 (Fix unit conversion in aerosol-only sim)
yantosca Aug 12, 2024
0345075
Merge PR #2402 (Fixes for HEMCO_Diagn.rc)
yantosca Aug 12, 2024
7b4b808
Merge "no-diff-to-benchmark" updates into main for 14.4.3 release
yantosca Aug 13, 2024
bef56c6
GEOS-Chem (science codebase) 14.4.3 release
yantosca Aug 13, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
stale-issue-label: 'stale'
exempt-issue-labels: 'category: Discussion','category: Feature Request','deferred','help needed: Open Research Problem','help needed: Request Input from Community','never stale','TODO: Documentation'
exempt-issue-labels: ['category: Discussion','category: Feature Request','deferred','help needed: Open Research Problem','help needed: Request Input from Community','never stale','TODO: Documentation']
days-before-issue-stale: 30
days-before-issue-close: 7
stale-issue-message: 'This issue has been automatically marked as stale because it has not had recent activity. If there are no updates within 7 days it will be closed. You can add the "never stale" tag to prevent the issue from closing this issue.'
Expand Down
27 changes: 26 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,48 @@ This file documents all notable changes to the GEOS-Chem repository starting in

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [14.4.3] - 2024-08-13
### Added
- Added ModelEe.2 (GCAP 2.0) simulation to integration tests for GCClassic
- Added simulation with all diagnostics on in HISTORY.rc to integration tests for GCClassic (including Planeflight + ObsPack) and GCHP
- Added descriptive error message in `Interfaces/GCHP/gchp_historyexportsmod.F90`
- Auto-update GCHP HEMCO_Diagn.rc settings at run-time to ensure seasalt, dust, soil NOx, and biogenic emissions match settings in HEMCO_Config.rc

### Fixed
- Added brackets around `exempt-issue-labels` list in `.github/workflows/stale.yml`

### Removed
- Removed `XNUMOL_H2O2 / CM3PERM3` in routine `Chem_H2O2`, which removes an unnecessary unit conversion for the aerosol-only simulation

## [14.4.2] - 2024-07-24
### Added
- Added number of levels with clouds for photolysis to geoschem_config.yml and Input_Opt to pass to Cloud-J
- Added `State_Grid%CPU_Subdomain_ID` and `State_Grid%CPU_Subdomain_FirstID` as "identifier numbers" for multiple instances of GEOS-Chem on one core in WRF and CESM
- Added transport tracer run directory option for global half-degree GC-Classic run with GEOS-IT 0.5x0.625 fields

### Changed
- Now reset `State_Diag%SatDiagnCount` to zero in routine`History_Write` (instead of in `History_Netcdf_Write`)
- Update rundir creation scripts to turn off the MEGAN extension for "standard" fullchem simulations
- Updated emissions used in CESM to match standard emissions used in the 14.4 offline model
- Disable support For FAST-JX for all simulations except Hg
- Replace calls to `GEOS_CHEM_STOP` with calls to `GC_Error` in `planeflight_mod.F90`
- Script `test/integration/GCHP/integrationTestExecute.sh` now resets `cap_restart` time to `000000`, to facilitate manual restart

### Fixed
- Typo in `setCommonRunSettings.sh` that made GCHP always choose mass fluxes for meteorology
- Fixed bug in # levels with cloud used in photolysis when using GCAP met or CESM
- Fixed typos for `SatDiagnEdge` collection in `HISTORY.rc` templates
- The `SatDiagnOH` diagnostic now works for the carbon simulation
- Restored missing fields for `UVFlux` collection in `run/GCClassic/HISTORY.rc.templates/HISTORY.rc.fullchem`
- Comment out `UVFlux` diagnostic in the "alldiags" integration test, there is a floating point error. Look at this later.
- Now use SO4 instead of O3 in the GCHP fullchem budget diagnostic (SO4 is soluble, O3 is not)
- Convert `UVFlux_Tag_Names` to uppercase in the comparison in `Get_UVFlux_Bin`(located in`Headers/state_diag_mod.F90`)
- Fixed typo (missing `_` character) in GCHP `DryDep` collection diagnostic entries
- Commented out with `###` emissions diagnostics in the GCHP `HISTORY.rc.fullchem` template that are not present in the corresponding `HEMCO_DIAGN.rc` template

### Removed
- Entry `SatDiagnPEDGE` from the `SatDiagn` collection; This needs to go into the `SatDiagnEdge` collection.


### Changed
- Only read photolysis data in `Init_Photolysis` in first instance of GEOS-Chem on each PET in CESM as PIO requires it

Expand Down Expand Up @@ -428,6 +449,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Removed State_Met%LWI and input meteorology LWI from carbon simulation run config files
- Removed function `CLEANUP_UCX`; deallocations are now done in `state_chm_mod.F90`

## [14.4.3] - 2024-08-13
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are these lines so far down? Perhaps a merge issue? I think they need to be moved up.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks Melissa, I can fix that in a post-merge fix.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK. I will approve then.

### Added
- Tropopause pressure field in the satellite diagnostic (by @eamarais)

## [14.1.0] - 2023-02-01
### Added
- Added dry deposition updates to Hg0 from Feinberg22 ESPI publication + AMAP emissions
Expand Down
7 changes: 7 additions & 0 deletions GeosCore/diagnostics_mod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -1521,6 +1521,13 @@ SUBROUTINE Do_Archive_SatDiagn( Input_Opt, State_Chm, State_Diag, &
State_Diag%SatDiagnTROPP(I,:) = State_Met%TROPP(I,:) * good
ENDIF

!---------------------------------------------------------------------
! Tropopause level [unitless]:
!---------------------------------------------------------------------
IF ( State_Diag%Archive_SatDiagnTropLev ) THEN
State_Diag%SatDiagnTropLev(I,:) = State_Met%TropLev(I,:) * good
ENDIF

!---------------------------------------------------------------------
! PBL Height [m]:
!---------------------------------------------------------------------
Expand Down
Loading