Skip to content

Commit

Permalink
Merge pull request #35 from ed2014/DEROPAPY
Browse files Browse the repository at this point in the history 
Set ATLAS type met files in test - tidy up DERO test sim
  • Loading branch information
@ed2014
ed2014 authored Jan 8, 2024
2 parents 82a3aa3 + f04ff6c commit dd6b652
Show file tree
Hide file tree
Showing 14 changed files with 238 additions and 1 deletion.
149 changes: 148 additions & 1 deletion Prototypes/DEROPAPY/Deropapy.apsimx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19025,7 +19025,7 @@
{
"$type": "Models.Climate.Weather, Models",
"ConstantsFile": null,
"FileName": "Whakatu.met",
"FileName": "20993_Lincoln_Had_RCPpast.met",
"ExcelWorkSheetName": "",
"Name": "Weather",
"ResourceName": null,
Expand Down Expand Up @@ -46638,6 +46638,153 @@
"Enabled": true,
"ReadOnly": false
},
{
"$type": "Models.Core.Folder, Models",
"ShowInDocs": false,
"GraphsPerPage": 6,
"Name": "ATLAS_Fertiliser",
"ResourceName": null,
"Children": [
{
"$type": "Models.Graph, Models",
"Caption": null,
"Axis": [
{
"$type": "APSIM.Shared.Graphing.Axis, APSIM.Shared",
"Title": "",
"Position": 0,
"Inverted": false,
"CrossesAtZero": false,
"LabelOnOneLine": false,
"Minimum": "NaN",
"Maximum": "NaN",
"Interval": null
},
{
"$type": "APSIM.Shared.Graphing.Axis, APSIM.Shared",
"Title": null,
"Position": 3,
"Inverted": false,
"CrossesAtZero": false,
"LabelOnOneLine": false,
"Minimum": "NaN",
"Maximum": "NaN",
"Interval": null
}
],
"LegendPosition": 5,
"LegendOrientation": 0,
"AnnotationLocation": 0,
"DisabledSeries": [],
"LegendOutsideGraph": false,
"Name": "Maize",
"ResourceName": null,
"Children": [
{
"$type": "Models.Series, Models",
"Type": 1,
"XAxis": 3,
"YAxis": 0,
"ColourArgb": -16744448,
"FactorToVaryColours": "Irrigation",
"FactorToVaryMarkers": "Location",
"FactorToVaryLines": null,
"Marker": 11,
"MarkerSize": 0,
"Line": 4,
"LineThickness": 0,
"TableName": "Output",
"XFieldName": "Year",
"YFieldName": "FertiliserN_Cum",
"X2FieldName": null,
"Y2FieldName": null,
"ShowInLegend": true,
"IncludeSeriesNameInLegend": false,
"Cumulative": false,
"CumulativeX": false,
"Filter": "Crop = \"Maize\"",
"Name": "out",
"ResourceName": null,
"Children": [],
"Enabled": true,
"ReadOnly": false
}
],
"Enabled": true,
"ReadOnly": false
},
{
"$type": "Models.Graph, Models",
"Caption": null,
"Axis": [
{
"$type": "APSIM.Shared.Graphing.Axis, APSIM.Shared",
"Title": "",
"Position": 0,
"Inverted": false,
"CrossesAtZero": false,
"LabelOnOneLine": false,
"Minimum": "NaN",
"Maximum": 10.0,
"Interval": null
},
{
"$type": "APSIM.Shared.Graphing.Axis, APSIM.Shared",
"Title": null,
"Position": 3,
"Inverted": false,
"CrossesAtZero": false,
"LabelOnOneLine": false,
"Minimum": "NaN",
"Maximum": "NaN",
"Interval": null
}
],
"LegendPosition": 5,
"LegendOrientation": 0,
"AnnotationLocation": 0,
"DisabledSeries": [],
"LegendOutsideGraph": false,
"Name": "Grapevine",
"ResourceName": null,
"Children": [
{
"$type": "Models.Series, Models",
"Type": 1,
"XAxis": 3,
"YAxis": 0,
"ColourArgb": -16744448,
"FactorToVaryColours": "Location",
"FactorToVaryMarkers": "Irrigation",
"FactorToVaryLines": null,
"Marker": 11,
"MarkerSize": 0,
"Line": 4,
"LineThickness": 0,
"TableName": "Output",
"XFieldName": "Year",
"YFieldName": "FertiliserN_Cum",
"X2FieldName": null,
"Y2FieldName": null,
"ShowInLegend": true,
"IncludeSeriesNameInLegend": false,
"Cumulative": false,
"CumulativeX": false,
"Filter": "Crop = \"Grapevine\"",
"Name": "out",
"ResourceName": null,
"Children": [],
"Enabled": true,
"ReadOnly": false
}
],
"Enabled": true,
"ReadOnly": false
}
],
"Enabled": true,
"ReadOnly": false
},
{
"$type": "Models.Core.Folder, Models",
"ShowInDocs": false,
Expand Down
0 Prototypes/DEROPAPY/CropCoeffs.xlsx → ...otypes/DEROPAPY/coeff-old/CropCoeffs.xlsx
View file
File renamed without changes.
45 changes: 45 additions & 0 deletions Prototypes/DEROPAPY/coeff-old/CropParameters-New.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
ParamName,ParamUnit,Description,Maize,Apple,RyeGrass,Clover,Wheat,Hemp,OSR,Grapevine,Macadamia,Lemons,Avocado
CropType,string,type of crop used for organic matter residues types,Maize,Grapevine,pasture,whiteclover,Maize,Maize,Maize,Grapevine,Grapevine,Grapevine,Grapevine
TT_Temp_X,oC,Average temperature for thermal time calculation,(0 18.0 26.0 34.0 44.0),(0 18.0 26.0 34.0 44.0),(0 18.0 26.0 34.0 44.0),(0 18.0 26.0 34.0 44.0),(0 18.0 26.0 34.0 44.0),(0 18.0 26.0 34.0 44.0),(0 18.0 26.0 34.0 44.0),(0 18.0 26.0 34.0 44.0),(0 18.0 26.0 34.0 44.0),(0 18.0 26.0 34.0 44.0),(0 18.0 26.0 34.0 44.0)
TT_Acc_Y,oCd,Thermal time accumulation at average temperature,(0 10.0 18.0 26.0 0.0),(0 10.0 18.0 26.0 0.0),(0 10.0 18.0 26.0 0.0),(0 10.0 18.0 26.0 0.0),(0 10.0 18.0 26.0 0.0),(0 10.0 18.0 26.0 0.0),(0 10.0 18.0 26.0 0.0),(0 10.0 18.0 26.0 0.0),(0 10.0 18.0 26.0 0.0),(0 10.0 18.0 26.0 0.0),(0 10.0 18.0 26.0 0.0)
D_StartGrowth_00,DAWS,"""Earliest"" day after winter solstice when sowing/end-dorm is resumed every year",72,200,0,0,74,74,74,200,200,200,200
T_StartGrowth_00,oC,"""14 day running average temperature required to start growth""",13,10,0,0,14,14,14,10,10,10,10
Tt_Vegetative_01,oCd,Thermal-time accumulation from startGrowth to FullCanopy,750,450,300,300,600,600,600,450,450,450,450
DefoliateOrDevelop,binary,If plant defoliated at the end of the vegetative phase,Reproductive,Reproductive,Graze,Graze,Reproductive,Reproductive,Reproductive,Reproductive,Reproductive,Reproductive,Reproductive
Pp_Reproductive_02,oCd ,Photoperiod during the reproductive period, (12.5 24.0),(8.0 16.0),(8.0 16.0),(8.0 16.0), (8.0 16.0), (8.0 16.0), (8.0 16.0),(8.0 16.0),(8.0 16.0),(8.0 16.0),(8.0 16.0)
Tt_Reproductive_02,oCd,Thermal-time accumulation from FullCanopy to StartSenescence,(700 700),(200 1000),(0 0), (0 0),(300 300),(300 300),(300 300),(200 1000),(200 1000),(200 1000),(200 1000)
Tt_Senescent_03,oCd,Thermal-time accumulation from StartSenescence to Maturity,0,200,0,0,300,300,300,200,200,200,200
Tt_Mature_04,oCd,Thermal-time accumulation from Maturity to dormancy,0,50,0,0,50,50,50,50,50,50,50
Chill_Temp_X,oC,Chill thresholds,(0 0 0 0),(-5.0 0.0 8.0 12.0),(-5.0 0.0 8.0 12.0),(-5.0 0.0 8.0 12.0),(-5.0 0.0 8.0 12.0),(-5.0 0.0 8.0 12.0),(-5.0 0.0 8.0 12.0),(-5.0 0.0 8.0 12.0),(-5.0 0.0 8.0 12.0),(-5.0 0.0 8.0 12.0),(-5.0 0.0 8.0 12.0)
Chill_Acc_Y,oCd,Chill rate,(0 0 0 0),(0.0 1.0 1.0 0.0),(0.0 1.0 1.0 0.0),(0.0 1.0 1.0 0.0),(0.0 1.0 1.0 0.0),(0.0 1.0 1.0 0.0),(0.0 1.0 1.0 0.0),(0.0 1.0 1.0 0.0),(0.0 1.0 1.0 0.0),(0.0 1.0 1.0 0.0),(0.0 1.0 1.0 0.0)
AC_Dormant_05,oCd,chill stuff,(0 0),(0.0 200),(0.0 30),(0.0 30),(0.0 30),(0.0 30),(0.0 30),(0.0 200),(0.0 200),(0.0 200),(0.0 200)
Tt_Dormant_05,oCd,more chill stuff,(0 0),(900 300),(0 0),(0 0),(0 0),(0 0),(0 0),(900 300),(900 300),(900 300),(900 300)
MaxCanopyBaseHeight,mm,Height of the base of the canopy of mature plant,0,700,0,0,0,0,0,700,700,700,700
MaxCanopyPrunedHeight,mm,Height of the top of the canopy of a mature plant after pruning or grazing,0,2500,100,100,0,0,0,2500,2500,2500,2500
MaxCanopyHeight,mm,Height of the top of the canopy of a matur plant before harvest or pruning,2500,3500,300,300,1800,1800,1800,3500,3500,3500,3500
MaxCanopyPrunedWidth,mm,Width of the canopy of mature plants after pruning,800,1200,300,300,800,800,800,1200,1200,1200,1200
MaxCanopyWidth,mm,Width of the canopy of mature plants before pruning,800,1500,300,300,800,800,800,1500,1500,1500,1500
AgeToMaxDimension,Y,Years until plant reaches mature size,1,6,1,1,1,1,1,6,6,6,6
AgeAtStartSimulation,Y,How old is the plant at the start of the simulation,0,4,0.3,1,0,0,0,4,4,4,4
SeasonalDimensionPattern,0-1,Relative values for height and width at StartGrowth FullCanopy StartSenescence and Maturity respectively,(0 0.5 0.5 1.0),(0 0.3 0.3 1.0),(0 1.0 1.0 1.0),(0 1.0 1.0 1.0),(0 0.5 0.5 1.0),(0 0.5 0.5 1.0),(0 0.5 0.5 1.0),(0 0.3 0.3 1.0),(0 0.3 0.3 1.0),(0 0.3 0.3 1.0),(0 0.3 0.3 1.0)
LAImax,m2/m2,Maximum achievable leaf are index (optimal management),5,8,6,3,5,5,5,8,8,8,8
LAIWaterStressSens,0/1,Stress factor for LAI expansion when FW = 0.5 i.e this should be a value of zero or one,1,0,0,0,1,1,1,0,0,0,0
ExtCoeff,fractional,Extinction coefficient for diffuse light across canopy,0.45,0.7,0.5,0.8,0.45,0.45,0.45,0.7,0.7,0.7,0.7
ExtCoeffWaterStressSens,0/1,Stress factor of extinction coefficient when FW = 0.4 i.e should be between 0.2 and 1.0 depending on crop sensitivity,0.8,0.2,0.2,0.2,1,1,1,0.2,0.2,0.2,0.2
RUEtotal,g DM/MJ global rad,Radiation use efficiency for total plant biomass (global solar radiation),2,1.2,1,0.9,1.9,1.9,1.9,1.2,1.2,1.2,1.2
RUETempThresholds,oC,Threshold temperatures for lower_minimum lower_optima upper_optima and upper_minimum,(8 15 35 50),(5 20 30 40),(3 18 25 35),(5 20 25 35),(8 25 35 40),(8 25 35 40),(8 25 35 40),(5 20 30 40),(5 20 30 40),(5 20 30 40),(5 20 30 40)
PhotosynthesisType,C3 or C4,Metabolic pathway used for photosynthesis,C4,C3,C3,C3,C4,C4,C4,C3,C3,C3,C3
LeafPartitionFrac,0-1,Proportion of total biomass partitioned to Leaf (Note leaf is all above ground biomass that is not removed as product or remaining in permenant trunk),0.45,0.3,0.1,0.1,0.45,0.45,0.45,0.3,0.3,0.3,0.3
ProductPartitionFrac,0-1,Proportion of total biomass partitioned to product ,0.2,0.4,0.7,0.7,0.45,0.45,0.45,0.4,0.4,0.4,0.4
RootPartitionFrac,0-1,Proportion of total biomass partitioned to root,0.1,0.2,0.2,0.2,0.1,0.1,0.1,0.2,0.2,0.2,0.2
TrunkPartitionFrac,0-1,Proportion of total biomass partitioned to Trunk (note this is permenant biomass that is not removed),0,0.1,0,0,0,0,0,0.1,0.1,0.1,0.1
LeafMaxNConc,gN/gDM,Highest N conc of organ,0.04,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02
LeafMinNConc,gN/gDM,Lowest N conc of organ,0.01,0.01,0.01,0.01,0.01,0.01,0.01,0.01,0.01,0.01,0.01
ProductMaxNConc,gN/gDM,Highest N conc of organ,0.015,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02
ProductMinNConc,gN/gDM,Lowest N conc of organ,0.01,0.01,0.01,0.01,0.01,0.01,0.01,0.01,0.01,0.01,0.01
RootMaxNConc,gN/gDM,Highest N conc of organ,0.02,0.015,0.015,0.015,0.015,0.015,0.015,0.015,0.015,0.015,0.015
RootMinNConc,gN/gDM,Lowest N conc of organ,0.016,0.01,0.01,0.01,0.01,0.01,0.01,0.01,0.01,0.01,0.01
TrunkMaxNConc,gN/gDM,Highest N conc of organ,0,0,0,0,0.002,0.002,0.002,0,0,0,0
TrunkMinNConc,gN/gDM,Lowest N conc of organ,0,0,0,0,0.001,0.001,0.001,0,0,0,0
MaxRootDepth,mm,Depth that roots achieve when plant is mature,1500,3000,600,600,1500,1500,1500,3000,3000,3000,3000
RootTheNeighboursZone,bool,Do roots grow into neighbouring zone if multi simulation run?,TRUE,TRUE,TRUE,TRUE,TRUE,TRUE,TRUE,TRUE,TRUE,TRUE,TRUE
0 Prototypes/DEROPAPY/DraftCoeff.csv → Prototypes/DEROPAPY/coeff-old/DraftCoeff.csv
View file
File renamed without changes.
0 Prototypes/DEROPAPY/DraftCoeff.xlsx → ...otypes/DEROPAPY/coeff-old/DraftCoeff.xlsx
View file
File renamed without changes.
0 Prototypes/DEROPAPY/Test.csv → Prototypes/DEROPAPY/coeff-old/Test.csv
View file
File renamed without changes.
45 changes: 45 additions & 0 deletions Prototypes/DEROPAPY/coeff-old/Test2.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
ParamName,ParamUnit,Description,Maize,Apple,RyeGrass,Clover,Clover2
CropType,string,type of crop used for organic matter residues types,Maize,Grapevine,pasture,whiteclover,whiteclover
TT_Temp_X,oC,Average temperature for thermal time calculation,(0 18.0 26.0 34.0 44.0),(0 18.0 26.0 34.0 44.0),(0 18.0 26.0 34.0 44.0),(0 18.0 26.0 34.0 44.0),(0 18.0 26.0 34.0 44.0)
TT_Acc_Y,oCd,Thermal time accumulation at average temperature,(0 10.0 18.0 26.0 0.0),(0 10.0 18.0 26.0 0.0),(0 10.0 18.0 26.0 0.0),(0 10.0 18.0 26.0 0.0),(0 10.0 18.0 26.0 0.0)
D_StartGrowth_00,DAWS,"""Earliest"" day after winter solstice when sowing/end-dorm is resumed every year",200,200,0,0,0
T_StartGrowth_00,oC,"""14 day running average temperature required to start growth""",13,10,0,0,0
Tt_Vegetative_01,oCd,Thermal-time accumulation from startGrowth to FullCanopy,600,450,300,300,300
DefoliateOrDevelop,binary,If plant defoliated at the end of the vegetative phase,Reproductive,Reproductive,Graze,Graze,Graze
Pp_Reproductive_02,oCd ,Photoperiod during the reproductive period, (8.0 16.0),(8.0 16.0),(8.0 16.0),(8.0 16.0),(8.0 16.0)
Tt_Reproductive_02,oCd,Thermal-time accumulation from FullCanopy to StartSenescence,(300 300),(200 1000),(0 0), (0 0), (0 0)
Tt_Senescent_03,oCd,Thermal-time accumulation from StartSenescence to Maturity,300,200,0,0,0
Tt_Mature_04,oCd,Thermal-time accumulation from Maturity to dormancy,50,50,0,0,0
Chill_Temp_X,oC,Chill thresholds,(-5.0 0.0 8.0 12.0),(-5.0 0.0 8.0 12.0),(-5.0 0.0 8.0 12.0),(-5.0 0.0 8.0 12.0),(-5.0 0.0 8.0 12.0)
Chill_Acc_Y,oCd,Chill rate,(0.0 1.0 1.0 0.0),(0.0 1.0 1.0 0.0),(0.0 1.0 1.0 0.0),(0.0 1.0 1.0 0.0),(0.0 1.0 1.0 0.0)
AC_Dormant_05,oCd,chill stuff,(0.0 30),(0.0 200),(0.0 30),(0.0 30),(0.0 30)
Tt_Dormant_05,oCd,more chill stuff,(0 0),(900 300),(0 0),(0 0),(0 0)
MaxCanopyBaseHeight,mm,Height of the base of the canopy of mature plant,0,700,0,0,0
MaxCanopyPrunedHeight,mm,Height of the top of the canopy of a mature plant after pruning or grazing,0,2500,100,100,100
MaxCanopyHeight,mm,Height of the top of the canopy of a matur plant before harvest or pruning,1800,3500,300,300,300
MaxCanopyPrunedWidth,mm,Width of the canopy of mature plants after pruning,800,1200,300,300,300
MaxCanopyWidth,mm,Width of the canopy of mature plants before pruning,800,1500,300,300,300
AgeToMaxDimension,Y,Years until plant reaches mature size,1,6,1,1,1
AgeAtStartSimulation,Y,How old is the plant at the start of the simulation,0,4,0.3,1,1
SeasonalDimensionPattern,0-1,Relative values for height and width at StartGrowth FullCanopy StartSenescence and Maturity respectively,(0 0.5 0.5 1.0),(0 0.3 0.3 1.0),(0 1.0 1.0 1.0),(0 1.0 1.0 1.0),(0 1.0 1.0 1.0)
LAImax,m2/m2,Maximum achievable leaf are index (optimal management),5,8,6,3,3
LAIWaterStressSens,0/1,Stress factor for LAI expansion when FW = 0.5 i.e this should be a value of zero or one,1,0,0,0,0
ExtCoeff,fractional,Extinction coefficient for diffuse light across canopy,0.45,0.7,0.5,0.8,0.8
ExtCoeffWaterStressSens,0/1,Stress factor of extinction coefficient when FW = 0.4 i.e should be between 0.2 and 1.0 depending on crop sensitivity,1,0.2,0.2,0.2,0.2
RUEtotal,g DM/MJ global rad,Radiation use efficiency for total plant biomass (global solar radiation),1.9,1.2,1,0.9,0.9
RUETempThresholds,oC,Threshold temperatures for lower_minimum lower_optima upper_optima and upper_minimum,(8 25 35 40),(5 20 30 40),(3 18 25 35),(5 20 25 35),(5 20 25 35)
PhotosynthesisType,C3 or C4,Metabolic pathway used for photosynthesis,C4,C3,C3,C3,C3
LeafPartitionFrac,0-1,Proportion of total biomass partitioned to Leaf (Note leaf is all above ground biomass that is not removed as product or remaining in permenant trunk),0.45,0.3,0.1,0.1,0.1
ProductPartitionFrac,0-1,Proportion of total biomass partitioned to root ,0.45,0.4,0.7,0.7,0.7
RootPartitionFrac,0-1,Proportion of total biomass partitioned to Product,0.1,0.2,0.2,0.2,0.2
TrunkPartitionFrac,0-1,Proportion of total biomass partitioned to Trunk (note this is permenant biomass that is not removed),0,0.1,0,0,0
LeafMaxNConc,gN/gDM,Highest N conc of organ,0.02,0.02,0.02,0.02,0.02
LeafMinNConc,gN/gDM,Lowest N conc of organ,0.01,0.01,0.01,0.01,0.01
ProductMaxNConc,gN/gDM,Highest N conc of organ,0.02,0.02,0.02,0.02,0.02
ProductMinNConc,gN/gDM,Lowest N conc of organ,0.01,0.01,0.01,0.01,0.01
RootMaxNConc,gN/gDM,Highest N conc of organ,0.015,0.015,0.015,0.015,0.015
RootMinNConc,gN/gDM,Lowest N conc of organ,0.01,0.01,0.01,0.01,0.01
TrunkMaxNConc,gN/gDM,Highest N conc of organ,0.002,0,0,0,0
TrunkMinNConc,gN/gDM,Lowest N conc of organ,0.001,0,0,0,0
MaxRootDepth,mm,Depth that roots achieve when plant is mature,1500,3000,600,600,600
RootTheNeighboursZone,bool,Do roots grow into neighbouring zone if multi simulation run?,TRUE,TRUE,TRUE,TRUE,TRUE
0 Prototypes/DEROPAPY/VCS_Brightwater.met → ...ypes/DEROPAPY/met-old/VCS_Brightwater.met
View file
File renamed without changes.
0 Prototypes/DEROPAPY/VCS_Cromwell.met → Prototypes/DEROPAPY/met-old/VCS_Cromwell.met
View file
File renamed without changes.
0 Prototypes/DEROPAPY/VCS_Jervoistown.met → ...ypes/DEROPAPY/met-old/VCS_Jervoistown.met
View file
File renamed without changes.
0 Prototypes/DEROPAPY/VCS_Martinborough.met → ...es/DEROPAPY/met-old/VCS_Martinborough.met
View file
File renamed without changes.
0 Prototypes/DEROPAPY/VCS_Ranfurly.met → Prototypes/DEROPAPY/met-old/VCS_Ranfurly.met
View file
File renamed without changes.
0 Prototypes/DEROPAPY/VCS_Turitea.met → Prototypes/DEROPAPY/met-old/VCS_Turitea.met
View file
File renamed without changes.
0 Prototypes/DEROPAPY/Whakatu.met → Prototypes/DEROPAPY/met-old/Whakatu.met
View file
File renamed without changes.

0 comments on commit dd6b652

Please sign in to comment.