Merge remote-tracking branch 'glemieux/fates-satphen-call-fix' into n…

…ext (PR #5345) Move the fates-specific `satellitephenology` call out of an area that is unreachable when `fates` is active. Fixes NGEET/fates#953. [Non-B4B]
E3SM-Project · Dec 14, 2022 · 7a67522 · 7a67522
2 parents b4a7f82 + 63810b8
commit 7a67522
Showing 1 changed file with 8 additions and 9 deletions.
diff --git 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) 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