Index: DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs =================================================================== diff -u -r1183 -r1192 --- DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 1183) +++ DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 1192) @@ -3783,9 +3783,6 @@ public enum InputDamProjectType { /// - Assessment, - - /// AssessmentRegional, /// Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs =================================================================== diff -u -r1183 -r1192 --- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 1183) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 1192) @@ -33,7 +33,6 @@ public class ConversionHelperTests { [Test] - [TestCase(InputDamProjectType.Assessment, DamProjectType.Assessment)] [TestCase(InputDamProjectType.AssessmentRegional, DamProjectType.AssessmentRegional)] [TestCase(InputDamProjectType.Design, DamProjectType.Design)] [TestCase(InputDamProjectType.Operational, DamProjectType.Operational)] @@ -43,7 +42,6 @@ } [Test] - [TestCase(DamProjectType.Assessment, InputDamProjectType.Assessment)] [TestCase(DamProjectType.AssessmentRegional, InputDamProjectType.AssessmentRegional)] [TestCase(DamProjectType.Design, InputDamProjectType.Design)] [TestCase(DamProjectType.Operational, InputDamProjectType.Operational)] Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs =================================================================== diff -u -r1183 -r1192 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs (.../ConversionHelper.cs) (revision 1183) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs (.../ConversionHelper.cs) (revision 1192) @@ -43,7 +43,6 @@ { var translationTable = new Dictionary() { - {InputDamProjectType.Assessment, DamProjectType.Assessment}, {InputDamProjectType.AssessmentRegional, DamProjectType.AssessmentRegional}, {InputDamProjectType.Design, DamProjectType.Design}, {InputDamProjectType.Operational, DamProjectType.Operational} @@ -60,7 +59,6 @@ { var translationTable = new Dictionary() { - {DamProjectType.Assessment, InputDamProjectType.Assessment}, {DamProjectType.AssessmentRegional, InputDamProjectType.AssessmentRegional}, {DamProjectType.Design, InputDamProjectType.Design}, {DamProjectType.Operational, InputDamProjectType.Operational} @@ -1093,7 +1091,7 @@ public const int SoilTypeGravel = 1; public const int SoilTypeLoam = 2; public const int SoilTypePeat = 3; - public const int SoilTypeSand = 4; + public const int SoilTypeSand = 4; /// /// Converts the input dikeMaterialType to SoilType. @@ -1112,6 +1110,7 @@ }; return translationTable[dikeMaterialType]; } + /// /// Converts the SoilType to the input dikeMaterialType. /// Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Location.cs =================================================================== diff -u -r1122 -r1192 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Location.cs (.../Location.cs) (revision 1122) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Location.cs (.../Location.cs) (revision 1192) @@ -962,7 +962,7 @@ if (modelFactors != null) { // For regional assessment, automatically fill with the detriment factor instead of error message and repairer (MWDAM-748) - if (DamType == DamType.Regional && DamProjectType == DamProjectType.Assessment) + if (DamType == DamType.Regional && DamProjectType == DamProjectType.AssessmentRegional) { modelFactors.RequiredSafetyFactorStabilityInnerSlope = detrimentFactor; } @@ -1153,7 +1153,7 @@ [Validate] public ValidationResult[] ValidateLocationHasValidEssentialAssessmentValues() { - if (DamProjectType == DamProjectType.Assessment) + if (DamProjectType == DamProjectType.AssessmentRegional) { if (Math.Abs(BoezemLevelTp - BoezemLevelNotSetValue) < Double.Epsilon) { Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/LocationJob.cs =================================================================== diff -u -r1120 -r1192 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/LocationJob.cs (.../LocationJob.cs) (revision 1120) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/LocationJob.cs (.../LocationJob.cs) (revision 1192) @@ -232,7 +232,7 @@ return DamGlobalConstants.NoRunValue; } } - else if (DamProjectType == DamProjectType.Assessment) + else if (DamProjectType == DamProjectType.AssessmentRegional) { if (this.HasRegionalScenarioResults && GetRWScenarioResultWithLowestSafetyFactor(currentScenarioType) != null) { @@ -275,7 +275,7 @@ else { // For Piping in Assesment projects, ignore the given detriment factor and use the required safety for Piping - if (DamProjectType == DamProjectType.Assessment && (currentScenarioType == ScenarioType.Scenario10 || currentScenarioType == ScenarioType.Scenario11)) + if (DamProjectType == DamProjectType.AssessmentRegional && (currentScenarioType == ScenarioType.Scenario10 || currentScenarioType == ScenarioType.Scenario11)) { return DamGlobalConstants.RequiredSafetyPipingForAssessment; } @@ -314,7 +314,7 @@ { get { - if (DamProjectType == DamProjectType.Assessment && AreRWScenarioResultsMixed(currentScenarioType)) + if (DamProjectType == DamProjectType.AssessmentRegional && AreRWScenarioResultsMixed(currentScenarioType)) { return JobResult.Mixed; } Index: DamEngine/trunk/xsd/DamInput.xsd =================================================================== diff -u -r1088 -r1192 --- DamEngine/trunk/xsd/DamInput.xsd (.../DamInput.xsd) (revision 1088) +++ DamEngine/trunk/xsd/DamInput.xsd (.../DamInput.xsd) (revision 1192) @@ -57,7 +57,6 @@ - Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/DAMEnumerations.cs =================================================================== diff -u -r1122 -r1192 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/DAMEnumerations.cs (.../DAMEnumerations.cs) (revision 1122) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/DAMEnumerations.cs (.../DAMEnumerations.cs) (revision 1192) @@ -47,8 +47,7 @@ public enum DamProjectType { - Assessment, - AssessmentRegional, // #Bka: was/is: Assessment + type = regional. Not yet properly replaced + AssessmentRegional, Operational, Design } Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/EngineInterface.cs =================================================================== diff -u -r1181 -r1192 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/EngineInterface.cs (.../EngineInterface.cs) (revision 1181) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/EngineInterface.cs (.../EngineInterface.cs) (revision 1192) @@ -170,7 +170,6 @@ calculationMessages = regionalScenariosCalculator.Execute(DamProjectData); regionalScenariosCalculator.GetResults(); break; - case DamProjectType.Assessment: case DamProjectType.Operational: throw new NotImplementedException(); case DamProjectType.Design: Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/StabilityOptions.cs =================================================================== diff -u -r992 -r1192 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/StabilityOptions.cs (.../StabilityOptions.cs) (revision 992) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/StabilityOptions.cs (.../StabilityOptions.cs) (revision 1192) @@ -140,7 +140,7 @@ // TODO possibly set this when setting a damType and damProjectType for this location public void SetDefaultValues(DamType damType, DamProjectType damProjectType) { - if ((damType == DamType.Regional) && (damProjectType == DamProjectType.Assessment)) + if ((damType == DamType.Regional) && (damProjectType == DamProjectType.AssessmentRegional)) { zoneAreaRestSlopeCrestWidth = 1.5; }