Update rk4_misc.f90

Reverse the leaf_excess and wood_excess calculation when: if (initp%leaf_water_im2(ico) > rk4max_leaf_water_im2
EDmodel · Apr 28, 2022 · ae787d4 · ae787d4
1 parent 8154a59
commit ae787d4
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/ED/src/dynamics/rk4_misc.f90 b/ED/src/dynamics/rk4_misc.f90
@@ -2910,7 +2910,7 @@ subroutine adjust_veg_properties(initp,hdid,csite,ipa,ibuff)
                !     Leaves have too much water.  If possible, send water back to wood.    !
                ! If wood is also saturated, leaves expel the excess water as shedding.     !
                !---------------------------------------------------------------------------!
-               leaf_excess     = rk4max_leaf_water_im2 - initp%leaf_water_im2(ico)
+               leaf_excess     = initp%leaf_water_im2(ico) - rk4max_leaf_water_im2
                wood_demand     = min(leaf_excess,max(0.d0                                  &
                                     ,rk4max_wood_water_im2-initp%wood_water_im2(ico)))
                leaf_wshed      = leaf_excess - wood_demand
@@ -3104,7 +3104,7 @@ subroutine adjust_veg_properties(initp,hdid,csite,ipa,ibuff)
                ! the excess water goes to shedding.                                        !
                !---------------------------------------------------------------------------!
                !----- First guess. --------------------------------------------------------!
-               wood_excess = rk4max_wood_water_im2 - initp%wood_water_im2(ico)
+               wood_excess = initp%wood_water_im2(ico) - rk4max_wood_water_im2
                leaf_demand = rk4max_leaf_water_im2 - initp%leaf_water_im2(ico)
                soil_demand = (soil8(nstop)%slmsts-initp%soil_water(kt)) * dslz8(kt) * wdns8
                !----- Bounded guess. ------------------------------------------------------!
@@ -3151,7 +3151,7 @@ subroutine adjust_veg_properties(initp,hdid,csite,ipa,ibuff)
                if (fast_diagnostics) then
                   initp%avg_wflux_wl          (ico) = initp%avg_wflux_wl          (ico)    &
                                                     + leaf_demand
-                  initp%avg_wflux_gw          (ico) = initp%avg_wflux_wl          (ico)    &
+                  initp%avg_wflux_gw          (ico) = initp%avg_wflux_gw          (ico)    &
                                                     - soil_demand
                   initp%avg_wshed_lg          (ico) = initp%avg_wshed_lg          (ico)    &
                                                     + leaf_wshed