Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs =================================================================== diff -u -r5880 -r5960 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 5880) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 5960) @@ -901,11 +901,6 @@ inputSoilGeometryProbability.SoilProfileName = soilGeometryProbability.SoilProfile2DName; break; } - case SoilProfileType.ProfileTypeStiFile: - { - inputSoilGeometryProbability.SoilProfileName = soilGeometryProbability.StiFileName; - break; - } } inputSegment.SoilGeometryProbability[i] = inputSoilGeometryProbability; Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Segment.cs =================================================================== diff -u -r4540 -r5960 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Segment.cs (.../Segment.cs) (revision 4540) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Segment.cs (.../Segment.cs) (revision 5960) @@ -54,38 +54,6 @@ } /// - /// Gets the most probable profile1D. - /// - /// Type of the segment failure mechanism. - /// - public SoilProfile1D GetMostProbableProfile1D(SegmentFailureMechanismType? segmentFailureMechanismType) - { - SoilGeometryProbability mostProbableSoilGeometryProbability = GetMostProbableSoilGeometryProbability(segmentFailureMechanismType); - if (mostProbableSoilGeometryProbability != null && mostProbableSoilGeometryProbability.SoilProfileType == SoilProfileType.ProfileType1D) - { - return mostProbableSoilGeometryProbability?.SoilProfile1D; - } - - return null; - } - - /// - /// Gets the name of the most probable sti filename (name of MStab .sti file). - /// - /// Type of the segment failure mechanism. - /// - public string GetMostProbableProfile2DStiFileName(SegmentFailureMechanismType? segmentFailureMechanismType) - { - SoilGeometryProbability mostProbableSoilGeometryProbability = GetMostProbableSoilGeometryProbability(segmentFailureMechanismType); - if (mostProbableSoilGeometryProbability != null && mostProbableSoilGeometryProbability.SoilProfileType == SoilProfileType.ProfileTypeStiFile) - { - return mostProbableSoilGeometryProbability?.FullStiFileName; - } - - return null; - } - - /// /// Gets the most probable soil geometry probability. /// /// Type of the segment failure mechanism. @@ -127,7 +95,7 @@ } else { - sb.Append($"(2D) {spp.StiFileName} ({spp.Probability}%) "); + sb.Append($"(2D) {spp.SoilProfile2D} ({spp.Probability}%) "); } //#Bka: should be adapted for WtiStability where 2D profiles are used. } Index: DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/General/SoilGeometryProbabilityTest.cs =================================================================== diff -u -r4540 -r5960 --- DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/General/SoilGeometryProbabilityTest.cs (.../SoilGeometryProbabilityTest.cs) (revision 4540) +++ DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/General/SoilGeometryProbabilityTest.cs (.../SoilGeometryProbabilityTest.cs) (revision 5960) @@ -43,8 +43,7 @@ var scenario = new SoilGeometryProbability { SoilProfile1D = soilProfile1D, - SoilProfile2D = soilProfile2D, - StiFileName = "Not Relevant Sti File" + SoilProfile2D = soilProfile2D }; // Call @@ -64,8 +63,7 @@ }; var scenario = new SoilGeometryProbability { - SoilProfile2D = soilProfile2D, - StiFileName = "Not Relevant Sti File" + SoilProfile2D = soilProfile2D }; // Call @@ -76,19 +74,15 @@ } [Test] - public void ToString_GeometryWithoutAnyProfile_ReturnsExpectedString() + public void ToString_GeometryWithoutAnyProfile_ReturnsEmptyString() { // Setup - const string stiFileName = "StiFileName"; - var scenario = new SoilGeometryProbability - { - StiFileName = stiFileName - }; + var scenario = new SoilGeometryProbability(); // Call var stringRepresentation = scenario.ToString(); // Assert - Assert.That(stringRepresentation, Is.EqualTo(stiFileName)); + Assert.That(stringRepresentation, Is.Empty); } } \ No newline at end of file Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/DebuggingTest.cs =================================================================== diff -u -r5369 -r5960 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/DebuggingTest.cs (.../DebuggingTest.cs) (revision 5369) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/DebuggingTest.cs (.../DebuggingTest.cs) (revision 5960) @@ -39,7 +39,7 @@ /// 2) Copy the file to src\Deltares.DamEngine.IntegrationTests\TestFiles\InputForDebugging.xml /// 3) Run the test in Debugging mode /// - [Test, Ignore("This test is only used for debugging XML files generated by Dam UI")] + [Test]//, Ignore("This test is only used for debugging XML files generated by Dam UI")] public void DebugWithXmlInputFile() { const string inputFilename = "InputForDebugging.xml"; Index: DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs =================================================================== diff -u -r5820 -r5960 --- DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs (.../FactoryForDamProjectData.cs) (revision 5820) +++ DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs (.../FactoryForDamProjectData.cs) (revision 5960) @@ -681,10 +681,6 @@ { soilProfileProbability.SoilProfileType = SoilProfileType.ProfileType2D; } - else - { - soilProfileProbability.SoilProfileType = SoilProfileType.ProfileTypeStiFile; - } } else { Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Uplift/UpliftLocationDeterminator.cs =================================================================== diff -u -r5784 -r5960 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Uplift/UpliftLocationDeterminator.cs (.../UpliftLocationDeterminator.cs) (revision 5784) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Uplift/UpliftLocationDeterminator.cs (.../UpliftLocationDeterminator.cs) (revision 5960) @@ -48,8 +48,6 @@ public SurfaceLine2 SurfaceLine { get; set; } public SoilProfile1D SoilProfile { get; set; } public SoilProfile2D SoilProfile2D { get; set; } - public string SoilGeometry2DName { get; set; } - public Soil DikeEmbankmentMaterial { get; set; } // public SoilbaseDB SoilBaseDB { get; set; } @@ -284,7 +282,7 @@ /// private void ThrowIfNoSoilProfileDefined() { - if (SoilProfile == null && (SoilGeometry2DName == null || SoilGeometry2DName == "") && SoilProfile2D == null) + if (SoilProfile == null && SoilProfile2D == null) { throw new UpliftLocationDeterminatorException("Required soilProfile not found"); } Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs =================================================================== diff -u -r5933 -r5960 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs (.../MacroStabilityInwardsTests.cs) (revision 5933) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs (.../MacroStabilityInwardsTests.cs) (revision 5960) @@ -80,7 +80,7 @@ // Check that a line is specified Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.RedesignedSurfaceLine, Is.Not.Null); - // Profile name = DWP_1.sti + // Profile name = DWP_1.stix Assert.That(output.Results.CalculationResults[0].ProfileName, Is.EqualTo("DWP_1.stix")); }); Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs =================================================================== diff -u -r5846 -r5960 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 5846) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 5960) @@ -1021,11 +1021,6 @@ soilGeometryProbability.SoilProfile2DName = inputSoilGeometryProbability.SoilProfileName; break; } - case SoilProfileType.ProfileTypeStiFile: - { - soilGeometryProbability.StiFileName = inputSoilGeometryProbability.SoilProfileName; - break; - } } segment.SoilProfileProbabilities.Add(soilGeometryProbability); Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/SoilGeometryProbability.cs =================================================================== diff -u -r4540 -r5960 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/SoilGeometryProbability.cs (.../SoilGeometryProbability.cs) (revision 4540) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/SoilGeometryProbability.cs (.../SoilGeometryProbability.cs) (revision 5960) @@ -30,56 +30,38 @@ public class SoilGeometryProbability { /// - /// Gets or sets the name of the SoilProfile1D. + /// Gets or sets the name of the soil profile 1D. /// /// - /// The name of the soilgeometry1d. + /// The name of the soil profile 1D. /// public virtual string SoilProfile1DName { get; set; } /// /// Gets or sets the soil profile 1D. /// /// - /// The soil profile. + /// The soil profile 1D. /// public virtual SoilProfile1D SoilProfile1D { get; set; } /// - /// Gets or sets the name of the SoilProfile2D. + /// Gets or sets the name of the soil profile 2D. /// /// - /// The name of the soilgeometry1d. + /// The name of the soil profile 2D. /// public virtual string SoilProfile2DName { get; set; } /// - /// Gets or sets the soilprofile2d. + /// Gets or sets the soil profile 2D. /// /// - /// The soilprofile2d. + /// The soil profile 2D. /// public virtual SoilProfile2D SoilProfile2D { get; set; } /// - /// Gets or sets the name of the sti file (that holds the 2D profile) including full path. - /// - /// - /// The name of the soilgeometry2d including full path. - /// - - public virtual string FullStiFileName { get; set; } - - /// - /// Gets or sets the name of the sti file (that holds the 2D profile). - /// - /// - /// The name of the soilgeometry2d. - /// - - public virtual string StiFileName { get; set; } - - /// /// Gets or sets the type of the segment failure mechanism. /// /// @@ -88,7 +70,7 @@ public virtual SegmentFailureMechanismType? SegmentFailureMechanismType { get; set; } /// - /// Gets or sets the probability of occurance; number between 0.0 and 100.0. + /// Gets or sets the probability of occurrence; number between 0.0 and 100.0. /// /// /// The probability. @@ -101,11 +83,11 @@ /// /// The type of the soil geometry. /// - /// No soilprofile assigned public SoilProfileType SoilProfileType { get; set; } - /// Determines the soilProfile1D at x coordinate, regardless of the soil profile type (1D or 2D). - /// Does not support *.sti files + /// + /// Determines the soilProfile1D at x coordinate, regardless of the soil profile type (1D or 2D). + /// /// The x coordinate. /// /// @@ -147,6 +129,6 @@ return SoilProfile2D.Name; } - return StiFileName; + return ""; } } \ No newline at end of file Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelper.cs =================================================================== diff -u -r5941 -r5960 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelper.cs (.../MacroStabilityCommonHelper.cs) (revision 5941) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelper.cs (.../MacroStabilityCommonHelper.cs) (revision 5960) @@ -59,7 +59,6 @@ /// The sub soil scenario. /// The surface line. /// The dike embankment soil. - /// Thrown when subSoilScenario.SoilProfileType is ProfileTypeStiFile /// /// The combined profile as full SoilProfile2D public static SoilProfile2D CombineSoilProfileWithSurfaceLine(SoilGeometryProbability subSoilScenario, SurfaceLine2 surfaceLine2, Soil dikeEmbankmentSoil) Fisheye: Tag 5960 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/InputFileForDGeoStability.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Assemblers/TestData/ProfileOutput.xml =================================================================== diff -u -r4000 -r5960 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Assemblers/TestData/ProfileOutput.xml (.../ProfileOutput.xml) (revision 4000) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Assemblers/TestData/ProfileOutput.xml (.../ProfileOutput.xml) (revision 5960) @@ -42,5 +42,5 @@ ExcessPorePressureAtBottom="0" OCRValue="0" PlAtTop="1" PlAtBottom="1"/> - + Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs =================================================================== diff -u -r5793 -r5960 --- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 5793) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 5960) @@ -183,7 +183,6 @@ [Test] [TestCase(SoilProfileType.ProfileType1D, 0)] [TestCase(SoilProfileType.ProfileType2D, 1)] - [TestCase(SoilProfileType.ProfileTypeStiFile, 2)] public void CanConvertToInputSoilGeometryType(SoilProfileType soilProfileType, int inputSoilGeometryType) { Assert.That(ConversionHelper.ConvertToInputSoilGeometryType(soilProfileType), Is.EqualTo(inputSoilGeometryType)); @@ -192,7 +191,6 @@ [Test] [TestCase(0, SoilProfileType.ProfileType1D)] [TestCase(1, SoilProfileType.ProfileType2D)] - [TestCase(2, SoilProfileType.ProfileTypeStiFile)] public void CanConvertToSoilGeometryType(int inputSoilGeometryType, SoilProfileType soilProfileType) { Assert.That(ConversionHelper.ConvertToSoilGeometryType(inputSoilGeometryType), Is.EqualTo(soilProfileType)); Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj =================================================================== diff -u -r5943 -r5960 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj (.../Deltares.DamEngine.IntegrationTests.csproj) (revision 5943) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj (.../Deltares.DamEngine.IntegrationTests.csproj) (revision 5960) @@ -98,9 +98,6 @@ PreserveNewest - - PreserveNewest - PreserveNewest Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs =================================================================== diff -u -r5933 -r5960 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs (.../MacroStabilityInwardsKernelWrapperTests.cs) (revision 5933) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs (.../MacroStabilityInwardsKernelWrapperTests.cs) (revision 5960) @@ -702,8 +702,6 @@ var subSoilScenario = new SoilGeometryProbability { SoilProfileType = SoilProfileType.ProfileType1D, - StiFileName = "", - FullStiFileName = "", SoilProfile2D = null, SegmentFailureMechanismType = SegmentFailureMechanismType.Stability, SoilProfile1D = soilProfile Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/PlLinesCreator.cs =================================================================== diff -u -r5936 -r5960 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/PlLinesCreator.cs (.../PlLinesCreator.cs) (revision 5936) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/PlLinesCreator.cs (.../PlLinesCreator.cs) (revision 5960) @@ -61,7 +61,6 @@ public SoilProfileType SoilProfileType { get; set; } public SoilProfile1D SoilProfile { get; set; } public SoilProfile2D SoilProfile2D { get; set; } - public string SoilGeometry2DName { get; set; } public Soil DikeEmbankmentMaterial { get; set; } public SoilList SoilList { get; set; } public double? HeadInPlLine2 { get; set; } @@ -278,9 +277,6 @@ soilProfile = SoilProfile2D.GetSoilProfile1D(xCoordinate); cachedSoilProfiles1D[xCoordinate] = soilProfile; return soilProfile; - case SoilProfileType.ProfileTypeStiFile: - // This possibly should become conversion from StixFile - throw new NotImplementedException(@"Using full 2D geometry (based on stix file) not yet available."); default: return null; } @@ -312,7 +308,6 @@ plLine = CreatePlLine2ByExpertKnowledgeFor1DGeometry(penetrationLength, headInPlLine2); break; case SoilProfileType.ProfileType2D: - case SoilProfileType.ProfileTypeStiFile: plLine = CreatePlLine2ByExpertKnowledgeFor2DGeometry(headInPlLine2); break; } @@ -1691,7 +1686,6 @@ SoilProfileType = SoilProfileType, SoilProfile1D = SoilProfile, SoilProfile2D = SoilProfile2D, - SoilGeometry2DName = SoilGeometry2DName, DikeEmbankmentMaterial = DikeEmbankmentMaterial }; Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/PlLinesHelper.cs =================================================================== diff -u -r5767 -r5960 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/PlLinesHelper.cs (.../PlLinesHelper.cs) (revision 5767) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/PlLinesHelper.cs (.../PlLinesHelper.cs) (revision 5960) @@ -119,7 +119,6 @@ ModelParametersForPlLines = location.ModelParametersForPlLines, SoilProfile = subSoilScenario.SoilProfile1D, SoilProfileType = subSoilScenario.SoilProfileType, - SoilGeometry2DName = subSoilScenario.FullStiFileName, SoilProfile2D = subSoilScenario.SoilProfile2D, GaugePlLines = null, // TODO: Operational Gauges = null, // TODO: Operational Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/SoilGeometry.cs =================================================================== diff -u -r4540 -r5960 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/SoilGeometry.cs (.../SoilGeometry.cs) (revision 4540) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/SoilGeometry.cs (.../SoilGeometry.cs) (revision 5960) @@ -58,7 +58,7 @@ { get { - var soilProfileType = SoilProfileType.ProfileTypeStiFile; + var soilProfileType = SoilProfileType.ProfileType2D; if (SoilProfile != null) { soilProfileType = SoilProfileType.ProfileType1D; Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Deltares.DamEngine.Calculators.Tests.csproj =================================================================== diff -u -r5861 -r5960 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Deltares.DamEngine.Calculators.Tests.csproj (.../Deltares.DamEngine.Calculators.Tests.csproj) (revision 5861) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Deltares.DamEngine.Calculators.Tests.csproj (.../Deltares.DamEngine.Calculators.Tests.csproj) (revision 5960) @@ -25,9 +25,6 @@ PreserveNewest - - PreserveNewest - PreserveNewest Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/SoilProfileValidator.cs =================================================================== diff -u -r5836 -r5960 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/SoilProfileValidator.cs (.../SoilProfileValidator.cs) (revision 5836) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/SoilProfileValidator.cs (.../SoilProfileValidator.cs) (revision 5960) @@ -44,7 +44,6 @@ public SoilProfileType SoilProfileType { get; init; } public SoilProfile1D SoilProfile1D { get; init; } public SoilProfile2D SoilProfile2D { get; init; } - public string SoilGeometry2DName { get; init; } public Soil DikeEmbankmentMaterial { get; init; } public SurfaceLine2 SurfaceLine { get; init; } @@ -139,8 +138,7 @@ private void ThrowIfInsufficientSoilGeometryData() { bool hasNoGeometry1DData = (SoilProfileType == SoilProfileType.ProfileType1D) && (SoilProfile1D == null || DikeEmbankmentMaterial == null); - bool hasNoGeometry2DData = ((SoilProfileType == SoilProfileType.ProfileTypeStiFile) && (SoilGeometry2DName == null)) || - ((SoilProfileType == SoilProfileType.ProfileType2D) && (SoilProfile2D == null)); + bool hasNoGeometry2DData = (SoilProfileType == SoilProfileType.ProfileType2D) && (SoilProfile2D == null); if (hasNoGeometry1DData || hasNoGeometry2DData) { throw new PlLinesCreatorException(Resources.SoilProfileValidator_General @@ -191,8 +189,6 @@ case SoilProfileType.ProfileType2D: soilProfile1D = SoilProfile2D.GetSoilProfile1D(xCoordinate); return soilProfile1D; - case SoilProfileType.ProfileTypeStiFile: - throw new NotImplementedException(@"Using full 2D geometry (based on stix file) not yet available."); default: return null; } Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/InputForDebugging.xml =================================================================== diff -u -r5675 -r5960 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/InputForDebugging.xml (.../InputForDebugging.xml) (revision 5675) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/InputForDebugging.xml (.../InputForDebugging.xml) (revision 5960) @@ -1,1182 +1,618 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Dike.cs =================================================================== diff -u -r5793 -r5960 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Dike.cs (.../Dike.cs) (revision 5793) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Dike.cs (.../Dike.cs) (revision 5960) @@ -72,17 +72,13 @@ locations = new List(); soilProfiles = new List(); soilProfiles2D = new List(); - // this.surfaceLines = new DelegatedList { AddMethod = ConvertAddedOldSurfaceLineToNewFormat }; SurfaceLines2 = new List(); pl1Lines = new List(); soilList = new SoilList(); - IsRemoveStiFiles = true; } public virtual string MapForSoilGeometries2D { get; set; } - public bool IsRemoveStiFiles { get; set; } - public virtual string Name { get; set; } /// Fisheye: Tag 5960 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/InputForDebuggingBeeSwarm.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs =================================================================== diff -u -r5813 -r5960 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs (.../ConversionHelper.cs) (revision 5813) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs (.../ConversionHelper.cs) (revision 5960) @@ -645,9 +645,6 @@ }, { SoilProfileType.ProfileType2D, 1 - }, - { - SoilProfileType.ProfileTypeStiFile, 2 } }; return translationTable[soilProfileType]; @@ -667,9 +664,6 @@ }, { 1, SoilProfileType.ProfileType2D - }, - { - 2, SoilProfileType.ProfileTypeStiFile } }; return translationTable[soilGeometryType]; Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/UpliftHelper.cs =================================================================== diff -u -r5633 -r5960 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/UpliftHelper.cs (.../UpliftHelper.cs) (revision 5633) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/UpliftHelper.cs (.../UpliftHelper.cs) (revision 5960) @@ -82,21 +82,21 @@ double upliftCriterion = location.ModelFactors.UpliftCriterionStability; SurfaceLine2 surfaceLineWithNewHeight = location.SurfaceLine; double? upliftFactor = GetLowestUpliftFactor(surfaceLineWithNewHeight, - subSoilScenario.SoilProfile1D, subSoilScenario.FullStiFileName, - subSoilScenario.SoilProfile2D, plLines, location, out xCoordLowestUpliftFactor); + subSoilScenario.SoilProfile1D, subSoilScenario.SoilProfile2D, plLines, + location, out xCoordLowestUpliftFactor); return upliftFactor < upliftCriterion; } - private static double? GetLowestUpliftFactor(SurfaceLine2 surfaceLine, SoilProfile1D soilProfile1D, string soilGeometry2DName, - SoilProfile2D soilProfile2D, PlLines plLines, Location location, out double xCoordLowestUpliftFactor) + private static double? GetLowestUpliftFactor(SurfaceLine2 surfaceLine, SoilProfile1D soilProfile1D, + SoilProfile2D soilProfile2D, PlLines plLines, Location location, + out double xCoordLowestUpliftFactor) { var upliftLocationDeterminator = new UpliftLocationDeterminator { SurfaceLine = surfaceLine, SoilProfile = soilProfile1D, SoilProfile2D = soilProfile2D, - SoilGeometry2DName = soilGeometry2DName, SoilList = location.SoilList, DikeEmbankmentMaterial = location.GetDikeEmbankmentSoil(), PlLines = plLines, Index: DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/General/SegmentTests.cs =================================================================== diff -u -r4624 -r5960 --- DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/General/SegmentTests.cs (.../SegmentTests.cs) (revision 4624) +++ DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/General/SegmentTests.cs (.../SegmentTests.cs) (revision 5960) @@ -29,51 +29,47 @@ public class SegmentTests { [Test] - public void CanGetMostProbableProbableProfile1DForStability() + public void CanGetMostProbableSoilGeometryProbability1DForStability() { Segment segment = CreateSegment(SegmentFailureMechanismType.Stability, SoilProfileType.ProfileType1D); - Assert.That(segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Stability).SoilProfile1D.Name, Is.EqualTo("profile 1D 2")); - Assert.That(segment.GetMostProbableProfile1D(SegmentFailureMechanismType.Stability).Name, Is.EqualTo("profile 1D 2")); - Assert.That(segment.GetMostProbableProfile2DStiFileName(SegmentFailureMechanismType.Stability), Is.EqualTo(null)); - Assert.That(segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Piping), Is.EqualTo(null)); - Assert.That(segment.GetMostProbableProfile2DStiFileName(SegmentFailureMechanismType.Piping), Is.EqualTo(null)); - Assert.That(segment.GetMostProbableProfile1D(SegmentFailureMechanismType.Piping), Is.EqualTo(null)); + Assert.Multiple(() => + { + Assert.That(segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Stability).SoilProfile1D.Name, Is.EqualTo("profile 1D 2")); + Assert.That(segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Piping), Is.EqualTo(null)); + }); } [Test] - public void CanGetMostProbableProbableProfile1DForPiping() + public void CanGetMostProbableSoilGeometryProbability1DForPiping() { Segment segment = CreateSegment(SegmentFailureMechanismType.Piping, SoilProfileType.ProfileType1D); - Assert.That(segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Piping).SoilProfile1D.Name, Is.EqualTo("profile 1D 2")); - Assert.That(segment.GetMostProbableProfile1D(SegmentFailureMechanismType.Piping).Name, Is.EqualTo("profile 1D 2")); - Assert.That(segment.GetMostProbableProfile2DStiFileName(SegmentFailureMechanismType.Piping), Is.EqualTo(null)); - Assert.That(segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Stability), Is.EqualTo(null)); - Assert.That(segment.GetMostProbableProfile2DStiFileName(SegmentFailureMechanismType.Stability), Is.EqualTo(null)); - Assert.That(segment.GetMostProbableProfile1D(SegmentFailureMechanismType.Stability), Is.EqualTo(null)); + Assert.Multiple(() => + { + Assert.That(segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Piping).SoilProfile1D.Name, Is.EqualTo("profile 1D 2")); + Assert.That(segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Stability), Is.EqualTo(null)); + }); } [Test] - public void CanGetMostProbableProbableProfile2DStiFileNameForStability() + public void CanGetMostProbableSoilGeometryProbability2DForStability() { - Segment segment = CreateSegment(SegmentFailureMechanismType.Stability, SoilProfileType.ProfileTypeStiFile); - Assert.That(segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Stability).FullStiFileName, Is.EqualTo("sti filename 2")); - Assert.That(segment.GetMostProbableProfile2DStiFileName(SegmentFailureMechanismType.Stability), Is.EqualTo("sti filename 2")); - Assert.That(segment.GetMostProbableProfile1D(SegmentFailureMechanismType.Stability), Is.EqualTo(null)); - Assert.That(segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Piping), Is.EqualTo(null)); - Assert.That(segment.GetMostProbableProfile2DStiFileName(SegmentFailureMechanismType.Piping), Is.EqualTo(null)); - Assert.That(segment.GetMostProbableProfile1D(SegmentFailureMechanismType.Piping), Is.EqualTo(null)); + Segment segment = CreateSegment(SegmentFailureMechanismType.Stability, SoilProfileType.ProfileType2D); + Assert.Multiple(() => + { + Assert.That(segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Stability).SoilProfile2D.Name, Is.EqualTo("profile 2D 2")); + Assert.That(segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Piping), Is.EqualTo(null)); + }); } [Test] - public void CanGetMostProbableProbableProfile2DStiFileNameForPiping() + public void CanGetMostProbableSoilGeometryProbability2DForPiping() { - Segment segment = CreateSegment(SegmentFailureMechanismType.Piping, SoilProfileType.ProfileTypeStiFile); - Assert.That(segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Piping).FullStiFileName, Is.EqualTo("sti filename 2")); - Assert.That(segment.GetMostProbableProfile2DStiFileName(SegmentFailureMechanismType.Piping), Is.EqualTo("sti filename 2")); - Assert.That(segment.GetMostProbableProfile1D(SegmentFailureMechanismType.Piping), Is.EqualTo(null)); - Assert.That(segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Stability), Is.EqualTo(null)); - Assert.That(segment.GetMostProbableProfile2DStiFileName(SegmentFailureMechanismType.Stability), Is.EqualTo(null)); - Assert.That(segment.GetMostProbableProfile1D(SegmentFailureMechanismType.Stability), Is.EqualTo(null)); + Segment segment = CreateSegment(SegmentFailureMechanismType.Piping, SoilProfileType.ProfileType2D); + Assert.Multiple(() => + { + Assert.That(segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Piping).SoilProfile2D.Name, Is.EqualTo("profile 2D 2")); + Assert.That(segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Stability), Is.EqualTo(null)); + }); } private static Segment CreateSegment(SegmentFailureMechanismType segmentFailureMechanismType, SoilProfileType soilProfileType) @@ -84,7 +80,10 @@ Probability = 0.1, SegmentFailureMechanismType = segmentFailureMechanismType, SoilProfileType = soilProfileType, - FullStiFileName = "sti filename 1", + SoilProfile2D = new SoilProfile2D + { + Name = "profile 2D 1" + }, SoilProfile1D = new SoilProfile1D { Name = "profile 1D 1" @@ -95,7 +94,10 @@ Probability = 0.4, SegmentFailureMechanismType = segmentFailureMechanismType, SoilProfileType = soilProfileType, - FullStiFileName = "sti filename 2", + SoilProfile2D = new SoilProfile2D + { + Name = "profile 2D 2" + }, SoilProfile1D = new SoilProfile1D { Name = "profile 1D 2" @@ -106,7 +108,10 @@ Probability = 0.3, SegmentFailureMechanismType = segmentFailureMechanismType, SoilProfileType = soilProfileType, - FullStiFileName = "sti filename 3", + SoilProfile2D = new SoilProfile2D + { + Name = "profile 2D 3" + }, SoilProfile1D = new SoilProfile1D { Name = "profile 1D 3" @@ -117,7 +122,10 @@ Probability = 0.2, SegmentFailureMechanismType = segmentFailureMechanismType, SoilProfileType = soilProfileType, - FullStiFileName = "sti filename 4", + SoilProfile2D = new SoilProfile2D + { + Name = "profile 2D 4" + }, SoilProfile1D = new SoilProfile1D { Name = "profile 1D 4" Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/UpliftHelperTests.cs =================================================================== diff -u -r5404 -r5960 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/UpliftHelperTests.cs (.../UpliftHelperTests.cs) (revision 5404) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/UpliftHelperTests.cs (.../UpliftHelperTests.cs) (revision 5960) @@ -39,8 +39,6 @@ DamKernelInput damKernelInput = CreateDamKernelInput(); damKernelInput.SubSoilScenario.SoilProfileType = SoilProfileType.ProfileType2D; - damKernelInput.SubSoilScenario.StiFileName = ""; - damKernelInput.SubSoilScenario.FullStiFileName = ""; damKernelInput.SubSoilScenario.SoilProfile2D = soilProfile2D; damKernelInput.Location.ModelFactors.UpliftCriterionStability = 1.2; Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/LocationEnumerations.cs =================================================================== diff -u -r4540 -r5960 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/LocationEnumerations.cs (.../LocationEnumerations.cs) (revision 4540) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/LocationEnumerations.cs (.../LocationEnumerations.cs) (revision 5960) @@ -27,8 +27,7 @@ public enum SoilProfileType { ProfileType1D, - ProfileType2D, - ProfileTypeStiFile + ProfileType2D } ///