Index: dam engine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs =================================================================== diff -u -r757 -r758 --- dam engine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs (.../ConversionHelper.cs) (revision 757) +++ dam engine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs (.../ConversionHelper.cs) (revision 758) @@ -43,18 +43,10 @@ { var translationTable = new Dictionary() { - { - InputDamProjectType.Assessment, DamProjectType.Assessment - }, - { - InputDamProjectType.AssessmentRegional, DamProjectType.AssessmentRegional - }, - { - InputDamProjectType.Design, DamProjectType.Design - }, - { - InputDamProjectType.Operational, DamProjectType.Operational - } + {InputDamProjectType.Assessment, DamProjectType.Assessment}, + {InputDamProjectType.AssessmentRegional, DamProjectType.AssessmentRegional}, + {InputDamProjectType.Design, DamProjectType.Design}, + {InputDamProjectType.Operational, DamProjectType.Operational} }; return translationTable[inputDamProjectType]; } @@ -68,18 +60,10 @@ { var translationTable = new Dictionary() { - { - DamProjectType.Assessment, InputDamProjectType.Assessment - }, - { - DamProjectType.AssessmentRegional, InputDamProjectType.AssessmentRegional - }, - { - DamProjectType.Design, InputDamProjectType.Design - }, - { - DamProjectType.Operational, InputDamProjectType.Operational - } + {DamProjectType.Assessment, InputDamProjectType.Assessment}, + {DamProjectType.AssessmentRegional, InputDamProjectType.AssessmentRegional}, + {DamProjectType.Design, InputDamProjectType.Design}, + {DamProjectType.Operational, InputDamProjectType.Operational} }; return translationTable[damProjectType]; } @@ -95,21 +79,11 @@ { var translationTable = new Dictionary() { - { - PLLineCreationMethod.ExpertKnowledgeLinearInDike, LocationWaternetOptionsPhreaticLineCreationMethod.ExpertKnowledgeLinearInDike - }, - { - PLLineCreationMethod.ExpertKnowledgeRRD, LocationWaternetOptionsPhreaticLineCreationMethod.ExpertKnowledgeRRD - }, - { - PLLineCreationMethod.GaugesWithFallbackToExpertKnowledgeRRD, LocationWaternetOptionsPhreaticLineCreationMethod.GaugesWithFallbackToExpertKnowledgeRRD - }, - { - PLLineCreationMethod.Sensors, LocationWaternetOptionsPhreaticLineCreationMethod.Sensors - }, - { - PLLineCreationMethod.None, LocationWaternetOptionsPhreaticLineCreationMethod.None - } + {PLLineCreationMethod.ExpertKnowledgeLinearInDike, LocationWaternetOptionsPhreaticLineCreationMethod.ExpertKnowledgeLinearInDike}, + {PLLineCreationMethod.ExpertKnowledgeRRD, LocationWaternetOptionsPhreaticLineCreationMethod.ExpertKnowledgeRRD}, + {PLLineCreationMethod.GaugesWithFallbackToExpertKnowledgeRRD, LocationWaternetOptionsPhreaticLineCreationMethod.GaugesWithFallbackToExpertKnowledgeRRD}, + {PLLineCreationMethod.Sensors, LocationWaternetOptionsPhreaticLineCreationMethod.Sensors}, + {PLLineCreationMethod.None, LocationWaternetOptionsPhreaticLineCreationMethod.None} }; return translationTable[plLineCreationMethod]; } @@ -125,21 +99,11 @@ { var translationTable = new Dictionary() { - { - LocationWaternetOptionsPhreaticLineCreationMethod.ExpertKnowledgeLinearInDike, PLLineCreationMethod.ExpertKnowledgeLinearInDike - }, - { - LocationWaternetOptionsPhreaticLineCreationMethod.ExpertKnowledgeRRD, PLLineCreationMethod.ExpertKnowledgeRRD - }, - { - LocationWaternetOptionsPhreaticLineCreationMethod.GaugesWithFallbackToExpertKnowledgeRRD, PLLineCreationMethod.GaugesWithFallbackToExpertKnowledgeRRD - }, - { - LocationWaternetOptionsPhreaticLineCreationMethod.Sensors, PLLineCreationMethod.Sensors - }, - { - LocationWaternetOptionsPhreaticLineCreationMethod.None, PLLineCreationMethod.None - } + {LocationWaternetOptionsPhreaticLineCreationMethod.ExpertKnowledgeLinearInDike, PLLineCreationMethod.ExpertKnowledgeLinearInDike}, + {LocationWaternetOptionsPhreaticLineCreationMethod.ExpertKnowledgeRRD, PLLineCreationMethod.ExpertKnowledgeRRD}, + {LocationWaternetOptionsPhreaticLineCreationMethod.GaugesWithFallbackToExpertKnowledgeRRD, PLLineCreationMethod.GaugesWithFallbackToExpertKnowledgeRRD}, + {LocationWaternetOptionsPhreaticLineCreationMethod.Sensors, PLLineCreationMethod.Sensors}, + {LocationWaternetOptionsPhreaticLineCreationMethod.None, PLLineCreationMethod.None} }; return translationTable[inputPhreaticLineCreationMethod]; } @@ -155,21 +119,11 @@ { var translationTable = new Dictionary() { - { - IntrusionVerticalWaterPressureType.FullHydroStatic, LocationWaternetOptionsIntrusionVerticalWaterPressure.FullHydroStatic - }, - { - IntrusionVerticalWaterPressureType.HydroStatic, LocationWaternetOptionsIntrusionVerticalWaterPressure.HydroStatic - }, - { - IntrusionVerticalWaterPressureType.Linear, LocationWaternetOptionsIntrusionVerticalWaterPressure.Linear - }, - { - IntrusionVerticalWaterPressureType.SemiTimeDependent, LocationWaternetOptionsIntrusionVerticalWaterPressure.SemiTimeDependent - }, - { - IntrusionVerticalWaterPressureType.Standard, LocationWaternetOptionsIntrusionVerticalWaterPressure.Standard - } + {IntrusionVerticalWaterPressureType.FullHydroStatic, LocationWaternetOptionsIntrusionVerticalWaterPressure.FullHydroStatic}, + {IntrusionVerticalWaterPressureType.HydroStatic, LocationWaternetOptionsIntrusionVerticalWaterPressure.HydroStatic}, + {IntrusionVerticalWaterPressureType.Linear, LocationWaternetOptionsIntrusionVerticalWaterPressure.Linear}, + {IntrusionVerticalWaterPressureType.SemiTimeDependent, LocationWaternetOptionsIntrusionVerticalWaterPressure.SemiTimeDependent}, + {IntrusionVerticalWaterPressureType.Standard, LocationWaternetOptionsIntrusionVerticalWaterPressure.Standard} }; return translationTable[intrusionVerticalWaterPressureType]; } @@ -185,21 +139,11 @@ { var translationTable = new Dictionary() { - { - LocationWaternetOptionsIntrusionVerticalWaterPressure.FullHydroStatic, IntrusionVerticalWaterPressureType.FullHydroStatic - }, - { - LocationWaternetOptionsIntrusionVerticalWaterPressure.HydroStatic, IntrusionVerticalWaterPressureType.HydroStatic - }, - { - LocationWaternetOptionsIntrusionVerticalWaterPressure.Linear, IntrusionVerticalWaterPressureType.Linear - }, - { - LocationWaternetOptionsIntrusionVerticalWaterPressure.SemiTimeDependent, IntrusionVerticalWaterPressureType.SemiTimeDependent - }, - { - LocationWaternetOptionsIntrusionVerticalWaterPressure.Standard, IntrusionVerticalWaterPressureType.Standard - } + {LocationWaternetOptionsIntrusionVerticalWaterPressure.FullHydroStatic, IntrusionVerticalWaterPressureType.FullHydroStatic}, + {LocationWaternetOptionsIntrusionVerticalWaterPressure.HydroStatic, IntrusionVerticalWaterPressureType.HydroStatic}, + {LocationWaternetOptionsIntrusionVerticalWaterPressure.Linear, IntrusionVerticalWaterPressureType.Linear}, + {LocationWaternetOptionsIntrusionVerticalWaterPressure.SemiTimeDependent, IntrusionVerticalWaterPressureType.SemiTimeDependent}, + {LocationWaternetOptionsIntrusionVerticalWaterPressure.Standard, IntrusionVerticalWaterPressureType.Standard} }; return translationTable[inputIntrusionVerticalWaterPressure]; } @@ -213,33 +157,15 @@ { var translationTable = new Dictionary() { - { - CalculationResult.NoRun, 0 - }, - { - CalculationResult.Succeeded, 1 - }, - { - CalculationResult.NoInput, 2 - }, - { - CalculationResult.NoLicense, 3 - }, - { - CalculationResult.UserAbort, 4 - }, - { - CalculationResult.InvalidInputStructure, 5 - }, - { - CalculationResult.InvalidInputData, 6 - }, - { - CalculationResult.RunFailed, 7 - }, - { - CalculationResult.UnexpectedError, 8 - } + {CalculationResult.NoRun, 0}, + {CalculationResult.Succeeded, 1}, + {CalculationResult.NoInput, 2}, + {CalculationResult.NoLicense, 3}, + {CalculationResult.UserAbort, 4}, + {CalculationResult.InvalidInputStructure, 5}, + {CalculationResult.InvalidInputData, 6}, + {CalculationResult.RunFailed, 7}, + {CalculationResult.UnexpectedError, 8} }; return translationTable[calculationResult]; } @@ -253,33 +179,15 @@ { var translationTable = new Dictionary() { - { - 0, CalculationResult.NoRun - }, - { - 1, CalculationResult.Succeeded - }, - { - 2, CalculationResult.NoInput - }, - { - 3, CalculationResult.NoLicense - }, - { - 4, CalculationResult.UserAbort - }, - { - 5, CalculationResult.InvalidInputStructure - }, - { - 6, CalculationResult.InvalidInputData - }, - { - 7, CalculationResult.RunFailed - }, - { - 8, CalculationResult.UnexpectedError - } + {0, CalculationResult.NoRun}, + {1, CalculationResult.Succeeded}, + {2, CalculationResult.NoInput}, + {3, CalculationResult.NoLicense}, + {4, CalculationResult.UserAbort}, + {5, CalculationResult.InvalidInputStructure}, + {6, CalculationResult.InvalidInputData}, + {7, CalculationResult.RunFailed}, + {8, CalculationResult.UnexpectedError} }; return translationTable[calculationResult]; } @@ -312,60 +220,24 @@ { var translationTable = new Dictionary() { - { - CpNone, CharacteristicPointType.None - }, - { - CpSurfaceLevelOutside, CharacteristicPointType.SurfaceLevelOutside - }, - { - CpDikeToeAtRiver, CharacteristicPointType.DikeToeAtRiver - }, - { - CpShoulderTopOutside, CharacteristicPointType.ShoulderTopOutside - }, - { - CpShoulderBaseOutside, CharacteristicPointType.ShoulderBaseOutside - }, - { - CpDikeTopAtRiver, CharacteristicPointType.DikeTopAtRiver - }, - { - CpDikeLine, CharacteristicPointType.DikeLine - }, - { - CpTrafficLoadOutside, CharacteristicPointType.TrafficLoadOutside - }, - { - CpTrafficLoadInside, CharacteristicPointType.TrafficLoadInside - }, - { - CpDikeTopAtPolder, CharacteristicPointType.DikeTopAtPolder - }, - { - CpShoulderBaseInside, CharacteristicPointType.ShoulderBaseInside - }, - { - CpShoulderTopInside, CharacteristicPointType.ShoulderTopInside - }, - { - CpDikeToeAtPolder, CharacteristicPointType.DikeToeAtPolder - }, - { - CpDitchDikeSide, CharacteristicPointType.DitchDikeSide - }, - { - CpBottomDitchDikeSide, CharacteristicPointType.BottomDitchDikeSide - }, - { - CpBottomDitchPolderSide, CharacteristicPointType.BottomDitchPolderSide - }, - { - CpDitchPolderSide, CharacteristicPointType.DitchPolderSide - }, - { - CpSurfaceLevelInside, CharacteristicPointType.SurfaceLevelInside - } + {CpNone, CharacteristicPointType.None}, + {CpSurfaceLevelOutside, CharacteristicPointType.SurfaceLevelOutside}, + {CpDikeToeAtRiver, CharacteristicPointType.DikeToeAtRiver}, + {CpShoulderTopOutside, CharacteristicPointType.ShoulderTopOutside}, + {CpShoulderBaseOutside, CharacteristicPointType.ShoulderBaseOutside}, + {CpDikeTopAtRiver, CharacteristicPointType.DikeTopAtRiver}, + {CpDikeLine, CharacteristicPointType.DikeLine}, + {CpTrafficLoadOutside, CharacteristicPointType.TrafficLoadOutside}, + {CpTrafficLoadInside, CharacteristicPointType.TrafficLoadInside}, + {CpDikeTopAtPolder, CharacteristicPointType.DikeTopAtPolder}, + {CpShoulderBaseInside, CharacteristicPointType.ShoulderBaseInside}, + {CpShoulderTopInside, CharacteristicPointType.ShoulderTopInside}, + {CpDikeToeAtPolder, CharacteristicPointType.DikeToeAtPolder}, + {CpDitchDikeSide, CharacteristicPointType.DitchDikeSide}, + {CpBottomDitchDikeSide, CharacteristicPointType.BottomDitchDikeSide}, + {CpBottomDitchPolderSide, CharacteristicPointType.BottomDitchPolderSide}, + {CpDitchPolderSide, CharacteristicPointType.DitchPolderSide}, + {CpSurfaceLevelInside, CharacteristicPointType.SurfaceLevelInside} }; return translationTable[inputPointType]; } @@ -379,60 +251,24 @@ { var translationTable = new Dictionary() { - { - CharacteristicPointType.None, CpNone - }, - { - CharacteristicPointType.SurfaceLevelOutside, CpSurfaceLevelOutside - }, - { - CharacteristicPointType.DikeToeAtRiver, CpDikeToeAtRiver - }, - { - CharacteristicPointType.ShoulderTopOutside, CpShoulderTopOutside - }, - { - CharacteristicPointType.ShoulderBaseOutside, CpShoulderBaseOutside - }, - { - CharacteristicPointType.DikeTopAtRiver, CpDikeTopAtRiver - }, - { - CharacteristicPointType.DikeLine, CpDikeLine - }, - { - CharacteristicPointType.TrafficLoadOutside, CpTrafficLoadOutside - }, - { - CharacteristicPointType.TrafficLoadInside, CpTrafficLoadInside - }, - { - CharacteristicPointType.DikeTopAtPolder, CpDikeTopAtPolder - }, - { - CharacteristicPointType.ShoulderBaseInside, CpShoulderBaseInside - }, - { - CharacteristicPointType.ShoulderTopInside, CpShoulderTopInside - }, - { - CharacteristicPointType.DikeToeAtPolder, CpDikeToeAtPolder - }, - { - CharacteristicPointType.DitchDikeSide, CpDitchDikeSide - }, - { - CharacteristicPointType.BottomDitchDikeSide, CpBottomDitchDikeSide - }, - { - CharacteristicPointType.BottomDitchPolderSide, CpBottomDitchPolderSide - }, - { - CharacteristicPointType.DitchPolderSide, CpDitchPolderSide - }, - { - CharacteristicPointType.SurfaceLevelInside, CpSurfaceLevelInside - } + {CharacteristicPointType.None, CpNone}, + {CharacteristicPointType.SurfaceLevelOutside, CpSurfaceLevelOutside}, + {CharacteristicPointType.DikeToeAtRiver, CpDikeToeAtRiver}, + {CharacteristicPointType.ShoulderTopOutside, CpShoulderTopOutside}, + {CharacteristicPointType.ShoulderBaseOutside, CpShoulderBaseOutside}, + {CharacteristicPointType.DikeTopAtRiver, CpDikeTopAtRiver}, + {CharacteristicPointType.DikeLine, CpDikeLine}, + {CharacteristicPointType.TrafficLoadOutside, CpTrafficLoadOutside}, + {CharacteristicPointType.TrafficLoadInside, CpTrafficLoadInside}, + {CharacteristicPointType.DikeTopAtPolder, CpDikeTopAtPolder}, + {CharacteristicPointType.ShoulderBaseInside, CpShoulderBaseInside}, + {CharacteristicPointType.ShoulderTopInside, CpShoulderTopInside}, + {CharacteristicPointType.DikeToeAtPolder, CpDikeToeAtPolder}, + {CharacteristicPointType.DitchDikeSide, CpDitchDikeSide}, + {CharacteristicPointType.BottomDitchDikeSide, CpBottomDitchDikeSide}, + {CharacteristicPointType.BottomDitchPolderSide, CpBottomDitchPolderSide}, + {CharacteristicPointType.DitchPolderSide, CpDitchPolderSide}, + {CharacteristicPointType.SurfaceLevelInside, CpSurfaceLevelInside} }; return translationTable[characteristicPointType]; } @@ -446,12 +282,8 @@ { var translationTable = new Dictionary() { - { - 0, WaterpressureInterpolationModel.Automatic - }, - { - 1, WaterpressureInterpolationModel.Hydrostatic - } + {0, WaterpressureInterpolationModel.Automatic}, + {1, WaterpressureInterpolationModel.Hydrostatic} }; return translationTable[inputWaterpressureInterpolationModel]; } @@ -465,12 +297,8 @@ { var translationTable = new Dictionary() { - { - WaterpressureInterpolationModel.Automatic, 0 - }, - { - WaterpressureInterpolationModel.Hydrostatic, 1 - } + {WaterpressureInterpolationModel.Automatic, 0}, + {WaterpressureInterpolationModel.Hydrostatic, 1} }; return translationTable[waterpressureInterpolationModel]; } @@ -484,15 +312,9 @@ { var translationTable = new Dictionary() { - { - SoilProfileType.ProfileType1D, 0 - }, - { - SoilProfileType.ProfileType2D, 1 - }, - { - SoilProfileType.ProfileTypeStiFile, 2 - } + {SoilProfileType.ProfileType1D, 0}, + {SoilProfileType.ProfileType2D, 1}, + {SoilProfileType.ProfileTypeStiFile, 2} }; return translationTable[soilProfileType]; } @@ -506,15 +328,9 @@ { var translationTable = new Dictionary() { - { - 0, SoilProfileType.ProfileType1D - }, - { - 1, SoilProfileType.ProfileType2D - }, - { - 2, SoilProfileType.ProfileTypeStiFile - } + {0, SoilProfileType.ProfileType1D}, + {1, SoilProfileType.ProfileType2D}, + {2, SoilProfileType.ProfileTypeStiFile} }; return translationTable[soilGeometryType]; } @@ -533,18 +349,10 @@ { var translationTable = new Dictionary() { - { - FailureMechanismSystemType.StabilityInside, InputFailureMechanismStabilityInside - }, - { - FailureMechanismSystemType.StabilityOutside, InputFailureMechanismStabilityOutside - }, - { - FailureMechanismSystemType.Piping, InputFailureMechanismPiping - }, - { - FailureMechanismSystemType.HorizontalBalance, InputFailureMechanismHorizontalBalance - } + {FailureMechanismSystemType.StabilityInside, InputFailureMechanismStabilityInside}, + {FailureMechanismSystemType.StabilityOutside, InputFailureMechanismStabilityOutside}, + {FailureMechanismSystemType.Piping, InputFailureMechanismPiping}, + {FailureMechanismSystemType.HorizontalBalance, InputFailureMechanismHorizontalBalance} }; return translationTable[segmentFailureMechanismType]; } @@ -558,18 +366,10 @@ { var translationTable = new Dictionary() { - { - InputFailureMechanismStabilityInside, FailureMechanismSystemType.StabilityInside - }, - { - InputFailureMechanismStabilityOutside, FailureMechanismSystemType.StabilityOutside - }, - { - InputFailureMechanismPiping, FailureMechanismSystemType.Piping - }, - { - InputFailureMechanismHorizontalBalance, FailureMechanismSystemType.HorizontalBalance - } + {InputFailureMechanismStabilityInside, FailureMechanismSystemType.StabilityInside}, + {InputFailureMechanismStabilityOutside, FailureMechanismSystemType.StabilityOutside}, + {InputFailureMechanismPiping, FailureMechanismSystemType.Piping}, + {InputFailureMechanismHorizontalBalance, FailureMechanismSystemType.HorizontalBalance} }; return translationTable[failureMechanismSystemType]; } @@ -583,15 +383,9 @@ { var translationTable = new Dictionary() { - { - PipingModelType.Bligh, InputPipingModelType.Bligh - }, - { - PipingModelType.SellmeijerVnk, InputPipingModelType.SellmeijerVnk - }, - { - PipingModelType.Sellmeijer4Forces, InputPipingModelType.Sellmeijer4Forces - } + {PipingModelType.Bligh, InputPipingModelType.Bligh}, + {PipingModelType.SellmeijerVnk, InputPipingModelType.SellmeijerVnk}, + {PipingModelType.Sellmeijer4Forces, InputPipingModelType.Sellmeijer4Forces} }; return translationTable[pipingModelType]; } @@ -605,15 +399,9 @@ { var translationTable = new Dictionary() { - { - InputPipingModelType.Bligh, PipingModelType.Bligh - }, - { - InputPipingModelType.SellmeijerVnk, PipingModelType.SellmeijerVnk - }, - { - InputPipingModelType.Sellmeijer4Forces, PipingModelType.Sellmeijer4Forces - } + {InputPipingModelType.Bligh, PipingModelType.Bligh}, + {InputPipingModelType.SellmeijerVnk, PipingModelType.SellmeijerVnk}, + {InputPipingModelType.Sellmeijer4Forces, PipingModelType.Sellmeijer4Forces} }; return translationTable[inputPipingModelType]; } @@ -627,15 +415,9 @@ { var translationTable = new Dictionary() { - { - MStabModelType.Bishop, InputStabilityModelType.Bishop - }, - { - MStabModelType.UpliftVan, InputStabilityModelType.UpliftVan - }, - { - MStabModelType.BishopUpliftVan, InputStabilityModelType.BishopUpliftVan - } + {MStabModelType.Bishop, InputStabilityModelType.Bishop}, + {MStabModelType.UpliftVan, InputStabilityModelType.UpliftVan}, + {MStabModelType.BishopUpliftVan, InputStabilityModelType.BishopUpliftVan} }; return translationTable[stabilityModelType]; } @@ -649,15 +431,9 @@ { var translationTable = new Dictionary() { - { - InputStabilityModelType.Bishop, MStabModelType.Bishop - }, - { - InputStabilityModelType.UpliftVan, MStabModelType.UpliftVan - }, - { - InputStabilityModelType.BishopUpliftVan, MStabModelType.BishopUpliftVan - } + {InputStabilityModelType.Bishop, MStabModelType.Bishop}, + {InputStabilityModelType.UpliftVan, MStabModelType.UpliftVan}, + {InputStabilityModelType.BishopUpliftVan, MStabModelType.BishopUpliftVan} }; return translationTable[inputStabilityModelType]; } @@ -671,12 +447,8 @@ { var translationTable = new Dictionary() { - { - AnalysisType.NoAdaption, InputAnalysisType.NoAdaption - }, - { - AnalysisType.AdaptGeometry, InputAnalysisType.AdaptGeometry - } + {AnalysisType.NoAdaption, InputAnalysisType.NoAdaption}, + {AnalysisType.AdaptGeometry, InputAnalysisType.AdaptGeometry} }; return translationTable[analysisType]; } @@ -690,12 +462,8 @@ { var translationTable = new Dictionary() { - { - InputAnalysisType.NoAdaption, AnalysisType.NoAdaption - }, - { - InputAnalysisType.AdaptGeometry, AnalysisType.AdaptGeometry - } + {InputAnalysisType.NoAdaption, AnalysisType.NoAdaption}, + {InputAnalysisType.AdaptGeometry, AnalysisType.AdaptGeometry} }; return translationTable[inputAnalysisType]; } @@ -724,15 +492,9 @@ { var translationTable = new Dictionary() { - { - MStabZonesType.NoZones, InputZoneTypeNoZones - }, - { - MStabZonesType.ZoneAreas, InputZoneTypeZoneAreas - }, - { - MStabZonesType.ForbiddenZone, InputZoneTypesForbiddenZones - } + {MStabZonesType.NoZones, InputZoneTypeNoZones}, + {MStabZonesType.ZoneAreas, InputZoneTypeZoneAreas}, + {MStabZonesType.ForbiddenZone, InputZoneTypesForbiddenZones} }; return translationTable[zoneType]; } @@ -746,15 +508,9 @@ { var translationTable = new Dictionary() { - { - InputZoneTypeNoZones, MStabZonesType.NoZones - }, - { - InputZoneTypeZoneAreas, MStabZonesType.ZoneAreas - }, - { - InputZoneTypesForbiddenZones, MStabZonesType.ForbiddenZone - } + {InputZoneTypeNoZones, MStabZonesType.NoZones}, + {InputZoneTypeZoneAreas, MStabZonesType.ZoneAreas}, + {InputZoneTypesForbiddenZones, MStabZonesType.ForbiddenZone} }; return translationTable[inputZoneType]; } @@ -778,12 +534,8 @@ { var translationTable = new Dictionary() { - { - MStabSearchMethod.Grid, InputSearchMethodGrid - }, - { - MStabSearchMethod.GeneticAlgorithm, InputSearchMethodGenetic - } + {MStabSearchMethod.Grid, InputSearchMethodGrid}, + {MStabSearchMethod.GeneticAlgorithm, InputSearchMethodGenetic} }; return translationTable[searchMethod]; } @@ -797,12 +549,8 @@ { var translationTable = new Dictionary() { - { - InputSearchMethodGrid, MStabSearchMethod.Grid - }, - { - InputSearchMethodGenetic, MStabSearchMethod.GeneticAlgorithm - } + {InputSearchMethodGrid, MStabSearchMethod.Grid}, + {InputSearchMethodGenetic, MStabSearchMethod.GeneticAlgorithm} }; return translationTable[searchMethod]; } @@ -816,24 +564,12 @@ { var translationTable = new Dictionary() { - { - LogMessageType.Warning, MessageMessageType.Warning - }, - { - LogMessageType.Debug, MessageMessageType.Info - }, - { - LogMessageType.Error, MessageMessageType.Error - }, - { - LogMessageType.FatalError, MessageMessageType.Error - }, - { - LogMessageType.Info, MessageMessageType.Info - }, - { - LogMessageType.Trace, MessageMessageType.Info - } + {LogMessageType.Warning, MessageMessageType.Warning}, + {LogMessageType.Debug, MessageMessageType.Info}, + {LogMessageType.Error, MessageMessageType.Error}, + {LogMessageType.FatalError, MessageMessageType.Error}, + {LogMessageType.Info, MessageMessageType.Info}, + {LogMessageType.Trace, MessageMessageType.Info} }; return translationTable[messageType]; } @@ -847,15 +583,9 @@ { var translationTable = new Dictionary() { - { - MessageMessageType.Warning, LogMessageType.Warning - }, - { - MessageMessageType.Error, LogMessageType.Error - }, - { - MessageMessageType.Info, LogMessageType.Info - } + {MessageMessageType.Warning, LogMessageType.Warning}, + {MessageMessageType.Error, LogMessageType.Error}, + {MessageMessageType.Info, LogMessageType.Info} }; return translationTable[validationResultMessageType]; } @@ -880,12 +610,8 @@ { var translationTable = new Dictionary() { - { - GridSizeDetermination.Automatic, InputGridTypeAutomatic - }, - { - GridSizeDetermination.Specified, InputGridTypeSpecified - } + {GridSizeDetermination.Automatic, InputGridTypeAutomatic}, + {GridSizeDetermination.Specified, InputGridTypeSpecified} }; return translationTable[gridType]; @@ -899,17 +625,17 @@ public static SoilShearStrengthModel ConvertToSoilShearStrengthModel(ShearStrengthModel shearStrengthModel) { var translationTable = new Dictionary() - { - {ShearStrengthModel.None, SoilShearStrengthModel.None}, - {ShearStrengthModel.CPhi, SoilShearStrengthModel.CPhi}, - {ShearStrengthModel.StressTable, SoilShearStrengthModel.StressTable}, - {ShearStrengthModel.PseudoValues, SoilShearStrengthModel.PseudoValues}, - {ShearStrengthModel.SuMeasured, SoilShearStrengthModel.SuMeasured}, - {ShearStrengthModel.SuCalculated, SoilShearStrengthModel.SuCalculated}, - {ShearStrengthModel.SuGradient, SoilShearStrengthModel.SuGradient}, - {ShearStrengthModel.SuCalculatedWithYield, SoilShearStrengthModel.SuCalculatedWithYield}, - {ShearStrengthModel.CPhiOrSuCalculated, SoilShearStrengthModel.CPhiOrSuCalculated}, - }; + { + {ShearStrengthModel.None, SoilShearStrengthModel.None}, + {ShearStrengthModel.CPhi, SoilShearStrengthModel.CPhi}, + {ShearStrengthModel.StressTable, SoilShearStrengthModel.StressTable}, + {ShearStrengthModel.PseudoValues, SoilShearStrengthModel.PseudoValues}, + {ShearStrengthModel.SuMeasured, SoilShearStrengthModel.SuMeasured}, + {ShearStrengthModel.SuCalculated, SoilShearStrengthModel.SuCalculated}, + {ShearStrengthModel.SuGradient, SoilShearStrengthModel.SuGradient}, + {ShearStrengthModel.SuCalculatedWithYield, SoilShearStrengthModel.SuCalculatedWithYield}, + {ShearStrengthModel.CPhiOrSuCalculated, SoilShearStrengthModel.CPhiOrSuCalculated}, + }; return translationTable[shearStrengthModel]; } @@ -923,12 +649,8 @@ { var translationTable = new Dictionary() { - { - InputGridTypeAutomatic, GridSizeDetermination.Automatic - }, - { - InputGridTypeSpecified, GridSizeDetermination.Specified - } + {InputGridTypeAutomatic, GridSizeDetermination.Automatic}, + {InputGridTypeSpecified, GridSizeDetermination.Specified} }; return translationTable[gridType]; } @@ -952,12 +674,8 @@ { var translationTable = new Dictionary() { - { - TangentLinesDefinition.OnBoundaryLines, InputGridTypeAutomatic - }, - { - TangentLinesDefinition.Specified, InputGridTypeSpecified - } + {TangentLinesDefinition.OnBoundaryLines, InputGridTypeAutomatic}, + {TangentLinesDefinition.Specified, InputGridTypeSpecified} }; return translationTable[tangentLineType]; } @@ -971,12 +689,8 @@ { var translationTable = new Dictionary() { - { - InputGridTypeAutomatic, TangentLinesDefinition.OnBoundaryLines - }, - { - InputGridTypeSpecified, TangentLinesDefinition.Specified - } + {InputGridTypeAutomatic, TangentLinesDefinition.OnBoundaryLines}, + {InputGridTypeSpecified, TangentLinesDefinition.Specified} }; return translationTable[tangentLineType]; } @@ -989,17 +703,17 @@ public static ShearStrengthModel ConvertToShearStrengthModel(SoilShearStrengthModel soilShearStrengthModel) { var translationTable = new Dictionary() - { - {SoilShearStrengthModel.None, ShearStrengthModel.None}, - {SoilShearStrengthModel.CPhi, ShearStrengthModel.CPhi}, - {SoilShearStrengthModel.StressTable, ShearStrengthModel.StressTable}, - {SoilShearStrengthModel.PseudoValues, ShearStrengthModel.PseudoValues}, - {SoilShearStrengthModel.SuMeasured, ShearStrengthModel.SuMeasured}, - {SoilShearStrengthModel.SuCalculated, ShearStrengthModel.SuCalculated}, - {SoilShearStrengthModel.SuGradient, ShearStrengthModel.SuGradient}, - {SoilShearStrengthModel.SuCalculatedWithYield, ShearStrengthModel.SuCalculatedWithYield}, - {SoilShearStrengthModel.CPhiOrSuCalculated, ShearStrengthModel.CPhiOrSuCalculated}, - }; + { + {SoilShearStrengthModel.None, ShearStrengthModel.None}, + {SoilShearStrengthModel.CPhi, ShearStrengthModel.CPhi}, + {SoilShearStrengthModel.StressTable, ShearStrengthModel.StressTable}, + {SoilShearStrengthModel.PseudoValues, ShearStrengthModel.PseudoValues}, + {SoilShearStrengthModel.SuMeasured, ShearStrengthModel.SuMeasured}, + {SoilShearStrengthModel.SuCalculated, ShearStrengthModel.SuCalculated}, + {SoilShearStrengthModel.SuGradient, ShearStrengthModel.SuGradient}, + {SoilShearStrengthModel.SuCalculatedWithYield, ShearStrengthModel.SuCalculatedWithYield}, + {SoilShearStrengthModel.CPhiOrSuCalculated, ShearStrengthModel.CPhiOrSuCalculated}, + }; return translationTable[soilShearStrengthModel]; } @@ -1011,11 +725,11 @@ public static SoilDilatancyType ConvertToSoilDilatancyType(DilatancyType dilatancyType) { var translationTable = new Dictionary() - { - {DilatancyType.Zero, SoilDilatancyType.Zero}, - {DilatancyType.Phi, SoilDilatancyType.Phi}, - {DilatancyType.MinusPhi, SoilDilatancyType.MinusPhi}, - }; + { + {DilatancyType.Zero, SoilDilatancyType.Zero}, + {DilatancyType.Phi, SoilDilatancyType.Phi}, + {DilatancyType.MinusPhi, SoilDilatancyType.MinusPhi}, + }; return translationTable[dilatancyType]; } @@ -1027,11 +741,11 @@ public static DilatancyType ConvertToDilatancyType(SoilDilatancyType soilDilatancyType) { var translationTable = new Dictionary() - { - {SoilDilatancyType.Zero, DilatancyType.Zero}, - {SoilDilatancyType.Phi, DilatancyType.Phi}, - {SoilDilatancyType.MinusPhi, DilatancyType.MinusPhi}, - }; + { + {SoilDilatancyType.Zero, DilatancyType.Zero}, + {SoilDilatancyType.Phi, DilatancyType.Phi}, + {SoilDilatancyType.MinusPhi, DilatancyType.MinusPhi}, + }; return translationTable[soilDilatancyType]; } Index: dam engine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs =================================================================== diff -u -r734 -r758 --- dam engine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 734) +++ dam engine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 758) @@ -100,81 +100,84 @@ { if (input.StabilityParameters != null) { - var curSpec = damProjectData.DamProjectCalculationSpecification.CurrentSpecification; - if (curSpec != null) + if (damProjectData.DamProjectCalculationSpecification != null) { - curSpec.FailureMechanismeParamatersMStab = new FailureMechanismeParamatersMStab(); - curSpec.FailureMechanismeParamatersMStab.MStabParameters = new MStabParameters(); - var curStabParamas = curSpec.FailureMechanismeParamatersMStab.MStabParameters; - curStabParamas.SearchMethod = ConversionHelper.ConvertToSearchMethod(input.StabilityParameters.SearchMethod); - curStabParamas.SlipCircleDefinition = new SlipCircleDefinition(); - var slipCircleDefinition = curStabParamas.SlipCircleDefinition; - slipCircleDefinition.GridSizeDetermination = ConversionHelper.ConvertToGridDetermination(input.StabilityParameters.GridDetermination); - - if (input.StabilityParameters.BishopTangentLinesDefinitionSpecified) + var curSpec = damProjectData.DamProjectCalculationSpecification.CurrentSpecification; + if (curSpec != null) { - slipCircleDefinition.BishopTangentLinesDefinition = ConversionHelper.ConvertToTangentLinesDefinition(input.StabilityParameters.BishopTangentLinesDefinition); + curSpec.FailureMechanismeParamatersMStab = new FailureMechanismeParamatersMStab(); + curSpec.FailureMechanismeParamatersMStab.MStabParameters = new MStabParameters(); + var curStabParamas = curSpec.FailureMechanismeParamatersMStab.MStabParameters; + curStabParamas.SearchMethod = ConversionHelper.ConvertToSearchMethod(input.StabilityParameters.SearchMethod); + curStabParamas.SlipCircleDefinition = new SlipCircleDefinition(); + var slipCircleDefinition = curStabParamas.SlipCircleDefinition; + slipCircleDefinition.GridSizeDetermination = ConversionHelper.ConvertToGridDetermination(input.StabilityParameters.GridDetermination); + + if (input.StabilityParameters.BishopTangentLinesDefinitionSpecified) + { + slipCircleDefinition.BishopTangentLinesDefinition = ConversionHelper.ConvertToTangentLinesDefinition(input.StabilityParameters.BishopTangentLinesDefinition); + } + if (input.StabilityParameters.BishopTangentLinesDistanceSpecified) + { + slipCircleDefinition.BishopTangentLinesDistance = input.StabilityParameters.BishopTangentLinesDistance; + } + if (input.StabilityParameters.BishopGridVerticalPointsCountSpecified) + { + slipCircleDefinition.BishopGridVerticalPointCount = input.StabilityParameters.BishopGridVerticalPointsCount; + } + if (input.StabilityParameters.BishopGridVerticalPointsDistanceSpecified) + { + slipCircleDefinition.BishopGridVerticalPointDistance = input.StabilityParameters.BishopGridVerticalPointsDistance; + } + if (input.StabilityParameters.BishopGridHorizontalPointsCountSpecified) + { + slipCircleDefinition.BishopGridHorizontalPointCount = input.StabilityParameters.BishopGridHorizontalPointsCount; + } + if (input.StabilityParameters.BishopGridHorizontalPointsDistanceSpecified) + { + slipCircleDefinition.BishopGridHorizontalPointDistance = input.StabilityParameters.BishopGridHorizontalPointsDistance; + } + if (input.StabilityParameters.UpliftVanTangentLinesDefinitionSpecified) + { + slipCircleDefinition.UpliftVanTangentLinesDefinition = ConversionHelper.ConvertToTangentLinesDefinition(input.StabilityParameters.UpliftVanTangentLinesDefinition); + } + if (input.StabilityParameters.UpliftVanTangentLinesDistanceSpecified) + { + slipCircleDefinition.UpliftVanTangentLinesDistance = input.StabilityParameters.UpliftVanTangentLinesDistance; + } + if (input.StabilityParameters.UpliftVanGridLeftVerticalPointsCountSpecified) + { + slipCircleDefinition.UpliftVanLeftGridVerticalPointCount = input.StabilityParameters.UpliftVanGridLeftVerticalPointsCount; + } + if (input.StabilityParameters.UpliftVanGridLeftVerticalPointsDistanceSpecified) + { + slipCircleDefinition.UpliftVanLeftGridVerticalPointDistance = input.StabilityParameters.UpliftVanGridLeftVerticalPointsDistance; + } + if (input.StabilityParameters.UpliftVanGridLeftHorizontalPointsCountSpecified) + { + slipCircleDefinition.UpliftVanLeftGridHorizontalPointCount = input.StabilityParameters.UpliftVanGridLeftHorizontalPointsCount; + } + if (input.StabilityParameters.UpliftVanGridLeftHorizontalPointsDistanceSpecified) + { + slipCircleDefinition.UpliftVanLeftGridHorizontalPointDistance = input.StabilityParameters.UpliftVanGridLeftHorizontalPointsDistance; + } + if (input.StabilityParameters.UpliftVanGridRightVerticalPointsCountSpecified) + { + slipCircleDefinition.UpliftVanRightGridVerticalPointCount = input.StabilityParameters.UpliftVanGridRightVerticalPointsCount; + } + if (input.StabilityParameters.UpliftVanGridRightVerticalPointsDistanceSpecified) + { + slipCircleDefinition.UpliftVanRightGridVerticalPointDistance = input.StabilityParameters.UpliftVanGridRightVerticalPointsDistance; + } + if (input.StabilityParameters.UpliftVanGridRightHorizontalPointsCountSpecified) + { + slipCircleDefinition.UpliftVanRightGridHorizontalPointCount = input.StabilityParameters.UpliftVanGridRightHorizontalPointsCount; + } + if (input.StabilityParameters.UpliftVanGridRightHorizontalPointsDistanceSpecified) + { + slipCircleDefinition.UpliftVanRightGridHorizontalPointDistance = input.StabilityParameters.UpliftVanGridRightHorizontalPointsDistance; + } } - if (input.StabilityParameters.BishopTangentLinesDistanceSpecified) - { - slipCircleDefinition.BishopTangentLinesDistance = input.StabilityParameters.BishopTangentLinesDistance; - } - if (input.StabilityParameters.BishopGridVerticalPointsCountSpecified) - { - slipCircleDefinition.BishopGridVerticalPointCount = input.StabilityParameters.BishopGridVerticalPointsCount; - } - if (input.StabilityParameters.BishopGridVerticalPointsDistanceSpecified) - { - slipCircleDefinition.BishopGridVerticalPointDistance = input.StabilityParameters.BishopGridVerticalPointsDistance; - } - if (input.StabilityParameters.BishopGridHorizontalPointsCountSpecified) - { - slipCircleDefinition.BishopGridHorizontalPointCount = input.StabilityParameters.BishopGridHorizontalPointsCount; - } - if (input.StabilityParameters.BishopGridHorizontalPointsDistanceSpecified) - { - slipCircleDefinition.BishopGridHorizontalPointDistance = input.StabilityParameters.BishopGridHorizontalPointsDistance; - } - if (input.StabilityParameters.UpliftVanTangentLinesDefinitionSpecified) - { - slipCircleDefinition.UpliftVanTangentLinesDefinition = ConversionHelper.ConvertToTangentLinesDefinition(input.StabilityParameters.UpliftVanTangentLinesDefinition); - } - if (input.StabilityParameters.UpliftVanTangentLinesDistanceSpecified) - { - slipCircleDefinition.UpliftVanTangentLinesDistance = input.StabilityParameters.UpliftVanTangentLinesDistance; - } - if (input.StabilityParameters.UpliftVanGridLeftVerticalPointsCountSpecified) - { - slipCircleDefinition.UpliftVanLeftGridVerticalPointCount = input.StabilityParameters.UpliftVanGridLeftVerticalPointsCount; - } - if (input.StabilityParameters.UpliftVanGridLeftVerticalPointsDistanceSpecified) - { - slipCircleDefinition.UpliftVanLeftGridVerticalPointDistance = input.StabilityParameters.UpliftVanGridLeftVerticalPointsDistance; - } - if (input.StabilityParameters.UpliftVanGridLeftHorizontalPointsCountSpecified) - { - slipCircleDefinition.UpliftVanLeftGridHorizontalPointCount = input.StabilityParameters.UpliftVanGridLeftHorizontalPointsCount; - } - if (input.StabilityParameters.UpliftVanGridLeftHorizontalPointsDistanceSpecified) - { - slipCircleDefinition.UpliftVanLeftGridHorizontalPointDistance = input.StabilityParameters.UpliftVanGridLeftHorizontalPointsDistance; - } - if (input.StabilityParameters.UpliftVanGridRightVerticalPointsCountSpecified) - { - slipCircleDefinition.UpliftVanRightGridVerticalPointCount = input.StabilityParameters.UpliftVanGridRightVerticalPointsCount; - } - if (input.StabilityParameters.UpliftVanGridRightVerticalPointsDistanceSpecified) - { - slipCircleDefinition.UpliftVanRightGridVerticalPointDistance = input.StabilityParameters.UpliftVanGridRightVerticalPointsDistance; - } - if (input.StabilityParameters.UpliftVanGridRightHorizontalPointsCountSpecified) - { - slipCircleDefinition.UpliftVanRightGridHorizontalPointCount = input.StabilityParameters.UpliftVanGridRightHorizontalPointsCount; - } - if (input.StabilityParameters.UpliftVanGridRightHorizontalPointsDistanceSpecified) - { - slipCircleDefinition.UpliftVanRightGridHorizontalPointDistance = input.StabilityParameters.UpliftVanGridRightHorizontalPointsDistance; - } } } }