Index: dam classic/trunk/src/Stability/RTOCalculationgrid.cs =================================================================== diff -u -r190 -r230 --- dam classic/trunk/src/Stability/RTOCalculationgrid.cs (.../RTOCalculationgrid.cs) (revision 190) +++ dam classic/trunk/src/Stability/RTOCalculationgrid.cs (.../RTOCalculationgrid.cs) (revision 230) @@ -1,15 +1,11 @@ using System; using System.Collections.Generic; -using System.Diagnostics.Contracts; using System.Linq; -using System.Reflection; using Deltares.Geometry; using Deltares.Geotechnics; -using Deltares.Geotechnics.GeotechnicalGeometry; using Deltares.Geotechnics.Soils; using Deltares.Geotechnics.SurfaceLines; using Deltares.Mathematics; -using Deltares.Standard; using Deltares.Standard.EventPublisher; using Deltares.Standard.Language; using Deltares.Standard.Logging; @@ -40,13 +36,6 @@ /// is not null. public RTOCalculationgrid(StabilityModel stabilityModel) { - Contract.Requires(stabilityModel != null); - Contract.Requires(stabilityModel.SoilProfile != null); - Contract.Requires(stabilityModel.GeometryData != null); - Contract.Requires(stabilityModel.SlipCircle != null); - Contract.Requires(stabilityModel.GeotechnicsData != null); - //Contract.Ensures(SurfaceLine != null); - profile2D = stabilityModel.SoilProfile; surfaceLine = stabilityModel.SurfaceLine2; waternet = stabilityModel.GeotechnicsData.CurrentWaternet; @@ -78,7 +67,6 @@ /// cannot be null. public void SetSoilProfile2D(SoilProfile2D profile) { - Contract.Requires(profile != null); profile2D = profile; } @@ -93,11 +81,6 @@ /// public void DetermineOutwardBishopGrid(SlipCircle slipCircle) { - Contract.Requires(SurfaceLine != null); - Contract.Requires(SurfaceLine.CharacteristicPoints != null); - Contract.Requires(SurfaceLine.IsDefined(CharacteristicPointType.DikeTopAtRiver)); - Contract.Requires(SurfaceLine.IsDefined(CharacteristicPointType.DikeToeAtRiver)); - GeometryPoint dikeTopRiver = SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver); GeometryPoint dikeToeRiver = SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtRiver); GeometryPoint dikeTopPolder = SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder); @@ -146,8 +129,7 @@ { throw new InvalidOperationException("Grid can not be generated / updated when surface line is not present."); } - Contract.EndContractBlock(); - + if (InwardStability) { DetermineInwardBishopGrid(slipCircle); @@ -231,11 +213,6 @@ /// if has no soil layers and grid should be generated. public void CreateGrid(StabilityModel model) { - Contract.Requires(model != null); - Contract.Requires(model.SlipCircle != null); - Contract.Requires(SurfaceLine != null); - Contract.Requires(SurfaceLine.Geometry.Count > 0); - if (!model.SoilProfile.Surfaces.Any()) { return; @@ -360,11 +337,6 @@ /// for the given characteristic points has layers. private double GetTopPleistoceen(double x) { - Contract.Requires(profile2D != null); - Contract.Requires(surfaceLine != null); - Contract.Requires(surfaceLine.IsDefined(CharacteristicPointType.DikeTopAtRiver)); - Contract.Requires(surfaceLine.IsDefined(CharacteristicPointType.DikeTopAtPolder)); - SoilProfile1D helpProfile = profile2D.GetSoilProfile1D(x); if (helpProfile.Layers.Count == 0) @@ -468,11 +440,6 @@ /// private void DetermineInwardBishopGrid(SlipCircle slipCircle) { - Contract.Requires(SurfaceLine != null); - Contract.Requires(SurfaceLine.CharacteristicPoints != null); - Contract.Requires(SurfaceLine.IsDefined(CharacteristicPointType.DikeTopAtPolder)); - Contract.Requires(SurfaceLine.IsDefined(CharacteristicPointType.DikeToeAtPolder)); - GeometryPoint dikeTopPolder = SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder); GeometryPoint dikeToe = SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder); GeometryPoint dikeTopRiver = SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver); @@ -602,8 +569,6 @@ private static bool StabilityModelHasLayers(StabilityModel model) { - Contract.Requires(model != null); - Contract.Requires(model.SoilProfile != null); return model.SoilProfile.Surfaces.Any(); } Index: dam classic/trunk/src/Stability/SlipCircle.cs =================================================================== diff -u -r190 -r230 --- dam classic/trunk/src/Stability/SlipCircle.cs (.../SlipCircle.cs) (revision 190) +++ dam classic/trunk/src/Stability/SlipCircle.cs (.../SlipCircle.cs) (revision 230) @@ -1,10 +1,8 @@ using System; using System.ComponentModel; -using System.Diagnostics.Contracts; using System.Drawing; using System.Xml.Serialization; using Deltares.Geometry; -using Deltares.Geotechnics; using Deltares.Geotechnics.Soils; using Deltares.Standard; using Deltares.Standard.EventPublisher; @@ -67,14 +65,10 @@ { get { - Contract.Ensures(SlipCircleFixedPoint != null); return slipCircleFixedPoint; } set { - Contract.Requires(value != null); - Contract.Ensures(SlipCircleFixedPoint != null); - DataEventPublisher.BeforeChange(this, "SlipCircleFixedPoint"); slipCircleFixedPoint = value; DataEventPublisher.AfterChange(this, "SlipCircleFixedPoint"); Index: dam classic/trunk/src/GeoTechnics/WaternetCreator/PlLineCreator/WaternetCreator.cs =================================================================== diff -u -r190 -r230 --- dam classic/trunk/src/GeoTechnics/WaternetCreator/PlLineCreator/WaternetCreator.cs (.../WaternetCreator.cs) (revision 190) +++ dam classic/trunk/src/GeoTechnics/WaternetCreator/PlLineCreator/WaternetCreator.cs (.../WaternetCreator.cs) (revision 230) @@ -1,12 +1,9 @@ using System; using System.Collections.Generic; -using System.Diagnostics.Contracts; using System.Linq; -using System.Runtime.InteropServices; using Deltares.Geometry; using Deltares.Geotechnics.Soils; using Deltares.Geotechnics.SurfaceLines; -using Deltares.Standard; using Deltares.Standard.EventPublisher; using Deltares.Standard.Extensions; using Deltares.Standard.Language; @@ -292,7 +289,6 @@ return new GeometryCurve(point3, point4); } - [Pure] private bool HasWaterLevel(Location location) { return !double.IsNaN(location.Inwards || location.PlLineCreationMethod == PlLineCreationMethod.RingtoetsWti2017 ? location.WaterLevelRiver : location.WaterLevelRiverLow); Index: dam classic/trunk/src/MacroStability/Data/StabilitySafetyFactorCalculation.cs =================================================================== diff -u -r190 -r230 --- dam classic/trunk/src/MacroStability/Data/StabilitySafetyFactorCalculation.cs (.../StabilitySafetyFactorCalculation.cs) (revision 190) +++ dam classic/trunk/src/MacroStability/Data/StabilitySafetyFactorCalculation.cs (.../StabilitySafetyFactorCalculation.cs) (revision 230) @@ -1,16 +1,12 @@ -using System.Diagnostics.Contracts; using Deltares.AssessmentMechanism; -using Deltares.Geotechnics; namespace Deltares.Stability.Calculation2 { public class StabilitySafetyFactorCalculation : AssessmentCalculation { public override AssessmentCalculationResult Execute(DikeLocationInfo dikeLocationInfo) { - Contract.Requires(dikeLocationInfo is StabilityDikeLocationInfo); - var stabilityDikeLocationInfo = (StabilityDikeLocationInfo) dikeLocationInfo; var location = stabilityDikeLocationInfo.Location; Index: dam classic/trunk/src/Deltares.DeltaModel/DikeLocation.cs =================================================================== diff -u -r190 -r230 --- dam classic/trunk/src/Deltares.DeltaModel/DikeLocation.cs (.../DikeLocation.cs) (revision 190) +++ dam classic/trunk/src/Deltares.DeltaModel/DikeLocation.cs (.../DikeLocation.cs) (revision 230) @@ -2,7 +2,6 @@ using System.Collections; using System.Collections.Generic; using System.ComponentModel; -using System.Diagnostics.Contracts; using System.Linq; using System.Xml.Serialization; using Deltares.Geographic; @@ -908,12 +907,10 @@ { get { - Contract.Assume(piezometricHeads != null); return piezometricHeads; } set { - Contract.Ensures(PiezometricHeads != null); if (value != null) { this.SetAndNotify2(out piezometricHeads, value, dl => dl.PiezometricHeads); Index: dam classic/trunk/src/Stability/StabilityModelValidator.cs =================================================================== diff -u -r190 -r230 --- dam classic/trunk/src/Stability/StabilityModelValidator.cs (.../StabilityModelValidator.cs) (revision 190) +++ dam classic/trunk/src/Stability/StabilityModelValidator.cs (.../StabilityModelValidator.cs) (revision 230) @@ -1,11 +1,9 @@ using System; using System.Collections.Generic; -using System.Diagnostics.Contracts; using System.Linq; using Deltares.Geometry; using Deltares.Geotechnics; using Deltares.Geotechnics.Soils; -using Deltares.Standard; using Deltares.Standard.EventPublisher; using Deltares.Standard.Extensions; using Deltares.Standard.Language; @@ -52,8 +50,7 @@ { throw new ArgumentNullException("model"); } - Contract.EndContractBlock(); - + this.model = model; uniformLoadErrorList = new List(); @@ -73,7 +70,6 @@ { get { - Contract.Ensures(Contract.Result() != null); return model; } } @@ -1167,7 +1163,6 @@ isOutsideGeometryX = " is outside geometry limits (" + GetUserValue(model.GeometryData.MinGeometryPointsX) + " to " + GetUserValue(model.GeometryData.MaxGeometryPointsX) + " )"; isOutsideGeometryZ = " is outside geometry limits (" + GetUserValue(model.GeometryData.MinGeometryPointsZ) + " to " + GetUserValue(model.GeometryData.MaxGeometryPointsZ) + " )"; var maxZGeometry = model.GeometryData.MaxGeometryPointsZ; - foreach (var forbiddenLine in model.ForbiddenLinesList) { forbiddenLineErrorList.Add(GetInvalidProperties(forbiddenLine, maxZGeometry)); @@ -1440,7 +1435,7 @@ } case "Deltares.Stability.ZoneAreas": { - WriteInvalidPropertiesOutsideGeometry(ref err, model.ZoneAreas, "DikeTableHeight", false, zMax); + WriteInvalidPropertiesOutsideGeometry(ref err, model.ZoneAreas, "DikeTableHeight", false, zMax); // + 20 WriteInvalidPropertiesOutsideGeometry(ref err, model.ZoneAreas, "RestProfileStartX", true, zMax); WriteInvalidPropertiesOutsideGeometry(ref err, model.ZoneAreas, "DesignLevelInfluenceX", true, zMax); WriteInvalidPropertiesOutsideGeometry(ref err, model.ZoneAreas, "DesignLevelInfluenceY", false, zMax); @@ -1652,11 +1647,11 @@ { if (property == "XStart") { - ((UniformLoad) subject).XStart = (((UniformLoad) subject).XStart > model.GeometryData.MaxGeometryPointsX) ? model.GeometryData.MaxGeometryPointsX : model.GeometryData.MinGeometryPointsX; + ((UniformLoad)subject).XStart = (((UniformLoad)subject).XStart > model.GeometryData.MaxGeometryPointsX) ? model.GeometryData.MaxGeometryPointsX : model.GeometryData.MinGeometryPointsX; } else if (property == "XEnd") { - ((UniformLoad) subject).XEnd = (((UniformLoad) subject).XEnd > model.GeometryData.MaxGeometryPointsX) ? model.GeometryData.MaxGeometryPointsX : model.GeometryData.MinGeometryPointsX; + ((UniformLoad)subject).XEnd = (((UniformLoad)subject).XEnd > model.GeometryData.MaxGeometryPointsX) ? model.GeometryData.MaxGeometryPointsX : model.GeometryData.MinGeometryPointsX; } } else if (subject.GetType() == typeof(Geotextile)) @@ -1827,19 +1822,19 @@ } else if (property == "StartX") { - ((Geotextile) subject).StartX = (((Geotextile) subject).StartX > model.GeometryData.MaxGeometryPointsX) ? model.GeometryData.MaxGeometryPointsX : model.GeometryData.MinGeometryPointsX; + ((Geotextile)subject).StartX = (((Geotextile)subject).StartX > model.GeometryData.MaxGeometryPointsX) ? model.GeometryData.MaxGeometryPointsX : model.GeometryData.MinGeometryPointsX; } else if (property == "StartZ") { - ((Geotextile) subject).StartZ = (((Geotextile) subject).StartZ > model.GeometryData.MaxGeometryPointsZ) ? model.GeometryData.MaxGeometryPointsZ : model.GeometryData.MinGeometryPointsZ; + ((Geotextile)subject).StartZ = (((Geotextile)subject).StartZ > model.GeometryData.MaxGeometryPointsZ) ? model.GeometryData.MaxGeometryPointsZ : model.GeometryData.MinGeometryPointsZ; } else if (property == "EndX") { - ((Geotextile) subject).EndX = (((Geotextile) subject).EndX > model.GeometryData.MaxGeometryPointsX) ? model.GeometryData.MaxGeometryPointsX : model.GeometryData.MinGeometryPointsX; + ((Geotextile)subject).EndX = (((Geotextile)subject).EndX > model.GeometryData.MaxGeometryPointsX) ? model.GeometryData.MaxGeometryPointsX : model.GeometryData.MinGeometryPointsX; } else if (property == "EndZ") { - ((Geotextile) subject).EndZ = (((Geotextile) subject).EndZ > model.GeometryData.MaxGeometryPointsZ) ? model.GeometryData.MaxGeometryPointsZ : model.GeometryData.MinGeometryPointsZ; + ((Geotextile)subject).EndZ = (((Geotextile)subject).EndZ > model.GeometryData.MaxGeometryPointsZ) ? model.GeometryData.MaxGeometryPointsZ : model.GeometryData.MinGeometryPointsZ; } } else if (subject.GetType() == typeof(ForbiddenLines)) @@ -2010,114 +2005,114 @@ } else if (property == "StartX") { - ((ForbiddenLines) subject).StartX = (((ForbiddenLines) subject).StartX > model.GeometryData.MaxGeometryPointsX) ? model.GeometryData.MaxGeometryPointsX : model.GeometryData.MinGeometryPointsX; + ((ForbiddenLines)subject).StartX = (((ForbiddenLines)subject).StartX > model.GeometryData.MaxGeometryPointsX) ? model.GeometryData.MaxGeometryPointsX : model.GeometryData.MinGeometryPointsX; } else if (property == "StartZ") { - ((ForbiddenLines) subject).StartZ = (((ForbiddenLines) subject).StartZ > model.GeometryData.MaxGeometryPointsZ) ? model.GeometryData.MaxGeometryPointsZ : model.GeometryData.MinGeometryPointsZ; + ((ForbiddenLines)subject).StartZ = (((ForbiddenLines)subject).StartZ > model.GeometryData.MaxGeometryPointsZ) ? model.GeometryData.MaxGeometryPointsZ : model.GeometryData.MinGeometryPointsZ; } else if (property == "EndX") { - ((ForbiddenLines) subject).EndX = (((ForbiddenLines) subject).EndX > model.GeometryData.MaxGeometryPointsX) ? model.GeometryData.MaxGeometryPointsX : model.GeometryData.MinGeometryPointsX; + ((ForbiddenLines)subject).EndX = (((ForbiddenLines)subject).EndX > model.GeometryData.MaxGeometryPointsX) ? model.GeometryData.MaxGeometryPointsX : model.GeometryData.MinGeometryPointsX; } else if (property == "EndZ") { - ((ForbiddenLines) subject).EndZ = (((ForbiddenLines) subject).EndZ > model.GeometryData.MaxGeometryPointsZ) ? model.GeometryData.MaxGeometryPointsZ : model.GeometryData.MinGeometryPointsZ; + ((ForbiddenLines)subject).EndZ = (((ForbiddenLines)subject).EndZ > model.GeometryData.MaxGeometryPointsZ) ? model.GeometryData.MaxGeometryPointsZ : model.GeometryData.MinGeometryPointsZ; } } else if (subject.GetType() == typeof(SlipCircle)) { if (property == "TangentLineZTop") { - ((SlipCircle) subject).SlipCircleTangentLine.TangentLineZTop = (((SlipCircle) subject).SlipCircleTangentLine.TangentLineZTop > model.GeometryData.MaxGeometryPointsZ) ? model.GeometryData.MaxGeometryPointsZ : model.GeometryData.MinGeometryPointsZ; + ((SlipCircle)subject).SlipCircleTangentLine.TangentLineZTop = (((SlipCircle)subject).SlipCircleTangentLine.TangentLineZTop > model.GeometryData.MaxGeometryPointsZ) ? model.GeometryData.MaxGeometryPointsZ : model.GeometryData.MinGeometryPointsZ; } else if (property == "TangentLineZBottom") { - ((SlipCircle) subject).SlipCircleTangentLine.TangentLineZBottom = (((SlipCircle) subject).SlipCircleTangentLine.TangentLineZBottom > model.GeometryData.MaxGeometryPointsZ) ? model.GeometryData.MaxGeometryPointsZ : model.GeometryData.MinGeometryPointsZ; + ((SlipCircle)subject).SlipCircleTangentLine.TangentLineZBottom = (((SlipCircle)subject).SlipCircleTangentLine.TangentLineZBottom > model.GeometryData.MaxGeometryPointsZ) ? model.GeometryData.MaxGeometryPointsZ : model.GeometryData.MinGeometryPointsZ; } else if (property == "XFixed") { - ((SlipCircle) subject).SlipCircleFixedPoint.XFixed = (((SlipCircle) subject).SlipCircleFixedPoint.XFixed > model.GeometryData.MaxGeometryPointsZ) ? model.GeometryData.MaxGeometryPointsZ : model.GeometryData.MinGeometryPointsZ; + ((SlipCircle)subject).SlipCircleFixedPoint.XFixed = (((SlipCircle)subject).SlipCircleFixedPoint.XFixed > model.GeometryData.MaxGeometryPointsZ) ? model.GeometryData.MaxGeometryPointsZ : model.GeometryData.MinGeometryPointsZ; } else if (property == "ZFixed") { - ((SlipCircle) subject).SlipCircleFixedPoint.ZFixed = (((SlipCircle) subject).SlipCircleFixedPoint.ZFixed > model.GeometryData.MaxGeometryPointsZ) ? model.GeometryData.MaxGeometryPointsZ : model.GeometryData.MinGeometryPointsZ; + ((SlipCircle)subject).SlipCircleFixedPoint.ZFixed = (((SlipCircle)subject).SlipCircleFixedPoint.ZFixed > model.GeometryData.MaxGeometryPointsZ) ? model.GeometryData.MaxGeometryPointsZ : model.GeometryData.MinGeometryPointsZ; } } else if (subject.GetType() == typeof(HorizontalBalance)) { if (property == "XLeft") { - ((HorizontalBalance) subject).XLeft = (((HorizontalBalance) subject).XLeft > model.GeometryData.MaxGeometryPointsZ) ? model.GeometryData.MaxGeometryPointsZ : model.GeometryData.MinGeometryPointsZ; + ((HorizontalBalance)subject).XLeft = (((HorizontalBalance)subject).XLeft > model.GeometryData.MaxGeometryPointsZ) ? model.GeometryData.MaxGeometryPointsZ : model.GeometryData.MinGeometryPointsZ; } else if (property == "XRight") { - ((HorizontalBalance) subject).XRight = (((HorizontalBalance) subject).XRight > model.GeometryData.MaxGeometryPointsZ) ? model.GeometryData.MaxGeometryPointsZ : model.GeometryData.MinGeometryPointsZ; + ((HorizontalBalance)subject).XRight = (((HorizontalBalance)subject).XRight > model.GeometryData.MaxGeometryPointsZ) ? model.GeometryData.MaxGeometryPointsZ : model.GeometryData.MinGeometryPointsZ; } else if (property == "ZBottom") { - ((HorizontalBalance) subject).ZBottom = (((HorizontalBalance) subject).ZBottom > model.GeometryData.MaxGeometryPointsZ) ? model.GeometryData.MaxGeometryPointsZ : model.GeometryData.MinGeometryPointsZ; + ((HorizontalBalance)subject).ZBottom = (((HorizontalBalance)subject).ZBottom > model.GeometryData.MaxGeometryPointsZ) ? model.GeometryData.MaxGeometryPointsZ : model.GeometryData.MinGeometryPointsZ; } else if (property == "ZTop") { - ((HorizontalBalance) subject).ZTop = (((HorizontalBalance) subject).ZTop > model.GeometryData.MaxGeometryPointsZ) ? model.GeometryData.MaxGeometryPointsZ : model.GeometryData.MinGeometryPointsZ; + ((HorizontalBalance)subject).ZTop = (((HorizontalBalance)subject).ZTop > model.GeometryData.MaxGeometryPointsZ) ? model.GeometryData.MaxGeometryPointsZ : model.GeometryData.MinGeometryPointsZ; } } else if (subject.GetType() == typeof(SlipPlaneUpliftVan)) { if (property == "GridXLeft") { - ((SlipPlaneUpliftVan) subject).SlipPlaneLeftGrid.GridXLeft = (((SlipPlaneUpliftVan) subject).SlipPlaneLeftGrid.GridXLeft > model.GeometryData.MaxGeometryPointsZ) ? model.GeometryData.MaxGeometryPointsZ : model.GeometryData.MinGeometryPointsZ; + ((SlipPlaneUpliftVan)subject).SlipPlaneLeftGrid.GridXLeft = (((SlipPlaneUpliftVan)subject).SlipPlaneLeftGrid.GridXLeft > model.GeometryData.MaxGeometryPointsZ) ? model.GeometryData.MaxGeometryPointsZ : model.GeometryData.MinGeometryPointsZ; } else if (property == "GridXRight") { - ((SlipPlaneUpliftVan) subject).SlipPlaneLeftGrid.GridXRight = (((SlipPlaneUpliftVan) subject).SlipPlaneLeftGrid.GridXRight > model.GeometryData.MaxGeometryPointsZ) ? model.GeometryData.MaxGeometryPointsZ : model.GeometryData.MinGeometryPointsZ; + ((SlipPlaneUpliftVan)subject).SlipPlaneLeftGrid.GridXRight = (((SlipPlaneUpliftVan)subject).SlipPlaneLeftGrid.GridXRight > model.GeometryData.MaxGeometryPointsZ) ? model.GeometryData.MaxGeometryPointsZ : model.GeometryData.MinGeometryPointsZ; } else if (property == "GridZBottom") { - ((SlipPlaneUpliftVan) subject).SlipPlaneLeftGrid.GridZBottom = (((SlipPlaneUpliftVan) subject).SlipPlaneLeftGrid.GridZBottom > model.GeometryData.MaxGeometryPointsZ) ? model.GeometryData.MaxGeometryPointsZ : model.GeometryData.MinGeometryPointsZ; + ((SlipPlaneUpliftVan)subject).SlipPlaneLeftGrid.GridZBottom = (((SlipPlaneUpliftVan)subject).SlipPlaneLeftGrid.GridZBottom > model.GeometryData.MaxGeometryPointsZ) ? model.GeometryData.MaxGeometryPointsZ : model.GeometryData.MinGeometryPointsZ; } else if (property == "GridZTop") { - ((SlipPlaneUpliftVan) subject).SlipPlaneLeftGrid.GridZTop = (((SlipPlaneUpliftVan) subject).SlipPlaneLeftGrid.GridZTop > model.GeometryData.MaxGeometryPointsZ) ? model.GeometryData.MaxGeometryPointsZ : model.GeometryData.MinGeometryPointsZ; + ((SlipPlaneUpliftVan)subject).SlipPlaneLeftGrid.GridZTop = (((SlipPlaneUpliftVan)subject).SlipPlaneLeftGrid.GridZTop > model.GeometryData.MaxGeometryPointsZ) ? model.GeometryData.MaxGeometryPointsZ : model.GeometryData.MinGeometryPointsZ; } else if (property == "TangentLineZTop") { - ((SlipPlaneUpliftVan) subject).SlipPlaneTangentLine.TangentLineZTop = (((SlipPlaneUpliftVan) subject).SlipPlaneTangentLine.TangentLineZTop > model.GeometryData.MaxGeometryPointsZ) ? model.GeometryData.MaxGeometryPointsZ : model.GeometryData.MinGeometryPointsZ; + ((SlipPlaneUpliftVan)subject).SlipPlaneTangentLine.TangentLineZTop = (((SlipPlaneUpliftVan)subject).SlipPlaneTangentLine.TangentLineZTop > model.GeometryData.MaxGeometryPointsZ) ? model.GeometryData.MaxGeometryPointsZ : model.GeometryData.MinGeometryPointsZ; } else if (property == "TangentLineZBottom") { - ((SlipPlaneUpliftVan) subject).SlipPlaneTangentLine.TangentLineZBottom = (((SlipPlaneUpliftVan) subject).SlipPlaneTangentLine.TangentLineZBottom > model.GeometryData.MaxGeometryPointsZ) ? model.GeometryData.MaxGeometryPointsZ : model.GeometryData.MinGeometryPointsZ; + ((SlipPlaneUpliftVan)subject).SlipPlaneTangentLine.TangentLineZBottom = (((SlipPlaneUpliftVan)subject).SlipPlaneTangentLine.TangentLineZBottom > model.GeometryData.MaxGeometryPointsZ) ? model.GeometryData.MaxGeometryPointsZ : model.GeometryData.MinGeometryPointsZ; } } else if (subject.GetType() == typeof(SlipCircleGrid)) { if (property == "GridXLeft") { - ((SlipCircleGrid) subject).GridXLeft = (((SlipCircleGrid) subject).GridXLeft > model.GeometryData.MaxGeometryPointsZ) ? model.GeometryData.MaxGeometryPointsZ : model.GeometryData.MinGeometryPointsZ; + ((SlipCircleGrid)subject).GridXLeft = (((SlipCircleGrid)subject).GridXLeft > model.GeometryData.MaxGeometryPointsZ) ? model.GeometryData.MaxGeometryPointsZ : model.GeometryData.MinGeometryPointsZ; } else if (property == "GridXRight") { - ((SlipCircleGrid) subject).GridXRight = (((SlipCircleGrid) subject).GridXRight > model.GeometryData.MaxGeometryPointsZ) ? model.GeometryData.MaxGeometryPointsZ : model.GeometryData.MinGeometryPointsZ; + ((SlipCircleGrid)subject).GridXRight = (((SlipCircleGrid)subject).GridXRight > model.GeometryData.MaxGeometryPointsZ) ? model.GeometryData.MaxGeometryPointsZ : model.GeometryData.MinGeometryPointsZ; } else if (property == "GridZBottom") { - ((SlipCircleGrid) subject).GridZBottom = (((SlipCircleGrid) subject).GridZBottom > model.GeometryData.MaxGeometryPointsZ) ? model.GeometryData.MaxGeometryPointsZ : model.GeometryData.MinGeometryPointsZ; + ((SlipCircleGrid)subject).GridZBottom = (((SlipCircleGrid)subject).GridZBottom > model.GeometryData.MaxGeometryPointsZ) ? model.GeometryData.MaxGeometryPointsZ : model.GeometryData.MinGeometryPointsZ; } else if (property == "GridZTop") { - ((SlipCircleGrid) subject).GridZTop = (((SlipCircleGrid) subject).GridZTop > model.GeometryData.MaxGeometryPointsZ) ? model.GeometryData.MaxGeometryPointsZ : model.GeometryData.MinGeometryPointsZ; + ((SlipCircleGrid)subject).GridZTop = (((SlipCircleGrid)subject).GridZTop > model.GeometryData.MaxGeometryPointsZ) ? model.GeometryData.MaxGeometryPointsZ : model.GeometryData.MinGeometryPointsZ; } } else if (subject.GetType() == typeof(TreeOnSlope)) { if (property == "X") { - ((TreeOnSlope) subject).X = (((TreeOnSlope) subject).X > model.GeometryData.MaxGeometryPointsX) ? model.GeometryData.MaxGeometryPointsX : model.GeometryData.MinGeometryPointsX; + ((TreeOnSlope)subject).X = (((TreeOnSlope)subject).X > model.GeometryData.MaxGeometryPointsX) ? model.GeometryData.MaxGeometryPointsX : model.GeometryData.MinGeometryPointsX; } else if (property == "Z") { - ((TreeOnSlope) subject).Z = (((TreeOnSlope) subject).Z > model.GeometryData.MaxGeometryPointsZ) ? model.GeometryData.MaxGeometryPointsZ : model.GeometryData.MinGeometryPointsZ; + ((TreeOnSlope)subject).Z = (((TreeOnSlope)subject).Z > model.GeometryData.MaxGeometryPointsZ) ? model.GeometryData.MaxGeometryPointsZ : model.GeometryData.MinGeometryPointsZ; } } else if (subject.GetType() == typeof(GeometryPoint)) Index: dam classic/trunk/src/Deltares.DeltaModel/DikeCrossSection.cs =================================================================== diff -u -r190 -r230 --- dam classic/trunk/src/Deltares.DeltaModel/DikeCrossSection.cs (.../DikeCrossSection.cs) (revision 190) +++ dam classic/trunk/src/Deltares.DeltaModel/DikeCrossSection.cs (.../DikeCrossSection.cs) (revision 230) @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.ComponentModel; -using System.Diagnostics.Contracts; using System.Xml.Serialization; using Deltares.Geographic; using Deltares.Geotechnics; @@ -208,8 +207,6 @@ /// The piezometric heads. public void ConnectPiezometricHeads(IEnumerable piezometricHeads) { - Contract.Requires(piezometricHeads != null); - PiezometricHeads = PiezometricHeads.SnapToPoint(Point, piezometricHeads); } @@ -219,8 +216,6 @@ /// The revetment cross sections. public void ConnectRevetmentCrossSections(IEnumerable revetmentCrossSections) { - Contract.Requires(revetmentCrossSections != null); - foreach (var revetmentCrossSection in revetmentCrossSections) { if (revetmentCrossSection.BeginOffset <= Offset && revetmentCrossSection.EndOffset >= Offset) Index: dam classic/trunk/src/Stability/PreConsolidationStressListValidator.cs =================================================================== diff -u -r190 -r230 --- dam classic/trunk/src/Stability/PreConsolidationStressListValidator.cs (.../PreConsolidationStressListValidator.cs) (revision 190) +++ dam classic/trunk/src/Stability/PreConsolidationStressListValidator.cs (.../PreConsolidationStressListValidator.cs) (revision 230) @@ -1,12 +1,8 @@ using System; using System.Collections.Generic; -using System.Diagnostics.Contracts; using System.Linq; -using Deltares.Geometry; -using Deltares.Geotechnics; using Deltares.Geotechnics.Soils; using Deltares.Mathematics; -using Deltares.Standard; using Deltares.Standard.Language; using Deltares.Standard.Reflection; using Deltares.Standard.Validation; @@ -40,8 +36,6 @@ /// The stability model to be validated. Cannot be null. public PreConsolidationStressListValidator(StabilityModel stabilityModel) { - Contract.Requires(stabilityModel != null); - model = stabilityModel; } @@ -51,8 +45,6 @@ /// The collection of validation messages generated by this method. public IValidationResult[] Validate() { - Contract.Ensures(Contract.Result() != null); - var validationMessages = new List(); if (RequiredDataAvailableForValidation(validationMessages) && IsPreconsolidationStressDataRequired()) { @@ -67,10 +59,6 @@ private bool RequiredDataAvailableForValidation(ICollection validationMessages) { - Contract.Ensures(!Contract.Result() || model.SoilProfile != null); - Contract.Ensures(!Contract.Result() || model.SurfaceLine2 != null); - Contract.Ensures(!Contract.Result() || Contract.ForAll(model.SoilProfile.Surfaces, d => d.Soil != null)); - var noSoilProfileToValidate = model.SoilProfile == null; if (noSoilProfileToValidate) { @@ -95,9 +83,6 @@ private bool IsPreconsolidationStressDataRequired() { - Contract.Requires(model.SoilProfile != null); - Contract.Requires(Contract.ForAll(model.SoilProfile.Surfaces, d => d.Soil != null)); - return model.SoilProfile.Surfaces.Any(s => s.Soil.ShearStrengthModel == ShearStrengthModel.CuCalculated && !s.Soil.UsePop); } @@ -117,9 +102,6 @@ private void ValidateDataInsideProfileBounds(ICollection validationMessages) { - Contract.Requires(model.SoilProfile != null); - Contract.Requires(model.SoilProfile.PreconsolidationStresses != null); - if (model.SoilProfile.PreconsolidationStresses.Any(PreConsolidationStressOutsideSoilProfileBounds)) { var translate = this.Translate("Validation::PreconsolidationStressOutOfBounds_LocationName{0}"); @@ -133,15 +115,10 @@ } } - [Pure] private bool PreConsolidationStressOutsideSoilProfileBounds(PreConsolidationStress preConsolidationStress) { - Contract.Requires(model.SurfaceLine2 != null); - Contract.Requires(preConsolidationStress != null); - var heightAtXcoordinate = model.SurfaceLine2.Geometry.GetZAtX(preConsolidationStress.X); - Contract.Assume(!double.IsNaN(heightAtXcoordinate)); - + return heightAtXcoordinate < preConsolidationStress.Z; } @@ -153,20 +130,13 @@ } } - [Pure] private bool PreConsolidationDataAvailableForSoilProfile() { - Contract.Requires(model != null); - Contract.Requires(model.SoilProfile.PreconsolidationStresses != null); - return model.SoilProfile.PreconsolidationStresses.Any(); } private void ValidateDataNotOnLayerBoundary(ICollection validationMessages) { - Contract.Requires(model.SoilProfile != null); - Contract.Requires(model.SoilProfile.PreconsolidationStresses != null); - if (model.SoilProfile.PreconsolidationStresses.Any(PreConsolidationStressOnLayerBoundary)) { var translate = this.Translate("Validation::PreconsolidationStressOnLayerBoundary_LocationName{0}"); @@ -180,12 +150,8 @@ } } - [Pure] private bool PreConsolidationStressOnLayerBoundary(PreConsolidationStress preConsolidationStress) { - Contract.Requires(model.Geometry != null); - Contract.Requires(preConsolidationStress != null); - bool result = false; Point3D point = new Point3D { Index: dam classic/trunk/src/Dam/Data/NonWaterRetainingObjectInSurfaceLine.cs =================================================================== diff -u -r190 -r230 --- dam classic/trunk/src/Dam/Data/NonWaterRetainingObjectInSurfaceLine.cs (.../NonWaterRetainingObjectInSurfaceLine.cs) (revision 190) +++ dam classic/trunk/src/Dam/Data/NonWaterRetainingObjectInSurfaceLine.cs (.../NonWaterRetainingObjectInSurfaceLine.cs) (revision 230) @@ -1,8 +1,5 @@ using System; -using System.Diagnostics.Contracts; - using Deltares.Geometry; -using Deltares.Geotechnics; using Deltares.Geotechnics.SurfaceLines; namespace Deltares.Dam.Data Index: dam classic/trunk/src/MacroStability/Data/StabilityInwardsCalculation.cs =================================================================== diff -u -r190 -r230 --- dam classic/trunk/src/MacroStability/Data/StabilityInwardsCalculation.cs (.../StabilityInwardsCalculation.cs) (revision 190) +++ dam classic/trunk/src/MacroStability/Data/StabilityInwardsCalculation.cs (.../StabilityInwardsCalculation.cs) (revision 230) @@ -1,12 +1,8 @@ using System; using System.Collections.Generic; -using System.Diagnostics.Contracts; using System.Linq; - using Deltares.AssessmentMechanism; -using Deltares.Geotechnics; using Deltares.Geotechnics.Soils; -using Deltares.Standard; using Deltares.Standard.Attributes; using Deltares.Standard.Language; using Deltares.Standard.Logging; @@ -30,8 +26,6 @@ /// public override AssessmentCalculationResult Execute(DikeLocationInfo dikeLocationInfo) { - Contract.Assume(dikeLocationInfo is StabilityDikeLocationInfo); - LogManager.Messages.Clear(); var stabilityDikeLocationInfo = (StabilityDikeLocationInfo) dikeLocationInfo; @@ -80,8 +74,6 @@ internal double CalculateFactorOfSafetyBasedOnModelUncertainty(double modelFactor, SlidingCurve resultCurve) { - Contract.Assume(modelFactor > 0.0); - resultCurve.SafetyFactor = resultCurve.SafetyFactor/modelFactor; return resultCurve.SafetyFactor; @@ -112,9 +104,6 @@ /// Resulting sliding curve internal SlidingCurve RunSpencerHigh(StabilityDikeLocationInfo locationInfo) { - Contract.Requires(locationInfo.StabilityModel != null); - Contract.Ensures(Contract.Result() != null); - locationInfo.StabilityModel.SlipPlanePosition = SlipPlanePosition.High; return RunSpencer(locationInfo); @@ -127,9 +116,6 @@ /// Resulting sliding curve internal SlidingCurve RunSpencerLow(StabilityDikeLocationInfo locationInfo) { - Contract.Requires(locationInfo.StabilityModel != null); - Contract.Ensures(Contract.Result() != null); - locationInfo.StabilityModel.SlipPlanePosition = SlipPlanePosition.Low; return RunSpencer(locationInfo); @@ -142,9 +128,6 @@ /// internal SlidingCurve RunSpencer(StabilityDikeLocationInfo locationInfo) { - Contract.Requires(locationInfo.StabilityModel != null); - Contract.Ensures(Contract.Result() != null); - SetSpencerSettings(locationInfo); //Run Index: dam classic/trunk/src/Deltares.DeltaModel/DeltaModelFactory.cs =================================================================== diff -u -r190 -r230 --- dam classic/trunk/src/Deltares.DeltaModel/DeltaModelFactory.cs (.../DeltaModelFactory.cs) (revision 190) +++ dam classic/trunk/src/Deltares.DeltaModel/DeltaModelFactory.cs (.../DeltaModelFactory.cs) (revision 230) @@ -1,10 +1,8 @@ using System; using System.Collections; using System.Collections.Generic; -using System.Diagnostics.Contracts; using System.Drawing; using System.Linq; -using Deltares.Geotechnics; using Deltares.Geotechnics.Soils; using Deltares.Geotechnics.SurfaceLines; using Deltares.Probabilistic; @@ -199,8 +197,6 @@ protected virtual object CreateItem(string key, Enum subType, Type type) { - Contract.Requires(type != null); - var newItem = Activator.CreateInstance(type); if (newItem is IIdentifier) Index: dam classic/trunk/src/GeoTechnics/WaternetCreator/PlLineCreator/WaternetCreatorWTI.cs =================================================================== diff -u -r190 -r230 --- dam classic/trunk/src/GeoTechnics/WaternetCreator/PlLineCreator/WaternetCreatorWTI.cs (.../WaternetCreatorWTI.cs) (revision 190) +++ dam classic/trunk/src/GeoTechnics/WaternetCreator/PlLineCreator/WaternetCreatorWTI.cs (.../WaternetCreatorWTI.cs) (revision 230) @@ -21,7 +21,6 @@ using System; using System.Collections.Generic; -using System.Diagnostics.Contracts; using System.Linq; using Deltares.Geometry; using Deltares.Geotechnics.Soils; @@ -218,7 +217,6 @@ return location.Validate().Where(v => v.MessageType == ValidationResultType.Error).ToArray().Length == 0; } - [Pure] private bool HasWaterLevel(Location location) { return !double.IsNaN(location.WaterLevelRiver); Index: dam classic/trunk/src/Stability/StabilityDikeLocationInfo.cs =================================================================== diff -u -r190 -r230 --- dam classic/trunk/src/Stability/StabilityDikeLocationInfo.cs (.../StabilityDikeLocationInfo.cs) (revision 190) +++ dam classic/trunk/src/Stability/StabilityDikeLocationInfo.cs (.../StabilityDikeLocationInfo.cs) (revision 230) @@ -2,7 +2,6 @@ using System.Collections; using System.Collections.Generic; using System.ComponentModel; -using System.Diagnostics.Contracts; using System.Linq; using System.Xml.Serialization; @@ -729,8 +728,6 @@ /// public void ApplySettings() { - Contract.Requires(Settings != null); - StabilityModel.SlipPlaneConstraints.CreateZones = Settings.CreateZones; StabilityModel.MaximumSliceWidth = Settings.MaximumSlideWidth; StabilityModel.SlipPlaneConstraints.SlipPlaneMinDepth = Settings.MinimalPlaneDepth; Index: dam classic/trunk/src/MacroStability/Data/SmoothSlidingPlaneValidator.cs =================================================================== diff -u -r190 -r230 --- dam classic/trunk/src/MacroStability/Data/SmoothSlidingPlaneValidator.cs (.../SmoothSlidingPlaneValidator.cs) (revision 190) +++ dam classic/trunk/src/MacroStability/Data/SmoothSlidingPlaneValidator.cs (.../SmoothSlidingPlaneValidator.cs) (revision 230) @@ -1,6 +1,4 @@ using System; -using System.Diagnostics.Contracts; -using Deltares.Standard; using Deltares.Standard.Logging; namespace Deltares.Stability.Calculation2 @@ -65,8 +63,6 @@ /// internal SpencerEvaluationValues EvaluateSpencerResults(SlidingPlane slidingPlane) { - Contract.Requires(slidingPlane != null); - var result = new SpencerEvaluationValues { PercentageForcePointsInSlices = GetPercentageForcePointsInSlices(slidingPlane), @@ -81,18 +77,12 @@ private bool AreSpencerEvaluationResultsAcceptable(SpencerEvaluationValues spencerEvaluationValues) { - Contract.Requires(!double.IsNaN(spencerEvaluationValues.MaxDifferenceAngleInDegreesBetweenSlices)); - Contract.Requires(!double.IsNaN(spencerEvaluationValues.PercentageForcePointsInSlices)); - return spencerEvaluationValues.MaxDifferenceAngleInDegreesBetweenSlices <= allowedMaxAngleBetweenSlices && spencerEvaluationValues.PercentageForcePointsInSlices/100 >= requiredMinPercForcePointsInSlices; } private double GetMaxDifferenceAngleInDegreesBetweenSlices(SlidingPlane slidingPlane) { - Contract.Requires(slidingPlane != null); - Contract.Requires(slidingPlane.Slices != null); - var maxAngle = 0.0; for (int i = 1; i < slidingPlane.Slices.Count; i++) { @@ -114,9 +104,6 @@ private double GetPercentageForcePointsInSlices(SlidingPlane slidingPlane) { - Contract.Requires(slidingPlane != null); - Contract.Requires(slidingPlane.Slices != null); - double slicesTotal = slidingPlane.Slices.Count; var result = 100.0; Index: dam classic/trunk/src/Deltares.AssessmentMechanism/DikeLocationInfo.cs =================================================================== diff -u -r190 -r230 --- dam classic/trunk/src/Deltares.AssessmentMechanism/DikeLocationInfo.cs (.../DikeLocationInfo.cs) (revision 190) +++ dam classic/trunk/src/Deltares.AssessmentMechanism/DikeLocationInfo.cs (.../DikeLocationInfo.cs) (revision 230) @@ -2,7 +2,6 @@ using System.Collections; using System.Collections.Generic; using System.ComponentModel; -using System.Diagnostics.Contracts; using System.Linq; using System.Xml.Serialization; using Deltares.DeltaModel; @@ -601,8 +600,6 @@ /// if set to true [begin p]. TODO: Comment: what is beginP? public void UpdateDikeSection(DikeSection dikeSection, double offset, bool beginP) { - Contract.Requires(dikeSection != null); - var newSection = dikeSection; if (beginP) { Index: dam classic/trunk/src/GeoTechnics/WaternetCreator/PlLineCreator/PlLinesCreatorWTI.cs =================================================================== diff -u -r190 -r230 --- dam classic/trunk/src/GeoTechnics/WaternetCreator/PlLineCreator/PlLinesCreatorWTI.cs (.../PlLinesCreatorWTI.cs) (revision 190) +++ dam classic/trunk/src/GeoTechnics/WaternetCreator/PlLineCreator/PlLinesCreatorWTI.cs (.../PlLinesCreatorWTI.cs) (revision 230) @@ -21,10 +21,8 @@ using System; using System.Collections.Generic; -using System.Diagnostics.Contracts; using System.Linq; using Deltares.Geometry; -using Deltares.Geotechnics; using Deltares.Geotechnics.Soils; using Deltares.Geotechnics.SurfaceLines; using Deltares.Standard.Extensions; Index: dam classic/trunk/src/Stability/MissingPreconsolidationStressRepairer.cs =================================================================== diff -u -r190 -r230 --- dam classic/trunk/src/Stability/MissingPreconsolidationStressRepairer.cs (.../MissingPreconsolidationStressRepairer.cs) (revision 190) +++ dam classic/trunk/src/Stability/MissingPreconsolidationStressRepairer.cs (.../MissingPreconsolidationStressRepairer.cs) (revision 230) @@ -1,7 +1,4 @@ -using System.Diagnostics.Contracts; -using Deltares.Geotechnics; using Deltares.Geotechnics.Soils; -using Deltares.Standard; using Deltares.Standard.Language; using Deltares.Standard.Validation; @@ -21,8 +18,6 @@ public void Repair(object subject, string property, string id) { - CheckPreconditions(subject, property, id); - var model = (StabilityModel) subject; if (model.SoilProfile.PreconsolidationStresses.Count == 0) @@ -33,21 +28,7 @@ public string GetRepairDescription(object subject, string property, string id) { - CheckPreconditions(subject, property, id); - return this.Translate("MissingPreconsolidationStressRepairerDescription"); - } - - /// - /// Checks the preconditions for this class. - /// - /// The object to be repaired. - /// The relevant property. - /// The identifier for the type of problem. - private static void CheckPreconditions(object subject, string property, string id) - { - Contract.Requires(subject is StabilityModel); - Contract.Requires(id == NoPreconsolidationStressDataId); - } + } } } \ No newline at end of file Index: dam classic/trunk/src/Dam/Forms/DamPlugin.cs =================================================================== diff -u -r190 -r230 --- dam classic/trunk/src/Dam/Forms/DamPlugin.cs (.../DamPlugin.cs) (revision 190) +++ dam classic/trunk/src/Dam/Forms/DamPlugin.cs (.../DamPlugin.cs) (revision 230) @@ -22,12 +22,9 @@ using Deltares.Dam.Data.License; using Deltares.Dam.Data.Sensors; using Deltares.Dam.Data.UISupport; -using Deltares.Geotechnics; -using Deltares.Geotechnics.IO; using Deltares.Geotechnics.Mechanisms; using Deltares.Geotechnics.Soils; using Deltares.Geotechnics.SurfaceLines; -using Deltares.Stability; using Deltares.Standard; using Deltares.Standard.Attributes; using Deltares.Standard.Calculate; @@ -36,7 +33,6 @@ using Deltares.Standard.Forms; using Deltares.Standard.Forms.DExpress; using Deltares.Standard.Forms.Maps; -using Deltares.Standard.IO; using Deltares.Standard.IO.Xml; using Deltares.Standard.Language; using Deltares.Standard.Logging; Index: dam classic/trunk/src/GeoTechnics/WaternetCreator/PlLineCreator/PlLinesCreator.cs =================================================================== diff -u -r190 -r230 --- dam classic/trunk/src/GeoTechnics/WaternetCreator/PlLineCreator/PlLinesCreator.cs (.../PlLinesCreator.cs) (revision 190) +++ dam classic/trunk/src/GeoTechnics/WaternetCreator/PlLineCreator/PlLinesCreator.cs (.../PlLinesCreator.cs) (revision 230) @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Diagnostics.Contracts; using System.Linq; using Deltares.Geometry; using Deltares.Geotechnics.Soils; @@ -423,8 +422,6 @@ /// PL1 (= phreatic level) public GeometryPointString CreatePLLine1ByExpertKnowledge(Location location) { - Contract.Requires(!double.IsNaN(Inwards || location.PlLineCreationMethod == PlLineCreationMethod.RingtoetsWti2017 ? location.WaterLevelRiver : location.WaterLevelRiverLow)); - /*this validation is carried out within location*/ //ValidateSurfaceLine(location.Surfaceline); //ValidateRequiredCharacteristicPoints(location.Surfaceline); Index: dam classic/trunk/src/Stability/StabilityModel.cs =================================================================== diff -u -r190 -r230 --- dam classic/trunk/src/Stability/StabilityModel.cs (.../StabilityModel.cs) (revision 190) +++ dam classic/trunk/src/Stability/StabilityModel.cs (.../StabilityModel.cs) (revision 230) @@ -2,7 +2,6 @@ using System.Collections; using System.Collections.Generic; using System.ComponentModel; -using System.Diagnostics.Contracts; using System.Linq; using System.Xml.Serialization; using Deltares.Geometry; @@ -4645,11 +4644,6 @@ { return; } - - Contract.Assume(SlipCircle != null); - Contract.Assume(rtoCalculationgrid.SurfaceLine.Geometry.Count > 0); - Contract.Assume(rtoCalculationgrid.SurfaceLine.CharacteristicPoints.Count > 0); - rtoCalculationgrid.CreateGrid(this); } @@ -4814,11 +4808,7 @@ { return; } - - Contract.Assume(SlipCircle != null); - Contract.Assume(rtoCalculationgrid.SurfaceLine.Geometry.Count > 0); - Contract.Assume(rtoCalculationgrid.SurfaceLine.CharacteristicPoints.Count > 0); - + if (CalculationModel == CalculationModel.RTO || CalculationModel == CalculationModel.WBI) { Delayed.Invoke(UpdateAutomaticDefinitions);