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.

Sign up for GitHub

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

Disallow legacy FAST-JX unless using mercury simulation #2380

Closed
wants to merge 1 commit into from
Closed

Disallow legacy FAST-JX unless using mercury simulation #2380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
### 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 error for using legacy FAST-JX for any simulation other than mercury

### Changed
- Now reset `State_Diag%SatDiagnCount` to zero in routine`History_Write` (instead of in `History_Netcdf_Write`)
Expand Down
5 changes: 5 additions & 0 deletions GeosCore/photolysis_mod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,11 @@ SUBROUTINE INIT_PHOTOLYSIS( Input_Opt, State_Grid, State_Chm, State_Diag, RC )
!--------------------------------------------------------------------
IF ( Input_Opt%Do_Photolysis ) THEN
#ifdef FASTJX
IF ( .not. Input_Opt%Its_A_Mercury_Sim ) THEN
ErrMsg = 'Legacy FAST-JX is only an option for the mercury simulation!'
CALL GC_Error( ErrMsg, RC, ThisLoc )
RETURN
ENDIF
IF ( TRIM(Input_Opt%Fast_JX_Dir) == MISSING_STR ) THEN
ErrMsg = 'Init_Photolysis: Fast-JX directory missing in ' // &
'in geoschem_config.yml!'
Expand Down