From 0192d36922e9c85cbbe3568cdcaec7b58bdcee43 Mon Sep 17 00:00:00 2001 From: "Shawn P. Serbin" Date: Fri, 7 Feb 2020 17:45:16 -0500 Subject: [PATCH] Minor typo correction and cleanup in main/FatesHistoryInterfaceMod.F90. Address issue #606 --- main/FatesHistoryInterfaceMod.F90 | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/main/FatesHistoryInterfaceMod.F90 b/main/FatesHistoryInterfaceMod.F90 index d5ab89a2d7..0c1c22a597 100644 --- a/main/FatesHistoryInterfaceMod.F90 +++ b/main/FatesHistoryInterfaceMod.F90 @@ -2240,9 +2240,9 @@ subroutine update_history_dyn(this,nc,nsites,sites) hio_nplant_canopy_si_scpf(io_si,scpf) = hio_nplant_canopy_si_scpf(io_si,scpf) + ccohort%n hio_nplant_canopy_si_scls(io_si,scls) = hio_nplant_canopy_si_scls(io_si,scls) + ccohort%n hio_lai_canopy_si_scls(io_si,scls) = hio_lai_canopy_si_scls(io_si,scls) + & - ccohort%treelai*ccohort%c_area * AREA_INV + ccohort%treelai*ccohort%c_area * AREA_INV hio_sai_canopy_si_scls(io_si,scls) = hio_sai_canopy_si_scls(io_si,scls) + & - ccohort%treesai*ccohort%c_area * AREA_INV + ccohort%treesai*ccohort%c_area * AREA_INV hio_trimming_canopy_si_scls(io_si,scls) = hio_trimming_canopy_si_scls(io_si,scls) + & ccohort%n * ccohort%canopy_trim hio_crown_area_canopy_si_scls(io_si,scls) = hio_crown_area_canopy_si_scls(io_si,scls) + & @@ -2326,9 +2326,9 @@ subroutine update_history_dyn(this,nc,nsites,sites) hio_nplant_understory_si_scpf(io_si,scpf) = hio_nplant_understory_si_scpf(io_si,scpf) + ccohort%n hio_nplant_understory_si_scls(io_si,scls) = hio_nplant_understory_si_scls(io_si,scls) + ccohort%n hio_lai_understory_si_scls(io_si,scls) = hio_lai_understory_si_scls(io_si,scls) + & - ccohort%treelai*ccohort%c_area * AREA_INV + ccohort%treelai*ccohort%c_area * AREA_INV hio_sai_understory_si_scls(io_si,scls) = hio_sai_understory_si_scls(io_si,scls) + & - ccohort%treelai*ccohort%c_area * AREA_INV + ccohort%treelai*ccohort%c_area * AREA_INV hio_trimming_understory_si_scls(io_si,scls) = hio_trimming_understory_si_scls(io_si,scls) + & ccohort%n * ccohort%canopy_trim hio_crown_area_understory_si_scls(io_si,scls) = hio_crown_area_understory_si_scls(io_si,scls) + & @@ -3221,7 +3221,7 @@ subroutine update_history_prod(this,nc,nsites,sites,dt_tstep) hio_c_stomata_si(io_si) = 0._r8 hio_c_lblayer_si(io_si) = 0._r8 end if - + enddo ! site loop end associate @@ -3314,7 +3314,7 @@ subroutine update_history_hydraulics(this,nc,nsites,sites,dt_tstep) hio_twp_scpf => this%hvars(ih_twp_scpf)%r82d, & hio_swp_scpf => this%hvars(ih_swp_scpf)%r82d, & hio_lwp_scpf => this%hvars(ih_lwp_scpf)%r82d, & - hio_aflc_scpf => this%hvars(ih_aflc_scpf)%r82d, & + hio_aflc_scpf => this%hvars(ih_aflc_scpf)%r82d, & hio_tflc_scpf => this%hvars(ih_tflc_scpf)%r82d, & hio_sflc_scpf => this%hvars(ih_sflc_scpf)%r82d, & hio_lflc_scpf => this%hvars(ih_lflc_scpf)%r82d, & @@ -3534,8 +3534,8 @@ subroutine update_history_hydraulics(this,nc,nsites,sites,dt_tstep) hio_lwp_scpf(io_si,iscpf) = hio_lwp_scpf(io_si,iscpf) + & ccohort_hydr%psi_ag(1) * number_fraction ! [MPa] - - hio_aflc_scpf(io_si,iscpf) = hio_aflc_scpf(io_si,iscpf) + & + + hio_aflc_scpf(io_si,iscpf) = hio_aflc_scpf(io_si,iscpf) + & ccohort_hydr%flc_aroot(1) * number_fraction hio_tflc_scpf(io_si,iscpf) = hio_tflc_scpf(io_si,iscpf) + & @@ -3564,7 +3564,7 @@ subroutine update_history_hydraulics(this,nc,nsites,sites,dt_tstep) io_shsl = io_shsl + 1 hio_h2osoi_shsl(io_si,io_shsl) = sites(s)%si_hydr%h2osoi_liqvol_shell(j,k) end do - end do + end do if(hlm_use_ed_st3.eq.ifalse) then do scpf=1,nlevsclass*numpft @@ -4004,8 +4004,6 @@ subroutine define_history_vars(this, initialize_variables) long='Seed mass decay', use_default='active', & avgflag='A', vtype=site_elem_r8, hlms='CLM:ALM', flushval=hlm_hio_ignore_val, upfreq=1, & ivar=ivar, initialize=initialize_variables, index = ih_seed_decay_elem ) - - call this%set_history_var(vname='ED_bstore', units='gC m-2', & long='Storage biomass', use_default='active', & @@ -4111,7 +4109,7 @@ subroutine define_history_vars(this, initialize_variables) ivar=ivar, initialize=initialize_variables, index = ih_c_stomata_si_age ) call this%set_history_var(vname='C_LBLAYER_BY_AGE', units='umol m-2 s-1', & - long='mean leaf boundary layer conductance - by page age', use_default='inactive', & + long='mean leaf boundary layer conductance - by patch age', use_default='inactive', & avgflag='A', vtype=site_age_r8, hlms='CLM:ALM', flushval=0.0_r8, upfreq=2, & ivar=ivar, initialize=initialize_variables, index = ih_c_lblayer_si_age ) @@ -4584,7 +4582,7 @@ subroutine define_history_vars(this, initialize_variables) call this%set_history_var(vname='C13disc_SCPF', units = 'per mil', & long='C13 discrimination by pft/size',use_default='inactive', & avgflag='A', vtype=site_size_pft_r8, hlms='CLM:ALM', flushval=0.0_r8, & - upfreq=1, ivar=ivar, initialize=initialize_variables, index = ih_c13disc_si_scpf ) + upfreq=1, ivar=ivar, initialize=initialize_variables, index = ih_c13disc_si_scpf ) call this%set_history_var(vname='BSTOR_CANOPY_SCPF', units = 'kgC/ha', & long='biomass carbon in storage pools of canopy plants by pft/size', use_default='inactive', & @@ -5073,7 +5071,6 @@ subroutine define_history_vars(this, initialize_variables) avgflag='A', vtype=site_elem_r8, hlms='CLM:ALM', flushval=hlm_hio_ignore_val, & upfreq=1, ivar=ivar, initialize=initialize_variables, index = ih_err_fates_si ) - call this%set_history_var(vname='LITTER_FINES_AG_ELEM', units='kg/m^2', & long='mass of above ground litter in fines (leaves,nonviable seed)', use_default='active', & avgflag='A', vtype=site_elem_r8, hlms='CLM:ALM', flushval=hlm_hio_ignore_val, & @@ -5316,7 +5313,7 @@ subroutine define_history_vars(this, initialize_variables) long='cumulative net borrowed (+) from plant_stored_h2o due to leaf emergence', use_default='inactive', & avgflag='A', vtype=site_r8, hlms='CLM:ALM', flushval=0.0_r8, & upfreq=1, ivar=ivar, initialize=initialize_variables, index = ih_h2oveg_pheno_err_si ) - + call this%set_history_var(vname='H2OVEG_HYDRO_ERR', units = 'kg/m2', & long='cumulative net borrowed (+) from plant_stored_h2o due to plant hydrodynamics', use_default='inactive', & avgflag='A', vtype=site_r8, hlms='CLM:ALM', flushval=0.0_r8, &