Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

HLM-side changes to allow FATES snow occlusion of LAI #1324

Merged
merged 7 commits into from
Apr 21, 2021
Merged

HLM-side changes to allow FATES snow occlusion of LAI #1324

Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e33f6bc
added logic to differentiate canopy_summarization calls for restart v…
ckoven Apr 6, 2021
c8b965a
Modified wrapper for snow depth
rgknox Apr 6, 2021
810a09f
Merge pull request #3 from rgknox/snow_occlusion_ctsm
ckoven Apr 6, 2021
f9a166d
changed logic to use logican ratehr than integers and added a bit of …
ckoven Apr 7, 2021
51d3145
Merge tag 'ctsm5.1.dev035' into snow_occlusion_ctsm
glemieux Apr 20, 2021
64c06ff
updating fates tag in Externals_CLM.cfg and adding ChangeLog entry
glemieux Apr 21, 2021
da2df93
Update change log file
ekluzek Apr 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 16 additions & 5 deletions src/utils/clmfates_interfaceMod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ module CLMFatesInterfaceMod
use EDBtranMod , only : btran_ed, &
get_active_suction_layers
use EDCanopyStructureMod , only : canopy_summarization, update_hlm_dynamics
use EDCanopyStructureMod , only : UpdateFatesAvgSnowDepth
use FatesPlantRespPhotosynthMod, only : FatesPlantRespPhotosynthDrive
use EDAccumulateFluxesMod , only : AccumulateFluxes_ED
use FatesSoilBGCFluxMod , only : FluxIntoLitterPools
Expand Down Expand Up @@ -919,7 +920,7 @@ subroutine dynamics_driv(this, nc, bounds_clump, &
call this%wrap_update_hlmfates_dyn(nc, &
bounds_clump, &
waterdiagnosticbulk_inst, &
canopystate_inst)
canopystate_inst, .false.)

! ---------------------------------------------------------------------------------
! Part IV:
Expand All @@ -942,7 +943,7 @@ end subroutine dynamics_driv
! ------------------------------------------------------------------------------------

subroutine wrap_update_hlmfates_dyn(this, nc, bounds_clump, &
waterdiagnosticbulk_inst, canopystate_inst)
waterdiagnosticbulk_inst, canopystate_inst, is_initing_from_restart)

! ---------------------------------------------------------------------------------
! This routine handles the updating of vegetation canopy diagnostics, (such as lai)
Expand All @@ -956,7 +957,11 @@ subroutine wrap_update_hlmfates_dyn(this, nc, bounds_clump, &
integer , intent(in) :: nc
type(waterdiagnosticbulk_type) , intent(inout) :: waterdiagnosticbulk_inst
type(canopystate_type) , intent(inout) :: canopystate_inst


! is this being called during a read from restart sequence (if so then use the restarted fates
! snow depth variable rather than the CLM variable).
logical , intent(in) :: is_initing_from_restart

integer :: npatch ! number of patches in each site
integer :: ifp ! index FATES patch
integer :: p ! HLM patch index
Expand Down Expand Up @@ -988,6 +993,11 @@ subroutine wrap_update_hlmfates_dyn(this, nc, bounds_clump, &
this%fates(nc)%bc_in(s)%frac_sno_eff_si = frac_sno_eff(c)
end do

! Only update the fates internal snow burial if this is not a restart
if (.not. is_initing_from_restart) then
call UpdateFatesAvgSnowDepth(this%fates(nc)%sites,this%fates(nc)%bc_in)
end if

! Canopy diagnostics for FATES
call canopy_summarization(this%fates(nc)%nsites, &
this%fates(nc)%sites, &
Expand Down Expand Up @@ -1390,7 +1400,7 @@ subroutine restart( this, bounds_proc, ncid, flag, waterdiagnosticbulk_inst, &
! Update diagnostics of FATES ecosystem structure used in HLM.
! ------------------------------------------------------------------------
call this%wrap_update_hlmfates_dyn(nc,bounds_clump, &
waterdiagnosticbulk_inst,canopystate_inst)
waterdiagnosticbulk_inst,canopystate_inst, .true.)

! ------------------------------------------------------------------------
! Update the 3D patch level radiation absorption fractions
Expand Down Expand Up @@ -1527,7 +1537,7 @@ subroutine init_coldstart(this, waterstatebulk_inst, waterdiagnosticbulk_inst, &
! Update diagnostics of FATES ecosystem structure used in HLM.
! ------------------------------------------------------------------------
call this%wrap_update_hlmfates_dyn(nc,bounds_clump, &
waterdiagnosticbulk_inst,canopystate_inst)
waterdiagnosticbulk_inst,canopystate_inst, .false.)

! ------------------------------------------------------------------------
! Update history IO fields that depend on ecosystem dynamics
Expand Down Expand Up @@ -1610,6 +1620,7 @@ subroutine wrap_sunfrac(this,nc,atm2lnd_inst,canopystate_inst)
end do
end do


! -------------------------------------------------------------------------------
! Call FATES public function to calculate internal sun/shade structures
! as well as total patch sun/shade fraction output boundary condition
Expand Down