Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs
===================================================================
diff -u -r3085 -r3124
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs (.../FillXmlInputFromDamUi.cs) (revision 3085)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs (.../FillXmlInputFromDamUi.cs) (revision 3124)
@@ -47,7 +47,6 @@
/// Creates the input.
///
/// The dam project data.
- /// The project map.
///
public static Input CreateInput(DamProjectData damProjectData)
{
@@ -97,50 +96,15 @@
// Process soilprofiles
var localSegments = EnsureInputLocationsSegmentsAreInSegments(damProjectData.WaterBoard.Segments, filteredLocations);
- if (damProjectData.DamProjectCalculationSpecification.SelectedStabilityKernelType == StabilityKernelType.DamClassicStability)
+ // Fill 1D profiles in case of DamClassicStability
+ if (dike.SoilProfiles != null)
{
- // Fill 1D profiles in case of DamClassicStability
- if (dike.SoilProfiles != null)
- {
- var profilesCount = dike.SoilProfiles.Count;
- input.SoilProfiles1D = new DamEngine.Io.XmlInput.SoilProfile1D[profilesCount];
- TransferSoilProfiles1D(dike.SoilProfiles, input.SoilProfiles1D);
- }
-
- input.SoilProfiles2D = soilProfiles2DToSerialize.ToArray();
+ var profilesCount = dike.SoilProfiles.Count;
+ input.SoilProfiles1D = new DamEngine.Io.XmlInput.SoilProfile1D[profilesCount];
+ TransferSoilProfiles1D(dike.SoilProfiles, input.SoilProfiles1D);
}
- if (damProjectData.DamProjectCalculationSpecification.SelectedStabilityKernelType == StabilityKernelType.WtiMacroStabilityKernel)
- {
- // fill 2D profiles in case of WtiMacroStabilityKernel
- var i = 0;
- foreach (var localSegment in localSegments)
- {
- foreach (var localSegmentSoilProfileProbability in localSegment.SoilProfileProbabilities)
- {
- if (localSegmentSoilProfileProbability.SegmentFailureMechanismType ==
- FailureMechanismSystemType.StabilityInside)
- {
- var soilSurfaceProfile = new SoilSurfaceProfile();
- var soilProfile1D = new Deltares.Geotechnics.Soils.SoilProfile1D();
- soilProfile1D.Assign(localSegmentSoilProfileProbability.SoilProfile);
- soilSurfaceProfile.SoilProfile = soilProfile1D;
- soilSurfaceProfile.SurfaceLine2 = filteredLocations[i].LocalXZSurfaceLine2;
- var dikeSoil = filteredLocations[i].GetDikeEmbankmentSoil();
- soilSurfaceProfile.DikeEmbankmentMaterial = dikeSoil;
- foreach (SoilLayer2D layer in soilSurfaceProfile.Surfaces)
- {
- if (layer.Soil == null)
- {
- layer.Soil = dikeSoil;
- }
- }
- }
- }
- i++;
- }
- TransferSoilProfiles2D(dike.SoilProfiles, input.SoilProfiles2D);
- }
+ input.SoilProfiles2D = soilProfiles2DToSerialize.ToArray();
// Process segments
if (localSegments != null)