Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityHorizontalBalance/DamMacroStabilityHorizontalBalanceKernelWrapperTests.cs =================================================================== diff -u -r1125 -r1128 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityHorizontalBalance/DamMacroStabilityHorizontalBalanceKernelWrapperTests.cs (.../DamMacroStabilityHorizontalBalanceKernelWrapperTests.cs) (revision 1125) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityHorizontalBalance/DamMacroStabilityHorizontalBalanceKernelWrapperTests.cs (.../DamMacroStabilityHorizontalBalanceKernelWrapperTests.cs) (revision 1128) @@ -44,7 +44,7 @@ [Test] - public void TestObsoleteCalculationForProcess() + public void TestNotRelevantCalculationForProcess() { // expected is that preparation of this calculation is not done. var absoluteFolder = Path.GetFullPath(Path.Combine(Directory.GetCurrentDirectory(), testFolder)); @@ -246,81 +246,10 @@ kernelWrapper.PostProcess(damKernelInput, output, "", out results); Assert.AreEqual(1.1, results[0].StabilityDesignResults.SafetyFactor); Assert.AreEqual(1.1, results[0].StabilityDesignResults.Zone1SafetyFactor); - Assert.AreEqual(1.3, results[0].StabilityDesignResults.LocalZone1EntryPointX); - Assert.AreEqual(1.2, results[0].StabilityDesignResults.LocalZone1ExitPointX); // Horizontal Balance does not have results for zone 2 - Assert.AreEqual(null, results[0].StabilityDesignResults.Zone2SafetyFactor); - Assert.AreEqual(null, results[0].StabilityDesignResults.LocalZone2EntryPointX); - Assert.AreEqual(null, results[0].StabilityDesignResults.LocalZone2ExitPointX); + Assert.AreEqual(null, results[0].StabilityDesignResults.Zone2SafetyFactor); } - private void PrepareWithInvalidFile() - { - // expected results are based on test CanCalculateStabilitySafetyFactorGeometry2D - // in 'https://repos.deltares.nl/repos/dam/dam classic' revision 190 - var soilDbName = Path.Combine(testFolder, "soilmaterials.mdb"); - var soilGeometry2DName = "1D1.sti"; - - 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. - - if (Directory.Exists(workingDir)) - { - Directory.Delete(workingDir, true); - } - - var line = FactoryForSurfaceLines.CreateSurfaceLineTutorial1(); - var location = new Location(); - var scenario = DamMacroStabilityTestHelper.CreateScenarioForLocation(location, line); - scenario.Location.StabilityOptions = new StabilityOptions - { - TrafficLoad = 10.0, - SoilGeometries2DPath = testFolder - }; - scenario.Location.StabilityOptions.SoilDatabaseName = soilDbName; - scenario.ModelFactors.RequiredSafetyFactorStabilityInnerSlope = 1.1; - - var subSoilScenario = new SoilGeometryProbability - { - StiFileName = soilGeometry2DName, - SoilProfileType = SoilProfileType.ProfileTypeStiFile, - SegmentFailureMechanismType = FailureMechanismSystemType.HorizontalBalance - }; - - var FailureMechanismParametersMStab = new FailureMechanismParametersMStab - { - MStabParameters = - { - GridPosition = MStabGridPosition.Left, - SearchMethod = MStabSearchMethod.GeneticAlgorithm, - CalculationOptions = - { - MinimalCircleDepth = 1.0 - } - }, - ProjectWorkingPath = workingDir - }; - - var damKernelInput = new DamKernelInput - { - Location = location, - DesignScenario = scenario, - SubSoilScenario = subSoilScenario, - ProjectDir = absoluteFolder, - CalculationDir = workingDir - }; - - var kernelWrapper = new DamMacroStabilityHorizontalBalanceKernelWrapper - { - FailureMechanismParametersMStab = FailureMechanismParametersMStab - }; - - // Prepare the wrapper. Result is input for the calculation dll - IKernelDataInput damStabilityInput; - IKernelDataOutput kernelOutput; - kernelWrapper.Prepare(damKernelInput, 0, out damStabilityInput, out kernelOutput); - } - + private static DamKernelInput CreateDamKernelInput(bool realOut = false) { var absoluteFolder = Path.GetFullPath(Path.Combine(Directory.GetCurrentDirectory(), testFolder)); @@ -343,9 +272,9 @@ scenario.Location.StabilityOptions = new StabilityOptions { TrafficLoad = 10.0, - SoilGeometries2DPath = absoluteFolder + SoilGeometries2DPath = absoluteFolder, + SoilDatabaseName = soilDbName }; - scenario.Location.StabilityOptions.SoilDatabaseName = soilDbName; scenario.ModelFactors.RequiredSafetyFactorStabilityOuterSlope = 1.1; var subSoilScenario = new SoilGeometryProbability Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityHorizontalBalance/DamMacroStabilityHorizontalBalanceKernelWrapper.cs =================================================================== diff -u -r1125 -r1128 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityHorizontalBalance/DamMacroStabilityHorizontalBalanceKernelWrapper.cs (.../DamMacroStabilityHorizontalBalanceKernelWrapper.cs) (revision 1125) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityHorizontalBalance/DamMacroStabilityHorizontalBalanceKernelWrapper.cs (.../DamMacroStabilityHorizontalBalanceKernelWrapper.cs) (revision 1128) @@ -108,6 +108,7 @@ /// public int Validate(IKernelDataInput kernelDataInput, IKernelDataOutput kernelDataOutput, out List messages) { + // For now, validation is not implemented so return empty list. var input = (DamMacroStabilityInput)kernelDataInput; messages = new List(); return messages.Count; @@ -136,10 +137,7 @@ // For Horizontal balance only zone 1 is used to give back the results. var zone1 = new DamMacroStabilityOutputItem.ResultsSingleZone { - SafetyFactor = results[0].Zone1.SafetyFactor, - //#Bka: I think only safetyfactor is relevant. - CircleSurfacePointLeftXCoordinate = results[0].Zone1.CircleSurfacePointLeftXCoordinate, - CircleSurfacePointRightXCoordinate = results[0].Zone1.CircleSurfacePointRightXCoordinate, + SafetyFactor = results[0].Zone1.SafetyFactor }; damMacroStabilityOutputItem.Zone1Results = zone1; damMacroStabilityOutput.StabilityOutputItems.Add(damMacroStabilityOutputItem); @@ -174,7 +172,7 @@ damKernelInput.DesignScenario, damKernelInput.SubSoilScenario.SoilProfile1D, soilProfile2DName, DamProjectCalculationSpecification.SelectedAnalysisType) { - // initialize has failed + // Initialize result as failed CalculationResult = CalculationResult.RunFailed }; // Horiontal Balance has only one result @@ -184,9 +182,6 @@ var stabilityDesignResults = new StabilityDesignResults { Zone1SafetyFactor = damMacroStabilityOutputItem.Zone1Results.SafetyFactor, - //#Bka: zonepoints are probably irrelevant. - LocalZone1EntryPointX = damMacroStabilityOutputItem.Zone1Results.CircleSurfacePointRightXCoordinate, - LocalZone1ExitPointX = damMacroStabilityOutputItem.Zone1Results.CircleSurfacePointLeftXCoordinate, ResultMessage = resultMessage, UpliftSituation = null };