Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Deltares.Dam.Data.csproj =================================================================== diff -u -r2153 -r2202 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Deltares.Dam.Data.csproj (.../Deltares.Dam.Data.csproj) (revision 2153) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Deltares.Dam.Data.csproj (.../Deltares.Dam.Data.csproj) (revision 2202) @@ -199,7 +199,6 @@ - Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Scenario.cs =================================================================== diff -u -r2089 -r2202 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Scenario.cs (.../Scenario.cs) (revision 2089) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Scenario.cs (.../Scenario.cs) (revision 2202) @@ -98,7 +98,6 @@ private Dictionary stabilityUpliftSituations; private Dictionary pipingResults; - private Dictionary mStabResults; private Dictionary failureProbabilitiesStability; private Dictionary safetyFactorsPiping; private Dictionary failureProbabilitiesPiping; @@ -169,7 +168,6 @@ { calculationResult = CalculationResult.NoRun; pipingResults = new Dictionary(); - mStabResults = new Dictionary(); safetyFactorsPiping = new Dictionary(); safetyFactorsFlowSlide = new Dictionary(); resultMessages = new Dictionary(); @@ -852,54 +850,6 @@ } /// - /// Get MStabResults - /// - /// - /// - private MStabResults? GetMStabResults(Object objectAsKey) - { - if (objectAsKey != null) - { - return mStabResults.ContainsKey(objectAsKey) ? mStabResults[objectAsKey] : null; - } - return null; - } - - /// - /// Get MStabResults - /// - /// - /// - /// - public MStabResults? GetMStabResults(SoilProfile1D soilProfile, string soilGeometry2DName) - { - Object objectAsKey = GetObjectAsKey(soilProfile, soilGeometry2DName); - return GetMStabResults(objectAsKey); - } - - /// - /// Set MStabResults - /// - /// - /// - private void SetMStabResults(Object objectAsKey, MStabResults? mStabResults) - { - this.mStabResults[objectAsKey] = mStabResults; - } - - /// - /// Set MStabResults - /// - /// - /// - /// - public void SetMStabResults(SoilProfile1D soilProfile, string soilGeometry2DName, MStabResults? mStabResults) - { - Object objectAsKey = GetObjectAsKey(soilProfile, soilGeometry2DName); - SetMStabResults(objectAsKey, mStabResults); - } - - /// /// Get Safety Factor Piping /// /// @@ -1092,32 +1042,6 @@ } /// - /// Return the safety factor for calculation type of most probable soil profile - /// - /// - /// - public double? GetMostProbableSafetyFactor(FailureMechanismSystemType? failureMechanismType) - { - SoilProfile1D soilProfile = Location.Segment.GetMostProbableProfile(failureMechanismType); - string soilGeometry2DName = Location.Segment.GetMostProbableGeometry2DName(failureMechanismType); - switch (failureMechanismType) - { - case FailureMechanismSystemType.Piping: - return GetSafetyFactorPiping(soilProfile, soilGeometry2DName); - case FailureMechanismSystemType.StabilityInside: - case FailureMechanismSystemType.StabilityOutside: - MStabResults? mstabResults = GetMStabResults(soilProfile, soilGeometry2DName); - double? safetyFactor = null; - if (mstabResults != null) - { - safetyFactor = mstabResults.Value.Zone1.SafetyFactor; - } - return safetyFactor; - } - return null; - } - - /// /// Return probability stability /// /// Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs =================================================================== diff -u -r2138 -r2202 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs (.../CsvExportData.cs) (revision 2138) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs (.../CsvExportData.cs) (revision 2202) @@ -165,15 +165,6 @@ { get { - if (damFailureMechanismeCalculationSpecification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityInside || - damFailureMechanismeCalculationSpecification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityOutside) - { - var mstabResults = scenario.GetMStabResults(soilProfile, soilGeometry2DName); - if (mstabResults != null) - { - numberOfIterations = mstabResults.Value.IterationNumber; - } - } return numberOfIterations; } set { numberOfIterations = value; } @@ -1918,6 +1909,8 @@ return null; SurfaceLine2 originalSurfaceLine = scenario.Location.SurfaceLine2; + if (originalSurfaceLine == null) + return null; var coordinateSystemConverter = new CoordinateSystemConverter(); coordinateSystemConverter.DefineGlobalXYZBasedOnLine(originalSurfaceLine.Geometry); var localRedesignedSurfaceLineGlobal = redesignedSurfaceLine.FullDeepClone(); @@ -2009,15 +2002,6 @@ { get { - if (damFailureMechanismeCalculationSpecification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityInside || - damFailureMechanismeCalculationSpecification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityOutside) - { - var mstabResults = scenario.GetMStabResults(soilProfile, soilGeometry2DName); - if (mstabResults != null) - { - stabilityModel = mstabResults.Value.MStabModelType; - } - } return stabilityModel; } set { stabilityModel = value; } Fisheye: Tag 2202 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/MStabResults.cs'. Fisheye: No comparison available. Pass `N' to diff?