Skip to content

Commit

Permalink
Merge PR #2560 (Fix trace metals sim name in config files)
Browse files Browse the repository at this point in the history
This merge brings PR #2560 (Fix trace metals simulation name in
config file comments, by @ihough) into the GEOS-Chem
"no-diff-to-benchmark" development stream.

This PR fixes incorrect comments in configuration files.
Also, merge conflicts in CHANGELOG.md have been resolved.

Signed-off-by: Bob Yantosca <[email protected]
  • Loading branch information
yantosca committed Nov 19, 2024
2 parents 68e6933 + 50fa39f commit f149b46
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Added fix to turn on ship emissions for CO2 in the carbon simulation
- Updated `HEMCO_Config.rc` for carbon simulation to read data based on carbon species used
- Fixed entries for CO2 emissions in `ExtData.rc.carbon`
- Fixed metals simulation name in config file template comments

## [14.5.0] - 2024-11-07
### Added
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#\\
#\\
# !REMARKS:
# This file has been customized for the Transport Tracers simulation.
# This file has been customized for the trace metals simulation.
# See The HEMCO User's Guide for file details:
# http://wiki.geos-chem.org/The_HEMCO_User%27s_Guide
#
Expand Down
2 changes: 1 addition & 1 deletion run/GCClassic/HISTORY.rc.templates/HISTORY.rc.metals
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
###############################################################################
### HISTORY.rc file for GEOS-Chem Transport Tracers simulations ###
### HISTORY.rc file for GEOS-Chem trace metals simulations ###
### Contact: GEOS-Chem Support Team ([email protected]) ###
###############################################################################

Expand Down

0 comments on commit f149b46

Please sign in to comment.