Index: dam failuremechanisms/damMacroStability/trunk/src/Deltares.DamMacroStability.Calculator/DGeoStabilityResultReader.cs =================================================================== diff -u -r423 -r426 --- dam failuremechanisms/damMacroStability/trunk/src/Deltares.DamMacroStability.Calculator/DGeoStabilityResultReader.cs (.../DGeoStabilityResultReader.cs) (revision 423) +++ dam failuremechanisms/damMacroStability/trunk/src/Deltares.DamMacroStability.Calculator/DGeoStabilityResultReader.cs (.../DGeoStabilityResultReader.cs) (revision 426) @@ -43,15 +43,13 @@ public double CircleSurfacePointRightXCoordinate; public double EntryPointXCoordinate; public double ExitPointXCoordinate; - public double Beta; public void Init() { SafetyFactor = 0.0; CircleSurfacePointLeftXCoordinate = 0.0; CircleSurfacePointRightXCoordinate = 0.0; EntryPointXCoordinate = 0.0; ExitPointXCoordinate = 0.0; - Beta = 0.0; } } @@ -245,15 +243,14 @@ int xCoordinateLeftSurfaceIndex; int xCoordinateRightSurfaceIndex; int zoneNumberIndex; - int betaIndex = -1; DGeoStabilityResultsSingleZone resultsStruct = new DGeoStabilityResultsSingleZone(); while ((line = stringReader.ReadLine()) != null) { if (line.Equals("[Dump]")) { if (!ReadParameterColumnIndices(stringReader, out stabilityFactorIndex, - out xCoordinateLeftSurfaceIndex, out xCoordinateRightSurfaceIndex, out zoneNumberIndex, ref betaIndex)) + out xCoordinateLeftSurfaceIndex, out xCoordinateRightSurfaceIndex, out zoneNumberIndex)) throw new DGeoStabilityResultReaderException(Resources.DGeoStabilityResultReader_ParseZoneResults_CouldNotReadColumnIndication); while ((line = stringReader.ReadLine()) != null) @@ -277,10 +274,6 @@ resultsStruct.SafetyFactor = resultsStruct.SafetyFactor / 1.05; resultsStruct.CircleSurfacePointLeftXCoordinate = zoneStabilityResultsElements[xCoordinateLeftSurfaceIndex].ToType(); resultsStruct.CircleSurfacePointRightXCoordinate = zoneStabilityResultsElements[xCoordinateRightSurfaceIndex].ToType(); - if (betaIndex > -1) - { - resultsStruct.Beta = zoneStabilityResultsElements[betaIndex].ToType(); - } return resultsStruct; } } @@ -301,7 +294,7 @@ } private static bool ReadParameterColumnIndices(StringReader stringReader, out int stabilityFactorIndex, - out int xCoordinateLeftSurfaceIndex, out int xCoordinateRightSurfaceIndex, out int zoneNumberIndex, ref int betaIndex) + out int xCoordinateLeftSurfaceIndex, out int xCoordinateRightSurfaceIndex, out int zoneNumberIndex) { string line = ""; const string startCondition = "[Column Indication]"; @@ -310,7 +303,6 @@ const string headerXCoordinateLeftSurface = "X coordinate left surface"; const string headerXCoordinateRightSurface = "X coordinate right surface"; const string headerZoneNumber = "Zone number"; - const string headerBeta = "Beta"; bool isEndCondition = false; stabilityFactorIndex = -1; @@ -336,9 +328,6 @@ if (line.Equals(headerZoneNumber)) zoneNumberIndex = columnIndex; - if (line.Equals(headerBeta)) - betaIndex = columnIndex; - columnIndex++; if (line.Equals(endCondition)) {