Index: DamEngine/trunk/src/Deltares.DamEngine.Io/DamOutput.cs =================================================================== diff -u -r2111 -r2873 --- DamEngine/trunk/src/Deltares.DamEngine.Io/DamOutput.cs (.../DamOutput.cs) (revision 2111) +++ DamEngine/trunk/src/Deltares.DamEngine.Io/DamOutput.cs (.../DamOutput.cs) (revision 2873) @@ -226,30 +226,6 @@ private bool safetyFactorFieldSpecified; - private double zone1SafetyFactorField; - - private bool zone1SafetyFactorFieldSpecified; - - private double zone1EntryPointXField; - - private bool zone1EntryPointXFieldSpecified; - - private double zone1ExitPointXField; - - private bool zone1ExitPointXFieldSpecified; - - private double zone2SafetyFactorField; - - private bool zone2SafetyFactorFieldSpecified; - - private double zone2EntryPointXField; - - private bool zone2EntryPointXFieldSpecified; - - private double zone2ExitPointXField; - - private bool zone2ExitPointXFieldSpecified; - private int numberOfIterationsField; private bool numberOfIterationsFieldSpecified; @@ -313,138 +289,6 @@ /// [System.Xml.Serialization.XmlAttributeAttribute()] - public double Zone1SafetyFactor { - get { - return this.zone1SafetyFactorField; - } - set { - this.zone1SafetyFactorField = value; - } - } - - /// - [System.Xml.Serialization.XmlIgnoreAttribute()] - public bool Zone1SafetyFactorSpecified { - get { - return this.zone1SafetyFactorFieldSpecified; - } - set { - this.zone1SafetyFactorFieldSpecified = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] - public double Zone1EntryPointX { - get { - return this.zone1EntryPointXField; - } - set { - this.zone1EntryPointXField = value; - } - } - - /// - [System.Xml.Serialization.XmlIgnoreAttribute()] - public bool Zone1EntryPointXSpecified { - get { - return this.zone1EntryPointXFieldSpecified; - } - set { - this.zone1EntryPointXFieldSpecified = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] - public double Zone1ExitPointX { - get { - return this.zone1ExitPointXField; - } - set { - this.zone1ExitPointXField = value; - } - } - - /// - [System.Xml.Serialization.XmlIgnoreAttribute()] - public bool Zone1ExitPointXSpecified { - get { - return this.zone1ExitPointXFieldSpecified; - } - set { - this.zone1ExitPointXFieldSpecified = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] - public double Zone2SafetyFactor { - get { - return this.zone2SafetyFactorField; - } - set { - this.zone2SafetyFactorField = value; - } - } - - /// - [System.Xml.Serialization.XmlIgnoreAttribute()] - public bool Zone2SafetyFactorSpecified { - get { - return this.zone2SafetyFactorFieldSpecified; - } - set { - this.zone2SafetyFactorFieldSpecified = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] - public double Zone2EntryPointX { - get { - return this.zone2EntryPointXField; - } - set { - this.zone2EntryPointXField = value; - } - } - - /// - [System.Xml.Serialization.XmlIgnoreAttribute()] - public bool Zone2EntryPointXSpecified { - get { - return this.zone2EntryPointXFieldSpecified; - } - set { - this.zone2EntryPointXFieldSpecified = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] - public double Zone2ExitPointX { - get { - return this.zone2ExitPointXField; - } - set { - this.zone2ExitPointXField = value; - } - } - - /// - [System.Xml.Serialization.XmlIgnoreAttribute()] - public bool Zone2ExitPointXSpecified { - get { - return this.zone2ExitPointXFieldSpecified; - } - set { - this.zone2ExitPointXFieldSpecified = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] public int NumberOfIterations { get { return this.numberOfIterationsField; Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlOutput.cs =================================================================== diff -u -r2111 -r2873 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlOutput.cs (.../FillDamFromXmlOutput.cs) (revision 2111) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlOutput.cs (.../FillDamFromXmlOutput.cs) (revision 2873) @@ -278,18 +278,6 @@ } if (designResult.StabilityDesignResults.SafetyFactorSpecified) desResult.StabilityDesignResults.SafetyFactor = designResult.StabilityDesignResults.SafetyFactor; - if (designResult.StabilityDesignResults.Zone1SafetyFactorSpecified) desResult.StabilityDesignResults.Zone1SafetyFactor = designResult.StabilityDesignResults.Zone1SafetyFactor; - - if (designResult.StabilityDesignResults.Zone1EntryPointXSpecified) desResult.StabilityDesignResults.LocalZone1EntryPointX = designResult.StabilityDesignResults.Zone1EntryPointX; - - if (designResult.StabilityDesignResults.Zone1ExitPointXSpecified) desResult.StabilityDesignResults.LocalZone1ExitPointX = designResult.StabilityDesignResults.Zone1ExitPointX; - - if (designResult.StabilityDesignResults.Zone2SafetyFactorSpecified) desResult.StabilityDesignResults.Zone2SafetyFactor = designResult.StabilityDesignResults.Zone2SafetyFactor; - - if (designResult.StabilityDesignResults.Zone2EntryPointXSpecified) desResult.StabilityDesignResults.LocalZone2EntryPointX = designResult.StabilityDesignResults.Zone2EntryPointX; - - if (designResult.StabilityDesignResults.Zone2ExitPointXSpecified) desResult.StabilityDesignResults.LocalZone2ExitPointX = designResult.StabilityDesignResults.Zone2ExitPointX; - if (designResult.StabilityDesignResults.NumberOfIterationsSpecified) desResult.StabilityDesignResults.NumberOfIterations = designResult.StabilityDesignResults.NumberOfIterations; if (designResult.StabilityDesignResults.UpliftSituation != null) Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs =================================================================== diff -u -r2111 -r2873 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs (.../FillXmlOutputFromDam.cs) (revision 2111) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs (.../FillXmlOutputFromDam.cs) (revision 2873) @@ -272,24 +272,6 @@ desResult.StabilityDesignResults.SafetyFactorSpecified = designResult.StabilityDesignResults.SafetyFactor.HasValue; if (designResult.StabilityDesignResults.SafetyFactor.HasValue) desResult.StabilityDesignResults.SafetyFactor = designResult.StabilityDesignResults.SafetyFactor.Value; - desResult.StabilityDesignResults.Zone1SafetyFactorSpecified = designResult.StabilityDesignResults.Zone1SafetyFactor.HasValue; - if (designResult.StabilityDesignResults.Zone1SafetyFactor.HasValue) desResult.StabilityDesignResults.Zone1SafetyFactor = designResult.StabilityDesignResults.Zone1SafetyFactor.Value; - - desResult.StabilityDesignResults.Zone1EntryPointXSpecified = designResult.StabilityDesignResults.LocalZone1EntryPointX.HasValue; - if (designResult.StabilityDesignResults.LocalZone1EntryPointX.HasValue) desResult.StabilityDesignResults.Zone1EntryPointX = designResult.StabilityDesignResults.LocalZone1EntryPointX.Value; - - desResult.StabilityDesignResults.Zone1ExitPointXSpecified = designResult.StabilityDesignResults.LocalZone1ExitPointX.HasValue; - if (designResult.StabilityDesignResults.LocalZone1ExitPointX.HasValue) desResult.StabilityDesignResults.Zone1ExitPointX = designResult.StabilityDesignResults.LocalZone1ExitPointX.Value; - - desResult.StabilityDesignResults.Zone2SafetyFactorSpecified = designResult.StabilityDesignResults.Zone2SafetyFactor.HasValue; - if (designResult.StabilityDesignResults.Zone2SafetyFactor.HasValue) desResult.StabilityDesignResults.Zone2SafetyFactor = designResult.StabilityDesignResults.Zone2SafetyFactor.Value; - - desResult.StabilityDesignResults.Zone2EntryPointXSpecified = designResult.StabilityDesignResults.LocalZone2EntryPointX.HasValue; - if (designResult.StabilityDesignResults.LocalZone2EntryPointX.HasValue) desResult.StabilityDesignResults.Zone2EntryPointX = designResult.StabilityDesignResults.LocalZone2EntryPointX.Value; - - desResult.StabilityDesignResults.Zone2ExitPointXSpecified = designResult.StabilityDesignResults.LocalZone2ExitPointX.HasValue; - if (designResult.StabilityDesignResults.LocalZone2ExitPointX.HasValue) desResult.StabilityDesignResults.Zone2ExitPointX = designResult.StabilityDesignResults.LocalZone2ExitPointX.Value; - desResult.StabilityDesignResults.NumberOfIterationsSpecified = designResult.StabilityDesignResults.NumberOfIterations.HasValue; if (designResult.StabilityDesignResults.NumberOfIterations.HasValue) desResult.StabilityDesignResults.NumberOfIterations = designResult.StabilityDesignResults.NumberOfIterations.Value; Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs =================================================================== diff -u -r2660 -r2873 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs (.../MacroStabilityInwardsTests.cs) (revision 2660) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs (.../MacroStabilityInwardsTests.cs) (revision 2873) @@ -107,21 +107,7 @@ var output = DamXmlSerialization.LoadOutputFromXmlString(outputString); Assert.IsNotNull(output.Results.CalculationResults, "No results available"); Assert.AreEqual(1.282, output.Results.CalculationResults[0].StabilityDesignResults.SafetyFactor, Tolerance); - // Zone1SafetyFactor=1.282 - Assert.AreEqual(1.282, output.Results.CalculationResults[0].StabilityDesignResults.Zone1SafetyFactor, Tolerance); - // Zone1EntryPointX Local =38.818 Global=47.238 - Assert.AreEqual(38.818, output.Results.CalculationResults[0].StabilityDesignResults.Zone1EntryPointX, Tolerance); - // Zone1ExitPointX Local=64.262 Global=72.682 - Assert.AreEqual(64.262, output.Results.CalculationResults[0].StabilityDesignResults.Zone1ExitPointX, Tolerance); - - // Zone2SafetyFactor null, is set to default reading from output.xml - Assert.AreEqual(0, output.Results.CalculationResults[0].StabilityDesignResults.Zone2SafetyFactor, Tolerance); - // Zone2EntryPointX null, is set to default reading from output.xml - Assert.AreEqual(0, output.Results.CalculationResults[0].StabilityDesignResults.Zone2EntryPointX, Tolerance); - // Zone2ExitPointX null, is set to default reading from output.xml - Assert.AreEqual(0, output.Results.CalculationResults[0].StabilityDesignResults.Zone2ExitPointX, Tolerance); - // NumberOfIterations=0 Assert.AreEqual(0, output.Results.CalculationResults[0].StabilityDesignResults.NumberOfIterations); // ResultMessage "" @@ -175,21 +161,7 @@ Assert.IsNotNull(outputString); var output = DamXmlSerialization.LoadOutputFromXmlString(outputString); Assert.AreEqual(1.115, output.Results.CalculationResults[0].StabilityDesignResults.SafetyFactor, Tolerance); - // Zone1SafetyFactor=1.115 - Assert.AreEqual(1.115, output.Results.CalculationResults[0].StabilityDesignResults.Zone1SafetyFactor, Tolerance); - // Zone1EntryPointX Local =39.3 Global=47.72 - Assert.AreEqual(39.3, output.Results.CalculationResults[0].StabilityDesignResults.Zone1EntryPointX, Tolerance); - // Zone1ExitPointX Local=64.442 Global=72.682 - Assert.AreEqual(64.442, output.Results.CalculationResults[0].StabilityDesignResults.Zone1ExitPointX, Tolerance); - - // Zone2SafetyFactor null, is set to default reading from output.xml - Assert.AreEqual(0, output.Results.CalculationResults[0].StabilityDesignResults.Zone2SafetyFactor, Tolerance); - // Zone2EntryPointX null, is set to default reading from output.xml - Assert.AreEqual(0, output.Results.CalculationResults[0].StabilityDesignResults.Zone2EntryPointX, Tolerance); - // Zone2ExitPointX null, is set to default reading from output.xml - Assert.AreEqual(0, output.Results.CalculationResults[0].StabilityDesignResults.Zone2ExitPointX, Tolerance); - // NumberOfIterations=0 Assert.AreEqual(0, output.Results.CalculationResults[0].StabilityDesignResults.NumberOfIterations); // ResultMessage "" @@ -410,23 +382,9 @@ Assert.AreEqual("6-4-1-A-1-F_3_s", output.Results.CalculationResults[2].ProfileName); var result = output.Results.CalculationResults[0]; - // SafetyFactor=1.621 (lowest of zone 1 and 2) + // SafetyFactor=1.621 Assert.AreEqual(1.621, result.StabilityDesignResults.SafetyFactor, Tolerance); - // Zone1SafetyFactor=1.621 - Assert.AreEqual(1.621, result.StabilityDesignResults.Zone1SafetyFactor, Tolerance); - // Zone1EntryPointX=26.653 - Assert.AreEqual(26.653, result.StabilityDesignResults.Zone1EntryPointX, Tolerance); - // Zone1ExitPointX=32.807 - Assert.AreEqual(32.807, result.StabilityDesignResults.Zone1ExitPointX, Tolerance); - - // Zone2SafetyFactor=1.644 - Assert.AreEqual(1.644, result.StabilityDesignResults.Zone2SafetyFactor, Tolerance); - // Zone2EntryPointX=27.196 - Assert.AreEqual(27.196, result.StabilityDesignResults.Zone2EntryPointX, Tolerance); - // Zone2ExitPointX=32.783 - Assert.AreEqual(32.783, result.StabilityDesignResults.Zone2ExitPointX, Tolerance); - // skip testing some of the results like uplift etc. // Calculation Result @@ -484,19 +442,8 @@ Assert.AreEqual("6-4-5-A-1-B_2_s", output.Results.CalculationResults[1].ProfileName); var result = output.Results.CalculationResults[0]; - // Zone1SafetyFactor=2.138 - Assert.AreEqual(2.138, result.StabilityDesignResults.Zone1SafetyFactor, Tolerance); - // Zone2SafetyFactor=2.155 - Assert.AreEqual(2.155, result.StabilityDesignResults.Zone2SafetyFactor, Tolerance); - // SafetyFactor=2.138 (same as zone 1) - Assert.AreEqual(2.138, result.StabilityDesignResults.SafetyFactor, Tolerance); - result = output.Results.CalculationResults[1]; - // Zone1SafetyFactor=2.009 - Assert.AreEqual(2.009, result.StabilityDesignResults.Zone1SafetyFactor, Tolerance); - // Zone2SafetyFactor=1.974 - Assert.AreEqual(1.974, result.StabilityDesignResults.Zone2SafetyFactor, Tolerance); - // SafetyFactor=2.009 (same as zone 1) + // SafetyFactor=2.009 Assert.AreEqual(2.009, result.StabilityDesignResults.SafetyFactor, Tolerance); // Calculation Result @@ -546,23 +493,9 @@ Assert.AreEqual("6-4-1-A-1-F_3_s", output.Results.CalculationResults[2].ProfileName); var result = output.Results.CalculationResults[0]; - // SafetyFactor=1.032 (lowest of zone 1 and 2) + // SafetyFactor=1.032 Assert.AreEqual(1.032, result.StabilityDesignResults.SafetyFactor, Tolerance); - // Zone1SafetyFactor=1.032 - Assert.AreEqual(1.032, result.StabilityDesignResults.Zone1SafetyFactor, Tolerance); - // Zone1EntryPointX=29.779 - Assert.AreEqual(29.779, result.StabilityDesignResults.Zone1EntryPointX, Tolerance); - // Zone1ExitPointX72.599= - Assert.AreEqual(72.599, result.StabilityDesignResults.Zone1ExitPointX, Tolerance); - - // Zone2SafetyFactor=2.332 - Assert.AreEqual(2.332, result.StabilityDesignResults.Zone2SafetyFactor, Tolerance); - // Zone2EntryPointX=27.1 - Assert.AreEqual(27.1, result.StabilityDesignResults.Zone2EntryPointX, Tolerance); - // Zone2ExitPointX=72.524 - Assert.AreEqual(72.524, result.StabilityDesignResults.Zone2ExitPointX, Tolerance); - // skip testing some of the results like uplift etc. // Calculation Result @@ -878,9 +811,6 @@ var stabilityDesignResults = output.Results.CalculationResults[0].StabilityDesignResults; Assert.AreEqual(expectedSafetyFactor, stabilityDesignResults.SafetyFactor, Tolerance); - Assert.AreEqual(expectedSafetyFactor, stabilityDesignResults.Zone1SafetyFactor, Tolerance); - Assert.AreEqual(expectedZone1EntryPointX, stabilityDesignResults.Zone1EntryPointX, Tolerance); - Assert.AreEqual(expectedZone1ExitPointX, stabilityDesignResults.Zone1ExitPointX, Tolerance); Assert.AreEqual(expectedNumberOfIterations, stabilityDesignResults.NumberOfIterations); Assert.AreEqual(expectedResultMessage, stabilityDesignResults.ResultMessage); SurfaceLine2 redesignedSurfaceLine = actualDamProjectData.DesignCalculations[0].StabilityDesignResults.RedesignedSurfaceLine;