From e1b5b9b9d6512bc0b4d71f671754d661d026555a Mon Sep 17 00:00:00 2001 From: Ryan Knox Date: Mon, 6 Feb 2017 14:17:50 -0800 Subject: [PATCH] Some calls to fates_endrun() were not passing messages. --- components/clm/src/ED/biogeochem/EDPhysiologyMod.F90 | 4 ++-- components/clm/src/ED/main/FatesGlobals.F90 | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/components/clm/src/ED/biogeochem/EDPhysiologyMod.F90 b/components/clm/src/ED/biogeochem/EDPhysiologyMod.F90 index 90cac68551..2eb77c486e 100755 --- a/components/clm/src/ED/biogeochem/EDPhysiologyMod.F90 +++ b/components/clm/src/ED/biogeochem/EDPhysiologyMod.F90 @@ -1505,7 +1505,7 @@ subroutine flux_into_litter_pools(nsites, sites, bc_in, bc_out) write(fates_log(), *) 'stem_prof: ', stem_prof(s,:) write(fates_log(), *) 'max_rooting_depth_index_col: ', bc_in(s)%max_rooting_depth_index_col write(fates_log(), *) 'dzsoi_decomp: ', dzsoi_decomp - call endrun() + call endrun(msg=errMsg(sourcefile, __LINE__)) endif ! now check each fine root profile do ft = 1,numpft_ed @@ -1515,7 +1515,7 @@ subroutine flux_into_litter_pools(nsites, sites, bc_in, bc_out) end do if ( ( abs(froot_prof_sum - 1._r8) > delta ) ) then write(fates_log(), *) 'profile sums: ', froot_prof_sum - call endrun() + call endrun(msg=errMsg(sourcefile, __LINE__)) endif end do end do diff --git a/components/clm/src/ED/main/FatesGlobals.F90 b/components/clm/src/ED/main/FatesGlobals.F90 index dda07ec64c..3d4d561c7a 100644 --- a/components/clm/src/ED/main/FatesGlobals.F90 +++ b/components/clm/src/ED/main/FatesGlobals.F90 @@ -58,10 +58,7 @@ subroutine fates_endrun(msg) character(len=*), intent(in) :: msg ! string to be printed !----------------------------------------------------------------------- - if (present (msg)) then - write(fates_log(),*)'ENDRUN:', msg - end if - + write(fates_log(),*)'ENDRUN:', msg call shr_sys_abort() end subroutine fates_endrun