Index: src/Deltares.DSoilModel.Tests/DSoilModelIOTest.cs
===================================================================
diff -u -r7 -r14
--- src/Deltares.DSoilModel.Tests/DSoilModelIOTest.cs (.../DSoilModelIOTest.cs) (revision 7)
+++ src/Deltares.DSoilModel.Tests/DSoilModelIOTest.cs (.../DSoilModelIOTest.cs) (revision 14)
@@ -110,7 +110,7 @@
public void ImportDamSegmentsFromDefxFile()
{
// setup
- string tutorial = Path.Combine(TestHelper.GetDataPath(), @"Dam\Benchmarks\KernelComparison\Dam Tutorial Design", "DAM Tutorial Design.defx");
+ string tutorial = Path.Combine(@"..\..\..\data", @"DAM\Dam Tutorial Design", "DAM Tutorial Design.defx");
Assert.IsTrue(File.Exists(tutorial));
// call
@@ -138,7 +138,7 @@
[Category(Categories.Slow)]
public void ImportDuplicateMdbDoesNotCreateDuplicateSoils()
{
- string mdbFile = Path.Combine(TestHelper.GetDataPath(), "D-Soil Model", "Groot Salland.mdb");
+ string mdbFile = Path.Combine(@"..\..\..\data", "D-Soil Model", "Groot Salland.mdb");
var project = new DSoilModelProject();
project.ReadSoilsFromDatabase(mdbFile);
@@ -199,7 +199,7 @@
// setup using DAM files
const string segmentFile = "segments.csv";
const string soilprofileFile = "soilprofiles.csv";
- var dir = TestHelper.GetDataPath() + @"\Dam\Waterboards\Delfland\regionaal\csv files\";
+ var dir = @"..\..\..\data\\Dam\Waterboards\Delfland\regionaal\csv files\";
using (var project = new DSoilModelProject())
{
// complete import
Index: src/Deltares.DSoilModel.Tests/TestData/Groot Salland.mdb
===================================================================
diff -u
Binary files differ
Index: src/Deltares.DSoilModel.Forms/Deltares.DSoilModel.Forms.csproj
===================================================================
diff -u -r9 -r14
--- src/Deltares.DSoilModel.Forms/Deltares.DSoilModel.Forms.csproj (.../Deltares.DSoilModel.Forms.csproj) (revision 9)
+++ src/Deltares.DSoilModel.Forms/Deltares.DSoilModel.Forms.csproj (.../Deltares.DSoilModel.Forms.csproj) (revision 14)
@@ -21,7 +21,7 @@
true
- ..\..\bin\Debug\
+ ..\bin\Debug\
DEBUG;TRACE
full
x86
@@ -71,7 +71,7 @@
0
- ..\..\bin\Release\
+ ..\bin\Release\
TRACE
true
pdbonly
@@ -98,6 +98,12 @@
MinimumRecommendedRules.ruleset
+
+ ..\..\lib\DotSpatial.BrutileLayer\BruTile.dll
+
+
+ ..\..\lib\DotSpatial.BrutileLayer\BruTile.Desktop.dll
+
False
..\..\lib\Deltares\Deltares.DeltaModel.dll
@@ -171,6 +177,10 @@
False
..\..\lib\DotSpatial\DotSpatial.Topology.dll
+
+ False
+ ..\..\lib\DotSpatial.BrutileLayer\SmartThreadPool.dll
+
Index: src/Deltares.DSoilModel.Tests/TestData/SoilProperties.xml
===================================================================
diff -u
--- src/Deltares.DSoilModel.Tests/TestData/SoilProperties.xml (revision 0)
+++ src/Deltares.DSoilModel.Tests/TestData/SoilProperties.xml (revision 14)
@@ -0,0 +1,100 @@
+
+
+ Mechanisms
+ Name
+ Description
+ Color
+ BelowPhreaticLevel
+ AbovePhreaticLevel
+ DryUnitWeight
+ Cohesion
+ CohesionStochast
+ EMod
+ FrictionAngle
+ FrictionAngleStochast
+ StressTable
+ StressTableStochast
+ BondStressTable
+ POP
+ POPStochast
+ OCR
+ OCRStochast
+ RatioCuPc
+ RatioCuPcStochast
+ RatioCuPcPassive
+ RatioCuPcPassiveStochast
+ RatioCuPcActive
+ RatioCuPcActiveStochast
+ Cu
+ CuStochast
+ CuTop
+ CuTopStochast
+ CuActiveTop
+ CuActiveTopStochast
+ CuPassiveTop
+ CuPassiveTopStochast
+ CuBottom
+ CuBottomStochast
+ CuActiveBottom
+ CuActiveBottomStochast
+ CuPassiveBottom
+ CuPassiveBottomStochast
+ CuGradient
+ CuGradientStochast
+ UseDefaultProbabilisticValues
+ UsePop
+ RRatio
+ RRatioStochast
+ SoilPropertyManager
+ ExcessPorePressure
+ PorePressureFactor
+ CorrelationCPhi
+ Pn
+ PnStochast
+ FormReferencePn
+ UseDefaultShearStrengthModel
+ DilatancyType
+ StrengthIncreaseExponent
+ ShearStrengthModel
+ UserShearStrengthModel
+ UseDefaultShearStrengthInput
+ InputModeReliabilityAnalysisOption
+ UserShearStrengthInput
+ RestSlope
+ SoilType
+ PermeabKx
+ PermeabKxStochast
+ DiameterD15
+ DiameterD50
+ DiameterD50Stochast
+ DiameterD70
+ DiameterD70Stochast
+ DiameterD90
+ BeddingAngle
+ BeddingAngleStochast
+ WhitesConstant
+ WhitesConstantStochast
+ UseSoilType
+ SoilGroup
+ Alpha
+ AlphaGrd
+ Equilibrium
+ Iterations
+ CalculationPoints
+ ComputedPermeability
+ Vwal
+ FlowWidth
+ Porosity
+ MinPorosity
+ MaxPorosity
+ StateParameter
+ Evoldm
+ Ks0
+ ParS2
+ GammaKorrel
+ ParM
+ ParR
+ ParU
+ ParV
+ AllowedUserColumnFilters
+
\ No newline at end of file
Index: src/Deltares.Geotechnics.IO.Tests/SurfaceLinesImporterTest.cs
===================================================================
diff -u -r6 -r14
--- src/Deltares.Geotechnics.IO.Tests/SurfaceLinesImporterTest.cs (.../SurfaceLinesImporterTest.cs) (revision 6)
+++ src/Deltares.Geotechnics.IO.Tests/SurfaceLinesImporterTest.cs (.../SurfaceLinesImporterTest.cs) (revision 14)
@@ -22,7 +22,7 @@
[TestFixtureSetUp]
public void TestFixtureSetUp()
{
- testDataFolder = Path.Combine("..", "..", "Geotechnics", "Tests", "TestData", "CSVImportTest");
+ testDataFolder = Path.Combine(@"..\..\..\data", "Geotechnics", "CSVImportTest");
}
///
Index: src/DSoilModel.sln
===================================================================
diff -u -r11 -r14
--- src/DSoilModel.sln (.../DSoilModel.sln) (revision 11)
+++ src/DSoilModel.sln (.../DSoilModel.sln) (revision 14)
@@ -19,6 +19,8 @@
EndProject
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Deltares.DSoilModel.Setup", "Deltares.DSoilModel.Setup\Deltares.DSoilModel.Setup.wixproj", "{E3E0CC29-5031-47E2-B230-C077B9BB5061}"
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{EEEE9444-BDDA-44ED-A139-4A7B6F93BBCA}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x86 = Debug|x86
@@ -75,12 +77,15 @@
{7F3A1524-E28B-47BF-94BB-4571D304BE16}.Release|x86.ActiveCfg = Release|x86
{7F3A1524-E28B-47BF-94BB-4571D304BE16}.Release|x86.Build.0 = Release|x86
{E3E0CC29-5031-47E2-B230-C077B9BB5061}.Debug|x86.ActiveCfg = Debug|x86
- {E3E0CC29-5031-47E2-B230-C077B9BB5061}.Debug|x86.Build.0 = Debug|x86
{E3E0CC29-5031-47E2-B230-C077B9BB5061}.DebugWithSources|x86.ActiveCfg = Debug|x86
- {E3E0CC29-5031-47E2-B230-C077B9BB5061}.DebugWithSources|x86.Build.0 = Debug|x86
{E3E0CC29-5031-47E2-B230-C077B9BB5061}.Release|x86.ActiveCfg = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
+ GlobalSection(NestedProjects) = preSolution
+ {2961067E-0D46-4A68-AC21-962CC5B0A626} = {EEEE9444-BDDA-44ED-A139-4A7B6F93BBCA}
+ {7F3A1524-E28B-47BF-94BB-4571D304BE16} = {EEEE9444-BDDA-44ED-A139-4A7B6F93BBCA}
+ {7DD9B469-0E1C-4592-8ED8-197128D012CA} = {EEEE9444-BDDA-44ED-A139-4A7B6F93BBCA}
+ EndGlobalSection
EndGlobal
Index: src/Deltares.Geotechnics.IO.Tests/SoilModelDatabaseTest.cs
===================================================================
diff -u -r6 -r14
--- src/Deltares.Geotechnics.IO.Tests/SoilModelDatabaseTest.cs (.../SoilModelDatabaseTest.cs) (revision 6)
+++ src/Deltares.Geotechnics.IO.Tests/SoilModelDatabaseTest.cs (.../SoilModelDatabaseTest.cs) (revision 14)
@@ -32,7 +32,7 @@
public class SoilModelDatabaseTest
{
private bool oldIsDataEventPublishStopped;
- private const string TestDataFolder = @"..\..\DSoilModel\Tests\TestData\";
+ private const string TestDataFolder = @"..\..\Deltares.DSoilModel.Tests\TestData\";
private const string TestOutputFolder = TestDataFolder + @"SoilModelDatabaseTest\";
[TestFixtureSetUp]
Index: lib/DotSpatial.BrutileLayer/BruTile.Desktop.dll
===================================================================
diff -u
Binary files differ
Index: src/Deltares.DSoilModel.Tests/TestData/Groot Salland.soil
===================================================================
diff -u
Binary files differ
Index: src/Deltares.DSoilModel.Tests/TestData/SoilLayer2DProperties.xml
===================================================================
diff -u
--- src/Deltares.DSoilModel.Tests/TestData/SoilLayer2DProperties.xml (revision 0)
+++ src/Deltares.DSoilModel.Tests/TestData/SoilLayer2DProperties.xml (revision 14)
@@ -0,0 +1,100 @@
+
+
+ Mechanisms
+ Name
+ Description
+ Color
+ BelowPhreaticLevel
+ AbovePhreaticLevel
+ DryUnitWeight
+ Cohesion
+ CohesionStochast
+ EMod
+ FrictionAngle
+ FrictionAngleStochast
+ StressTable
+ StressTableStochast
+ BondStressTable
+ POP
+ POPStochast
+ OCR
+ OCRStochast
+ RatioCuPc
+ RatioCuPcStochast
+ RatioCuPcPassive
+ RatioCuPcPassiveStochast
+ RatioCuPcActive
+ RatioCuPcActiveStochast
+ Cu
+ CuStochast
+ CuTop
+ CuTopStochast
+ CuActiveTop
+ CuActiveTopStochast
+ CuPassiveTop
+ CuPassiveTopStochast
+ CuBottom
+ CuBottomStochast
+ CuActiveBottom
+ CuActiveBottomStochast
+ CuPassiveBottom
+ CuPassiveBottomStochast
+ CuGradient
+ CuGradientStochast
+ UseDefaultProbabilisticValues
+ UsePop
+ RRatio
+ RRatioStochast
+ SoilPropertyManager
+ ExcessPorePressure
+ PorePressureFactor
+ CorrelationCPhi
+ Pn
+ PnStochast
+ FormReferencePn
+ UseDefaultShearStrengthModel
+ DilatancyType
+ StrengthIncreaseExponent
+ ShearStrengthModel
+ UserShearStrengthModel
+ UseDefaultShearStrengthInput
+ InputModeReliabilityAnalysisOption
+ UserShearStrengthInput
+ RestSlope
+ SoilType
+ PermeabKx
+ PermeabKxStochast
+ DiameterD15
+ DiameterD50
+ DiameterD50Stochast
+ DiameterD70
+ DiameterD70Stochast
+ DiameterD90
+ BeddingAngle
+ BeddingAngleStochast
+ WhitesConstant
+ WhitesConstantStochast
+ UseSoilType
+ SoilGroup
+ Alpha
+ AlphaGrd
+ Equilibrium
+ Iterations
+ CalculationPoints
+ ComputedPermeability
+ Vwal
+ FlowWidth
+ Porosity
+ MinPorosity
+ MaxPorosity
+ StateParameter
+ Evoldm
+ Ks0
+ ParS2
+ GammaKorrel
+ ParM
+ ParR
+ ParU
+ ParV
+ AllowedUserColumnFilters
+
\ No newline at end of file
Index: src/Deltares.Soilbase.Test/Deltares.Soilbase.Tests.csproj
===================================================================
diff -u -r7 -r14
--- src/Deltares.Soilbase.Test/Deltares.Soilbase.Tests.csproj (.../Deltares.Soilbase.Tests.csproj) (revision 7)
+++ src/Deltares.Soilbase.Test/Deltares.Soilbase.Tests.csproj (.../Deltares.Soilbase.Tests.csproj) (revision 14)
@@ -20,14 +20,14 @@
true
- ..\..\bin\Debug\
+ ..\bin\Debug\
DEBUG;TRACE
full
x86
prompt
- ..\..\bin\Release\
+ ..\bin\Release\
TRACE
true
pdbonly
@@ -97,9 +97,15 @@
+
+ Always
+
Always
+
+ Always
+
Index: src/Deltares.DSoilModel.Application/Deltares.DSoilModel.Application.csproj
===================================================================
diff -u -r6 -r14
--- src/Deltares.DSoilModel.Application/Deltares.DSoilModel.Application.csproj (.../Deltares.DSoilModel.Application.csproj) (revision 6)
+++ src/Deltares.DSoilModel.Application/Deltares.DSoilModel.Application.csproj (.../Deltares.DSoilModel.Application.csproj) (revision 14)
@@ -20,15 +20,15 @@
true
- ..\..\bin\Debug\
+ ..\bin\Debug\
DEBUG;TRACE
full
x86
prompt
MinimumRecommendedRules.ruleset
- ..\..\bin\Release\
+ ..\bin\Release\
TRACE
true
pdbonly
Index: src/Deltares.DSoilModel.Tests/TestData/demo-3-bore.gef
===================================================================
diff -u
--- src/Deltares.DSoilModel.Tests/TestData/demo-3-bore.gef (revision 0)
+++ src/Deltares.DSoilModel.Tests/TestData/demo-3-bore.gef (revision 14)
@@ -0,0 +1,157 @@
+#GEFID = 1, 0, 0
+#COLUMN = 2
+#COLUMNINFO = 1, m, diepte onderkant laag, 1
+#COLUMNINFO = 2, m, diepte bovenkant laag, 2
+#COLUMNVOID = 3, 0.0
+#COLUMNTEXT = 1, verplicht
+#RECORDSEPARATOR = !
+#COLUMNSEPARATOR = ;
+#COMPANYID= DEMO B.V., 9999999B09, 99
+#FILEOWNER= DMO
+#FILEDATE= 2001,10,21
+#LASTSCAN= 9
+#MEASUREMENTCODE= NEN5104, 1, 0, 0, NNI 1989
+#MEASUREMENTTEXT= 1, Een opdrachtgever, opdrachtgever
+#MEASUREMENTTEXT= 2, Een Projectnaam, projectnaam
+#MEASUREMENTTEXT= 3, Een plaatsnaam, plaatsnaam
+#MEASUREMENTTEXT =4, Ja, boring uitgevoerd volgens NEN 5119
+#MEASUREMENTTEXT = 5, 2001-09-25, datum boorbeschrijving
+#MEASUREMENTTEXT = 6, Een beschrijver, beschrijver lagen
+#MEASUREMENTTEXT = 9, maaiveld, vast horizontaal niveau
+#MEASUREMENTTEXT = 13, Een boorbedrijf, boorbedrijf
+#MEASUREMENTTEXT = 16, 2001-09-18, datum boring
+#MEASUREMENTTEXT = 17, nat, vochtigheidstoestand grond
+#MEASUREMENTTEXT = 18, Ja, Peilbuizen zijn er
+#MEASUREMENTTEXT = 19, 2001-09-19, einddatum boring
+#MEASUREMENTTEXT = 20, 999/999, bij sondering
+#MEASUREMENTTEXT = 21, Ja, Boor- en steunvloeistof
+#MEASUREMENTTEXT = 22, leidingwater, omschrijving boor- en steunvloeistof
+#MEASUREMENTTEXT = 23, Een boormeester, boormeester
+#MEASUREMENTTEXT = 31, AVH, boormethode
+#MEASUREMENTTEXT = 32, PUL, boormethode
+#MEASUREMENTVAR = 13, 1.5, m, voorgegraven diepte
+#MEASUREMENTVAR = 14, 0.55, m, GHG
+#MEASUREMENTVAR = 15, 1.20, m, GLG
+#MEASUREMENTVAR = 16, 25.0, m, einddiepte
+#MEASUREMENTVAR = 17, 500, l, verbruik boor- en steunvloeistof
+#MEASUREMENTVAR = 18, 2.50, m, grondwaterstand tijdens boren
+#MEASUREMENTVAR = 19, 2, - , aantal peilbuizen
+#MEASUREMENTVAR = 31, 3.00, m, onderdiepte traject
+#MEASUREMENTVAR = 32, 150, mm, boorbuisdiameter
+#MEASUREMENTVAR = 33, 25.00, m, onderdiepte traject
+#MEASUREMENTVAR = 34, 150, mm, boorbuisdiameter
+#SPECIMENVAR = 1, 11, -, aantal monsters
+#SPECIMENVAR = 11, 2.8, m, bovenkant monster 1
+#SPECIMENVAR = 12, 3.2, m, onderkant monster 1
+#SPECIMENVAR = 13, 67, mm, diameter monster 1
+#SPECIMENVAR = 14, 80, mm, diameter monstersteekapparaat monster 1
+#SPECIMENVAR = 18, 3.8, m, bovenkant monster 2
+#SPECIMENVAR = 19, 4.2, m, onderkant monster 2
+#SPECIMENVAR = 20, 67, mm, diameter monster 2
+#SPECIMENVAR = 21, 80, mm, diameter monstersteekapparaat monster 2
+#SPECIMENVAR = 25, 4.8, m, bovenkant monster 3
+#SPECIMENVAR = 26, 5.2, m, onderkant monster 3
+#SPECIMENVAR = 27, 67, mm, diameter monster 3
+#SPECIMENVAR = 28, 80, mm, diameter monstersteekapparaat monster 3
+#SPECIMENVAR = 32, 5.8, m, bovenkant monster 4
+#SPECIMENVAR = 33, 6.2, m, onderkant monster 4
+#SPECIMENVAR = 34, 67, mm, diameter monster 4
+#SPECIMENVAR = 35, 80, mm, diameter monstersteekapparaat monster 4
+#SPECIMENVAR = 39, 6.5, m, bovenkant monster 5
+#SPECIMENVAR = 40, 6.9, m, onderkant monster 5
+#SPECIMENVAR = 41, 67, mm, diameter monster 5
+#SPECIMENVAR = 42, 80, mm, diameter monstersteekapparaat monster 5
+#SPECIMENVAR = 46, 6.9, m, bovenkant monster 6
+#SPECIMENVAR = 47, 7.3, m, onderkant monster 6
+#SPECIMENVAR = 48, 67, mm, diameter monster 6
+#SPECIMENVAR = 49, 80, mm, diameter monstersteekapparaat monster 6
+#SPECIMENVAR = 53, 7.3, m, bovenkant monster 7
+#SPECIMENVAR = 54, 7.7, m, onderkant monster 7
+#SPECIMENVAR = 55, 67, mm, diameter monster 7
+#SPECIMENVAR = 56, 80, mm, diameter monstersteekapparaat monster 7
+#SPECIMENVAR = 60, 9.5, m, bovenkant monster 8
+#SPECIMENVAR = 61, 9.9, m, onderkant monster 8
+#SPECIMENVAR = 62, 67, mm, diameter monster 8
+#SPECIMENVAR = 63, 80, mm, diameter monstersteekapparaat monster 8
+#SPECIMENVAR = 67, 14.5, m, bovenkant monster 9
+#SPECIMENVAR = 68, 14.9, m, onderkant monster 9
+#SPECIMENVAR = 69, 67, mm, diameter monster 9
+#SPECIMENVAR = 70, 80, mm, diameter monstersteekapparaat monster 9
+#SPECIMENVAR = 74, 20.6, m, bovenkant monster 10
+#SPECIMENVAR = 75, 21, m, onderkant monster 10
+#SPECIMENVAR = 76, 67, mm, diameter monster 10
+#SPECIMENVAR = 77, 80, mm, diameter monstersteekapparaat monster 10
+#SPECIMENVAR = 81, 21, m, bovenkant monster 11
+#SPECIMENVAR = 82, 21.4, m, onderkant monster 11
+#SPECIMENVAR = 83, 67, mm, diameter monster 11
+#SPECIMENVAR = 84, 80, mm, diameter monstersteekapparaat monster 11
+#SPECIMENTEXT = 11, 1, monstercode monster 1
+#SPECIMENTEXT = 14, G, (on)geroerd monster 1
+#SPECIMENTEXT = 15, AMS, monstersteekapparaat monster 1
+#SPECIMENTEXT = 16, DIK, dik of dunwandig monster 1
+#SPECIMENTEXT = 17, H, monstermethode monster 1
+#SPECIMENTEXT = 18, 2, monstercode monster 2
+#SPECIMENTEXT = 21, O, (on)geroerd monster 2
+#SPECIMENTEXT = 22, AMS, monstersteekapparaat monster 2
+#SPECIMENTEXT = 23, DUN, dik of dunwandig monster 2
+#SPECIMENTEXT = 24, H, monstermethode monster 2
+#SPECIMENTEXT = 25, 3, monstercode monster 3
+#SPECIMENTEXT = 28, O, (on)geroerd monster 3
+#SPECIMENTEXT = 29, AMS, monstersteekapparaat monster 3
+#SPECIMENTEXT = 30, DUN, dik of dunwandig monster 3
+#SPECIMENTEXT = 31, H, monstermethode monster 3
+#SPECIMENTEXT = 32, 4, monstercode monster 4
+#SPECIMENTEXT = 35, G, (on)geroerd monster 4
+#SPECIMENTEXT = 36, AMS, monstersteekapparaat monster 4
+#SPECIMENTEXT = 37, DUN, dik of dunwandig monster 4
+#SPECIMENTEXT = 38, H, monstermethode monster 4
+#SPECIMENTEXT = 39, 5, monstercode monster 5
+#SPECIMENTEXT = 42, O, (on)geroerd monster 5
+#SPECIMENTEXT = 43, AMS, monstersteekapparaat monster 5
+#SPECIMENTEXT = 44, DIK, dik of dunwandig monster 5
+#SPECIMENTEXT = 45, H, monstermethode monster 5
+#SPECIMENTEXT = 46, 6, monstercode monster 6
+#SPECIMENTEXT = 49, O, (on)geroerd monster 6
+#SPECIMENTEXT = 50, AMS, monstersteekapparaat monster 6
+#SPECIMENTEXT = 51, DUN, dik of dunwandig monster 6
+#SPECIMENTEXT = 52, H, monstermethode monster 6
+#SPECIMENTEXT = 53, 7, monstercode monster 7
+#SPECIMENTEXT = 56, G, (on)geroerd monster 7
+#SPECIMENTEXT = 57, AMS, monstersteekapparaat monster 7
+#SPECIMENTEXT = 58, DIK, dik of dunwandig monster 7
+#SPECIMENTEXT = 59, H, monstermethode monster 7
+#SPECIMENTEXT = 60, 8, monstercode monster 8
+#SPECIMENTEXT = 63, G, (on)geroerd monster 8
+#SPECIMENTEXT = 64, AMS, monstersteekapparaat monster 8
+#SPECIMENTEXT = 65, DUN, dik of dunwandig monster 8
+#SPECIMENTEXT = 66, H, monstermethode monster 8
+#SPECIMENTEXT = 67, 9, monstercode monster 9
+#SPECIMENTEXT = 70, O, (on)geroerd monster 9
+#SPECIMENTEXT = 71, AMS, monstersteekapparaat monster 9
+#SPECIMENTEXT = 72, DIK, dik of dunwandig monster 9
+#SPECIMENTEXT = 73, H, monstermethode monster 9
+#SPECIMENTEXT = 74, 10, monstercode monster 10
+#SPECIMENTEXT = 77, G, (on)geroerd monster 10
+#SPECIMENTEXT = 78, AMS, monstersteekapparaat monster 10
+#SPECIMENTEXT = 79, DUN, dik of dunwandig monster 10
+#SPECIMENTEXT = 80, H, monstermethode monster 10
+#SPECIMENTEXT = 81, 11, monstercode monster 11
+#SPECIMENTEXT = 84, G, (on)geroerd monster 11
+#SPECIMENTEXT = 85, AMS, monstersteekapparaat monster 11
+#SPECIMENTEXT = 86, DIK, dik of dunwandig monster 11
+#SPECIMENTEXT = 87, H, monstermethode monster 11
+#PROJECTID= A-9999
+#REPORTCODE = GEF-BORE-Report, 1, 0, 0, GeoDin version 3.1
+#TESTID = AA 999/999
+#XYID = 31000, 99999.23, 999999.481, 0.1, 0.05
+#ZID = 31000, 3.50, 0.01
+#EOH=
+0.00;1.50;'Zs2h1';'BR';'met kleilaagjes';!
+1.50;2.60;'Zs3';'ZMF GR';!
+2.60;4.25;'Vm';'BR';'met houtresten';!
+4.25;5.80;'Kh3';'GR';!
+5.80;6.30;'Zs1';'ZMG GR';!
+6.30;10.70;'Gz1';'GMG GR';!
+10.70;15.80;'Zs1';'ZZG GR';!
+15.80;20.20;'Ks4';'GR TBR';!
+20.20;25.00;'Zs1';'ZZG GR';!
Index: src/Deltares.DSoilModel.Tests/TestData/XmlOldNameExample.soil
===================================================================
diff -u
Binary files differ
Index: src/Deltares.DSoilModel.Tests/TestData/soil1200materials.mdb
===================================================================
diff -u
Binary files differ
Index: src/Deltares.DSoilModel.Tests/TestData/CPTDataSample.xml
===================================================================
diff -u
--- src/Deltares.DSoilModel.Tests/TestData/CPTDataSample.xml (revision 0)
+++ src/Deltares.DSoilModel.Tests/TestData/CPTDataSample.xml (revision 14)
@@ -0,0 +1,2351 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: src/Deltares.DSoilModel.Tests/TestData/demo-3-bore.xml
===================================================================
diff -u
--- src/Deltares.DSoilModel.Tests/TestData/demo-3-bore.xml (revision 0)
+++ src/Deltares.DSoilModel.Tests/TestData/demo-3-bore.xml (revision 14)
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
Index: src/Deltares.DSoilModel.Tests/TestData/soilmaterials.soil
===================================================================
diff -u
Binary files differ
Index: src/Deltares.DSoilModel.Tests/TestData/21225004.xml
===================================================================
diff -u
--- src/Deltares.DSoilModel.Tests/TestData/21225004.xml (revision 0)
+++ src/Deltares.DSoilModel.Tests/TestData/21225004.xml (revision 14)
@@ -0,0 +1,1318 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: src/Deltares.DSoilModel.Tests/TestData/SoilSegments.soil
===================================================================
diff -u
Binary files differ
Index: lib/Deltares/Deltares.Geotechnics.WaternetCreator.dll
===================================================================
diff -u
Binary files differ
Index: src/Deltares.DSoilModel.Tests/TestData/SoilSegments_Test2D21D.soil
===================================================================
diff -u
Binary files differ
Index: src/Deltares.DSoilModel.Tests/Deltares.DSoilModel.Tests.csproj
===================================================================
diff -u -r7 -r14
--- src/Deltares.DSoilModel.Tests/Deltares.DSoilModel.Tests.csproj (.../Deltares.DSoilModel.Tests.csproj) (revision 7)
+++ src/Deltares.DSoilModel.Tests/Deltares.DSoilModel.Tests.csproj (.../Deltares.DSoilModel.Tests.csproj) (revision 14)
@@ -15,7 +15,7 @@
true
- ..\..\bin\Debug\
+ ..\bin\Debug\
DEBUG;TRACE
full
x86
@@ -24,7 +24,7 @@
true
- ..\..\bin\Release\
+ ..\bin\Release\
TRACE
true
pdbonly
@@ -68,9 +68,8 @@
..\..\lib\Deltares\DslGeo\Deltares.Geotechnics.TestUtils.dll
-
- False
- ..\..\lib\Deltares\DslProbabilistic\Deltares.Mathematics.dll
+
+ ..\..\lib\Deltares\DslCore\Deltares.Mathematics.dll
..\..\lib\Deltares\DslProbabilistic\Deltares.Probabilistic.dll
@@ -153,6 +152,9 @@
Always
+
+ PreserveNewest
+
PreserveNewest
Index: src/Deltares.Soilbase.Test/TestFiles/soilmaterials.mdb
===================================================================
diff -u
Binary files differ
Index: src/Deltares.DSoilModel.Application/app.config
===================================================================
diff -u -r6 -r14
--- src/Deltares.DSoilModel.Application/app.config (.../app.config) (revision 6)
+++ src/Deltares.DSoilModel.Application/app.config (.../app.config) (revision 14)
@@ -9,30 +9,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -47,6 +23,5 @@
-
Index: src/Deltares.DSoilModel.Tests/TestData/SoilSegments_version_1_3_3.soil
===================================================================
diff -u
Binary files differ
Index: src/Deltares.Geotechnics.IO/Deltares.Geotechnics.IO.csproj
===================================================================
diff -u -r6 -r14
--- src/Deltares.Geotechnics.IO/Deltares.Geotechnics.IO.csproj (.../Deltares.Geotechnics.IO.csproj) (revision 6)
+++ src/Deltares.Geotechnics.IO/Deltares.Geotechnics.IO.csproj (.../Deltares.Geotechnics.IO.csproj) (revision 14)
@@ -15,7 +15,7 @@
true
- ..\..\bin\Debug\
+ ..\bin\Debug\
DEBUG;TRACE
full
x86
@@ -57,7 +57,7 @@
0
- ..\..\bin\Release\
+ ..\bin\Release\
TRACE
true
pdbonly
Index: src/Deltares.Geotechnics.IO.Tests/Deltares.Geotechnics.IO.Tests.csproj
===================================================================
diff -u -r7 -r14
--- src/Deltares.Geotechnics.IO.Tests/Deltares.Geotechnics.IO.Tests.csproj (.../Deltares.Geotechnics.IO.Tests.csproj) (revision 7)
+++ src/Deltares.Geotechnics.IO.Tests/Deltares.Geotechnics.IO.Tests.csproj (.../Deltares.Geotechnics.IO.Tests.csproj) (revision 14)
@@ -15,15 +15,15 @@
true
- ..\..\bin\Debug\
+ ..\bin\Debug\
DEBUG;TRACE
full
x86
prompt
MinimumRecommendedRules.ruleset
- ..\..\bin\Release\
+ ..\bin\Release\
TRACE
true
pdbonly
@@ -54,9 +54,8 @@
False
..\..\lib\Deltares\Deltares.DeltaModel.dll
-
- False
- ..\..\lib\Deltares\DslGeo\Deltares.Geographic.dll
+
+ ..\..\lib\Deltares\DslFormsMap\Deltares.Geographic.dll
False
Index: src/Deltares.DSoilModel.Data/Deltares.DSoilModel.Data.csproj
===================================================================
diff -u -r6 -r14
--- src/Deltares.DSoilModel.Data/Deltares.DSoilModel.Data.csproj (.../Deltares.DSoilModel.Data.csproj) (revision 6)
+++ src/Deltares.DSoilModel.Data/Deltares.DSoilModel.Data.csproj (.../Deltares.DSoilModel.Data.csproj) (revision 14)
@@ -22,7 +22,7 @@
true
- ..\..\bin\Debug\
+ ..\bin\Debug\
DEBUG;TRACE
full
x86
@@ -72,7 +72,7 @@
0
- ..\..\bin\Release\
+ ..\bin\Release\
TRACE
true
pdbonly
@@ -104,14 +104,17 @@
..\..\lib\Deltares\Deltares.DeltaModel.dll
- ..\..\lib\Deltares\DslGeo\Deltares.Geographic.dll
+ ..\..\lib\Deltares\DslFormsMap\Deltares.Geographic.dll
..\..\lib\Deltares\DslGeo\Deltares.Geometry.dll
..\..\lib\Deltares\DslGeo\Deltares.Geotechnics.dll
+
+ ..\..\lib\Deltares\Deltares.Geotechnics.WaternetCreator.dll
+
False
..\..\lib\Deltares\DslCore\Deltares.Mathematics.dll
@@ -181,6 +184,16 @@
Designer
+
+
+ borlndmm.dll
+ PreserveNewest
+
+
+ DGSMStabSerializer.dll
+ PreserveNewest
+
+