Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Assemblers/Geometry2DSectionAssembler.cs =================================================================== diff -u -r5142 -r5148 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Assemblers/Geometry2DSectionAssembler.cs (.../Geometry2DSectionAssembler.cs) (revision 5142) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Assemblers/Geometry2DSectionAssembler.cs (.../Geometry2DSectionAssembler.cs) (revision 5148) @@ -33,11 +33,6 @@ public class Geometry2DSectionAssembler : DtoDocumentAssembler { /// - /// Holds the xml element name - /// - public const string XmlElementNameGeometry2DSectionInput = "Geometry2DSectionInput"; - - /// /// Holds the Geometry2DSectionParameters xml element and attribute names /// public const string XmlElementGeometry2DSectionInput = "Geometry2DSectionInput"; @@ -98,83 +93,4 @@ return geometry2DSectionParameters; } - - /// - /// Assembles the GeometryCreationOptions element - /// - /// - /// - /// - private static XElement GetGeometry2DSectionParametersElement(Geometry2DSectionParameters geometry2DSectionParameters, XNamespace tnsb) - { - return new XElement(tnsb + XmlElementGeometry2DSectionInput, - new XAttribute(XmlAttributeSoilGeometry2DFilename, geometry2DSectionParameters.SoilGeometry2DName), - new XAttribute(XmlAttributeXCoordinateSection, geometry2DSectionParameters.XCoordinateSection) - ); - } - - /// - /// - /// - /// - /// - /// - /// - private static XElement GetProfileElement(SoilProfile1D profile, XNamespace tns, XNamespace tnsa) - { - var profileElement = new XElement(tns + XMLAttributes.XmlElementProfile); - profileElement.Add(new XAttribute(XMLAttributes.XmlAttributeName, profile.Name)); - // Next four attributes are fake but never used in DAM anyway so ok. - profileElement.Add(new XAttribute(XMLAttributes.XmlAttributeXCoordinate, 0)); - profileElement.Add(new XAttribute(XMLAttributes.XmlAttributeYCoordinate, 0)); - profileElement.Add(new XAttribute(XMLAttributes.XmlAttributePhreaticLevel, 0)); - profileElement.Add(new XAttribute(XMLAttributes.XmlAttributeHasPhreaticLevel, false)); - - profileElement.Add(new XAttribute(XMLAttributes.XmlAttributeBottomLevel, profile.BottomLevel)); - - if (profile.Layers.Count > 0) - { - var layersElement = new XElement(tnsa + XMLAttributes.XmlElementLayers); - GetProfileLayersElement(profile, tnsa, layersElement); - profileElement.Add(layersElement); - } - - // Bottom sand layer - if (profile.BottomAquiferLayer != null) - { - profileElement.Add(new XAttribute(XMLAttributes.XmlAttributeBottomSandLayerID, profile.BottomAquiferLayer.Name)); - } - - // In-between sand layer - if (profile.InBetweenAquiferLayer != null) - { - profileElement.Add(new XAttribute(XMLAttributes.XmlAttributeInBetweenSandLayerID, profile.InBetweenAquiferLayer.Name)); - } - - // Infiltration layer - if (profile.InfiltrationLayer != null) - { - profileElement.Add(new XAttribute(XMLAttributes.XmlAttributeInfiltrationLayerID, profile.InfiltrationLayer.Name)); - } - - return profileElement; - } - - // Assembles the layer elements for the profile - private static void GetProfileLayersElement(SoilProfile1D profile, XNamespace tnsa, XElement layersElement) - { - foreach (SoilLayer1D layer in profile.Layers) - { - if (layer.Name == null) - { - layer.Name = profile.GetNewUniqueLayerName(); - } - - var layerElement = new XElement(tnsa + XMLAttributes.XmlElementLayer); - layersElement.Add(layerElement); - layerElement.Add(new XAttribute(XMLAttributes.XmlAttributeID, $"{layer.Name}")); - layerElement.Add(new XAttribute(XMLAttributes.XmlAttributeSoilID, layer.Soil.Name)); - layerElement.Add(new XAttribute(XMLAttributes.XmlAttributeTopLevel, layer.TopLevel)); - } - } -} \ No newline at end of file + } \ No newline at end of file