Index: dam engine/trunk/src/Deltares.DamEngine.Data/General/SoilGeometry.cs =================================================================== diff -u -r578 -r773 --- dam engine/trunk/src/Deltares.DamEngine.Data/General/SoilGeometry.cs (.../SoilGeometry.cs) (revision 578) +++ dam engine/trunk/src/Deltares.DamEngine.Data/General/SoilGeometry.cs (.../SoilGeometry.cs) (revision 773) @@ -62,7 +62,7 @@ { get { - SoilProfileType soilProfileType = SoilProfileType.ProfileType2D; + SoilProfileType soilProfileType = SoilProfileType.ProfileTypeStiFile; if (soilProfile != null) { soilProfileType = SoilProfileType.ProfileType1D; Index: dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStability/MStabXmlDocTests.cs =================================================================== diff -u -r769 -r773 --- dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStability/MStabXmlDocTests.cs (.../MStabXmlDocTests.cs) (revision 769) +++ dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStability/MStabXmlDocTests.cs (.../MStabXmlDocTests.cs) (revision 773) @@ -464,7 +464,7 @@ soilProfileProbability.StiFileName = "Profile2D " + (i + 1).ToString(); // soilProfileProbability.StiFileName = FillDamFromXmlInput.FindSoilProfile2DByName(damProjectData.Dike.SoilProfiles2D, // soilProfileProbability.SoilProfile2DName); - soilProfileProbability.SoilProfileType = SoilProfileType.ProfileType2D; + soilProfileProbability.SoilProfileType = SoilProfileType.ProfileTypeStiFile; } else { Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DamProjectCalculator.cs =================================================================== diff -u -r711 -r773 --- dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DamProjectCalculator.cs (.../DamProjectCalculator.cs) (revision 711) +++ dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DamProjectCalculator.cs (.../DamProjectCalculator.cs) (revision 773) @@ -537,7 +537,7 @@ case SoilProfileType.ProfileType1D: soilGeometryName = soilProfileProbability.SoilProfile1DName; break; - case SoilProfileType.ProfileType2D: + case SoilProfileType.ProfileTypeStiFile: soilGeometryName = soilProfileProbability.StiFileName; break; } Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStability/MStabXmlDoc.cs =================================================================== diff -u -r715 -r773 --- dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStability/MStabXmlDoc.cs (.../MStabXmlDoc.cs) (revision 715) +++ dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStability/MStabXmlDoc.cs (.../MStabXmlDoc.cs) (revision 773) @@ -54,7 +54,7 @@ { // 2d-geometry failureMechanismeParamatersMStab.MStabParameters.GeometryCreationOptions.SoilProfileType = - SoilProfileType.ProfileType2D; + SoilProfileType.ProfileTypeStiFile; } // Geometry Creation Options failureMechanismeParamatersMStab.MStabParameters.GeometryCreationOptions.SoilGeometry2DFilename = Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/Stability/StabilityCalculator.cs =================================================================== diff -u -r715 -r773 --- dam engine/trunk/src/Deltares.DamEngine.Calculators/Stability/StabilityCalculator.cs (.../StabilityCalculator.cs) (revision 715) +++ dam engine/trunk/src/Deltares.DamEngine.Calculators/Stability/StabilityCalculator.cs (.../StabilityCalculator.cs) (revision 773) @@ -158,7 +158,7 @@ } else { - plLineCreator.SoilProfileType = SoilProfileType.ProfileType2D; + plLineCreator.SoilProfileType = SoilProfileType.ProfileTypeStiFile; string mapForSoilGeometries2D = ""; if (location.StabilityOptions != null) { Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/Dikes Assessment Regional/RWScenariosCalculation.cs =================================================================== diff -u -r578 -r773 --- dam engine/trunk/src/Deltares.DamEngine.Calculators/Dikes Assessment Regional/RWScenariosCalculation.cs (.../RWScenariosCalculation.cs) (revision 578) +++ dam engine/trunk/src/Deltares.DamEngine.Calculators/Dikes Assessment Regional/RWScenariosCalculation.cs (.../RWScenariosCalculation.cs) (revision 773) @@ -224,7 +224,7 @@ { foreach (SoilGeometryProbability soilGeometryProbability in soilGeometryProbabilities) { - if (soilGeometryProbability.SoilProfileType == SoilProfileType.ProfileType2D) + if (soilGeometryProbability.SoilProfileType == SoilProfileType.ProfileType2D || soilGeometryProbability.SoilProfileType == SoilProfileType.ProfileTypeStiFile) { this.evaluationJob.FailedEvaluatedLocations.Add(location); sendMessageDelegate(new LogMessage(LogMessageType.Warning, location, LocalizationManager.GetTranslatedText(this, "Geometry2DNotSupportedInRegionalAssessment") + Index: dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs =================================================================== diff -u -r730 -r773 --- dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs (.../FillDamFromXmlInputTests.cs) (revision 730) +++ dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs (.../FillDamFromXmlInputTests.cs) (revision 773) @@ -412,7 +412,14 @@ soilProfileProbability.SoilProfile2DName = "Profile2D " + (i + 1).ToString(); soilProfileProbability.SoilProfile2D = FillDamFromXmlInput.FindSoilProfile2DByName(damProjectData.Dike.SoilProfiles2D, soilProfileProbability.SoilProfile2DName); - soilProfileProbability.SoilProfileType = SoilProfileType.ProfileType2D; + if (soilProfileProbability.SoilProfile2D != null) + { + soilProfileProbability.SoilProfileType = SoilProfileType.ProfileType2D; + } + else + { + soilProfileProbability.SoilProfileType = SoilProfileType.ProfileTypeStiFile; + } } else { Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/General/CalculationHelper.cs =================================================================== diff -u -r711 -r773 --- dam engine/trunk/src/Deltares.DamEngine.Calculators/General/CalculationHelper.cs (.../CalculationHelper.cs) (revision 711) +++ dam engine/trunk/src/Deltares.DamEngine.Calculators/General/CalculationHelper.cs (.../CalculationHelper.cs) (revision 773) @@ -464,7 +464,7 @@ { throw new TimeSerieStabilityCalculatorException(String.Format("Location {0} does not have a soilprofile assigned", location.Name)); } - soilProfileType = SoilProfileType.ProfileType2D; + soilProfileType = SoilProfileType.ProfileTypeStiFile; } } }