Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/DAMEnumerations.cs =================================================================== diff -u -r2032 -r2100 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/DAMEnumerations.cs (.../DAMEnumerations.cs) (revision 2032) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/DAMEnumerations.cs (.../DAMEnumerations.cs) (revision 2100) @@ -21,116 +21,7 @@ namespace Deltares.DamEngine.Data.General { - public enum DamType - { - Primary, - Regional - } - public enum DamProjectType - { - AssessmentRegional, - Operational, - Design - } - - public enum AnalysisType - { - NoAdaption, - AdaptGeometry - }; - - public enum FailureMechanismSystemType - { - StabilityInside, - StabilityOutside, - Piping, - HorizontalBalance - } - - // TODO: FM this is failure mechanism specific code and should be moved to ..\KernelWrappers - 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 - } - - // TODO: FM this is failure mechanism specific code and should be moved to ..\KernelWrappers - public enum PipingModelType - { - Bligh, - SellmeijerVnk, - Sellmeijer4Forces, - Wti2017 - }; - - public enum PlLineAssignment - { - NoPlLines, - ExpertKnowledge, - DikeFlow, - OrginalPlLines - } - - public enum SoilProfileType - { - ProfileType1D, - ProfileType2D, - ProfileTypeStiFile - } - - - - // TODO: FM this is failure mechanism specific code and should be moved to ..\KernelWrappers - public enum MStabShearStrength - { - CPhi, - StressTables, - CuCalculated, - CuMeasured, - CuGradient, - Default - } - - // TODO: FM this is failure mechanism specific code and should be moved to ..\KernelWrappers - public enum MStabSearchMethod - { - Grid, - GeneticAlgorithm - } - - // TODO: FM this is failure mechanism specific code and should be moved to ..\KernelWrappers - public enum MStabGridPosition - { - Left, - Right - } - - // TODO: FM this is failure mechanism specific code and should be moved to ..\KernelWrappers - public enum MStabZonesType - { - NoZones = 0, - ZoneAreas = 1, - ForbiddenZone = 2 - } - - public enum StabilityDesignMethod //Design - { - OptimizedSlopeAndShoulderAdaption, - SlopeAdaptionBeforeShoulderAdaption - } - public enum PlLineType { Pl1, @@ -139,51 +30,35 @@ Pl4 } - public enum PlLinePointPositionXzType - { - OnPlLine, - AbovePlLine, - BelowPlLine, - BeyondPlLine // indicates that point is outside the scope of the pl line. - }; - - // TODO: RW this is regional specific code and should be moved to its own class + // TODO: RW this is regional specific code and should be moved to its own class #Bka: so should be eliminated! public enum DikeDrySensitivity //RWScenarios { None, Dry } - // TODO: RW this is regional specific code and should be moved to its own class + // TODO: RW this is regional specific code and should be moved to its own class #Bka: so should be eliminated! public enum HydraulicShortcutType //RWScenarios { HydraulicShortcut, NoHydraulicShortcut } - // TODO: RW this is regional specific code and should be moved to its own class + // TODO: RW this is regional specific code and should be moved to its own class #Bka: so should be eliminated! public enum RegionalResultType //RWScenarios { ProbabilityOfFailure, SafetyFactor } - // TODO: RW this is regional specific code and should be moved to its own class - public enum ResultEvaluation //RWScenarios - { - Accepted, - Rejected, - NotEvaluated - } - - // TODO: RW this is regional specific code and should be moved to its own class + // TODO: RW this is regional specific code and should be moved to its own class #Bka: so should be eliminated! public enum LoadSituation //RWScenarios { Dry, Wet } - // TODO: RW this is regional specific code and should be moved to its own class + // TODO: RW this is regional specific code and should be moved to its own class #Bka: so should be eliminated! public enum ScenarioType //RWScenarios { Scenario01 = 1, @@ -199,47 +74,7 @@ Scenario11 = 11 } - // TODO: RW this is regional specific code and should be moved to its own class - public enum SchematizationType //Schematizationfactor - { - MacroStabilityInnerSideWet, - MacroStabilityInnerSideDry, - PipingWet, - PipingDry, - HorizontalBalanceDry - } - - // TODO: Operational. This is operational specific code and should be moved to its own class - public enum DataSourceTypeSensors //Sensors - { - Ignore, - LocationData, - Sensor - } - - // TODO: Operational. This is operational specific code and should be moved to its own class - public enum SensorType //Sensors - { - PiezometricHead, - WaterLevel, - PolderLevel - } - - // TODO: Operational. This is operational specific code and should be moved to its own class - /// - /// Type of output series - /// - public enum TimeSerieParameters - { - PipingFactorWtiSellmeijerRevised, - PipingFactorBligh, - PipingFactorSellmeijer, - ProbabilityOfFailurePipingSellmeijer, - OvertoppingErosion, - StabilityInsideFactor, - StabilityOutsideFactor - } - + // TODO: RW this is regional specific code and should be moved to its own class #Bka: so should be eliminated! public enum UpliftType { Uplift, @@ -255,30 +90,8 @@ None } - public enum JobResult - { - NoRun, - Failed, - Good, - Bad, - Mixed - } - - // TODO: Operational. This is operational specific code and should be moved to its own class - public enum TimeStepUnit - { - Second, - Minute, - Hour, - Day, - Week, - Month, - Year, - Nonequidistant - } - /// - /// Dike soil scenario for the automatic creation of the waternet - 4 possibilities. + /// Dike soil scenario for the automatic creation of the waternet - 4 possibilities. #Bka: is nowhere really used so should be removed entirely. /// public enum DikeSoilScenario { @@ -302,15 +115,4 @@ /// SandDikeOnSand } - - // TODO: FM this is failure mechanism specific code and should be moved to ..\KernelWrappers - public enum IntrusionVerticalWaterPressureType - { - Standard, - Linear, - FullHydroStatic, - HydroStatic, - SemiTimeDependent - } - }