Skip to content

Commit

Permalink
Merge PR #396 (Add GCHP_WRAPPER cpp definition)
Browse files Browse the repository at this point in the history
This merge brings PR #396 (Add GCHP_WRAPPER cpp definition, by @lizziel)
into the GEOS-Chem "no-diff-to-benchmark" development stream.

This fixes an compiliation issue in Cloud-J, which occurred because the
GCHP_WRAPPPER C-preprocessor setting was not defined in CMakeLists.txt.
Thus we need to merge this PR before Cloud-J PR #10 and GCHP PR #394.

Signed-off-by: Bob Yantosca <yantosca@seas.harvard.edu>
  • Loading branch information
yantosca committed Mar 18, 2024
2 parents cbba841 + 6ca8b1f commit e80c2dd
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
## [Unreleased] - TBD
### Added
- Now print container name being read by ExtData when `CAP.EXTDATA` is set to `DEBUG` in `logging.yml`
- Added new pre-processer setting GCHP_WRAPPER for use in submodules

### Changed
- Now use short names for submodules (i.e. without the path) in `.gitmodules`
Expand Down
1 change: 1 addition & 0 deletions src/GCHP_GridComp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
# Set cmake logicals needed for subprojects
#---------------
set(FV_PRECISION R8 ) # FV3 precision is R8
set(GCHP_WRAPPER TRUE ) # GCHP model configuration
set(CLOUDJ_EXTERNAL_CONFIG TRUE ) # Not Cloud-J standalone
set(HEMCO_EXTERNAL_CONFIG TRUE ) # Not HEMCO standalone
set(GC_EXTERNAL_CONFIG TRUE ) # Not GEOS-Chem Classic
Expand Down

0 comments on commit e80c2dd

Please sign in to comment.