Index: dam clients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillXmlOutputFromDamUi.cs =================================================================== diff -u -r726 -r810 --- dam clients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillXmlOutputFromDamUi.cs (.../FillXmlOutputFromDamUi.cs) (revision 726) +++ dam clients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillXmlOutputFromDamUi.cs (.../FillXmlOutputFromDamUi.cs) (revision 810) @@ -42,7 +42,7 @@ return output; } - private static void TransferOutputCalculationMessages(List calculationMessages, OutputResults outputResults) + private static void TransferOutputCalculationMessages(List calculationMessages, OutputResults outputResults) { //var calculationMessages = damProjectData.CalculationMessages; if (calculationMessages != null) Index: dam clients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillDamUiFromXmlInput.cs =================================================================== diff -u -r790 -r810 --- dam clients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillDamUiFromXmlInput.cs (.../FillDamUiFromXmlInput.cs) (revision 790) +++ dam clients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillDamUiFromXmlInput.cs (.../FillDamUiFromXmlInput.cs) (revision 810) @@ -230,15 +230,15 @@ soil.DiameterD90 = inputSoil.DiameterD90Specified ? inputSoil.DiameterD90 : Double.NaN; soil.PermeabKx = inputSoil.PermeabKxSpecified ? inputSoil.PermeabKx : Double.NaN; soil.WhitesConstant = inputSoil.WhitesConstantSpecified ? inputSoil.WhitesConstant : Double.NaN; - soil.ShearStrengthModel = inputSoil.ShearStrengthModelSpecified ? + soil.ShearStrengthModel = inputSoil.ShearStrengthModelSpecified ? ConversionHelper.ConvertToShearStrengthModel(inputSoil.ShearStrengthModel) : ShearStrengthModel.CPhi; - soil.UseDefaultShearStrengthModel = inputSoil.DefaultShearStrengthModelSpecified ? + soil.UseDefaultShearStrengthModel = inputSoil.DefaultShearStrengthModelSpecified ? inputSoil.DefaultShearStrengthModel : true; soil.Cohesion = inputSoil.CohesionSpecified ? inputSoil.Cohesion : Double.NaN; soil.FrictionAngle = inputSoil.FrictionAngleSpecified ? inputSoil.FrictionAngle : Double.NaN; soil.OCR = inputSoil.OcrSpecified ? inputSoil.Ocr : Double.NaN; soil.RestSlope = inputSoil.SlopeRestProfileSpecified ? inputSoil.SlopeRestProfile : Double.NaN; - soil.DilatancyType = inputSoil.DilatancyTypeSpecified ? + soil.DilatancyType = inputSoil.DilatancyTypeSpecified ? ConversionHelper.ConvertToDilatancyType(inputSoil.DilatancyType) : DilatancyType.Phi; soils.Add(soil); } @@ -261,22 +261,22 @@ var location = new Location(); var inputLocation = inputLocations[i]; var waternetOptions = inputLocation.WaternetOptions; - location.Name= inputLocation.Name; + location.Name = inputLocation.Name; location.PLLineCreationMethod = ConversionHelper.ConvertToPhreaticLineCreationMethod(waternetOptions.PhreaticLineCreationMethod); location.IntrusionVerticalWaterPressure = ConversionHelper.ConvertToIntrusionVerticalWaterPressure(waternetOptions.IntrusionVerticalWaterPressure); location.PolderLevel = waternetOptions.PolderLevel; location.DampingFactorPL4 = waternetOptions.DampingFactorPL3; location.DampingFactorPL3 = waternetOptions.DampingFactorPL4; location.PenetrationLength = waternetOptions.PenetrationLength; - location.PlLineOffsetBelowDikeCrestMiddle = (waternetOptions.Pl1BelowCrestMiddleSpecified ? (double?) waternetOptions.Pl1BelowCrestMiddle : null); + location.PlLineOffsetBelowDikeCrestMiddle = (waternetOptions.Pl1BelowCrestMiddleSpecified ? (double?)waternetOptions.Pl1BelowCrestMiddle : null); location.UsePlLineOffsetFactorBelowShoulderCrest = waternetOptions.Pl1FactorBelowShoulderCrestSpecified; location.PlLineOffsetFactorBelowShoulderCrest = waternetOptions.Pl1FactorBelowShoulderCrest; - location.PlLineOffsetDryBelowDikeCrestMiddle = (waternetOptions.DryPl1BelowCrestMiddleSpecified ? (double?) waternetOptions.DryPl1BelowCrestMiddle : null); + location.PlLineOffsetDryBelowDikeCrestMiddle = (waternetOptions.DryPl1BelowCrestMiddleSpecified ? (double?)waternetOptions.DryPl1BelowCrestMiddle : null); location.UsePlLineOffsetDryFactorBelowShoulderCrest = waternetOptions.DryPl1FactorBelowShoulderCrestSpecified; location.PlLineOffsetDryFactorBelowShoulderCrest = waternetOptions.DryPl1FactorBelowShoulderCrest; - location.HeadPL2 = (waternetOptions.HeadPl2Specified ? (double?) waternetOptions.HeadPl2 : null); - location.HeadPl3 = (waternetOptions.HeadPl3Specified ? (double?) waternetOptions.HeadPl3 : null); - location.HeadPl4 = (waternetOptions.HeadPl4Specified ? (double?) waternetOptions.HeadPl4 : null); + location.HeadPL2 = (waternetOptions.HeadPl2Specified ? (double?)waternetOptions.HeadPl2 : null); + location.HeadPl3 = (waternetOptions.HeadPl3Specified ? (double?)waternetOptions.HeadPl3 : null); + location.HeadPl4 = (waternetOptions.HeadPl4Specified ? (double?)waternetOptions.HeadPl4 : null); location.SlopeDampingPiezometricHeightPolderSide = waternetOptions.SlopeDampingFactor; location.PlLineOffsetBelowDikeTopAtRiver = waternetOptions.Pl1BelowCrestRiverside; location.PlLineOffsetBelowDikeTopAtPolder = waternetOptions.Pl1BelowCrestPolderside; Index: dam clients/DamUI/trunk/src/Dam/Data/DamEngineIo/ConversionHelper.cs =================================================================== diff -u -r790 -r810 --- dam clients/DamUI/trunk/src/Dam/Data/DamEngineIo/ConversionHelper.cs (.../ConversionHelper.cs) (revision 790) +++ dam clients/DamUI/trunk/src/Dam/Data/DamEngineIo/ConversionHelper.cs (.../ConversionHelper.cs) (revision 810) @@ -47,7 +47,7 @@ {InputDamProjectType.Assessment, DamProjectType.Assessment}, {InputDamProjectType.AssessmentRegional, DamProjectType.Assessment}, // must be handled in additional code after conversion {InputDamProjectType.Design, DamProjectType.Design}, - {InputDamProjectType.Operational, DamProjectType.Calamity} + {InputDamProjectType.Operational, DamProjectType.Calamity} }; return translationTable[inputDamProjectType]; } @@ -189,7 +189,7 @@ }; return translationTable[inputPointType]; } - + public static int ConvertToInputPointType(CharacteristicPointType characteristicPointType) { var translationTable = new Dictionary() Index: dam clients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillDamUiFromXmlOutput.cs =================================================================== diff -u -r795 -r810 --- dam clients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillDamUiFromXmlOutput.cs (.../FillDamUiFromXmlOutput.cs) (revision 795) +++ dam clients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillDamUiFromXmlOutput.cs (.../FillDamUiFromXmlOutput.cs) (revision 810) @@ -46,7 +46,7 @@ /// public static DamProjectData AddOutputToDamProjectData(DamProjectData damProjectData, Output output) { - if (output != null && output.Results != null && output.Results.CalculationResults != null && + if (output != null && output.Results != null && output.Results.CalculationResults != null && output.Results.CalculationResults.DesignResults != null) { DataEventPublisher.InvokeWithoutPublishingEvents(() => @@ -76,7 +76,7 @@ private static void CreateDesignResultsFromOutput(Output output, DamProjectData damProjectData) { if (damProjectData.WaterBoard.Dikes[0] != null) - { + { // Design results damProjectData.DesignCalculations = new List(); for (int i = 0; i < output.Results.CalculationResults.DesignResults.Length; i++) @@ -133,7 +133,7 @@ if (designResult.PipingDesignResults.BlighHcriticalSpecified) desResult.BlighHCritical = designResult.PipingDesignResults.BlighHcritical; if (designResult.PipingDesignResults.Sellmeijer4ForcesFactorSpecified) desResult.Sellmeijer4ForcesPipingFactor = designResult.PipingDesignResults.Sellmeijer4ForcesFactor; if (designResult.PipingDesignResults.Sellmeijer4ForcesHcriticalSpecified) desResult.Sellmeijer4ForcesHCritical = designResult.PipingDesignResults.Sellmeijer4ForcesHcritical; - if (designResult.PipingDesignResults.SellmeijerVnkFactorSpecified) desResult.SellmeijerPipingFactor= designResult.PipingDesignResults.SellmeijerVnkFactor; + if (designResult.PipingDesignResults.SellmeijerVnkFactorSpecified) desResult.SellmeijerPipingFactor = designResult.PipingDesignResults.SellmeijerVnkFactor; if (designResult.PipingDesignResults.SellmeijerVnkHcriticalSpecified) desResult.SellmeijerHCritical = designResult.PipingDesignResults.SellmeijerVnkHcritical; if (designResult.PipingDesignResults.Wbi2017FactorSpecified) desResult.Wti2017PipingFactor = designResult.PipingDesignResults.Wbi2017Factor; if (designResult.PipingDesignResults.Wbi2017HcriticalSpecified) desResult.Wti2017HCritical = designResult.PipingDesignResults.Wbi2017Hcritical; @@ -149,7 +149,7 @@ desResult.Pl4MinUplift = uplift.Pl4MinUplift; desResult.Pl4HeadAdjusted = uplift.Pl4HeadAdjusted; desResult.Pl4LocalLocationXMinUplift = uplift.Pl4LocationXMinUplift; - } + } } private static Scenario GetScenarioByName(DamProjectData damProjectData, string locationName, string scenarioName) @@ -171,7 +171,7 @@ return null; } - private static SoilProfile1D GetSoilProfileByName(DamProjectData damProjectData , string profileName) + private static SoilProfile1D GetSoilProfileByName(DamProjectData damProjectData, string profileName) { var soilProfiles1D = damProjectData.WaterBoard.Dikes[0].SoilProfiles; foreach (var soilProfile1D in soilProfiles1D) @@ -211,7 +211,7 @@ } } - + private static void CreateDesignResultsStabilityOutput(DesignResult designResult, CsvExportData desResult) { desResult.ResultMessage = designResult.StabilityDesignResults.ResultMessage; @@ -229,7 +229,7 @@ if (designResult.StabilityDesignResults.Zone2EntryPointXSpecified) desResult.LocalZone2EntryPointX = designResult.StabilityDesignResults.Zone2EntryPointX; if (designResult.StabilityDesignResults.Zone2ExitPointXSpecified) desResult.LocalZone2ExitPointX = designResult.StabilityDesignResults.Zone2ExitPointX; if (designResult.StabilityDesignResults.NumberOfIterationsSpecified) desResult.NumberOfIterations = designResult.StabilityDesignResults.NumberOfIterations; - + if (designResult.StabilityDesignResults.UpliftSituation != null) { var uplift = designResult.StabilityDesignResults.UpliftSituation;