transfer wetted surface area to SFE

Author: emorway-usgs

src/Model/GroundWaterEnergy/gwe-sfe.f90

@@ -1066,13 +1066,18 @@ subroutine sfe_shf_term(this, ientry, n1, n2, rrate, rhsval, hcofval)
     ! -- local
     real(DP) :: sensheat
     real(DP) :: strmtemp
+    integer(I4B) :: auxpos
+    real(DP) :: sa !< surface area of stream reach, different than wetted area
     !
-    n1 = this%flowbudptr%budterm(this%idxbudgwf)%id1(ientry)
+    n1 = this%flowbudptr%budterm(this%idxbudevap)%id1(ientry)
+    ! -- For now, there is only 1 aux variable under 'EVAPORATION'
+    auxpos = this%flowbudptr%budterm(this%idxbudevap)%naux
+    sa = this%flowbudptr%budterm(this%idxbudevap)%auxvar(auxpos, ientry)
     !
     strmtemp = this%xnewpak(n1)
     call this%shf%shf_cq(n1, strmtemp, sensheat)
     !
-    if (present(rrate)) rrate = sensheat
+    if (present(rrate)) rrate = sensheat * sa
     if (present(rhsval)) rhsval = -rrate
     if (present(hcofval)) hcofval = DZERO
   end subroutine sfe_shf_term

src/Model/GroundWaterFlow/gwf-sfr.f90

@@ -5121,14 +5121,15 @@ subroutine sfr_setup_budobj(this)
     text = '     EVAPORATION'
     idx = idx + 1
     maxlist = this%maxbound
-    naux = 0
+    naux = 1
+    auxtxt(1) = '    SURFACE-AREA'
     call this%budobj%budterm(idx)%initialize(text, &
                                              this%name_model, &
                                              this%packName, &
                                              this%name_model, &
                                              this%packName, &
-                                             maxlist, .false., .false., &
-                                             naux)
+                                             maxlist, .false., .true., &
+                                             naux, auxtxt)
     !
     ! --
     text = '          RUNOFF'
@@ -5260,7 +5261,7 @@ subroutine sfr_fill_budobj(this)
     real(DP) :: d
     real(DP) :: ca
     real(DP) :: a
-    real(DP) :: wp
+    real(DP) :: wp !< wetted perimeter
     real(DP) :: l
     !
     ! -- initialize counter
@@ -5345,11 +5346,18 @@ subroutine sfr_fill_budobj(this)
     call this%budobj%budterm(idx)%reset(this%maxbound)
     do n = 1, this%maxbound
       if (this%iboundpak(n) /= 0) then
+        if (this%depth(n) > DZERO) then
+          a = this%calc_surface_area_wet(n, this%depth(n))
+        else
+          a = DZERO
+        end if
+        this%qauxcbc(1) = a
         q = -this%simevap(n)
       else
+        this%qauxcbc(1) = DZERO
         q = DZERO
       end if
-      call this%budobj%budterm(idx)%update_term(n, n, q)
+      call this%budobj%budterm(idx)%update_term(n, n, q, this%qauxcbc)
     end do
     !
     ! -- RUNOFF