Index: DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/GeneralHelper.cs
===================================================================
diff -u -r6495 -r6543
--- DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/GeneralHelper.cs (.../GeneralHelper.cs) (revision 6495)
+++ DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/GeneralHelper.cs (.../GeneralHelper.cs) (revision 6543)
@@ -189,10 +189,13 @@
private static void CheckConsistencyOfAdaptGeometryResults(EngineInterface engineInterface, OutputResults outputResults)
{
if (engineInterface.DamProjectData.DamProjectType == DamProjectType.Design &&
- engineInterface.DamProjectData.DamProjectCalculationSpecification.AnalysisTypeForSerializationPurposeOnly == AnalysisType.AdaptGeometry)
+ engineInterface.DamProjectData.DamProjectCalculationSpecification.AnalysisTypeForSerializationPurposeOnly == AnalysisType.AdaptGeometry &&
+ engineInterface.DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.StabilityModelType != StabilityModelType.BishopUpliftVan)
{
var isIteratedFilePresent = false;
+ // The check does NOT work for BishopUpliftVan model as then a Bishop might be larger then required fos while UpliftVan is smaller (or vice versa).
+ // And that will always result in a fail here which is not relevant.
foreach (DesignResult calculationResult in outputResults.CalculationResults)
{
bool isDesignSuccessful = calculationResult.CalculationResult == ConversionHelper.ConvertToOutputCalculationResult(CalculationResult.Succeeded) &&
@@ -219,6 +222,7 @@
(!fileName.IsNullOrEmpty() && fileName.Contains("Ite(") && !fileName.Contains("Ite(1)"))
|| !isDesignSuccessful;
}
+
// The iterated file is created only for the stability mechanism (not for piping) to be opened in D-Stability
if (engineInterface.DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismSystemType != FailureMechanismSystemType.Piping)
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs
===================================================================
diff -u -r6498 -r6543
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs (.../MacroStabilityInwardsTests.cs) (revision 6498)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs (.../MacroStabilityInwardsTests.cs) (revision 6543)
@@ -945,6 +945,40 @@
});
}
+ [Test, Category(Categories.Slow)]
+ public void TestRunMacroStabilityTutorialDwp1WithAdaptionAndBishopUpliftVanProducesCorrectResults()
+ {
+ const string calcDir = "TestRunMacroStabilityTutorialDWP1WithAdaptionAndBishopUpliftVanProducesCorrectResults";
+ if (Directory.Exists(calcDir))
+ {
+ Directory.Delete(calcDir, true); // delete previous results
+ }
+
+ Directory.CreateDirectory(calcDir);
+
+ const string fileName = @"TestFiles\TutorialDWP1WithAdaptionAndBishopUpliftVan.xml";
+ string inputString = File.ReadAllText(fileName);
+ inputString = XmlAdapter.ChangeValueInXml(inputString, "ProjectPath", ""); // Current directory will be used
+ inputString = XmlAdapter.ChangeValueInXml(inputString, "CalculationMap", calcDir); // Current directory will be used
+
+ Output output = GeneralHelper.RunAfterInputValidation(inputString);
+
+ // one location is calculated with 1 2D profile and results are for the 3 models (Bishop, Uplift-Van and Bishop/UpliftVan)
+ Assert.That(output.Results.CalculationResults, Has.Length.EqualTo(3));
+ Assert.Multiple(() =>
+ {
+ CheckCalculationResults(
+ output.Results.CalculationResults[0], "DWP_1", "DWP_1.stix",
+ DesignResultStabilityDesignResultsStabilityModelType.Bishop, 1.538, true, CalculationResult.RunFailed);
+ CheckCalculationResults(
+ output.Results.CalculationResults[1], "DWP_1", "DWP_1.stix",
+ DesignResultStabilityDesignResultsStabilityModelType.UpliftVan, 1.403, true, CalculationResult.RunFailed);
+ CheckCalculationResults(
+ output.Results.CalculationResults[2], "DWP_1", "DWP_1.stix",
+ DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan, 1.403, true, CalculationResult.RunFailed);
+ });
+ }
+
private static Output GetOutputStringForProject(string analysisType, bool isSuccessful)
{
// Create xml with Tutorial project
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj
===================================================================
diff -u -r6520 -r6543
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj (.../Deltares.DamEngine.IntegrationTests.csproj) (revision 6520)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj (.../Deltares.DamEngine.IntegrationTests.csproj) (revision 6543)
@@ -140,6 +140,12 @@
PreserveNewest
+
+ Always
+
+
+ Always
+
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/TutorialDWP1WithAdaptionAndBishopUpliftVan.xml
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/TutorialDWP1WithAdaptionAndBishopUpliftVan.xml (revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/TutorialDWP1WithAdaptionAndBishopUpliftVan.xml (revision 6543)
@@ -0,0 +1,262 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file