Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesOperational/OperationalCalculator.cs =================================================================== diff -u -r1649 -r1651 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesOperational/OperationalCalculator.cs (.../OperationalCalculator.cs) (revision 1649) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesOperational/OperationalCalculator.cs (.../OperationalCalculator.cs) (revision 1651) @@ -279,6 +279,7 @@ calculationResult = CalculationResult.Succeeded; kernelWrapper.PostProcess(damKernelInput, kernelDataOutput, null, resultMessage, out designResults); + timeSerieEntry.Value = designResults[0].SafetyFactor.Value; } catch (Exception exception) { Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/OperationalTests.cs =================================================================== diff -u -r1635 -r1651 --- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/OperationalTests.cs (.../OperationalTests.cs) (revision 1635) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/OperationalTests.cs (.../OperationalTests.cs) (revision 1651) @@ -20,6 +20,7 @@ // All rights reserved. using System.IO; +using System.Text; using Deltares.DamEngine.Data.General; using Deltares.DamEngine.Io; using Deltares.DamEngine.TestHelpers; @@ -34,7 +35,7 @@ class OperationalTests { private const double tolerance = 0.0005; - [Test, Ignore("Work_In_Progress")] + [Test] public void Run_UsingTestFiles_HasExpectedResultsInOutputFile() { const string calcDir = "TestOperational"; @@ -46,24 +47,21 @@ Directory.CreateDirectory(calcDir); // Based on "DamLive\trunk\src\Deltares.DamLive.Tests\TestData\DamLive\Set2\\output.damx" - const string fileName = @"TestFiles\OperationalSet2.xml"; - string inputString = File.ReadAllText(fileName); + const string inputFileName = @"TestFiles\OperationalSet2.xml"; + const string outputFileName = @"TestFiles\OperationalSet2.output.xml"; + string inputString = File.ReadAllText(inputFileName); inputString = XmlAdapter.ChangeValueInXml(inputString, "ProjectPath", ""); // Current directory will be used inputString = XmlAdapter.ChangeValueInXml(inputString, "CalculationMap", calcDir); // Current directory will be used inputString = XmlAdapter.ChangeValueInXml(inputString, "MapForSoilgeometries2D", @"TestFiles\output.Geometries\"); inputString = XmlAdapter.ChangeValueInXml(inputString, "SoilDatabaseName", @"TestFiles\output0.soilmaterials.mdb"); EngineInterface engineInterface = new EngineInterface(inputString); Assert.IsNotNull(engineInterface.DamProjectData); string outputString = engineInterface.Run(); + File.WriteAllText(outputFileName, outputString, Encoding.Unicode); Assert.IsNotNull(outputString); var output = DamXmlSerialization.LoadOutputFromXmlString(outputString); DamProjectData actualDamProjectData = FillDamFromXmlOutput.CreateDamProjectData(null, output); -// SurfaceLine2 redesignedSurfaceLine = actualDamProjectData.DesignCalculations[0].PipingDesignResults.RedesignedSurfaceLine; -// Assert.AreEqual(0.521, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.BlighFactor, tolerance); -// Assert.AreEqual(1.667, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.BlighHcritical, tolerance); -// Assert.AreEqual(35.0, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.ExitPointX, tolerance); -// Assert.AreEqual(25.00, redesignedSurfaceLine.GetDikeLength(), tolerance); -// Assert.AreEqual(true, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.UpliftSituation.IsUplift); + Assert.AreEqual(1.2257, output.Results.OperationalOutputTimeSeries[0].Entries.TimeSerieEntry[0].Value, tolerance); }