Skip to content

Commit

Permalink
[ Fix bug in error message]
Browse files Browse the repository at this point in the history
[Error message if user tries to have age dependent mortality
and inventory init on. ]

Fixes: [NGT-ED Github issue #]

User interface changes?: [ No]

Code review: [Names]

Test suite: [suite name, machine, compilers]
Test baseline:
Test namelist changes:
Test answer changes: [bit for bit, roundoff, climate changing]
Test summary:No testing
  • Loading branch information
Jessica Needham committed Dec 17, 2019
1 parent 34019b7 commit 194f073
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions main/FatesInterfaceMod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -1428,7 +1428,8 @@ subroutine set_fates_ctrlparms(tag,ival,rval,cval)
!
! RGK-2016
! ---------------------------------------------------------------------------------

use EDParamsMod , only : ED_val_cohort_age_fusion_tol

! Arguments
integer, optional, intent(in) :: ival
real(r8), optional, intent(in) :: rval
Expand Down Expand Up @@ -1540,7 +1541,7 @@ subroutine set_fates_ctrlparms(tag,ival,rval,cval)
call endrun(msg=errMsg(sourcefile, __LINE__))
end if

if ( hlm_use_ed_inventory_init.eq.1 .and. ED_val_cohort_age_fusion_tol > 0.0_r8) then
if ( hlm_use_inventory_init.eq.1 .and. ED_val_cohort_age_fusion_tol > 0.0_r8) then
if (fates_global_verbose()) then
write(fates_log(), *) 'Fates inventory init cannot be used with age dependent mortality'
write(fates_log(), *) 'Set fates_cohort_age_fusion_tol to 0 or turn off inventory init'
Expand Down

0 comments on commit 194f073

Please sign in to comment.