Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/ShearStrengthModel.cs
===================================================================
diff -u -r4628 -r5813
--- DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/ShearStrengthModel.cs (.../ShearStrengthModel.cs) (revision 4628)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/ShearStrengthModel.cs (.../ShearStrengthModel.cs) (revision 5813)
@@ -39,5 +39,10 @@
///
/// The Sigma Tau curve model
///
- SigmaTauCurve = 3
+ SigmaTauCurve = 3,
+
+ ///
+ /// The Su table model
+ ///
+ SuTable = 4
}
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs
===================================================================
diff -u -r5702 -r5813
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 5702)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 5813)
@@ -532,6 +532,18 @@
};
}
}
+ if (soil.SuTableCurve != null)
+ {
+ inputSoil.SuTable = new SuTableSigmaSuPoint[soil.SuTableCurve.Points.Count];
+ for (var j = 0; j < soil.SuTableCurve.Points.Count; j++)
+ {
+ inputSoil.SuTable[j] = new SuTableSigmaSuPoint
+ {
+ Sigma = soil.SuTableCurve.Points[j].Sigma,
+ Su = soil.SuTableCurve.Points[j].Su
+ };
+ }
+ }
inputSoils[i] = inputSoil;
}
Index: DamEngine/trunk/xsd/DamInput.xsd
===================================================================
diff -u -r5467 -r5813
--- DamEngine/trunk/xsd/DamInput.xsd (.../DamInput.xsd) (revision 5467)
+++ DamEngine/trunk/xsd/DamInput.xsd (.../DamInput.xsd) (revision 5813)
@@ -13,6 +13,7 @@
+
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/SigmaSuPoint.cs
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/SigmaSuPoint.cs (revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/SigmaSuPoint.cs (revision 5813)
@@ -0,0 +1,48 @@
+// Copyright (C) Stichting Deltares 2024. All rights reserved.
+//
+// This file is part of the Dam Engine.
+//
+// The Dam Engine is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+namespace Deltares.DamEngine.Data.Geotechnics;
+
+///
+/// The Sigma Su point.
+///
+public class SigmaSuPoint(double sigma = 0, double su = 0)
+{
+ ///
+ /// The sigma.
+ ///
+ public double Sigma { get; set; } = sigma;
+
+ ///
+ /// The su.
+ ///
+ public double Su { get; set; } = su;
+
+ ///
+ /// Assigns the specified point.
+ ///
+ ///
+ public void Assign(SigmaSuPoint point)
+ {
+ Sigma = point.Sigma;
+ Su = point.Su;
+ }
+}
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs
===================================================================
diff -u -r5702 -r5813
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 5702)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 5813)
@@ -543,6 +543,15 @@
soil.SigmaTauCurve.Points.Add(new SigmaTauPoint(point.Sigma, point.Tau));
}
}
+ if (inputSoil.SuTable != null)
+ {
+ soil.SuTableCurve = new SuTableCurve();
+ for (var j = 0; j < inputSoil.SuTable.Length; j++)
+ {
+ SuTableSigmaSuPoint point = inputSoil.SuTable[j];
+ soil.SuTableCurve.Points.Add(new SigmaSuPoint(point.Sigma, point.Su));
+ }
+ }
soils.Add(soil);
}
Index: DamEngine/trunk/xsd/DamSoil.xsd
===================================================================
diff -u -r4669 -r5813
--- DamEngine/trunk/xsd/DamSoil.xsd (.../DamSoil.xsd) (revision 4669)
+++ DamEngine/trunk/xsd/DamSoil.xsd (.../DamSoil.xsd) (revision 5813)
@@ -2,9 +2,11 @@
+
-
-
+
+
+
@@ -21,6 +23,7 @@
+
Index: DamEngine/trunk/xsd/DamSuTable.xsd
===================================================================
diff -u
--- DamEngine/trunk/xsd/DamSuTable.xsd (revision 0)
+++ DamEngine/trunk/xsd/DamSuTable.xsd (revision 5813)
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/SuTableCurve.cs
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/SuTableCurve.cs (revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/SuTableCurve.cs (revision 5813)
@@ -0,0 +1,45 @@
+// Copyright (C) Stichting Deltares 2024. All rights reserved.
+//
+// This file is part of the Dam Engine.
+//
+// The Dam Engine is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Collections.Generic;
+
+namespace Deltares.DamEngine.Data.Geotechnics;
+
+///
+/// The Su table curve.
+///
+public class SuTableCurve
+{
+ ///
+ /// The points of the curve.
+ ///
+ public List Points { get; } = new();
+
+ ///
+ /// Assigns the specified curve.
+ ///
+ ///
+ public void Assign(SuTableCurve curve)
+ {
+ Points.Clear();
+ Points.AddRange(curve.Points);
+ }
+}
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs
===================================================================
diff -u -r5793 -r5813
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs (.../ConversionHelper.cs) (revision 5793)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs (.../ConversionHelper.cs) (revision 5813)
@@ -1096,7 +1096,11 @@
},
{
ShearStrengthModel.SigmaTauCurve, SoilShearStrengthModel.SigmaTauCurve
+ },
+ {
+ ShearStrengthModel.SuTable, SoilShearStrengthModel.SuTable
}
+
};
return translationTable[shearStrengthModel];
}
@@ -1175,6 +1179,9 @@
},
{
SoilShearStrengthModel.SigmaTauCurve, ShearStrengthModel.SigmaTauCurve
+ },
+ {
+ SoilShearStrengthModel.SuTable, ShearStrengthModel.SuTable
}
};
return translationTable[soilShearStrengthModel];
Index: DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs
===================================================================
diff -u -r5702 -r5813
--- DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 5702)
+++ DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 5813)
@@ -9,14 +9,14 @@
//------------------------------------------------------------------------------
//
-// This source code was auto-generated by xsd, Version=4.8.3928.0.
+// This source code was auto-generated by xsd, Version=4.8.4084.0.
//
namespace Deltares.DamEngine.Io.XmlInput {
using System.Xml.Serialization;
///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -326,7 +326,7 @@
}
///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -511,7 +511,7 @@
}
///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -545,7 +545,7 @@
}
///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -567,7 +567,7 @@
}
///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -705,7 +705,7 @@
}
///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -778,7 +778,7 @@
}
///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -800,7 +800,7 @@
}
///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1053,7 +1053,7 @@
}
///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1127,7 +1127,7 @@
}
///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1149,7 +1149,7 @@
}
///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1235,7 +1235,7 @@
}
///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1283,7 +1283,7 @@
}
///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1720,7 +1720,7 @@
}
///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1767,7 +1767,7 @@
}
///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1827,7 +1827,7 @@
}
///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1862,7 +1862,7 @@
}
///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1897,7 +1897,7 @@
}
///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1932,7 +1932,7 @@
}
///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1993,7 +1993,7 @@
}
///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2040,7 +2040,7 @@
}
///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2114,7 +2114,7 @@
}
///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2148,7 +2148,7 @@
}
///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2222,14 +2222,16 @@
}
///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
public partial class Soil {
private SigmaTauCurveSigmaTauPoint[] sigmaTauCurveField;
+ private SuTableSigmaSuPoint[] suTableField;
+
private string nameField;
private double beddingAngleField;
@@ -2320,6 +2322,17 @@
}
///
+ [System.Xml.Serialization.XmlArrayItemAttribute("SigmaSuPoint", IsNullable=false)]
+ public SuTableSigmaSuPoint[] SuTable {
+ get {
+ return this.suTableField;
+ }
+ set {
+ this.suTableField = value;
+ }
+ }
+
+ ///
[System.Xml.Serialization.XmlAttributeAttribute()]
public string Name {
get {
@@ -2750,7 +2763,7 @@
}
///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2785,9 +2798,44 @@
}
///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
[System.SerializableAttribute()]
+ [System.Diagnostics.DebuggerStepThroughAttribute()]
+ [System.ComponentModel.DesignerCategoryAttribute("code")]
[System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
+ public partial class SuTableSigmaSuPoint {
+
+ private double sigmaField;
+
+ private double suField;
+
+ ///
+ [System.Xml.Serialization.XmlAttributeAttribute()]
+ public double Sigma {
+ get {
+ return this.sigmaField;
+ }
+ set {
+ this.sigmaField = value;
+ }
+ }
+
+ ///
+ [System.Xml.Serialization.XmlAttributeAttribute()]
+ public double Su {
+ get {
+ return this.suField;
+ }
+ set {
+ this.suField = value;
+ }
+ }
+ }
+
+ ///
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
+ [System.SerializableAttribute()]
+ [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
public enum SoilShearStrengthModel {
///
@@ -2798,10 +2846,13 @@
///
SigmaTauCurve,
+
+ ///
+ SuTable,
}
///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
public enum SoilDilatancyType {
@@ -2817,7 +2868,7 @@
}
///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2851,7 +2902,7 @@
}
///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2899,7 +2950,7 @@
}
///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3311,7 +3362,7 @@
}
///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
public enum LocationDesignOptionsStabilityDesignMethod {
@@ -3324,7 +3375,7 @@
}
///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3424,7 +3475,7 @@
}
///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
public enum LocationWaternetOptionsPhreaticLineCreationMethod {
@@ -3446,7 +3497,7 @@
}
///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
public enum LocationWaternetOptionsIntrusionVerticalWaterPressure {
@@ -3468,7 +3519,7 @@
}
///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
public enum LocationWaternetOptionsDikeSoilScenario {
@@ -3487,7 +3538,7 @@
}
///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3587,7 +3638,7 @@
}
///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3934,7 +3985,7 @@
}
///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4112,7 +4163,7 @@
}
///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4147,7 +4198,7 @@
}
///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4182,7 +4233,7 @@
}
///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4230,7 +4281,7 @@
}
///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
public enum InputDamProjectType {
@@ -4243,7 +4294,7 @@
}
///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
public enum InputPipingModelType {
@@ -4262,7 +4313,7 @@
}
///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
public enum InputStabilityModelType {
@@ -4278,7 +4329,7 @@
}
///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
public enum InputAnalysisType {
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/Soil.cs
===================================================================
diff -u -r4671 -r5813
--- DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/Soil.cs (.../Soil.cs) (revision 4671)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/Soil.cs (.../Soil.cs) (revision 5813)
@@ -93,6 +93,11 @@
{
SigmaTauCurve.Assign(aSoil.SigmaTauCurve);
}
+ SuTableCurve = new SuTableCurve();
+ if ((ShearStrengthModel == Geotechnics.ShearStrengthModel.SuTable) && (aSoil.SuTableCurve != null))
+ {
+ SuTableCurve.Assign(aSoil.SuTableCurve);
+ }
}
#region property Name
@@ -265,5 +270,10 @@
///
public SigmaTauCurve SigmaTauCurve { get; set; } = new();
+ ///
+ /// The su table (for Shear Strength Model = SuTable)
+ ///
+ public SuTableCurve SuTableCurve { get; set; } = new();
+
#endregion
}
\ No newline at end of file
Index: DamEngine/trunk/xsd/ReadMe.txt
===================================================================
diff -u
--- DamEngine/trunk/xsd/ReadMe.txt (revision 0)
+++ DamEngine/trunk/xsd/ReadMe.txt (revision 5813)
@@ -0,0 +1,13 @@
+To generate classes
+
+Open Command Prompt in admin mode
+Go to location where xsd.exe is, e.g.
+C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools
+
+Run for DamInput:
+xsd /c /l:cs /n:Deltares.DamEngine.Io.XmlInput D:\src\dam\DamEngine\trunk\xsd\DamInput.xsd
+copy DamInput.cs D:\src\dam\DamEngine\trunk\src\Deltares.DamEngine.Io\DamInput.cs
+
+Run for DamOutput:
+xsd /c /l:cs /n:Deltares.DamEngine.Io.XmlInput D:\src\dam\DamEngine\trunk\xsd\DamOutput.xsd
+copy DamOutput.cs D:\src\dam\DamEngine\trunk\src\Deltares.DamEngine.Io\DamOutput.cs