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.

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

Barley camp #8177

Open
wants to merge 45 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
f3337c3
Rename observed values to reflect new model structure
hut104 Jul 20, 2023
493de6d
Extend met data to allow for long simulations
hut104 Jul 20, 2023
774b814
Barley now set to wheat model with Barley Cv fits
hut104 Jul 20, 2023
7379199
Merge branch 'master' of https://github.com/APSIMInitiative/APSIMX in…
hut104 Jul 20, 2023
513679a
Reinstate harvests in CE expt
hut104 Jul 20, 2023
7af2de6
Merge branch 'master' of https://github.com/APSIMInitiative/APSIMX in…
hut104 Aug 3, 2023
b1ff9f4
Work from Toowoomba sprint with Hamish
hut104 Aug 3, 2023
989c5f8
Merge branch 'master' of https://github.com/APSIMInitiative/APSIMX in…
hut104 Oct 16, 2023
804f175
Merge branch 'master' of https://github.com/APSIMInitiative/APSIMX in…
hut104 Oct 16, 2023
6433fff
Day one of Barley Sprint
hut104 Oct 16, 2023
b7eb45f
fitting of stem growth and SLA
hut104 Oct 16, 2023
a041609
Merge branch 'master' of https://github.com/APSIMInitiative/APSIMX in…
hut104 Oct 17, 2023
2dafe9c
work on NZ datasets
hut104 Oct 17, 2023
0bbb6a4
Merge branch 'master' of https://github.com/APSIMInitiative/APSIMX in…
hut104 Oct 17, 2023
14f8704
work on NZ datasets (both sims and obs data)
hut104 Oct 17, 2023
017cd54
extra graphs and some fitting of soil params
hut104 Oct 17, 2023
2f3a520
Merge branch 'master' of https://github.com/APSIMInitiative/ApsimX in…
hut104 Feb 27, 2024
ff83049
swap column headers as per earlier commit
hut104 Feb 27, 2024
5e78fd0
changes - may be andrews changes
hut104 Mar 4, 2024
4acc41c
Merge branch 'master' of https://github.com/APSIMInitiative/ApsimX in…
hut104 Mar 14, 2024
12fcc9b
comment out leaf[1].Area set to smaller number (ie 10)
hut104 Mar 15, 2024
90a9246
Merge branch 'master' of https://github.com/APSIMInitiative/ApsimX in…
hut104 Apr 15, 2024
efe6db1
Fix phenology for NZ cultivars and removing some columns from OBS dat…
hut104 Apr 16, 2024
9dff3b6
general fitting
hut104 Apr 16, 2024
1473c40
Fix dots on graphs and soil n graphs for MCP910
hut104 Apr 16, 2024
adfa9cf
Correcting names for outputs and obs data for soil mineral n
hut104 Apr 16, 2024
fd571da
Fix soil water graphs in MCPD1011
hut104 Apr 17, 2024
d59beb0
Phenology and soil water fitting
hut104 Apr 17, 2024
21526d7
Merge branch 'master' of https://github.com/APSIMInitiative/ApsimX in…
hut104 Apr 18, 2024
d112617
Fixed harvest dates in Hermitage 1990
hut104 Apr 18, 2024
e2eb752
Merge branch 'master' of https://github.com/APSIMInitiative/ApsimX in…
hut104 Apr 20, 2024
ac5289a
Merge branch 'BarleyCamp' of https://github.com/hut104/ApsimX into Ba…
PengchengHU Apr 22, 2024
2f9e0a6
working on SLA
hut104 Apr 26, 2024
6a5f3de
Merge branch 'master' of https://github.com/APSIMInitiative/ApsimX in…
hut104 Apr 26, 2024
070b614
removed duplicate data for wellcamp
hut104 Apr 26, 2024
8a4f95d
fixed harvest date for wellcamp
hut104 Apr 26, 2024
04e37ec
Change initial sw for RS experiment
hut104 Apr 26, 2024
588ddd2
initial sw again on RS
hut104 Apr 26, 2024
9e0bac3
Fix emergence dates for NPI simulations
PengchengHU Apr 27, 2024
7031191
Merge branch 'master' of https://github.com/APSIMInitiative/ApsimX in…
PengchengHU Apr 27, 2024
151c0b1
Merge branch 'BarleyCamp' of https://github.com/hut104/ApsimX into Ba…
PengchengHU Apr 27, 2024
71cb168
Fix emergence dates for NPI simulations
PengchengHU Apr 28, 2024
b8cff46
Improve the performance of MCVP phenology simulations
PengchengHU May 1, 2024
a504250
Improve phenology simulation
PengchengHU Jun 27, 2024
074ecfe
Working on biomass and yield simulations
PengchengHU Jun 27, 2024
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
Prev Previous commit
Next Next commit
working on SLA
hut104 committed Apr 26, 2024
commit 2f9e0a60af7b25059010b3037232d1175dadbaaf
167 changes: 163 additions & 4 deletions Tests/Validation/Barley/Barley.apsimx
Original file line number Diff line number Diff line change
@@ -74,7 +74,9 @@
"[Barley].Stem.Allocated.Wt",
"[Barley].Root.DMDemand.Total",
"[Barley].Spike.DMDemand.Total",
"[Barley].Grain.DMDemand.Total"
"[Barley].Grain.DMDemand.Total",
"[Barley].Leaf.CohortParameters.SpecificLeafAreaMax",
"[Barley].Leaf.CohortParameters.SpecificLeafAreaMin"
],
"EventNames": [
"[Clock].DoReport"
@@ -201,8 +203,28 @@
"[Stem].DMDemands.Structural.DMDemandFunction.PartitionFraction.PreStemElongation.StemFraction.FixedValue=0.24",
"[Stem].DMDemands.Structural.DMDemandFunction.PartitionFraction.StemElongation.StemFraction.FixedValue=0.64",
"",
"[Leaf].CohortParameters.SpecificLeafAreaMax.XYPairs.Y= 18000, 20000, 25000, 25000, 25000, 20000",
"[Leaf].CohortParameters.SpecificLeafAreaMin.XYPairs.Y= 12000, 15000",
"",
"[Leaf].CohortParameters.StructuralFraction.FixedValue = 0.99",
"[Leaf].CohortParameters.StorageFraction.FixedValue = 0.01",
"",
"[Leaf].CohortParameters.SpecificLeafAreaMax.XValue.VariableName=[Barley].Leaf.LAI",
"[Leaf].CohortParameters.SpecificLeafAreaMax.XYPairs.X= 3, 9",
"[Leaf].CohortParameters.SpecificLeafAreaMax.XYPairs.Y= 18000, 35000",
"",
"[Leaf].CohortParameters.SpecificLeafAreaMin.XValue.VariableName=[Barley].Leaf.LAI",
"[Leaf].CohortParameters.SpecificLeafAreaMin.XYPairs.X= 3, 9",
"[Leaf].CohortParameters.SpecificLeafAreaMin.XYPairs.Y= 15000, 25000",
"",
"//[Leaf].CohortParameters.SpecificLeafAreaMax.XValue.VariableName=[Barley].Phenology.Stage",
"//[Leaf].CohortParameters.SpecificLeafAreaMax.XYPairs.X= 3, 5, 6, 8, 9, 10",
"//[Leaf].CohortParameters.SpecificLeafAreaMax.XYPairs.Y= 18000, 20000, 35000, 35000, 25000, 20000",
"",
"//[Leaf].CohortParameters.SpecificLeafAreaMin.XValue.VariableName=[Barley].Phenology.Stage",
"//[Leaf].CohortParameters.SpecificLeafAreaMin.XYPairs.X= 3, 5, 6, 8, 9, 10",
"//[Leaf].CohortParameters.SpecificLeafAreaMin.XYPairs.Y= 15000, 15000, 20000, 20000, 15000, 15000",
"",
"//[Leaf].CohortParameters.SpecificLeafAreaMin.XYPairs.Y= 12000, 15000",
"",
"[Leaf].CohortParameters.MaxArea.AgeFactor.XYPairs.Y=0.1, 0.5, 1.0, 0.5",
"[Leaf].KDead = 0.5",
"",
@@ -2569,7 +2591,7 @@
"Interval": null
}
],
"LegendPosition": 3,
"LegendPosition": 2,
"LegendOrientation": 0,
"AnnotationLocation": 0,
"DisabledSeries": [],
@@ -63689,6 +63711,143 @@
],
"Enabled": true,
"ReadOnly": false
},
{
"$type": "Models.Graph, Models",
"Caption": null,
"Axis": [
{
"$type": "APSIM.Shared.Graphing.Axis, APSIM.Shared",
"Title": null,
"Position": 3,
"Inverted": false,
"CrossesAtZero": false,
"LabelOnOneLine": false,
"Minimum": null,
"Maximum": null,
"Interval": null
},
{
"$type": "APSIM.Shared.Graphing.Axis, APSIM.Shared",
"Title": null,
"Position": 0,
"Inverted": false,
"CrossesAtZero": false,
"LabelOnOneLine": false,
"Minimum": null,
"Maximum": "NaN",
"Interval": null
}
],
"LegendPosition": 0,
"LegendOrientation": 0,
"AnnotationLocation": 0,
"DisabledSeries": [],
"LegendOutsideGraph": false,
"Name": "SpecificLeafAreas",
"ResourceName": null,
"Children": [
{
"$type": "Models.Series, Models",
"Type": 1,
"XAxis": 3,
"YAxis": 0,
"ColourArgb": -16777216,
"FactorToVaryColours": null,
"FactorToVaryMarkers": null,
"FactorToVaryLines": null,
"Marker": 11,
"MarkerSize": 0,
"Line": 0,
"LineThickness": 0,
"TableName": "DailyReport",
"XFieldName": "Clock.Today",
"YFieldName": "Barley.Leaf.CohortParameters.SpecificLeafAreaMax",
"X2FieldName": null,
"Y2FieldName": null,
"ShowInLegend": true,
"IncludeSeriesNameInLegend": false,
"Cumulative": false,
"CumulativeX": false,
"Filter": null,
"Name": "Max",
"ResourceName": null,
"Children": [
{
"$type": "Models.EventNamesOnGraph, Models",
"ColumnName": "Barley.Phenology.CurrentStageName",
"SimulationName": null,
"Name": "EventNamesOnGraph",
"ResourceName": null,
"Children": [],
"Enabled": true,
"ReadOnly": false
}
],
"Enabled": true,
"ReadOnly": false
},
{
"$type": "Models.Series, Models",
"Type": 1,
"XAxis": 3,
"YAxis": 0,
"ColourArgb": -1663232,
"FactorToVaryColours": null,
"FactorToVaryMarkers": null,
"FactorToVaryLines": null,
"Marker": 11,
"MarkerSize": 0,
"Line": 0,
"LineThickness": 0,
"TableName": "DailyReport",
"XFieldName": "Clock.Today",
"YFieldName": "Barley.Leaf.CohortParameters.SpecificLeafAreaMin",
"X2FieldName": null,
"Y2FieldName": null,
"ShowInLegend": true,
"IncludeSeriesNameInLegend": false,
"Cumulative": false,
"CumulativeX": false,
"Filter": null,
"Name": "Min",
"ResourceName": null,
"Children": [],
"Enabled": true,
"ReadOnly": false
},
{
"$type": "Models.Series, Models",
"Type": 1,
"XAxis": 3,
"YAxis": 0,
"ColourArgb": -16736653,
"FactorToVaryColours": null,
"FactorToVaryMarkers": null,
"FactorToVaryLines": null,
"Marker": 11,
"MarkerSize": 0,
"Line": 0,
"LineThickness": 0,
"TableName": "DailyReport",
"XFieldName": "Clock.Today",
"YFieldName": "Barley.Leaf.SpecificArea",
"X2FieldName": null,
"Y2FieldName": null,
"ShowInLegend": true,
"IncludeSeriesNameInLegend": false,
"Cumulative": false,
"CumulativeX": false,
"Filter": null,
"Name": "Actual",
"ResourceName": null,
"Children": [],
"Enabled": true,
"ReadOnly": false
}
],
"Enabled": true,
"ReadOnly": false
}
],
"Enabled": true,