FarmMaps/CarbonLib
13
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

removed fodder maize; if straw withdraw is checked results in 0
All checks were successful
FarmMaps.Develop/CarbonLib/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Francisco Salas
2021-07-26 16:07:39 +02:00
parent ee361e0085
commit 710473c727
2 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CarbonCalculation.cs
View File

@@ -500,10 +500,6 @@ namespace FarmMapsAPI.Carbon
newValue = 0.024 * item.Value + 0.228; newValue = 0.024 * item.Value + 0.228;
valueList.Add(new ColumnValue(item.Key, newValue)); valueList.Add(new ColumnValue(item.Key, newValue));
break; break;
case "Fodder_maize":
newValue = 0.024 * item.Value + 0.228;
valueList.Add(new ColumnValue(item.Key, newValue));
break;
case "Corn_Cob_mix": case "Corn_Cob_mix":
newValue = 0.024 * item.Value + 0.228; newValue = 0.024 * item.Value + 0.228;
valueList.Add(new ColumnValue(item.Key, newValue)); valueList.Add(new ColumnValue(item.Key, newValue));
@@ -621,7 +617,7 @@ namespace FarmMapsAPI.Carbon
var fracR = cropPropertyConfig.SingleOrDefault(x => x.Name.ToLower() == crop.Key.ToLower())?.FracR ?? 0.0; var fracR = cropPropertyConfig.SingleOrDefault(x => x.Name.ToLower() == crop.Key.ToLower())?.FracR ?? 0.0;
var field = farmInput.CropFields.SingleOrDefault(x => x.Name == cropArea.Key.Item1); var field = farmInput.CropFields.SingleOrDefault(x => x.Name == cropArea.Key.Item1);
var crop_res = field.HistoricalCropData.SingleOrDefault(x => x.Year == loopYear).Crops[0].CropRes ? 1 : 0; var crop_res = field.HistoricalCropData.SingleOrDefault(x => x.Year == loopYear).Crops[0].CropRes ? 0 : 1;
//var result = belowGroundCarbon.Value + (stubble * dm_contentStraw * parameterSet.CarbonBiomass) + ((1 - fracR) * strawYld * dm_contentStraw * parameterSet.CarbonBiomass); //var result = belowGroundCarbon.Value + (stubble * dm_contentStraw * parameterSet.CarbonBiomass) + ((1 - fracR) * strawYld * dm_contentStraw * parameterSet.CarbonBiomass);
var result = belowGroundCarbon.Value + (stubble * dm_contentStraw * parameterSet.CarbonBiomass) + (crop_res * strawYld * dm_contentStraw * parameterSet.CarbonBiomass); var result = belowGroundCarbon.Value + (stubble * dm_contentStraw * parameterSet.CarbonBiomass) + (crop_res * strawYld * dm_contentStraw * parameterSet.CarbonBiomass);

4
config/CropSets.json
View File

@@ -4,10 +4,6 @@
"StrawCrop": "Maize", "StrawCrop": "Maize",
"DM_Content": 0.7 "DM_Content": 0.7
}, },
{
"StrawCrop": "Fodder_maize",
"DM_Content": 0.85
},
{ {
"StrawCrop": "Corn_cob_mix", "StrawCrop": "Corn_cob_mix",
"DM_Content": 0.7 "DM_Content": 0.7