Skip to content

Commit

Permalink
Merge PR 2225# (Don't expect photolysis dirs to end in "/")
Browse files Browse the repository at this point in the history
This merge brings PR # (Remove requirement for photolysis data directories
to end with slash, by @lizziel) into the GEOS-Chem "no-diff-to-benchmark"
development stream.

This PR is needed to facilitate interfacing GEOS-Chem into external
models such as CESM (which may not require that directory paths in
specified in configuration files end with a "/" character.)

Signed-off-by: Bob Yantosca <yantosca@seas.harvard.edu>
  • Loading branch information
yantosca committed Mar 28, 2024
2 parents d085e39 + df50721 commit a185885
Show file tree
Hide file tree
Showing 2 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 util folder in run/CESM to include .cdl file used to generate CESM NetCDF input file for deposition
- Add GCClassic operational example environment files for Harvard Cannon
- Added new GCHP history collections for advection diagnostics
- Added slash in front of names of LUT files read into `photolysis_mod.F90` to avoid needing it in path

### Changed
- Updated Harvard Cannon operational run scripts to use `huce_cascade` instead of `huce_intel`; also added `sapphire`
Expand Down
4 changes: 2 additions & 2 deletions GeosCore/photolysis_mod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -938,7 +938,7 @@ SUBROUTINE RD_AOD( Input_Opt, State_Chm, RC )

! Choose different set of input files for standard (trop+strat chenm)
! and tropchem (trop-only chem) simulations
THISFILE = TRIM( DATA_DIR ) // TRIM( SPECFIL(k) )
THISFILE = TRIM( DATA_DIR ) // '/' // TRIM( SPECFIL(k) )

!--------------------------------------------------------------
! In dry-run mode, print file path to dryrun log and cycle.
Expand Down Expand Up @@ -1572,7 +1572,7 @@ SUBROUTINE RD_PROF_NC( Input_Opt, State_Chm, RC )
TREF => State_Chm%Phot%TREF

! Directory and file names
nc_dir = TRIM( Input_Opt%CHEM_INPUTS_DIR ) // 'FastJ_201204/'
nc_dir = TRIM( Input_Opt%CHEM_INPUTS_DIR ) // '/' // 'FastJ_201204' // '/'
nc_file = 'fastj.jv_atms_dat.nc'
nc_path = TRIM( nc_dir ) // TRIM( nc_file )

Expand Down

0 comments on commit a185885

Please sign in to comment.