Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingSellmeijer4ForcesTests.cs =================================================================== diff -u -r3893 -r4000 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingSellmeijer4ForcesTests.cs (.../PipingSellmeijer4ForcesTests.cs) (revision 3893) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingSellmeijer4ForcesTests.cs (.../PipingSellmeijer4ForcesTests.cs) (revision 4000) @@ -24,6 +24,7 @@ using Deltares.DamEngine.Data.Geotechnics; using Deltares.DamEngine.Interface; using Deltares.DamEngine.Io; +using Deltares.DamEngine.Io.XmlOutput; using Deltares.DamEngine.TestHelpers; using NUnit.Framework; using ConversionHelper = Deltares.DamEngine.Interface.ConversionHelper; @@ -48,7 +49,7 @@ const string fileName = @"PipingVoorbeeld1_Sellmeijer4ForcesInputFile.xml"; string inputString = File.ReadAllText(fileName); inputString = XmlAdapter.ChangeValueInXml(inputString, "SegmentFailureMechanismType", segmentFailureMechanismType.ToString()); - EngineInterface engineInterface = new EngineInterface(inputString); + var engineInterface = new EngineInterface(inputString); Assert.IsNotNull(engineInterface.DamProjectData); string outputString = engineInterface.Run(); // Factor piping = 0.506 @@ -69,7 +70,7 @@ // ID locatie scenario = "1" // Heave Factor = 90.0 Assert.IsNotNull(outputString); - var output = DamXmlSerialization.LoadOutputFromXmlString(outputString); + Output output = DamXmlSerialization.LoadOutputFromXmlString(outputString); Assert.IsNotNull(output.Results.CalculationResults, "No results available"); Assert.AreEqual(0.506, output.Results.CalculationResults[0].PipingDesignResults.Sellmeijer4ForcesFactor, tolerance); Assert.AreEqual(1.619, output.Results.CalculationResults[0].PipingDesignResults.Sellmeijer4ForcesHcritical, tolerance); @@ -95,11 +96,11 @@ // Set Analysis type to "Adapt geometry" const string fileName = @"PipingVoorbeeld1_Sellmeijer4ForcesDesignInputFile.xml"; string inputString = File.ReadAllText(fileName); - EngineInterface engineInterface = new EngineInterface(inputString); + var engineInterface = new EngineInterface(inputString); Assert.IsNotNull(engineInterface.DamProjectData); string outputString = engineInterface.Run(); Assert.IsNotNull(outputString); - var output = DamXmlSerialization.LoadOutputFromXmlString(outputString); + Output output = DamXmlSerialization.LoadOutputFromXmlString(outputString); DamProjectData actualDamProjectData = FillDamFromXmlOutput.CreateDamProjectData(null, output); SurfaceLine2 redesignedSurfaceLine = actualDamProjectData.DesignCalculations[0].PipingDesignResults.RedesignedSurfaceLine; // uplift = true @@ -108,7 +109,7 @@ Assert.AreEqual(1.995, redesignedSurfaceLine.DetermineShoulderHeight(), tolerance); // dike length = 66.986 Assert.That(redesignedSurfaceLine.GetDikeLength(), Is.EqualTo(66.986).Within(tolerance)); - + // ShoulderWidth = X_Kruin binnenberm - X_Insteek binnenberm = 65.01 - 29.01 = 36.0 // Read from PipingSellmeijer4Forces_Piping_CharacteristicPoints.csv by export surfacelines in Release Assert.AreEqual(36.0, redesignedSurfaceLine.DetermineShoulderLength(), tolerance); @@ -152,11 +153,11 @@ // Set DTH = 4.5 for location "profiel 1" const string fileName = @"PipingVoorbeeld1_Sellmeijer4ForcesDesignHeightInputFile.xml"; string inputString = File.ReadAllText(fileName); - EngineInterface engineInterface = new EngineInterface(inputString); + var engineInterface = new EngineInterface(inputString); Assert.IsNotNull(engineInterface.DamProjectData); string outputString = engineInterface.Run(); Assert.IsNotNull(outputString); - var output = DamXmlSerialization.LoadOutputFromXmlString(outputString); + Output output = DamXmlSerialization.LoadOutputFromXmlString(outputString); DamProjectData actualDamProjectData = FillDamFromXmlOutput.CreateDamProjectData(null, output); SurfaceLine2 redesignedSurfaceLine = actualDamProjectData.DesignCalculations[0].PipingDesignResults.RedesignedSurfaceLine; @@ -182,4 +183,4 @@ Assert.AreEqual(0.582, output.Results.CalculationResults[0].PipingDesignResults.UpliftFactor, tolerance); } } -} +} \ No newline at end of file