Index: dam clients/DamUI/trunk/src/Dam/Data/Translations.xml
===================================================================
diff -u -r339 -r673
--- dam clients/DamUI/trunk/src/Dam/Data/Translations.xml (.../Translations.xml) (revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/Translations.xml (.../Translations.xml) (revision 673)
@@ -152,7 +152,6 @@
-
Index: dam clients/DamUI/trunk/src/Dam/Tests/TestData/DamLive/Set3/output.damx
===================================================================
diff -u -r236 -r673
--- dam clients/DamUI/trunk/src/Dam/Tests/TestData/DamLive/Set3/output.damx (.../output.damx) (revision 236)
+++ dam clients/DamUI/trunk/src/Dam/Tests/TestData/DamLive/Set3/output.damx (.../output.damx) (revision 673)
@@ -1819,7 +1819,6 @@
-
Fisheye: Tag 673 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Tests/NonWaterRetainingObjectTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 673 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Data/NonWaterRetainingObject.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: dam clients/DamUI/trunk/src/Dam/Data/Properties/Settings.Designer.cs
===================================================================
diff -u -r339 -r673
--- dam clients/DamUI/trunk/src/Dam/Data/Properties/Settings.Designer.cs (.../Settings.Designer.cs) (revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/Properties/Settings.Designer.cs (.../Settings.Designer.cs) (revision 673)
@@ -1,25 +1,4 @@
-// Copyright (C) Stichting Deltares 2017. All rights reserved.
-//
-// This file is part of the application DAM - UI.
-//
-// DAM - UI is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see .
-//
-// All names, logos, and references to "Deltares" are registered trademarks of
-// Stichting Deltares and remain full property of Stichting Deltares at all times.
-// All rights reserved.
-
-//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
//
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
@@ -145,15 +124,6 @@
[global::System.Configuration.ApplicationScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.Configuration.DefaultSettingValueAttribute("nonwaterretainingobjects")]
- public string NonWaterRetainingImportFile {
- get {
- return ((string)(this["NonWaterRetainingImportFile"]));
- }
- }
-
- [global::System.Configuration.ApplicationScopedSettingAttribute()]
- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute(".\\DGeoStability.exe")]
public string MStabExePath {
get {
Index: dam clients/DamUI/trunk/src/Dam/Data/MStabResults.cs
===================================================================
diff -u -r341 -r673
--- dam clients/DamUI/trunk/src/Dam/Data/MStabResults.cs (.../MStabResults.cs) (revision 341)
+++ dam clients/DamUI/trunk/src/Dam/Data/MStabResults.cs (.../MStabResults.cs) (revision 673)
@@ -57,33 +57,5 @@
exitPointXCoordinate = 0.0;
beta = 0.0;
}
- }
- public struct NonWaterRetainingObjectResults
- {
- public string NwoId;
- public double LocationXrdStart;
- public double LocationYrdStart;
- public double LocationZrdStart;
- public double LocationXrdEnd;
- public double LocationYrdEnd;
- public double LocationZrdEnd;
- public MStabResults MStabResults;
- public SurfaceLine2 AdaptedSurfaceLine;
- public SoilGeometryProbability SoilProfileProbability;
- public void Init()
- {
- NwoId = "";
- MStabResults = new MStabResults();
- MStabResults.Init();
- LocationXrdStart = 0.0;
- LocationYrdStart = 0.0;
- LocationZrdStart = 0.0;
- LocationXrdEnd = 0.0;
- LocationYrdEnd = 0.0;
- LocationZrdEnd = 0.0;
- AdaptedSurfaceLine = null;
- }
-
- }
-
+ }
}
Index: dam clients/DamUI/trunk/src/Dam/Tests/TestData/DamLive/Grebbedijk/input.damx
===================================================================
diff -u -r236 -r673
--- dam clients/DamUI/trunk/src/Dam/Tests/TestData/DamLive/Grebbedijk/input.damx (.../input.damx) (revision 236)
+++ dam clients/DamUI/trunk/src/Dam/Tests/TestData/DamLive/Grebbedijk/input.damx (.../input.damx) (revision 673)
@@ -544,7 +544,6 @@
-
Index: dam clients/DamUI/trunk/src/Dam/Data/Deltares.Dam.Data.csproj
===================================================================
diff -u -r574 -r673
--- dam clients/DamUI/trunk/src/Dam/Data/Deltares.Dam.Data.csproj (.../Deltares.Dam.Data.csproj) (revision 574)
+++ dam clients/DamUI/trunk/src/Dam/Data/Deltares.Dam.Data.csproj (.../Deltares.Dam.Data.csproj) (revision 673)
@@ -236,15 +236,13 @@
-
-
Index: dam clients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.Tests.csproj
===================================================================
diff -u -r506 -r673
--- dam clients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.Tests.csproj (.../Deltares.Dam.Tests.csproj) (revision 506)
+++ dam clients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.Tests.csproj (.../Deltares.Dam.Tests.csproj) (revision 673)
@@ -145,8 +145,6 @@
-
-
Index: dam clients/DamUI/trunk/src/Dam/Data/ThrowHelper.cs
===================================================================
diff -u -r341 -r673
--- dam clients/DamUI/trunk/src/Dam/Data/ThrowHelper.cs (.../ThrowHelper.cs) (revision 341)
+++ dam clients/DamUI/trunk/src/Dam/Data/ThrowHelper.cs (.../ThrowHelper.cs) (revision 673)
@@ -80,9 +80,7 @@
SurfaceLineNotAssigned,
SoilProfileNotAssigned,
SoilListIsNull,
- PL1NotCreated,
- NonWaterRetainingObjectCategoryArgumentNullOrEmpty,
- NonWaterRetainingObjectTypeArgumentNullOrEmpty
+ PL1NotCreated
}
///
Index: dam clients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.IntegrationTests.csproj
===================================================================
diff -u -r509 -r673
--- dam clients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.IntegrationTests.csproj (.../Deltares.Dam.IntegrationTests.csproj) (revision 509)
+++ dam clients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.IntegrationTests.csproj (.../Deltares.Dam.IntegrationTests.csproj) (revision 673)
@@ -110,7 +110,6 @@
-
@@ -279,9 +278,6 @@
PreserveNewest
-
- PreserveNewest
-
PreserveNewest
@@ -359,45 +355,6 @@
PreserveNewest
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- Always
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
Index: dam clients/DamUI/trunk/src/Dam/Data/Dike.cs
===================================================================
diff -u -r339 -r673
--- dam clients/DamUI/trunk/src/Dam/Data/Dike.cs (.../Dike.cs) (revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/Dike.cs (.../Dike.cs) (revision 673)
@@ -68,7 +68,6 @@
private SoilList soilList;
private IList gauges = new List();
private IList gaugePLLines = new List();
- private IList nonWaterRetainingObjects;
private IList soilProfiles;
private string soilDatabaseName = "";
private List databaseSoils = new List();
@@ -85,7 +84,6 @@
SurfaceLines2 = new List();
this.pl1Lines = new List();
this.soilList = new SoilList();
- this.nonWaterRetainingObjects = new List();
removeStiFiles = true;
}
@@ -187,12 +185,6 @@
set { this.gaugePLLines = value; }
}
- public virtual IList NonWaterRetainingObjects
- {
- get { return this.nonWaterRetainingObjects; }
- set { this.nonWaterRetainingObjects = value; }
- }
-
public bool UsesGauges { get { return this.GaugePLLines != null && this.GaugePLLines.Count > 0 && this.Gauges != null; } }
public virtual List Scenarios
Fisheye: Tag 673 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Tests/DamStabilityNWOIntegrationTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 673 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Tests/NonWaterRetainingObjectInSurfaceLineTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: dam clients/DamUI/trunk/src/Dam/Data/DAMEnumerations.cs
===================================================================
diff -u -r341 -r673
--- dam clients/DamUI/trunk/src/Dam/Data/DAMEnumerations.cs (.../DAMEnumerations.cs) (revision 341)
+++ dam clients/DamUI/trunk/src/Dam/Data/DAMEnumerations.cs (.../DAMEnumerations.cs) (revision 673)
@@ -91,11 +91,7 @@
[Label("Adapt geometry")]
[XmlOldName("Design")]
- AdaptGeometry,
-
- [Label("Adapt NWO")]
- [XmlOldName("DesigNWO")]
- AdaptNWO
+ AdaptGeometry
};
public enum ProbabilisticType
@@ -191,34 +187,12 @@
ForbiddenZone = 2
}
- public enum NonWaterRetainingObjectCategory
- {
- Tree,
- Main
- };
-
- public enum NonWaterRetainingObjectType
- {
- Oak,
- Alder,
- Poplar,
- GasMain,
- WaterMain
- };
-
public enum StabilityDesignMethod //Design
{
OptimizedSlopeAndShoulderAdaption,
SlopeAdaptionBeforeShoulderAdaption
}
- public enum PhreaticAdaptionType //NWO
- {
- None,
- MakeEmpty,
- Fill // Note: Fill not yet implemented!
- } ;
-
public enum PLLineType
{
PL1,
Fisheye: Tag 673 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Data/NonWaterRetainingObjectInSurfaceLine.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: dam clients/DamUI/trunk/src/Dam/Data/Properties/Settings.settings
===================================================================
diff -u -r236 -r673
--- dam clients/DamUI/trunk/src/Dam/Data/Properties/Settings.settings (.../Settings.settings) (revision 236)
+++ dam clients/DamUI/trunk/src/Dam/Data/Properties/Settings.settings (.../Settings.settings) (revision 673)
@@ -35,9 +35,6 @@
gauges
-
- nonwaterretainingobjects
-
.\DGeoStability.exe
Index: dam clients/DamUI/trunk/src/Dam/Data/DataPlugins/DataPluginImporter.cs
===================================================================
diff -u -r341 -r673
--- dam clients/DamUI/trunk/src/Dam/Data/DataPlugins/DataPluginImporter.cs (.../DataPluginImporter.cs) (revision 341)
+++ dam clients/DamUI/trunk/src/Dam/Data/DataPlugins/DataPluginImporter.cs (.../DataPluginImporter.cs) (revision 673)
@@ -574,17 +574,6 @@
}
///
- /// Gets the non water retaining object list.
- ///
- /// The dike ring identifier.
- ///
- public IEnumerable GetNonWaterRetainingObjectList(string dikeRingId)
- {
- var dike = GetDike(dikeRingId);
- return new List(dike.NonWaterRetainingObjects);
- }
-
- ///
/// Gets the profile1 d identifier list for segment.
///
/// The dike ring identifier.
Index: dam clients/DamUI/trunk/src/Dam/Data/Properties/Resources.resx
===================================================================
diff -u -r236 -r673
--- dam clients/DamUI/trunk/src/Dam/Data/Properties/Resources.resx (.../Resources.resx) (revision 236)
+++ dam clients/DamUI/trunk/src/Dam/Data/Properties/Resources.resx (.../Resources.resx) (revision 673)
@@ -257,11 +257,5 @@
PL1 has not been created
-
-
- The category for the non water reatining object is null or empty which is not allowed
-
-
- The type for the non water reatining object is null or empty which is not allowed
-
+
\ No newline at end of file
Index: dam clients/DamUI/trunk/src/Dam/Data/Properties/Resources.Designer.cs
===================================================================
diff -u -r339 -r673
--- dam clients/DamUI/trunk/src/Dam/Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 673)
@@ -1,25 +1,4 @@
-// Copyright (C) Stichting Deltares 2017. All rights reserved.
-//
-// This file is part of the application DAM - UI.
-//
-// DAM - UI is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see .
-//
-// All names, logos, and references to "Deltares" are registered trademarks of
-// Stichting Deltares and remain full property of Stichting Deltares at all times.
-// All rights reserved.
-
-//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
//
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
@@ -298,24 +277,6 @@
}
///
- /// Looks up a localized string similar to The category for the non water reatining object is null or empty which is not allowed.
- ///
- internal static string NonWaterRetainingObjectCategoryArgumentNullOrEmpty {
- get {
- return ResourceManager.GetString("NonWaterRetainingObjectCategoryArgumentNullOrEmpty", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to The type for the non water reatining object is null or empty which is not allowed.
- ///
- internal static string NonWaterRetainingObjectTypeArgumentNullOrEmpty {
- get {
- return ResourceManager.GetString("NonWaterRetainingObjectTypeArgumentNullOrEmpty", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to No soil profiles have been defined for location '{0}'..
///
internal static string NoSoilProfileDefinedForLocation {
Index: dam clients/DamUI/trunk/src/Dam/Data/DamEngineIo/ConversionHelper.cs
===================================================================
diff -u -r661 -r673
--- dam clients/DamUI/trunk/src/Dam/Data/DamEngineIo/ConversionHelper.cs (.../ConversionHelper.cs) (revision 661)
+++ dam clients/DamUI/trunk/src/Dam/Data/DamEngineIo/ConversionHelper.cs (.../ConversionHelper.cs) (revision 673)
@@ -41,8 +41,7 @@
{InputDamProjectType.Assessment, DamProjectType.Assessment},
{InputDamProjectType.AssessmentRegional, DamProjectType.Assessment}, // must be handled in additional code after conversion
{InputDamProjectType.Design, DamProjectType.Design},
- {InputDamProjectType.Operational, DamProjectType.Calamity}
- // InputDamProjectType.NWO not implemented yet
+ {InputDamProjectType.Operational, DamProjectType.Calamity}
};
return translationTable[inputDamProjectType];
}
@@ -193,10 +192,6 @@
{CharacteristicPointType.BottomRiverChannel, CpNone},
{CharacteristicPointType.InsertRiverChannel, CpNone},
{CharacteristicPointType.ForelandStart, CpNone},
- {CharacteristicPointType.NonWaterRetainingObjectPoint1, CpNone},
- {CharacteristicPointType.NonWaterRetainingObjectPoint2, CpNone},
- {CharacteristicPointType.NonWaterRetainingObjectPoint3, CpNone},
- {CharacteristicPointType.NonWaterRetainingObjectPoint4, CpNone},
{CharacteristicPointType.DunesBoundaryProfile, CpNone},
{CharacteristicPointType.DunesTransectLocation, CpNone},
// The following types are DAM related, so should be translated
Index: dam clients/DamUI/trunk/src/Dam/Tests/DataPluginImporterCsvTests.cs
===================================================================
diff -u -r339 -r673
--- dam clients/DamUI/trunk/src/Dam/Tests/DataPluginImporterCsvTests.cs (.../DataPluginImporterCsvTests.cs) (revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Tests/DataPluginImporterCsvTests.cs (.../DataPluginImporterCsvTests.cs) (revision 673)
@@ -175,51 +175,10 @@
}
[Test]
- [Ignore("Not yet implemented in new csv importer")]
- public void CanRetrieveNonWaterRetainingObjects()
- {
- const double cToleranceDimension = 0.001;
-
- // Check if NonWaterRetainingObjects available
- string dikeRingId = dataPluginImporter.GetDikeRingIdList(DamType.Primary).FirstOrDefault();
- dataPluginImporter.ImportDataForDikeRings(new List() { dikeRingId }, DamType.Primary, null);
-
- IEnumerable nonWaterRetainingObjects = dataPluginImporter.GetNonWaterRetainingObjectList(dikeRingId);
- Assert.AreEqual(2, nonWaterRetainingObjects.Count());
-
- NonWaterRetainingObject nonWaterRetainingObject = nonWaterRetainingObjects.First();
- Assert.AreEqual("NWO1", nonWaterRetainingObject.NwoId);
- Assert.AreEqual(NonWaterRetainingObjectCategory.Main, nonWaterRetainingObject.Category);
- Assert.AreEqual(NonWaterRetainingObjectType.GasMain, nonWaterRetainingObject.Type);
- Assert.AreEqual(PhreaticAdaptionType.MakeEmpty, nonWaterRetainingObject.PhreaticAdaption);
- Assert.AreEqual(2, nonWaterRetainingObject.H1, cToleranceDimension);
- Assert.AreEqual(2, nonWaterRetainingObject.H2, cToleranceDimension);
- Assert.AreEqual(2, nonWaterRetainingObject.N1, cToleranceDimension);
- Assert.AreEqual(2, nonWaterRetainingObject.N2, cToleranceDimension);
- Assert.AreEqual(1, nonWaterRetainingObject.B, cToleranceDimension);
- Assert.AreEqual(0.25, nonWaterRetainingObject.StepSizeX, cToleranceDimension);
- Assert.AreEqual(1000, nonWaterRetainingObject.MaxDistanceFromToe, cToleranceDimension);
-
- nonWaterRetainingObject = nonWaterRetainingObjects.Last();
- Assert.AreEqual("NWO2", nonWaterRetainingObject.NwoId);
- Assert.AreEqual(NonWaterRetainingObjectCategory.Tree, nonWaterRetainingObject.Category);
- Assert.AreEqual(NonWaterRetainingObjectType.Oak, nonWaterRetainingObject.Type);
- Assert.AreEqual(PhreaticAdaptionType.None, nonWaterRetainingObject.PhreaticAdaption);
- Assert.AreEqual(1.5, nonWaterRetainingObject.H1, cToleranceDimension);
- Assert.AreEqual(1.5, nonWaterRetainingObject.H2, cToleranceDimension);
- Assert.AreEqual(2, nonWaterRetainingObject.N1, cToleranceDimension);
- Assert.AreEqual(2, nonWaterRetainingObject.N2, cToleranceDimension);
- Assert.AreEqual(1.2, nonWaterRetainingObject.B, cToleranceDimension);
- Assert.AreEqual(0.5, nonWaterRetainingObject.StepSizeX, cToleranceDimension);
- Assert.AreEqual(12.5, nonWaterRetainingObject.MaxDistanceFromToe, cToleranceDimension);
- }
-
- [Test]
public void CanRetrieveScenarios()
{
const double cToleranceDimension = 0.001;
- // Check if NonWaterRetainingObjects available
string dikeRingId = dataPluginImporter.GetDikeRingIdList(DamType.Primary).FirstOrDefault();
dataPluginImporter.ImportDataForDikeRings(new List() { dikeRingId }, DamType.Primary, null);
Index: dam clients/DamUI/trunk/src/Dam/Data/Scenario.cs
===================================================================
diff -u -r341 -r673
--- dam clients/DamUI/trunk/src/Dam/Data/Scenario.cs (.../Scenario.cs) (revision 341)
+++ dam clients/DamUI/trunk/src/Dam/Data/Scenario.cs (.../Scenario.cs) (revision 673)
@@ -131,10 +131,6 @@
}
[Browsable(false)]
- [XmlIgnore]
- public IList NwoResults { get; set; }
-
- [Browsable(false)]
public List CalculationResults
{
get { return calculationResults; }
@@ -180,7 +176,6 @@
failureProbabilitiesStability = new Dictionary();
failureProbabilitiesPiping = new Dictionary();
redesignedSurfaceLines = new Dictionary();
- NwoResults = new List();
calculationResults.Clear();
}
Index: dam clients/DamUI/trunk/src/Dam/Data/EntityFactory.cs
===================================================================
diff -u -r339 -r673
--- dam clients/DamUI/trunk/src/Dam/Data/EntityFactory.cs (.../EntityFactory.cs) (revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/EntityFactory.cs (.../EntityFactory.cs) (revision 673)
@@ -69,17 +69,12 @@
///
private readonly IList scenarios = new List();
- ///
- /// Holds a reference to the (concrete) NonWaterRetainingObject list
- ///
- private readonly IList nonWaterRetainingObjects = new List();
-
#endregion
#region Constructors
public EntityFactory()
- : this(null, null, null, null, null, null, null)
+ : this(null, null, null, null, null, null)
{
}
@@ -88,7 +83,7 @@
///
/// The surface lines look up table
public EntityFactory(IEnumerable surfaceLines)
- : this(null, null, null, surfaceLines, null, null, null)
+ : this(null, null, null, surfaceLines, null, null)
{
}
@@ -99,7 +94,7 @@
/// The segment look up table
/// The surface lines look up table
public EntityFactory(IEnumerable segments, IEnumerable surfaceLines)
- : this(null, null, segments, surfaceLines, null, null, null)
+ : this(null, null, segments, surfaceLines, null, null)
{
}
@@ -111,7 +106,7 @@
/// The location look up table
/// The segment look up table
public EntityFactory(IEnumerable locations, IEnumerable soilProfiles, IEnumerable segments)
- : this(locations, soilProfiles, segments, null, null, null, null)
+ : this(locations, soilProfiles, segments, null, null, null)
{
}
@@ -124,9 +119,8 @@
/// The surface lines look up table
/// The pl1Lines look up table
/// The gauges look up table
- /// The surface lines look up table
public EntityFactory(IEnumerable locations, IEnumerable soilProfiles, IEnumerable segments, IEnumerable surfaceLines,
- IEnumerable pl1Lines, IEnumerable gauges, IEnumerable nonWaterRetainingObjects)
+ IEnumerable pl1Lines, IEnumerable gauges)
{
if (soilProfiles != null)
{
@@ -225,22 +219,8 @@
{
this.scenarios.RemoveNullElements();
}
- }
+ }
- if (nonWaterRetainingObjects != null)
- {
- this.nonWaterRetainingObjects = nonWaterRetainingObjects as IList;
- if (this.nonWaterRetainingObjects == null)
- {
- this.nonWaterRetainingObjects = new List();
- this.nonWaterRetainingObjects.AddRangeLeavingNullElementsOut(nonWaterRetainingObjects);
- }
- else
- {
- this.nonWaterRetainingObjects.RemoveNullElements();
- }
- }
-
}
#endregion
@@ -289,14 +269,6 @@
get { return scenarios; }
}
- ///
- /// Gets a reference to the nonWaterRetainingObjects list through the interface
- ///
- public IEnumerable NonWaterRetainingObjects
- {
- get { return nonWaterRetainingObjects; }
- }
-
#endregion
#region Factory / Creational Methods
@@ -721,60 +693,7 @@
return segment;
}
-
- public NonWaterRetainingObject CreateNonWaterRetainingObject(string NwoId, string category, string type, string phreaticAdaption, double h1, double h2, double n1,
- double n2, double b, double stepSizeX, double maxDistanceFromToe)
- {
- ThrowHelper.ThrowIfStringArgumentNullOrEmpty(category, StringResourceNames.NonWaterRetainingObjectCategoryArgumentNullOrEmpty);
- ThrowHelper.ThrowIfStringArgumentNullOrEmpty(type, StringResourceNames.NonWaterRetainingObjectTypeArgumentNullOrEmpty);
-
- var nonWaterRetainingObject = new NonWaterRetainingObject();
- nonWaterRetainingObject.NwoId = NwoId;
- nonWaterRetainingObject.Category = NonWaterRetainingObjectCategory.Tree;
-
- if (category.Equals("Main",StringComparison.OrdinalIgnoreCase))
- {
- nonWaterRetainingObject.Category = NonWaterRetainingObjectCategory.Main;
- }
-
- if (nonWaterRetainingObject.Category == NonWaterRetainingObjectCategory.Tree)
- {
- nonWaterRetainingObject.Type = NonWaterRetainingObjectType.Oak;
- if (type.Equals("Alder", StringComparison.OrdinalIgnoreCase))
- {
- nonWaterRetainingObject.Type = NonWaterRetainingObjectType.Alder;
- }
- if (type.Equals("Poplar", StringComparison.OrdinalIgnoreCase))
- {
- nonWaterRetainingObject.Type = NonWaterRetainingObjectType.Poplar;
- }
- }
- else
- {
- nonWaterRetainingObject.Type = NonWaterRetainingObjectType.WaterMain;
- if (type.Equals("GasMain", StringComparison.OrdinalIgnoreCase))
- {
- nonWaterRetainingObject.Type = NonWaterRetainingObjectType.GasMain;
- }
- }
-
- nonWaterRetainingObject.PhreaticAdaption = PhreaticAdaptionType.None;
- if (phreaticAdaption.Equals("MakeEmpty", StringComparison.OrdinalIgnoreCase))
- {
- nonWaterRetainingObject.PhreaticAdaption = PhreaticAdaptionType.MakeEmpty;
- }
-
- nonWaterRetainingObject.H1 = h1;
- nonWaterRetainingObject.H2 = h2;
- nonWaterRetainingObject.N1 = n1;
- nonWaterRetainingObject.N2 = n2;
- nonWaterRetainingObject.B = b;
- nonWaterRetainingObject.StepSizeX = stepSizeX;
- nonWaterRetainingObject.MaxDistanceFromToe = maxDistanceFromToe;
- return nonWaterRetainingObject;
- }
-
-
+
///
/// Check if either a 1D-geometry or a 2D-geometry is specified
///
Index: dam clients/DamUI/trunk/src/Dam/Tests/TestHelper/ProjectLoader.cs
===================================================================
diff -u -r339 -r673
--- dam clients/DamUI/trunk/src/Dam/Tests/TestHelper/ProjectLoader.cs (.../ProjectLoader.cs) (revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Tests/TestHelper/ProjectLoader.cs (.../ProjectLoader.cs) (revision 673)
@@ -90,7 +90,7 @@
MStabParameters = mstabParameters
}
};
- DamProjectCalculationSpecification.SelectedAnalysisType = AnalysisType.AdaptNWO;
+ DamProjectCalculationSpecification.SelectedAnalysisType = AnalysisType.AdaptGeometry;
damProjectData.DamProjectCalculationSpecification.SelectedProbabilisticType = ProbabilisticType.Deterministic;
return damCalculationSpecification;
}
Index: dam clients/DamUI/trunk/src/Dam/Data/app.config
===================================================================
diff -u -r339 -r673
--- dam clients/DamUI/trunk/src/Dam/Data/app.config (.../app.config) (revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/app.config (.../app.config) (revision 673)
@@ -62,9 +62,6 @@
gauges
-
- nonwaterretainingobjects
-
.\DGeoStability.exe
Index: dam clients/DamUI/trunk/src/Dam/Tests/DamEngineIo/ConversionHelperTests.cs
===================================================================
diff -u -r658 -r673
--- dam clients/DamUI/trunk/src/Dam/Tests/DamEngineIo/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 658)
+++ dam clients/DamUI/trunk/src/Dam/Tests/DamEngineIo/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 673)
@@ -37,7 +37,6 @@
[TestCase(InputDamProjectType.AssessmentRegional, DamProjectType.Assessment)]
[TestCase(InputDamProjectType.Design, DamProjectType.Design)]
[TestCase(InputDamProjectType.Operational, DamProjectType.Calamity)]
- //[TestCase(InputDamProjectType.NWO, DamProjectType.NWO)] // not implemented yet
public void CanConvertToDamProjectType(InputDamProjectType inputDamProjectType, DamProjectType damProjectType)
{
Assert.AreEqual(damProjectType, ConversionHelper.ConvertToDamProjectType(inputDamProjectType));
@@ -47,7 +46,6 @@
[TestCase(DamProjectType.Assessment, InputDamProjectType.Assessment)]
[TestCase(DamProjectType.Design, InputDamProjectType.Design)]
[TestCase(DamProjectType.Calamity, InputDamProjectType.Operational)]
- // [TestCase(DamProjectType.NWO, InputDamProjectType.NWO)] // not implemented yet
public void CanConvertToInputDamProjectType(DamProjectType damProjectType, InputDamProjectType inputDamProjectType)
{
Assert.AreEqual(inputDamProjectType, ConversionHelper.ConvertToInputDamProjectType(damProjectType));
Index: dam clients/DamUI/trunk/src/Dam/Tests/TestData/DamLive/Set2/output.damx
===================================================================
diff -u -r236 -r673
--- dam clients/DamUI/trunk/src/Dam/Tests/TestData/DamLive/Set2/output.damx (.../output.damx) (revision 236)
+++ dam clients/DamUI/trunk/src/Dam/Tests/TestData/DamLive/Set2/output.damx (.../output.damx) (revision 673)
@@ -1717,7 +1717,6 @@
-
Index: dam clients/DamUI/trunk/src/Dam/Tests/TestData/StabilityNWO/soilmaterials.mdb
===================================================================
diff -u -r236 -r673
Binary files differ
Fisheye: Tag 673 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Tests/TestData/StabilityNWO/soilprofiles.csv'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 673 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Tests/TestData/StabilityNWO/surfacelines.csv'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 673 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Tests/TestData/StabilityNWO/nonwaterretainingobjects.csv'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 673 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Tests/TestData/StabilityNWO/Import.defx'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 673 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Tests/TestData/StabilityNWO/Geometries/10Y_005_STBI.sti'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 673 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Tests/TestData/StabilityNWO/Geometries/10Y_041_STBI.sti'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 673 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Tests/TestData/StabilityNWO/locations.csv'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 673 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Tests/TestData/StabilityNWO/Geometries/10Y_054_STBI.sti'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 673 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Tests/TestData/StabilityNWO/segments.csv'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 673 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Tests/TestData/StabilityNWO/Geometries/10Y_024_STBI.sti'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 673 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Tests/TestData/StabilityNWO/characteristicpoints.csv'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 673 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Tests/TestData/StabilityNWO/scenarios.csv'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 673 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Tests/TestData/StabilityNWO/modelparameters.csv'.
Fisheye: No comparison available. Pass `N' to diff?