Fisheye: Tag 2897 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Assemblers/DamMStabAssembler.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Assemblers/DAMMStabGeometry2DSectionAssembler.cs
===================================================================
diff -u -r2895 -r2897
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Assemblers/DAMMStabGeometry2DSectionAssembler.cs (.../DAMMStabGeometry2DSectionAssembler.cs) (revision 2895)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Assemblers/DAMMStabGeometry2DSectionAssembler.cs (.../DAMMStabGeometry2DSectionAssembler.cs) (revision 2897)
@@ -49,7 +49,7 @@
///
///
public DamMstabGeometry2DSectionAssembler() :
- base(DamMStabAssembler.XmlElementName, DamMStabAssembler.XmlElementNamespace, DamMStabAssembler.XsdEmbeddedResourcePath)
+ base(XMLAttributes.XmlElementName, XMLAttributes.XmlElementNamespace, XMLAttributes.XsdEmbeddedResourcePath)
{
}
@@ -106,32 +106,32 @@
///
private static XElement GetProfileElement(SoilProfile1D profile, XNamespace tns, XNamespace tnsa)
{
- var profileElement = new XElement(tns + DamMStabAssembler.XmlElementProfile);
- profileElement.Add(new XAttribute(DamMStabAssembler.XmlAttributeName, profile.Name));
+ 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(DamMStabAssembler.XmlAttributeXCoordinate, 0));
- profileElement.Add(new XAttribute(DamMStabAssembler.XmlAttributeYCoordinate, 0));
- profileElement.Add(new XAttribute(DamMStabAssembler.XmlAttributePhreaticLevel, 0));
- profileElement.Add(new XAttribute(DamMStabAssembler.XmlAttributeHasPhreaticLevel, false));
+ 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(DamMStabAssembler.XmlAttributeBottomLevel, profile.BottomLevel));
+ profileElement.Add(new XAttribute(XMLAttributes.XmlAttributeBottomLevel, profile.BottomLevel));
if (profile.Layers.Count > 0)
{
- var layersElement = new XElement(tnsa + DamMStabAssembler.XmlElementLayers);
+ 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(DamMStabAssembler.XmlAttributeBottomSandLayerID, profile.BottomAquiferLayer.Name));
+ profileElement.Add(new XAttribute(XMLAttributes.XmlAttributeBottomSandLayerID, profile.BottomAquiferLayer.Name));
// In-between sand layer
if (profile.InBetweenAquiferLayer != null)
- profileElement.Add(new XAttribute(DamMStabAssembler.XmlAttributeInBetweenSandLayerID, profile.InBetweenAquiferLayer.Name));
+ profileElement.Add(new XAttribute(XMLAttributes.XmlAttributeInBetweenSandLayerID, profile.InBetweenAquiferLayer.Name));
// Infiltration layer
if (profile.InfiltrationLayer != null)
- profileElement.Add(new XAttribute(DamMStabAssembler.XmlAttributeInfiltrationLayerID, profile.InfiltrationLayer.Name));
+ profileElement.Add(new XAttribute(XMLAttributes.XmlAttributeInfiltrationLayerID, profile.InfiltrationLayer.Name));
return profileElement;
}
@@ -143,11 +143,11 @@
if (layer.Name == null)
layer.Name = profile.GetNewUniqueLayerName();
- var layerElement = new XElement(tnsa + DamMStabAssembler.XmlElementLayer);
+ var layerElement = new XElement(tnsa + XMLAttributes.XmlElementLayer);
layersElement.Add(layerElement);
- layerElement.Add(new XAttribute(DamMStabAssembler.XmlAttributeID, String.Format("{0}", layer.Name)));
- layerElement.Add(new XAttribute(DamMStabAssembler.XmlAttributeSoilID, layer.Soil.Name));
- layerElement.Add(new XAttribute(DamMStabAssembler.XmlAttributeTopLevel, layer.TopLevel));
+ layerElement.Add(new XAttribute(XMLAttributes.XmlAttributeID, String.Format("{0}", layer.Name)));
+ layerElement.Add(new XAttribute(XMLAttributes.XmlAttributeSoilID, layer.Soil.Name));
+ layerElement.Add(new XAttribute(XMLAttributes.XmlAttributeTopLevel, layer.TopLevel));
}
}
@@ -166,29 +166,29 @@
// Get the dto
XElement profileDto = (from x in dtoDocument.Descendants()
- where x.Name.LocalName == DamMStabAssembler.XmlElementProfile
+ where x.Name.LocalName == XMLAttributes.XmlElementProfile
select x).FirstOrDefault();
if (profileDto != null)
{
var soilProfile = new SoilProfile1D
{
- Name = profileDto.AttributeAs(DamMStabAssembler.XmlAttributeName),
- BottomLevel = profileDto.AttributeAs(DamMStabAssembler.XmlAttributeBottomLevel)
+ Name = profileDto.AttributeAs(XMLAttributes.XmlAttributeName),
+ BottomLevel = profileDto.AttributeAs(XMLAttributes.XmlAttributeBottomLevel)
};
// Layers
XElement layerCollectionElement = (from element in profileDto.Descendants()
- where element.Name.LocalName == DamMStabAssembler.XmlElementLayers
+ where element.Name.LocalName == XMLAttributes.XmlElementLayers
select element).Single();
IEnumerable layerElementCollection = from element in layerCollectionElement.Descendants()
- where element.Name.LocalName == DamMStabAssembler.XmlElementLayer
+ where element.Name.LocalName == XMLAttributes.XmlElementLayer
select element;
foreach (XElement layerElement in layerElementCollection)
{
var soilLayer = new SoilLayer1D
{
Name = layerElement.AttributeAs("ID"),
- SoilName = layerElement.AttributeAs(DamMStabAssembler.XmlAttributeSoilID),
- TopLevel = layerElement.AttributeAs(DamMStabAssembler.XmlAttributeTopLevel)
+ SoilName = layerElement.AttributeAs(XMLAttributes.XmlAttributeSoilID),
+ TopLevel = layerElement.AttributeAs(XMLAttributes.XmlAttributeTopLevel)
};
soilProfile.Layers.Add(soilLayer);
}
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj
===================================================================
diff -u -r2896 -r2897
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj (.../Deltares.DamEngine.Calculators.csproj) (revision 2896)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj (.../Deltares.DamEngine.Calculators.csproj) (revision 2897)
@@ -99,6 +99,7 @@
+
@@ -147,7 +148,6 @@
-
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Assemblers/XMLAttributes.cs
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Assemblers/XMLAttributes.cs (revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Assemblers/XMLAttributes.cs (revision 2897)
@@ -0,0 +1,51 @@
+namespace Deltares.DamEngine.Calculators.KernelWrappers.Assemblers
+{
+ public static class XMLAttributes
+ {
+ public const string XmlAttributeBottomLevel = "BottomLevel";
+ public const string XmlAttributeHasPhreaticLevel = "HasPhreaticLevel";
+ public const string XmlAttributeID = "ID";
+ public const string XmlAttributeName = "Name";
+ public const string XmlAttributePhreaticLevel = "PhreaticLevel";
+ public const string XmlAttributeSoilID = "SoilID";
+ public const string XmlAttributeTopLevel = "TopLevel";
+ public const string XmlAttributeXCoordinate = "XCoordinate";
+ public const string XmlAttributeYCoordinate = "YCoordinate";
+ public const string XmlElementLayer = "Layer";
+ public const string XmlElementLayers = "Layers";
+ public const string XmlAttributeInBetweenSandLayerID = "InBetweenSandLayerID";
+ public const string XmlAttributeBottomSandLayerID = "BottomSandLayerID";
+ public const string XmlAttributeInfiltrationLayerID = "InfiltrationLayerID";
+
+ ///
+ /// Holds the xml element name
+ ///
+ public const string XmlElementName = "DamMStabDoc";
+
+ public const string XmlElementProfile = "Profile";
+
+ ///
+ /// Holds the common part of the path to the embedded resource
+ ///
+ private const string EmbeddedResourcePath = "Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStabilityCommon.Xsd";
+
+ ///
+ /// Holds the name of the xml schema
+ ///
+ public const string XmlSchemaName = "DamMStabDocDefinition";
+
+ public const string XmlSchemaNameInput = "DamMStabInputDefinition";
+
+ ///
+ /// Holds the xsd resource path
+ ///
+ public const string XsdEmbeddedResourcePath = EmbeddedResourcePath + "." + XmlSchemaName + ".xsd";
+
+ public const string XsdEmbeddedResourcePathInput = EmbeddedResourcePath + "." + XmlSchemaNameInput + ".xsd";
+
+ ///
+ /// Holds the xml namespace
+ ///
+ public const string XmlElementNamespace = "http://deltares.nl/2008/" + XMLAttributes.XmlSchemaName;
+ }
+}
\ No newline at end of file