Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalPulauTekongTests.cs
===================================================================
diff -u -r6088 -r6095
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalPulauTekongTests.cs (.../OperationalPulauTekongTests.cs) (revision 6088)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalPulauTekongTests.cs (.../OperationalPulauTekongTests.cs) (revision 6095)
@@ -55,11 +55,11 @@
Assert.Multiple(() =>
{
Assert.That(output.Results.OperationalOutputTimeSeries[0].Entries.TimeSerieEntry, Has.Length.EqualTo(1));
- Assert.That(output.Results.OperationalOutputTimeSeries[0].Entries.TimeSerieEntry[0].SafetyFactor, Is.EqualTo(1.439).Within(tolerance));
- Assert.That(output.Results.OperationalOutputTimeSeries[1].Entries.TimeSerieEntry[0].SafetyFactor, Is.EqualTo(1.218).Within(tolerance));
- Assert.That(output.Results.OperationalOutputTimeSeries[2].Entries.TimeSerieEntry[0].SafetyFactor, Is.EqualTo(1.375).Within(tolerance));
- Assert.That(output.Results.OperationalOutputTimeSeries[3].Entries.TimeSerieEntry[0].SafetyFactor, Is.EqualTo(1.395).Within(tolerance));
- Assert.That(output.Results.OperationalOutputTimeSeries[4].Entries.TimeSerieEntry[0].SafetyFactor, Is.EqualTo(0.997).Within(tolerance));
+ Assert.That(output.Results.OperationalOutputTimeSeries[0].Entries.TimeSerieEntry[0].Value, Is.EqualTo(1.439).Within(tolerance));
+ Assert.That(output.Results.OperationalOutputTimeSeries[1].Entries.TimeSerieEntry[0].Value, Is.EqualTo(1.218).Within(tolerance));
+ Assert.That(output.Results.OperationalOutputTimeSeries[2].Entries.TimeSerieEntry[0].Value, Is.EqualTo(1.375).Within(tolerance));
+ Assert.That(output.Results.OperationalOutputTimeSeries[3].Entries.TimeSerieEntry[0].Value, Is.EqualTo(1.395).Within(tolerance));
+ Assert.That(output.Results.OperationalOutputTimeSeries[4].Entries.TimeSerieEntry[0].Value, Is.EqualTo(0.997).Within(tolerance));
});
}
@@ -86,9 +86,9 @@
Assert.Multiple(() =>
{
Assert.That(output.Results.OperationalOutputTimeSeries[0].Entries.TimeSerieEntry, Has.Length.EqualTo(1));
- Assert.That(output.Results.OperationalOutputTimeSeries[0].Entries.TimeSerieEntry[0].SafetyFactor, Is.EqualTo(1.222).Within(tolerance));
- Assert.That(output.Results.OperationalOutputTimeSeries[1].Entries.TimeSerieEntry[0].SafetyFactor, Is.EqualTo(1.231).Within(tolerance));
- Assert.That(output.Results.OperationalOutputTimeSeries[2].Entries.TimeSerieEntry[0].SafetyFactor, Is.EqualTo(1.282).Within(tolerance));
+ Assert.That(output.Results.OperationalOutputTimeSeries[0].Entries.TimeSerieEntry[0].Value, Is.EqualTo(1.222).Within(tolerance));
+ Assert.That(output.Results.OperationalOutputTimeSeries[1].Entries.TimeSerieEntry[0].Value, Is.EqualTo(1.231).Within(tolerance));
+ Assert.That(output.Results.OperationalOutputTimeSeries[2].Entries.TimeSerieEntry[0].Value, Is.EqualTo(1.282).Within(tolerance));
});
}
}
\ No newline at end of file
Index: DamClients/DamLive/trunk/lib/DamEngine/Deltares.DamEngine.Calculators.deps.json
===================================================================
diff -u -r6091 -r6095
--- DamClients/DamLive/trunk/lib/DamEngine/Deltares.DamEngine.Calculators.deps.json (.../Deltares.DamEngine.Calculators.deps.json) (revision 6091)
+++ DamClients/DamLive/trunk/lib/DamEngine/Deltares.DamEngine.Calculators.deps.json (.../Deltares.DamEngine.Calculators.deps.json) (revision 6095)
@@ -6,9 +6,9 @@
"compilationOptions": {},
"targets": {
".NETCoreApp,Version=v6.0": {
- "Deltares.DamEngine.Calculators/24.1.0.6089": {
+ "Deltares.DamEngine.Calculators/24.1.0.6077": {
"dependencies": {
- "Deltares.DamEngine.Data": "24.1.0.6089",
+ "Deltares.DamEngine.Data": "24.1.0.6077",
"Deltares.StixFileWriter": "24.1.0.118",
"Deltares.DamPiping.BlighCalculator": "23.2.0.4623",
"Deltares.WTIPiping": "24.1.500.10"
@@ -575,11 +575,11 @@
}
},
"System.Threading.Tasks.Extensions/4.5.4": {},
- "Deltares.DamEngine.Data/24.1.0.6089": {
+ "Deltares.DamEngine.Data/24.1.0.6077": {
"runtime": {
"Deltares.DamEngine.Data.dll": {
- "assemblyVersion": "24.1.0.6089",
- "fileVersion": "24.1.0.6089"
+ "assemblyVersion": "24.1.0.6077",
+ "fileVersion": "24.1.0.6077"
}
},
"resources": {
@@ -620,7 +620,7 @@
}
},
"libraries": {
- "Deltares.DamEngine.Calculators/24.1.0.6089": {
+ "Deltares.DamEngine.Calculators/24.1.0.6077": {
"type": "project",
"serviceable": false,
"sha512": ""
@@ -1101,7 +1101,7 @@
"path": "system.threading.tasks.extensions/4.5.4",
"hashPath": "system.threading.tasks.extensions.4.5.4.nupkg.sha512"
},
- "Deltares.DamEngine.Data/24.1.0.6089": {
+ "Deltares.DamEngine.Data/24.1.0.6077": {
"type": "project",
"serviceable": false,
"sha512": ""
Index: DamClients/DamLive/trunk/lib/DamEngine/nl-NL/Deltares.DamEngine.Calculators.resources.dll
===================================================================
diff -u -r6091 -r6095
Binary files differ
Index: DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Interface.dll
===================================================================
diff -u -r6090 -r6095
Binary files differ
Index: DamEngine/trunk/xsd/DamOutput.xsd
===================================================================
diff -u -r6088 -r6095
--- DamEngine/trunk/xsd/DamOutput.xsd (.../DamOutput.xsd) (revision 6088)
+++ DamEngine/trunk/xsd/DamOutput.xsd (.../DamOutput.xsd) (revision 6095)
@@ -4,35 +4,12 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Operational/Profile1DTests/CalculateStabilityInsideUpliftVanGrid1OutputFile.xml
===================================================================
diff -u -r6093 -r6095
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Operational/Profile1DTests/CalculateStabilityInsideUpliftVanGrid1OutputFile.xml (.../CalculateStabilityInsideUpliftVanGrid1OutputFile.xml) (revision 6093)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Operational/Profile1DTests/CalculateStabilityInsideUpliftVanGrid1OutputFile.xml (.../CalculateStabilityInsideUpliftVanGrid1OutputFile.xml) (revision 6095)
@@ -4,8 +4,6 @@
< R e s u l t s >
- < O p e r a t i o n a l L o c a t i o n s S t a t i c D a t a x s i : n i l = " t r u e " / >
-
< O p e r a t i o n a l O u t p u t T i m e S e r i e s >
< T i m e S e r i e F o r e c a s t D a t e T i m e = " 0 0 0 1 - 0 1 - 0 1 T 0 0 : 0 0 : 0 0 " T y p e = " i n s t a n t a n e o u s " L o c a t i o n I d = " P u r m e r _ P U 0 0 4 2 + 0 0 _ K " P a r a m e t e r I d = " S t a b i l i t y I n s i d e F a c t o r " S t a r t D a t e T i m e = " 2 0 1 6 - 0 3 - 0 2 T 0 3 : 1 0 : 0 0 " E n d D a t e T i m e = " 2 0 1 8 - 0 7 - 0 5 T 1 0 : 0 0 : 0 0 " M i s s V a l = " N a N " S t a t i o n N a m e = " M P N - A S - 1 7 4 3 " U n i t s = " m N A P " >
@@ -14,9 +12,9 @@
< E n t r i e s >
- < T i m e S e r i e E n t r y D a t e T i m e = " 2 0 1 6 - 0 3 - 0 2 T 0 3 : 1 0 : 0 0 " S a f e t y F a c t o r = " 1 . 4 4 1 7 6 4 2 6 9 4 6 1 0 0 6 4 " / >
+ < T i m e S e r i e E n t r y D a t e T i m e = " 2 0 1 6 - 0 3 - 0 2 T 0 3 : 1 0 : 0 0 " V a l u e = " 1 . 4 4 1 7 6 4 2 6 9 4 6 1 0 0 6 4 " F l a g - n i e t e c h t g e b r u i k t = " 0 " / >
- < T i m e S e r i e E n t r y D a t e T i m e = " 2 0 1 6 - 0 3 - 0 2 T 0 3 : 2 0 : 0 0 " S a f e t y F a c t o r = " 1 . 5 7 3 9 4 6 9 7 8 8 9 4 8 5 2 8 " / >
+ < T i m e S e r i e E n t r y D a t e T i m e = " 2 0 1 6 - 0 3 - 0 2 T 0 3 : 2 0 : 0 0 " V a l u e = " 1 . 5 7 3 9 4 6 9 7 8 8 9 4 8 5 2 8 " F l a g - n i e t e c h t g e b r u i k t = " 0 " / >
< / E n t r i e s >
@@ -28,9 +26,9 @@
< E n t r i e s >
- < T i m e S e r i e E n t r y D a t e T i m e = " 2 0 1 6 - 0 3 - 0 2 T 0 3 : 1 0 : 0 0 " S a f e t y F a c t o r = " 1 . 3 5 1 3 8 3 0 6 8 2 2 7 8 4 6 7 " / >
+ < T i m e S e r i e E n t r y D a t e T i m e = " 2 0 1 6 - 0 3 - 0 2 T 0 3 : 1 0 : 0 0 " V a l u e = " 1 . 3 5 1 3 8 3 0 6 8 2 2 7 8 4 6 7 " F l a g - n i e t e c h t g e b r u i k t = " 0 " / >
- < T i m e S e r i e E n t r y D a t e T i m e = " 2 0 1 6 - 0 3 - 0 2 T 0 3 : 2 0 : 0 0 " S a f e t y F a c t o r = " 1 . 4 6 7 4 2 9 1 2 3 7 3 1 5 7 3 " / >
+ < T i m e S e r i e E n t r y D a t e T i m e = " 2 0 1 6 - 0 3 - 0 2 T 0 3 : 2 0 : 0 0 " V a l u e = " 1 . 4 6 7 4 2 9 1 2 3 7 3 1 5 7 3 " F l a g - n i e t e c h t g e b r u i k t = " 0 " / >
< / E n t r i e s >
@@ -42,9 +40,9 @@
< E n t r i e s >
- < T i m e S e r i e E n t r y D a t e T i m e = " 2 0 1 6 - 0 3 - 0 2 T 0 3 : 1 0 : 0 0 " S a f e t y F a c t o r = " 1 . 2 3 4 3 7 5 9 6 8 1 8 7 4 6 9 " / >
+ < T i m e S e r i e E n t r y D a t e T i m e = " 2 0 1 6 - 0 3 - 0 2 T 0 3 : 1 0 : 0 0 " V a l u e = " 1 . 2 3 4 3 7 5 9 6 8 1 8 7 4 6 9 " F l a g - n i e t e c h t g e b r u i k t = " 0 " / >
- < T i m e S e r i e E n t r y D a t e T i m e = " 2 0 1 6 - 0 3 - 0 2 T 0 3 : 2 0 : 0 0 " S a f e t y F a c t o r = " 1 . 3 5 0 2 8 9 6 9 1 4 9 9 1 3 7 8 " / >
+ < T i m e S e r i e E n t r y D a t e T i m e = " 2 0 1 6 - 0 3 - 0 2 T 0 3 : 2 0 : 0 0 " V a l u e = " 1 . 3 5 0 2 8 9 6 9 1 4 9 9 1 3 7 8 " F l a g - n i e t e c h t g e b r u i k t = " 0 " / >
< / E n t r i e s >
@@ -56,9 +54,9 @@
< E n t r i e s >
- < T i m e S e r i e E n t r y D a t e T i m e = " 2 0 1 6 - 0 3 - 0 2 T 0 3 : 1 0 : 0 0 " S a f e t y F a c t o r = " 1 . 1 5 8 8 7 3 3 2 4 8 1 7 5 5 3 " / >
+ < T i m e S e r i e E n t r y D a t e T i m e = " 2 0 1 6 - 0 3 - 0 2 T 0 3 : 1 0 : 0 0 " V a l u e = " 1 . 1 5 8 8 7 3 3 2 4 8 1 7 5 5 3 " F l a g - n i e t e c h t g e b r u i k t = " 0 " / >
- < T i m e S e r i e E n t r y D a t e T i m e = " 2 0 1 6 - 0 3 - 0 2 T 0 3 : 2 0 : 0 0 " S a f e t y F a c t o r = " 1 . 2 6 0 0 0 9 6 4 3 0 2 1 8 1 1 7 " / >
+ < T i m e S e r i e E n t r y D a t e T i m e = " 2 0 1 6 - 0 3 - 0 2 T 0 3 : 2 0 : 0 0 " V a l u e = " 1 . 2 6 0 0 0 9 6 4 3 0 2 1 8 1 1 7 " F l a g - n i e t e c h t g e b r u i k t = " 0 " / >
< / E n t r i e s >
@@ -70,9 +68,9 @@
< E n t r i e s >
- < T i m e S e r i e E n t r y D a t e T i m e = " 2 0 1 6 - 0 3 - 0 2 T 0 3 : 1 0 : 0 0 " S a f e t y F a c t o r = " N a N " / >
+ < T i m e S e r i e E n t r y D a t e T i m e = " 2 0 1 6 - 0 3 - 0 2 T 0 3 : 1 0 : 0 0 " V a l u e = " N a N " F l a g - n i e t e c h t g e b r u i k t = " 0 " / >
- < T i m e S e r i e E n t r y D a t e T i m e = " 2 0 1 6 - 0 3 - 0 2 T 0 3 : 2 0 : 0 0 " S a f e t y F a c t o r = " N a N " / >
+ < T i m e S e r i e E n t r y D a t e T i m e = " 2 0 1 6 - 0 3 - 0 2 T 0 3 : 2 0 : 0 0 " V a l u e = " N a N " F l a g - n i e t e c h t g e b r u i k t = " 0 " / >
< / E n t r i e s >
@@ -84,9 +82,9 @@
< E n t r i e s >
- < T i m e S e r i e E n t r y D a t e T i m e = " 2 0 1 6 - 0 3 - 0 2 T 0 3 : 1 0 : 0 0 " S a f e t y F a c t o r = " N a N " / >
+ < T i m e S e r i e E n t r y D a t e T i m e = " 2 0 1 6 - 0 3 - 0 2 T 0 3 : 1 0 : 0 0 " V a l u e = " N a N " F l a g - n i e t e c h t g e b r u i k t = " 0 " / >
- < T i m e S e r i e E n t r y D a t e T i m e = " 2 0 1 6 - 0 3 - 0 2 T 0 3 : 2 0 : 0 0 " S a f e t y F a c t o r = " N a N " / >
+ < T i m e S e r i e E n t r y D a t e T i m e = " 2 0 1 6 - 0 3 - 0 2 T 0 3 : 2 0 : 0 0 " V a l u e = " N a N " F l a g - n i e t e c h t g e b r u i k t = " 0 " / >
< / E n t r i e s >
@@ -98,9 +96,9 @@
< E n t r i e s >
- < T i m e S e r i e E n t r y D a t e T i m e = " 2 0 1 6 - 0 3 - 0 2 T 0 3 : 1 0 : 0 0 " S a f e t y F a c t o r = " N a N " / >
+ < T i m e S e r i e E n t r y D a t e T i m e = " 2 0 1 6 - 0 3 - 0 2 T 0 3 : 1 0 : 0 0 " V a l u e = " N a N " F l a g - n i e t e c h t g e b r u i k t = " 0 " / >
- < T i m e S e r i e E n t r y D a t e T i m e = " 2 0 1 6 - 0 3 - 0 2 T 0 3 : 2 0 : 0 0 " S a f e t y F a c t o r = " N a N " / >
+ < T i m e S e r i e E n t r y D a t e T i m e = " 2 0 1 6 - 0 3 - 0 2 T 0 3 : 2 0 : 0 0 " V a l u e = " N a N " F l a g - n i e t e c h t g e b r u i k t = " 0 " / >
< / E n t r i e s >
@@ -112,9 +110,9 @@
< E n t r i e s >
- < T i m e S e r i e E n t r y D a t e T i m e = " 2 0 1 6 - 0 3 - 0 2 T 0 3 : 1 0 : 0 0 " S a f e t y F a c t o r = " N a N " / >
+ < T i m e S e r i e E n t r y D a t e T i m e = " 2 0 1 6 - 0 3 - 0 2 T 0 3 : 1 0 : 0 0 " V a l u e = " N a N " F l a g - n i e t e c h t g e b r u i k t = " 0 " / >
- < T i m e S e r i e E n t r y D a t e T i m e = " 2 0 1 6 - 0 3 - 0 2 T 0 3 : 2 0 : 0 0 " S a f e t y F a c t o r = " N a N " / >
+ < T i m e S e r i e E n t r y D a t e T i m e = " 2 0 1 6 - 0 3 - 0 2 T 0 3 : 2 0 : 0 0 " V a l u e = " N a N " F l a g - n i e t e c h t g e b r u i k t = " 0 " / >
< / E n t r i e s >
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillXmlOutputFromDamTests.cs
===================================================================
diff -u -r6089 -r6095
--- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillXmlOutputFromDamTests.cs (.../FillXmlOutputFromDamTests.cs) (revision 6089)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillXmlOutputFromDamTests.cs (.../FillXmlOutputFromDamTests.cs) (revision 6095)
@@ -310,8 +310,8 @@
{
DateTime = new DateTime(2012, 12, 31, 1, j * 10, 0),
Value = 1 + j * 0.1,
-// Flag = 1,
-// BasisFileName = $"BasisFileName{i}"
+ Flag = 1,
+ BasisFileName = $"BasisFileName{i}"
});
}
}
Index: DamEngine/trunk/xsd/DamTimeSerie.xsd
===================================================================
diff -u -r6088 -r6095
--- DamEngine/trunk/xsd/DamTimeSerie.xsd (.../DamTimeSerie.xsd) (revision 6088)
+++ DamEngine/trunk/xsd/DamTimeSerie.xsd (.../DamTimeSerie.xsd) (revision 6095)
@@ -1,12 +1,6 @@
-
-
-
-
-
-
@@ -37,15 +31,19 @@
-
-
-
-
-
+
+
+
+
+
+
+
-
-
+
+
+
+
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Operational/Profile1DTests/CalculateStabilityInsideBishopGrid1_UseLocationDataOutputFile.xml
===================================================================
diff -u -r6093 -r6095
Binary files differ
Index: DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Data.deps.json
===================================================================
diff -u -r6090 -r6095
--- DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Data.deps.json (.../Deltares.DamEngine.Data.deps.json) (revision 6090)
+++ DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Data.deps.json (.../Deltares.DamEngine.Data.deps.json) (revision 6095)
@@ -6,7 +6,7 @@
"compilationOptions": {},
"targets": {
".NETCoreApp,Version=v6.0": {
- "Deltares.DamEngine.Data/24.1.0.6089": {
+ "Deltares.DamEngine.Data/24.1.0.6077": {
"runtime": {
"Deltares.DamEngine.Data.dll": {}
},
@@ -19,7 +19,7 @@
}
},
"libraries": {
- "Deltares.DamEngine.Data/24.1.0.6089": {
+ "Deltares.DamEngine.Data/24.1.0.6077": {
"type": "project",
"serviceable": false,
"sha512": ""
Index: DamClients/DamLive/trunk/lib/DamEngine/Deltares.DamEngine.Io.dll
===================================================================
diff -u -r6091 -r6095
Binary files differ
Index: DamClients/DamLive/trunk/lib/DamEngine/Deltares.DamEngine.Interface.deps.json
===================================================================
diff -u -r6091 -r6095
--- DamClients/DamLive/trunk/lib/DamEngine/Deltares.DamEngine.Interface.deps.json (.../Deltares.DamEngine.Interface.deps.json) (revision 6091)
+++ DamClients/DamLive/trunk/lib/DamEngine/Deltares.DamEngine.Interface.deps.json (.../Deltares.DamEngine.Interface.deps.json) (revision 6095)
@@ -6,11 +6,11 @@
"compilationOptions": {},
"targets": {
".NETCoreApp,Version=v6.0": {
- "Deltares.DamEngine.Interface/24.1.0.6089": {
+ "Deltares.DamEngine.Interface/24.1.0.6077": {
"dependencies": {
- "Deltares.DamEngine.Calculators": "24.1.0.6089",
- "Deltares.DamEngine.Data": "24.1.0.6089",
- "Deltares.DamEngine.Io": "24.1.0.6089"
+ "Deltares.DamEngine.Calculators": "24.1.0.6077",
+ "Deltares.DamEngine.Data": "24.1.0.6077",
+ "Deltares.DamEngine.Io": "24.1.0.6077"
},
"runtime": {
"Deltares.DamEngine.Interface.dll": {}
@@ -574,15 +574,15 @@
}
},
"System.Threading.Tasks.Extensions/4.5.4": {},
- "Deltares.DamEngine.Calculators/24.1.0.6089": {
+ "Deltares.DamEngine.Calculators/24.1.0.6077": {
"dependencies": {
- "Deltares.DamEngine.Data": "24.1.0.6089",
+ "Deltares.DamEngine.Data": "24.1.0.6077",
"Deltares.StixFileWriter": "24.1.0.118"
},
"runtime": {
"Deltares.DamEngine.Calculators.dll": {
- "assemblyVersion": "24.1.0.6089",
- "fileVersion": "24.1.0.6089"
+ "assemblyVersion": "24.1.0.6077",
+ "fileVersion": "24.1.0.6077"
}
},
"resources": {
@@ -594,11 +594,11 @@
}
}
},
- "Deltares.DamEngine.Data/24.1.0.6089": {
+ "Deltares.DamEngine.Data/24.1.0.6077": {
"runtime": {
"Deltares.DamEngine.Data.dll": {
- "assemblyVersion": "24.1.0.6089",
- "fileVersion": "24.1.0.6089"
+ "assemblyVersion": "24.1.0.6077",
+ "fileVersion": "24.1.0.6077"
}
},
"resources": {
@@ -607,11 +607,11 @@
}
}
},
- "Deltares.DamEngine.Io/24.1.0.6089": {
+ "Deltares.DamEngine.Io/24.1.0.6077": {
"runtime": {
"Deltares.DamEngine.Io.dll": {
- "assemblyVersion": "24.1.0.6089",
- "fileVersion": "24.1.0.6089"
+ "assemblyVersion": "24.1.0.6077",
+ "fileVersion": "24.1.0.6077"
}
}
},
@@ -647,7 +647,7 @@
}
},
"libraries": {
- "Deltares.DamEngine.Interface/24.1.0.6089": {
+ "Deltares.DamEngine.Interface/24.1.0.6077": {
"type": "project",
"serviceable": false,
"sha512": ""
@@ -1128,17 +1128,17 @@
"path": "system.threading.tasks.extensions/4.5.4",
"hashPath": "system.threading.tasks.extensions.4.5.4.nupkg.sha512"
},
- "Deltares.DamEngine.Calculators/24.1.0.6089": {
+ "Deltares.DamEngine.Calculators/24.1.0.6077": {
"type": "project",
"serviceable": false,
"sha512": ""
},
- "Deltares.DamEngine.Data/24.1.0.6089": {
+ "Deltares.DamEngine.Data/24.1.0.6077": {
"type": "project",
"serviceable": false,
"sha512": ""
},
- "Deltares.DamEngine.Io/24.1.0.6089": {
+ "Deltares.DamEngine.Io/24.1.0.6077": {
"type": "project",
"serviceable": false,
"sha512": ""
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Operational/Profile1DTests/CalculateStabilityInsideUpliftVanBeeSwarm1OutputFile.xml
===================================================================
diff -u -r6093 -r6095
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Operational/Profile1DTests/CalculateStabilityInsideUpliftVanBeeSwarm1OutputFile.xml (.../CalculateStabilityInsideUpliftVanBeeSwarm1OutputFile.xml) (revision 6093)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Operational/Profile1DTests/CalculateStabilityInsideUpliftVanBeeSwarm1OutputFile.xml (.../CalculateStabilityInsideUpliftVanBeeSwarm1OutputFile.xml) (revision 6095)
@@ -4,8 +4,6 @@
< R e s u l t s >
- < O p e r a t i o n a l L o c a t i o n s S t a t i c D a t a x s i : n i l = " t r u e " / >
-
< O p e r a t i o n a l O u t p u t T i m e S e r i e s >
< T i m e S e r i e F o r e c a s t D a t e T i m e = " 0 0 0 1 - 0 1 - 0 1 T 0 0 : 0 0 : 0 0 " T y p e = " i n s t a n t a n e o u s " L o c a t i o n I d = " P u r m e r _ P U 0 0 4 2 + 0 0 _ K " P a r a m e t e r I d = " S t a b i l i t y I n s i d e F a c t o r " S t a r t D a t e T i m e = " 2 0 1 6 - 0 3 - 0 2 T 0 3 : 1 0 : 0 0 " E n d D a t e T i m e = " 2 0 1 8 - 0 7 - 0 5 T 1 0 : 0 0 : 0 0 " M i s s V a l = " N a N " S t a t i o n N a m e = " M P N - A S - 1 7 4 3 " U n i t s = " m N A P " >
@@ -14,9 +12,9 @@
< E n t r i e s >
- < T i m e S e r i e E n t r y D a t e T i m e = " 2 0 1 6 - 0 3 - 0 2 T 0 3 : 1 0 : 0 0 " S a f e t y F a c t o r = " 1 . 4 4 7 2 4 2 3 0 9 4 3 1 7 2 4 6 " / >
+ < T i m e S e r i e E n t r y D a t e T i m e = " 2 0 1 6 - 0 3 - 0 2 T 0 3 : 1 0 : 0 0 " V a l u e = " 1 . 4 4 7 2 4 2 3 0 9 4 3 1 7 2 4 6 " F l a g - n i e t e c h t g e b r u i k t = " 0 " / >
- < T i m e S e r i e E n t r y D a t e T i m e = " 2 0 1 6 - 0 3 - 0 2 T 0 3 : 2 0 : 0 0 " S a f e t y F a c t o r = " 1 . 5 7 1 1 8 9 7 8 5 2 8 9 2 7 9 8 " / >
+ < T i m e S e r i e E n t r y D a t e T i m e = " 2 0 1 6 - 0 3 - 0 2 T 0 3 : 2 0 : 0 0 " V a l u e = " 1 . 5 7 1 1 8 9 7 8 5 2 8 9 2 7 9 8 " F l a g - n i e t e c h t g e b r u i k t = " 0 " / >
< / E n t r i e s >
@@ -28,9 +26,9 @@
< E n t r i e s >
- < T i m e S e r i e E n t r y D a t e T i m e = " 2 0 1 6 - 0 3 - 0 2 T 0 3 : 1 0 : 0 0 " S a f e t y F a c t o r = " 1 . 3 4 6 8 4 0 7 7 0 1 2 6 7 8 2 8 " / >
+ < T i m e S e r i e E n t r y D a t e T i m e = " 2 0 1 6 - 0 3 - 0 2 T 0 3 : 1 0 : 0 0 " V a l u e = " 1 . 3 4 6 8 4 0 7 7 0 1 2 6 7 8 2 8 " F l a g - n i e t e c h t g e b r u i k t = " 0 " / >
- < T i m e S e r i e E n t r y D a t e T i m e = " 2 0 1 6 - 0 3 - 0 2 T 0 3 : 2 0 : 0 0 " S a f e t y F a c t o r = " 1 . 4 6 6 8 4 4 7 2 0 7 1 9 4 3 6 4 " / >
+ < T i m e S e r i e E n t r y D a t e T i m e = " 2 0 1 6 - 0 3 - 0 2 T 0 3 : 2 0 : 0 0 " V a l u e = " 1 . 4 6 6 8 4 4 7 2 0 7 1 9 4 3 6 4 " F l a g - n i e t e c h t g e b r u i k t = " 0 " / >
< / E n t r i e s >
@@ -42,9 +40,9 @@
< E n t r i e s >
- < T i m e S e r i e E n t r y D a t e T i m e = " 2 0 1 6 - 0 3 - 0 2 T 0 3 : 1 0 : 0 0 " S a f e t y F a c t o r = " 1 . 2 3 9 8 3 6 0 5 6 3 9 3 4 0 3 9 " / >
+ < T i m e S e r i e E n t r y D a t e T i m e = " 2 0 1 6 - 0 3 - 0 2 T 0 3 : 1 0 : 0 0 " V a l u e = " 1 . 2 3 9 8 3 6 0 5 6 3 9 3 4 0 3 9 " F l a g - n i e t e c h t g e b r u i k t = " 0 " / >
- < T i m e S e r i e E n t r y D a t e T i m e = " 2 0 1 6 - 0 3 - 0 2 T 0 3 : 2 0 : 0 0 " S a f e t y F a c t o r = " 1 . 3 4 8 2 6 2 5 1 5 5 1 7 2 1 5 4 " / >
+ < T i m e S e r i e E n t r y D a t e T i m e = " 2 0 1 6 - 0 3 - 0 2 T 0 3 : 2 0 : 0 0 " V a l u e = " 1 . 3 4 8 2 6 2 5 1 5 5 1 7 2 1 5 4 " F l a g - n i e t e c h t g e b r u i k t = " 0 " / >
< / E n t r i e s >
@@ -56,9 +54,9 @@
< E n t r i e s >
- < T i m e S e r i e E n t r y D a t e T i m e = " 2 0 1 6 - 0 3 - 0 2 T 0 3 : 1 0 : 0 0 " S a f e t y F a c t o r = " 1 . 1 5 4 8 4 4 7 1 2 9 8 8 9 7 2 7 " / >
+ < T i m e S e r i e E n t r y D a t e T i m e = " 2 0 1 6 - 0 3 - 0 2 T 0 3 : 1 0 : 0 0 " V a l u e = " 1 . 1 5 4 8 4 4 7 1 2 9 8 8 9 7 2 7 " F l a g - n i e t e c h t g e b r u i k t = " 0 " / >
- < T i m e S e r i e E n t r y D a t e T i m e = " 2 0 1 6 - 0 3 - 0 2 T 0 3 : 2 0 : 0 0 " S a f e t y F a c t o r = " 1 . 2 5 9 7 2 6 5 6 5 7 7 3 6 5 1 8 " / >
+ < T i m e S e r i e E n t r y D a t e T i m e = " 2 0 1 6 - 0 3 - 0 2 T 0 3 : 2 0 : 0 0 " V a l u e = " 1 . 2 5 9 7 2 6 5 6 5 7 7 3 6 5 1 8 " F l a g - n i e t e c h t g e b r u i k t = " 0 " / >
< / E n t r i e s >
@@ -70,9 +68,9 @@
< E n t r i e s >
- < T i m e S e r i e E n t r y D a t e T i m e = " 2 0 1 6 - 0 3 - 0 2 T 0 3 : 1 0 : 0 0 " S a f e t y F a c t o r = " N a N " / >
+ < T i m e S e r i e E n t r y D a t e T i m e = " 2 0 1 6 - 0 3 - 0 2 T 0 3 : 1 0 : 0 0 " V a l u e = " N a N " F l a g - n i e t e c h t g e b r u i k t = " 0 " / >
- < T i m e S e r i e E n t r y D a t e T i m e = " 2 0 1 6 - 0 3 - 0 2 T 0 3 : 2 0 : 0 0 " S a f e t y F a c t o r = " N a N " / >
+ < T i m e S e r i e E n t r y D a t e T i m e = " 2 0 1 6 - 0 3 - 0 2 T 0 3 : 2 0 : 0 0 " V a l u e = " N a N " F l a g - n i e t e c h t g e b r u i k t = " 0 " / >
< / E n t r i e s >
@@ -84,9 +82,9 @@
< E n t r i e s >
- < T i m e S e r i e E n t r y D a t e T i m e = " 2 0 1 6 - 0 3 - 0 2 T 0 3 : 1 0 : 0 0 " S a f e t y F a c t o r = " N a N " / >
+ < T i m e S e r i e E n t r y D a t e T i m e = " 2 0 1 6 - 0 3 - 0 2 T 0 3 : 1 0 : 0 0 " V a l u e = " N a N " F l a g - n i e t e c h t g e b r u i k t = " 0 " / >
- < T i m e S e r i e E n t r y D a t e T i m e = " 2 0 1 6 - 0 3 - 0 2 T 0 3 : 2 0 : 0 0 " S a f e t y F a c t o r = " N a N " / >
+ < T i m e S e r i e E n t r y D a t e T i m e = " 2 0 1 6 - 0 3 - 0 2 T 0 3 : 2 0 : 0 0 " V a l u e = " N a N " F l a g - n i e t e c h t g e b r u i k t = " 0 " / >
< / E n t r i e s >
@@ -98,9 +96,9 @@
< E n t r i e s >
- < T i m e S e r i e E n t r y D a t e T i m e = " 2 0 1 6 - 0 3 - 0 2 T 0 3 : 1 0 : 0 0 " S a f e t y F a c t o r = " N a N " / >
+ < T i m e S e r i e E n t r y D a t e T i m e = " 2 0 1 6 - 0 3 - 0 2 T 0 3 : 1 0 : 0 0 " V a l u e = " N a N " F l a g - n i e t e c h t g e b r u i k t = " 0 " / >
- < T i m e S e r i e E n t r y D a t e T i m e = " 2 0 1 6 - 0 3 - 0 2 T 0 3 : 2 0 : 0 0 " S a f e t y F a c t o r = " N a N " / >
+ < T i m e S e r i e E n t r y D a t e T i m e = " 2 0 1 6 - 0 3 - 0 2 T 0 3 : 2 0 : 0 0 " V a l u e = " N a N " F l a g - n i e t e c h t g e b r u i k t = " 0 " / >
< / E n t r i e s >
@@ -112,9 +110,9 @@
< E n t r i e s >
- < T i m e S e r i e E n t r y D a t e T i m e = " 2 0 1 6 - 0 3 - 0 2 T 0 3 : 1 0 : 0 0 " S a f e t y F a c t o r = " N a N " / >
+ < T i m e S e r i e E n t r y D a t e T i m e = " 2 0 1 6 - 0 3 - 0 2 T 0 3 : 1 0 : 0 0 " V a l u e = " N a N " F l a g - n i e t e c h t g e b r u i k t = " 0 " / >
- < T i m e S e r i e E n t r y D a t e T i m e = " 2 0 1 6 - 0 3 - 0 2 T 0 3 : 2 0 : 0 0 " S a f e t y F a c t o r = " N a N " / >
+ < T i m e S e r i e E n t r y D a t e T i m e = " 2 0 1 6 - 0 3 - 0 2 T 0 3 : 2 0 : 0 0 " V a l u e = " N a N " F l a g - n i e t e c h t g e b r u i k t = " 0 " / >
< / E n t r i e s >
Index: DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Io.dll
===================================================================
diff -u -r6090 -r6095
Binary files differ
Index: DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Io.deps.json
===================================================================
diff -u -r6090 -r6095
--- DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Io.deps.json (.../Deltares.DamEngine.Io.deps.json) (revision 6090)
+++ DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Io.deps.json (.../Deltares.DamEngine.Io.deps.json) (revision 6095)
@@ -6,15 +6,15 @@
"compilationOptions": {},
"targets": {
".NETCoreApp,Version=v6.0": {
- "Deltares.DamEngine.Io/24.1.0.6089": {
+ "Deltares.DamEngine.Io/24.1.0.6077": {
"runtime": {
"Deltares.DamEngine.Io.dll": {}
}
}
}
},
"libraries": {
- "Deltares.DamEngine.Io/24.1.0.6089": {
+ "Deltares.DamEngine.Io/24.1.0.6077": {
"type": "project",
"serviceable": false,
"sha512": ""
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlOutputFromDamUi.cs
===================================================================
diff -u -r6092 -r6095
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlOutputFromDamUi.cs (.../FillXmlOutputFromDamUi.cs) (revision 6092)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlOutputFromDamUi.cs (.../FillXmlOutputFromDamUi.cs) (revision 6095)
@@ -94,25 +94,25 @@
var timeSerieEntryIndex = 0;
foreach (TimeSerieEntry timestepEntry in damTimeSerie.Entries)
{
- // TimeSerieEntriesTimeSerieEntryStochastValue stochastValue = null;
- // if (timestepEntry.StochastValue != null)
- // {
- // stochastValue = new TimeSerieEntriesTimeSerieEntryStochastValue
- // {
- // Distribution = timestepEntry.StochastValue.Distribution,
- // Mean = timestepEntry.StochastValue.Mean,
- // StandardDeviation = timestepEntry.StochastValue.StandardDeviation
- // };
- // }
+ TimeSerieEntriesTimeSerieEntryStochastValue stochastValue = null;
+ if (timestepEntry.StochastValue != null)
+ {
+ stochastValue = new TimeSerieEntriesTimeSerieEntryStochastValue
+ {
+ Distribution = timestepEntry.StochastValue.Distribution,
+ Mean = timestepEntry.StochastValue.Mean,
+ StandardDeviation = timestepEntry.StochastValue.StandardDeviation
+ };
+ }
var timeStep = new TimeSerieEntriesTimeSerieEntry
{
DateTime = timestepEntry.DateTime,
- SafetyFactor = timestepEntry.Value,
- // BasisFileNameWMF = timestepEntry.BasisFileName,
- // Flagnietechtgebruikt = timestepEntry.Flag,
- // RelativeCalculationPathName = timestepEntry.RelativeCalculationPathName,
- // StochastValue = stochastValue
+ Value = timestepEntry.Value,
+ BasisFileNameWMF = timestepEntry.BasisFileName,
+ Flagnietechtgebruikt = timestepEntry.Flag,
+ RelativeCalculationPathName = timestepEntry.RelativeCalculationPathName,
+ StochastValue = stochastValue
};
outputTimeSerie.Entries.TimeSerieEntry[timeSerieEntryIndex] = timeStep;
timeSerieEntryIndex++;
Index: DamClients/DamLive/trunk/lib/DamEngine/Deltares.DamEngine.Data.dll
===================================================================
diff -u -r6091 -r6095
Binary files differ
Index: DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Interface.deps.json
===================================================================
diff -u -r6090 -r6095
--- DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Interface.deps.json (.../Deltares.DamEngine.Interface.deps.json) (revision 6090)
+++ DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Interface.deps.json (.../Deltares.DamEngine.Interface.deps.json) (revision 6095)
@@ -6,11 +6,11 @@
"compilationOptions": {},
"targets": {
".NETCoreApp,Version=v6.0": {
- "Deltares.DamEngine.Interface/24.1.0.6089": {
+ "Deltares.DamEngine.Interface/24.1.0.6077": {
"dependencies": {
- "Deltares.DamEngine.Calculators": "24.1.0.6089",
- "Deltares.DamEngine.Data": "24.1.0.6089",
- "Deltares.DamEngine.Io": "24.1.0.6089"
+ "Deltares.DamEngine.Calculators": "24.1.0.6077",
+ "Deltares.DamEngine.Data": "24.1.0.6077",
+ "Deltares.DamEngine.Io": "24.1.0.6077"
},
"runtime": {
"Deltares.DamEngine.Interface.dll": {}
@@ -574,15 +574,15 @@
}
},
"System.Threading.Tasks.Extensions/4.5.4": {},
- "Deltares.DamEngine.Calculators/24.1.0.6089": {
+ "Deltares.DamEngine.Calculators/24.1.0.6077": {
"dependencies": {
- "Deltares.DamEngine.Data": "24.1.0.6089",
+ "Deltares.DamEngine.Data": "24.1.0.6077",
"Deltares.StixFileWriter": "24.1.0.118"
},
"runtime": {
"Deltares.DamEngine.Calculators.dll": {
- "assemblyVersion": "24.1.0.6089",
- "fileVersion": "24.1.0.6089"
+ "assemblyVersion": "24.1.0.6077",
+ "fileVersion": "24.1.0.6077"
}
},
"resources": {
@@ -594,11 +594,11 @@
}
}
},
- "Deltares.DamEngine.Data/24.1.0.6089": {
+ "Deltares.DamEngine.Data/24.1.0.6077": {
"runtime": {
"Deltares.DamEngine.Data.dll": {
- "assemblyVersion": "24.1.0.6089",
- "fileVersion": "24.1.0.6089"
+ "assemblyVersion": "24.1.0.6077",
+ "fileVersion": "24.1.0.6077"
}
},
"resources": {
@@ -607,11 +607,11 @@
}
}
},
- "Deltares.DamEngine.Io/24.1.0.6089": {
+ "Deltares.DamEngine.Io/24.1.0.6077": {
"runtime": {
"Deltares.DamEngine.Io.dll": {
- "assemblyVersion": "24.1.0.6089",
- "fileVersion": "24.1.0.6089"
+ "assemblyVersion": "24.1.0.6077",
+ "fileVersion": "24.1.0.6077"
}
}
},
@@ -647,7 +647,7 @@
}
},
"libraries": {
- "Deltares.DamEngine.Interface/24.1.0.6089": {
+ "Deltares.DamEngine.Interface/24.1.0.6077": {
"type": "project",
"serviceable": false,
"sha512": ""
@@ -1128,17 +1128,17 @@
"path": "system.threading.tasks.extensions/4.5.4",
"hashPath": "system.threading.tasks.extensions.4.5.4.nupkg.sha512"
},
- "Deltares.DamEngine.Calculators/24.1.0.6089": {
+ "Deltares.DamEngine.Calculators/24.1.0.6077": {
"type": "project",
"serviceable": false,
"sha512": ""
},
- "Deltares.DamEngine.Data/24.1.0.6089": {
+ "Deltares.DamEngine.Data/24.1.0.6077": {
"type": "project",
"serviceable": false,
"sha512": ""
},
- "Deltares.DamEngine.Io/24.1.0.6089": {
+ "Deltares.DamEngine.Io/24.1.0.6077": {
"type": "project",
"serviceable": false,
"sha512": ""
Index: DamClients/DamUI/trunk/lib/DamEngine/nl-NL/Deltares.DamEngine.Calculators.resources.dll
===================================================================
diff -u -r6090 -r6095
Binary files differ
Index: DamClients/DamLive/trunk/lib/DamEngine/nl-NL/Deltares.DamEngine.Data.resources.dll
===================================================================
diff -u -r6091 -r6095
Binary files differ
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlOutput.cs
===================================================================
diff -u -r6088 -r6095
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlOutput.cs (.../FillDamFromXmlOutput.cs) (revision 6088)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlOutput.cs (.../FillDamFromXmlOutput.cs) (revision 6095)
@@ -95,25 +95,25 @@
for (var i = 0; i < outputTimeSerie.Entries.TimeSerieEntry.Length; i++)
{
TimeSerieEntriesTimeSerieEntry entry = outputTimeSerie.Entries.TimeSerieEntry[i];
- // Stochast stochastValue = null;
- // if (entry.StochastValue != null)
- // {
- // stochastValue = new Stochast
- // {
- // Distribution = entry.StochastValue.Distribution,
- // Mean = entry.StochastValue.Mean,
- // StandardDeviation = entry.StochastValue.StandardDeviation
- // };
- // }
+ Stochast stochastValue = null;
+ if (entry.StochastValue != null)
+ {
+ stochastValue = new Stochast
+ {
+ Distribution = entry.StochastValue.Distribution,
+ Mean = entry.StochastValue.Mean,
+ StandardDeviation = entry.StochastValue.StandardDeviation
+ };
+ }
var timeSerieEntry = new TimeSerieEntry
{
DateTime = entry.DateTime,
- Value = entry.SafetyFactor,
- // BasisFileName = entry.BasisFileNameWMF,
- // Flag = entry.Flagnietechtgebruikt,
- // RelativeCalculationPathName = entry.RelativeCalculationPathName,
- // StochastValue = stochastValue
+ Value = entry.Value,
+ BasisFileName = entry.BasisFileNameWMF,
+ Flag = entry.Flagnietechtgebruikt,
+ RelativeCalculationPathName = entry.RelativeCalculationPathName,
+ StochastValue = stochastValue
};
timeSerie.Entries.Add(timeSerieEntry);
}
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Operational/Profile1DTests/CalculateStabilityInsideBishopGrid1OutputFile.xml
===================================================================
diff -u -r6093 -r6095
Binary files differ
Index: DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Data.dll
===================================================================
diff -u -r6090 -r6095
Binary files differ
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalHHNKTests.cs
===================================================================
diff -u -r6088 -r6095
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalHHNKTests.cs (.../OperationalHHNKTests.cs) (revision 6088)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalHHNKTests.cs (.../OperationalHHNKTests.cs) (revision 6095)
@@ -57,15 +57,15 @@
Assert.Multiple(() =>
{
Assert.That(output.Results.OperationalOutputTimeSeries[0].Entries.TimeSerieEntry, Has.Length.EqualTo(1));
- Assert.That(output.Results.OperationalOutputTimeSeries[0].Entries.TimeSerieEntry[0].SafetyFactor, Is.EqualTo(0.932).Within(tolerance));
- Assert.That(output.Results.OperationalOutputTimeSeries[1].Entries.TimeSerieEntry[0].SafetyFactor, Is.EqualTo(0.862).Within(tolerance));
- Assert.That(output.Results.OperationalOutputTimeSeries[2].Entries.TimeSerieEntry[0].SafetyFactor, Is.EqualTo(0.803).Within(tolerance));
- Assert.That(output.Results.OperationalOutputTimeSeries[3].Entries.TimeSerieEntry[0].SafetyFactor, Is.EqualTo(0.747).Within(tolerance));
+ Assert.That(output.Results.OperationalOutputTimeSeries[0].Entries.TimeSerieEntry[0].Value, Is.EqualTo(0.932).Within(tolerance));
+ Assert.That(output.Results.OperationalOutputTimeSeries[1].Entries.TimeSerieEntry[0].Value, Is.EqualTo(0.862).Within(tolerance));
+ Assert.That(output.Results.OperationalOutputTimeSeries[2].Entries.TimeSerieEntry[0].Value, Is.EqualTo(0.803).Within(tolerance));
+ Assert.That(output.Results.OperationalOutputTimeSeries[3].Entries.TimeSerieEntry[0].Value, Is.EqualTo(0.747).Within(tolerance));
// The following values are NaN due to no uplift
- Assert.That(output.Results.OperationalOutputTimeSeries[4].Entries.TimeSerieEntry[0].SafetyFactor, Is.NaN);
- Assert.That(output.Results.OperationalOutputTimeSeries[5].Entries.TimeSerieEntry[0].SafetyFactor, Is.NaN);
- Assert.That(output.Results.OperationalOutputTimeSeries[6].Entries.TimeSerieEntry[0].SafetyFactor, Is.NaN);
- Assert.That(output.Results.OperationalOutputTimeSeries[7].Entries.TimeSerieEntry[0].SafetyFactor, Is.NaN);
+ Assert.That(output.Results.OperationalOutputTimeSeries[4].Entries.TimeSerieEntry[0].Value, Is.NaN);
+ Assert.That(output.Results.OperationalOutputTimeSeries[5].Entries.TimeSerieEntry[0].Value, Is.NaN);
+ Assert.That(output.Results.OperationalOutputTimeSeries[6].Entries.TimeSerieEntry[0].Value, Is.NaN);
+ Assert.That(output.Results.OperationalOutputTimeSeries[7].Entries.TimeSerieEntry[0].Value, Is.NaN);
});
}
}
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalStabilityProfile2DTests.cs
===================================================================
diff -u -r6088 -r6095
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalStabilityProfile2DTests.cs (.../OperationalStabilityProfile2DTests.cs) (revision 6088)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalStabilityProfile2DTests.cs (.../OperationalStabilityProfile2DTests.cs) (revision 6095)
@@ -33,8 +33,6 @@
using NUnit.Framework;
using CharacteristicPointType = Deltares.DamEngine.Data.Geotechnics.CharacteristicPointType;
using SurfaceLinePoint = Deltares.DamEngine.Io.XmlInput.SurfaceLinePoint;
-using WaternetLineType = Deltares.MacroStability.Io.XmlInput.WaternetLineType;
-using WaternetType = Deltares.MacroStability.Io.XmlInput.WaternetType;
namespace Deltares.DamEngine.IntegrationTests.IntegrationTests;
Index: DamClients/DamLive/trunk/lib/DamEngine/Deltares.DamEngine.Calculators.dll
===================================================================
diff -u -r6091 -r6095
Binary files differ
Index: DamClients/DamLive/trunk/lib/DamEngine/Deltares.DamEngine.Data.deps.json
===================================================================
diff -u -r6091 -r6095
--- DamClients/DamLive/trunk/lib/DamEngine/Deltares.DamEngine.Data.deps.json (.../Deltares.DamEngine.Data.deps.json) (revision 6091)
+++ DamClients/DamLive/trunk/lib/DamEngine/Deltares.DamEngine.Data.deps.json (.../Deltares.DamEngine.Data.deps.json) (revision 6095)
@@ -6,7 +6,7 @@
"compilationOptions": {},
"targets": {
".NETCoreApp,Version=v6.0": {
- "Deltares.DamEngine.Data/24.1.0.6089": {
+ "Deltares.DamEngine.Data/24.1.0.6077": {
"runtime": {
"Deltares.DamEngine.Data.dll": {}
},
@@ -19,7 +19,7 @@
}
},
"libraries": {
- "Deltares.DamEngine.Data/24.1.0.6089": {
+ "Deltares.DamEngine.Data/24.1.0.6077": {
"type": "project",
"serviceable": false,
"sha512": ""
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalMultiCoreTests.cs
===================================================================
diff -u -r6088 -r6095
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalMultiCoreTests.cs (.../OperationalMultiCoreTests.cs) (revision 6088)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalMultiCoreTests.cs (.../OperationalMultiCoreTests.cs) (revision 6095)
@@ -153,8 +153,8 @@
numberOfResults += resultSerie.Entries.TimeSerieEntry.Length;
foreach (TimeSerieEntriesTimeSerieEntry timeSerieEntriesTimeSerieEntry in resultSerie.Entries.TimeSerieEntry)
{
- if (!double.IsNaN(timeSerieEntriesTimeSerieEntry.SafetyFactor) &&
- timeSerieEntriesTimeSerieEntry.SafetyFactor is > 0 and < 100000)
+ if (!double.IsNaN(timeSerieEntriesTimeSerieEntry.Value) &&
+ timeSerieEntriesTimeSerieEntry.Value is > 0 and < 100000)
{
numberOfRealResults++;
}
Index: DamClients/DamLive/trunk/lib/DamEngine/Deltares.DamEngine.Io.deps.json
===================================================================
diff -u -r6091 -r6095
--- DamClients/DamLive/trunk/lib/DamEngine/Deltares.DamEngine.Io.deps.json (.../Deltares.DamEngine.Io.deps.json) (revision 6091)
+++ DamClients/DamLive/trunk/lib/DamEngine/Deltares.DamEngine.Io.deps.json (.../Deltares.DamEngine.Io.deps.json) (revision 6095)
@@ -6,15 +6,15 @@
"compilationOptions": {},
"targets": {
".NETCoreApp,Version=v6.0": {
- "Deltares.DamEngine.Io/24.1.0.6089": {
+ "Deltares.DamEngine.Io/24.1.0.6077": {
"runtime": {
"Deltares.DamEngine.Io.dll": {}
}
}
}
},
"libraries": {
- "Deltares.DamEngine.Io/24.1.0.6089": {
+ "Deltares.DamEngine.Io/24.1.0.6077": {
"type": "project",
"serviceable": false,
"sha512": ""
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalStabilityProfile1DTests.cs
===================================================================
diff -u -r6088 -r6095
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalStabilityProfile1DTests.cs (.../OperationalStabilityProfile1DTests.cs) (revision 6088)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalStabilityProfile1DTests.cs (.../OperationalStabilityProfile1DTests.cs) (revision 6095)
@@ -33,7 +33,6 @@
using KellermanSoftware.CompareNetObjects;
using NUnit.Framework;
using Point2DType = Deltares.DamEngine.Io.XmlOutput.Point2DType;
-using WaternetType = Deltares.MacroStability.Io.XmlInput.WaternetType;
namespace Deltares.DamEngine.IntegrationTests.IntegrationTests;
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalWtiPipingTests.cs
===================================================================
diff -u -r6088 -r6095
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalWtiPipingTests.cs (.../OperationalWtiPipingTests.cs) (revision 6088)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalWtiPipingTests.cs (.../OperationalWtiPipingTests.cs) (revision 6095)
@@ -54,10 +54,10 @@
Assert.Multiple(() =>
{
Assert.That(output.Results.OperationalOutputTimeSeries[0].Entries.TimeSerieEntry, Has.Length.EqualTo(2));
- Assert.That(output.Results.OperationalOutputTimeSeries[0].Entries.TimeSerieEntry[0].SafetyFactor, Is.EqualTo(0.7396).Within(tolerance));
- Assert.That(output.Results.OperationalOutputTimeSeries[0].Entries.TimeSerieEntry[1].SafetyFactor, Is.EqualTo(0.6795).Within(tolerance));
- Assert.That(output.Results.OperationalOutputTimeSeries[7].Entries.TimeSerieEntry[0].SafetyFactor, Is.NaN);
- Assert.That(output.Results.OperationalOutputTimeSeries[7].Entries.TimeSerieEntry[1].SafetyFactor, Is.NaN);
+ Assert.That(output.Results.OperationalOutputTimeSeries[0].Entries.TimeSerieEntry[0].Value, Is.EqualTo(0.7396).Within(tolerance));
+ Assert.That(output.Results.OperationalOutputTimeSeries[0].Entries.TimeSerieEntry[1].Value, Is.EqualTo(0.6795).Within(tolerance));
+ Assert.That(output.Results.OperationalOutputTimeSeries[7].Entries.TimeSerieEntry[0].Value, Is.NaN);
+ Assert.That(output.Results.OperationalOutputTimeSeries[7].Entries.TimeSerieEntry[1].Value, Is.NaN);
});
}
}
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs
===================================================================
diff -u -r6088 -r6095
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs (.../FillXmlOutputFromDam.cs) (revision 6088)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs (.../FillXmlOutputFromDam.cs) (revision 6095)
@@ -474,25 +474,25 @@
var timeSerieEntryIndex = 0;
foreach (TimeSerieEntry timestepEntry in damTimeSerie.Entries)
{
- // TimeSerieEntriesTimeSerieEntryStochastValue stochastValue = null;
- // if (timestepEntry.StochastValue != null)
- // {
- // stochastValue = new TimeSerieEntriesTimeSerieEntryStochastValue
- // {
- // Distribution = timestepEntry.StochastValue.Distribution,
- // Mean = timestepEntry.StochastValue.Mean,
- // StandardDeviation = timestepEntry.StochastValue.StandardDeviation
- // };
- // }
+ TimeSerieEntriesTimeSerieEntryStochastValue stochastValue = null;
+ if (timestepEntry.StochastValue != null)
+ {
+ stochastValue = new TimeSerieEntriesTimeSerieEntryStochastValue
+ {
+ Distribution = timestepEntry.StochastValue.Distribution,
+ Mean = timestepEntry.StochastValue.Mean,
+ StandardDeviation = timestepEntry.StochastValue.StandardDeviation
+ };
+ }
var timeStep = new TimeSerieEntriesTimeSerieEntry
{
DateTime = timestepEntry.DateTime,
- SafetyFactor = timestepEntry.Value,
- // BasisFileNameWMF = timestepEntry.BasisFileName,
- // Flagnietechtgebruikt = timestepEntry.Flag,
- // RelativeCalculationPathName = timestepEntry.RelativeCalculationPathName,
- // StochastValue = stochastValue
+ Value = timestepEntry.Value,
+ BasisFileNameWMF = timestepEntry.BasisFileName,
+ Flagnietechtgebruikt = timestepEntry.Flag,
+ RelativeCalculationPathName = timestepEntry.RelativeCalculationPathName,
+ StochastValue = stochastValue
};
outputTimeSerie.Entries.TimeSerieEntry[timeSerieEntryIndex] = timeStep;
timeSerieEntryIndex++;
Index: DamClients/DamLive/trunk/lib/DamEngine/nl-NL/Deltares.DamEngine.Interface.resources.dll
===================================================================
diff -u -r6091 -r6095
Binary files differ
Index: DamClients/DamUI/trunk/lib/DamEngine/nl-NL/Deltares.DamEngine.Interface.resources.dll
===================================================================
diff -u -r6090 -r6095
Binary files differ
Index: DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Calculators.dll
===================================================================
diff -u -r6090 -r6095
Binary files differ
Index: DamClients/DamLive/trunk/lib/DamEngine/Deltares.DamEngine.Interface.dll
===================================================================
diff -u -r6091 -r6095
Binary files differ
Index: DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Calculators.deps.json
===================================================================
diff -u -r6090 -r6095
--- DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Calculators.deps.json (.../Deltares.DamEngine.Calculators.deps.json) (revision 6090)
+++ DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Calculators.deps.json (.../Deltares.DamEngine.Calculators.deps.json) (revision 6095)
@@ -6,9 +6,9 @@
"compilationOptions": {},
"targets": {
".NETCoreApp,Version=v6.0": {
- "Deltares.DamEngine.Calculators/24.1.0.6089": {
+ "Deltares.DamEngine.Calculators/24.1.0.6077": {
"dependencies": {
- "Deltares.DamEngine.Data": "24.1.0.6089",
+ "Deltares.DamEngine.Data": "24.1.0.6077",
"Deltares.StixFileWriter": "24.1.0.118",
"Deltares.DamPiping.BlighCalculator": "23.2.0.4623",
"Deltares.WTIPiping": "24.1.500.10"
@@ -575,11 +575,11 @@
}
},
"System.Threading.Tasks.Extensions/4.5.4": {},
- "Deltares.DamEngine.Data/24.1.0.6089": {
+ "Deltares.DamEngine.Data/24.1.0.6077": {
"runtime": {
"Deltares.DamEngine.Data.dll": {
- "assemblyVersion": "24.1.0.6089",
- "fileVersion": "24.1.0.6089"
+ "assemblyVersion": "24.1.0.6077",
+ "fileVersion": "24.1.0.6077"
}
},
"resources": {
@@ -620,7 +620,7 @@
}
},
"libraries": {
- "Deltares.DamEngine.Calculators/24.1.0.6089": {
+ "Deltares.DamEngine.Calculators/24.1.0.6077": {
"type": "project",
"serviceable": false,
"sha512": ""
@@ -1101,7 +1101,7 @@
"path": "system.threading.tasks.extensions/4.5.4",
"hashPath": "system.threading.tasks.extensions.4.5.4.nupkg.sha512"
},
- "Deltares.DamEngine.Data/24.1.0.6089": {
+ "Deltares.DamEngine.Data/24.1.0.6077": {
"type": "project",
"serviceable": false,
"sha512": ""
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs
===================================================================
diff -u -r6092 -r6095
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs (.../FillDamUiFromXmlOutput.cs) (revision 6092)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs (.../FillDamUiFromXmlOutput.cs) (revision 6095)
@@ -118,25 +118,25 @@
for (var i = 0; i < outputTimeSerie.Entries.TimeSerieEntry.Length; i++)
{
TimeSerieEntriesTimeSerieEntry entry = outputTimeSerie.Entries.TimeSerieEntry[i];
- // Stochast stochastValue = null;
- // if (entry.StochastValue != null)
- // {
- // stochastValue = new Stochast
- // {
- // Distribution = entry.StochastValue.Distribution,
- // Mean = entry.StochastValue.Mean,
- // StandardDeviation = entry.StochastValue.StandardDeviation
- // };
- // }
+ Stochast stochastValue = null;
+ if (entry.StochastValue != null)
+ {
+ stochastValue = new Stochast
+ {
+ Distribution = entry.StochastValue.Distribution,
+ Mean = entry.StochastValue.Mean,
+ StandardDeviation = entry.StochastValue.StandardDeviation
+ };
+ }
var timeSerieEntry = new TimeSerieEntry
{
DateTime = entry.DateTime,
- Value = entry.SafetyFactor,
- // BasisFileName = entry.BasisFileNameWMF,
- // Flag = entry.Flagnietechtgebruikt,
- // RelativeCalculationPathName = entry.RelativeCalculationPathName,
- // StochastValue = stochastValue
+ Value = entry.Value,
+ BasisFileName = entry.BasisFileNameWMF,
+ Flag = entry.Flagnietechtgebruikt,
+ RelativeCalculationPathName = entry.RelativeCalculationPathName,
+ StochastValue = stochastValue
};
timeSerie.Entries.Add(timeSerieEntry);
}
Index: DamClients/DamUI/trunk/lib/DamEngine/nl-NL/Deltares.DamEngine.Data.resources.dll
===================================================================
diff -u -r6090 -r6095
Binary files differ
Index: DamEngine/trunk/src/Deltares.DamEngine.Io/DamOutput.cs
===================================================================
diff -u -r6088 -r6095
--- DamEngine/trunk/src/Deltares.DamEngine.Io/DamOutput.cs (.../DamOutput.cs) (revision 6088)
+++ DamEngine/trunk/src/Deltares.DamEngine.Io/DamOutput.cs (.../DamOutput.cs) (revision 6095)
@@ -9,14 +9,14 @@
//------------------------------------------------------------------------------
//
-// This source code was auto-generated by xsd, Version=4.8.4084.0.
+// This source code was auto-generated by xsd, Version=4.8.3928.0.
//
namespace Deltares.DamEngine.Io.XmlOutput {
using System.Xml.Serialization;
///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -50,7 +50,7 @@
}
///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -59,10 +59,6 @@
private DesignResult[] calculationResultsField;
- private OutputResultsOperationalStaticData operationalStaticDataField;
-
- private OutputResultsOperationalLocationsStaticData operationalLocationsStaticDataField;
-
private TimeSerie[] operationalOutputTimeSeriesField;
private Message[] calculationMessagesField;
@@ -79,27 +75,6 @@
}
///
- public OutputResultsOperationalStaticData OperationalStaticData {
- get {
- return this.operationalStaticDataField;
- }
- set {
- this.operationalStaticDataField = value;
- }
- }
-
- ///
- [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)]
- public OutputResultsOperationalLocationsStaticData OperationalLocationsStaticData {
- get {
- return this.operationalLocationsStaticDataField;
- }
- set {
- this.operationalLocationsStaticDataField = value;
- }
- }
-
- ///
[System.Xml.Serialization.XmlArrayAttribute(IsNullable=true)]
[System.Xml.Serialization.XmlArrayItemAttribute(IsNullable=false)]
public TimeSerie[] OperationalOutputTimeSeries {
@@ -124,7 +99,7 @@
}
///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -234,7 +209,7 @@
}
///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -370,7 +345,7 @@
}
///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -469,7 +444,7 @@
}
///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -503,7 +478,7 @@
}
///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
public enum MessageMessageType {
@@ -519,564 +494,10 @@
}
///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
- public partial class UpliftVanCalculatedSlipPlaneType {
-
- private Point2DType leftCenterField;
-
- private Point2DType rightCenterField;
-
- private double tangentHeightField;
-
- private double safetyFactorField;
-
- ///
- public Point2DType LeftCenter {
- get {
- return this.leftCenterField;
- }
- set {
- this.leftCenterField = value;
- }
- }
-
- ///
- public Point2DType RightCenter {
- get {
- return this.rightCenterField;
- }
- set {
- this.rightCenterField = value;
- }
- }
-
- ///
- [System.Xml.Serialization.XmlAttributeAttribute()]
- public double TangentHeight {
- get {
- return this.tangentHeightField;
- }
- set {
- this.tangentHeightField = value;
- }
- }
-
- ///
- [System.Xml.Serialization.XmlAttributeAttribute()]
- public double SafetyFactor {
- get {
- return this.safetyFactorField;
- }
- set {
- this.safetyFactorField = value;
- }
- }
- }
-
- ///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
- [System.SerializableAttribute()]
- [System.Diagnostics.DebuggerStepThroughAttribute()]
- [System.ComponentModel.DesignerCategoryAttribute("code")]
- public partial class Point2DType {
-
- private double xField;
-
- private double zField;
-
- ///
- [System.Xml.Serialization.XmlAttributeAttribute()]
- public double X {
- get {
- return this.xField;
- }
- set {
- this.xField = value;
- }
- }
-
- ///
- [System.Xml.Serialization.XmlAttributeAttribute()]
- public double Z {
- get {
- return this.zField;
- }
- set {
- this.zField = value;
- }
- }
- }
-
- ///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
- [System.SerializableAttribute()]
- [System.Diagnostics.DebuggerStepThroughAttribute()]
- [System.ComponentModel.DesignerCategoryAttribute("code")]
- public partial class BishopCalculatedSlipPlaneType {
-
- private Point2DType centerField;
-
- private double radiusField;
-
- private double safetyFactorField;
-
- ///
- public Point2DType Center {
- get {
- return this.centerField;
- }
- set {
- this.centerField = value;
- }
- }
-
- ///
- [System.Xml.Serialization.XmlAttributeAttribute()]
- public double Radius {
- get {
- return this.radiusField;
- }
- set {
- this.radiusField = value;
- }
- }
-
- ///
- [System.Xml.Serialization.XmlAttributeAttribute()]
- public double SafetyFactor {
- get {
- return this.safetyFactorField;
- }
- set {
- this.safetyFactorField = value;
- }
- }
- }
-
- ///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
- [System.SerializableAttribute()]
- [System.Diagnostics.DebuggerStepThroughAttribute()]
- [System.ComponentModel.DesignerCategoryAttribute("code")]
- public partial class UpliftVanCalculationGridType {
-
- private CalculationGridType leftGridField;
-
- private CalculationGridType rightGridField;
-
- private double[] tangentLinesField;
-
- ///
- public CalculationGridType LeftGrid {
- get {
- return this.leftGridField;
- }
- set {
- this.leftGridField = value;
- }
- }
-
- ///
- public CalculationGridType RightGrid {
- get {
- return this.rightGridField;
- }
- set {
- this.rightGridField = value;
- }
- }
-
- ///
- [System.Xml.Serialization.XmlArrayItemAttribute("BoundaryHeight", IsNullable=false)]
- public double[] TangentLines {
- get {
- return this.tangentLinesField;
- }
- set {
- this.tangentLinesField = value;
- }
- }
- }
-
- ///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
- [System.SerializableAttribute()]
- [System.Diagnostics.DebuggerStepThroughAttribute()]
- [System.ComponentModel.DesignerCategoryAttribute("code")]
- public partial class CalculationGridType {
-
- private double gridXLeftField;
-
- private double gridXRightField;
-
- private double gridZTopField;
-
- private double gridZBottomField;
-
- private int gridXNumberField;
-
- private int gridZNumberField;
-
- ///
- [System.Xml.Serialization.XmlAttributeAttribute()]
- public double GridXLeft {
- get {
- return this.gridXLeftField;
- }
- set {
- this.gridXLeftField = value;
- }
- }
-
- ///
- [System.Xml.Serialization.XmlAttributeAttribute()]
- public double GridXRight {
- get {
- return this.gridXRightField;
- }
- set {
- this.gridXRightField = value;
- }
- }
-
- ///
- [System.Xml.Serialization.XmlAttributeAttribute()]
- public double GridZTop {
- get {
- return this.gridZTopField;
- }
- set {
- this.gridZTopField = value;
- }
- }
-
- ///
- [System.Xml.Serialization.XmlAttributeAttribute()]
- public double GridZBottom {
- get {
- return this.gridZBottomField;
- }
- set {
- this.gridZBottomField = value;
- }
- }
-
- ///
- [System.Xml.Serialization.XmlAttributeAttribute()]
- public int GridXNumber {
- get {
- return this.gridXNumberField;
- }
- set {
- this.gridXNumberField = value;
- }
- }
-
- ///
- [System.Xml.Serialization.XmlAttributeAttribute()]
- public int GridZNumber {
- get {
- return this.gridZNumberField;
- }
- set {
- this.gridZNumberField = value;
- }
- }
- }
-
- ///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
- [System.SerializableAttribute()]
- [System.Diagnostics.DebuggerStepThroughAttribute()]
- [System.ComponentModel.DesignerCategoryAttribute("code")]
- public partial class BishopCalculationGridType {
-
- private CalculationGridType gridField;
-
- private double[] tangentLinesField;
-
- private bool useFixedPointField;
-
- private double fixedPointXField;
-
- private bool fixedPointXFieldSpecified;
-
- private double fixedPointZField;
-
- private bool fixedPointZFieldSpecified;
-
- ///
- public CalculationGridType Grid {
- get {
- return this.gridField;
- }
- set {
- this.gridField = value;
- }
- }
-
- ///
- [System.Xml.Serialization.XmlArrayItemAttribute("BoundaryHeight", IsNullable=false)]
- public double[] TangentLines {
- get {
- return this.tangentLinesField;
- }
- set {
- this.tangentLinesField = value;
- }
- }
-
- ///
- [System.Xml.Serialization.XmlAttributeAttribute()]
- public bool UseFixedPoint {
- get {
- return this.useFixedPointField;
- }
- set {
- this.useFixedPointField = value;
- }
- }
-
- ///
- [System.Xml.Serialization.XmlAttributeAttribute()]
- public double FixedPointX {
- get {
- return this.fixedPointXField;
- }
- set {
- this.fixedPointXField = value;
- }
- }
-
- ///
- [System.Xml.Serialization.XmlIgnoreAttribute()]
- public bool FixedPointXSpecified {
- get {
- return this.fixedPointXFieldSpecified;
- }
- set {
- this.fixedPointXFieldSpecified = value;
- }
- }
-
- ///
- [System.Xml.Serialization.XmlAttributeAttribute()]
- public double FixedPointZ {
- get {
- return this.fixedPointZField;
- }
- set {
- this.fixedPointZField = value;
- }
- }
-
- ///
- [System.Xml.Serialization.XmlIgnoreAttribute()]
- public bool FixedPointZSpecified {
- get {
- return this.fixedPointZFieldSpecified;
- }
- set {
- this.fixedPointZFieldSpecified = value;
- }
- }
- }
-
- ///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
- [System.SerializableAttribute()]
- [System.Diagnostics.DebuggerStepThroughAttribute()]
- [System.ComponentModel.DesignerCategoryAttribute("code")]
- public partial class WaternetLineType {
-
- private Point2DType[] pointsField;
-
- private string nameField;
-
- ///
- [System.Xml.Serialization.XmlArrayItemAttribute("Point", IsNullable=false)]
- public Point2DType[] Points {
- get {
- return this.pointsField;
- }
- set {
- this.pointsField = value;
- }
- }
-
- ///
- [System.Xml.Serialization.XmlAttributeAttribute()]
- public string Name {
- get {
- return this.nameField;
- }
- set {
- this.nameField = value;
- }
- }
- }
-
- ///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
- [System.SerializableAttribute()]
- [System.Diagnostics.DebuggerStepThroughAttribute()]
- [System.ComponentModel.DesignerCategoryAttribute("code")]
- public partial class HeadLineType {
-
- private WaternetLineType waternetLineField;
-
- private int keyField;
-
- ///
- public WaternetLineType WaternetLine {
- get {
- return this.waternetLineField;
- }
- set {
- this.waternetLineField = value;
- }
- }
-
- ///
- [System.Xml.Serialization.XmlAttributeAttribute()]
- public int Key {
- get {
- return this.keyField;
- }
- set {
- this.keyField = value;
- }
- }
- }
-
- ///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
- [System.SerializableAttribute()]
- [System.Diagnostics.DebuggerStepThroughAttribute()]
- [System.ComponentModel.DesignerCategoryAttribute("code")]
- public partial class WaternetType {
-
- private HeadLineType phreaticLineField;
-
- private HeadLineType[] headLinesField;
-
- private WaternetTypeWaternetLine[] waternetLinesField;
-
- private string nameField;
-
- private double unitWeightWaterField;
-
- private bool unitWeightWaterFieldSpecified;
-
- ///
- public HeadLineType PhreaticLine {
- get {
- return this.phreaticLineField;
- }
- set {
- this.phreaticLineField = value;
- }
- }
-
- ///
- [System.Xml.Serialization.XmlArrayItemAttribute("HeadLine", IsNullable=false)]
- public HeadLineType[] HeadLines {
- get {
- return this.headLinesField;
- }
- set {
- this.headLinesField = value;
- }
- }
-
- ///
- [System.Xml.Serialization.XmlArrayItemAttribute("WaternetLine", IsNullable=false)]
- public WaternetTypeWaternetLine[] WaternetLines {
- get {
- return this.waternetLinesField;
- }
- set {
- this.waternetLinesField = value;
- }
- }
-
- ///
- [System.Xml.Serialization.XmlAttributeAttribute()]
- public string Name {
- get {
- return this.nameField;
- }
- set {
- this.nameField = value;
- }
- }
-
- ///
- [System.Xml.Serialization.XmlAttributeAttribute()]
- public double UnitWeightWater {
- get {
- return this.unitWeightWaterField;
- }
- set {
- this.unitWeightWaterField = value;
- }
- }
-
- ///
- [System.Xml.Serialization.XmlIgnoreAttribute()]
- public bool UnitWeightWaterSpecified {
- get {
- return this.unitWeightWaterFieldSpecified;
- }
- set {
- this.unitWeightWaterFieldSpecified = value;
- }
- }
- }
-
- ///
- [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 WaternetTypeWaternetLine : WaternetLineType {
-
- private int associatedHeadLineField;
-
- private bool associatedHeadLineFieldSpecified;
-
- ///
- [System.Xml.Serialization.XmlAttributeAttribute()]
- public int AssociatedHeadLine {
- get {
- return this.associatedHeadLineField;
- }
- set {
- this.associatedHeadLineField = value;
- }
- }
-
- ///
- [System.Xml.Serialization.XmlIgnoreAttribute()]
- public bool AssociatedHeadLineSpecified {
- get {
- return this.associatedHeadLineFieldSpecified;
- }
- set {
- this.associatedHeadLineFieldSpecified = value;
- }
- }
- }
-
- ///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
- [System.SerializableAttribute()]
- [System.Diagnostics.DebuggerStepThroughAttribute()]
- [System.ComponentModel.DesignerCategoryAttribute("code")]
public partial class TimeSerie {
private TimeSerieTimeStep timeStepField;
@@ -1326,7 +747,7 @@
}
///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1400,7 +821,7 @@
}
///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1422,257 +843,176 @@
}
///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
[System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
public partial class TimeSerieEntriesTimeSerieEntry {
- private WaternetType waternetField;
+ private TimeSerieEntriesTimeSerieEntryStochastValue stochastValueField;
- private BishopCalculationGridType bishopCalculationGridField;
-
- private UpliftVanCalculationGridType upliftVanCalculationGridField;
-
- private BishopCalculatedSlipPlaneType bishopCalculatedSlipPlaneField;
-
- private UpliftVanCalculatedSlipPlaneType upliftVanCalculatedSlipPlaneField;
-
private System.DateTime dateTimeField;
- private double safetyFactorField;
+ private double valueField;
- private bool isUpliftField;
+ private int flagnietechtgebruiktField;
- private bool isUpliftFieldSpecified;
+ private string basisFileNameWMFField;
- ///
- public WaternetType Waternet {
- get {
- return this.waternetField;
- }
- set {
- this.waternetField = value;
- }
- }
+ private string relativeCalculationPathNameField;
///
- public BishopCalculationGridType BishopCalculationGrid {
+ public TimeSerieEntriesTimeSerieEntryStochastValue StochastValue {
get {
- return this.bishopCalculationGridField;
+ return this.stochastValueField;
}
set {
- this.bishopCalculationGridField = value;
+ this.stochastValueField = value;
}
}
///
- public UpliftVanCalculationGridType UpliftVanCalculationGrid {
+ [System.Xml.Serialization.XmlAttributeAttribute()]
+ public System.DateTime DateTime {
get {
- return this.upliftVanCalculationGridField;
+ return this.dateTimeField;
}
set {
- this.upliftVanCalculationGridField = value;
+ this.dateTimeField = value;
}
}
///
- public BishopCalculatedSlipPlaneType BishopCalculatedSlipPlane {
+ [System.Xml.Serialization.XmlAttributeAttribute()]
+ public double Value {
get {
- return this.bishopCalculatedSlipPlaneField;
+ return this.valueField;
}
set {
- this.bishopCalculatedSlipPlaneField = value;
+ this.valueField = value;
}
}
///
- public UpliftVanCalculatedSlipPlaneType UpliftVanCalculatedSlipPlane {
+ [System.Xml.Serialization.XmlAttributeAttribute("Flag-nietechtgebruikt")]
+ public int Flagnietechtgebruikt {
get {
- return this.upliftVanCalculatedSlipPlaneField;
+ return this.flagnietechtgebruiktField;
}
set {
- this.upliftVanCalculatedSlipPlaneField = value;
+ this.flagnietechtgebruiktField = value;
}
}
///
[System.Xml.Serialization.XmlAttributeAttribute()]
- public System.DateTime DateTime {
+ public string BasisFileNameWMF {
get {
- return this.dateTimeField;
+ return this.basisFileNameWMFField;
}
set {
- this.dateTimeField = value;
+ this.basisFileNameWMFField = value;
}
}
///
[System.Xml.Serialization.XmlAttributeAttribute()]
- public double SafetyFactor {
+ public string RelativeCalculationPathName {
get {
- return this.safetyFactorField;
+ return this.relativeCalculationPathNameField;
}
set {
- this.safetyFactorField = value;
+ this.relativeCalculationPathNameField = value;
}
}
-
- ///
- [System.Xml.Serialization.XmlAttributeAttribute()]
- public bool IsUplift {
- get {
- return this.isUpliftField;
- }
- set {
- this.isUpliftField = value;
- }
- }
-
- ///
- [System.Xml.Serialization.XmlIgnoreAttribute()]
- public bool IsUpliftSpecified {
- get {
- return this.isUpliftFieldSpecified;
- }
- set {
- this.isUpliftFieldSpecified = value;
- }
- }
}
///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
- public partial class OperationalStaticData {
+ [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
+ public partial class TimeSerieEntriesTimeSerieEntryStochastValue {
- private OperationalStaticDataFailureMechanismSystemType failureMechanismSystemTypeField;
+ private double meanField;
- private bool failureMechanismSystemTypeFieldSpecified;
+ private double standardDeviationField;
- private OperationalStaticDataStabilityModel stabilityModelField;
+ private int distributionField;
- private bool stabilityModelFieldSpecified;
-
- private OperationalStaticDataSearchAlgorithm searchAlgorithmField;
-
- private bool searchAlgorithmFieldSpecified;
-
///
[System.Xml.Serialization.XmlAttributeAttribute()]
- public OperationalStaticDataFailureMechanismSystemType FailureMechanismSystemType {
+ public double Mean {
get {
- return this.failureMechanismSystemTypeField;
+ return this.meanField;
}
set {
- this.failureMechanismSystemTypeField = value;
+ this.meanField = value;
}
}
///
- [System.Xml.Serialization.XmlIgnoreAttribute()]
- public bool FailureMechanismSystemTypeSpecified {
+ [System.Xml.Serialization.XmlAttributeAttribute()]
+ public double StandardDeviation {
get {
- return this.failureMechanismSystemTypeFieldSpecified;
+ return this.standardDeviationField;
}
set {
- this.failureMechanismSystemTypeFieldSpecified = value;
+ this.standardDeviationField = value;
}
}
///
[System.Xml.Serialization.XmlAttributeAttribute()]
- public OperationalStaticDataStabilityModel StabilityModel {
+ public int Distribution {
get {
- return this.stabilityModelField;
+ return this.distributionField;
}
set {
- this.stabilityModelField = value;
+ this.distributionField = value;
}
}
+ }
+
+ ///
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+ [System.SerializableAttribute()]
+ [System.Diagnostics.DebuggerStepThroughAttribute()]
+ [System.ComponentModel.DesignerCategoryAttribute("code")]
+ public partial class Point2DType {
- ///
- [System.Xml.Serialization.XmlIgnoreAttribute()]
- public bool StabilityModelSpecified {
- get {
- return this.stabilityModelFieldSpecified;
- }
- set {
- this.stabilityModelFieldSpecified = value;
- }
- }
+ private double xField;
+ private double zField;
+
///
[System.Xml.Serialization.XmlAttributeAttribute()]
- public OperationalStaticDataSearchAlgorithm SearchAlgorithm {
+ public double X {
get {
- return this.searchAlgorithmField;
+ return this.xField;
}
set {
- this.searchAlgorithmField = value;
+ this.xField = value;
}
}
///
- [System.Xml.Serialization.XmlIgnoreAttribute()]
- public bool SearchAlgorithmSpecified {
+ [System.Xml.Serialization.XmlAttributeAttribute()]
+ public double Z {
get {
- return this.searchAlgorithmFieldSpecified;
+ return this.zField;
}
set {
- this.searchAlgorithmFieldSpecified = value;
+ this.zField = value;
}
}
}
///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
[System.SerializableAttribute()]
- [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
- public enum OperationalStaticDataFailureMechanismSystemType {
-
- ///
- StabilityInside,
-
- ///
- StabilityOutside,
- }
-
- ///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
- [System.SerializableAttribute()]
- [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
- public enum OperationalStaticDataStabilityModel {
-
- ///
- Bishop,
-
- ///
- UpliftVan,
-
- ///
- BishopUpliftVan,
- }
-
- ///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
- [System.SerializableAttribute()]
- [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
- public enum OperationalStaticDataSearchAlgorithm {
-
- ///
- Grid,
-
- ///
- Beeswarm,
- }
-
- ///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
- [System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
public partial class SliceType {
@@ -2520,7 +1860,7 @@
}
///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
[System.SerializableAttribute()]
public enum ShearStrengthModelType {
@@ -2538,7 +1878,7 @@
[System.Xml.Serialization.XmlIncludeAttribute(typeof(SlidingPlaneMinimumSafetyCurveType))]
[System.Xml.Serialization.XmlIncludeAttribute(typeof(DualSlidingCircleMinimumSafetyCurveType))]
[System.Xml.Serialization.XmlIncludeAttribute(typeof(SlidingCircleMinimumSafetyCurveType))]
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2572,7 +1912,7 @@
}
///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2581,7 +1921,7 @@
}
///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2602,7 +1942,7 @@
}
///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2983,7 +2323,7 @@
}
///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3301,7 +2641,7 @@
}
///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3335,7 +2675,7 @@
}
///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3383,7 +2723,7 @@
}
///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
public enum DesignResultStabilityDesignResultsStabilityModelType {
@@ -3399,7 +2739,7 @@
}
///
- [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4041,156 +3381,4 @@
}
}
}
-
- ///
- [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 OutputResultsOperationalStaticData {
-
- private OperationalStaticData operationalStaticDataField;
-
- ///
- public OperationalStaticData OperationalStaticData {
- get {
- return this.operationalStaticDataField;
- }
- set {
- this.operationalStaticDataField = value;
- }
- }
- }
-
- ///
- [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 OutputResultsOperationalLocationsStaticData {
-
- private OutputResultsOperationalLocationsStaticDataOperationalLocationStaticData[] operationalLocationStaticDataField;
-
- ///
- [System.Xml.Serialization.XmlElementAttribute("OperationalLocationStaticData")]
- public OutputResultsOperationalLocationsStaticDataOperationalLocationStaticData[] OperationalLocationStaticData {
- get {
- return this.operationalLocationStaticDataField;
- }
- set {
- this.operationalLocationStaticDataField = value;
- }
- }
- }
-
- ///
- [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 OutputResultsOperationalLocationsStaticDataOperationalLocationStaticData {
-
- private TrafficLoadTypeTrafficLoad[] trafficLoadField;
-
- ///
- [System.Xml.Serialization.XmlArrayItemAttribute("TrafficLoad", IsNullable=false)]
- public TrafficLoadTypeTrafficLoad[] TrafficLoad {
- get {
- return this.trafficLoadField;
- }
- set {
- this.trafficLoadField = value;
- }
- }
- }
-
- ///
- [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 TrafficLoadTypeTrafficLoad {
-
- private int keyField;
-
- private double magnitudeField;
-
- private double distributionAngleField;
-
- private string loadTypeField;
-
- private double xStartField;
-
- private double xEndField;
-
- ///
- [System.Xml.Serialization.XmlAttributeAttribute()]
- public int Key {
- get {
- return this.keyField;
- }
- set {
- this.keyField = value;
- }
- }
-
- ///
- [System.Xml.Serialization.XmlAttributeAttribute()]
- public double Magnitude {
- get {
- return this.magnitudeField;
- }
- set {
- this.magnitudeField = value;
- }
- }
-
- ///
- [System.Xml.Serialization.XmlAttributeAttribute()]
- public double DistributionAngle {
- get {
- return this.distributionAngleField;
- }
- set {
- this.distributionAngleField = value;
- }
- }
-
- ///
- [System.Xml.Serialization.XmlAttributeAttribute()]
- public string LoadType {
- get {
- return this.loadTypeField;
- }
- set {
- this.loadTypeField = value;
- }
- }
-
- ///
- [System.Xml.Serialization.XmlAttributeAttribute()]
- public double XStart {
- get {
- return this.xStartField;
- }
- set {
- this.xStartField = value;
- }
- }
-
- ///
- [System.Xml.Serialization.XmlAttributeAttribute()]
- public double XEnd {
- get {
- return this.xEndField;
- }
- set {
- this.xEndField = value;
- }
- }
- }
}
Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillDamUiFromXmlOutputTests.cs
===================================================================
diff -u -r6092 -r6095
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillDamUiFromXmlOutputTests.cs (.../FillDamUiFromXmlOutputTests.cs) (revision 6092)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillDamUiFromXmlOutputTests.cs (.../FillDamUiFromXmlOutputTests.cs) (revision 6095)
@@ -274,8 +274,8 @@
{
DateTime = new DateTime(2012, 12, 31, 1, j * 10, 0),
Value = 1 + j * 0.1,
- // Flag = 1,
- // BasisFileName = String.Format("BasisFileName{0}", i)
+ Flag = 1,
+ BasisFileName = String.Format("BasisFileName{0}", i)
});
}
}