Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.CalculatedInput/Converters/SoilProfileConverter.cs =================================================================== diff -u -r7416a5b8b704dba259475ca259a2ea54054f6dd4 -rf91b60465fec69cf14c1fa0f659393cc235b69e7 --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.CalculatedInput/Converters/SoilProfileConverter.cs (.../SoilProfileConverter.cs) (revision 7416a5b8b704dba259475ca259a2ea54054f6dd4) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.CalculatedInput/Converters/SoilProfileConverter.cs (.../SoilProfileConverter.cs) (revision f91b60465fec69cf14c1fa0f659393cc235b69e7) @@ -87,8 +87,8 @@ UsePop = data.UsePop, IsAquifer = data.IsAquifer, ShearStrengthModel = ConvertShearStrengthModel(data.ShearStrengthModel), - AbovePhreaticLevel = data.AbovePhreaticLevel.Mean, - BelowPhreaticLevel = data.BelowPhreaticLevel.Mean, + AbovePhreaticLevel = MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetAbovePhreaticLevel(data).GetDesignValue(), + BelowPhreaticLevel = MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetBelowPhreaticLevel(data).GetDesignValue(), Cohesion = MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetCohesion(data).GetDesignValue(), FrictionAngle = MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetFrictionAngle(data).GetDesignValue(), ShearStrengthRatio = MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetShearStrengthRatio(data).GetDesignValue(), Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/Factories/PersistableSoilCollectionFactory.cs =================================================================== diff -u -r7416a5b8b704dba259475ca259a2ea54054f6dd4 -rf91b60465fec69cf14c1fa0f659393cc235b69e7 --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/Factories/PersistableSoilCollectionFactory.cs (.../PersistableSoilCollectionFactory.cs) (revision 7416a5b8b704dba259475ca259a2ea54054f6dd4) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/Factories/PersistableSoilCollectionFactory.cs (.../PersistableSoilCollectionFactory.cs) (revision f91b60465fec69cf14c1fa0f659393cc235b69e7) @@ -105,8 +105,8 @@ ShearStrengthRatioAndShearStrengthExponentCorrelated = false, ShearStrengthModelTypeAbovePhreaticLevel = GetShearStrengthModelTypeForAbovePhreaticLevel(layerData.ShearStrengthModel), ShearStrengthModelTypeBelowPhreaticLevel = GetShearStrengthModelTypeForBelowPhreaticLevel(layerData.ShearStrengthModel), - VolumetricWeightAbovePhreaticLevel = layerData.AbovePhreaticLevel.Mean, - VolumetricWeightBelowPhreaticLevel = layerData.BelowPhreaticLevel.Mean, + VolumetricWeightAbovePhreaticLevel = MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetAbovePhreaticLevel(layerData).GetDesignValue(), + VolumetricWeightBelowPhreaticLevel = MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetBelowPhreaticLevel(layerData).GetDesignValue(), Dilatancy = 0, DilatancyStochasticParameter = PersistableStochasticParameterFactory.Create(new VariationCoefficientNormalDistribution(2) { Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.CalculatedInput.Test/Converters/SoilProfileConverterTest.cs =================================================================== diff -u -r7416a5b8b704dba259475ca259a2ea54054f6dd4 -rf91b60465fec69cf14c1fa0f659393cc235b69e7 --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.CalculatedInput.Test/Converters/SoilProfileConverterTest.cs (.../SoilProfileConverterTest.cs) (revision 7416a5b8b704dba259475ca259a2ea54054f6dd4) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.CalculatedInput.Test/Converters/SoilProfileConverterTest.cs (.../SoilProfileConverterTest.cs) (revision f91b60465fec69cf14c1fa0f659393cc235b69e7) @@ -44,10 +44,10 @@ public void Convert_SoilProfileNull_ThrowsArgumentNullException() { // Call - void Call() => SoilProfileConverter.Convert(null); + TestDelegate call = () => SoilProfileConverter.Convert(null); // Assert - var exception = Assert.Throws(Call); + var exception = Assert.Throws(call); Assert.AreEqual("soilProfile", exception.ParamName); } Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.CalculatedInput.TestUtil/CalculatorInputAssert.cs =================================================================== diff -u -r7416a5b8b704dba259475ca259a2ea54054f6dd4 -rf91b60465fec69cf14c1fa0f659393cc235b69e7 --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.CalculatedInput.TestUtil/CalculatorInputAssert.cs (.../CalculatorInputAssert.cs) (revision 7416a5b8b704dba259475ca259a2ea54054f6dd4) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.CalculatedInput.TestUtil/CalculatorInputAssert.cs (.../CalculatorInputAssert.cs) (revision f91b60465fec69cf14c1fa0f659393cc235b69e7) @@ -133,8 +133,8 @@ Assert.AreEqual(WaterPressureInterpolationModel.Automatic, actual[i].WaterPressureInterpolationModel); Assert.AreEqual(ConvertShearStrengthModel(expectedData.ShearStrengthModel), actual[i].ShearStrengthModel); - Assert.AreEqual(expectedData.AbovePhreaticLevel.Mean, actual[i].AbovePhreaticLevel); - Assert.AreEqual(expectedData.BelowPhreaticLevel.Mean, actual[i].BelowPhreaticLevel); + Assert.AreEqual(MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetAbovePhreaticLevel(expectedData).GetDesignValue(), actual[i].AbovePhreaticLevel); + Assert.AreEqual(MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetBelowPhreaticLevel(expectedData).GetDesignValue(), actual[i].BelowPhreaticLevel); Assert.AreEqual(MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetCohesion(expectedData).GetDesignValue(), actual[i].Cohesion); Assert.AreEqual(MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetFrictionAngle(expectedData).GetDesignValue(), actual[i].FrictionAngle); Assert.AreEqual(MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetStrengthIncreaseExponent(expectedData).GetDesignValue(), actual[i].StrengthIncreaseExponent); Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.IO.TestUtil/PersistableDataModelTestHelper.cs =================================================================== diff -u -r7416a5b8b704dba259475ca259a2ea54054f6dd4 -rf91b60465fec69cf14c1fa0f659393cc235b69e7 --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.IO.TestUtil/PersistableDataModelTestHelper.cs (.../PersistableDataModelTestHelper.cs) (revision 7416a5b8b704dba259475ca259a2ea54054f6dd4) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.IO.TestUtil/PersistableDataModelTestHelper.cs (.../PersistableDataModelTestHelper.cs) (revision f91b60465fec69cf14c1fa0f659393cc235b69e7) @@ -178,8 +178,8 @@ Assert.AreEqual(MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetStrengthIncreaseExponent(layerData).GetDesignValue(), soil.StrengthIncreaseExponent); AssertStochasticParameter(layerData.StrengthIncreaseExponent, soil.StrengthIncreaseExponentStochasticParameter); - Assert.AreEqual(layerData.AbovePhreaticLevel.Mean, soil.VolumetricWeightAbovePhreaticLevel); - Assert.AreEqual(layerData.BelowPhreaticLevel.Mean, soil.VolumetricWeightBelowPhreaticLevel); + Assert.AreEqual(MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetAbovePhreaticLevel(layerData).GetDesignValue(), soil.VolumetricWeightAbovePhreaticLevel); + Assert.AreEqual(MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetBelowPhreaticLevel(layerData).GetDesignValue(), soil.VolumetricWeightBelowPhreaticLevel); Assert.IsFalse(soil.CohesionAndFrictionAngleCorrelated); Assert.IsFalse(soil.ShearStrengthRatioAndShearStrengthExponentCorrelated);