Skip to content

Commit

Permalink
Remove commented chunks and track deallocation changes
Browse files Browse the repository at this point in the history
  • Loading branch information
Margaret Marvin committed Nov 18, 2024
1 parent 53b9d1e commit fe1824b
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 68 deletions.
68 changes: 0 additions & 68 deletions src/canopy_calcs.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -461,40 +461,6 @@ SUBROUTINE canopy_calcs(nn)
tleaf_shade240_3d(i,j,:) = sum(tleaf_shade240_rst_3d(:,i,j,:),1)/240.0
tleaf_ave240_3d(i,j,:) = sum(tleaf_ave240_rst_3d(:,i,j,:),1)/240.0

!ppfd_sun24_3d(i,j,:) = 0.0_rk
!ppfd_shade24_3d(i,j,:) = 0.0_rk
!tleaf_sun24_3d(i,j,:) = 0.0_rk
!tleaf_shade24_3d(i,j,:) = 0.0_rk
!tleaf_ave24_3d(i,j,:) = 0.0_rk
!ppfd_sun240_3d(i,j,:) = 0.0_rk
!ppfd_shade240_3d(i,j,:) = 0.0_rk
!tleaf_sun240_3d(i,j,:) = 0.0_rk
!tleaf_shade240_3d(i,j,:) = 0.0_rk
!tleaf_ave240_3d(i,j,:) = 0.0_rk
!do t = nn-24, nn-1 !>24 hours sum previous 24 hour moving time window (i.e., running)
! ppfd_sun24_3d(i,j,:) = ppfd_sun24_tmp_3d(t,i,j,:) + ppfd_sun24_3d(i,j,:)
! ppfd_shade24_3d(i,j,:) = ppfd_shade24_tmp_3d(t,i,j,:) + ppfd_shade24_3d(i,j,:)
! tleaf_sun24_3d(i,j,:) = tleaf_sun24_tmp_3d(t,i,j,:) + tleaf_sun24_3d(i,j,:)
! tleaf_shade24_3d(i,j,:) = tleaf_shade24_tmp_3d(t,i,j,:) + tleaf_shade24_3d(i,j,:)
! tleaf_ave24_3d(i,j,:) = tleaf_ave24_tmp_3d(t,i,j,:) + tleaf_ave24_3d(i,j,:)
! ppfd_sun240_3d(i,j,:) = ppfd_sun240_tmp_3d(t,i,j,:) + ppfd_sun240_3d(i,j,:)
! ppfd_shade240_3d(i,j,:) = ppfd_shade240_tmp_3d(t,i,j,:) + ppfd_shade240_3d(i,j,:)
! tleaf_sun240_3d(i,j,:) = tleaf_sun240_tmp_3d(t,i,j,:) + tleaf_sun240_3d(i,j,:)
! tleaf_shade240_3d(i,j,:) = tleaf_shade240_tmp_3d(t,i,j,:) + tleaf_sun240_3d(i,j,:)
! tleaf_ave240_3d(i,j,:) = tleaf_ave240_tmp_3d(t,i,j,:) + tleaf_ave240_3d(i,j,:)
!end do
!!average hours
!ppfd_sun24_3d(i,j,:) = ppfd_sun24_3d(i,j,:)/24.0_rk
!ppfd_shade24_3d(i,j,:) = ppfd_shade24_3d(i,j,:)/24.0_rk
!tleaf_sun24_3d(i,j,:) = tleaf_sun24_3d(i,j,:)/24.0_rk
!tleaf_shade24_3d(i,j,:) = tleaf_shade24_3d(i,j,:)/24.0_rk
!tleaf_ave24_3d(i,j,:) = tleaf_ave24_3d(i,j,:)/24.0_rk
!ppfd_sun240_3d(i,j,:) = ppfd_sun240_3d(i,j,:)/24.0_rk
!ppfd_shade240_3d(i,j,:) = ppfd_shade240_3d(i,j,:)/24.0_rk
!tleaf_sun240_3d(i,j,:) = tleaf_sun240_3d(i,j,:)/24.0_rk
!tleaf_shade240_3d(i,j,:) = tleaf_shade240_3d(i,j,:)/24.0_rk
!tleaf_ave240_3d(i,j,:) = tleaf_ave240_3d(i,j,:)/24.0_rk

!Update for current time value using efolding (holdfrac and hnewfrac)
ppfd_sun24_3d(i,j,:) = ( holdfrac * ppfd_sun24_3d(i,j,:) ) + ( hnewfrac * ppfd_sun )
ppfd_shade24_3d(i,j,:) = ( holdfrac * ppfd_shade24_3d(i,j,:) ) + ( hnewfrac * ppfd_shade )
Expand Down Expand Up @@ -1287,40 +1253,6 @@ SUBROUTINE canopy_calcs(nn)
tleaf_shade240(loc,:) = sum(tleaf_shade240_rst(:,loc,:),1)/240.0
tleaf_ave240(loc,:) = sum(tleaf_ave240_rst(:,loc,:),1)/240.0

!ppfd_sun24(loc,:) = 0.0_rk
!ppfd_shade24(loc,:) = 0.0_rk
!tleaf_sun24(loc,:) = 0.0_rk
!tleaf_shade24(loc,:) = 0.0_rk
!tleaf_ave24(loc,:) = 0.0_rk
!ppfd_sun240(loc,:) = 0.0_rk
!ppfd_shade240(loc,:) = 0.0_rk
!tleaf_sun240(loc,:) = 0.0_rk
!tleaf_shade240(loc,:) = 0.0_rk
!tleaf_ave240(loc,:) = 0.0_rk
!do t = nn-24, nn-1 !>24 hours sum previous 24 hour moving time window (i.e., running)
! ppfd_sun24(loc,:) = ppfd_sun24_tmp(t,loc,:) + ppfd_sun24(loc,:)
! ppfd_shade24(loc,:) = ppfd_shade24_tmp(t,loc,:) + ppfd_shade24(loc,:)
! tleaf_sun24(loc,:) = tleaf_sun24_tmp(t,loc,:) + tleaf_sun24(loc,:)
! tleaf_shade24(loc,:) = tleaf_shade24_tmp(t,loc,:) + tleaf_shade24(loc,:)
! tleaf_ave24(loc,:) = tleaf_ave24_tmp(t,loc,:) + tleaf_ave24(loc,:)
! ppfd_sun240(loc,:) = ppfd_sun240_tmp(t,loc,:) + ppfd_sun240(loc,:)
! ppfd_shade240(loc,:) = ppfd_shade240_tmp(t,loc,:) + ppfd_shade240(loc,:)
! tleaf_sun240(loc,:) = tleaf_sun240_tmp(t,loc,:) + tleaf_sun240(loc,:)
! tleaf_shade240(loc,:) = tleaf_shade240_tmp(t,loc,:) + tleaf_sun240(loc,:)
! tleaf_ave240(loc,:) = tleaf_ave240_tmp(t,loc,:) + tleaf_ave240(loc,:)
!end do
!!average hours
!ppfd_sun24(loc,:) = ppfd_sun24(loc,:)/24.0_rk
!ppfd_shade24(loc,:) = ppfd_shade24(loc,:)/24.0_rk
!tleaf_sun24(loc,:) = tleaf_sun24(loc,:)/24.0_rk
!tleaf_shade24(loc,:) = tleaf_shade24(loc,:)/24.0_rk
!tleaf_ave24(loc,:) = tleaf_ave24(loc,:)/24.0_rk
!ppfd_sun240(loc,:) = ppfd_sun240(loc,:)/24.0_rk
!ppfd_shade240(loc,:) = ppfd_shade240(loc,:)/24.0_rk
!tleaf_sun240(loc,:) = tleaf_sun240(loc,:)/24.0_rk
!tleaf_shade240(loc,:) = tleaf_shade240(loc,:)/24.0_rk
!tleaf_ave240(loc,:) = tleaf_ave240(loc,:)/24.0_rk

!Updated rolling 24 hour (hourly, short term) and 240 hour (daily, long-term) averages
ppfd_sun24(loc,:) = ( holdfrac * ppfd_sun24(loc,:) ) + ( hnewfrac * ppfd_sun )
ppfd_shade24(loc,:) = ( holdfrac * ppfd_shade24(loc,:) ) + ( hnewfrac * ppfd_shade )
Expand Down
24 changes: 24 additions & 0 deletions src/canopy_dealloc.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,18 @@ SUBROUTINE canopy_dealloc
if(allocated(ppfd_shade240_tmp)) deallocate(ppfd_shade240_tmp)
if(allocated(tmp2mref_tmp)) deallocate(tmp2mref_tmp)
if(allocated(ubzref_tmp)) deallocate(ubzref_tmp)
if(allocated(tleaf_sun24_rst)) deallocate(tleaf_sun24_rst)
if(allocated(tleaf_shade24_rst)) deallocate(tleaf_shade24_rst)
if(allocated(tleaf_ave24_rst)) deallocate(tleaf_ave24_rst)
if(allocated(ppfd_sun24_rst)) deallocate(ppfd_sun24_rst)
if(allocated(ppfd_shade24_rst)) deallocate(ppfd_shade24_rst)
if(allocated(tleaf_sun240_rst)) deallocate(tleaf_sun240_rst)
if(allocated(tleaf_shade240_rst)) deallocate(tleaf_shade240_rst)
if(allocated(tleaf_ave240_rst)) deallocate(tleaf_ave240_rst)
if(allocated(ppfd_sun240_rst)) deallocate(ppfd_sun240_rst)
if(allocated(ppfd_shade240_rst)) deallocate(ppfd_shade240_rst)
if(allocated(tmp2mref_rst)) deallocate(tmp2mref_rst)
if(allocated(ubzref_rst)) deallocate(ubzref_rst)
if(allocated(tleaf_sun24)) deallocate(tleaf_sun24)
if(allocated(tleaf_shade24)) deallocate(tleaf_shade24)
if(allocated(tleaf_ave24)) deallocate(tleaf_ave24)
Expand All @@ -85,6 +97,18 @@ SUBROUTINE canopy_dealloc
if(allocated(ppfd_shade240_tmp_3d)) deallocate(ppfd_shade240_tmp_3d)
if(allocated(tmp2mref_tmp_3d)) deallocate(tmp2mref_tmp_3d)
if(allocated(ubzref_tmp_3d)) deallocate(ubzref_tmp_3d)
if(allocated(tleaf_sun24_rst_3d)) deallocate(tleaf_sun24_rst_3d)
if(allocated(tleaf_shade24_rst_3d)) deallocate(tleaf_shade24_rst_3d)
if(allocated(tleaf_ave24_rst_3d)) deallocate(tleaf_ave24_rst_3d)
if(allocated(ppfd_sun24_rst_3d)) deallocate(ppfd_sun24_rst_3d)
if(allocated(ppfd_shade24_rst_3d)) deallocate(ppfd_shade24_rst_3d)
if(allocated(tleaf_sun240_rst_3d)) deallocate(tleaf_sun240_rst_3d)
if(allocated(tleaf_shade240_rst_3d)) deallocate(tleaf_shade240_rst_3d)
if(allocated(tleaf_ave240_rst_3d)) deallocate(tleaf_ave240_rst_3d)
if(allocated(ppfd_sun240_rst_3d)) deallocate(ppfd_sun240_rst_3d)
if(allocated(ppfd_shade240_rst_3d)) deallocate(ppfd_shade240_rst_3d)
if(allocated(tmp2mref_rst_3d)) deallocate(tmp2mref_rst_3d)
if(allocated(ubzref_rst_3d)) deallocate(ubzref_rst_3d)
if(allocated(tleaf_sun24_3d)) deallocate(tleaf_sun24_3d)
if(allocated(tleaf_shade24_3d)) deallocate(tleaf_shade24_3d)
if(allocated(tleaf_ave24_3d)) deallocate(tleaf_ave24_3d)
Expand Down

0 comments on commit fe1824b

Please sign in to comment.