Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changes for GEOS-Chem v14.4 within CESM compatibility #2348

Merged
merged 3 commits into from
Jun 25, 2024
Merged

Changes for GEOS-Chem v14.4 within CESM compatibility #2348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b3e5c4f
Changes for GEOS-Chem within CESM compatibility
jimmielin Jun 24, 2024
abb36e6
Update CHANGELOG.md
jimmielin Jun 24, 2024
8d0fdca
Remove extraneous variables in MODEL_CESM block in UCX
jimmielin Jun 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,14 @@ 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
### Changed
- Updated `run/CESM` with alphabetical sorting of species in `geoschem_config.yml`

### Removed
- 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
- Added `SpcConc%Units` for species-specific unit conversion
Expand Down
10 changes: 0 additions & 10 deletions GeosCore/ucx_mod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3903,8 +3903,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 @@ -3930,10 +3928,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 @@ -4057,7 +4051,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 @@ -4138,9 +4131,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 )
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The error catch right below this line should be removed as well.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks Lizzie, I also got rid of all the unnecessary variable definitions.

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
View file
Open in desktop
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
6 changes: 3 additions & 3 deletions run/CESM/geoschem_config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,16 +94,16 @@ operations:
- AERI
- ALD2
- ALK4
- AONITA
- AROMP4
- AROMP5
- ASOA1
- ASOA2
- ASOA3
- ASOAN
- ASOG1
- ASOG2
- ASOG3
- AONITA
- AROMP4
- AROMP5
- ATOOH
- BALD
- BCPI
Expand Down