Skip to content

Commit

Permalink
Merge PR #1879 (Add new GCHP config file for ESMF logging)
Browse files Browse the repository at this point in the history
This merge brings PR #1879 (Add new GCHP config file for ESMF logging,
by @lizziel) into the GEOS-Chem 14.2.1 development stream.

This update is necessary to remove the hardwired configuration for
ESMF log file output in MAPL code.  Users may now configure the ESMF.rc
file to select ESMF log file output options.

Signed-off-by: Bob Yantosca <yantosca@seas.harvard.edu>
  • Loading branch information
yantosca committed Jul 18, 2023
2 parents f9d697f + 067b1f8 commit 2fd2002
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 0 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Script `test/difference/diffTest.sh`, checks 2 different integration tests for differences
- Added GCHP environment file and export/unset env variables in run script for NASA Pleiades cluster
`SatDiagnEdge` collection to all GEOS-Chem Classic `HISTORY.rc` templates
- Added new GCHP config file ESMF.rc for configuring ESMF logging

### Changed
- Update `DiagnFreq` in GCClassic integration tests to ensure HEMCO diagnostic output
Expand All @@ -19,6 +20,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Explicitly define tagCH4 simulations in `Input_Opt` rather than basing off of number of advected species
- The `fullchem` mechanism must now be built with KPP 3.0.0 or later
- Changed the AEIC 2019 monthly climatology specification format in ExtData.rc to match standard convention for climatology
- Changed default ESMF logging in GCHP to be ESMF_LOGKIND_NONE (no log)

### Fixed
- Add missing mol wt for HgBrO in `run/shared/species_database_hg.yml`
Expand Down
7 changes: 7 additions & 0 deletions run/GCHP/ESMF.rc
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
logKindFlag: ESMF_LOGKIND_NONE

# ESMF_LOGKIND options for ESMF logging. Options include:
# ESMF_LOGKIND_NONE - no ESMF logging
# ESMF_LOGKIND_SINGLE - one log file (ESMF_LogFile)
# ESMF_LOGKIND_MULTI - one log file per core (PET#.ESMF_LogFile)
# ESMF_LOGKIND_MULTI_ON_ERROR - one log file per core if error (PET#.ESMF_LogFile))
1 change: 1 addition & 0 deletions run/GCHP/init_rd.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ variables=$(echo $variables | sort | uniq)
envsubst_list="$(printf '${%s} ' $variables)"

COPY_LIST="""
ESMF.rc
input.nml
logging.yml
HEMCO_Diagn.rc.templates/HEMCO_Diagn.rc.${RUNDIR_SIM_NAME}
Expand Down
1 change: 1 addition & 0 deletions run/shared/cleanRunDir.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ rm -fv gchp.log
rm -fv gchp.*.log
rm -fv HEMCO.log
rm -fv PET*.log
rm -fv ESMF_LogFile
rm -fv multirun.log
rm -fv warnings_and_errors.log
rm -fv GC*.log
Expand Down

0 comments on commit 2fd2002

Please sign in to comment.