Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/UpliftVanGridCreatorTests.cs =================================================================== diff -u -r5556 -r5557 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/UpliftVanGridCreatorTests.cs (.../UpliftVanGridCreatorTests.cs) (revision 5556) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/UpliftVanGridCreatorTests.cs (.../UpliftVanGridCreatorTests.cs) (revision 5557) @@ -106,35 +106,63 @@ UpliftVanCalculationGrid upliftVanCalculationGrid = UpliftVanGridCreator.DetermineGridsFromSettings(slipCircleDefinition, surfaceLine); // Then Assert.That(upliftVanCalculationGrid.IsGridsAutomatic, Is.True); + CheckValuesLeftGrid(upliftVanCalculationGrid, true); + CheckValuesRightGrid(upliftVanCalculationGrid, 0.0, 0.0, true); } - private static void CheckValuesLeftGrid(UpliftVanCalculationGrid upliftVanCalculationGrid) + private static void CheckValuesLeftGrid(UpliftVanCalculationGrid upliftVanCalculationGrid, bool isGridsAutomatic = false) { const double tolerance = 0.0001; + var expectedXLeft = 0.0; + var expectedXRight = 0.0; + var expectedXCount= 0; + var expectedZBottom = 0.0; + var expectedZTop = 0.0; + var expectedZCount = 0; + if (!isGridsAutomatic) + { + expectedXLeft = 31.52; + expectedXRight = 57.52; + expectedXCount= 14; + expectedZBottom = 3.775; + expectedZTop = 73.775; + expectedZCount = 36; + } Assert.Multiple(() => { - Assert.That(upliftVanCalculationGrid.LeftGridXLeft, Is.EqualTo(31.52).Within(tolerance)); - Assert.That(upliftVanCalculationGrid.LeftGridXRight, Is.EqualTo(57.52).Within(tolerance)); - Assert.That(upliftVanCalculationGrid.LeftGridXCount, Is.EqualTo(14)); - Assert.That(upliftVanCalculationGrid.LeftGridZBottom, Is.EqualTo(3.775).Within(tolerance)); - Assert.That(upliftVanCalculationGrid.LeftGridZTop, Is.EqualTo(73.775).Within(tolerance)); - Assert.That(upliftVanCalculationGrid.LeftGridZCount, Is.EqualTo(36)); + Assert.That(upliftVanCalculationGrid.LeftGridXLeft, Is.EqualTo(expectedXLeft).Within(tolerance)); + Assert.That(upliftVanCalculationGrid.LeftGridXRight, Is.EqualTo(expectedXRight).Within(tolerance)); + Assert.That(upliftVanCalculationGrid.LeftGridXCount, Is.EqualTo(expectedXCount)); + Assert.That(upliftVanCalculationGrid.LeftGridZBottom, Is.EqualTo(expectedZBottom).Within(tolerance)); + Assert.That(upliftVanCalculationGrid.LeftGridZTop, Is.EqualTo(expectedZTop).Within(tolerance)); + Assert.That(upliftVanCalculationGrid.LeftGridZCount, Is.EqualTo(expectedZCount)); }); } - private static void CheckValuesRightGrid(UpliftVanCalculationGrid upliftVanCalculationGrid, double expectedXLeft, double expectedXRight) + private static void CheckValuesRightGrid(UpliftVanCalculationGrid upliftVanCalculationGrid, double expectedXLeft, double expectedXRight, bool isGridsAutomatic = false) { const double tolerance = 0.0001; - Assert.Multiple(() => - { - Assert.That(upliftVanCalculationGrid.RightGridXLeft, Is.EqualTo(expectedXLeft).Within(tolerance)); - Assert.That(upliftVanCalculationGrid.RightGridXRight, Is.EqualTo(expectedXRight).Within(tolerance)); - Assert.That(upliftVanCalculationGrid.RightGridXCount, Is.EqualTo(6)); - Assert.That(upliftVanCalculationGrid.RightGridZBottom, Is.EqualTo(-0.09).Within(tolerance)); - Assert.That(upliftVanCalculationGrid.RightGridZTop, Is.EqualTo(3.91).Within(tolerance)); - Assert.That(upliftVanCalculationGrid.RightGridZCount, Is.EqualTo(3)); - }); - } + var expectedXCount= 0; + var expectedZBottom = 0.0; + var expectedZTop = 0.0; + var expectedZCount = 0; + if (!isGridsAutomatic) + { + expectedXCount= 6; + expectedZBottom = -0.09; + expectedZTop = 3.91; + expectedZCount = 3; + } + Assert.Multiple(() => + { + Assert.That(upliftVanCalculationGrid.RightGridXLeft, Is.EqualTo(expectedXLeft).Within(tolerance)); + Assert.That(upliftVanCalculationGrid.RightGridXRight, Is.EqualTo(expectedXRight).Within(tolerance)); + Assert.That(upliftVanCalculationGrid.RightGridXCount, Is.EqualTo(expectedXCount)); + Assert.That(upliftVanCalculationGrid.RightGridZBottom, Is.EqualTo(expectedZBottom).Within(tolerance)); + Assert.That(upliftVanCalculationGrid.RightGridZTop, Is.EqualTo(expectedZTop).Within(tolerance)); + Assert.That(upliftVanCalculationGrid.RightGridZCount, Is.EqualTo(expectedZCount)); + }); + } private static SlipCircleDefinition CreateSlipCircleDefinitionSpecified() {