From 70fc3e5a702dd2e1d46ef5a3febf3e9839743e13 Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Tue, 29 Nov 2022 19:55:39 -0800 Subject: [PATCH 1/2] move fates satellitephenology call out of unreachable area --- components/elm/src/main/elm_driver.F90 | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/components/elm/src/main/elm_driver.F90 b/components/elm/src/main/elm_driver.F90 index aab7777f58b3..0931b120ae0e 100644 --- a/components/elm/src/main/elm_driver.F90 +++ b/components/elm/src/main/elm_driver.F90 @@ -1108,21 +1108,20 @@ subroutine elm_drv(doalb, nextsw_cday, declinp1, declin, rstwr, nlend, rdate) filter(nc)%num_soilp, filter(nc)%soilp, & cnstate_vars) end if + + if (use_fates_sp .and. doalb) then + call SatellitePhenology(bounds_clump, & + filter_inactive_and_active(nc)%num_soilp, filter_inactive_and_active(nc)%soilp, & + waterstate_vars, canopystate_vars) + endif + else ! not ( if-use_cn or if-use_fates) - - if (.not.use_fates_sp .and. doalb) then + if (doalb) then ! Prescribed biogeography - prescribed canopy structure, some prognostic carbon fluxes call SatellitePhenology(bounds_clump, & filter(nc)%num_nolakep, filter(nc)%nolakep, & waterstate_vars, canopystate_vars) end if - - if (use_fates_sp .and. doalb) then - call SatellitePhenology(bounds_clump, & - filter_inactive_and_active(nc)%num_soilp, filter_inactive_and_active(nc)%soilp, & - waterstate_vars, canopystate_vars) - endif - end if ! end of if-use_cn or if-use_fates end if ! end of is_active_betr_bgc From 63810b80f96eed8a2cab61a9df76f4ec7b9dd2a9 Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Thu, 1 Dec 2022 14:53:37 -0800 Subject: [PATCH 2/2] remove doalb check for fates satphen call --- components/elm/src/main/elm_driver.F90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/elm/src/main/elm_driver.F90 b/components/elm/src/main/elm_driver.F90 index 0931b120ae0e..9f9988b06c3d 100644 --- a/components/elm/src/main/elm_driver.F90 +++ b/components/elm/src/main/elm_driver.F90 @@ -1109,7 +1109,7 @@ subroutine elm_drv(doalb, nextsw_cday, declinp1, declin, rstwr, nlend, rdate) cnstate_vars) end if - if (use_fates_sp .and. doalb) then + if (use_fates_sp) then call SatellitePhenology(bounds_clump, & filter_inactive_and_active(nc)%num_soilp, filter_inactive_and_active(nc)%soilp, & waterstate_vars, canopystate_vars)