Skip to content

Commit

Permalink
Throw a CMake error if FAST-JX is used for any mech except Hg
Browse files Browse the repository at this point in the history
src/GCHP_GridComp/GEOSChem_GridComp/CMakeLists.txt
- Add an if block to throw a fatal error if the FASTJX compile option
  is selected for fullchem, custom, or carbon simulations.  Fullchem
  and custom mechanisms use Cloud-J.  We still need to use the FAST-JX
  photolysis scheme with Hg pending input file updates.

CHANGELOG.md
- Updated accordingly

Signed-off-by: Bob Yantosca <[email protected]>
  • Loading branch information
yantosca committed Jul 12, 2024
1 parent 95a745c commit 481ea94
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 5 deletions.
14 changes: 9 additions & 5 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
# Changelog

This file documents all notable changes to the GCHP wrapper repository starting in version 14.0.0. See also CHANGELOG files for individual submodules, such as:
- src/GCHP_GridComp/GEOSChem_GridComp/geos-chem/CHANGELOG.md
- src/GCHP_GridComp/GEOSChem_GridComp/HEMCO/CHANGELOG.md
- src/GCHP_GridComp/GEOSChem_GridComp/Cloud-J/CHANGELOG.md
- src/GCHP_GridComp/GEOSChem_GridComp/HETP/CHANGELOG.md
- src/MAPL/CHANGELOG.md
- `src/GCHP_GridComp/GEOSChem_GridComp/geos-chem/CHANGELOG.md`
- `src/GCHP_GridComp/GEOSChem_GridComp/HEMCO/CHANGELOG.md`
- `src/GCHP_GridComp/GEOSChem_GridComp/Cloud-J/CHANGELOG.md`
- `src/GCHP_GridComp/GEOSChem_GridComp/HETP/CHANGELOG.md`
- `src/MAPL/CHANGELOG.md`

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
### Changed
- CMake now throws an error if FAST-JX is used with any other mechanism than Hg

## [14.4.1] - 2024-06-28
### Fixed
- Fixed formatting error in `.github/workflows/stale.yml` that caused the Mark Stale Issues action not to run
Expand Down
8 changes: 8 additions & 0 deletions src/GCHP_GridComp/GEOSChem_GridComp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -147,3 +147,11 @@ gc_pretty_print(VARIABLE RRTMG IS_BOOLEAN)
gc_pretty_print(VARIABLE GTMM IS_BOOLEAN)
gc_pretty_print(VARIABLE LUO_WETDEP IS_BOOLEAN)
gc_pretty_print(VARIABLE FASTJX IS_BOOLEAN)

# Throw an error unless we are using the Hg mechanism,
# The fullchem & custom mechanisms now use Cloud-J!
if(${FASTJX})
if(NOT ${MECH} MATCHES "Hg")
message(FATAL_ERROR "FASTJX can only be used with the Hg mechanism!")
endif()
endif()

0 comments on commit 481ea94

Please sign in to comment.