Skip to content

Commit

Permalink
Merge PR #282 (Remove manual InvMEGAN diagnostics)
Browse files Browse the repository at this point in the history 
This merge brings PR #282 (Remove InvMEGAN manual diagnostics from
hcox_megan_mod.F90, by @yantosca) into the HEMCO "no-diff-to-benchmark"
development stream.

This PR removes several obsolete manual diagnostics.  The diagnostics can
be scheduled by editing HEMCO_Diagn.rc instead.

Signed-off-by: Bob Yantosca <[email protected]>
  • Loading branch information
@yantosca
yantosca committed Jul 16, 2024
2 parents 2192e0e + ebd4177 commit 40066bc
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 243 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
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
### Removed
- Manual `InvMEGAN` diagnostics from `src/Extensions/hcox_megan_mod.F90`; Activate these with `HEMCO_Diagn.rc` instead

## [3.9.1] - 2024-06-28
### Fixed
- Fixed formatting error in `.github/workflows/stale.yml` that caused the Mark Stale Issues action not to run
Expand Down
243 changes: 0 additions & 243 deletions src/Extensions/hcox_megan_mod.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4300,249 +4300,6 @@ SUBROUTINE HCOX_Megan_Init( HcoState, ExtName, ExtState, RC )
Inst%AEF_OCIM = 0.0_hp
Inst%AEF_SABI = 0.0_hp

!=================================================================
! Create manual diagnostics
!=================================================================
CALL Diagn_Create( HcoState = HcoState, &
cName = 'InvMEGAN_ACET_MBOX', &
ExtNr = ExtNr, &
Cat = -1, &
Hier = -1, &
HcoID = -1, &
SpaceDim = 2, &
OutUnit = 'kg/m2/s', &
AutoFill = 0, &
Trgt2D = Inst%FLUXACETmb, &
RC = RC )
IF ( RC /= HCO_SUCCESS ) THEN
CALL HCO_ERROR( 'ERROR 45', RC, THISLOC=LOC )
RETURN
ENDIF

CALL Diagn_Create( HcoState = HcoState, &
cName = 'InvMEGAN_ACET_DIRECT',&
ExtNr = ExtNr, &
Cat = -1, &
Hier = -1, &
HcoID = -1, &
SpaceDim = 2, &
OutUnit = 'kg/m2/s', &
AutoFill = 0, &
Trgt2D = Inst%FLUXACETbg, &
RC = RC )
IF ( RC /= HCO_SUCCESS ) THEN
CALL HCO_ERROR( 'ERROR 46', RC, THISLOC=LOC )
RETURN
ENDIF

CALL Diagn_Create( HcoState = HcoState, &
cName = 'InvMEGAN_APIN', &
ExtNr = ExtNr, &
Cat = -1, &
Hier = -1, &
HcoID = -1, &
SpaceDim = 2, &
OutUnit = 'kg/m2/s', &
AutoFill = 0, &
Trgt2D = Inst%FLUXAPIN, &
RC = RC )
IF ( RC /= HCO_SUCCESS ) THEN
CALL HCO_ERROR( 'ERROR 47', RC, THISLOC=LOC )
RETURN
ENDIF

CALL Diagn_Create( HcoState = HcoState, &
cName = 'InvMEGAN_BPIN', &
ExtNr = ExtNr, &
Cat = -1, &
Hier = -1, &
HcoID = -1, &
SpaceDim = 2, &
OutUnit = 'kg/m2/s', &
AutoFill = 0, &
Trgt2D = Inst%FLUXBPIN, &
RC = RC )
IF ( RC /= HCO_SUCCESS ) THEN
CALL HCO_ERROR( 'ERROR 48', RC, THISLOC=LOC )
RETURN
ENDIF

CALL Diagn_Create( HcoState = HcoState, &
cName = 'InvMEGAN_SABI', &
ExtNr = ExtNr, &
Cat = -1, &
Hier = -1, &
HcoID = -1, &
SpaceDim = 2, &
OutUnit = 'kg/m2/s', &
AutoFill = 0, &
Trgt2D = Inst%FLUXSABI, &
RC = RC )
IF ( RC /= HCO_SUCCESS ) THEN
CALL HCO_ERROR( 'ERROR 49', RC, THISLOC=LOC )
RETURN
ENDIF

CALL Diagn_Create( HcoState = HcoState, &
cName = 'InvMEGAN_MYRC', &
ExtNr = ExtNr, &
Cat = -1, &
Hier = -1, &
HcoID = -1, &
SpaceDim = 2, &
OutUnit = 'kg/m2/s', &
AutoFill = 0, &
Trgt2D = Inst%FLUXMYRC, &
RC = RC )
IF ( RC /= HCO_SUCCESS ) THEN
CALL HCO_ERROR( 'ERROR 50', RC, THISLOC=LOC )
RETURN
ENDIF

CALL Diagn_Create( HcoState = HcoState, &
cName = 'InvMEGAN_CARE', &
ExtNr = ExtNr, &
Cat = -1, &
Hier = -1, &
HcoID = -1, &
SpaceDim = 2, &
OutUnit = 'kg/m2/s', &
AutoFill = 0, &
Trgt2D = Inst%FLUXCARE, &
RC = RC )
IF ( RC /= HCO_SUCCESS ) THEN
CALL HCO_ERROR( 'ERROR 51', RC, THISLOC=LOC )
RETURN
ENDIF

CALL Diagn_Create( HcoState = HcoState, &
cName = 'InvMEGAN_OCIM', &
ExtNr = ExtNr, &
Cat = -1, &
Hier = -1, &
HcoID = -1, &
SpaceDim = 2, &
OutUnit = 'kg/m2/s', &
AutoFill = 0, &
Trgt2D = Inst%FLUXOCIM, &
RC = RC )
IF ( RC /= HCO_SUCCESS ) THEN
CALL HCO_ERROR( 'ERROR 52', RC, THISLOC=LOC )
RETURN
ENDIF

CALL Diagn_Create( HcoState = HcoState, &
cName = 'InvMEGAN_OMON', &
ExtNr = ExtNr, &
Cat = -1, &
Hier = -1, &
HcoID = -1, &
SpaceDim = 2, &
OutUnit = 'kg/m2/s', &
AutoFill = 0, &
Trgt2D = Inst%FLUXOMON, &
RC = RC )
IF ( RC /= HCO_SUCCESS ) THEN
CALL HCO_ERROR( 'ERROR 53', RC, THISLOC=LOC )
RETURN
ENDIF

CALL Diagn_Create( HcoState = HcoState, &
cName = 'InvMEGAN_FARN', &
ExtNr = ExtNr, &
Cat = -1, &
Hier = -1, &
HcoID = -1, &
SpaceDim = 2, &
OutUnit = 'kg/m2/s', &
AutoFill = 0, &
Trgt2D = Inst%FLUXFARN, &
RC = RC )
IF ( RC /= HCO_SUCCESS ) THEN
CALL HCO_ERROR( 'ERROR 54', RC, THISLOC=LOC )
RETURN
ENDIF

CALL Diagn_Create( HcoState = HcoState, &
cName = 'InvMEGAN_BCAR', &
ExtNr = ExtNr, &
Cat = -1, &
Hier = -1, &
HcoID = -1, &
SpaceDim = 2, &
OutUnit = 'kg/m2/s', &
AutoFill = 0, &
Trgt2D = Inst%FLUXBCAR, &
RC = RC )
IF ( RC /= HCO_SUCCESS ) THEN
CALL HCO_ERROR( 'ERROR 55', RC, THISLOC=LOC )
RETURN
ENDIF

CALL Diagn_Create( HcoState = HcoState, &
cName = 'InvMEGAN_OSQT', &
ExtNr = ExtNr, &
Cat = -1, &
Hier = -1, &
HcoID = -1, &
SpaceDim = 2, &
OutUnit = 'kg/m2/s', &
AutoFill = 0, &
Trgt2D = Inst%FLUXOSQT, &
RC = RC )
IF ( RC /= HCO_SUCCESS ) THEN
CALL HCO_ERROR( 'ERROR 56', RC, THISLOC=LOC )
RETURN
ENDIF

CALL Diagn_Create( HcoState = HcoState, &
cName = 'InvMEGAN_MBOX', &
ExtNr = ExtNr, &
Cat = -1, &
Hier = -1, &
HcoID = -1, &
SpaceDim = 2, &
OutUnit = 'kg/m2/s', &
AutoFill = 0, &
Trgt2D = Inst%FLUXMBOX, &
RC = RC )
IF ( RC /= HCO_SUCCESS ) THEN
CALL HCO_ERROR( 'ERROR 57', RC, THISLOC=LOC )
RETURN
ENDIF

CALL Diagn_Create( HcoState = HcoState, &
cName = 'InvMEGAN_FAXX', &
ExtNr = ExtNr, &
Cat = -1, &
Hier = -1, &
HcoID = -1, &
SpaceDim = 2, &
OutUnit = 'kg/m2/s', &
AutoFill = 0, &
Trgt2D = Inst%FLUXFAXX, &
RC = RC )
IF ( RC /= HCO_SUCCESS ) THEN
CALL HCO_ERROR( 'ERROR 58', RC, THISLOC=LOC )
RETURN
ENDIF

CALL Diagn_Create( HcoState = HcoState, &
cName = 'InvMEGAN_AAXX', &
ExtNr = ExtNr, &
Cat = -1, &
Hier = -1, &
HcoID = -1, &
SpaceDim = 2, &
OutUnit = 'kg/m2/s', &
AutoFill = 0, &
Trgt2D = Inst%FLUXAAXX, &
RC = RC )
IF ( RC /= HCO_SUCCESS ) THEN
CALL HCO_ERROR( 'ERROR 59', RC, THISLOC=LOC )
RETURN
ENDIF

!=================================================================
! Initialize internal diagnostics. These are the restart variables
! that can be used for a 'warm' start of MEGAN.
Expand Down

0 comments on commit 40066bc

Please sign in to comment.