Skip to content

Commit

Permalink
Merge PR #2348 (Changes for 14.4.0 within CESM compatibility)
Browse files Browse the repository at this point in the history
This merge brings PR #2348 (Changes for GEOS-Chem v14.4 within CESM
compatibility, by @jimmielin) into the GEOS-Chem "no-diff-to-benchmark"
development stream.

This PR fixes a few minor issues in the GEOS-Chem to CESM interface.

Signed-off-by: Bob Yantosca <[email protected]>
  • Loading branch information
yantosca committed Jun 25, 2024
2 parents 0bb78b8 + d3fba4d commit 40a0723
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 16 deletions.
13 changes: 8 additions & 5 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,22 @@ This file documents all notable changes to the GEOS-Chem repository starting in
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased] - TBD
### Added
- Added initialization of PHOTDELTA in `ucx_h2so4phot` to avoid run-time error in CESM

### Changed
- Alphabetically sort Complex SOA species into `geoschem_config.yml` in run directory creation
- Alphabetically sort Complex SOA species into `geoschem_config.yml` in run directory creation

### 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
- Use hard-coded years for met fields and BC files in `HEMCO_Config.rc` so they are not read hourly
- Updated `run/CESM` with alphabetical sorting of species in `geoschem_config.yml`

### Removed
- Removed `BudgetWetDep*` entries from simulations with no soluble species in `HISTORY.rc` templates

### Added
- Added initialization of PHOTDELTA in ucx_h2so4phot to avoid run-time error in CESM
- Disabled `run/CESM` ParaNOx extension by default in `HEMCO_Config.rc`
- Removed MPI broadcasts in CESM-only UCX code; MPI broadcast done at coupler level

## [14.4.0] - 2024-05-30
### Added
Expand Down
10 changes: 0 additions & 10 deletions GeosCore/ucx_mod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -3906,8 +3906,6 @@ SUBROUTINE NOXCOEFF_INIT( Input_Opt, State_Grid, State_Chm )
USE State_Chm_Mod, ONLY : ChmState
#if defined( MODEL_CESM )
USE UNITS, ONLY : freeUnit
USE CAM_ABORTUTILS, ONLY : endrun
USE SPMD_UTILS, ONLY : mpicom, masterprocid, mpi_success, mpi_real8
#endif
!
! !INPUT PARAMETERS:
Expand All @@ -3933,10 +3931,6 @@ SUBROUTINE NOXCOEFF_INIT( Input_Opt, State_Grid, State_Chm )
INTEGER :: I, AS, IOS
INTEGER :: IMON, ITRAC, ILEV
INTEGER :: IU_FILE
#if defined( MODEL_CESM )
INTEGER :: nSize ! Number of elements in State_Chm%NOXCOEFF
INTEGER :: ierr
#endif

! Strings
CHARACTER(LEN=255) :: NOX_FILE
Expand Down Expand Up @@ -4060,7 +4054,6 @@ SUBROUTINE NOXCOEFF_INIT( Input_Opt, State_Grid, State_Chm )
State_Chm%NOXCOEFF = 0.0e+0_fp

#if defined( MODEL_CESM )
nSize = State_Chm%JJNOXCOEFF * UCX_NLEVS * 6 * 12
IF ( Input_Opt%amIRoot ) THEN
#endif
! Fill array
Expand Down Expand Up @@ -4141,9 +4134,6 @@ SUBROUTINE NOXCOEFF_INIT( Input_Opt, State_Grid, State_Chm )
ENDDO !IMON
#if defined( MODEL_CESM )
ENDIF

CALL MPI_BCAST( State_Chm%NOXCOEFF, nSize, mpi_real8, masterprocid, mpicom, ierr )
IF ( ierr /= mpi_success ) CALL endrun(subname//': MPI_BCAST ERROR: NOXCOEFF')
#endif

END SUBROUTINE NOXCOEFF_INIT
Expand Down
2 changes: 1 addition & 1 deletion run/CESM/HEMCO_Config.rc
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ VerboseOnCores: root # Accepted values: root all
# -----------------------------------------------------------------------------
100 Custom : off -
101 SeaFlux : on DMS/ACET/ALD2/MENO3/ETNO3/MOH
102 ParaNOx : on NO/NO2/O3/HNO3
102 ParaNOx : off NO/NO2/O3/HNO3
--> LUT data format : nc
--> LUT source dir : $ROOT/PARANOX/v2015-02
103 LightNOx : off NO
Expand Down

0 comments on commit 40a0723

Please sign in to comment.