add the output

Author: Dalei Hao

components/clm/src/biogeophys/EnergyFluxType.F90

@@ -300,7 +300,11 @@ subroutine InitHistory(this, bounds)
     call hist_addfld1d (fname='BTRAN', units='unitless',  &
          avgflag='A', long_name='transpiration beta factor', &
          ptr_patch=this%btran_patch, set_lake=spval, set_urb=spval)
+<<<<<<< HEAD
 
+=======
+
+>>>>>>> e05e89d9b3d048ea47aecc06c3ac4c18cfad7bd4
 	!!! add output (pft-based SH and LH) by Dalei Hao 12/6/2020	 
 	this%eflx_sh_tot_patch(begp:endp) = spval
     call hist_addfld1d (fname='SH_pft', units='W/m^2',  &
@@ -313,6 +317,10 @@ subroutine InitHistory(this, bounds)
          ptr_patch=this%eflx_lh_tot_patch, default='inactive')
     !!! end
 
+<<<<<<< HEAD
+=======
+	
+>>>>>>> e05e89d9b3d048ea47aecc06c3ac4c18cfad7bd4
     if (use_cn) then
        this%rresis_patch(begp:endp,:) = spval
        call hist_addfld2d (fname='RRESIS', units='proportion', type2d='levgrnd', &

components/clm/src/biogeophys/FrictionVelocityMod.F90

@@ -111,12 +111,21 @@ subroutine FrictionVelocity(lbn, ubn, fn, filtern, &
          u10              => frictionvel_vars%u10_patch        , & ! Output: [real(r8) (:) ] 10-m wind (m/s) (for dust model)        
          u10_clm          => frictionvel_vars%u10_clm_patch    , & ! Output: [real(r8) (:) ] 10-m wind (m/s)                         
          va               => frictionvel_vars%va_patch         , & ! Output: [real(r8) (:) ] atmospheric wind speed plus convective velocity (m/s)
+<<<<<<< HEAD
          fv               => frictionvel_vars%fv_patch         , & ! Output: [real(r8) (:) ] friction velocity (m/s) (for dust model)
 		 !!! add by Dalei Hao
 		 zeta_patch               => frictionvel_vars%zeta_patch         , & ! Output: [real(r8) (:) ] atmospheric wind speed plus convective velocity (m/s)
          ustar_patch               => frictionvel_vars%ustar_patch         & ! Output: [real(r8) (:) ] friction velocity (m/s) (for dust model)	 
 		 !!!
 		)
+=======
+         fv               => frictionvel_vars%fv_patch           & ! Output: [real(r8) (:) ] friction velocity (m/s) (for dust model)
+         !!! add by Dalei Hao
+		 zeta_patch               => frictionvel_vars%zeta_patch         , & ! Output: [real(r8) (:) ] atmospheric wind speed plus convective velocity (m/s)
+         ustar_patch               => frictionvel_vars%ustar_patch         & ! Output: [real(r8) (:) ] friction velocity (m/s) (for dust model)	 
+		 !!!
+		 )
+>>>>>>> e05e89d9b3d048ea47aecc06c3ac4c18cfad7bd4
 
       ! Adjustment factors for unstable (moz < 0) or stable (moz > 0) conditions.
 
@@ -391,8 +400,13 @@ subroutine FrictionVelocity(lbn, ubn, fn, filtern, &
             u10(n) = ur(n) - ustar(n)/vkc * (tmp4 - fm(n) + fm10)
             fv(n)  = ustar(n)
          end if
+<<<<<<< HEAD
 
 !!! add by Dalei Hao
+=======
+
+        !!! add by Dalei Hao
+>>>>>>> e05e89d9b3d048ea47aecc06c3ac4c18cfad7bd4
          if (present(landunit_index)) then
             do pp = pfti(n),pftf(n)
 				zeta_patch(pp)  = zeta(n)

components/clm/src/biogeophys/FrictionVelocityType.F90

@@ -109,7 +109,10 @@ subroutine InitAllocate(this, bounds)
     allocate(this%z0qg_col         (begc:endc)) ; this%z0qg_col         (:)   = nan
     allocate(this%z0hg_col         (begc:endc)) ; this%z0hg_col         (:)   = nan
 
+<<<<<<< HEAD
 
+=======
+>>>>>>> e05e89d9b3d048ea47aecc06c3ac4c18cfad7bd4
 	!!! add by Dalei Hao
     allocate(this%zeta_patch       (begp:endp)) ; this%zeta_patch       (:)   = nan
     allocate(this%ustar_patch       (begp:endp)) ; this%ustar_patch       (:)   = nan
@@ -162,7 +165,11 @@ subroutine InitHistory(this, bounds)
     call hist_addfld1d (fname='U10', units='m/s', &
          avgflag='A', long_name='10-m wind', &
          ptr_patch=this%u10_clm_patch)
+<<<<<<< HEAD
 
+=======
+
+>>>>>>> e05e89d9b3d048ea47aecc06c3ac4c18cfad7bd4
 	!!! add by Dalei hao
 	this%zeta_patch(begp:endp) = spval
     call hist_addfld1d (fname='zeta_patch', units='unitless', &
@@ -174,12 +181,22 @@ subroutine InitHistory(this, bounds)
          avgflag='A', long_name='friction velocity [m/s]', &
          ptr_patch=this%ustar_patch, default='inactive')
 
+<<<<<<< HEAD
 		  this%fv_patch(begp:endp) = spval
        call hist_addfld1d (fname='FV', units='m/s', &
+=======
+	this%fv_patch(begp:endp) = spval
+    call hist_addfld1d (fname='FV', units='m/s', &
+>>>>>>> e05e89d9b3d048ea47aecc06c3ac4c18cfad7bd4
             avgflag='A', long_name='friction velocity for dust model', &
             ptr_patch=this%fv_patch, default='inactive')
 	!!! end
 
+<<<<<<< HEAD
+=======
+	
+	
+>>>>>>> e05e89d9b3d048ea47aecc06c3ac4c18cfad7bd4
     if (use_cn) then
        this%u10_patch(begp:endp) = spval
        call hist_addfld1d (fname='U10_DUST', units='m/s', &

components/clm/src/data_types/TopounitDataType.F90

@@ -147,14 +147,22 @@ subroutine init_top_as(this, begt, endt)
     call hist_addfld1d (fname='RH', units='%',  &
          avgflag='A', long_name='atmospheric relative humidity', &
          ptr_gcell=this%rhbot, default='inactive')
+<<<<<<< HEAD
 
+=======
+
+>>>>>>> e05e89d9b3d048ea47aecc06c3ac4c18cfad7bd4
 	!!! add by Dalei Hao
     this%rhobot(begt:endt) = spval
     call hist_addfld1d (fname='RHO', units='kg/m**3',  &
          avgflag='A', long_name='air density at atmospheric forcing height', &
          ptr_gcell=this%rhobot, default='inactive')
 	!!! end
 
+<<<<<<< HEAD
+=======
+	
+>>>>>>> e05e89d9b3d048ea47aecc06c3ac4c18cfad7bd4
     this%windbot(begt:endt) = spval
     call hist_addfld1d (fname='WIND', units='m/s',  &
          avgflag='A', long_name='atmospheric wind velocity magnitude', &