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

Jump to bottom

Fix GEOS-Chem 14.5.0 build in CESM by excluding hard dependencies on HEMCO #2542

Open
wants to merge 3 commits into
base: dev/no-diff-to-benchmark
Choose a base branch
from
Open

Fix GEOS-Chem 14.5.0 build in CESM by excluding hard dependencies on HEMCO #2542

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
00c6a20
Fix GEOS-Chem 14.5.0 build in CESM by excluding hard dependencies on …
jimmielin Oct 31, 2024
b9b11b1
Update CHANGELOG
jimmielin Nov 1, 2024
482d047
Update CHANGELOG
jimmielin Nov 1, 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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Removed EDGAR8_CH4_AWB emissions from CH4 and carbon simulations to avoid double counting with GFED
- Fixed formatting error in `.github/workflows/stale.yml` that caused the Mark Stale Issues action not to run
- Fixed emissions in GCHP carbon ExtData.rc so that data in molecules/cm2/s are converted to kg/m2/s
- Excluded HEMCO interface and ExtState fields from `MODEL_CESM` in `hco_interface_gc_mod.F90` for compatibility with CESM, which runs HEMCO separately
Copy link
Contributor

Choose a reason for hiding this comment

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

Could you move this to Changed? Fixed implies there was a bug in a previous version which in this case I don't think there was.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, done! Thank you


## [14.4.3] - 2024-08-13
### Added
Expand Down
225 changes: 116 additions & 109 deletions GeosCore/hco_interface_gc_mod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,18 +46,23 @@ MODULE HCO_Interface_GC_Mod
!
! !PUBLIC MEMBER FUNCTIONS:
!
#if !defined( MODEL_CESM )
PUBLIC :: HCOI_GC_Init
PUBLIC :: HCOI_GC_Run
PUBLIC :: HCOI_GC_Final
#endif

PUBLIC :: HCOI_GC_WriteDiagn

PUBLIC :: Compute_Sflx_For_Vdiff
!
! !PRIVATE MEMBER FUNCTIONS:
!
#if !defined( MODEL_CESM )
PRIVATE :: ExtState_InitTargets
PRIVATE :: ExtState_SetFields
PRIVATE :: ExtState_UpdateFields
#endif
PRIVATE :: Get_SzaFact
PRIVATE :: GridEdge_Set
PRIVATE :: CheckSettings
Expand Down Expand Up @@ -162,6 +167,7 @@ MODULE HCO_Interface_GC_Mod
LOGICAL, PARAMETER :: DoDiagn = .TRUE.

CONTAINS
#if !defined( MODEL_CESM )
!EOC
!------------------------------------------------------------------------------
! GEOS-Chem Global Chemical Transport Model !
Expand Down Expand Up @@ -1299,115 +1305,6 @@ END SUBROUTINE HCOI_GC_Final
!------------------------------------------------------------------------------
!BOP
!
! !IROUTINE: HCOI_GC_WriteDiagn
!
! !DESCRIPTION: Subroutine HCOI\_GC\_WriteDiagn is the wrapper routine to
! write the HEMCO diagnostics. This will only write the diagnostics of
! diagnostics collection 1.
!\\
!\\
! !INTERFACE:
!
SUBROUTINE HCOI_GC_WriteDiagn( Input_Opt, Restart, RC )
!
! !USES:
!
USE ErrCode_Mod
USE HCOIO_Diagn_Mod, ONLY : HcoDiagn_Write
USE Input_Opt_Mod, ONLY : OptInput

USE Time_Mod, ONLY : Get_Year, Get_Month, Get_Day, GET_DAY_OF_YEAR
USE Time_Mod, ONLY : GET_HOUR, GET_MINUTE, GET_SECOND
#if defined( ADJOINT )
USE MAPL_CommsMod, ONLY : MAPL_AM_I_ROOT
#endif
!
! !INPUT/OUTPUT PARAMETERS:
!
TYPE(OptInput), INTENT(IN ) :: Input_Opt ! Input options
LOGICAL, INTENT(IN ) :: Restart ! write restart (enforced)?
!
! !INPUT/OUTPUT PARAMETERS:
!
INTEGER, INTENT(INOUT) :: RC ! Success or failure?
!
! !REVISION HISTORY:
! 01 Apr 2015 - C. Keller - Initial version
! See https://github.com/geoschem/geos-chem for complete history
!EOP
!------------------------------------------------------------------------------
!BOC
!
! !LOCAL VARIABLES:
!
! Scalars
INTEGER :: HMRC
INTEGER :: year, month, day, dayOfYr, hour, minute, second

! Strings
CHARACTER(LEN=255) :: ThisLoc, Instr
CHARACTER(LEN=512) :: ErrMsg

!=======================================================================
! HCOI_GC_WriteDiagn begins here!
!=======================================================================

! Initialize
RC = GC_SUCCESS
HMRC = HCO_SUCCESS
ErrMsg = ''
ThisLoc = &
' -> at HCOI_GC_WriteDiagn (in module GeosCore/hco_interface_gc_mod.F90)'
Instr = 'THIS ERROR ORIGINATED IN HEMCO! Please check the ' // &
'HEMCO log file for additional error messages!'

!-----------------------------------------------------------------------
! Make sure HEMCO time is in sync
!-----------------------------------------------------------------------

! Now done through a universal function in HCO_Interface_Common
! (hplin, 3/12/20)
year = GET_YEAR()
month = GET_MONTH()
day = GET_DAY()
dayOfYr = GET_DAY_OF_YEAR()
hour = GET_HOUR()
minute = GET_MINUTE()
second = GET_SECOND()

CALL SetHcoTime( HcoState, ExtState, year, month, day, dayOfYr, &
hour, minute, second, .FALSE., HMRC )

! Trap potential errors
IF ( HMRC /= HCO_SUCCESS ) THEN
RC = HMRC
ErrMsg = 'Error encountered in "SetHcoTime"!'
CALL GC_Error( ErrMsg, RC, ThisLoc, Instr )
CALL Flush( HcoState%Config%Err%Lun )
RETURN
ENDIF

!-----------------------------------------------------------------------
! Write diagnostics
!-----------------------------------------------------------------------
CALL HcoDiagn_Write( HcoState, RESTART, HMRC )

! Trap potential errors
IF ( HMRC /= HCO_SUCCESS ) THEN
RC = HMRC
ErrMsg = 'Error encountered in "HcoDiagn_Write"!'
CALL GC_Error( ErrMsg, RC, ThisLoc, Instr )
CALL Flush( HcoState%Config%Err%Lun )
RETURN
ENDIF

END SUBROUTINE HCOI_GC_WriteDiagn
!EOC
!------------------------------------------------------------------------------
! GEOS-Chem Global Chemical Transport Model !
!------------------------------------------------------------------------------
!BOP
!
! !IROUTINE: ExtState_InitTargets
!
! !DESCRIPTION: SUBROUTINE ExtState\_InitTargets allocates some local arrays
Expand Down Expand Up @@ -3245,6 +3142,116 @@ SUBROUTINE ExtState_UpdateFields( Input_Opt, State_Chm, &
#endif

END SUBROUTINE ExtState_UpdateFields
#endif ! MODEL_CESM exclude
!EOC
!------------------------------------------------------------------------------
! GEOS-Chem Global Chemical Transport Model !
!------------------------------------------------------------------------------
!BOP
!
! !IROUTINE: HCOI_GC_WriteDiagn
!
! !DESCRIPTION: Subroutine HCOI\_GC\_WriteDiagn is the wrapper routine to
! write the HEMCO diagnostics. This will only write the diagnostics of
! diagnostics collection 1.
!\\
!\\
! !INTERFACE:
!
SUBROUTINE HCOI_GC_WriteDiagn( Input_Opt, Restart, RC )
!
! !USES:
!
USE ErrCode_Mod
USE HCOIO_Diagn_Mod, ONLY : HcoDiagn_Write
USE Input_Opt_Mod, ONLY : OptInput

USE Time_Mod, ONLY : Get_Year, Get_Month, Get_Day, GET_DAY_OF_YEAR
USE Time_Mod, ONLY : GET_HOUR, GET_MINUTE, GET_SECOND
#if defined( ADJOINT )
USE MAPL_CommsMod, ONLY : MAPL_AM_I_ROOT
#endif
!
! !INPUT/OUTPUT PARAMETERS:
!
TYPE(OptInput), INTENT(IN ) :: Input_Opt ! Input options
LOGICAL, INTENT(IN ) :: Restart ! write restart (enforced)?
!
! !INPUT/OUTPUT PARAMETERS:
!
INTEGER, INTENT(INOUT) :: RC ! Success or failure?
!
! !REVISION HISTORY:
! 01 Apr 2015 - C. Keller - Initial version
! See https://github.com/geoschem/geos-chem for complete history
!EOP
!------------------------------------------------------------------------------
!BOC
!
! !LOCAL VARIABLES:
!
! Scalars
INTEGER :: HMRC
INTEGER :: year, month, day, dayOfYr, hour, minute, second

! Strings
CHARACTER(LEN=255) :: ThisLoc, Instr
CHARACTER(LEN=512) :: ErrMsg

!=======================================================================
! HCOI_GC_WriteDiagn begins here!
!=======================================================================

! Initialize
RC = GC_SUCCESS
HMRC = HCO_SUCCESS
ErrMsg = ''
ThisLoc = &
' -> at HCOI_GC_WriteDiagn (in module GeosCore/hco_interface_gc_mod.F90)'
Instr = 'THIS ERROR ORIGINATED IN HEMCO! Please check the ' // &
'HEMCO log file for additional error messages!'

!-----------------------------------------------------------------------
! Make sure HEMCO time is in sync
!-----------------------------------------------------------------------

! Now done through a universal function in HCO_Interface_Common
! (hplin, 3/12/20)
year = GET_YEAR()
month = GET_MONTH()
day = GET_DAY()
dayOfYr = GET_DAY_OF_YEAR()
hour = GET_HOUR()
minute = GET_MINUTE()
second = GET_SECOND()

CALL SetHcoTime( HcoState, ExtState, year, month, day, dayOfYr, &
hour, minute, second, .FALSE., HMRC )

! Trap potential errors
IF ( HMRC /= HCO_SUCCESS ) THEN
RC = HMRC
ErrMsg = 'Error encountered in "SetHcoTime"!'
CALL GC_Error( ErrMsg, RC, ThisLoc, Instr )
CALL Flush( HcoState%Config%Err%Lun )
RETURN
ENDIF

!-----------------------------------------------------------------------
! Write diagnostics
!-----------------------------------------------------------------------
CALL HcoDiagn_Write( HcoState, RESTART, HMRC )

! Trap potential errors
IF ( HMRC /= HCO_SUCCESS ) THEN
RC = HMRC
ErrMsg = 'Error encountered in "HcoDiagn_Write"!'
CALL GC_Error( ErrMsg, RC, ThisLoc, Instr )
CALL Flush( HcoState%Config%Err%Lun )
RETURN
ENDIF

END SUBROUTINE HCOI_GC_WriteDiagn
!EOC
!------------------------------------------------------------------------------
! GEOS-Chem Global Chemical Transport Model !
Expand Down