Skip to content

Commit c1dfc21

Browse files
glemieuxglemieux
authored
Merge pull request #1456 from rgknox/hist-dense1-fixes-api40
fixes for history level 1
2 parents 315e0d6 + fb5e6de commit c1dfc21

File tree

1 file changed

+24
-21
lines changed

1 file changed

+24
-21
lines changed

‎main/FatesHistoryInterfaceMod.F90‎

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7089,8 +7089,25 @@ subroutine define_history_vars(this, initialize_variables)
70897089
upfreq=group_dyna_simple, ivar=ivar, initialize=initialize_variables, index = ih_crownarea_ustory_damage_si )
70907090

70917091
end if if_crowndamage1
7092-
70937092

7093+
call this%set_history_var(vname='FATES_NCL', units='', &
7094+
long='number of canopy levels', &
7095+
use_default='inactive', avgflag='A', vtype=site_r8, &
7096+
hlms='CLM:ALM', upfreq=group_dyna_simple, ivar=ivar, initialize=initialize_variables, &
7097+
index=ih_ncl_si)
7098+
7099+
if ( comp_excln_exp .lt. 0._r8 ) then ! only valid when "strict ppa" enabled
7100+
tempstring = 'active'
7101+
else
7102+
tempstring = 'inactive'
7103+
endif
7104+
7105+
call this%set_history_var(vname='FATES_ZSTAR', units='m', &
7106+
long='product of zstar and patch area', &
7107+
use_default=tempstring, avgflag='A', vtype=site_r8, &
7108+
hlms='CLM:ALM', upfreq=group_dyna_simple, ivar=ivar, initialize=initialize_variables, &
7109+
index=ih_zstar_si)
7110+
70947111
if_dyn1: if(hlm_hist_level_dynam>1) then
70957112

70967113
call this%set_history_var(vname='FATES_NPP_LU', units='kg m-2 s-1', &
@@ -7133,7 +7150,7 @@ subroutine define_history_vars(this, initialize_variables)
71337150
call this%set_history_var(vname='FATES_RECRUITMENT_CFLUX_PF', units='kg m-2 yr-1', &
71347151
long='total PFT-level biomass of new recruits in kg of carbon per land area', &
71357152
use_default='active', avgflag='A', vtype=site_pft_r8, hlms='CLM:ALM', &
7136-
upfreq=1, ivar=ivar, initialize=initialize_variables, &
7153+
upfreq=group_dyna_complx, ivar=ivar, initialize=initialize_variables, &
71377154
index=ih_recruitment_cflux_si_pft)
71387155

71397156
call this%set_history_var(vname='FATES_LEAFC_PF', units='kg m-2', &
@@ -7299,18 +7316,12 @@ subroutine define_history_vars(this, initialize_variables)
72997316

73007317
call this%set_history_var(vname='FATES_CANOPYAREA', units='m2 m-2', &
73017318
long='canopy area per m2 land area', use_default='inactive', &
7302-
avgflag='A', vtype=site_r8, hlms='CLM:ALM', upfreq=group_dyna_simple, ivar=ivar, &
7319+
avgflag='A', vtype=site_r8, hlms='CLM:ALM', upfreq=group_dyna_complx, ivar=ivar, &
73037320
initialize=initialize_variables, index=ih_canopy_fracarea_si)
73047321

7305-
call this%set_history_var(vname='FATES_NCL', units='', &
7306-
long='number of canopy levels', &
7307-
use_default='inactive', avgflag='A', vtype=site_r8, &
7308-
hlms='CLM:ALM', upfreq=group_dyna_simple, ivar=ivar, initialize=initialize_variables, &
7309-
index=ih_ncl_si)
7310-
73117322
call this%set_history_var(vname='FATES_PATCHAREA', units='m2 m-2', &
73127323
long='patch area per m2 land area', use_default='inactive', &
7313-
avgflag='A', vtype=site_r8, hlms='CLM:ALM', upfreq=group_dyna_simple, ivar=ivar, &
7324+
avgflag='A', vtype=site_r8, hlms='CLM:ALM', upfreq=group_dyna_complx, ivar=ivar, &
73147325
initialize=initialize_variables, index=ih_fracarea_si)
73157326

73167327
! patch age class variables
@@ -7359,12 +7370,6 @@ subroutine define_history_vars(this, initialize_variables)
73597370
hlms='CLM:ALM', upfreq=group_dyna_complx, ivar=ivar, initialize=initialize_variables, &
73607371
index=ih_zstar_si_age)
73617372

7362-
call this%set_history_var(vname='FATES_ZSTAR', units='m', &
7363-
long='product of zstar and patch area', &
7364-
use_default='inactive', avgflag='A', vtype=site_r8, &
7365-
hlms='CLM:ALM', upfreq=group_dyna_simple, ivar=ivar, initialize=initialize_variables, &
7366-
index=ih_zstar_si)
7367-
73687373
call this%set_history_var(vname='FATES_CANOPYAREA_HT', units='m2 m-2', &
73697374
long='canopy area height distribution', &
73707375
use_default='active', avgflag='A', vtype=site_height_r8, &
@@ -7394,14 +7399,14 @@ subroutine define_history_vars(this, initialize_variables)
73947399
units='m2 m-2', &
73957400
long='secondary forest patch area since anthropgenic disturbance', &
73967401
use_default='inactive', avgflag='A', vtype=site_r8, &
7397-
hlms='CLM:ALM', upfreq=group_dyna_simple, ivar=ivar, initialize=initialize_variables, &
7402+
hlms='CLM:ALM', upfreq=group_dyna_complx, ivar=ivar, initialize=initialize_variables, &
73987403
index=ih_agesince_anthrodist_si)
73997404

74007405
call this%set_history_var(vname='FATES_SECONDARY_AREA', &
74017406
units='m2 m-2', &
74027407
long='secondary forest patch area since any kind of disturbance', &
74037408
use_default='inactive', avgflag='A', vtype=site_r8, &
7404-
hlms='CLM:ALM', upfreq=group_dyna_simple, ivar=ivar, initialize=initialize_variables, &
7409+
hlms='CLM:ALM', upfreq=group_dyna_complx, ivar=ivar, initialize=initialize_variables, &
74057410
index=ih_secondarylands_fracarea_si)
74067411

74077412
call this%set_history_var(vname='FATES_SECONDARY_AREA_AP', &
@@ -7415,7 +7420,7 @@ subroutine define_history_vars(this, initialize_variables)
74157420
units='m2 m-2', &
74167421
long='primary forest patch area since any kind of disturbance', &
74177422
use_default='inactive', avgflag='A', vtype=site_r8, &
7418-
hlms='CLM:ALM', upfreq=group_dyna_simple, ivar=ivar, initialize=initialize_variables, &
7423+
hlms='CLM:ALM', upfreq=group_dyna_complx, ivar=ivar, initialize=initialize_variables, &
74197424
index=ih_primarylands_fracarea_si)
74207425

74217426
call this%set_history_var(vname='FATES_PRIMARY_AREA_AP', &
@@ -8941,8 +8946,6 @@ subroutine define_history_vars(this, initialize_variables)
89418946
end if if_dyn1
89428947
end if if_dyn0
89438948

8944-
!HERE
8945-
89468949

89478950
if_hifrq0: if(hlm_hist_level_hifrq>0) then
89488951

0 commit comments

Comments
 (0)