Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/StabilityEnumerations.cs
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/StabilityEnumerations.cs (revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/StabilityEnumerations.cs (revision 2227)
@@ -0,0 +1,114 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the Dam Engine.
+//
+// The Dam Engine is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero 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 Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero 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.
+
+namespace Deltares.DamEngine.Data.General
+{
+ ///
+ /// Types of (calculation) models for Stability.
+ ///
+ public enum MStabModelType
+ {
+ Bishop,
+ Spencer,
+ Fellenius,
+ UpliftVan,
+ UpliftSpencer,
+ BishopRandomField,
+ HorizontalBalance,
+ BishopUpliftVan,
+ SpencerHigh, // #Bka added SpencerHigh/SpencerLow as quick fix. Should be replaced with options for Spencer later! These enums should be removed.
+ SpencerLow,
+ BishopWti, // #Bka: for now, only UpliftVanWti is to be used of all Wti options.
+ UpliftVanWti,
+ UpliftSpencerWti
+ }
+
+ ///
+ /// Types of Intrusion Vertical Water Pressures
+ ///
+ public enum IntrusionVerticalWaterPressureType
+ {
+ Standard,
+ Linear,
+ FullHydroStatic,
+ HydroStatic,
+ SemiTimeDependent
+ }
+
+ ///
+ /// Types of MStab Shear Strength models
+ ///
+ public enum MStabShearStrength
+ {
+ CPhi,
+ StressTables,
+ CuCalculated,
+ CuMeasured,
+ CuGradient,
+ Default
+ }
+
+ ///
+ /// Types of MStab Search Methods
+ ///
+ public enum MStabSearchMethod
+ {
+ Grid,
+ GeneticAlgorithm
+ }
+
+ ///
+ /// Types of MStab Grid Positions
+ ///
+ public enum MStabGridPosition
+ {
+ Left,
+ Right
+ }
+
+ ///
+ /// Types of MStab Zones
+ ///
+ public enum MStabZonesType
+ {
+ NoZones = 0,
+ ZoneAreas = 1,
+ ForbiddenZone = 2
+ }
+
+ ///
+ /// Types of tangent lines definitions.
+ ///
+ public enum TangentLinesDefinition
+ {
+ OnBoundaryLines = 0,
+ Specified = 1
+ }
+
+ ///
+ /// Types of GridSize Determinations
+ ///
+ public enum GridSizeDetermination
+ {
+ Automatic = 0,
+ Specified = 1
+ }
+}
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/SegmentEnumerations.cs
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/SegmentEnumerations.cs (revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/SegmentEnumerations.cs (revision 2227)
@@ -0,0 +1,34 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the Dam Engine.
+//
+// The Dam Engine is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero 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 Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero 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.
+
+namespace Deltares.DamEngine.Data.General
+{
+ ///
+ /// Types of Failure mechanisms for soil segments
+ ///
+ public enum SegmentFailureMechanismType
+ {
+ All,
+ Stability,
+ Piping,
+ Liquefaction
+ }
+}
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/LocationEnumerations.cs
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/LocationEnumerations.cs (revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/LocationEnumerations.cs (revision 2227)
@@ -0,0 +1,42 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the Dam Engine.
+//
+// The Dam Engine is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero 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 Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero 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.
+
+namespace Deltares.DamEngine.Data.General
+{
+ ///
+ /// Types of soil profiles for DAM
+ ///
+ public enum SoilProfileType
+ {
+ ProfileType1D,
+ ProfileType2D,
+ ProfileTypeStiFile
+ }
+
+ ///
+ /// Types of stability adaption options for the DesignOption for DAM
+ ///
+ public enum StabilityDesignMethod //Design
+ {
+ OptimizedSlopeAndShoulderAdaption,
+ SlopeAdaptionBeforeShoulderAdaption
+ }
+}
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Deltares.DamEngine.Data.csproj
===================================================================
diff -u -r2171 -r2227
--- DamEngine/trunk/src/Deltares.DamEngine.Data/Deltares.DamEngine.Data.csproj (.../Deltares.DamEngine.Data.csproj) (revision 2171)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/Deltares.DamEngine.Data.csproj (.../Deltares.DamEngine.Data.csproj) (revision 2227)
@@ -43,11 +43,14 @@
+
+
+
+
-
@@ -68,6 +71,7 @@
+
@@ -91,6 +95,7 @@
+
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/ProjectEnumerations.cs
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/ProjectEnumerations.cs (revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/ProjectEnumerations.cs (revision 2227)
@@ -0,0 +1,53 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the Dam Engine.
+//
+// The Dam Engine is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero 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 Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero 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.
+
+
+namespace Deltares.DamEngine.Data.General
+{
+ ///
+ /// Types of project for DAM
+ ///
+ public enum DamProjectType
+ {
+ Operational,
+ Design
+ }
+
+ ///
+ /// Types of analysis for the Design option DAM
+ ///
+ public enum AnalysisType
+ {
+ NoAdaption,
+ AdaptGeometry
+ };
+
+ ///
+ /// Types of Failure mechanisms for DAM
+ ///
+ public enum FailureMechanismSystemType
+ {
+ StabilityInside,
+ StabilityOutside,
+ Piping,
+ HorizontalBalance
+ }
+}
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/DamFailureMechanismeCalculationSpecification.cs
===================================================================
diff -u -r2113 -r2227
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/DamFailureMechanismeCalculationSpecification.cs (.../DamFailureMechanismeCalculationSpecification.cs) (revision 2113)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/DamFailureMechanismeCalculationSpecification.cs (.../DamFailureMechanismeCalculationSpecification.cs) (revision 2227)
@@ -25,37 +25,6 @@
{
///
- /// Types of (calculation) models for Stability.
- ///
- public enum MStabModelType
- {
- Bishop,
- Spencer,
- Fellenius,
- UpliftVan,
- UpliftSpencer,
- BishopRandomField,
- HorizontalBalance,
- BishopUpliftVan,
- SpencerHigh, // #Bka added SpencerHigh/SpencerLow as quick fix. Should be replaced with options for Spencer later! These enums should be removed.
- SpencerLow,
- BishopWti, // #Bka: for now, only UpliftVanWti is to be used of all Wti options.
- UpliftVanWti,
- UpliftSpencerWti
- }
-
- ///
- /// Types of (calculation) models for Piping
- ///
- public enum PipingModelType
- {
- Bligh,
- SellmeijerVnk,
- Sellmeijer4Forces,
- Wti2017
- }
-
- ///
///
///
public class DamFailureMechanismeCalculationSpecification
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/PlLineEnumerations.cs
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/PlLineEnumerations.cs (revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/PlLineEnumerations.cs (revision 2227)
@@ -0,0 +1,84 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the Dam Engine.
+//
+// The Dam Engine is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero 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 Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero 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.
+
+namespace Deltares.DamEngine.Data.General
+{
+ ///
+ /// Types of PlLine Assignments
+ ///
+ public enum PlLineAssignment
+ {
+ NoPlLines,
+ ExpertKnowledge,
+ DikeFlow,
+ OrginalPlLines
+ }
+
+ ///
+ /// PlLineType
+ ///
+ public enum PlLineType
+ {
+ Pl1,
+ Pl2,
+ Pl3,
+ Pl4
+ }
+
+ ///
+ /// PlLineCreationMethod
+ ///
+ public enum PlLineCreationMethod
+ {
+ ExpertKnowledgeRRD,
+ ExpertKnowledgeLinearInDike,
+ GaugesWithFallbackToExpertKnowledgeRRD,
+ Sensors,
+ None
+ }
+
+ ///
+ /// Dike soil scenario for the automatic creation of the waternet - 4 possibilities.
+ /// This is used in the wti stability kernel
+ ///
+ public enum DikeSoilScenario
+ {
+ ///
+ /// Clay dike on clay subsoil
+ ///
+ ClayDikeOnClay,
+
+ ///
+ /// Sand dike on clay subsoil
+ ///
+ SandDikeOnClay,
+
+ ///
+ /// Clay dike on sand subsoil
+ ///
+ ClayDikeOnSand,
+
+ ///
+ /// Sand dike on sand subsoil
+ ///
+ SandDikeOnSand
+ }
+}
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/MStabParameters.cs
===================================================================
diff -u -r2113 -r2227
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/MStabParameters.cs (.../MStabParameters.cs) (revision 2113)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/MStabParameters.cs (.../MStabParameters.cs) (revision 2227)
@@ -24,88 +24,7 @@
namespace Deltares.DamEngine.Data.General
{
- ///
- /// Types of tangent lines definitions.
- ///
- public enum TangentLinesDefinition
- {
- OnBoundaryLines = 0,
- Specified = 1
- }
-
- ///
- /// Types of GridSize Determinations
- ///
- public enum GridSizeDetermination
- {
- Automatic = 0,
- Specified = 1
- }
-
- ///
- /// Types of Intrusion Vertical Water Pressures
- ///
- public enum IntrusionVerticalWaterPressureType
- {
- Standard,
- Linear,
- FullHydroStatic,
- HydroStatic,
- SemiTimeDependent
- }
-
- ///
- /// Types of MStab Shear Strength models
- ///
- public enum MStabShearStrength
- {
- CPhi,
- StressTables,
- CuCalculated,
- CuMeasured,
- CuGradient,
- Default
- }
-
- ///
- /// Types of MStab Search Methods
- ///
- public enum MStabSearchMethod
- {
- Grid,
- GeneticAlgorithm
- }
-
- ///
- /// Types of MStab Grid Positions
- ///
- public enum MStabGridPosition
- {
- Left,
- Right
- }
-
- ///
- /// Types of MStab Zones
- ///
- public enum MStabZonesType
- {
- NoZones = 0,
- ZoneAreas = 1,
- ForbiddenZone = 2
- }
-
- ///
- /// Types of PlLine Assignments
- ///
- public enum PlLineAssignment
- {
- NoPlLines,
- ExpertKnowledge,
- DikeFlow,
- OrginalPlLines
- }
-
+
public class SheetPiling : IAssignable, ICloneable
{
public double XCoordinate { get; set; }
Fisheye: Tag 2227 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Data/General/DAMEnumerations.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj
===================================================================
diff -u -r2127 -r2227
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj (.../Deltares.DamEngine.Calculators.csproj) (revision 2127)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj (.../Deltares.DamEngine.Calculators.csproj) (revision 2227)
@@ -98,6 +98,7 @@
+
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/PipingEnumerations.cs
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/PipingEnumerations.cs (revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/PipingEnumerations.cs (revision 2227)
@@ -0,0 +1,34 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the Dam Engine.
+//
+// The Dam Engine is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero 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 Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero 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.
+
+namespace Deltares.DamEngine.Data.General
+{
+ ///
+ /// Types of (calculation) models for Piping
+ ///
+ public enum PipingModelType
+ {
+ Bligh,
+ SellmeijerVnk,
+ Sellmeijer4Forces,
+ Wti2017
+ }
+}
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesOperational/OperationalEnumerations.cs
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesOperational/OperationalEnumerations.cs (revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesOperational/OperationalEnumerations.cs (revision 2227)
@@ -0,0 +1,32 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the Dam Engine.
+//
+// The Dam Engine is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero 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 Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero 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.
+
+namespace Deltares.DamEngine.Calculators.DikesOperational
+{
+ ///
+ /// Type of output series
+ ///
+ public enum TimeSerieParameters
+ {
+ StabilityInsideFactor,
+ StabilityOutsideFactor
+ }
+}
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesOperational/OperationalCalculator.cs
===================================================================
diff -u -r2173 -r2227
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesOperational/OperationalCalculator.cs (.../OperationalCalculator.cs) (revision 2173)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesOperational/OperationalCalculator.cs (.../OperationalCalculator.cs) (revision 2227)
@@ -44,15 +44,6 @@
{
///
- /// Type of output series
- ///
- public enum TimeSerieParameters
- {
- StabilityInsideFactor,
- StabilityOutsideFactor
- }
-
- ///
/// Class for the Operational Calculator
///
public class OperationalCalculator
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Location.cs
===================================================================
diff -u -r2171 -r2227
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Location.cs (.../Location.cs) (revision 2171)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Location.cs (.../Location.cs) (revision 2227)
@@ -33,65 +33,6 @@
namespace Deltares.DamEngine.Data.General
{
- ///
- /// Types of project for DAM
- ///
- public enum DamProjectType
- {
- Operational,
- Design
- }
-
- ///
- /// Types of analysis for the Design option DAM
- ///
- public enum AnalysisType
- {
- NoAdaption,
- AdaptGeometry
- };
-
- ///
- /// Types of Failure mechanisms for DAM
- ///
- public enum FailureMechanismSystemType
- {
- StabilityInside,
- StabilityOutside,
- Piping,
- HorizontalBalance
- }
-
- ///
- /// Types of Failure mechanisms for soil segments
- ///
- public enum SegmentFailureMechanismType
- {
- All,
- Stability,
- Piping,
- Liquefaction
- }
-
- ///
- /// Types of soil profiles for DAM
- ///
- public enum SoilProfileType
- {
- ProfileType1D,
- ProfileType2D,
- ProfileTypeStiFile
- }
-
- ///
- /// Types of stability adaption options for the DesignOption for DAM
- ///
- public enum StabilityDesignMethod //Design
- {
- OptimizedSlopeAndShoulderAdaption,
- SlopeAdaptionBeforeShoulderAdaption
- }
-
public class Location
{
// Added initial value as these properties must be tested for real values on import