add h2o_liq_sisl to the fates interface registery

Author: glemieux

biogeophys/FatesPlantHydraulicsMod.F90

@@ -1554,7 +1554,7 @@ subroutine HydrSiteColdStart(sites, bc_in )
 
         ! [kg/m2] / ([m] * [kg/m3]) = [m3/m3]
         h2osoi_liqvol = min(eff_por, &
-             sum(bc_in(s)%h2o_liq_sisl(j_t:j_b))/(csite_hydr%dz_rhiz(j)*denh2o))
+             sum(sites(s)%bc_in(ifp)%h2o_liq_sisl(j_t:j_b))/(csite_hydr%dz_rhiz(j)*denh2o))
         csite_hydr%h2osoi_liqvol_shell(j,1:nshell) = h2osoi_liqvol
 
      end do
@@ -2235,6 +2235,7 @@ subroutine FillDrainRhizShells(nsites, sites, bc_in)
   real(r8) :: cumShellH2O                              ! sum of water in all the shells of a specific layer             [kg/m2]
   real(r8) :: h2osoi_liq_shell(nlevsoi_hyd_max,nshell) ! water in the rhizosphere shells                               [kg]
   integer  :: tmp                                      ! temporary
+  integer  :: ifp                                      ! patch index for accessing boundary condition water content
   logical  :: found                                    ! flag in search loop
   !-----------------------------------------------------------------------
 
@@ -2253,6 +2254,9 @@ subroutine FillDrainRhizShells(nsites, sites, bc_in)
      ! If there are just no plants in this site, don't bother shuffling water
      if( sum(csite_hydr%l_aroot_layer) <= nearzero ) cycle
 
+     ! Temporarily hardcode this prior to multi-column fates implementation
+     ifp = 1
+     
      do j = 1,csite_hydr%nlevrhiz
 
         j_t = csite_hydr%map_r2s(j,1) ! top soil layer matching rhiz layer
@@ -2263,7 +2267,7 @@ subroutine FillDrainRhizShells(nsites, sites, bc_in)
         cumShellH2O=sum(csite_hydr%h2osoi_liqvol_shell(j,:) *csite_hydr%v_shell(j,:)) * denh2o*AREA_INV
 
         ! [kg/m2]
-        dwat_kgm2 = sum(bc_in(s)%h2o_liq_sisl(j_t:j_b)) - cumShellH2O
+        dwat_kgm2 = sum(sites(s)%bc_in(ifp)%h2o_liq_sisl(j_t:j_b)) - cumShellH2O
 
         dwat_kg = dwat_kgm2 * AREA
 
@@ -2325,7 +2329,7 @@ subroutine FillDrainRhizShells(nsites, sites, bc_in)
              csite_hydr%v_shell(j,:) * denh2o
 
 
-        errh2o(j) = sum(h2osoi_liq_shell(j,:))*AREA_INV - sum(bc_in(s)%h2o_liq_sisl(j_t:j_b))
+        errh2o(j) = sum(h2osoi_liq_shell(j,:))*AREA_INV - sum(sites(s)%bc_in(ifp)%h2o_liq_sisl(j_t:j_b))
 
         if (abs(errh2o(j)) > 1.e-9_r8) then
            write(fates_log(),*)'WARNING:  water balance error in FillDrainRhizShells'
@@ -2771,7 +2775,7 @@ subroutine hydraulics_bc ( nsites, sites, bc_in, bc_out, dtime)
                     ! into the root, othersize weight by root length
                     ! h2osoi_liqvol: [kg/m2] / [m] / [kg/m3] = [m3/m3]
                     eff_por       = sites(s)%bc_in(ifp)%eff_porosity_sl(j_bc)
-                    h2osoi_liqvol = min(eff_por, bc_in(s)%h2o_liq_sisl(j_bc)/(bc_in(s)%dz_sisl(j_bc)*denh2o))
+                    h2osoi_liqvol = min(eff_por, sites(s)%bc_in(ifp)%h2o_liq_sisl(j_bc)/(sites(s)%bc_in(ifp)%dz_sisl(j_bc)*denh2o))
                     psi_layer     = csite_hydr%wrf_soil(j)%p%psi_from_th(h2osoi_liqvol)
                     ftc_layer     = csite_hydr%wkf_soil(j)%p%ftc_from_psi(psi_layer)
                     weight_sl(j_bc) = bc_in(s)%hksat_sisl(j_bc)*ftc_layer*csite_hydr%rootl_sl(j_bc)

main/FatesInterfaceMod.F90

@@ -570,7 +570,6 @@ subroutine allocate_bcin(bc_in, nlevsoil_in, nlevdecomp_in, num_lu_harvest_cats,
          allocate(bc_in%sucsat_sisl(nlevsoil_in))
          allocate(bc_in%bsw_sisl(nlevsoil_in))
          allocate(bc_in%hksat_sisl(nlevsoil_in))
-         allocate(bc_in%h2o_liq_sisl(nlevsoil_in)); bc_in%h2o_liq_sisl = nan
       end if
 
       ! Land use
@@ -3009,6 +3008,8 @@ subroutine InitializeBoundaryConditions(this, patches_per_site)
       if (hlm_use_planthydro == itrue) then
          call this%registry(r)%Register(key=hlm_fates_soil_potential_min, &                               
                                         data=bc_in%smpmin, hlm_flag=.false.)
+         call this%registry(r)%Register(key=hlm_fates_liquid_water, &                               
+                                        data=bc_in%h2o_liq_sisl, hlm_flag=.false.)
       end if
 
       ! bc_out

main/FatesInterfaceParametersMod.F90

@@ -32,6 +32,7 @@ module FatesInterfaceParametersMod
   character(len=*), parameter, public :: hlm_fates_soil_h2o_liquid = 'soil_h2o_liquid_volume_content'
   character(len=*), parameter, public :: hlm_fates_soil_temperature = 'soil_temperature'
   character(len=*), parameter, public :: hlm_fates_soil_potential_min = 'soil_potential_minimum'
+  character(len=*), parameter, public :: hlm_fates_liquid_water = 'liquid_water'
 
   ! Registry update frequency parameters
   integer, parameter, public :: registry_update_init_dims = 0  ! variable dimension that needs to be updated during initialization

main/FatesInterfaceTypesMod.F90

@@ -983,6 +983,7 @@ subroutine InitializeBCIn(this)
     allocate(this%watsat_sl(this%nlevgrnd))
     allocate(this%h2o_liqvol_sl(this%nlevgrnd))
     allocate(this%tempk_sl(this%nlevgrnd))
+    allocate(this%h2o_liq_sisl(this%nlevgrnd))
 
     ! Unset variables
     this%decomp_id = fates_unset_int
@@ -997,6 +998,7 @@ subroutine InitializeBCIn(this)
     this%h2o_liqvol_sl= nan
     this%tempk_sl = nan
     this%smpmin = nan
+    this%h2o_liq_sisl = nan
 
   end subroutine InitializeBCIn
 
@@ -1220,6 +1222,8 @@ subroutine DefineInterfaceRegistry(this, initialize)
     if (hlm_use_planthydro == itrue) then
       call this%DefineInterfaceVariable(key=hlm_fates_soil_potential_min, initialize=initialize, index=index, &
                                         update_frequency=registry_update_timestep, bc_dir=bc_in)
+      call this%DefineInterfaceVariable(key=hlm_fates_liquid_water, initialize=initialize, index=index, &
+                                        update_frequency=registry_update_timestep, bc_dir=bc_in)
     end if
 
     ! Define the N and P litter fluxes if in CNP mode