Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs =================================================================== diff -u -r3688 -r3699 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs (.../MacroStabilityInwardsKernelWrapper.cs) (revision 3688) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs (.../MacroStabilityInwardsKernelWrapper.cs) (revision 3699) @@ -236,13 +236,12 @@ trafficLoad = new TrafficLoad { Pressure = damKernelInput.Location.StabilityOptions.TrafficLoad.Value, - XStart = damKernelInput.Location.SurfaceLine - .CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadInside).X, XEnd = damKernelInput.Location.SurfaceLine + .CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadInside).X, + XStart = damKernelInput.Location.SurfaceLine .CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadOutside).X }; } - return trafficLoad; } @@ -447,7 +446,7 @@ MacroStabilityOutput macroStabilityOutput = kernelDataOutput as MacroStabilityOutput; ThrowWhenMacroStabilityKernelOutputNull(macroStabilityOutput); designResults = new List(); - if (macroStabilityOutput != null && macroStabilityOutput.StabilityOutputItems.Count > 0) + if (macroStabilityOutput != null && macroStabilityOutput.StabilityOutputItems != null && macroStabilityOutput.StabilityOutputItems.Count > 0) { var macroStabilityOutputItem = macroStabilityOutput.StabilityOutputItems[0]; if (macroStabilityOutputItem != null) Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs =================================================================== diff -u -r3651 -r3699 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 3651) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 3699) @@ -443,6 +443,11 @@ (ShearStrengthModel?)ConversionHelper.ConvertToShearStrengthModel(inputSoil.ShearStrengthModel) : null; soil.UseDefaultShearStrengthModel = inputSoil.UseDefaultShearStrengthModelSpecified ? (bool?)inputSoil.UseDefaultShearStrengthModel : null; + if (soil.UseDefaultShearStrengthModel.HasValue && soil.UseDefaultShearStrengthModel.Value && + soil.ShearStrengthModel == ShearStrengthModel.None) + { + soil.ShearStrengthModel = ShearStrengthModel.CPhi; + } soil.Cohesion = inputSoil.CohesionSpecified ? inputSoil.Cohesion : double.NaN; soil.FrictionAngle = inputSoil.FrictionAngleSpecified ? inputSoil.FrictionAngle : double.NaN; soil.Ocr = inputSoil.OcrSpecified ? inputSoil.Ocr : double.NaN; Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/BishopGridCreator.cs =================================================================== diff -u -r3695 -r3699 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/BishopGridCreator.cs (.../BishopGridCreator.cs) (revision 3695) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/BishopGridCreator.cs (.../BishopGridCreator.cs) (revision 3699) @@ -69,6 +69,7 @@ else { // code for slipCircleDefinition.GridSizeDetermination == GridSizeDetermination.Automatic + bishopCalculationGrid.GridXLeft = 0; bishopCalculationGrid.IsGridsAutomatic = true; }