Follow-up to conflict resolutions in order for the code to build

ESCOMP · Jun 28, 2023 · f2767b5 · f2767b5
1 parent 180206c
commit f2767b5
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 17 deletions.
diff --git a/src/biogeophys/BareGroundFluxesMod.F90 b/src/biogeophys/BareGroundFluxesMod.F90
@@ -237,7 +237,6 @@ subroutine BareGroundFluxes(bounds, num_noexposedvegp, filter_noexposedvegp, &
          forc_hgt_u_patch       => frictionvel_inst%forc_hgt_u_patch            , & ! Output: [real(r8) (:)   ] observational height of wind at patch level [m]
          forc_hgt_t_patch       => frictionvel_inst%forc_hgt_t_patch            , & ! Output: [real(r8) (:)   ] observational height of temperature at patch level [m]
          forc_hgt_q_patch       => frictionvel_inst%forc_hgt_q_patch            , & ! Output: [real(r8) (:)   ] observational height of specific humidity at patch level [m]
-         displa                 => canopystate_inst%displa_patch                , & ! Input:  [real(r8) (:)   ]  displacement height (m)
          u10_clm                => frictionvel_inst%u10_clm_patch               , & ! Input:  [real(r8) (:)   ]  10 m height winds (m/s)
          zetamax                => frictionvel_inst%zetamaxstable               , & ! Input:  [real(r8)       ]  max zeta value under stable conditions
          zeta                   => frictionvel_inst%zeta_patch                  , & ! Output: [real(r8) (:)   ]  dimensionless stability parameter

diff --git a/src/biogeophys/CanopyStateType.F90 b/src/biogeophys/CanopyStateType.F90
@@ -225,22 +225,6 @@ subroutine InitHistory(this, bounds)
               avgflag='A', long_name='canopy top', &
               ptr_patch=this%htop_patch)
        endif
-
-    this%displa_patch(begp:endp) = spval
-    call hist_addfld1d (fname='DISPLA', units='m', &
-         avgflag='A', long_name='displacement height', &
-         ptr_patch=this%displa_patch, default='inactive')
-
-    if(use_fates_sp)then
-       this%htop_hist_patch(begp:endp) = spval
-       call hist_addfld1d (fname='HTOP', units='m', &
-           avgflag='A', long_name='HTOP weights for SP mode', &
-           ptr_patch=this%htop_hist_patch)
-    else
-       this%htop_patch(begp:endp) = spval
-       call hist_addfld1d (fname='HTOP', units='m', &
-           avgflag='A', long_name='canopy top', &
-           ptr_patch=this%htop_patch)
     endif
 
     if(use_fates_sp)then

diff --git a/src/biogeophys/FrictionVelocityMod.F90 b/src/biogeophys/FrictionVelocityMod.F90
@@ -342,6 +342,7 @@ subroutine InitHistory(this, bounds)
        call hist_addfld1d (fname='KBM1', units='unitless', &
             avgflag='A', long_name='natural logarithm of Z0MG_P/Z0HG_P', &
             ptr_patch=this%kbm1_patch, default='inactive')
+    end if
 
     if (use_luna) then
        call hist_addfld1d (fname='RB10', units='s/m', &