Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsSoilProfileUnderSurfaceLineFactory.cs =================================================================== diff -u -r708bcebfe9e5db209c818a12d630cb418231f863 -rbb8e7ef450e816a647e105ad1123f43b6d22ff36 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsSoilProfileUnderSurfaceLineFactory.cs (.../MacroStabilityInwardsSoilProfileUnderSurfaceLineFactory.cs) (revision 708bcebfe9e5db209c818a12d630cb418231f863) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsSoilProfileUnderSurfaceLineFactory.cs (.../MacroStabilityInwardsSoilProfileUnderSurfaceLineFactory.cs) (revision bb8e7ef450e816a647e105ad1123f43b6d22ff36) @@ -104,7 +104,7 @@ new MacroStabilityInwardsSoilLayerPropertiesUnderSurfaceLine.ConstructionProperties { AbovePhreaticLevelMean = properties.AbovePhreaticLevelMean, - AbovePhreaticLevelCoefficientOfVariation = properties.AbovePhreaticLevelDeviation, + AbovePhreaticLevelCoefficientOfVariation = properties.AbovePhreaticLevelCoefficientOfVariation, UsePop = properties.UsePop, IsAquifer = properties.IsAquifer, ShearStrengthModel = properties.ShearStrengthModel, Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsSoilProfileUnderSurfaceLineFactoryTest.cs =================================================================== diff -u -r708bcebfe9e5db209c818a12d630cb418231f863 -rbb8e7ef450e816a647e105ad1123f43b6d22ff36 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsSoilProfileUnderSurfaceLineFactoryTest.cs (.../MacroStabilityInwardsSoilProfileUnderSurfaceLineFactoryTest.cs) (revision 708bcebfe9e5db209c818a12d630cb418231f863) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsSoilProfileUnderSurfaceLineFactoryTest.cs (.../MacroStabilityInwardsSoilProfileUnderSurfaceLineFactoryTest.cs) (revision bb8e7ef450e816a647e105ad1123f43b6d22ff36) @@ -341,7 +341,7 @@ bool isAquifer = random.NextBoolean(); var shearStrengthModel = random.NextEnumValue(); double abovePhreaticLevelMean = random.NextDouble(); - double abovePhreaticLevelDeviation = random.NextDouble(); + double abovePhreaticLevelCoefficientOfVariation = random.NextDouble(); const string material = "Clay"; var layer = new MacroStabilityInwardsSoilLayer1D(1) @@ -352,7 +352,7 @@ IsAquifer = isAquifer, ShearStrengthModel = shearStrengthModel, AbovePhreaticLevelMean = abovePhreaticLevelMean, - AbovePhreaticLevelDeviation = abovePhreaticLevelDeviation, + AbovePhreaticLevelCoefficientOfVariation = abovePhreaticLevelCoefficientOfVariation, MaterialName = material } }; @@ -371,14 +371,15 @@ Assert.AreEqual(usePop, layerUnderSurfaceLineProperties.UsePop); Assert.AreEqual(isAquifer, layerUnderSurfaceLineProperties.IsAquifer); Assert.AreEqual(shearStrengthModel, layerUnderSurfaceLineProperties.ShearStrengthModel); - Assert.AreEqual(abovePhreaticLevelMean, layerUnderSurfaceLineProperties.AbovePhreaticLevel.Mean, layerUnderSurfaceLineProperties.AbovePhreaticLevel.Mean.GetAccuracy()); - Assert.AreEqual(abovePhreaticLevelDeviation, layerUnderSurfaceLineProperties.AbovePhreaticLevel.CoefficientOfVariation, layerUnderSurfaceLineProperties.AbovePhreaticLevel.CoefficientOfVariation.GetAccuracy()); + Assert.AreEqual(abovePhreaticLevelMean, layerUnderSurfaceLineProperties.AbovePhreaticLevel.Mean, + layerUnderSurfaceLineProperties.AbovePhreaticLevel.Mean.GetAccuracy()); + Assert.AreEqual(abovePhreaticLevelCoefficientOfVariation, layerUnderSurfaceLineProperties.AbovePhreaticLevel.CoefficientOfVariation, + layerUnderSurfaceLineProperties.AbovePhreaticLevel.CoefficientOfVariation.GetAccuracy()); Assert.AreEqual(material, layerUnderSurfaceLineProperties.MaterialName); Assert.AreEqual(MacroStabilityInwardsSemiProbabilisticDesignValueFactory.GetAbovePhreaticLevel(layerUnderSurfaceLineProperties).GetDesignValue(), layerUnderSurfaceLineProperties.AbovePhreaticLevelDesignVariable); } - [Test] public void SoilProfile2DCreate_ProfileWithOuterRingAndHoles_ReturnsEqualGeometries() { @@ -429,15 +430,15 @@ bool isAquifer = random.NextBoolean(); var shearStrengthModel = random.NextEnumValue(); double abovePhreaticLevelMean = random.NextDouble(); - double abovePhreaticLevelDeviation = random.NextDouble(); + double abovePhreaticLevelCoefficientOfVariation = random.NextDouble(); const string material = "Clay"; - + MacroStabilityInwardsSoilLayer2D layer = GetSoilLayer(); layer.Properties.UsePop = usePop; layer.Properties.IsAquifer = isAquifer; layer.Properties.ShearStrengthModel = shearStrengthModel; layer.Properties.AbovePhreaticLevelMean = abovePhreaticLevelMean; - layer.Properties.AbovePhreaticLevelDeviation = abovePhreaticLevelDeviation; + layer.Properties.AbovePhreaticLevelCoefficientOfVariation = abovePhreaticLevelCoefficientOfVariation; layer.Properties.MaterialName = material; var profile = new MacroStabilityInwardsSoilProfile2D("name", new[] @@ -454,8 +455,10 @@ Assert.AreEqual(usePop, layerUnderSurfaceLineProperties.UsePop); Assert.AreEqual(isAquifer, layerUnderSurfaceLineProperties.IsAquifer); Assert.AreEqual(shearStrengthModel, layerUnderSurfaceLineProperties.ShearStrengthModel); - Assert.AreEqual(abovePhreaticLevelMean, layerUnderSurfaceLineProperties.AbovePhreaticLevel.Mean, layerUnderSurfaceLineProperties.AbovePhreaticLevel.Mean.GetAccuracy()); - Assert.AreEqual(abovePhreaticLevelDeviation, layerUnderSurfaceLineProperties.AbovePhreaticLevel.CoefficientOfVariation, layerUnderSurfaceLineProperties.AbovePhreaticLevel.CoefficientOfVariation.GetAccuracy()); + Assert.AreEqual(abovePhreaticLevelMean, layerUnderSurfaceLineProperties.AbovePhreaticLevel.Mean, + layerUnderSurfaceLineProperties.AbovePhreaticLevel.Mean.GetAccuracy()); + Assert.AreEqual(abovePhreaticLevelCoefficientOfVariation, layerUnderSurfaceLineProperties.AbovePhreaticLevel.CoefficientOfVariation, + layerUnderSurfaceLineProperties.AbovePhreaticLevel.CoefficientOfVariation.GetAccuracy()); Assert.AreEqual(material, layerUnderSurfaceLineProperties.MaterialName); Assert.AreEqual(MacroStabilityInwardsSemiProbabilisticDesignValueFactory.GetAbovePhreaticLevel(layerUnderSurfaceLineProperties).GetDesignValue(), layerUnderSurfaceLineProperties.AbovePhreaticLevelDesignVariable);