Skip to content

Commit

Permalink
Merge pull request #63 from HamishBrownPFR/SmallerFixes
Browse files Browse the repository at this point in the history
Smaller fixes
  • Loading branch information
HamishBrownPFR authored Jun 23, 2024
2 parents 6e67f68 + 059bbb6 commit df5d1b5
Show file tree
Hide file tree
Showing 155 changed files with 47,117 additions and 47,117 deletions.
Binary file added SVSModel.Excel/TestingFiles/Brians 3.6.xlsm
Binary file not shown.
Binary file added SVSModel.Excel/TestingFiles/Darians 3.6.xlsm
Binary file not shown.
Empty file.
Binary file added SVSModel.Excel/TestingFiles/Geralds 3.6.xlsm
Binary file not shown.
Binary file modified SVSModel.Excel/TestingFiles/Geralds.xlsm
Binary file not shown.
Binary file added SVSModel.Excel/TestingFiles/Jasons 3.6.xlsm
Binary file not shown.
Binary file added SVSModel.Excel/TestingFiles/Jasons.xlsm
Binary file not shown.
Binary file added SVSModel.Excel/TestingFiles/Obama 3.6.xlsm
Binary file not shown.
Binary file modified SVSModel.Excel/TestingFiles/Obama.xlsm
Binary file not shown.
Binary file modified SVSModel.Excel/TestingFiles/PotatoShort.xlsm
Binary file not shown.
Binary file added SVSModel.Excel/TestingFiles/Prototype 3.6.xlsm
Binary file not shown.
Binary file added SVSModel.Excel/TestingFiles/Wallies 3.6.xlsm
Binary file not shown.
56 changes: 28 additions & 28 deletions SVSModel/Data/CropCoefficientTableFull.csv
Original file line number Diff line number Diff line change
Expand Up @@ -75,40 +75,40 @@ TestResidue10,79,Testing,,,,,,,,,,Seed,Apr,Maturity,Feb,12,t/ha,Saleable grain ,
TestResidue15,80,Testing,,,,,,,,,,Seed,Apr,Maturity,Feb,12,t/ha,Saleable grain ,1,Total,0,0,0.5,0,15,0.1,1.5,1,1,1.5,1.5,1.5,0,0
TestResidue30,81,Testing,,,,,,,,,,Seed,Apr,Maturity,Feb,12,t/ha,Saleable grain ,1,Total,0,0,0.5,0,15,0.1,1.5,1,1,3,3,3,0,0
TestResidue45,82,Testing,,,,,,,,,,Seed,Apr,Maturity,Feb,12,t/ha,Saleable grain ,1,Total,0,0,0.5,0,15,0.1,1.5,1,1,4.5,4.5,4.5,0,0
Pumpkin Vegetable General,55,Vegetable,Fruit,Pumpkin,General,Cucurbitaceae,Cucurbita,pepo,,Cucurbita pepo ,pepo ,Seed,Oct,LateReproductive,Mar,54,t/ha,Saleable product ,1,Total,0,0,0.8,0,81,0.1,0.8,1,1,1,2.3,1.4,75,5
Rock melon Vegetable General,53,Vegetable,Fruit,Rock melon,General,Cucurbitaceae,Cucumis,melo,,Cucumis melo ,melo ,Seedling,Oct,LateReproductive,Feb,80,t/ha,Saleable product ,1,Total,0,0,0.7,0,95,0.1,0.8,1,1,1,2,2,75,5
Squash Vegetable General,54,Vegetable,Fruit,Squash,General,Cucurbitaceae,Cucurbita,argyrosperma,,Cucurbita argyrosperma ,argyrosperma ,Seedling,Oct,Maturity,Mar,22,t/ha,Saleable product ,1,Total,0,0,0.69,0,70,0.1,0.8,0.94,1,1,1.9,1.5,75,5
Sweetcorn Vegetable General,70,Vegetable,Fruit,Sweetcorn,General,Poaceae ,Zea,mays,,Zea mays ,mays ,Seed,Oct,MidReproductive,Feb,22,t/ha,Saleable product ,1,Total,0,0,0.48,0.02,78,0.1,1.5,0.75,1,0.9,0.9,1.4,150,5
Tomato Vegetable General,67,Vegetable,Fruit,Tomato,General,Solanaceae,Solanum ,lycopersicum,,Solanum lycopersicum ,lycopersicum ,Seedling,Oct,LateReproductive,Apr,100,t/ha,Saleable product ,1,Total,0,0,0.5,0,95,0.1,0.6,1,1.2,0.9,2,2,150,5
Water melon Vegetable General,52,Vegetable,Fruit,Water melon,General,Cucurbitaceae,Cucumis,lanatus,,Cucumis lanatus ,lanatus ,Seedling,Oct,LateReproductive,Feb,120,t/ha,Saleable product ,1,Total,0,0,0.73,0,93,0.1,0.8,1,1,1,1.9,1.4,75,5
Zucchini Vegetable General,56,Vegetable,Fruit,Zucchini,General,Cucurbitaceae,Cucurbita,pepo,,Cucurbita pepo ,pepo ,Seed,Oct,EarlyReproductive,Jan,40,t/ha,Saleable product ,1,Total,0,0,0.4,0,95,0.1,0.8,0.85,1,1,3.8,3.2,75,5
Broccoli Vegetable Chinese cut,47,Vegetable,Green,Broccoli,Chinese cut,Brassicaceae,Brassica,oleracea,italica,Brassica oleracea italica,oleracea italica,Seedling,May,EarlyReproductive,Sep,0.5,kg/head,Saleable product ,50000,Total,0,0,0.5,0.1,89,0.1,1.2,1,2,0.8,3,3.6,75,0
Broccoli Vegetable Head only,46,Vegetable,Green,Broccoli,Head only,Brassicaceae,Brassica,oleracea,italica,Brassica oleracea italica,oleracea italica,Seedling,May,EarlyReproductive,Sep,0.3,kg/head,Saleable product ,38000,Total,0,0,0.3,0.1,89,0.1,1.2,0.9,2,0.8,3.2,4.6,75,0
Brussel sprout Vegetable General,45,Vegetable,Green,Brussel sprout ,General,Brassicaceae,Brassica,oleracea,gemmifera,Brassica oleracea gemmifera,oleracea gemmifera,Seedling,Nov,EarlyReproductive,Jun,0.3,kg/head,Saleable product ,50000,Total,0,0,0.4,0.05,80,0.1,1.2,1,2,0.8,3.8,2.6,75,5
Cabbage Vegetable General,44,Vegetable,Green,Cabbage,General,Brassicaceae,Brassica,oleracea,capitata,Brassica oleracea capitata,oleracea capitata,Seedling,Sep,Vegetative,Jan,1.6,kg/head,Saleable product ,39000,Total,0,0,0.46,0,91,0.1,1.2,1,2,0.8,2.3,2.3,75,5
Cauliflower Vegetable General,43,Vegetable,Green,Cauliflower,General,Brassicaceae,Brassica,oleracea,botrytis,Brassica oleracea botrytis,oleracea botrytis,Seedling,Sep,EarlyReproductive,Jan,1.3,kg/head,Saleable product ,30000,Total,0,0,0.3,0.1,92,0.1,1.2,1,2,0.8,3.8,4.1,75,0
Celery Vegetable General,40,Vegetable,Green,Celery,General,Apiaceae ,Apium,graveolens,,Apium graveolens ,graveolens ,Seedling,Oct,Vegetative,Jan,0.7,kg/head,Saleable product ,80000,Total,0,0,0.85,0,88,0.1,1.2,1,0.8,0.9,2.5,2.5,150,5
Choy sum Vegetable General,49,Vegetable,Green,Choy sum,General,Brassicaceae,Brassica,rapa,parachinensis,Brassica rapa parachinensis,rapa parachinensis,Seedling,May,Vegetative,Sep,0.2,kg/head,Saleable product ,120000,Total,0,0,0.85,0,90,0.1,1.2,0.9,2,0.8,4.5,4.8,75,5
Pumpkin Vegetable General,55,Vegetable,Fruit,Pumpkin,General,Cucurbitaceae,Cucurbita,pepo,,Cucurbita pepo ,pepo ,Seed,Oct,LateReproductive,Mar,54,t/ha,Saleable product ,1,Total,0,0,0.8,.2,81,0.1,0.8,1,1,1,2.3,1.4,75,5
Rock melon Vegetable General,53,Vegetable,Fruit,Rock melon,General,Cucurbitaceae,Cucumis,melo,,Cucumis melo ,melo ,Seedling,Oct,LateReproductive,Feb,80,t/ha,Saleable product ,1,Total,0,0,0.7,0.2,95,0.1,0.8,1,1,1,2,2,75,5
Squash Vegetable General,54,Vegetable,Fruit,Squash,General,Cucurbitaceae,Cucurbita,argyrosperma,,Cucurbita argyrosperma ,argyrosperma ,Seedling,Oct,Maturity,Mar,22,t/ha,Saleable product ,1,Total,0,0,0.69,.2,70,0.1,0.8,0.94,1,1,1.9,1.5,75,5
Sweetcorn Vegetable General,70,Vegetable,Fruit,Sweetcorn,General,Poaceae ,Zea,mays,,Zea mays ,mays ,Seed,Oct,MidReproductive,Feb,22,t/ha,Saleable product ,1,Total,0,0,0.48,.2,78,0.1,1.5,0.75,1,0.9,0.9,1.4,150,5
Tomato Vegetable General,67,Vegetable,Fruit,Tomato,General,Solanaceae,Solanum ,lycopersicum,,Solanum lycopersicum ,lycopersicum ,Seedling,Oct,LateReproductive,Apr,100,t/ha,Saleable product ,1,Total,0,0,0.5,.4,95,0.1,0.6,1,1.2,0.9,2,2,150,5
Water melon Vegetable General,52,Vegetable,Fruit,Water melon,General,Cucurbitaceae,Cucumis,lanatus,,Cucumis lanatus ,lanatus ,Seedling,Oct,LateReproductive,Feb,120,t/ha,Saleable product ,1,Total,0,0,0.73,.2,93,0.1,0.8,1,1,1,1.9,1.4,75,5
Zucchini Vegetable General,56,Vegetable,Fruit,Zucchini,General,Cucurbitaceae,Cucurbita,pepo,,Cucurbita pepo ,pepo ,Seed,Oct,EarlyReproductive,Jan,40,t/ha,Saleable product ,1,Total,0,0,0.4,0.35,95,0.1,0.8,0.85,1,1,3.8,3.2,75,5
Broccoli Vegetable Chinese cut,47,Vegetable,Green,Broccoli,Chinese cut,Brassicaceae,Brassica,oleracea,italica,Brassica oleracea italica,oleracea italica,Seedling,May,EarlyReproductive,Sep,0.5,kg/head,Saleable product ,50000,Total,0,0,0.5,0.45,89,0.1,1.2,1,2,0.8,3,3.6,75,0
Broccoli Vegetable Head only,46,Vegetable,Green,Broccoli,Head only,Brassicaceae,Brassica,oleracea,italica,Brassica oleracea italica,oleracea italica,Seedling,May,EarlyReproductive,Sep,0.3,kg/head,Saleable product ,38000,Total,0,0,0.3,0.3,89,0.1,1.2,0.9,2,0.8,3.2,4.6,75,0
Brussel sprout Vegetable General,45,Vegetable,Green,Brussel sprout ,General,Brassicaceae,Brassica,oleracea,gemmifera,Brassica oleracea gemmifera,oleracea gemmifera,Seedling,Nov,EarlyReproductive,Jun,0.3,kg/head,Saleable product ,50000,Total,0,0,0.4,0.5,80,0.1,1.2,1,2,0.8,3.8,2.6,75,5
Cabbage Vegetable General,44,Vegetable,Green,Cabbage,General,Brassicaceae,Brassica,oleracea,capitata,Brassica oleracea capitata,oleracea capitata,Seedling,Sep,Vegetative,Jan,1.6,kg/head,Saleable product ,39000,Total,0,0,0.46,0.4,91,0.1,1.2,1,2,0.8,2.3,2.3,75,5
Cauliflower Vegetable General,43,Vegetable,Green,Cauliflower,General,Brassicaceae,Brassica,oleracea,botrytis,Brassica oleracea botrytis,oleracea botrytis,Seedling,Sep,EarlyReproductive,Jan,1.3,kg/head,Saleable product ,30000,Total,0,0,0.3,0.3,92,0.1,1.2,1,2,0.8,3.8,4.1,75,0
Celery Vegetable General,40,Vegetable,Green,Celery,General,Apiaceae ,Apium,graveolens,,Apium graveolens ,graveolens ,Seedling,Oct,Vegetative,Jan,0.7,kg/head,Saleable product ,80000,Total,0,0,0.85,.2,88,0.1,1.2,1,0.8,0.9,2.5,2.5,150,5
Choy sum Vegetable General,49,Vegetable,Green,Choy sum,General,Brassicaceae,Brassica,rapa,parachinensis,Brassica rapa parachinensis,rapa parachinensis,Seedling,May,Vegetative,Sep,0.2,kg/head,Saleable product ,120000,Total,0,0,0.85,.2,90,0.1,1.2,0.9,2,0.8,4.5,4.8,75,5
Coriander Vegetable General,51,Vegetable,Green,Coriander,General,Apiaceae ,Coriandrum,sativum,,Coriandrum sativum ,sativum ,Seed,May,Vegetative,Sep,0.3,kg/head,Saleable product ,120000,Total,0,0,1,0,95,0.1,1.2,0.9,0.8,0.9,4.7,4.7,150,5
Leek Vegetable General,34,Vegetable,Green,Leek,General,Amaryllidaceae,Allium,ampeloprasum,,Allium ampeloprasum ,ampeloprasum ,Seedling,Nov,Vegetative,May,0.5,kg/head,Saleable product ,50000,Total,0,0,0.65,0,89,0.1,0.6,0.75,0.6,1,2.7,2.7,400,5
Lettuce Vegetable Ice berg,61,Vegetable,Green,Lettuce,Ice berg,Asteraceae ,Lactuca,sativa,,Lactuca sativa ,sativa ,Seedling,Sep,Vegetative,Dec,0.9,kg/head,Saleable product ,70000,Total,0,0,0.42,0,96,0.1,1,0.95,1,0.9,3.6,3.5,300,5
Lettuce Vegetable Leafy-salad,62,Vegetable,Green,Lettuce,Leafy-salad,Asteraceae ,Lactuca,sativa,,Lactuca sativa ,sativa ,Seedling,Sep,Vegetative,Dec,0.3,kg/head,Saleable product ,110000,Total,0,0,0.95,0,95,0.1,1,0.9,1,0.9,1.9,4,50,5
Pak choi Vegetable General,48,Vegetable,Green,Pak choi,General,Brassicaceae,Brassica,rapa,chinensis,Brassica rapa chinensis,rapa chinensis,Seedling,May,Vegetative,Aug,0.08,kg/head,Saleable product ,500000,Total,0,0,0.7,0,95,0.1,1.2,0.8,1.5,0.8,4.5,4.2,75,5
Parsley Vegetable General,83,Vegetable,Green,Parsley,General,Apiaceae,Petroselinum,crispum,,Petroselinum crispum,crispum,Seed,May,Vegetative,Sep,0.3,kg/head,Saleable product ,100000,Total,0,0,0.7,0,92,0.1,1.5,0.8,1,0.8,4,4.5,150,5
Silver beet Vegetable General,41,Vegetable,Green,Silver beet,General,Amaranthaceae ,Beta,vulgaris,cicla,Beta vulgaris cicla,vulgaris cicla,Seedling,Nov,Vegetative,May,0.6,kg/head,Saleable product ,60000,Total,0,0,0.8,0,93,0.1,1.5,0.76,1,0.8,2.5,3,100,5
Spinach Vegetable General,68,Vegetable,Green,Spinach,General,Amaranthaceae ,Spinacia,loeracea,,Spinacia loeracea ,loeracea ,Seed,May,Vegetative,Sep,0.3,kg/head,Saleable product ,66000,Total,0,0,0.95,0,92,0.1,1.5,0.8,1,0.8,4,4.5,100,5
Leek Vegetable General,34,Vegetable,Green,Leek,General,Amaryllidaceae,Allium,ampeloprasum,,Allium ampeloprasum ,ampeloprasum ,Seedling,Nov,Vegetative,May,0.5,kg/head,Saleable product ,50000,Total,0,0,0.65,0.3,89,0.1,0.6,0.75,0.6,1,2.7,2.7,400,5
Lettuce Vegetable Ice berg,61,Vegetable,Green,Lettuce,Ice berg,Asteraceae ,Lactuca,sativa,,Lactuca sativa ,sativa ,Seedling,Sep,Vegetative,Dec,0.9,kg/head,Saleable product ,70000,Total,0,0,0.42,0.4,96,0.1,1,0.95,1,0.9,3.6,3.5,300,5
Lettuce Vegetable Leafy-salad,62,Vegetable,Green,Lettuce,Leafy-salad,Asteraceae ,Lactuca,sativa,,Lactuca sativa ,sativa ,Seedling,Sep,Vegetative,Dec,0.3,kg/head,Saleable product ,110000,Total,0,0,0.95,.05,95,0.1,1,0.9,1,0.9,1.9,4,50,5
Pak choi Vegetable General,48,Vegetable,Green,Pak choi,General,Brassicaceae,Brassica,rapa,chinensis,Brassica rapa chinensis,rapa chinensis,Seedling,May,Vegetative,Aug,0.08,kg/head,Saleable product ,500000,Total,0,0,0.7,0.3,95,0.1,1.2,0.8,1.5,0.8,4.5,4.2,75,5
Parsley Vegetable General,83,Vegetable,Green,Parsley,General,Apiaceae,Petroselinum,crispum,,Petroselinum crispum,crispum,Seed,May,Vegetative,Sep,0.3,kg/head,Saleable product ,100000,Total,0,0,0.7,0.3,92,0.1,1.5,0.8,1,0.8,4,4.5,150,5
Silver beet Vegetable General,41,Vegetable,Green,Silver beet,General,Amaranthaceae ,Beta,vulgaris,cicla,Beta vulgaris cicla,vulgaris cicla,Seedling,Nov,Vegetative,May,0.6,kg/head,Saleable product ,60000,Total,0,0,0.8,0.2,93,0.1,1.5,0.76,1,0.8,2.5,3,100,5
Spinach Vegetable General,68,Vegetable,Green,Spinach,General,Amaranthaceae ,Spinacia,loeracea,,Spinacia loeracea ,loeracea ,Seed,May,Vegetative,Sep,0.3,kg/head,Saleable product ,66000,Total,0,0,0.95,.05,92,0.1,1.5,0.8,1,0.8,4,4.5,100,5
Spring onion Vegetable General,38,Vegetable,Green,Spring onion,General,Amaryllidaceae,Allium,fistulosum,,Allium fistulosum ,fistulosum ,Seed,Feb,Vegetative,Sep,0.07,kg/head,Saleable product ,1400000,Total,0,0,1,0,90,0.1,0.6,0.75,0.6,1,1.9,1.9,400,5
Wong bok Vegetable General,50,Vegetable,Green,Wong bok,General,Brassicaceae,Brassica,rapa,pekinensis,Brassica rapa pekinensis,rapa pekinensis,Seedling,Dec,Vegetative,Jun,0.5,kg/head,Saleable product ,60000,Total,0,0,0.8,0,90,0.1,1.2,0.9,2,0.8,3,3,75,5
Wong bok Vegetable General,50,Vegetable,Green,Wong bok,General,Brassicaceae,Brassica,rapa,pekinensis,Brassica rapa pekinensis,rapa pekinensis,Seedling,Dec,Vegetative,Jun,0.5,kg/head,Saleable product ,60000,Total,0,0,0.8,0.2,90,0.1,1.2,0.9,2,0.8,3,3,75,5
Bean Vegetable General,65,Vegetable,Pulse,Bean,General,Fabaceae ,Phaseolus,vulgaris,,Phaseolus vulgaris ,vulgaris ,Seed,Nov,EarlyReproductive,Mar,18,t/ha,Saleable product ,1,Total,0,0,0.44,0.07,89,0.1,1,0.9,1,1.5,2.5,2.8,150,5
Broad bean Vegetable General,69,Vegetable,Pulse,Broad bean,General,Fabaceae ,Vicia,faba,,Vicia faba ,faba ,Seed,May,EarlyReproductive,Nov,11,t/ha,Saleable product ,1,Total,0,0,0.3,0.05,76,0.1,1,0.9,1,1.5,1.7,4.4,75,0
Pea Vegetable General,66,Vegetable,Pulse,Pea,General,Fabaceae ,Pisum,sativum,,Pisum sativum ,sativum ,Seed,Aug,EarlyReproductive,Jan,10,t/ha,Saleable product ,1,Total,0,0,0.34,0.08,77,0.1,0.7,1,1,1.5,2.1,4,150,5
Carrot Vegetable Fresh,59,Vegetable,Root,Carrot,Fresh,Apiaceae ,Daucus,carota,,Daucus carota ,carota ,Seed,Oct,EarlyReproductive,Jun,100,t/ha,Saleable product ,1,Total,0,0,0.88,0.07,89,0.1,1.2,0.9,0.7,0.9,1.2,1.5,150,5
Carrot Vegetable Juicing,57,Vegetable,Root,Carrot,Juicing,Apiaceae ,Daucus,carota,,Daucus carota ,carota ,Seed,Oct,EarlyReproductive,Jun,130,t/ha,Saleable product ,1,Total,0,0,0.86,0.07,88,0.1,1.2,0.9,0.7,0.9,1,1.4,150,5
Carrot Vegetable Processing,58,Vegetable,Root,Carrot,Processing,Apiaceae ,Daucus,carota,,Daucus carota ,carota ,Seed,Oct,EarlyReproductive,Jun,100,t/ha,Saleable product ,1,Total,0,0,0.8,0.07,88,0.1,1.2,0.9,0.7,0.9,1.3,1.6,150,5
Garlic Vegetable General,39,Vegetable,Root,Garlic,General,Amaryllidaceae,Allium,sativum,,Allium sativum ,sativum ,Seed,Jun,Vegetative,Dec,50,t/ha,Saleable product ,1,Total,0,0,0.88,0,87,0.1,0.6,0.7,0.6,1,1.35,1.4,500,5
Kumara Vegetable General,60,Vegetable,Root,Kumara,General,Convolvulaceae,Ipomoea,batatas,,Ipomoea batatas ,batatas ,Seed,Oct,Maturity,May,50,t/ha,Saleable product ,1,Total,0,0,0.89,0,77.4,0.1,0.9,1,1,1,2,1.8,150,5
Onion Vegetable Brown,35,Vegetable,Root,Onion,Brown,Amaryllidaceae,Allium,cepa,,Allium cepa ,cepa ,Seed,May,Maturity,Feb,65,t/ha,Saleable product ,1,Total,0,0,0.88,0,87,0.1,0.6,0.8,0.6,1,1.4,1.5,500,5
Onion Vegetable Red,36,Vegetable,Root,Onion,Red,Amaryllidaceae,Allium,cepa,,Allium cepa ,cepa ,Seed,May,LateReproductive,Apr,80,t/ha,Saleable product ,1,Total,0,0,0.88,0,87,0.1,0.6,0.8,0.6,1,1.4,1.5,500,5
Onion Vegetable Shallot,37,Vegetable,Root,Onion,Shallot,Amaryllidaceae,Allium,cepa,,Allium cepa ,cepa ,Seed,Apr,Vegetative,Dec,60,t/ha,Saleable product ,1,Total,0,0,0.88,0,87,0.1,0.6,0.8,0.6,1,1.4,1.5,500,5
Parsnip Vegetable General,64,Vegetable,Root,Parsnip,General,Apiaceae ,Pastinaca,sativa,,Pastinaca sativa ,sativa ,Seed,Sep,EarlyReproductive,May,44,t/ha,Saleable product ,1,Total,0,0,0.95,0,83,0.1,1.2,0.95,0.8,0.9,2,1.35,150,5
Garlic Vegetable General,39,Vegetable,Root,Garlic,General,Amaryllidaceae,Allium,sativum,,Allium sativum ,sativum ,Seed,Jun,Vegetative,Dec,50,t/ha,Saleable product ,1,Total,0,0,0.88,0.05,87,0.1,0.6,0.7,0.6,1,1.35,1.4,500,5
Kumara Vegetable General,60,Vegetable,Root,Kumara,General,Convolvulaceae,Ipomoea,batatas,,Ipomoea batatas ,batatas ,Seed,Oct,Maturity,May,50,t/ha,Saleable product ,1,Total,0,0,0.89,0.05,77.4,0.1,0.9,1,1,1,2,1.8,150,5
Onion Vegetable Brown,35,Vegetable,Root,Onion,Brown,Amaryllidaceae,Allium,cepa,,Allium cepa ,cepa ,Seed,May,Maturity,Feb,65,t/ha,Saleable product ,1,Total,0,0,0.88,0.05,87,0.1,0.6,0.8,0.6,1,1.4,1.5,500,5
Onion Vegetable Red,36,Vegetable,Root,Onion,Red,Amaryllidaceae,Allium,cepa,,Allium cepa ,cepa ,Seed,May,LateReproductive,Apr,80,t/ha,Saleable product ,1,Total,0,0,0.88,0.05,87,0.1,0.6,0.8,0.6,1,1.4,1.5,500,5
Onion Vegetable Shallot,37,Vegetable,Root,Onion,Shallot,Amaryllidaceae,Allium,cepa,,Allium cepa ,cepa ,Seed,Apr,Vegetative,Dec,60,t/ha,Saleable product ,1,Total,0,0,0.88,0.05,87,0.1,0.6,0.8,0.6,1,1.4,1.5,500,5
Parsnip Vegetable General,64,Vegetable,Root,Parsnip,General,Apiaceae ,Pastinaca,sativa,,Pastinaca sativa ,sativa ,Seed,Sep,EarlyReproductive,May,44,t/ha,Saleable product ,1,Total,0,0,0.95,0.05,83,0.1,1.2,0.95,0.8,0.9,2,1.35,150,5
Red beet Vegetable General,42,Vegetable,Root,Red beet,General,Amaranthaceae ,Beta,vulgaris,conditiva,Beta vulgaris conditiva,vulgaris conditiva,Seed,Sep,EarlyReproductive,May,55,t/ha,Saleable product ,1,Total,0,0,0.815,0.055,86,0.1,1.5,0.95,0.8,0.8,2,1.5,100,5
2 changes: 1 addition & 1 deletion SVSModel/Models/Crop.cs
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public static CropType Grow(Dictionary<DateTime, double> meanT, CropConfig cf)

// derive crop Harvest State Variables

thisCrop.HI = thisCrop.a_harvestIndex + thisCrop.fTotalProductFwt * thisCrop.b_harvestIndex;
thisCrop.HI = Math.Min(thisCrop.a_harvestIndex + thisCrop.fTotalProductFwt * thisCrop.b_harvestIndex,0.95);
if (cropParams.YieldType == "Standing DM")
{
thisCrop.fTotalProductFwt *= thisCrop.HI; // Yield is input at total standing DM but then partitioned to product and stover so need to adjust down her so it is only product
Expand Down
Loading

0 comments on commit df5d1b5

Please sign in to comment.