Skip to content

Commit

Permalink
Merge PR #221 (branch 'bugfix/print_HEMCO_verbose_status_on_root_thre…
Browse files Browse the repository at this point in the history
…ad_only') into dev/3.7.0
  • Loading branch information
msulprizio committed Jul 13, 2023
2 parents faaddbb + 640f907 commit 4b379f6
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 11 deletions.
2 changes: 1 addition & 1 deletion src/Core/hco_config_mod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -2177,7 +2177,7 @@ SUBROUTINE ReadSettings( HcoConfig, IU_HCO, EOF, RC )
ELSE
msg = NEW_LINE( 'A' ) // 'HEMCO verbose output is OFF'
ENDIF
CALL HCO_Msg( msg, verb=.TRUE. )
IF ( HcoConfig%amIRoot ) CALL HCO_Msg( msg, verb=.TRUE. )

! Logfile to write into
CALL GetExtOpt( HcoConfig, CoreNr, 'Logfile', &
Expand Down
23 changes: 13 additions & 10 deletions src/Extensions/hcox_volcano_mod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -355,18 +355,21 @@ SUBROUTINE HCOX_Volcano_Init( HcoState, ExtName,ExtState, RC )
! Extension Nr.
ExtNr = GetExtNr( HcoState%Config%ExtList, TRIM(ExtName) )

IF ( ExtNr > 0 ) THEN
! Write the name of the extension regardless of the verbose setting
msg = 'Using HEMCO extension: Volcano (volcanic SO2 emissions)'
IF ( HCO_IsVerb( HcoState%Config%Err ) ) THEN
CALL HCO_Msg( HcoState%Config%Err, msg, sep1='-' ) ! with separator
! Print to log
IF ( HcoState%amIRoot ) THEN
IF ( ExtNr > 0 ) THEN
! Write the name of the extension regardless of the verbose setting
msg = 'Using HEMCO extension: Volcano (volcanic SO2 emissions)'
IF ( HCO_IsVerb( HcoState%Config%Err ) ) THEN
CALL HCO_Msg( HcoState%Config%Err, msg, sep1='-' ) ! with separator
ELSE
CALL HCO_Msg( msg, verb=.TRUE. ) ! w/o separator
ENDIF
ELSE
CALL HCO_Msg( msg, verb=.TRUE. ) ! w/o separator
MSG = 'The Volcano extension is turned off.'
CALL HCO_MSG( HcoState%Config%Err, MSG )
RETURN
ENDIF
ELSE
MSG = 'The Volcano extension is turned off.'
CALL HCO_MSG( HcoState%Config%Err, MSG )
RETURN
ENDIF

! Enter
Expand Down

0 comments on commit 4b379f6

Please sign in to comment.