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

Fixes towards achieving bit-for-bit reproducibility in GC-Classic upon restart #2521

Draft
wants to merge 123 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
123 commits
Select commit Hold shift + click to select a range
81912e0
Simplified and removed unnecessary codes
yuanjianz Jun 8, 2024
f79c946
Supported SVPOA in SNAOM parameterized effective radius
yuanjianz Jun 8, 2024
2592c6d
Fixed bug only including Isoprene SOA OC for TotalOC in complexSOA_no…
yuanjianz Jun 12, 2024
5709742
Add fixes for ALK4 and R4N2 chemistry from Brewer et al. (2023, JGR)
msulprizio Jun 26, 2024
59d5a8f
Add KPP_AbsTol and KPP_RelTol to species_database.yml
yantosca Jul 2, 2024
9f22811
Update CHANGELOG for KPP_AbsTol and KPP_RelTol updates
yantosca Jul 2, 2024
0952b24
In roundoff_mod.F90, cast first, then round off if places > 0
yantosca Jul 2, 2024
813ea43
Fixed typo in fullchem_mod.F90
yantosca Jul 2, 2024
4288f0d
Merge PR #2359 (Set KPP dummy species to large ATOL value)
yantosca Jul 3, 2024
e61a510
Merge GCHP hotfix from PR #2363 on top of PR #2359
yantosca Jul 8, 2024
e86648f
Merge branch 'geoschem:main' into bugfix/Reff-SVPOA
yuanjianz Jul 14, 2024
006d012
Updated CHANGELOG.md
yuanjianz Jul 14, 2024
efa425c
Add KPP_AbsTol and KPP_RelTol to species_database.yml
yantosca Jul 2, 2024
8129a60
Update CHANGELOG for KPP_AbsTol and KPP_RelTol updates
yantosca Jul 2, 2024
fd5541a
In roundoff_mod.F90, cast first, then round off if places > 0
yantosca Jul 2, 2024
b0ec470
Fixed typo in fullchem_mod.F90
yantosca Jul 2, 2024
eabf06c
Update setCommonRunSettings.sh.template
ltmurray Jul 4, 2024
ef2ea60
Merge PR #2315 (Fix bugs in PDER, OCPISOA, and TotalOC)
yantosca Jul 16, 2024
0276c54
Uncomment setting Ca2, K, and Mg cation values passed to HETP
lizziel Jul 23, 2024
0a17228
Merge GEOS-Chem 14.4.2 back into the 14.5.0 development stream
yantosca Jul 24, 2024
e29a4c9
Merge PR #2398 (Pass non-zero Ca2, Mg, and K cations to HETP)
yantosca Jul 25, 2024
6548a8b
Merge 'origin/dev/14.5.0' into bugfix/alk4-chem-brewer2023
msulprizio Jul 25, 2024
0a392d4
Merge PR #2352 (Fixes for ALK4 and R4N2 chemistry from J. Brewer)
yantosca Aug 1, 2024
acd3354
PR #2352 post-merge fix: Rebuild fullchem solver files
yantosca Aug 5, 2024
cb86824
Archive "Drydep" diags in fullchem bmks; Reduce GCHP "DryDep" output
yantosca Feb 2, 2024
8fae654
Fix minor issues for PR #2144 (restore drydep in benchmarks)
yantosca Aug 7, 2024
000205c
Merge GEOS-Chem 14.4.3 back into the 14.5.0 development branch
yantosca Aug 13, 2024
e4e78a7
Add soil temperature (TSOIL1) field to State_Met for use in HEMCO soi…
msulprizio Aug 14, 2024
8f0a167
PR #2425 post-merge fix: Move 14.4.3 entry to top of CHANGELOG.md
yantosca Aug 15, 2024
99802a3
Rebase PR #2318 (Chemistry of RCHO, HCOOH ...) to commit 8f0a16767
Mar 18, 2024
32e4c09
Rebuilt the fullchem mechanism with KPP version 3.1.1
yantosca Aug 1, 2024
7cd5aef
Add emissions of new species to HEMCO_Config and ExtData templates
yantosca Aug 5, 2024
e94b5ff
Bug fix: Remove duplicates CEDS_CH614_* containers in HEMCO_Config
yantosca Aug 5, 2024
412f266
Fixed typo in HEMCO_Config.rc.fullchem templates
yantosca Aug 6, 2024
6788b9d
Update HEMCO_Config.rc for CESM with Kelvin Bates emissions updates
yantosca Aug 6, 2024
ef63c98
Fixed typo in species_database.yml for TLFUO2
yantosca Aug 8, 2024
1958e6e
Update config files for PR #2318
yantosca Aug 15, 2024
8a55346
Fix indentation in species_database.yml for aoa_PROP
yantosca Aug 15, 2024
d7e1248
Add new species to GCHP geoschem_config.yml.fullchem template
yantosca Aug 19, 2024
dd7ba9a
Merge PR #2318 (Chemistry for RCOOH, ANs, PNs)
yantosca Aug 19, 2024
53f9b2e
PR #2318 post-merge fix: Add missing species to geoschem_config.yml
yantosca Aug 19, 2024
f240c99
PR #2318 post-merge fix: Remove duplicate EmisHCOOH_Total entry
yantosca Aug 19, 2024
1eb36e5
Add DryDepChm_O3 and DryDepMix_O3 to HISTORY.rc.fullchem
yantosca Aug 20, 2024
586260f
PR #2318 post-merge fix: Use less drydep fields for the alldiags test
yantosca Aug 20, 2024
c7332ed
Merge PR #2144 (Restore drydep output in fullchem benchmarks)
yantosca Aug 20, 2024
443a91a
mass conservation fixes
nicholasbalasus Aug 20, 2024
0aaee51
Add UseSoilTemperature option to SoilNOx extension in HEMCO_Config.rc…
msulprizio Aug 19, 2024
a8e1983
Merge branch 'origin/dev/14.5.0' into feature/ywang_soil_nox
msulprizio Aug 21, 2024
0620a7e
Update GFED4_Climatology entries for period 2010-2023
yantosca Aug 21, 2024
3073aff
Merge PR #2428 (Fix mass non-conservation in VDIFF)
yantosca Aug 26, 2024
bb2cc85
Store optical properties *.dat files in new data directory
lizziel Aug 14, 2024
388db30
Move RD_AOD and CALC_AOD from photolysis module to aerosols module
lizziel Aug 14, 2024
a436582
Call RD_AOD and CALC_AOD within Init_Aerosol subroutine
lizziel Aug 15, 2024
c746667
Update changelog
lizziel Aug 15, 2024
303caa2
Also call RD_AOD and CALC_AOD in Fast-JX initialization for Hg simula…
lizziel Aug 15, 2024
0c1ab5e
Update criteria for calling Init_Aerosol to be based on simulation type
lizziel Aug 15, 2024
99bfba4
Remove RD_AOD and CALC_AOD from photolysis_mod
lizziel Aug 15, 2024
75d885d
Add aerosol optics input dir to geoschem_config.yml.Hg template
yantosca Aug 19, 2024
e3d3f9b
Add missing entries for TMB and OTHER_VOC in ExtData.rc.fullchem
yantosca Aug 27, 2024
7919ccd
Initial update for PPN photolysis from Horner et al 2024
yantosca Aug 20, 2024
99f1cf9
Rebuild chemical mechanism for PPN photolysis w/ KPP 3.1.1
yantosca Aug 20, 2024
113f634
Update run scripts and environment files for NASA discover cluster
lizziel Aug 28, 2024
43d0e90
Merge PR #2371 (Adding PPN photolysis)
yantosca Aug 29, 2024
d4c47ba
Merge PR #2439 (Update run scripts and env files for Discover)
yantosca Aug 29, 2024
211c6dc
Bug fix: Replace $YYYY with %y4 in ExtData.rc.fullchem
yantosca Aug 29, 2024
d34c567
Merge PR #2436 (Update GFED4 climatology for 2010-2023)
yantosca Aug 29, 2024
602b660
PR #2436 post-merge update: Fix typo in ExtData.rc.fullchem
yantosca Aug 29, 2024
e0ba09e
Expand photolysis menu to set Cloud-J options at run-time
lizziel Aug 13, 2024
d89087d
Compute water concentration to pass to Cloud-J for UV absorption by H2O
lizziel Aug 26, 2024
d304ba7
Pass spherical correction from parent model rather than hard-code
lizziel Aug 27, 2024
810228b
Updated changelog
lizziel Aug 29, 2024
f839a16
Update Cloud-J data directory paths for Cloud-J v8 input files
lizziel Aug 29, 2024
647c9f5
Merge PR #2426 (Store aerosol-specific optics files in new directory)
yantosca Aug 29, 2024
40a0785
Merge PR #2424 (Support for Cloud-J_v8.0.0)
yantosca Aug 29, 2024
1951ea9
Hotfix: Declare PPN as photolyzing in the species database
yantosca Sep 3, 2024
d13c4fa
Merge branch 'dev/14.5.0' into feature/ywang_soil_nox
msulprizio Sep 3, 2024
0332049
Bug fix: Properly order photo rxns for PPN, PNs, and ANs
yantosca Sep 5, 2024
a5fba9c
Merge PR #2452 (Reorder photo rxns for PNs and ANs)
yantosca Sep 6, 2024
7c73070
Fix entries with "Is_Photolysis: true" in species_database.yml
yantosca Sep 11, 2024
25332d3
Updated J-value entries in GCHP HISTORY.rc.fullchem file
yantosca Sep 12, 2024
7361083
Updated note in CHANGELOG.md about added species
yantosca Sep 12, 2024
cd03660
Merge PR #2457 (Update Is_Photolysis tags in species_database.yml)
yantosca Sep 13, 2024
84da437
Bug fix: ALK6 in HEMCO_Config.rc should be ALK7
msulprizio Sep 13, 2024
aa40c69
Merge PR #2430 (Updated Y. Wang soil NOx scheme as an option)
yantosca Sep 13, 2024
5c31c34
Merge PR #2430 (Updated Y. Wang soil NOx scheme as an option)
yantosca Sep 16, 2024
c0aeff4
Merge PR #2462 (Bug fix: ALK6 in HEMCO_Config.rc should be ALK7)
yantosca Sep 16, 2024
c66e775
Add seasonality to CH4 reservoir emissions
msulprizio Sep 17, 2024
53a0ed5
Remove Is_Photolysis in species database for species not in FJX_j2j.dat
lizziel Sep 17, 2024
5ea40b2
Remove Is_Photolysis in species database for species not in fullchem.eqn
lizziel Sep 17, 2024
e270831
Update CH4 emissions in ExtData.rc to convert molec/cm2/s to kg/m2/s
lizziel Sep 19, 2024
ef2b073
Update dry mass ratio of seasalt in aerosol thermodynamics
lizziel Sep 19, 2024
dd8cce6
Merge PR #2464 containing fix to remove J-value diagnostics which are…
msulprizio Sep 19, 2024
875a159
Merge PR #2467 containing fixes for dry mass fraction of seasalt in a…
msulprizio Sep 20, 2024
2345214
Bugfix: Restore stale workflow functionality
msulprizio Sep 24, 2024
1e87827
Merge branch 'dev/14.5.0' into feature/ch4-seasonal-reservoir
msulprizio Sep 24, 2024
7238aac
Fix entry for SEASONAL_RES_MASK in ExtData.rc.carbon for GCHP
msulprizio Sep 24, 2024
95827cc
Bug fix for double counting CH4 agricultural burning emissions
msulprizio Sep 25, 2024
f2f6e09
Fix typo in SEASONAL_RES_MASK entry in ExtData.rc.carbon
msulprizio Sep 27, 2024
580c4e0
Merge PR #2477 removing double counting of CH4 agricultural burning e…
msulprizio Sep 27, 2024
4f11ef0
Merge PR #2473 applying seasonality to CH4 hydropower reservoir emiss…
msulprizio Sep 27, 2024
7ffdb5b
Merge PR #2472 containing a fix for the stale issue Github workflow
msulprizio Sep 27, 2024
e3113b3
Update formulas for TK, TMg, and TCa
yc-chan Sep 30, 2024
cf3f81b
Clean up CHANGELOG.md for 14.5.0 release
msulprizio Sep 30, 2024
6aa3ca2
Update CHANGELOG.md
yc-chan Sep 30, 2024
ced6447
Merge PR #2489 containing a bug fix for coarse-mode seasalt Ca, Mg, a…
msulprizio Sep 30, 2024
c7a6ae6
Merge PR #2490 cleaning up CHANGELOG.md
msulprizio Oct 1, 2024
f8d21f2
Fix GCHP ExtData.rc entry for CO2 diurnal scale factors
lizziel Oct 1, 2024
341ac16
Use ALK6 species name for >= C6 alkanes instead of ALK7
msulprizio Oct 1, 2024
57cf0df
Merge PR #2493 renaming ALK7 to ALK6
msulprizio Oct 3, 2024
51d306d
Merge PR #2492 with fixes for the GCHP carbon simulation
msulprizio Oct 3, 2024
0c2877a
Fix bug in Chem_ORVCsesq restart file entry in GC-Classic fullchem co…
lizziel Oct 4, 2024
9a06d08
Change state_met diagnostic output to be same precision as in the model
lizziel Oct 4, 2024
f6057f1
Fix minor error in checking variables after State_Chm array allocation
lizziel Oct 4, 2024
0e3b60d
Change state_chm diagnostic output to be same precision as in model
lizziel Oct 4, 2024
5196db6
Write out restart species concentrations as REAL8
lizziel Oct 4, 2024
6bcd1d9
Remove unused local variables in ucx_mod
lizziel Oct 4, 2024
97fbe1b
Move getting restart var DELPDRY to subroutine GC_Get_Restart
lizziel Oct 4, 2024
3a65c4f
Add GeosUtil/print_mod.F90 for specialized model print options
lizziel Oct 15, 2024
011e80c
Convert species concentration units of mol/mol <-> kg/kg in main.F90
lizziel Oct 15, 2024
c9df854
Move setting prescribed CH4 to just after emissions
lizziel Oct 15, 2024
6d3db18
Fix parallelization issue called SOIL_DRYDEP from HEMCO interface
lizziel Oct 16, 2024
1280b19
Clean up string formating in Get_GC_Restart subroutine
lizziel Oct 16, 2024
c0aa7f7
No diff fixes to SOIL_WETDEP and SOIL_DRYDEP
lizziel Oct 17, 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
53 changes: 44 additions & 9 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,46 @@ 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).

## [Unreleased] - TBD
### Added
- Added vectors `State_Chm%KPP_AbsTol` and `State_Chm%KPP_RelTol`
- Added setting `KPP_AbsTol` to 1e5 for dummy species in `species_database.yml` and `species_database_hg.yml`
- Implemented PPN photolysis from Horner et al (2024)
- Added four new species ALK4N1, ALK4N2, ALK4O2, and ALK4P to address issues in ALK4 and R4N2 chemistry following Brewer et al. (2023, JGR)
- Added new species ALK4N1 and ALK4N2 to Ox family in KPP
- Added Cloud-J input parameters to geoschem_config.yml in new photolysis sub-menu called cloud-j
- Added computation of water concentration to use in photolysis for application of UV absorption by water in Cloud-J v8
- Added ACO3, ACR, ACRO2, ALK4N{1,2,O}2, ALK4P, ALK6, APAN, APINN, APINO2, APINP, AROCMCHO, AROMCO3, AROMPN, BPINN, BPINO2, BPINON, BPINOO2, BPINOOH, BPINP, BUTN, BUTO2, C4H6, C96N, C96O2, C9602H, EBZ, GCO3, HACTA, LIMAL, LIMKB, LIMKET, LIMKO2, LIMN, LIMNB, LIMO2H, LIMO3, LIMO3H, LIMPAN, MEKCO3, MEKPN, MYRCO, PHAN, PIN, PINAL, PINO3, PINONIC, PINPAN, R7N{1,2}, R7O2, R7P, RNO3, STYR, TLFUO2, TLFUONE, TMB, ZRO2 to `species_database.yml` following Travis et al. 2024
- Added TSOIL1 field to `State_Met` for use in HEMCO soil NOx extension. This should only be read in when the `UseSoilTemperature` option is true in HEMCO config

### Changed
- Copied values from `State_Chm%KPP_AbsTol` to `ATOL` and `State_Chm%KPP_RelTol` to `RTOL` for fullchem and Hg simulations
- Introduced seasalt Ca, K, Mg back to aerosol thermodynamics via HETP.
- Updated `HEMCO_Config.rc.fullchem` (GCClassic + GCHP) and `ExtData.rc` to add emissons of new species from Travis et al 2023
- Activated the `DryDep` collection for GCClassic & GCHP fullchem benchmarks
- Reduced the GCHP `DryDep` collection to only the necessary species for benchmarks
- Removed unused `VDIFFAR` routine from `vdiff_mod.F90`
- Updated MW for CH4 and OH in `global_ch4_mod.F90`
- Added fix to not convert from kg/kg to mol/mol before passing State_Chm to PBL mixing in `vdiff_mod.F90`
- Updated GC-Classic and GCHP run scripts and environment files for NASA discover cluster
- Updated `GFED4_Climatology` entries to point to the climatology file for 2010-2023
- Moved aerosol optical properties files to a new data directory specified in geoschem_config.yml rather than specifying in photolysis input files
- Moved calls to `RD_AOD` and `CALC_AOD` from `Init_Aerosol` rather than `Init_Photolysis`
- Updated ResME CH4 reservoir emissions to apply seasonality via mask file

### Fixed
- Simplified SOA representations and fixed related AOD and TotalOA/OC calculations in benchmark
- Changed mass conservation adjustment in `vdiff_mod.F90` to use a mass tendency with units of `kg species/kg dry air`
- Converted the top pressure edge from hPa to Pa in `vdiff_mod.F90`
- Updated `Jval_` entries in `run/GCHP/HISTORY.rc.templates/HISTORY.rc.fullchem`
- Updated species database Is_Photolysis entries to remove J-value diagnostics with all zeros in full chemistry simulation
- Removed EDGAR8_CH4_AWB emissions from CH4 and carbon simulations to avoid double counting with GFED
- Fixed formatting error in `.github/workflows/stale.yml` that caused the Mark Stale Issues action not to run
- Fixed emissions in GCHP carbon ExtData.rc so that data in molecules/cm2/s are converted to kg/m2/s

## [14.4.3] - 2024-08-13
### Added
- Added tropopause pressure field in the satellite diagnostic (by @eamarais)
- 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`
Expand All @@ -28,10 +66,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- 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
- Only read photolysis data in `Init_Photolysis` in first instance of GEOS-Chem on each PET in CESM as PIO requires it
- 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
- In `Headers/roundoff_mod.F90`, first cast and then only round off if `places > 0`
- 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
Expand All @@ -46,9 +86,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
### 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

## [14.4.1] - 2024-06-28
### Added
- Added initialization of PHOTDELTA in `ucx_h2so4phot` to avoid run-time error in CESM
Expand All @@ -73,6 +110,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Removed MPI broadcasts in CESM-only UCX code; MPI broadcast done at coupler level
- Remove enabling O-server in GCHP for high core counts

### Fixed
- In `Headers/roundoff_mod.F90`, first cast and then only round off if `places > 0`

## [14.4.0] - 2024-05-30
### Added
- Added `SpcConc%Units` for species-specific unit conversion
Expand Down Expand Up @@ -188,7 +228,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

### Removed
- Removed MPI broadcasts in CESM-only photolysis code; will read on all cores
- Removed State_Chm%CH4_EMIS
- Removed `State_Chm%CH4_EMIS`

## [14.3.0] - 2024-02-07
### Added
Expand Down Expand Up @@ -443,16 +483,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Fixed a bug in routine GET_IJ where X and Y were swapped in an IF comparison.
- Fixed bug in GFAS pFe by applying work-around in config files


### Removed
- Removed `intTest*_slurm.sh`, `intTest_*lsf.sh`, and `intTest*_interactive.sh` integration test scripts
- 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
### 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
Loading