Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
FSPM_BASIC
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
JochemEvers
FSPM_BASIC
Commits
d2d7c82f
Commit
d2d7c82f
authored
5 years ago
by
Evers, Jochem
Browse files
Options
Downloads
Patches
Plain Diff
Small bug fixes in new root model
parent
e4a796d7
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
RootModule.rgg
+3
-2
3 additions, 2 deletions
RootModule.rgg
graph.xml
+115
-115
115 additions, 115 deletions
graph.xml
project.gs
+63
-63
63 additions, 63 deletions
project.gs
with
181 additions
and
180 deletions
RootModule.rgg
+
3
−
2
View file @
d2d7c82f
...
@@ -74,6 +74,7 @@ module RootBase extends GrowingOrgan
...
@@ -74,6 +74,7 @@ module RootBase extends GrowingOrgan
void Bleed(PlantBase pb) {
void Bleed(PlantBase pb) {
double r = growth>sumGrowth ? growth-sumGrowth : 0;
double r = growth>sumGrowth ? growth-sumGrowth : 0;
pb.reservePool += r;
pb.reservePool += r;
growth -= r;
}
}
void Uptake() {
void Uptake() {
...
@@ -336,7 +337,7 @@ module PrimaryRootOrgan extends GrowingRootOrgan
...
@@ -336,7 +337,7 @@ module PrimaryRootOrgan extends GrowingRootOrgan
void calcGrowth(RootBase RS) {
void calcGrowth(RootBase RS) {
//C allocated to radial growth
//C allocated to radial growth
double C =
potGrowth>0 &&
RS.sumGrowth>0 ?
(pRoot/
potGrowth
)*
RS.growth * potGrowth/RS.sumGrowth : 0;
double C = RS.sumGrowth>0 ?
Math.min(
potGrowth
,
RS.growth * potGrowth/RS.sumGrowth
)
: 0;
biomass += C;
biomass += C;
radius = Math.sqrt(biomass/(length*Math.PI*RTD[species]*1e6));
radius = Math.sqrt(biomass/(length*Math.PI*RTD[species]*1e6));
...
@@ -386,7 +387,7 @@ module SecondaryRootOrgan extends ExtendingRootOrgan
...
@@ -386,7 +387,7 @@ module SecondaryRootOrgan extends ExtendingRootOrgan
void calcGrowth(RootBase RS) {
void calcGrowth(RootBase RS) {
//C allocated to fine root growth
//C allocated to fine root growth
double C =
potGrowth>0 &&
RS.sumGrowth>0 ?
(pRoot/
potGrowth
)*
RS.growth * potGrowth/RS.sumGrowth : 0;
double C = RS.sumGrowth>0 ?
Math.min(
potGrowth
,
RS.growth * potGrowth/RS.sumGrowth
)
: 0;
biomass += C;
biomass += C;
FineRootBiomass += C;
FineRootBiomass += C;
...
...
This diff is collapsed.
Click to expand it.
graph.xml
+
115
−
115
View file @
d2d7c82f
This diff is collapsed.
Click to expand it.
project.gs
+
63
−
63
View file @
d2d7c82f
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment