Index: DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs
===================================================================
diff -u -r1268 -r1382
--- DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 1268)
+++ DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 1382)
@@ -2553,9 +2553,9 @@
private bool headPl4FieldSpecified;
- private double dampingFactorPL3Field;
+ private double dampingFactorPl3Field;
- private double dampingFactorPL4Field;
+ private double dampingFactorPl4Field;
private double penetrationLengthField;
@@ -2715,23 +2715,23 @@
///
[System.Xml.Serialization.XmlAttributeAttribute()]
- public double DampingFactorPL3 {
+ public double DampingFactorPl3 {
get {
- return this.dampingFactorPL3Field;
+ return this.dampingFactorPl3Field;
}
set {
- this.dampingFactorPL3Field = value;
+ this.dampingFactorPl3Field = value;
}
}
///
[System.Xml.Serialization.XmlAttributeAttribute()]
- public double DampingFactorPL4 {
+ public double DampingFactorPl4 {
get {
- return this.dampingFactorPL4Field;
+ return this.dampingFactorPl4Field;
}
set {
- this.dampingFactorPL4Field = value;
+ this.dampingFactorPl4Field = value;
}
}
Index: DamEngine/trunk/xsd/DamLocation.xsd
===================================================================
diff -u -r1268 -r1382
--- DamEngine/trunk/xsd/DamLocation.xsd (.../DamLocation.xsd) (revision 1268)
+++ DamEngine/trunk/xsd/DamLocation.xsd (.../DamLocation.xsd) (revision 1382)
@@ -75,8 +75,8 @@
-
-
+
+
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs
===================================================================
diff -u -r1285 -r1382
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 1285)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 1382)
@@ -346,8 +346,8 @@
location.PolderLevel = waternetOptions.PolderLevel;
location.PolderLevelLow = waternetOptions.PolderLevelLow;
// waternetOptions.PolderLevelLowSpecified is not used because the value is not a nullable
- location.ModelParametersForPlLines.DampingFactorPl4 = waternetOptions.DampingFactorPL3;
- location.ModelParametersForPlLines.DampingFactorPl3 = waternetOptions.DampingFactorPL4;
+ location.ModelParametersForPlLines.DampingFactorPl4 = waternetOptions.DampingFactorPl3;
+ location.ModelParametersForPlLines.DampingFactorPl3 = waternetOptions.DampingFactorPl4;
location.ModelParametersForPlLines.PenetrationLength = waternetOptions.PenetrationLength;
location.PlLineOffsetBelowDikeCrestMiddle = (waternetOptions.Pl1BelowCrestMiddleSpecified ? (double?)waternetOptions.Pl1BelowCrestMiddle : null);
location.UsePlLineOffsetFactorBelowShoulderCrest = waternetOptions.Pl1FactorBelowShoulderCrestSpecified;
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs
===================================================================
diff -u -r1268 -r1382
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 1268)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 1382)
@@ -300,8 +300,8 @@
waternetOptions.PolderLevel = location.PolderLevel;
waternetOptions.PolderLevelLow = location.PolderLevelLow;
waternetOptions.PolderLevelLowSpecified = true;
- waternetOptions.DampingFactorPL3 = location.ModelParametersForPlLines.DampingFactorPl4;
- waternetOptions.DampingFactorPL4 = location.ModelParametersForPlLines.DampingFactorPl3;
+ waternetOptions.DampingFactorPl3 = location.ModelParametersForPlLines.DampingFactorPl4;
+ waternetOptions.DampingFactorPl4 = location.ModelParametersForPlLines.DampingFactorPl3;
waternetOptions.PenetrationLength = location.ModelParametersForPlLines.PenetrationLength;
waternetOptions.Pl1BelowCrestMiddleSpecified = location.PlLineOffsetBelowDikeCrestMiddle.HasValue;
waternetOptions.Pl1BelowCrestMiddle = location.PlLineOffsetBelowDikeCrestMiddle ?? 0.0;