Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs =================================================================== diff -u -r3649 -r3651 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs (.../MacroStabilityInwardsTests.cs) (revision 3649) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs (.../MacroStabilityInwardsTests.cs) (revision 3651) @@ -49,9 +49,6 @@ RemoveUsedDirectoryAfterTests("TestStabInwardsBishopUpliftVan_UpliftVanLowest"); RemoveUsedDirectoryAfterTests("TestStabInwardsBishopUpliftVan_BishopLowest"); RemoveUsedDirectoryAfterTests("TestStabInwardsBishopUpliftVan_NoUplift"); - RemoveUsedDirectoryAfterTests("TestStabInwardsZoneBishop"); - RemoveUsedDirectoryAfterTests("TestStabInwardsZone2Bishop"); - RemoveUsedDirectoryAfterTests("TestStabInwardsZoneUpliftVan"); RemoveUsedDirectoryAfterTests("TestStabInwardsForbiddenZoneBishop"); RemoveUsedDirectoryAfterTests("TestStabInwardsWithErrorUpliftVan"); RemoveUsedDirectoryAfterTests("TestStabInwardsWithErrorBishopUpliftVan"); @@ -344,195 +341,9 @@ Assert.AreEqual(CalculationResult.NoRun, ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[1].CalculationResult)); Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[2].CalculationResult)); } - + [Test, Category("Slow")] - [Ignore("Test disabled due to removal of zone areas")] - public void TestRunMacroStabilityDeltaDijkZoneAreasBishopWith1D() - { - // Expected results are determined by running dam\dam clients\DamUI\trunk\data\DamEngineTestProjects\DeltaDijk_zonering_BI\DeltaDijk normal.damx - // with Dam Classic rev.1059 - // This tests both zone areas and use of 1D profiles - // Select first location (6-4-1-A-1-F) - // Analysis type "No adaption" - // Calculation options: Stability Inside - Bishop - const string calcDir = "TestStabInwardsZoneBishop"; - if (Directory.Exists(calcDir)) - { - Directory.Delete(calcDir, true); // delete previous results - } - - Directory.CreateDirectory(calcDir); - - - const string fileName = @"TestFiles\DeltaDijkZoneringInwards.xml"; - string inputString = File.ReadAllText(fileName); - inputString = ChangeInputModel(inputString, InputStabilityModelType.Bishop); - inputString = XmlAdapter.ChangeValueInXml(inputString, "ProjectPath", ""); // Current directory will be used - inputString = XmlAdapter.ChangeValueInXml(inputString, "CalculationMap", calcDir); // Current directory will be used - inputString = XmlAdapter.ChangeValueInXml(inputString, "MapForSoilgeometries2D", @"TestFiles\DeltaDijk normal.geometries2D.0\"); - inputString = XmlAdapter.ChangeValueInXml(inputString, "SoilDatabaseName", @"TestFiles\DeltaDijk normal0.soilmaterials.mdb"); - EngineInterface engineInterface = new EngineInterface(inputString); - Assert.IsNotNull(engineInterface.DamProjectData); - - string outputString = engineInterface.Run(); - - Assert.IsNotNull(outputString); - var output = DamXmlSerialization.LoadOutputFromXmlString(outputString); - - // one location is calculated with 3 1D profiles - Assert.AreEqual(3, output.Results.CalculationResults.Length); - Assert.AreEqual("6-4-1-A-1-F", output.Results.CalculationResults[0].LocationName); - Assert.AreEqual("6-4-1-A-1-F_1_s", output.Results.CalculationResults[0].ProfileName); - Assert.AreEqual("6-4-1-A-1-F", output.Results.CalculationResults[1].LocationName); - Assert.AreEqual("6-4-1-A-1-F_2_s", output.Results.CalculationResults[1].ProfileName); - Assert.AreEqual("6-4-1-A-1-F", output.Results.CalculationResults[2].LocationName); - Assert.AreEqual("6-4-1-A-1-F_3_s", output.Results.CalculationResults[2].ProfileName); - - var result = output.Results.CalculationResults[0]; - // SafetyFactor=1.682 - Assert.AreEqual(1.682, result.StabilityDesignResults.SafetyFactor, Tolerance); - - // skip testing some of the results like uplift etc. - - // Calculation Result - Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(result.CalculationResult)); - - // test safety factor for other profiles - result = output.Results.CalculationResults[1]; - // SafetyFactor=1.644 - Assert.AreEqual(1.644, result.StabilityDesignResults.SafetyFactor, Tolerance); - result = output.Results.CalculationResults[2]; - // SafetyFactor=1.682 - Assert.AreEqual(1.682, result.StabilityDesignResults.SafetyFactor, Tolerance); - - // Stix file - var file1 = Path.Combine(Path.GetFullPath(calcDir), "Stability\\Bishop\\Loc(6-4-1-A-1-F)_Sce(1)_Pro(6-4-1-A-1-F_1_s)_result.stix"); - Assert.IsTrue(File.Exists(file1)); - var file2 = Path.Combine(Path.GetFullPath(calcDir), "Stability\\Bishop\\Loc(6-4-1-A-1-F)_Sce(1)_Pro(6-4-1-A-1-F_2_s)_result.stix"); - Assert.IsTrue(File.Exists(file2)); - var file3 = Path.Combine(Path.GetFullPath(calcDir), "Stability\\Bishop\\Loc(6-4-1-A-1-F)_Sce(1)_Pro(6-4-1-A-1-F_3_s)_result.stix"); - Assert.IsTrue(File.Exists(file3)); - } - - [Test, Category("Slow")] [Ignore("Test disabled due to removal of the old MacroStability kernel wrapper implementation")] - public void TestRunMacroStabilityDeltaDijkZoneAreasBishopWith1DAnd2Profiles() - { - // Expected results are determined by running dam\dam clients\DamUI\trunk\data\DamEngineTestProjects\DeltaDijk_zonering_BI\DeltaDijk normal.damx - // with Dam Classic rev.1059 - // Select last location (6-4-5-A-1-B) - // Analysis type "No adaption" - // Calculation options: Stability Inside - Bishop - // - // In this test the location is calculated with 2 profiles. - // For one case safety factor of zone 1 is lower than for zone 2 - // For the other one safety factor of zone 1 is higher than for zone 2 - // But the overall safety factor should always be the one of zone 1 - const string calcDir = "TestStabInwardsZone2Bishop"; - if (Directory.Exists(calcDir)) - { - Directory.Delete(calcDir, true); // delete previous results - } - - Directory.CreateDirectory(calcDir); - - const string fileName = @"TestFiles\DeltaDijkZoneringInwardsZone2.xml"; - string inputString = File.ReadAllText(fileName); - inputString = ChangeInputModel(inputString, InputStabilityModelType.Bishop); - inputString = XmlAdapter.ChangeValueInXml(inputString, "ProjectPath", ""); // Current directory will be used - inputString = XmlAdapter.ChangeValueInXml(inputString, "CalculationMap", calcDir); // Current directory will be used - inputString = XmlAdapter.ChangeValueInXml(inputString, "MapForSoilgeometries2D", @"TestFiles\DeltaDijk normal.geometries2D.0\"); - inputString = XmlAdapter.ChangeValueInXml(inputString, "SoilDatabaseName", @"TestFiles\DeltaDijk normal0.soilmaterials.mdb"); - EngineInterface engineInterface = new EngineInterface(inputString); - Assert.IsNotNull(engineInterface.DamProjectData); - - string outputString = engineInterface.Run(); - - Assert.IsNotNull(outputString); - var output = DamXmlSerialization.LoadOutputFromXmlString(outputString); - - Assert.AreEqual(2, output.Results.CalculationResults.Length); - Assert.AreEqual("6-4-5-A-1-B", output.Results.CalculationResults[0].LocationName); - Assert.AreEqual("6-4-5-A-1-B_1_s", output.Results.CalculationResults[0].ProfileName); - Assert.AreEqual("6-4-5-A-1-B", output.Results.CalculationResults[1].LocationName); - Assert.AreEqual("6-4-5-A-1-B_2_s", output.Results.CalculationResults[1].ProfileName); - - // SafetyFactor=2.138 - DesignResult result = output.Results.CalculationResults[0]; - Assert.AreEqual(2.138, result.StabilityDesignResults.SafetyFactor, Tolerance); - - // SafetyFactor=2.054 - result = output.Results.CalculationResults[1]; - Assert.AreEqual(2.054, result.StabilityDesignResults.SafetyFactor, Tolerance); - - // Calculation Result - Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(result.CalculationResult)); - } - - [Test, Category("Slow")] - [Ignore("Test disabled due to removal of zone areas")] - public void TestRunMacroStabilityDeltaDijkZoneAreasUpliftVanWith1D() - { - // Expected results are determined by running dam\dam clients\DamUI\trunk\data\DamEngineTestProjects\DeltaDijk_zonering_BI - // with Dam Classic rev.1059 - // Select first location (6-4-1-A-1-F) - // Analysis type "No adaption" - // Calculation options: Stability Inside - Bishop - // This tests both zone areas and use of 1D profiles - const string calcDir = "TestStabInwardsZoneUpliftVan"; - if (Directory.Exists(calcDir)) - { - Directory.Delete(calcDir, true); // delete previous results - } - - Directory.CreateDirectory(calcDir); - - - const string fileName = @"TestFiles\DeltaDijkZoneringInwards.xml"; - string inputString = File.ReadAllText(fileName); - inputString = ChangeInputModel(inputString, InputStabilityModelType.UpliftVan); - inputString = XmlAdapter.ChangeValueInXml(inputString, "ProjectPath", ""); // Current directory will be used - inputString = XmlAdapter.ChangeValueInXml(inputString, "CalculationMap", calcDir); // Current directory will be used - inputString = XmlAdapter.ChangeValueInXml(inputString, "MapForSoilgeometries2D", @"TestFiles\DeltaDijk normal.geometries2D.0\"); - inputString = XmlAdapter.ChangeValueInXml(inputString, "SoilDatabaseName", @"TestFiles\DeltaDijk normal0.soilmaterials.mdb"); - EngineInterface engineInterface = new EngineInterface(inputString); - Assert.IsNotNull(engineInterface.DamProjectData); - - string outputString = engineInterface.Run(); - - Assert.IsNotNull(outputString); - var output = DamXmlSerialization.LoadOutputFromXmlString(outputString); - - // one location is calculated with 3 1D profiles - // However, profile 6-4-1-A-1-F_3_s has no UpliftVan occuring and thus has no result - Assert.AreEqual(2, output.Results.CalculationResults.Length); - Assert.AreEqual("6-4-1-A-1-F", output.Results.CalculationResults[0].LocationName); - Assert.AreEqual("6-4-1-A-1-F_1_s", output.Results.CalculationResults[0].ProfileName); - Assert.AreEqual("6-4-1-A-1-F", output.Results.CalculationResults[1].LocationName); - Assert.AreEqual("6-4-1-A-1-F_2_s", output.Results.CalculationResults[1].ProfileName); - - var result = output.Results.CalculationResults[0]; - // SafetyFactor=1.638 DSTAB 1.518 (1.079) - Assert.AreEqual(1.638, result.StabilityDesignResults.SafetyFactor, Tolerance); - - // skip testing some of the results like uplift etc. - - // Calculation Result - Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(result.CalculationResult)); - - // test safety factor for other profiles - result = output.Results.CalculationResults[1]; - // SafetyFactor=1.551 DSTAB 1.414. 1.097 - Assert.AreEqual(1.551, result.StabilityDesignResults.SafetyFactor, Tolerance); - Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(result.CalculationResult)); - var file1 = Path.Combine(Path.GetFullPath(calcDir), "Stability\\UpliftVan\\Loc(6-4-1-A-1-F)_Sce(1)_Pro(6-4-1-A-1-F_1_s)_result.stix"); - Assert.IsTrue(File.Exists(file1)); - var file2 = Path.Combine(Path.GetFullPath(calcDir), "Stability\\UpliftVan\\Loc(6-4-1-A-1-F)_Sce(1)_Pro(6-4-1-A-1-F_2_s)_result.stix"); - Assert.IsTrue(File.Exists(file2)); - } - - [Test, Category("Slow")] - [Ignore("Test disabled due to removal of the old MacroStability kernel wrapper implementation")] public void TestRunMacroStabilityInvoer10ForbiddenZoneBishop() { // Expected results are determined by running dam\dam clients\DamUI\trunk\data\DamEngineTestProjects\Invoer10\ZoneType.damx @@ -542,6 +353,8 @@ // Calculation options: Stability Inside - Bishop // This tests two locations with same profile // But first location with Zone Areas and second location with Forbidden Zone + + // Note: this test might be activated again in the future as Forbidden zone seems to be supported by the new kernel. But then all new reference values are needed. const string calcDir = "TestStabInwardsForbiddenZoneBishop"; if (Directory.Exists(calcDir)) {