Index: dam engine/trunk/Xsds Liquid/DamDesignResult.xsd
===================================================================
diff -u -r388 -r394
--- dam engine/trunk/Xsds Liquid/DamDesignResult.xsd	(.../DamDesignResult.xsd)	(revision 388)
+++ dam engine/trunk/Xsds Liquid/DamDesignResult.xsd	(.../DamDesignResult.xsd)	(revision 394)
@@ -2,159 +2,84 @@
 <!-- Created with Liquid XML Studio 1.0.8.0 (http://www.liquid-technologies.com) -->
 <xs:schema elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <xs:complexType name="DesignResult">
-    <xs:attribute name="NumberOfIterations" type="xs:int" />
-    <xs:attribute name="ResultFileName" type="xs:string" />
-    <xs:attribute name="InputFileName" type="xs:string" />
-    <xs:attribute name="AnalysisType">
-      <xs:simpleType>
-        <xs:restriction base="xs:string">
-          <xs:enumeration value="NoAdaption" />
-          <xs:enumeration value="AdaptGeometry" />
-          <xs:enumeration value="AdaptNWO" />
-        </xs:restriction>
-      </xs:simpleType>
-    </xs:attribute>
-    <xs:attribute name="ProbabilisticType">
-      <xs:simpleType>
-        <xs:restriction base="xs:string">
-          <xs:enumeration value="Deterministic" />
-          <xs:enumeration value="Probabilistic" />
-          <xs:enumeration value="ProbabilisticFragility" />
-        </xs:restriction>
-      </xs:simpleType>
-    </xs:attribute>
-    <xs:attribute name="DamFailureMechanismeCalculation-niettoch" />
-    <xs:attribute name="DikeName" type="xs:string" />
-    <xs:attribute name="ScenarioName" type="xs:string" />
-    <xs:attribute name="LocationName" type="xs:string" />
-    <xs:attribute name="LocationScenarioCount" type="xs:int" />
-    <xs:attribute name="ScenarioDefinitionName" type="xs:string" />
-    <xs:attribute name="CalculationResult">
-      <xs:simpleType>
-        <xs:restriction base="xs:string">
-          <xs:enumeration value="NoRun" />
-          <xs:enumeration value="Succeeded" />
-          <xs:enumeration value="NoInput" />
-          <xs:enumeration value="NoLicense" />
-          <xs:enumeration value="UserAbort" />
-          <xs:enumeration value="InvalidInputStructure" />
-          <xs:enumeration value="InvalidInputData" />
-          <xs:enumeration value="RunFailed" />
-          <xs:enumeration value="UnexpectedError" />
-        </xs:restriction>
-      </xs:simpleType>
-    </xs:attribute>
-    <xs:attribute name="ResultMessage" type="xs:string" />
+    <xs:sequence>
+      <xs:element minOccurs="0" maxOccurs="1" name="NwoResults">
+        <xs:complexType>
+          <xs:attribute name="NumberOfIterations" type="xs:int" />
+          <xs:attribute name="StabilitySafetyFactor" type="xs:double" use="optional" />
+          <xs:attribute name="Zone1SafetyFactorStability" type="xs:double" use="optional" />
+          <xs:attribute name="LocalZone1EntryPointX" type="xs:double" use="optional" />
+          <xs:attribute name="LocalZone1ExitPointX" type="xs:double" use="optional" />
+          <xs:attribute name="Zone2SafetyFactorStability" type="xs:double" use="optional" />
+          <xs:attribute name="LocalZone2EntryPointX" type="xs:double" use="optional" />
+          <xs:attribute name="LocalZone2ExitPointX" type="xs:double" use="optional" />
+          <xs:attribute name="NwoId" type="xs:string" />
+          <xs:attribute name="ResultIndex" type="xs:int" />
+          <xs:attribute name="LocationXrdStart" type="xs:double" use="optional" />
+          <xs:attribute name="LocationYrdStart" type="xs:double" use="optional" />
+          <xs:attribute name="LocationZrdStart" type="xs:double" use="optional" />
+          <xs:attribute name="LocationXrdEnd" type="xs:double" use="optional" />
+          <xs:attribute name="LocationYrdEnd" type="xs:double" use="optional" />
+          <xs:attribute name="LocationZrdEnd" type="xs:double" use="optional" />
+        </xs:complexType>
+      </xs:element>
+      <xs:element minOccurs="0" maxOccurs="1" name="StabilityResults">
+        <xs:complexType>
+          <xs:attribute name="ResultMessage" type="xs:string" />
+          <xs:attribute name="RedesignedSurfaceLine2Stability" />
+          <xs:attribute name="StabilitySafetyFactor" type="xs:double" use="optional" />
+          <xs:attribute name="StabilityFailureProbability" type="xs:double" use="optional" />
+          <xs:attribute name="Zone1SafetyFactorStability" type="xs:double" use="optional" />
+          <xs:attribute name="LocalZone1EntryPointX" type="xs:double" use="optional" />
+          <xs:attribute name="LocalZone1ExitPointX" type="xs:double" use="optional" />
+          <xs:attribute name="Zone2SafetyFactorStability" type="xs:double" use="optional" />
+          <xs:attribute name="LocalZone2EntryPointX" type="xs:double" use="optional" />
+          <xs:attribute name="LocalZone2ExitPointX" type="xs:double" use="optional" />
+          <xs:attribute name="IsUplift" type="xs:boolean" use="optional" />
+          <xs:attribute name="Pl3MinUplift" type="xs:double" use="optional" />
+          <xs:attribute name="Pl3HeadAdjusted" type="xs:double" use="optional" />
+          <xs:attribute name="Pl3LocalLocationXMinUplift" type="xs:double" use="optional" />
+          <xs:attribute name="Pl4MinUplift" type="xs:double" use="optional" />
+          <xs:attribute name="Pl4HeadAdjusted" type="xs:double" use="optional" />
+          <xs:attribute name="Pl4LocalLocationXMinUplift" type="xs:double" use="optional" />
+        </xs:complexType>
+      </xs:element>
+      <xs:element minOccurs="0" maxOccurs="1" name="PipingResults">
+        <xs:complexType>
+          <xs:attribute name="ResultMessage" type="xs:string" />
+          <xs:attribute name="RedesignedSurfaceLine2Piping" />
+          <xs:attribute name="PipingFailureProbability" type="xs:double" use="optional" />
+          <xs:attribute name="IsUplift" type="xs:boolean" use="optional" />
+          <xs:attribute name="Pl3MinUplift" type="xs:double" use="optional" />
+          <xs:attribute name="Pl3HeadAdjusted" type="xs:double" use="optional" />
+          <xs:attribute name="Pl3LocalLocationXMinUplift" type="xs:double" use="optional" />
+          <xs:attribute name="Pl4MinUplift" type="xs:double" use="optional" />
+          <xs:attribute name="Pl4HeadAdjusted" type="xs:double" use="optional" />
+          <xs:attribute name="Pl4LocalLocationXMinUplift" type="xs:double" use="optional" />
+          <xs:attribute name="UpliftFactor" type="xs:double" use="optional" />
+          <xs:attribute name="HeaveFactor" type="xs:double" use="optional" />
+          <xs:attribute name="BlighPipingFactor" type="xs:double" use="optional" />
+          <xs:attribute name="BlighHCritical" type="xs:double" use="optional" />
+          <xs:attribute name="Sellmeijer2ForcesPipingFactor" type="xs:double" use="optional" />
+          <xs:attribute name="Sellmeijer2ForcesHCritical" type="xs:double" use="optional" />
+          <xs:attribute name="Sellmeijer4ForcesPipingFactor" type="xs:double" use="optional" />
+          <xs:attribute name="Sellmeijer4ForcesHCritical" type="xs:double" use="optional" />
+          <xs:attribute name="SellmeijerPipingFactor" type="xs:double" use="optional" />
+          <xs:attribute name="SellmeijerHCritical" type="xs:double" use="optional" />
+          <xs:attribute name="Wti2017PipingFactor" type="xs:double" use="optional" />
+          <xs:attribute name="Wti2017HCritical" type="xs:double" use="optional" />
+          <xs:attribute name="LocalPipingExitPointX" type="xs:double" use="optional" />
+        </xs:complexType>
+      </xs:element>
+      <xs:element name="FlowSlide">
+        <xs:complexType>
+          <xs:attribute name="FlowSlideSafetyFactor" type="xs:double" use="optional" />
+        </xs:complexType>
+      </xs:element>
+    </xs:sequence>
+    <xs:attribute name="Id" type="xs:string" />
     <xs:attribute name="Xrd" type="xs:double" />
     <xs:attribute name="Yrd" type="xs:double" />
-    <xs:attribute name="LocationScenarioId" type="xs:string" />
-    <xs:attribute name="RiverLevel" type="xs:double" use="optional" />
-    <xs:attribute name="RiverLevelLow" type="xs:double" use="optional" />
-    <xs:attribute name="DikeTableHeight" type="xs:double" use="optional" />
-    <xs:attribute name="SlopeDampingPiezometricHeightPolderSide" type="xs:double" use="optional" />
-    <xs:attribute name="CurrentDikeHeight" type="xs:double" use="optional" />
-    <xs:attribute name="CurrentDikeToeAtPolderX" type="xs:double" use="optional" />
-    <xs:attribute name="CurrentDikeToeAtPolderZ" type="xs:double" use="optional" />
-    <xs:attribute name="StabilityProfileName" type="xs:string" />
-    <xs:attribute name="StabilityProfileProbability" type="xs:double" use="optional" />
-    <xs:attribute name="PipingProfileName" type="xs:string" />
-    <xs:attribute name="PipingProfileProbability" type="xs:double" use="optional" />
-    <xs:attribute name="CurrentDikeLength" type="xs:double" use="optional" />
-    <xs:attribute name="StabilityToeAtPolderX" type="xs:double" use="optional" />
-    <xs:attribute name="StabilityToeAtPolderZ" type="xs:double" use="optional" />
-    <xs:attribute name="StabilityShoulderHeight" type="xs:double" use="optional" />
-    <xs:attribute name="StabilitySafetyFactor" type="xs:double" use="optional" />
-    <xs:attribute name="StabilityFailureProbability" type="xs:double" use="optional" />
-    <xs:attribute name="RequiredSafetyFactorStabilityInnerSlope" type="xs:double" use="optional" />
-    <xs:attribute name="RequiredSafetyFactorStabilityOuterSlope" type="xs:double" use="optional" />
-    <xs:attribute name="RequiredSafetyFactorPiping" type="xs:double" use="optional" />
-    <xs:attribute name="PipingToeAtPolderX" type="xs:double" use="optional" />
-    <xs:attribute name="PipingToeAtPolderZ" type="xs:double" use="optional" />
-    <xs:attribute name="PipingShoulderHeight" type="xs:double" use="optional" />
-    <xs:attribute name="PipingFailureProbability" type="xs:double" use="optional" />
-    <xs:attribute name="RequiredFailureProbabilityPiping" type="xs:double" use="optional" />
-    <xs:attribute name="DikeLength" type="xs:double" use="optional" />
-    <xs:attribute name="Zone1SafetyFactorStability" type="xs:double" use="optional" />
-    <xs:attribute name="LocalZone1EntryPointX" type="xs:double" use="optional" />
-    <xs:attribute name="Zone1EntryPointX" type="xs:double" use="optional" />
-    <xs:attribute name="Zone1EntryPointY" type="xs:double" use="optional" />
-    <xs:attribute name="Zone1EntryPointZ" type="xs:double" use="optional" />
-    <xs:attribute name="LocalZone1ExitPointX" type="xs:double" use="optional" />
-    <xs:attribute name="Zone1ExitPointX" type="xs:double" use="optional" />
-    <xs:attribute name="Zone1ExitPointY" type="xs:double" use="optional" />
-    <xs:attribute name="Zone1ExitPointZ" type="xs:double" use="optional" />
-    <xs:attribute name="Zone2SafetyFactorStability" type="xs:double" use="optional" />
-    <xs:attribute name="LocalZone2EntryPointX" type="xs:double" use="optional" />
-    <xs:attribute name="Zone2EntryPointX" type="xs:double" use="optional" />
-    <xs:attribute name="Zone2EntryPointY" type="xs:double" use="optional" />
-    <xs:attribute name="Zone2EntryPointZ" type="xs:double" use="optional" />
-    <xs:attribute name="LocalZone2ExitPointX" type="xs:double" use="optional" />
-    <xs:attribute name="Zone2ExitPointX" type="xs:double" use="optional" />
-    <xs:attribute name="Zone2ExitPointY" type="xs:double" use="optional" />
-    <xs:attribute name="Zone2ExitPointZ" type="xs:double" use="optional" />
-    <xs:attribute name="IsUplift" type="xs:boolean" use="optional" />
-    <xs:attribute name="Pl3MinUplift" type="xs:double" use="optional" />
-    <xs:attribute name="Pl3HeadAdjusted" type="xs:double" use="optional" />
-    <xs:attribute name="Pl3LocalLocationXMinUplift" type="xs:double" use="optional" />
-    <xs:attribute name="Pl3LocationXMinUplift" type="xs:double" use="optional" />
-    <xs:attribute name="Pl3LocationYMinUplift" type="xs:double" use="optional" />
-    <xs:attribute name="Pl4MinUplift" type="xs:double" use="optional" />
-    <xs:attribute name="Pl4HeadAdjusted" type="xs:double" use="optional" />
-    <xs:attribute name="Pl4LocalLocationXMinUplift" type="xs:double" use="optional" />
-    <xs:attribute name="Pl4LocationXMinUplift" type="xs:double" use="optional" />
-    <xs:attribute name="Pl4LocationYMinUplift" type="xs:double" use="optional" />
-    <xs:attribute name="UpliftFactor" type="xs:double" use="optional" />
-    <xs:attribute name="HeaveFactor" type="xs:double" use="optional" />
-    <xs:attribute name="BlighPipingFactor" type="xs:double" use="optional" />
-    <xs:attribute name="BlighHCritical" type="xs:double" use="optional" />
-    <xs:attribute name="Sellmeijer2ForcesPipingFactor" type="xs:double" use="optional" />
-    <xs:attribute name="Sellmeijer2ForcesHCritical" type="xs:double" use="optional" />
-    <xs:attribute name="Sellmeijer4ForcesPipingFactor" type="xs:double" use="optional" />
-    <xs:attribute name="Sellmeijer4ForcesHCritical" type="xs:double" use="optional" />
-    <xs:attribute name="SellmeijerPipingFactor" type="xs:double" use="optional" />
-    <xs:attribute name="SellmeijerHCritical" type="xs:double" use="optional" />
-    <xs:attribute name="Wti2017PipingFactor" type="xs:double" use="optional" />
-    <xs:attribute name="Wti2017HCritical" type="xs:double" use="optional" />
-    <xs:attribute name="NwoId" type="xs:string" />
-    <xs:attribute name="NwoResultIndex" type="xs:int" />
-    <xs:attribute name="NWOLocationXrdStart" type="xs:double" use="optional" />
-    <xs:attribute name="NWOLocationYrdStart" type="xs:double" use="optional" />
-    <xs:attribute name="NWOLocationZrdStart" type="xs:double" use="optional" />
-    <xs:attribute name="NWOLocationXrdEnd" type="xs:double" use="optional" />
-    <xs:attribute name="NWOLocationYrdEnd" type="xs:double" use="optional" />
-    <xs:attribute name="NWOLocationZrdEnd" type="xs:double" use="optional" />
-    <xs:attribute name="DikeToeAtRiverXrd" type="xs:double" use="optional" />
-    <xs:attribute name="DikeToeAtRiverYrd" type="xs:double" use="optional" />
-    <xs:attribute name="DikeToeAtRiverZrd" type="xs:double" use="optional" />
-    <xs:attribute name="DikeTopAtRiverXrd" type="xs:double" use="optional" />
-    <xs:attribute name="DikeTopAtRiverYrd" type="xs:double" use="optional" />
-    <xs:attribute name="DikeTopAtRiverZrd" type="xs:double" use="optional" />
-    <xs:attribute name="DikeTopAtPolderXrd" type="xs:double" use="optional" />
-    <xs:attribute name="DikeTopAtPolderYrd" type="xs:double" use="optional" />
-    <xs:attribute name="DikeTopAtPolderZrd" type="xs:double" use="optional" />
-    <xs:attribute name="DikeToeAtPolderXrd" type="xs:double" use="optional" />
-    <xs:attribute name="DikeToeAtPolderYrd" type="xs:double" use="optional" />
-    <xs:attribute name="DikeToeAtPolderZrd" type="xs:double" use="optional" />
-    <xs:attribute name="FlowSlideSafetyFactor" type="xs:double" use="optional" />
-    <xs:attribute name="StabilityModel" use="optional">
-      <xs:simpleType>
-        <xs:restriction base="xs:string">
-          <xs:enumeration value="Bishop" />
-          <xs:enumeration value="Spencer" />
-          <xs:enumeration value="Fellenius" />
-          <xs:enumeration value="UpliftVan" />
-          <xs:enumeration value="UpliftSpencer" />
-          <xs:enumeration value="BishopRandomField" />
-          <xs:enumeration value="HorizontalBalance" />
-          <xs:enumeration value="BishopUpliftVan" />
-          <xs:enumeration value="SpencerHigh" />
-          <xs:enumeration value="SpencerLow" />
-        </xs:restriction>
-      </xs:simpleType>
-    </xs:attribute>
-    <xs:attribute name="LocalPipingExitPointX" type="xs:double" use="optional" />
-    <xs:attribute name="PipingExitPointX" type="xs:double" use="optional" />
-    <xs:attribute name="PipingExitPointY" type="xs:double" use="optional" />
-    <xs:attribute name="SeepageLength" type="xs:double" use="optional" />
+    <xs:attribute name="BaseFileName" type="xs:string" />
   </xs:complexType>
 </xs:schema>
\ No newline at end of file