Index: dam engine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs
===================================================================
diff -u -r851 -r854
--- dam engine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 851)
+++ dam engine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 854)
@@ -229,10 +229,10 @@
{
inputSoil.ShearStrengthModel = ConversionHelper.ConvertToSoilShearStrengthModel(soil.ShearStrengthModel.Value);
}
- inputSoil.DefaultShearStrengthModelSpecified = (soil.DefaultShearStrengthModel != null);
+ inputSoil.UseDefaultShearStrengthModelSpecified = (soil.UseDefaultShearStrengthModel != null);
if (inputSoil.ShearStrengthModelSpecified)
{
- inputSoil.DefaultShearStrengthModel = soil.DefaultShearStrengthModel.Value;
+ inputSoil.UseDefaultShearStrengthModel = soil.UseDefaultShearStrengthModel.Value;
}
inputSoil.CohesionSpecified = !double.IsNaN(soil.Cohesion);
inputSoil.Cohesion = soil.Cohesion;
Index: dam engine/trunk/src/Deltares.DamEngine.Io/DamInput.cs
===================================================================
diff -u -r730 -r854
--- dam engine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 730)
+++ dam engine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 854)
@@ -1500,9 +1500,9 @@
private bool shearStrengthModelFieldSpecified;
- private bool defaultShearStrengthModelField;
+ private bool useDefaultShearStrengthModelField;
- private bool defaultShearStrengthModelFieldSpecified;
+ private bool useDefaultShearStrengthModelFieldSpecified;
private double cohesionField;
@@ -1735,23 +1735,23 @@
///
[System.Xml.Serialization.XmlAttributeAttribute()]
- public bool DefaultShearStrengthModel {
+ public bool UseDefaultShearStrengthModel {
get {
- return this.defaultShearStrengthModelField;
+ return this.useDefaultShearStrengthModelField;
}
set {
- this.defaultShearStrengthModelField = value;
+ this.useDefaultShearStrengthModelField = value;
}
}
///
[System.Xml.Serialization.XmlIgnoreAttribute()]
- public bool DefaultShearStrengthModelSpecified {
+ public bool UseDefaultShearStrengthModelSpecified {
get {
- return this.defaultShearStrengthModelFieldSpecified;
+ return this.useDefaultShearStrengthModelFieldSpecified;
}
set {
- this.defaultShearStrengthModelFieldSpecified = value;
+ this.useDefaultShearStrengthModelFieldSpecified = value;
}
}
Index: dam engine/trunk/Xsds Liquid/DamSoil.xsd
===================================================================
diff -u -r728 -r854
--- dam engine/trunk/Xsds Liquid/DamSoil.xsd (.../DamSoil.xsd) (revision 728)
+++ dam engine/trunk/Xsds Liquid/DamSoil.xsd (.../DamSoil.xsd) (revision 854)
@@ -26,7 +26,7 @@
-
+
Index: dam engine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs
===================================================================
diff -u -r851 -r854
--- dam engine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 851)
+++ dam engine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 854)
@@ -280,8 +280,8 @@
soil.WhitesConstant = inputSoil.WhitesConstantSpecified ? inputSoil.WhitesConstant : double.NaN;
soil.ShearStrengthModel = inputSoil.ShearStrengthModelSpecified ?
(ShearStrengthModel?)ConversionHelper.ConvertToShearStrengthModel(inputSoil.ShearStrengthModel) : null;
- soil.DefaultShearStrengthModel = inputSoil.DefaultShearStrengthModelSpecified ?
- (bool?)inputSoil.DefaultShearStrengthModel : null;
+ soil.UseDefaultShearStrengthModel = inputSoil.UseDefaultShearStrengthModelSpecified ?
+ (bool?)inputSoil.UseDefaultShearStrengthModel : null;
soil.Cohesion = inputSoil.CohesionSpecified ? inputSoil.Cohesion : double.NaN;
soil.FrictionAngle = inputSoil.FrictionAngleSpecified ? inputSoil.FrictionAngle : double.NaN;
soil.Ocr = inputSoil.OcrSpecified ? inputSoil.Ocr : double.NaN;