Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapperTests.cs =================================================================== diff -u -r999 -r1001 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapperTests.cs (.../DamMacroStabilityOutwardsKernelWrapperTests.cs) (revision 999) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapperTests.cs (.../DamMacroStabilityOutwardsKernelWrapperTests.cs) (revision 1001) @@ -48,7 +48,7 @@ [Test] - public void TestObsloteCalculationForProcess() + public void TestObsoleteCalculationForProcess() { // expected is that preparation of this calculation is not done. var absoluteFolder = Path.GetFullPath(Path.Combine(Directory.GetCurrentDirectory(), testFolder)); @@ -85,7 +85,6 @@ IKernelDataInput damStabilityInput; IKernelDataOutput kernelOutput; var result = kernelWrapper.Prepare(damKernelInput, 0, out damStabilityInput, out kernelOutput); - Assert.AreEqual(result, PrepareResult.NotRelevant); } @@ -150,12 +149,9 @@ } [Test] - [Category(Categories.WorkInProgress)] - public void TestFullCalculationForProcess2() + public void TestValidate() { - // expected results are based on first run of this test as the actual values are irrelevant. - const double diff = 0.01; - + // expected result is one message var absoluteFolder = Path.GetFullPath(Path.Combine(Directory.GetCurrentDirectory(), testFolder)); var workingDir = Path.Combine(absoluteFolder, "FullOut"); // Relative paths in ini file do not work yet in DGeoStability 16.2. This is fixed in 18.1. @@ -176,12 +172,12 @@ GridPosition = MStabGridPosition.Left, SearchMethod = MStabSearchMethod.Grid, ZonesType = MStabZonesType.ZoneAreas, - CalculationOptions = + ZoneAreas = new MStabZoneAreas() { - MinimalCircleDepth = 1.0 - // #BKA: HAS NO USE, IS RESET BY Scenario.Location.StabilityOptions.MinimalCircleDepth - // WHEN WRITING MSTABXMLDOC. ZONEAREA SETTING IS NOT RESET (WHY??? I DO NOT KNOW) - } + DikeTableHeight = -1.70, + DikeTableWidth = 3, + XCoordinateStartRestProfile = 10 + } }, ProjectWorkingPath = workingDir }; @@ -199,34 +195,28 @@ // Validate the input List messages; kernelWrapper.Validate(damStabilityInput, kernelOutput, out messages); - Assert.AreEqual(0, messages.Count); - - // Run the dll For now outcomented as are test lines. This because DGS 16.2 contains an error which halts the execution, freezing this test. - //kernelWrapper.Execute(damStabilityInput, kernelOutput, out messages); - DamMacroStabilityOutput damMacroStabilityOutput = (DamMacroStabilityOutput)kernelOutput; - Assert.AreEqual(0, messages.Count); -// Assert.AreEqual(7.017, damMacroStabilityOutput.StabilityOutputItems[0].Zone1Results.SafetyFactor, diff); -// Assert.IsNull(damMacroStabilityOutput.StabilityOutputItems[0].Zone2Results); -// -// // Fill the design results -// List results; -// kernelWrapper.PostProcess(damKernelInput, damMacroStabilityOutput, "", out results); -// Assert.AreEqual(7.017, results[0].StabilityDesignResults.SafetyFactor, diff); -// Assert.AreEqual("", results[0].StabilityDesignResults.ResultMessage); -// Assert.AreEqual(CalculationResult.Succeeded, results[0].CalculationResult); + // Outside in combination with ZoneTypes = areas is not allowed so 1 error expected. + Assert.AreEqual(1, messages.Count); + Assert.AreEqual(LogMessageType.Error, messages[0].MessageType); } private static DamKernelInput CreateDamKernelInput(bool realOut = false) { var soilDbName = Path.Combine(testFolder, "soilmaterials.mdb"); var soilGeometry2DName = "1D1.sti"; + var line = FactoryForSurfaceLines.CreateSurfaceLineTutorial1(); + var location = new Location(); if (realOut) { soilDbName = Path.Combine(testFolder, "soilmaterialsOutwards.mdb"); soilGeometry2DName = "OutwardsZones.sti"; + foreach (var characteristicPoint in line.CharacteristicPoints) + { + characteristicPoint.Z = characteristicPoint.Z - 3; + } + location.PolderLevel = -11; } - var line = FactoryForSurfaceLines.CreateSurfaceLineTutorial1(); - var location = new Location(); + var scenario = DamMacroStabilityTestHelper.CreateScenarioForLocation(location, line); scenario.Location.StabilityOptions = new StabilityOptions { @@ -242,8 +232,14 @@ SoilProfileType = SoilProfileType.ProfileTypeStiFile, SegmentFailureMechanismType = FailureMechanismSystemType.StabilityOutside }; - var damKernelInput = new DamKernelInput + var damFailureMechanismeCalculationSpecification = new DamFailureMechanismeCalculationSpecification() { + FailureMechanismSystemType = FailureMechanismSystemType.StabilityOutside, + StabilityModelType = MStabModelType.Bishop + }; + var damKernelInput = new DamKernelInput + { + DamFailureMechanismeCalculationSpecification = damFailureMechanismeCalculationSpecification, Location = location, DesignScenario = scenario, SubSoilScenario = subSoilScenario @@ -324,30 +320,8 @@ return null; } } - + [Test] - public void TestValidate() - { - var kernelWrapper = new DamMacroStabilityOutwardsKernelWrapper(); - - // Validate without setting values. Expected error messages. - var damStabilityInput = new DamMacroStabilityInput(); - List messages; - // Validate is not implemented (yet), returns always true - kernelWrapper.Validate(damStabilityInput, null, out messages); -// Assert.IsTrue(messages.Count > 0); - - // Validate the input when valid input is provided. Expected no messages. - damStabilityInput = new DamMacroStabilityInput - { - // ToDo zant Fill input - }; - messages.Clear(); - kernelWrapper.Validate(damStabilityInput, null, out messages); - Assert.AreEqual(0, messages.Count); - } - - [Test] public void TestPostProcess() { var kernelWrapper = new DamMacroStabilityOutwardsKernelWrapper(); Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/DamMacroStabilityTestHelper.cs =================================================================== diff -u -r925 -r1001 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/DamMacroStabilityTestHelper.cs (.../DamMacroStabilityTestHelper.cs) (revision 925) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/DamMacroStabilityTestHelper.cs (.../DamMacroStabilityTestHelper.cs) (revision 1001) @@ -83,17 +83,17 @@ }; soilList.Soils.Add(s8); - var s9 = new Soil("Del_Ppp") + var s9 = new Soil("Del_Tfg") { AbovePhreaticLevel = 10.15, BelowPhreaticLevel = 10.20 }; soilList.Soils.Add(s9); - var s10 = new Soil("Del_Tcs_1") + var s10 = new Soil("Del_Tss_1") { - AbovePhreaticLevel = 16.05, - BelowPhreaticLevel = 17.74 + AbovePhreaticLevel = 14.46, + BelowPhreaticLevel = 14.50 }; soilList.Soils.Add(s10); @@ -118,6 +118,19 @@ }; soilList.Soils.Add(s13); + var s14 = new Soil("DeL_Tcs") + { + AbovePhreaticLevel = 16.05, + BelowPhreaticLevel = 17.74 + }; + soilList.Soils.Add(s14); + + var s15 = new Soil("Del_Ppp") + { + AbovePhreaticLevel = 18, + BelowPhreaticLevel = 20 + }; + soilList.Soils.Add(s15); soilList.AquiferDictionary = new Dictionary(); soilList.AquiferDictionary.Add(s1, false); soilList.AquiferDictionary.Add(s2, false); @@ -132,6 +145,8 @@ soilList.AquiferDictionary.Add(s11, false); soilList.AquiferDictionary.Add(s12, false); soilList.AquiferDictionary.Add(s13, true); + soilList.AquiferDictionary.Add(s14, false); + soilList.AquiferDictionary.Add(s15, false); return soilList; } Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/TestData/OutwardsZones.sti =================================================================== diff -u -r925 -r1001 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/TestData/OutwardsZones.sti (.../OutwardsZones.sti) (revision 925) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/TestData/OutwardsZones.sti (.../OutwardsZones.sti) (revision 1001) @@ -2,10 +2,10 @@ ============================================================================== COMPANY : Stichting Deltares LICENSE : Unknown -DATE : 1/9/2018 -TIME : 5:33:16 PM -FILENAME : D:\MWDAM-1057\Loc(RK214-200)_Sce(1)_Pro(Segment_1_1D36)_Ite(0).sti -CREATED BY : D-Geo Stability version 16.2.2.900 +DATE : 1/19/2018 +TIME : 5:09:58 PM +FILENAME : D:\MWDAM-1057\Invoer DAM\Actualisatie.Calc\Stability\Bishop\Loc(RK210-560)_Sce(1)_Pro(Segment_1_1D1).sti +CREATED BY : D-Geo Stability version 16.2.1.4 ========================== BEGINNING OF DATA ========================== [VERSION] Soil=1002 @@ -17,7 +17,7 @@ [END OF VERSION] [SOIL COLLECTION] - 7 = number of items + 8 = number of items [SOIL] veen SoilColor=536870911 @@ -108,22 +108,22 @@ SoilDistCuGradient=3 [END OF SOIL] [SOIL] -DeL_Ppp +DeL_Tss_1 SoilColor=536870911 -SoilSoilType=4 +SoilSoilType=3 SoilUseSoilType=0 SoilExcessPorePressure=0.00 SoilPorePressureFactor=1.00 -SoilGamDry=10.15 -SoilGamWet=10.20 -SoilRestSlope=1 +SoilGamDry=16.05 +SoilGamWet=17.74 +SoilRestSlope=0 SoilCohesion=0.00 SoilPhi=0.00 SoilDilatancy=0.00 SoilCuTop=0.00 SoilCuBottom=0.00 SoilCuGradient=0.00 -SoilStressTableName=Veen +SoilStressTableName=Klei_Calais SoilBondStressTableName= SoilMatStrengthType=2 SoilProbInputValues=0 @@ -197,7 +197,96 @@ SoilDistCuGradient=3 [END OF SOIL] [SOIL] -DeL_Tcs_1 +DeL_Tfg +SoilColor=536870911 +SoilSoilType=3 +SoilUseSoilType=0 +SoilExcessPorePressure=0.00 +SoilPorePressureFactor=1.00 +SoilGamDry=14.46 +SoilGamWet=14.50 +SoilRestSlope=0 +SoilCohesion=0.00 +SoilPhi=0.00 +SoilDilatancy=0.00 +SoilCuTop=0.00 +SoilCuBottom=0.00 +SoilCuGradient=0.00 +SoilStressTableName=Klei_Calais +SoilBondStressTableName= +SoilMatStrengthType=2 +SoilProbInputValues=0 +SoilRatioCuPc=0.00 +SoilStrengthIncreaseExponent=0.80 +SoilPc=0.00E+00 +SoilPOP=0.00 +SoilRheologicalCoefficient=0.00 +SoilXCoorSoilPc=-100.000 +SoilYCoorSoilPc=-100.000 +SoilIsPopCalculated=0 +SoilIsOCRCalculated=0 +SoilIsAquifer=0 +SoilUseProbDefaults=1 +SoilStdCohesion=0.00 +SoilStdPhi=0.00 +SoilStdRatioCuPc=0.00 +SoilStdRatioCuPcPassive=0.00 +SoilStdRatioCuPcActive=0.00 +SoilStdCu=0.00 +SoilStdCuTop=0.00 +SoilStdCuGradient=0.00 +SoilStdPn=0.00 +SoilDistCohesion=3 +SoilDistPhi=3 +SoilDistStressTable=3 +SoilDistRatioCuPc=3 +SoilDistRatioCuPcPassive=3 +SoilDistRatioCuPcActive=3 +SoilDistCu=3 +SoilDistCuTop=3 +SoilDistCuGradient=3 +SoilDistPn=3 +SoilCorrelationCPhi=0.00 +SoilRatioCuPcPassive=0.00 +SoilRatioCuPcActive=0.00 +SoilCuPassiveTop=0.00 +SoilCuPassiveBottom=0.00 +SoilCuActiveTop=0.00 +SoilCuActiveBottom=0.00 +SoilUniformRatioCuPc=1 +SoilUniformCu=1 +SoilDesignPartialCohesion=1.25 +SoilDesignStdCohesion=-1.65 +SoilDesignPartialPhi=1.10 +SoilDesignStdPhi=-1.65 +SoilDesignPartialStressTable=1.15 +SoilDesignStdStressTable=-1.65 +SoilDesignPartialRatioCuPc=1.15 +SoilDesignStdRatioCuPc=-1.65 +SoilDesignPartialCu=1.15 +SoilDesignStdCu=-1.65 +SoilDesignPartialPOP=1.10 +SoilDesignStdPOP=-1.65 +SoilDesignPartialRRatio=1.00 +SoilDesignStdRRatio=0.00 +SoilSoilGroup=0 +SoilStdPOP=0.00 +SoilDistPOP=2 +SoilHorFluctScaleCoh=0.00 +SoilVertFluctScaleCoh=0.00 +SoilNumberOfTestsCoh=0 +SoilVarianceRatioCoh=0.00 +SoilHorFluctScalePhi=0.00 +SoilVertFluctScalePhi=0.00 +SoilNumberOfTestsPhi=0 +SoilVarianceRatioPhi=0.00 +SoilRRatio=0.0000001 +SoilDistCu=3 +SoilDistCuTop=3 +SoilDistCuGradient=3 +[END OF SOIL] +[SOIL] +DeL_Tcs SoilColor=16777215 SoilSoilType=3 SoilUseSoilType=0 @@ -225,7 +314,7 @@ SoilYCoorSoilPc=-100.000 SoilIsPopCalculated=0 SoilIsOCRCalculated=0 -SoilIsAquifer=0 +SoilIsAquifer=1 SoilUseProbDefaults=1 SoilStdCohesion=0.00 SoilStdPhi=0.00 @@ -649,123 +738,117 @@ [END OF ACCURACY] [POINTS] - 91 - Number of geometry points - - 1 0.000 -2.650 0.000 - 2 0.376 -2.820 0.000 - 3 0.807 -2.820 0.000 - 4 1.396 -2.800 0.000 - 5 1.863 -2.850 0.000 - 6 2.430 -3.120 0.000 - 7 2.883 -3.270 0.000 - 8 3.188 -3.340 0.000 - 9 3.698 -3.500 0.000 - 10 4.272 -3.650 0.000 - 11 4.740 -3.780 0.000 - 12 5.300 -3.820 0.000 - 13 5.874 -3.680 0.000 - 14 6.285 -3.600 0.000 - 15 6.802 -3.630 0.000 - 16 7.213 -3.530 0.000 - 17 7.709 -3.330 0.000 - 18 8.148 -3.070 0.000 - 19 8.665 -3.070 0.000 - 20 9.254 -3.280 0.000 - 21 9.764 -2.930 0.000 - 22 10.182 -2.780 0.000 - 23 10.784 -2.440 0.000 - 24 10.876 -2.380 0.000 - 25 11.315 -1.950 0.000 - 26 11.657 -1.849 0.000 - 27 12.024 -1.740 0.000 - 28 12.373 -1.779 0.000 - 29 12.740 -1.820 0.000 - 30 13.448 -1.850 0.000 - 31 14.157 -2.000 0.000 - 32 14.873 -2.170 0.000 - 33 15.574 -2.530 0.000 - 34 16.283 -2.850 0.000 - 35 16.998 -2.980 0.000 - 36 17.707 -3.040 0.000 - 37 18.415 -3.060 0.000 - 38 19.131 -3.070 0.000 - 39 19.840 -3.090 0.000 - 40 20.548 -3.050 0.000 - 41 21.256 -3.200 0.000 - 42 21.965 -3.340 0.000 - 43 22.674 -3.460 0.000 - 44 23.389 -3.680 0.000 - 45 24.098 -3.970 0.000 - 46 24.807 -4.050 0.000 - 47 25.522 -4.110 0.000 - 48 26.231 -4.170 0.000 - 49 26.932 -4.240 0.000 - 50 27.647 -4.270 0.000 - 51 28.356 -4.320 0.000 - 52 29.065 -4.320 0.000 - 53 29.774 -4.360 0.000 - 54 30.489 -4.360 0.000 - 55 31.198 -4.400 0.000 - 56 31.907 -4.380 0.000 - 57 0.000 -45.000 0.000 - 58 31.907 -45.000 0.000 - 59 0.000 -3.500 0.000 - 60 0.000 -7.000 0.000 - 61 31.907 -7.000 0.000 - 62 0.000 -15.000 0.000 - 63 31.907 -15.000 0.000 - 64 0.000 -25.000 0.000 - 65 31.907 -25.000 0.000 - 66 7.287 -3.500 0.000 - 67 11.264 -2.000 0.000 - 68 22.804 -3.500 0.000 - 69 0.000 -2.520 0.000 - 70 10.642 -2.520 0.000 - 71 11.315 -2.320 0.000 - 72 14.873 -2.320 0.000 - 73 16.998 -3.180 0.000 - 74 24.098 -4.170 0.000 - 75 24.807 -4.250 0.000 - 76 25.522 -4.310 0.000 - 77 26.231 -4.370 0.000 - 78 26.932 -4.440 0.000 - 79 27.647 -4.470 0.000 - 80 28.356 -4.520 0.000 - 81 29.065 -4.520 0.000 - 82 29.774 -4.560 0.000 - 83 30.489 -4.560 0.000 - 84 31.198 -4.600 0.000 - 85 31.907 -4.580 0.000 - 86 0.000 -45.000 0.000 - 87 31.907 -45.000 0.000 - 88 0.000 -7.000 0.000 - 89 31.907 -7.000 0.000 - 90 0.000 -45.000 0.000 - 91 31.907 -45.000 0.000 + 85 - Number of geometry points - + 1 0.000 -2.770 0.000 + 2 0.519 -2.990 0.000 + 3 0.968 -3.160 0.000 + 4 1.502 -3.350 0.000 + 5 1.993 -3.460 0.000 + 6 2.413 -3.530 0.000 + 7 2.905 -3.700 0.000 + 8 3.454 -3.710 0.000 + 9 3.894 -3.530 0.000 + 10 4.294 -3.550 0.000 + 11 4.848 -3.580 0.000 + 12 5.455 -3.490 0.000 + 13 6.024 -3.330 0.000 + 14 6.529 -3.150 0.000 + 15 6.858 -3.050 0.000 + 16 7.491 -3.010 0.000 + 17 7.861 -2.980 0.000 + 18 8.281 -2.940 0.000 + 19 8.879 -2.910 0.000 + 20 8.950 -2.905 0.000 + 21 9.279 -2.880 0.000 + 22 9.798 -2.830 0.000 + 23 10.160 -2.600 0.000 + 24 10.382 -2.380 0.000 + 25 10.738 -1.990 0.000 + 26 11.079 -1.889 0.000 + 27 11.449 -1.780 0.000 + 28 12.161 -1.700 0.000 + 29 12.873 -1.690 0.000 + 30 13.579 -1.710 0.000 + 31 14.291 -1.770 0.000 + 32 15.002 -1.910 0.000 + 33 15.714 -2.020 0.000 + 34 16.420 -2.310 0.000 + 35 17.132 -2.440 0.000 + 36 17.844 -2.560 0.000 + 37 18.549 -2.710 0.000 + 38 19.261 -2.860 0.000 + 39 19.973 -2.980 0.000 + 40 20.685 -3.130 0.000 + 41 21.382 -3.230 0.000 + 42 22.094 -3.380 0.000 + 43 22.806 -3.480 0.000 + 44 23.518 -3.600 0.000 + 45 24.223 -3.700 0.000 + 46 24.935 -3.750 0.000 + 47 25.647 -3.820 0.000 + 48 26.359 -3.910 0.000 + 49 27.064 -3.940 0.000 + 50 27.776 -4.060 0.000 + 51 28.488 -4.280 0.000 + 52 29.200 -4.220 0.000 + 53 29.905 -4.240 0.000 + 54 30.617 -4.260 0.000 + 55 31.329 -4.270 0.000 + 56 0.000 -45.000 0.000 + 57 31.329 -45.000 0.000 + 58 0.000 -5.000 0.000 + 59 31.329 -5.000 0.000 + 60 0.000 -5.500 0.000 + 61 31.329 -5.500 0.000 + 62 0.000 -12.000 0.000 + 63 31.329 -12.000 0.000 + 64 0.000 -15.000 0.000 + 65 31.329 -15.000 0.000 + 66 0.000 -25.000 0.000 + 67 31.329 -25.000 0.000 + 68 10.729 -2.000 0.000 + 69 15.585 -2.000 0.000 + 70 0.000 -2.520 0.000 + 71 10.241 -2.520 0.000 + 72 11.079 -2.320 0.000 + 73 14.291 -2.320 0.000 + 74 27.776 -4.260 0.000 + 75 28.488 -4.480 0.000 + 76 29.200 -4.420 0.000 + 77 29.905 -4.440 0.000 + 78 30.617 -4.460 0.000 + 79 31.329 -4.470 0.000 + 80 0.000 -45.000 0.000 + 81 31.329 -45.000 0.000 + 82 0.000 -3.651 0.000 + 83 31.329 -3.651 0.000 + 84 0.000 -3.651 0.000 + 85 31.329 -3.651 0.000 [END OF POINTS] [CURVES] - 84 - Number of curves - + 75 - Number of curves - 1 - Curve number 2 - number of points on curve, next line(s) are pointnumbers - 57 58 + 56 57 2 - Curve number 2 - number of points on curve, next line(s) are pointnumbers - 67 31 + 68 69 3 - Curve number 2 - number of points on curve, next line(s) are pointnumbers - 59 9 + 58 59 4 - Curve number 2 - number of points on curve, next line(s) are pointnumbers - 66 68 + 60 61 5 - Curve number 2 - number of points on curve, next line(s) are pointnumbers - 60 61 + 62 63 6 - Curve number 2 - number of points on curve, next line(s) are pointnumbers - 62 63 + 64 65 7 - Curve number 2 - number of points on curve, next line(s) are pointnumbers - 64 65 + 66 67 8 - Curve number 2 - number of points on curve, next line(s) are pointnumbers 1 2 @@ -813,61 +896,61 @@ 15 16 23 - Curve number 2 - number of points on curve, next line(s) are pointnumbers - 16 66 + 16 17 24 - Curve number 2 - number of points on curve, next line(s) are pointnumbers - 66 17 + 17 18 25 - Curve number 2 - number of points on curve, next line(s) are pointnumbers - 17 18 + 18 19 26 - Curve number 2 - number of points on curve, next line(s) are pointnumbers - 18 19 + 19 20 27 - Curve number 2 - number of points on curve, next line(s) are pointnumbers - 19 20 + 20 21 28 - Curve number 2 - number of points on curve, next line(s) are pointnumbers - 20 21 + 21 22 29 - Curve number 2 - number of points on curve, next line(s) are pointnumbers - 21 22 + 22 23 30 - Curve number 2 - number of points on curve, next line(s) are pointnumbers - 22 23 + 23 24 31 - Curve number 2 - number of points on curve, next line(s) are pointnumbers - 23 24 + 24 68 32 - Curve number 2 - number of points on curve, next line(s) are pointnumbers - 24 67 + 68 25 33 - Curve number 2 - number of points on curve, next line(s) are pointnumbers - 67 25 + 25 26 34 - Curve number 2 - number of points on curve, next line(s) are pointnumbers - 25 26 + 26 27 35 - Curve number 2 - number of points on curve, next line(s) are pointnumbers - 26 27 + 27 28 36 - Curve number 2 - number of points on curve, next line(s) are pointnumbers - 27 28 + 28 29 37 - Curve number 2 - number of points on curve, next line(s) are pointnumbers - 28 29 + 29 30 38 - Curve number 2 - number of points on curve, next line(s) are pointnumbers - 29 30 + 30 31 39 - Curve number 2 - number of points on curve, next line(s) are pointnumbers - 30 31 + 31 32 40 - Curve number 2 - number of points on curve, next line(s) are pointnumbers - 31 32 + 32 69 41 - Curve number 2 - number of points on curve, next line(s) are pointnumbers - 32 33 + 69 33 42 - Curve number 2 - number of points on curve, next line(s) are pointnumbers 33 34 @@ -900,103 +983,76 @@ 42 43 52 - Curve number 2 - number of points on curve, next line(s) are pointnumbers - 43 68 + 43 44 53 - Curve number 2 - number of points on curve, next line(s) are pointnumbers - 68 44 + 44 45 54 - Curve number 2 - number of points on curve, next line(s) are pointnumbers - 44 45 + 45 46 55 - Curve number 2 - number of points on curve, next line(s) are pointnumbers - 45 46 + 46 47 56 - Curve number 2 - number of points on curve, next line(s) are pointnumbers - 46 47 + 47 48 57 - Curve number 2 - number of points on curve, next line(s) are pointnumbers - 47 48 + 48 49 58 - Curve number 2 - number of points on curve, next line(s) are pointnumbers - 48 49 + 49 50 59 - Curve number 2 - number of points on curve, next line(s) are pointnumbers - 49 50 + 50 51 60 - Curve number 2 - number of points on curve, next line(s) are pointnumbers - 50 51 + 51 52 61 - Curve number 2 - number of points on curve, next line(s) are pointnumbers - 51 52 + 52 53 62 - Curve number 2 - number of points on curve, next line(s) are pointnumbers - 52 53 + 53 54 63 - Curve number 2 - number of points on curve, next line(s) are pointnumbers - 53 54 + 54 55 64 - Curve number 2 - number of points on curve, next line(s) are pointnumbers - 54 55 + 70 71 65 - Curve number 2 - number of points on curve, next line(s) are pointnumbers - 55 56 + 71 72 66 - Curve number 2 - number of points on curve, next line(s) are pointnumbers - 69 70 + 72 73 67 - Curve number 2 - number of points on curve, next line(s) are pointnumbers - 70 71 + 73 74 68 - Curve number 2 - number of points on curve, next line(s) are pointnumbers - 71 72 + 74 75 69 - Curve number 2 - number of points on curve, next line(s) are pointnumbers - 72 73 + 75 76 70 - Curve number 2 - number of points on curve, next line(s) are pointnumbers - 73 74 + 76 77 71 - Curve number 2 - number of points on curve, next line(s) are pointnumbers - 74 75 + 77 78 72 - Curve number 2 - number of points on curve, next line(s) are pointnumbers - 75 76 + 78 79 73 - Curve number 2 - number of points on curve, next line(s) are pointnumbers - 76 77 + 80 81 74 - Curve number 2 - number of points on curve, next line(s) are pointnumbers - 77 78 + 82 83 75 - Curve number 2 - number of points on curve, next line(s) are pointnumbers - 78 79 - 76 - Curve number - 2 - number of points on curve, next line(s) are pointnumbers - 79 80 - 77 - Curve number - 2 - number of points on curve, next line(s) are pointnumbers - 80 81 - 78 - Curve number - 2 - number of points on curve, next line(s) are pointnumbers - 81 82 - 79 - Curve number - 2 - number of points on curve, next line(s) are pointnumbers - 82 83 - 80 - Curve number - 2 - number of points on curve, next line(s) are pointnumbers - 83 84 - 81 - Curve number - 2 - number of points on curve, next line(s) are pointnumbers 84 85 - 82 - Curve number - 2 - number of points on curve, next line(s) are pointnumbers - 86 87 - 83 - Curve number - 2 - number of points on curve, next line(s) are pointnumbers - 88 89 - 84 - Curve number - 2 - number of points on curve, next line(s) are pointnumbers - 90 91 [END OF CURVES] [BOUNDARIES] @@ -1014,33 +1070,26 @@ 1 - number of curves on boundary, next line(s) are curvenumbers 5 4 - Boundary number - 23 - number of curves on boundary, next line(s) are curvenumbers - 3 16 17 18 19 20 21 22 23 4 - 53 54 55 56 57 58 59 60 61 62 - 63 64 65 + 1 - number of curves on boundary, next line(s) are curvenumbers + 4 5 - Boundary number - 45 - number of curves on boundary, next line(s) are curvenumbers - 3 16 17 18 19 20 21 22 23 24 - 25 26 27 28 29 30 31 32 2 40 - 41 42 43 44 45 46 47 48 49 50 - 51 52 53 54 55 56 57 58 59 60 - 61 62 63 64 65 + 1 - number of curves on boundary, next line(s) are curvenumbers + 3 6 - Boundary number - 51 - number of curves on boundary, next line(s) are curvenumbers - 3 16 17 18 19 20 21 22 23 24 - 25 26 27 28 29 30 31 32 33 34 - 35 36 37 38 39 40 41 42 43 44 - 45 46 47 48 49 50 51 52 53 54 - 55 56 57 58 59 60 61 62 63 64 - 65 + 48 - number of curves on boundary, next line(s) are curvenumbers + 8 9 10 11 12 13 14 15 16 17 + 18 19 20 21 22 23 24 25 26 27 + 28 29 30 31 2 41 42 43 44 45 + 46 47 48 49 50 51 52 53 54 55 + 56 57 58 59 60 61 62 63 7 - Boundary number - 58 - number of curves on boundary, next line(s) are curvenumbers + 56 - number of curves on boundary, next line(s) are curvenumbers 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 - 58 59 60 61 62 63 64 65 + 58 59 60 61 62 63 [END OF BOUNDARIES] [USE PROBABILISTIC DEFAULTS BOUNDARIES] @@ -1082,18 +1131,17 @@ [PIEZO LINES] 4 - Number of piezometric level lines - 1 - PlLine number - 16 - number of curves on PlLine, next line(s) are curvenumbers - 66 67 68 69 70 71 72 73 74 75 - 76 77 78 79 80 81 + 9 - number of curves on PlLine, next line(s) are curvenumbers + 64 65 66 67 68 69 70 71 72 2 - PlLine number 1 - number of curves on PlLine, next line(s) are curvenumbers - 82 + 73 3 - PlLine number 1 - number of curves on PlLine, next line(s) are curvenumbers - 83 + 74 4 - PlLine number 1 - number of curves on PlLine, next line(s) are curvenumbers - 84 + 75 [END OF PIEZO LINES] [PHREATIC LINE] @@ -1128,25 +1176,25 @@ 3 - Boundarynumber at top of layer 2 - Boundarynumber at bottom of layer 4 - Layer number, next line is material of layer - DeL_Tcs_1 - 1 - Piezometric level line at top of layer - 1 - Piezometric level line at bottom of layer + DeL_Tcs + 4 - Piezometric level line at top of layer + 4 - Piezometric level line at bottom of layer 4 - Boundarynumber at top of layer 3 - Boundarynumber at bottom of layer 5 - Layer number, next line is material of layer - DeL_Ppp - 1 - Piezometric level line at top of layer - 1 - Piezometric level line at bottom of layer + DeL_Tfg + 99 - Piezometric level line at top of layer + 99 - Piezometric level line at bottom of layer 5 - Boundarynumber at top of layer 4 - Boundarynumber at bottom of layer 6 - Layer number, next line is material of layer - veen - 99 - Piezometric level line at top of layer - 99 - Piezometric level line at bottom of layer + DeL_Tss_1 + 1 - Piezometric level line at top of layer + 1 - Piezometric level line at bottom of layer 6 - Boundarynumber at top of layer 5 - Boundarynumber at bottom of layer 7 - Layer number, next line is material of layer - DeL_Ppp + veen 1 - Piezometric level line at top of layer 99 - Piezometric level line at bottom of layer 7 - Boundarynumber at top of layer @@ -1197,9 +1245,9 @@ [degree earth quake] 100 100 100 100 100 100 100 [CIRCLES] - 8.094 13.094 5 X-direction - -1.835 3.165 5 Y-direction - -3.820 -6.820 7 Tangent lines + 0.000 12.685 16 X-direction + -1.193 3.851 6 Y-direction + -3.710 -6.710 7 Tangent lines 0.000 0.000 0 no fixed point used [SPENCER SLIP DATA] 0 Number of points @@ -1371,7 +1419,7 @@ 18.000 Excavation gamma below freatic level 2 number of points 0.000 -45.000 x y - 31.907 -45.000 x y + 31.329 -45.000 x y [END OF REFERENCE LEVEL SU] [LIFT SLIP DATA] @@ -1395,9 +1443,9 @@ 3 3 = Pl-top and pl-bottom 3 3 = Pl-top and pl-bottom 99 99 = Pl-top and pl-bottom - 1 1 = Pl-top and pl-bottom - 1 1 = Pl-top and pl-bottom + 4 4 = Pl-top and pl-bottom 99 99 = Pl-top and pl-bottom + 1 1 = Pl-top and pl-bottom 1 99 = Pl-top and pl-bottom [MODEL FACTOR] 1.00 = Limit value stability factor @@ -1457,11 +1505,11 @@ LimitValueVanDistribution=3 [END OF PROBABILISTIC DEFAULTS] [NEWZONE PLOT DATA] - 0.00 = Diketable Height [m] - 0.00 = Width top rest profile [m] - 0.00 = X co-ordinate indicating start of zone [m] - 31.90 = Boundary of M.H.W influence at X [m] - -1.75 = Boundary of M.H.W influence at Y [m] + -1.70 = Diketable Height [m] + 3.00 = Width top rest profile [m] + 10.00 = X co-ordinate indicating start of zone [m] + 12.00 = Boundary of M.H.W influence at X [m] + -2.50 = Boundary of M.H.W influence at Y [m] 0.50 = Required safety in zone 1a 0.50 = Required safety in zone 1b 0.50 = Required safety in zone 2a @@ -1470,7 +1518,7 @@ 0.01 = Right side minimum road [m] 0.90 = Required safety in zone 3a 0.90 = Required safety in zone 3b - 1 Stability calculation at right side + 0 Stability calculation at left side 0.50 = Remolding reduction factor 0.80 = Schematization reduction factor 1 Overtopping condition less or equal 0.1 l/m/s Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.resx =================================================================== diff -u -r935 -r1001 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.resx (.../Resources.resx) (revision 935) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.resx (.../Resources.resx) (revision 1001) @@ -162,4 +162,7 @@ Location {0}, subsoil scenario '{1}', design scenario '{2}': The preparation for this calculation failed. + + The use of Zone Areas is not allowed for stability outside. + \ No newline at end of file Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.nl-NL.resx =================================================================== diff -u -r935 -r1001 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.nl-NL.resx (.../Resources.nl-NL.resx) (revision 935) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.nl-NL.resx (.../Resources.nl-NL.resx) (revision 1001) @@ -117,6 +117,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Het gebruik van zones is niet toegestaan voor buitenwaardse stabiliteit. + Geen uitvoer object gedefinieerd voor Macrostabiliteit Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapper.cs =================================================================== diff -u -r999 -r1001 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapper.cs (.../DamMacroStabilityOutwardsKernelWrapper.cs) (revision 999) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapper.cs (.../DamMacroStabilityOutwardsKernelWrapper.cs) (revision 1001) @@ -131,14 +131,13 @@ /// public int Validate(IKernelDataInput kernelDataInput, IKernelDataOutput kernelDataOutput, out List messages) { - //var calculator = StabilityCalculator(kernelDataInput); - //ToDo zant calculator has no Validate. -// List kernelMessages = calculator.Validate(); + var input = (DamMacroStabilityInput) kernelDataInput; messages = new List(); -// foreach (string stringMessage in kernelMessages) -// { -// messages.Add(new LogMessage() { Message = stringMessage, MessageType = LogMessageType.Error }); -// } + if (input.FailureMechanismParametersMStab.MStabParameters.ZonesType == MStabZonesType.ZoneAreas) + { + var message = new LogMessage(LogMessageType.Error, null, Resources.DamMacroStabilityKernelWrapper_OutsideWithZoneAreasNotAllowed); + messages.Add(message); + } return messages.Count; } @@ -279,6 +278,7 @@ stabilityDesignResults.LocalZone2ExitPointX = zone2.CircleSurfacePointLeftXCoordinate; stabilityDesignResults.SafetyFactor = Math.Min(damMacroStabilityOutputItem.Zone1Results.SafetyFactor, zone2.SafetyFactor); } + stabilityDesignResults.RedesignedSurfaceLine = damKernelInput.Location.SurfaceLine; designResult.StabilityDesignResults = stabilityDesignResults; designResult.CalculationResult = damMacroStabilityOutputItem.CalculationResult; } Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.Designer.cs =================================================================== diff -u -r935 -r1001 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 935) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 1001) @@ -61,6 +61,15 @@ } /// + /// Looks up a localized string similar to The use of Zone Areas is not allowed for stability outside.. + /// + internal static string DamMacroStabilityKernelWrapper_OutsideWithZoneAreasNotAllowed { + get { + return ResourceManager.GetString("DamMacroStabilityKernelWrapper_OutsideWithZoneAreasNotAllowed", resourceCulture); + } + } + + /// /// Looks up a localized string similar to No output object defined for Macro Stability. /// internal static string DamMacroStabilityKernelWrapper_PostProcess_NoOutputObjectDefinedForMacroStability {