Index: src/Deltares.Geotechnics.IO.Tests/SoilModelDatabaseTest.cs
===================================================================
diff -u -r14 -r49
--- src/Deltares.Geotechnics.IO.Tests/SoilModelDatabaseTest.cs (.../SoilModelDatabaseTest.cs) (revision 14)
+++ src/Deltares.Geotechnics.IO.Tests/SoilModelDatabaseTest.cs (.../SoilModelDatabaseTest.cs) (revision 49)
@@ -5,7 +5,6 @@
using System.IO;
using System.Linq;
using System.Xml.Serialization;
-using Deltares.DeltaModel;
using Deltares.Geographic;
using Deltares.Geometry;
using Deltares.Geotechnics;
@@ -629,107 +628,6 @@
}
///
- /// Test the Deltares.Standard.IO.Importer interface, as used by RingToets to import subsoil data
- ///
- [Test]
- public void ImportInterfaceForRingToetsSoilProfiles1DAnd2D()
- {
- var deltamodel = new DeltaModel();
- var factory = new DeltaModelFactory(deltamodel);
-
- using (var importer = new SoilModelDatabase())
- {
- importer.FileName = TestDataFolder + "Groot Salland.soil";
- importer.Factory = factory;
- importer.Type = typeof(SoilProfile); // both 1D & 2D
- importer.Import();
- }
-
- Assert.AreEqual(deltamodel.Soils.Soils.Count, 65);
- Assert.AreEqual(deltamodel.SoilProfiles1D.Count, 5);
- var sample1D = deltamodel.SoilProfiles1D.First(p => p.Name == "21225007");
- Assert.AreEqual(sample1D.LayerCount, 95);
- Assert.AreEqual(deltamodel.SoilProfiles2D.Count, 1);
- var sample2D = deltamodel.SoilProfiles2D.First(p => p.Name == "10Y_005_STBI.sti");
- Assert.AreEqual(sample2D.Surfaces.Count, 13);
-
- // rinse and repeat
- sample1D.Layers.Clear();
- sample2D.Surfaces.Clear();
- using (var importer = new SoilModelDatabase())
- {
- importer.FileName = TestDataFolder + "Groot Salland.soil";
- importer.Factory = factory;
- importer.Type = typeof(SoilProfile); // both 1D & 2D
- importer.Import();
- }
-
- Assert.AreEqual(deltamodel.Soils.Soils.Count, 65);
- Assert.AreEqual(deltamodel.SoilProfiles1D.Count, 5);
- var resample1D = deltamodel.SoilProfiles1D.First(p => p.Name == "21225007");
- Assert.AreEqual(resample1D.LayerCount, 95);
- Assert.AreSame(sample1D, resample1D);
- Assert.AreEqual(deltamodel.SoilProfiles2D.Count, 1);
- var resample2D = deltamodel.SoilProfiles2D.First(p => p.Name == "10Y_005_STBI.sti");
- Assert.AreEqual(resample2D.Surfaces.Count, 13);
- Assert.AreSame(sample2D, resample2D);
-
- // check if any soil properties have been Set (to non-default values)
- foreach (var layer in sample1D.Layers)
- {
- Assert.IsTrue(layer.Soil.GetOrdinaryParameters().Count > 0 || layer.Soil.GetStochasticParameters().Count > 0);
- }
- foreach (var layer in sample2D.Surfaces)
- {
- Assert.IsTrue(layer.Soil.GetOrdinaryParameters().Count > 0 || layer.Soil.GetStochasticParameters().Count > 0);
- }
- }
-
- ///
- /// Test the Deltares.Standard.IO.Importer interface, as used by RingToets to import subsoil data
- /// Special case: 2D profiles used for Piping are converted to 1D when imported by RingToets
- ///
- [Test]
- public void ImportInterfaceForRingToetsSoilProfiles2DForPipingConvertedTo1D()
- {
- var deltamodel = new DeltaModel();
- var factory = new DeltaModelFactory(deltamodel);
-
- using (var importer = new SoilModelDatabase())
- {
- // this file containss 2D profiles for segment_"dijkring10_dwp00_5_piping", "dijkring10_dwp02_4_piping" and "dijkring10_dwp04_1_piping"
- // only the first one has a SpecificMechanismPointLocation defined so the second one cannot be converted
- importer.FileName = TestDataFolder + "SoilSegments_Test2D21D.soil";
- importer.Factory = factory;
- importer.Type = typeof(SoilSegment); // import soil profiles & segments
- importer.Import();
- }
- Assert.AreEqual(205, deltamodel.Soils.Soils.Count);
- Assert.AreEqual(37, deltamodel.SoilProfiles1D.Count);
-
- // the 1D profiles, named *_1D are created by the 2D > 1D conversion
- var profile1D = deltamodel.SoilProfiles1D.FirstOrDefault(p => p.Name == "10Y_005_STBI_1D");
- Assert.NotNull(profile1D);
- Assert.AreEqual(6, profile1D.LayerCount);
- var segments = deltamodel.SoilSegments.Where(s => s.Mechanism == Mechanism.Piping && s.StochasticSoilModel.StochasticSoilProfiles.FirstOrDefault(p => p.Profile == profile1D) != null);
- Assert.AreEqual(1, segments.Count());
-
- // the second one is empty because the SpecificMechanismPointLocation for piping was undefined
- profile1D = deltamodel.SoilProfiles1D.FirstOrDefault(p => p.Name == "10Y_024_STBI_1D");
- Assert.NotNull(profile1D);
- Assert.AreEqual(0, profile1D.LayerCount);
- segments = deltamodel.SoilSegments.Where(s => s.Mechanism == Mechanism.Piping && s.StochasticSoilModel.StochasticSoilProfiles.FirstOrDefault(p => p.Profile == profile1D) != null);
- Assert.AreEqual(1, segments.Count());
-
- // the third one is converted to 1D as usual
- profile1D = deltamodel.SoilProfiles1D.FirstOrDefault(p => p.Name == "10Y_041_STBI_1D");
- Assert.NotNull(profile1D);
- Assert.AreEqual(3, profile1D.LayerCount);
- segments = deltamodel.SoilSegments.Where(s => s.Mechanism == Mechanism.Piping && s.StochasticSoilModel.StochasticSoilProfiles.FirstOrDefault(p => p.Profile == profile1D) != null);
- Assert.AreEqual(1, segments.Count());
- }
-
- ///
/// Creates one Schematized surface line with 5 points, two characteristic points, a name, an origin and an angle,
/// writes it to the database, reads it out again and compares relevant properties.
///