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

Improved/fixed sorghum co2 response #5479

Merged
merged 5 commits into from
Aug 20, 2020
Merged

Improved/fixed sorghum co2 response #5479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c62a02e
Improved/fixed sorghum co2 response
Aug 2, 2020
f6a0e91
Added CO2xTE response to sorghum.
Aug 7, 2020
78f2032
Add FRGR to c4maize to fix CI failures
Aug 7, 2020
43aa008
Merge branch 'master' of https://github.com/APSIMInitiative/ApsimX in…
Aug 18, 2020
c792ad2
Changed sorghum CO2xTE response to match that of old apsim
Aug 18, 2020
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
7 changes: 5 additions & 2 deletions Models/PMF/Organs/SorghumLeaf.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,9 @@ public double Gsmax
[Units("mm")]
public double Width { get; set; }

/// <summary>Gets or sets the FRGR.</summary>
/// <summary>The Fractional Growth Rate (FRGR) function.</summary>
[Units("mm")]
public double FRGR { get; set; }
public double FRGR => frgr.Value();

private double _PotentialEP = 0;
/// <summary>Sets the potential evapotranspiration. Set by MICROCLIMATE.</summary>
Expand Down Expand Up @@ -154,6 +154,9 @@ public double PotentialEP
[Link(Type = LinkType.Path, Path = "[Phenology].DltTT")]
private IFunction DltTT { get; set; }

[Link(Type = LinkType.Child, ByName = true)]
private IFunction frgr = null;

#region Canopy interface

/// <summary>
Expand Down
46 changes: 45 additions & 1 deletion Prototypes/C4Maize/C4Maize.apsimx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5960,7 +5960,6 @@
"R50": 0.0,
"BaseHeight": 0.0,
"Width": 0.0,
"FRGR": 0.0,
"PotentialEP": 0.0,
"LightProfile": null,
"DltLAI": 0.0,
Expand Down Expand Up @@ -8519,6 +8518,51 @@
"IncludeInDocumentation": true,
"Enabled": true,
"ReadOnly": false
},
{
"$type": "Models.Functions.MinimumFunction, Models",
"Name": "FRGR",
"Children": [
{
"$type": "Models.Functions.VariableReference, Models",
"VariableName": "[Leaf].Photosynthesis.FT",
"Name": "RUE_FT",
"Children": [],
"IncludeInDocumentation": true,
"Enabled": true,
"ReadOnly": false
},
{
"$type": "Models.Functions.MinimumFunction, Models",
"Name": "Others",
"Children": [
{
"$type": "Models.Functions.VariableReference, Models",
"VariableName": "[Leaf].Photosynthesis.FN",
"Name": "RUE_FN",
"Children": [],
"IncludeInDocumentation": true,
"Enabled": true,
"ReadOnly": false
},
{
"$type": "Models.Functions.VariableReference, Models",
"VariableName": "[Leaf].Photosynthesis.FVPD",
"Name": "RUE_FVPD",
"Children": [],
"IncludeInDocumentation": true,
"Enabled": true,
"ReadOnly": false
}
],
"IncludeInDocumentation": true,
"Enabled": true,
"ReadOnly": false
}
],
"IncludeInDocumentation": true,
"Enabled": true,
"ReadOnly": false
}
],
"IncludeInDocumentation": true,
Expand Down
Loading