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

Lower number-density termination threshold #189

Merged
merged 6 commits into from
Mar 14, 2017
Merged

Lower number-density termination threshold #189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3a7b068
reduced thresholds for cohort termination due to small number densiti…
ckoven Feb 22, 2017
4157e60
removed calls to terminate_cohorts in EDCanopyStructureMod.F90
ckoven Feb 22, 2017
c2d67ac
Merge branch 'new_mort_diagnostics' into lower_termination_threshold
ckoven Feb 23, 2017
37ba5ce
Merge branch 'dont_terminate_in_canopy' into lower_termination_threshold
ckoven Feb 23, 2017
6a5aa19
merged changes into lower_termination_threshold
ckoven Mar 6, 2017
07c10f3
merged in master
ckoven Mar 10, 2017
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
5 changes: 0 additions & 5 deletions components/clm/src/ED/biogeochem/EDCanopyStructureMod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,6 @@ subroutine canopy_structure( currentSite )
!currentCohort%canopy_layer,currentCohort%dbh

endif
! call terminate_cohorts(currentPatch)

!----------- End of cohort splitting ------------------------------!
endif !canopy layer = i
Expand All @@ -307,7 +306,6 @@ subroutine canopy_structure( currentSite )

enddo !currentCohort

call terminate_cohorts(currentSite, currentPatch)
arealayer(i) = arealayer(i) - sumloss
!Update arealayer for diff calculations of layer below.
arealayer(i + 1) = arealayer(i + 1) + sumloss
Expand Down Expand Up @@ -343,7 +341,6 @@ subroutine canopy_structure( currentSite )

enddo !is there still excess area in any layer?

call terminate_cohorts(currentSite, currentPatch)
call fuse_cohorts(currentPatch)
call terminate_cohorts(currentSite, currentPatch)

Expand Down Expand Up @@ -503,7 +500,6 @@ subroutine canopy_structure( currentSite )
!currentCohort%pft,currentPatch%patchno

endif
!call terminate_cohorts(currentPatch)
if(promswitch == 1)then
! write(fates_log(),*) 'cohort loop',currentCohort%pft,currentPatch%patchno
endif
Expand Down Expand Up @@ -565,7 +561,6 @@ subroutine canopy_structure( currentSite )
endif
enddo !is there still not enough canopy area in any layer?

call terminate_cohorts(currentSite, currentPatch)
call fuse_cohorts(currentPatch)
call terminate_cohorts(currentSite, currentPatch)

Expand Down
15 changes: 6 additions & 9 deletions components/clm/src/ED/main/EDTypesMod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,15 +67,12 @@ module EDTypesMod
integer , parameter :: N_DBH_BINS = 5 ! no. of dbh bins used when comparing patches


real(r8), parameter :: min_npm2 = 1.0d-5 ! minimum cohort number density per m2 before termination
real(r8), parameter :: min_patch_area = 0.001_r8 ! smallest allowable patch area before termination
real(r8), parameter :: min_nppatch = 1.0d-8 ! minimum number of cohorts per patch (min_npm2*min_patch_area)

! in some cases, we want to immediately remove super small
! number densities of cohorts to prevent FPEs, this is usually
! just relevant in the first day after recruitment
real(r8), parameter :: min_n_safemath = 1.0E-15_r8

real(r8), parameter :: min_npm2 = 1.0E-8_r8 ! minimum cohort number density per m2 before termination
real(r8), parameter :: min_patch_area = 0.001_r8 ! smallest allowable patch area before termination
real(r8), parameter :: min_nppatch = 1.0E-11_r8 ! minimum number of cohorts per patch (min_npm2*min_patch_area)
real(r8), parameter :: min_n_safemath = 1.0E-15_r8 ! in some cases, we want to immediately remove super small
! number densities of cohorts to prevent FPEs, this is usually
! just relevant in the first day after recruitment
character*4 yearchar

! special mode to cause PFTs to create seed mass of all currently-existing PFTs
Expand Down