Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/ShearStrengthModel.cs =================================================================== diff -u -r4556 -r4628 --- DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/ShearStrengthModel.cs (.../ShearStrengthModel.cs) (revision 4556) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/ShearStrengthModel.cs (.../ShearStrengthModel.cs) (revision 4628) @@ -35,7 +35,7 @@ /// The Su calculated model (with POP) /// SuCalculated = 2, - + /// /// The Sigma Tau curve model /// Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/WtiPipingSellmeijerRevised/WtiPipingSellmeijerRevisedKernelWrapperTests.cs =================================================================== diff -u -r4627 -r4628 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/WtiPipingSellmeijerRevised/WtiPipingSellmeijerRevisedKernelWrapperTests.cs (.../WtiPipingSellmeijerRevisedKernelWrapperTests.cs) (revision 4627) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/WtiPipingSellmeijerRevised/WtiPipingSellmeijerRevisedKernelWrapperTests.cs (.../WtiPipingSellmeijerRevisedKernelWrapperTests.cs) (revision 4628) @@ -446,7 +446,7 @@ Assert.That(result.PipingDesignResults.LocalExitPointX, Is.EqualTo(59.5)); Assert.That(result.PipingDesignResults.UpliftFactor, Is.EqualTo(0.88258734130293759)); - Assert.That(result.PipingDesignResults.UpliftSituation != null && ((UpliftSituation)result.PipingDesignResults.UpliftSituation).IsUplift, Is.EqualTo(true)); + Assert.That(result.PipingDesignResults.UpliftSituation != null && ((UpliftSituation) result.PipingDesignResults.UpliftSituation).IsUplift, Is.EqualTo(true)); Assert.That(result.CalculationResult, Is.EqualTo(CalculationResult.Succeeded)); Assert.That(result.PipingDesignResults.RedesignedSurfaceLine, Is.EqualTo(location.SurfaceLine)); Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs =================================================================== diff -u -r4624 -r4628 --- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs (.../FillDamFromXmlInputTests.cs) (revision 4624) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs (.../FillDamFromXmlInputTests.cs) (revision 4628) @@ -166,6 +166,6 @@ }; // TODO i.m.o the serializing of the geometry should be improved, so these ignores are not needed anymore ComparisonResult result = compare.Compare(expected, actual); Assert.That(result.Differences.Count, Is.EqualTo(0), - "Differences found read/write Input object:" + result.DifferencesString); + "Differences found read/write Input object:" + result.DifferencesString); } } \ No newline at end of file Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapperTests.cs =================================================================== diff -u -r4627 -r4628 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapperTests.cs (.../DamPipingBlighKernelWrapperTests.cs) (revision 4627) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapperTests.cs (.../DamPipingBlighKernelWrapperTests.cs) (revision 4628) @@ -113,7 +113,7 @@ Assert.That(result.PipingDesignResults.LocalExitPointX, Is.EqualTo(50.5)); Assert.That(result.PipingDesignResults.UpliftFactor, Is.EqualTo(0.072811999417504)); - Assert.That(result.PipingDesignResults.UpliftSituation != null && ((UpliftSituation)result.PipingDesignResults.UpliftSituation).IsUplift, Is.EqualTo(true)); + Assert.That(result.PipingDesignResults.UpliftSituation != null && ((UpliftSituation) result.PipingDesignResults.UpliftSituation).IsUplift, Is.EqualTo(true)); Assert.That(result.CalculationResult, Is.EqualTo(CalculationResult.Succeeded)); Assert.That(result.PipingDesignResults.RedesignedSurfaceLine, Is.EqualTo(location.SurfaceLine)); Index: DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SigmaTauPointTests.cs =================================================================== diff -u -r4624 -r4628 --- DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SigmaTauPointTests.cs (.../SigmaTauPointTests.cs) (revision 4624) +++ DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SigmaTauPointTests.cs (.../SigmaTauPointTests.cs) (revision 4628) @@ -32,7 +32,7 @@ { // Given var expectedSigma = 1.0; - var point = new SigmaTauPoint(expectedSigma, 0.0); + var point = new SigmaTauPoint(expectedSigma); // When point.Sigma = expectedSigma; @@ -60,7 +60,7 @@ { // Given var sourcePoint = new SigmaTauPoint(1.0, 2.0); - var targetPoint = new SigmaTauPoint(0.0, 0.0); + var targetPoint = new SigmaTauPoint(); // When targetPoint.Assign(sourcePoint); Index: DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SoilTests.cs =================================================================== diff -u -r4624 -r4628 --- DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SoilTests.cs (.../SoilTests.cs) (revision 4624) +++ DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SoilTests.cs (.../SoilTests.cs) (revision 4628) @@ -27,37 +27,37 @@ [TestFixture] public class SoilTests { - [Test] - public void GivenTwoSoilsWhenAssigningThenPropertiesAreAssignedCorrectly() + [Test] + public void GivenTwoSoilsWhenAssigningThenPropertiesAreAssignedCorrectly() + { + // Given + var sourceSoil = new Soil("Source Soil", 10.0, 20.0) { - // Given - var sourceSoil = new Soil("Source Soil", 10.0, 20.0) - { - BeddingAngle = 30.0, - DiameterD70 = 0.5, - PermeabKx = 0.01, - WhitesConstant = 1.2, - DiameterD90 = 0.7, - Cohesion = 5.0, - FrictionAngle = 25.0, - PoP = 100.0, - Ocr = 1.5, - RatioCuPc = 0.8, - CuTop = 2.0, - CuBottom = 3.0, - UsePop = true, - StrengthIncreaseExponent = 0.3, - ShearStrengthModel = ShearStrengthModel.SigmaTauCurve, - SigmaTauCurve = new SigmaTauCurve() - }; - sourceSoil.SigmaTauCurve.Points.Add(new SigmaTauPoint(1.0, 2.0)); - sourceSoil.SigmaTauCurve.Points.Add(new SigmaTauPoint(3.0, 4.0)); - - var targetSoil = new Soil(); + BeddingAngle = 30.0, + DiameterD70 = 0.5, + PermeabKx = 0.01, + WhitesConstant = 1.2, + DiameterD90 = 0.7, + Cohesion = 5.0, + FrictionAngle = 25.0, + PoP = 100.0, + Ocr = 1.5, + RatioCuPc = 0.8, + CuTop = 2.0, + CuBottom = 3.0, + UsePop = true, + StrengthIncreaseExponent = 0.3, + ShearStrengthModel = ShearStrengthModel.SigmaTauCurve, + SigmaTauCurve = new SigmaTauCurve() + }; + sourceSoil.SigmaTauCurve.Points.Add(new SigmaTauPoint(1.0, 2.0)); + sourceSoil.SigmaTauCurve.Points.Add(new SigmaTauPoint(3.0, 4.0)); - // When - targetSoil.Assign(sourceSoil); + var targetSoil = new Soil(); + // When + targetSoil.Assign(sourceSoil); + // Then Assert.That(targetSoil.Name, Is.EqualTo(sourceSoil.Name)); Assert.That(targetSoil.BeddingAngle, Is.EqualTo(sourceSoil.BeddingAngle)); @@ -76,10 +76,10 @@ Assert.That(targetSoil.StrengthIncreaseExponent, Is.EqualTo(sourceSoil.StrengthIncreaseExponent)); Assert.That(targetSoil.ShearStrengthModel, Is.EqualTo(sourceSoil.ShearStrengthModel)); Assert.That(targetSoil.SigmaTauCurve.Points.Count, Is.EqualTo(sourceSoil.SigmaTauCurve.Points.Count)); - for (int i = 0; i < sourceSoil.SigmaTauCurve.Points.Count; i++) - { + for (var i = 0; i < sourceSoil.SigmaTauCurve.Points.Count; i++) + { Assert.That(targetSoil.SigmaTauCurve.Points[i].Sigma, Is.EqualTo(sourceSoil.SigmaTauCurve.Points[i].Sigma)); Assert.That(targetSoil.SigmaTauCurve.Points[i].Tau, Is.EqualTo(sourceSoil.SigmaTauCurve.Points[i].Tau)); - } } + } } \ No newline at end of file Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs =================================================================== diff -u -r4627 -r4628 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs (.../MacroStabilityInwardsKernelWrapperTests.cs) (revision 4627) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs (.../MacroStabilityInwardsKernelWrapperTests.cs) (revision 4628) @@ -122,7 +122,7 @@ messages.Clear(); errorCount = kernelWrapper.Validate(kernelDataInput, kernelDataOutput, out messages); Assert.That(errorCount, Is.EqualTo(0)); - Assert.That(((MacroStabilityOutput)kernelDataOutput).CalculationResult, Is.EqualTo(CalculationResult.NoRun)); + Assert.That(((MacroStabilityOutput) kernelDataOutput).CalculationResult, Is.EqualTo(CalculationResult.NoRun)); } [Test] @@ -326,7 +326,7 @@ DesignResult result = results[index]; Assert.That(result.CalculationResult, Is.EqualTo(CalculationResult.Succeeded)); - Assert.That(((UpliftSituation)result.StabilityDesignResults.UpliftSituation).IsUplift, Is.EqualTo(true)); + Assert.That(((UpliftSituation) result.StabilityDesignResults.UpliftSituation).IsUplift, Is.EqualTo(true)); if (index == 0) { Assert.That(result.BaseFileName, Is.EqualTo(Path.GetFileNameWithoutExtension(inputXmlForDamEngine))); Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/ConversionHelper.cs =================================================================== diff -u -r4574 -r4628 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/ConversionHelper.cs (.../ConversionHelper.cs) (revision 4574) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/ConversionHelper.cs (.../ConversionHelper.cs) (revision 4628) @@ -290,7 +290,7 @@ BondStressCurve = null, // these are not supported in DAM so set to null. SigmaTauTable = new List() }; - + if (soil.ShearStrengthModel != null) { macroStabilitySoil.ShearStrengthAbovePhreaticLevelModel = ConvertToMacroStabilityShearStrengthModel(soil.ShearStrengthModel.Value); @@ -360,7 +360,7 @@ //UsePop = true, //WhitesConstant = 0.00, }; - + if (soil.SigmaTauTable != null) { damSoil.SigmaTauCurve = new SigmaTauCurve(); @@ -373,7 +373,7 @@ }); } } - + if (soil.Dilatancy.AlmostEquals(soil.FrictionAngle, tolerance)) { damSoil.DilatancyType = DilatancyType.Phi; Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityOutwardsTests.cs =================================================================== diff -u -r4624 -r4628 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityOutwardsTests.cs (.../MacroStabilityOutwardsTests.cs) (revision 4624) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityOutwardsTests.cs (.../MacroStabilityOutwardsTests.cs) (revision 4628) @@ -47,7 +47,7 @@ string fullFileName = @"TestFiles\" + fileName; string inputString = File.ReadAllText(fullFileName); inputString = XmlAdapter.ChangeValueInXml(inputString, "ProjectPath", "Minimale Invoer Stability"); // Current directory will be used - + Output output = GeneralHelper.RunAfterInputValidation(inputString); Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.SafetyFactor, Is.EqualTo(factorOfSafety).Within(Tolerance)); Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/ConversionHelperTests.cs =================================================================== diff -u -r4624 -r4628 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 4624) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 4628) @@ -334,7 +334,7 @@ public void CanConvertLogMessageTypeToKernelLogMessageType(LogMessageType logMessageType, MessageType messageType) { Assert.That(ConversionHelper.ConvertLogMessageTypeToKernelLogMessageType(logMessageType), - Is.EqualTo(messageType)); + Is.EqualTo(messageType)); } [TestCase(MessageType.Info, LogMessageType.Info)] @@ -344,7 +344,7 @@ LogMessageType logMessageType) { Assert.That(ConversionHelper.ConvertKernelLogMessageTypeToLogMessageType(kernelLogMessageType), - Is.EqualTo(logMessageType)); + Is.EqualTo(logMessageType)); } #endregion Index: DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SurfaceLine2Tests.cs =================================================================== diff -u -r4624 -r4628 --- DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SurfaceLine2Tests.cs (.../SurfaceLine2Tests.cs) (revision 4624) +++ DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SurfaceLine2Tests.cs (.../SurfaceLine2Tests.cs) (revision 4628) @@ -93,43 +93,43 @@ Assert.That(newSurfaceLine.CharacteristicPoints[0].X, Is.EqualTo(surfaceLine.CharacteristicPoints[0].X).Within(tolerance)); Assert.That(newSurfaceLine.CharacteristicPoints[0].Z, Is.EqualTo(surfaceLine.CharacteristicPoints[0].Z).Within(tolerance)); Assert.That(newSurfaceLine.CharacteristicPoints[0].CharacteristicPointType, - Is.EqualTo(surfaceLine.CharacteristicPoints[0].CharacteristicPointType)); + Is.EqualTo(surfaceLine.CharacteristicPoints[0].CharacteristicPointType)); Assert.That(newSurfaceLine.CharacteristicPoints[1].X, Is.EqualTo(surfaceLine.CharacteristicPoints[1].X).Within(tolerance)); Assert.That(newSurfaceLine.CharacteristicPoints[1].Z, Is.EqualTo(surfaceLine.CharacteristicPoints[1].Z).Within(tolerance)); Assert.That(newSurfaceLine.CharacteristicPoints[1].CharacteristicPointType, - Is.EqualTo(surfaceLine.CharacteristicPoints[1].CharacteristicPointType)); + Is.EqualTo(surfaceLine.CharacteristicPoints[1].CharacteristicPointType)); Assert.That(newSurfaceLine.CharacteristicPoints[2].X, Is.EqualTo(surfaceLine.CharacteristicPoints[2].X).Within(tolerance)); Assert.That(newSurfaceLine.CharacteristicPoints[2].Z, Is.EqualTo(surfaceLine.CharacteristicPoints[2].Z).Within(tolerance)); Assert.That(newSurfaceLine.CharacteristicPoints[2].CharacteristicPointType, - Is.EqualTo(surfaceLine.CharacteristicPoints[2].CharacteristicPointType)); + Is.EqualTo(surfaceLine.CharacteristicPoints[2].CharacteristicPointType)); Assert.That(newSurfaceLine.CharacteristicPoints[3].X, Is.EqualTo(surfaceLine.CharacteristicPoints[3].X).Within(tolerance)); Assert.That(newSurfaceLine.CharacteristicPoints[3].Z, Is.EqualTo(surfaceLine.CharacteristicPoints[3].Z).Within(tolerance)); Assert.That(newSurfaceLine.CharacteristicPoints[3].CharacteristicPointType, - Is.EqualTo(surfaceLine.CharacteristicPoints[3].CharacteristicPointType)); + Is.EqualTo(surfaceLine.CharacteristicPoints[3].CharacteristicPointType)); Assert.That(newSurfaceLine.CharacteristicPoints[4].X, Is.EqualTo(surfaceLine.CharacteristicPoints[4].X).Within(tolerance)); Assert.That(newSurfaceLine.CharacteristicPoints[4].Z, Is.EqualTo(surfaceLine.CharacteristicPoints[4].Z).Within(tolerance)); Assert.That(newSurfaceLine.CharacteristicPoints[4].CharacteristicPointType, - Is.EqualTo(surfaceLine.CharacteristicPoints[4].CharacteristicPointType)); + Is.EqualTo(surfaceLine.CharacteristicPoints[4].CharacteristicPointType)); Assert.That(newSurfaceLine.CharacteristicPoints[5].X, Is.EqualTo(surfaceLine.CharacteristicPoints[5].X).Within(tolerance)); Assert.That(newSurfaceLine.CharacteristicPoints[5].Z, Is.EqualTo(surfaceLine.CharacteristicPoints[5].Z).Within(tolerance)); Assert.That(newSurfaceLine.CharacteristicPoints[5].CharacteristicPointType, - Is.EqualTo(surfaceLine.CharacteristicPoints[5].CharacteristicPointType)); + Is.EqualTo(surfaceLine.CharacteristicPoints[5].CharacteristicPointType)); Assert.That(newSurfaceLine.CharacteristicPoints[6].X, Is.EqualTo(surfaceLine.CharacteristicPoints[6].X).Within(tolerance)); Assert.That(newSurfaceLine.CharacteristicPoints[6].Z, Is.EqualTo(surfaceLine.CharacteristicPoints[6].Z).Within(tolerance)); Assert.That(newSurfaceLine.CharacteristicPoints[6].CharacteristicPointType, - Is.EqualTo(surfaceLine.CharacteristicPoints[6].CharacteristicPointType)); + Is.EqualTo(surfaceLine.CharacteristicPoints[6].CharacteristicPointType)); Assert.That(newSurfaceLine.CharacteristicPoints[7].X, Is.EqualTo(surfaceLine.CharacteristicPoints[7].X).Within(tolerance)); Assert.That(newSurfaceLine.CharacteristicPoints[7].Z, Is.EqualTo(surfaceLine.CharacteristicPoints[7].Z).Within(tolerance)); Assert.That(newSurfaceLine.CharacteristicPoints[7].CharacteristicPointType, - Is.EqualTo(surfaceLine.CharacteristicPoints[7].CharacteristicPointType)); + Is.EqualTo(surfaceLine.CharacteristicPoints[7].CharacteristicPointType)); Assert.That(newSurfaceLine.CharacteristicPoints[8].X, Is.EqualTo(surfaceLine.CharacteristicPoints[8].X).Within(tolerance)); Assert.That(newSurfaceLine.CharacteristicPoints[8].Z, Is.EqualTo(surfaceLine.CharacteristicPoints[8].Z).Within(tolerance)); Assert.That(newSurfaceLine.CharacteristicPoints[8].CharacteristicPointType, - Is.EqualTo(surfaceLine.CharacteristicPoints[8].CharacteristicPointType)); + Is.EqualTo(surfaceLine.CharacteristicPoints[8].CharacteristicPointType)); Assert.That(newSurfaceLine.CharacteristicPoints[9].X, Is.EqualTo(surfaceLine.CharacteristicPoints[9].X).Within(tolerance)); Assert.That(newSurfaceLine.CharacteristicPoints[9].Z, Is.EqualTo(surfaceLine.CharacteristicPoints[9].Z).Within(tolerance)); Assert.That(newSurfaceLine.CharacteristicPoints[9].CharacteristicPointType, - Is.EqualTo(surfaceLine.CharacteristicPoints[9].CharacteristicPointType)); + Is.EqualTo(surfaceLine.CharacteristicPoints[9].CharacteristicPointType)); } private static void ValidateSurfaceLine(SurfaceLine2 surfaceLine)