Skip to content

Commit

Permalink
Merge PR #2347 (Use hard-coded dates for met fields/BCs)
Browse files Browse the repository at this point in the history
This merge brings PR #2347 (Use hard-coded dates for meteorological fields
and boundary conditions, by @nicholasbalasus) into the GEOS-Chem
"no-diff-to-benchmark" development stream.

This PR fixes a bug that was implemented in PR #2263.  It should improve
the performance by preventing excessive reading of met fields/BCs.

Signed-off-by: Bob Yantosca <yantosca@seas.harvard.edu>
  • Loading branch information
nicholasbalasus authored and yantosca committed Jun 24, 2024
1 parent 16ac9fc commit a6485af
Show file tree
Hide file tree
Showing 8 changed files with 77 additions and 76 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
### Fixed
- Fixed formatting error in `.github/workflows/stale.yml` that caused the Mark Stale Issues action not to run
- Fixed typo `$GCAPVERTRESL` -> `$GCAPVERTRES` in `HEMCO_Config.rc.fullchem` template file
- Use hard-coded years for met fields and BC files in HEMCO_Config.rc so they are not read hourly

## [14.4.0] - 2024-05-30
### Added
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -618,7 +618,7 @@ VerboseOnCores: root # Accepted values: root all
# --- GEOS-Chem boundary condition file ---
#==============================================================================
(((GC_BCs
* BC_ $ROOT/SAMPLE_BCs/v2021-07/CH4/GEOSChem.BoundaryConditions.$YYYY$MM$DD_0000z.nc4 SpeciesBC_?ADV? $YYYY/$MM/$DD/* EFY xyz 1 * - 1 1
* BC_ $ROOT/SAMPLE_BCs/v2021-07/CH4/GEOSChem.BoundaryConditions.$YYYY$MM$DD_0000z.nc4 SpeciesBC_?ADV? 1900-2100/1-12/1-31/* EFY xyz 1 * - 1 1
)))GC_BCs

#==============================================================================
Expand Down
2 changes: 1 addition & 1 deletion run/GCClassic/HEMCO_Config.rc.templates/HEMCO_Config.rc.Hg
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,7 @@ VerboseOnCores: root # Accepted values: root all
# --- GEOS-Chem boundary condition file ---
#==============================================================================
(((GC_BCs
* BC_ $ROOT/SAMPLE_BCs/v2019-05/tropchem/GEOSChem.BoundaryConditions.$YYYY$MM$DD_$HH$MNz.nc4 SpeciesBC_?ADV? $YYYY/$MM/$DD/* EFY xyz 1 * - 1 1
* BC_ $ROOT/SAMPLE_BCs/v2019-05/tropchem/GEOSChem.BoundaryConditions.$YYYY$MM$DD_$HH$MNz.nc4 SpeciesBC_?ADV? 1900-2100/1-12/1-31/* EFY xyz 1 * - 1 1
)))GC_BCs

(((CHEMISTRY_INPUT
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1967,7 +1967,7 @@ VerboseOnCores: root # Accepted values: root all
# --- GEOS-Chem boundary condition file ---
#==============================================================================
(((GC_BCs
* BC_ $ROOT/SAMPLE_BCs/GC_14.3.0/fullchem/GEOSChem.BoundaryConditions.$YYYY$MM$DD_$HH$MNz.nc4 SpeciesBC_?ADV? $YYYY/$MM/$DD/* EFY xyz 1 * - 1 1
* BC_ $ROOT/SAMPLE_BCs/GC_14.3.0/fullchem/GEOSChem.BoundaryConditions.$YYYY$MM$DD_$HH$MNz.nc4 SpeciesBC_?ADV? 1900-2100/1-12/1-31/* EFY xyz 1 * - 1 1
)))GC_BCs

(((CHEMISTRY_INPUT
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1067,7 +1067,7 @@ Mask fractions: false
# --- GEOS-Chem boundary condition file ---
#==============================================================================
(((GC_BCs
* BC_ $ROOT/SAMPLE_BCs/v2021-07/CH4/GEOSChem.BoundaryConditions.$YYYY$MM$DD_0000z.nc4 SpeciesBC_?ADV? $YYYY/$MM/$DD/* EFY xyz 1 * - 1 1
* BC_ $ROOT/SAMPLE_BCs/v2021-07/CH4/GEOSChem.BoundaryConditions.$YYYY$MM$DD_0000z.nc4 SpeciesBC_?ADV? 1900-2100/1-12/1-31/* EFY xyz 1 * - 1 1
)))GC_BCs
#==============================================================================
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3492,7 +3492,7 @@ VerboseOnCores: root # Accepted values: root all
# --- GEOS-Chem boundary condition file ---
#==============================================================================
(((GC_BCs
* BC_ $ROOT/SAMPLE_BCs/GC_14.3.0/fullchem/GEOSChem.BoundaryConditions.$YYYY$MM$DD_$HH$MNz.nc4 SpeciesBC_?ADV? $YYYY/$MM/$DD/* EFY xyz 1 * - 1 1
* BC_ $ROOT/SAMPLE_BCs/GC_14.3.0/fullchem/GEOSChem.BoundaryConditions.$YYYY$MM$DD_$HH$MNz.nc4 SpeciesBC_?ADV? 1900-2100/1-12/1-31/* EFY xyz 1 * - 1 1
)))GC_BCs

(((CHEMISTRY_INPUT
Expand Down
140 changes: 70 additions & 70 deletions run/GCClassic/HEMCO_Config.rc.templates/HEMCO_Config.rc.gmao_metfields

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion run/GCHP/HEMCO_Config.rc.templates/HEMCO_Config.rc.carbon
Original file line number Diff line number Diff line change
Expand Up @@ -1067,7 +1067,7 @@ Mask fractions: false
# --- GEOS-Chem boundary condition file ---
#==============================================================================
(((GC_BCs
* BC_ $ROOT/SAMPLE_BCs/v2021-07/CH4/GEOSChem.BoundaryConditions.$YYYY$MM$DD_0000z.nc4 SpeciesBC_?ADV? $YYYY/$MM/$DD/* EFY xyz 1 * - 1 1
* BC_ $ROOT/SAMPLE_BCs/v2021-07/CH4/GEOSChem.BoundaryConditions.$YYYY$MM$DD_0000z.nc4 SpeciesBC_?ADV? 1900-2100/1-12/1-31/* EFY xyz 1 * - 1 1
)))GC_BCs
#==============================================================================
Expand Down

0 comments on commit a6485af

Please sign in to comment.