Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Application/Properties/Settings.Designer.cs
===================================================================
diff -u -r5844 -r6324
--- DamClients/DamLive/trunk/src/Deltares.DamLive.Application/Properties/Settings.Designer.cs (.../Settings.Designer.cs) (revision 5844)
+++ DamClients/DamLive/trunk/src/Deltares.DamLive.Application/Properties/Settings.Designer.cs (.../Settings.Designer.cs) (revision 6324)
@@ -87,28 +87,28 @@
[global::System.Configuration.ApplicationScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.Configuration.DefaultSettingValueAttribute("0.25")]
- public double SlipCircleBishopTangentLinesDistance {
+ [global::System.Configuration.DefaultSettingValueAttribute("Specified")]
+ public global::Deltares.Dam.Data.GridSizeDetermination SlipCircleUpliftVanGridSizeDetermination {
get {
- return ((double)(this["SlipCircleBishopTangentLinesDistance"]));
+ return ((global::Deltares.Dam.Data.GridSizeDetermination)(this["SlipCircleUpliftVanGridSizeDetermination"]));
}
}
[global::System.Configuration.ApplicationScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.Configuration.DefaultSettingValueAttribute("Specified")]
- public global::Deltares.Dam.Data.GridSizeDetermination SlipCircleBishopSearchAreaDetermination {
+ [global::System.Configuration.DefaultSettingValueAttribute("0.25")]
+ public double SlipCircleBishopTangentLinesDistance {
get {
- return ((global::Deltares.Dam.Data.GridSizeDetermination)(this["SlipCircleBishopSearchAreaDetermination"]));
+ return ((double)(this["SlipCircleBishopTangentLinesDistance"]));
}
}
[global::System.Configuration.ApplicationScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("Specified")]
- public global::Deltares.Dam.Data.GridSizeDetermination SlipCircleUpliftVanGridSizeDetermination {
+ public global::Deltares.Dam.Data.GridSizeDetermination SlipCircleBishopSearchAreaDetermination {
get {
- return ((global::Deltares.Dam.Data.GridSizeDetermination)(this["SlipCircleUpliftVanGridSizeDetermination"]));
+ return ((global::Deltares.Dam.Data.GridSizeDetermination)(this["SlipCircleBishopSearchAreaDetermination"]));
}
}
Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Application/app.config
===================================================================
diff -u -r5844 -r6324
--- DamClients/DamLive/trunk/src/Deltares.DamLive.Application/app.config (.../app.config) (revision 5844)
+++ DamClients/DamLive/trunk/src/Deltares.DamLive.Application/app.config (.../app.config) (revision 6324)
@@ -51,13 +51,13 @@
2.5
-
- OnBoundaryLines
+
+ Specified
0.25
-
+
Specified
Index: DamClients/DamLive/trunk/data/HHNK Purmer/live.OutputTimeSeries.xml
===================================================================
diff -u -r5828 -r6324
--- DamClients/DamLive/trunk/data/HHNK Purmer/live.OutputTimeSeries.xml (.../live.OutputTimeSeries.xml) (revision 5828)
+++ DamClients/DamLive/trunk/data/HHNK Purmer/live.OutputTimeSeries.xml (.../live.OutputTimeSeries.xml) (revision 6324)
@@ -6,71 +6,71 @@
instantaneous
Purmer_PU0042+00_K
StabilityInsideFactor
-
+
-999
- Purmer Stedelijk Uitstroompeil
+
m
-
+
instantaneous
Purmer_PU0042+00_K_V
StabilityInsideFactor
-
+
-999
- Purmer Stedelijk Uitstroompeil
+
m
-
+
instantaneous
Purmer_PU0042+00_R
StabilityInsideFactor
-
+
-999
- Purmer Stedelijk Uitstroompeil
+
m
-
+
instantaneous
Purmer_PU0042+00_R_V
StabilityInsideFactor
-
+
-999
- Purmer Stedelijk Uitstroompeil
+
m
-
+
instantaneous
Purmer_PU0110+20_K
StabilityInsideFactor
-
+
-999
- Purmer Stedelijk Uitstroompeil
+
m
@@ -81,11 +81,11 @@
instantaneous
Purmer_PU0110+20_K_V
StabilityInsideFactor
-
+
-999
- Purmer Stedelijk Uitstroompeil
+
m
@@ -96,11 +96,11 @@
instantaneous
Purmer_PU0110+20_R
StabilityInsideFactor
-
+
-999
- Purmer Stedelijk Uitstroompeil
+
m
@@ -111,11 +111,11 @@
instantaneous
Purmer_PU0110+20_R_V
StabilityInsideFactor
-
+
-999
- Purmer Stedelijk Uitstroompeil
+
m
Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Application/Properties/Settings.settings
===================================================================
diff -u -r5844 -r6324
--- DamClients/DamLive/trunk/src/Deltares.DamLive.Application/Properties/Settings.settings (.../Settings.settings) (revision 5844)
+++ DamClients/DamLive/trunk/src/Deltares.DamLive.Application/Properties/Settings.settings (.../Settings.settings) (revision 6324)
@@ -1,6 +1,6 @@
+ GeneratedClassNamespace="Deltares.DamLive.Application.Properties" GeneratedClassName="Settings">
@@ -24,14 +24,14 @@
2.5
-
- OnBoundaryLines
+ Specified
0.25
-
Specified
Index: DamClients/DamLive/trunk/data/PulauTekong/PulauTekong_inside/live.OutputTimeSeries.xml
===================================================================
diff -u -r5828 -r6324
--- DamClients/DamLive/trunk/data/PulauTekong/PulauTekong_inside/live.OutputTimeSeries.xml (.../live.OutputTimeSeries.xml) (revision 5828)
+++ DamClients/DamLive/trunk/data/PulauTekong/PulauTekong_inside/live.OutputTimeSeries.xml (.../live.OutputTimeSeries.xml) (revision 6324)
@@ -6,26 +6,26 @@
instantaneous
CD CS1 X1
StabilityInsideFactor
-
+
-999
- SD CS 1-1
+
m
-
+
instantaneous
CD CS2 X3
StabilityInsideFactor
-
+
-999
- SD CS 1-1
+
m
@@ -36,11 +36,11 @@
instantaneous
SD CS1 3-3
StabilityInsideFactor
-
+
-999
- SD CS 1-1
+
m
@@ -51,11 +51,11 @@
instantaneous
SD CS2 8-8
StabilityInsideFactor
-
+
-999
- SD CS 1-1
+
m
@@ -66,14 +66,239 @@
instantaneous
SD CS3 10-10
StabilityInsideFactor
-
+
-999
- SD CS 1-1
+
m
-
+
+
+
+ instantaneous
+ CD CS1 X1
+ BishopCircleCentreX
+
+
+
+ -999
+
+ m
+
+
+
+
+
+
+ instantaneous
+ CD CS2 X3
+ BishopCircleCentreX
+
+
+
+ -999
+
+ m
+
+
+
+
+
+
+ instantaneous
+ SD CS1 3-3
+ BishopCircleCentreX
+
+
+
+ -999
+
+ m
+
+
+
+
+
+
+ instantaneous
+ SD CS2 8-8
+ BishopCircleCentreX
+
+
+
+ -999
+
+ m
+
+
+
+
+
+
+ instantaneous
+ SD CS3 10-10
+ BishopCircleCentreX
+
+
+
+ -999
+
+ m
+
+
+
+
+
+
+ instantaneous
+ CD CS1 X1
+ BishopCircleCentreZ
+
+
+
+ -999
+
+ m
+
+
+
+
+
+
+ instantaneous
+ CD CS2 X3
+ BishopCircleCentreZ
+
+
+
+ -999
+
+ m
+
+
+
+
+
+
+ instantaneous
+ SD CS1 3-3
+ BishopCircleCentreZ
+
+
+
+ -999
+
+ m
+
+
+
+
+
+
+ instantaneous
+ SD CS2 8-8
+ BishopCircleCentreZ
+
+
+
+ -999
+
+ m
+
+
+
+
+
+
+ instantaneous
+ SD CS3 10-10
+ BishopCircleCentreZ
+
+
+
+ -999
+
+ m
+
+
+
+
+
+
+ instantaneous
+ CD CS1 X1
+ BishopCircleRadius
+
+
+
+ -999
+
+ m
+
+
+
+
+
+
+ instantaneous
+ CD CS2 X3
+ BishopCircleRadius
+
+
+
+ -999
+
+ m
+
+
+
+
+
+
+ instantaneous
+ SD CS1 3-3
+ BishopCircleRadius
+
+
+
+ -999
+
+ m
+
+
+
+
+
+
+ instantaneous
+ SD CS2 8-8
+ BishopCircleRadius
+
+
+
+ -999
+
+ m
+
+
+
+
+
+
+ instantaneous
+ SD CS3 10-10
+ BishopCircleRadius
+
+
+
+ -999
+
+ m
+
+
+
+
\ No newline at end of file
Index: DamClients/DamLive/trunk/data/PulauTekong/PulauTekong_outside/live.OutputTimeSeries.xml
===================================================================
diff -u -r5828 -r6324
--- DamClients/DamLive/trunk/data/PulauTekong/PulauTekong_outside/live.OutputTimeSeries.xml (.../live.OutputTimeSeries.xml) (revision 5828)
+++ DamClients/DamLive/trunk/data/PulauTekong/PulauTekong_outside/live.OutputTimeSeries.xml (.../live.OutputTimeSeries.xml) (revision 6324)
@@ -6,26 +6,26 @@
instantaneous
SD CS1 3-3
StabilityOutsideFactor
-
+
-999
- SD CS 1-1
+
m
-
+
instantaneous
SD CS2 8-8
StabilityOutsideFactor
-
+
-999
- SD CS 1-1
+
m
@@ -36,14 +36,149 @@
instantaneous
SD CS3 10-10
StabilityOutsideFactor
-
+
-999
- SD CS 1-1
+
m
+
+
+ instantaneous
+ SD CS1 3-3
+ BishopCircleCentreX
+
+
+
+ -999
+
+ m
+
+
+
+
+
+
+ instantaneous
+ SD CS2 8-8
+ BishopCircleCentreX
+
+
+
+ -999
+
+ m
+
+
+
+
+
+
+ instantaneous
+ SD CS3 10-10
+ BishopCircleCentreX
+
+
+
+ -999
+
+ m
+
+
+
+
+
+
+ instantaneous
+ SD CS1 3-3
+ BishopCircleCentreZ
+
+
+
+ -999
+
+ m
+
+
+
+
+
+
+ instantaneous
+ SD CS2 8-8
+ BishopCircleCentreZ
+
+
+
+ -999
+
+ m
+
+
+
+
+
+
+ instantaneous
+ SD CS3 10-10
+ BishopCircleCentreZ
+
+
+
+ -999
+
+ m
+
+
+
+
+
+
+ instantaneous
+ SD CS1 3-3
+ BishopCircleRadius
+
+
+
+ -999
+
+ m
+
+
+
+
+
+
+ instantaneous
+ SD CS2 8-8
+ BishopCircleRadius
+
+
+
+ -999
+
+ m
+
+
+
+
+
+
+ instantaneous
+ SD CS3 10-10
+ BishopCircleRadius
+
+
+
+ -999
+
+ m
+
+
+
+
\ No newline at end of file