Calculate fire btran2 using updated h2osoi_vol

I had introduced a temporary, saved version of h2osoi_vol to achieve
bit-for-bit results in my testing. Now that I have verified that the
main changes are bit-for-bit, I'm changing this to use the actual
h2osoi_vol. This will change answers, because fire's btran2 will now
use the values of h2osoi_vol updated later in the driver loop.

src/biogeochem/CNFireBaseMod.F90

@@ -229,8 +229,7 @@ subroutine CNFire_calc_fire_root_wetness( this, bounds, num_exposedvegp, filter_
          watsat        => soilstate_inst%watsat_col         , & ! Input:  [real(r8) (:,:) ]  volumetric soil water at saturation
          btran2        => this%btran2_patch                 , & ! Output: [real(r8) (:)   ]  integrated soil water stress square
          rootfr        => soilstate_inst%rootfr_patch       , & ! Input:  [real(r8) (:,:) ]  fraction of roots in each soil layer
-         ! FIXME(wjs, 2020-09-18) change this to use h2osoi_vol_col instead of the prehydrology version
-         h2osoi_vol    => waterstatebulk_inst%h2osoi_vol_prehydrology_col  & ! Input:  [real(r8) (:,:) ]  volumetric soil water (0<=h2osoi_vol<=watsat) [m3/m3] (porosity)   (constant)
+         h2osoi_vol    => waterstatebulk_inst%h2osoi_vol_col  & ! Input:  [real(r8) (:,:) ]  volumetric soil water (0<=h2osoi_vol<=watsat) [m3/m3] (porosity)   (constant)
          )
 
       do f = 1, num_exposedvegp

src/biogeochem/CNFireLi2021Mod.F90

@@ -699,8 +699,7 @@ subroutine CNFire_calc_fire_root_wetness( this, bounds, num_exposedvegp, filter_
          watsat        => soilstate_inst%watsat_col         , & ! Input:  [real(r8) (:,:) ]  volumetric soil water at saturation
          btran2        => this%btran2_patch                 , & ! Output: [real(r8) (:)   ]  integrated soil water stress square
          rootfr        => soilstate_inst%rootfr_patch       , & ! Input:  [real(r8) (:,:) ]  fraction of roots in each soil layer
-         ! FIXME(wjs, 2020-09-18) change this to use h2osoi_vol_col instead of the prehydrology version
-         h2osoi_vol    => waterstatebulk_inst%h2osoi_vol_prehydrology_col  & ! Input:  [real(r8) (:,:) ]  volumetric soil water (0<=h2osoi_vol<=watsat) [m3/m3] (porosity)   (constant)
+         h2osoi_vol    => waterstatebulk_inst%h2osoi_vol_col  & ! Input:  [real(r8) (:,:) ]  volumetric soil water (0<=h2osoi_vol<=watsat) [m3/m3] (porosity)   (constant)
          )
 
       do f = 1, num_exposedvegp

src/biogeophys/HydrologyNoDrainageMod.F90

@@ -251,7 +251,6 @@ subroutine HydrologyNoDrainage(bounds, &
          h2osoi_ice_tot     => b_waterdiagnostic_inst%h2osoi_ice_tot_col     , & ! Output: [real(r8) (:)   ]  vertically summed ice lens (kg/m2)
          h2osoi_liq_tot     => b_waterdiagnostic_inst%h2osoi_liq_tot_col     , & ! Output: [real(r8) (:)   ]  vertically summed liquid water (kg/m2)   
          h2osoi_vol         => b_waterstate_inst%h2osoi_vol_col         , & ! Output: [real(r8) (:,:) ]  volumetric soil water (0<=h2osoi_vol<=watsat) [m3/m3]
-         h2osoi_vol_prehydrology => b_waterstate_inst%h2osoi_vol_prehydrology_col         , & ! Output: [real(r8) (:,:) ]  volumetric soil water (0<=h2osoi_vol<=watsat) saved before hydrology [m3/m3]
          h2osno_top         => b_waterdiagnostic_inst%h2osno_top_col         , & ! Output: [real(r8) (:)   ]  mass of snow in top layer (col) [kg]    
          wf                 => b_waterdiagnostic_inst%wf_col                 , & ! Output: [real(r8) (:)   ]  soil water as frac. of whc for top 0.05 m 
          wf2                => b_waterdiagnostic_inst%wf2_col                , & ! Output: [real(r8) (:)   ]  soil water as frac. of whc for top 0.17 m 
@@ -273,13 +272,6 @@ subroutine HydrologyNoDrainage(bounds, &
        call water_inst%TracerConsistencyCheck(bounds, 'before main snow code in HydrologyNoDrainage')
     end if
 
-    do j = 1, nlevgrnd
-       do fc = 1, num_hydrologyc
-          c = filter_hydrologyc(fc)
-          h2osoi_vol_prehydrology(c,j) = h2osoi_vol(c,j)
-       end do
-    end do
-
       ! Determine step size
 
       dtime = get_step_size_real()

src/biogeophys/WaterStateBulkType.F90

@@ -27,8 +27,6 @@ module WaterStateBulkType
 
      real(r8), pointer :: snow_persistence_col   (:)   ! col length of time that ground has had non-zero snow thickness (sec)
      real(r8), pointer :: int_snow_col           (:)   ! col integrated snowfall (mm H2O)
-     real(r8), pointer :: h2osoi_vol_prehydrology_col (:,:) ! col volumetric soil water (0<=h2osoi_vol<=watsat) [m3/m3]  (nlevgrnd) - saved pre-hydrology
-
 
    contains
 
@@ -105,8 +103,6 @@ subroutine InitBulkAllocate(this, bounds)
 
     allocate(this%snow_persistence_col   (begc:endc))                     ; this%snow_persistence_col   (:)   = nan
     allocate(this%int_snow_col           (begc:endc))                     ; this%int_snow_col           (:)   = nan   
-    allocate(this%h2osoi_vol_prehydrology_col(begc:endc, 1:nlevgrnd)); this%h2osoi_vol_prehydrology_col(:,:)  = nan
-
 
   end subroutine InitBulkAllocate