Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs
===================================================================
diff -u -r2949 -r2951
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 2949)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 2951)
@@ -455,6 +455,8 @@
inputSoil.RRatio = soil.RRatio;
inputSoil.StrengthIncreaseExponentSpecified = !double.IsNaN(soil.StrengthIncreaseExponent);
inputSoil.StrengthIncreaseExponent = soil.StrengthIncreaseExponent;
+ inputSoil.RatioCuPcSpecified = !double.IsNaN(soil.RatioCuPc);
+ inputSoil.RatioCuPc = soil.RatioCuPc;
inputSoils[i] = inputSoil;
}
}
Index: DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs
===================================================================
diff -u -r2949 -r2951
--- DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs (.../FactoryForDamProjectData.cs) (revision 2949)
+++ DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs (.../FactoryForDamProjectData.cs) (revision 2951)
@@ -270,18 +270,18 @@
soil.RRatio = 16 + 0.1 * i;
soil.StrengthIncreaseExponent = 17 + 0.1 * i;
+ soil.RatioCuPc = 18 + 0.1 * i;
//soil.CuBottom = 11 + 0.1 * i;
//soil.CuTop = 12 + 0.1 * i;
//soil.PoP = 15 + 0.1 * i;
- //soil.RatioCuPc = 16 + 0.1 * i;
//soil.UsePop = true;
- soil.BeddingAngle = 18 + 0.1 * i;
- soil.DiameterD70 = 19 + 0.1 * i;
- soil.DiameterD90 = 20 + 0.1 * i;
- soil.PermeabKx = 21 + 0.1 * i;
- soil.WhitesConstant = 22 + 0.1 * i;
+ soil.BeddingAngle = 19 + 0.1 * i;
+ soil.DiameterD70 = 20 + 0.1 * i;
+ soil.DiameterD90 = 21 + 0.1 * i;
+ soil.PermeabKx = 22 + 0.1 * i;
+ soil.WhitesConstant = 23 + 0.1 * i;
dike.SoilList.Add(soil);
}
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs
===================================================================
diff -u -r2949 -r2951
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 2949)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 2951)
@@ -451,6 +451,7 @@
(DilatancyType?)ConversionHelper.ConvertToDilatancyType(inputSoil.DilatancyType) : null;
soil.RRatio = inputSoil.RRatioSpecified ? inputSoil.RRatio : double.NaN;
soil.StrengthIncreaseExponent = inputSoil.StrengthIncreaseExponentSpecified ? inputSoil.StrengthIncreaseExponent : double.NaN;
+ soil.RatioCuPc = inputSoil.RatioCuPcSpecified ? inputSoil.RatioCuPc : double.NaN;
soils.Add(soil);
}
}
Index: DamEngine/trunk/xsd/DamSoil.xsd
===================================================================
diff -u -r2949 -r2951
--- DamEngine/trunk/xsd/DamSoil.xsd (.../DamSoil.xsd) (revision 2949)
+++ DamEngine/trunk/xsd/DamSoil.xsd (.../DamSoil.xsd) (revision 2951)
@@ -42,5 +42,6 @@
+
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs
===================================================================
diff -u -r2949 -r2951
--- DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 2949)
+++ DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 2951)
@@ -2297,6 +2297,10 @@
private bool strengthIncreaseExponentFieldSpecified;
+ private double ratioCuPcField;
+
+ private bool ratioCuPcFieldSpecified;
+
///
[System.Xml.Serialization.XmlAttributeAttribute()]
public string Name {
@@ -2681,6 +2685,28 @@
this.strengthIncreaseExponentFieldSpecified = value;
}
}
+
+ ///
+ [System.Xml.Serialization.XmlAttributeAttribute()]
+ public double RatioCuPc {
+ get {
+ return this.ratioCuPcField;
+ }
+ set {
+ this.ratioCuPcField = value;
+ }
+ }
+
+ ///
+ [System.Xml.Serialization.XmlIgnoreAttribute()]
+ public bool RatioCuPcSpecified {
+ get {
+ return this.ratioCuPcFieldSpecified;
+ }
+ set {
+ this.ratioCuPcFieldSpecified = value;
+ }
+ }
}
///