Index: DamFailureMechanisms/damMacroStability/trunk/src/Deltares.DamMacroStability.Calculator/DGeoStabilityResultReader.cs =================================================================== diff -u -r997 -r2402 --- DamFailureMechanisms/damMacroStability/trunk/src/Deltares.DamMacroStability.Calculator/DGeoStabilityResultReader.cs (.../DGeoStabilityResultReader.cs) (revision 997) +++ DamFailureMechanisms/damMacroStability/trunk/src/Deltares.DamMacroStability.Calculator/DGeoStabilityResultReader.cs (.../DGeoStabilityResultReader.cs) (revision 2402) @@ -326,8 +326,6 @@ if (int.Parse(zoneStabilityResultsElements[zoneNumberIndex]).Equals(stabilityZone)) { resultsStruct.SafetyFactor = zoneStabilityResultsElements[stabilityFactorIndex].ToType(); - if (IsUpliftResults(fileContent)) - resultsStruct.SafetyFactor = resultsStruct.SafetyFactor / 1.05; resultsStruct.CircleSurfacePointLeftXCoordinate = zoneStabilityResultsElements[xCoordinateLeftSurfaceIndex].ToType(); resultsStruct.CircleSurfacePointRightXCoordinate = zoneStabilityResultsElements[xCoordinateRightSurfaceIndex].ToType(); return resultsStruct; @@ -399,19 +397,6 @@ return (stabilityFactorIndex >= 0) && (zoneNumberIndex >= 0) && (xCoordinateLeftSurfaceIndex >= 0) && (xCoordinateRightSurfaceIndex >= 0); } - private static bool IsUpliftResults(string fileContent) - { - fileContent = ReadContentAfterIdentifier(fileContent, "[MODEL]"); - if (fileContent.Contains(" 4 : Uplift Van")) - { - return true; - } - else - { - return false; - } - } - private static string ReadContentAfterIdentifier(string fileContent, string identifier) { if (!fileContent.Contains(identifier)) @@ -425,8 +410,6 @@ { DGeoStabilityResultsSingleZone resultsStruct = new DGeoStabilityResultsSingleZone(); resultsStruct.SafetyFactor = GetColumnValueNoZones(fileContent, "Stability factor"); - if (IsUpliftResults(fileContent)) - resultsStruct.SafetyFactor = resultsStruct.SafetyFactor / 1.05; resultsStruct.CircleSurfacePointLeftXCoordinate = GetColumnValueNoZones(fileContent, "X coordinate left surface"); resultsStruct.CircleSurfacePointRightXCoordinate = GetColumnValueNoZones(fileContent, "X coordinate right surface"); return resultsStruct; Index: DamFailureMechanisms/damMacroStability/trunk/src/Tests/Deltares.DamMacroStability.CalculatorTests/DGeoStabilityResultReaderTests.cs =================================================================== diff -u -r997 -r2402 --- DamFailureMechanisms/damMacroStability/trunk/src/Tests/Deltares.DamMacroStability.CalculatorTests/DGeoStabilityResultReaderTests.cs (.../DGeoStabilityResultReaderTests.cs) (revision 997) +++ DamFailureMechanisms/damMacroStability/trunk/src/Tests/Deltares.DamMacroStability.CalculatorTests/DGeoStabilityResultReaderTests.cs (.../DGeoStabilityResultReaderTests.cs) (revision 2402) @@ -56,7 +56,7 @@ var results = DGeoStabilityResultReader.ExtractStabilityResults(TestReadFolder); Assert.AreEqual(2, results.Count); Assert.AreEqual(1.276, results.First(r => r.CalculationName == "TestBishop").Zone1.SafetyFactor, 0.001); - Assert.AreEqual(1.287/1.05, results.First(r => r.CalculationName == "TestUpliftVan").Zone1.SafetyFactor, 0.001); + Assert.AreEqual(1.287, results.First(r => r.CalculationName == "TestUpliftVan").Zone1.SafetyFactor, 0.001); } [Test] @@ -145,7 +145,7 @@ var fileName = Path.Combine(TestFolder, TestFileUplift); var contents = DGeoStabilityResultReader.GetFileContents(fileName); var result = DGeoStabilityResultReader.GetDGeoStabilityResults(contents); - Assert.AreEqual(1.276 / 1.05, result.Zone1.SafetyFactor, 0.001); + Assert.AreEqual(1.276, result.Zone1.SafetyFactor, 0.001); } [Test] @@ -157,7 +157,7 @@ (int)DGeoStabilityResultReader.StabilityZone.StabilityZone1a); Assert.IsTrue(result != null); var safetyFactor = ((DGeoStabilityResultReader.DGeoStabilityResultsSingleZone)result).SafetyFactor; - Assert.AreEqual(1.104 / 1.05, safetyFactor, 0.001); + Assert.AreEqual(1.104, safetyFactor, 0.001); } [Test] Index: DamFailureMechanisms/damMacroStability/trunk/src/Deltares.DamMacroStability.Version/GlobalAssembly.cs.svn =================================================================== diff -u -r894 -r2402 --- DamFailureMechanisms/damMacroStability/trunk/src/Deltares.DamMacroStability.Version/GlobalAssembly.cs.svn (.../GlobalAssembly.cs.svn) (revision 894) +++ DamFailureMechanisms/damMacroStability/trunk/src/Deltares.DamMacroStability.Version/GlobalAssembly.cs.svn (.../GlobalAssembly.cs.svn) (revision 2402) @@ -5,9 +5,9 @@ [assembly: AssemblyProduct("Dam Macrostability")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Deltares")] -[assembly: AssemblyCopyright("Copyright © Deltares 2018")] +[assembly: AssemblyCopyright("Copyright © Deltares 2019")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("18.1.0.SVNREV")] -[assembly: AssemblyFileVersion("18.1.0.SVNREV")] \ No newline at end of file +[assembly: AssemblyVersion("19.1.0.SVNREV")] +[assembly: AssemblyFileVersion("19.1.0.SVNREV")] \ No newline at end of file