Index: dam engine/trunk/Xsds Liquid/DamDesignResult.xsd
===================================================================
diff -u -r404 -r444
--- dam engine/trunk/Xsds Liquid/DamDesignResult.xsd	(.../DamDesignResult.xsd)	(revision 404)
+++ dam engine/trunk/Xsds Liquid/DamDesignResult.xsd	(.../DamDesignResult.xsd)	(revision 444)
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 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:include schemaLocation=".\DamUpliftSituation.xsd" />
   <xs:complexType name="DesignResult">
     <xs:sequence>
-      <xs:element minOccurs="0" maxOccurs="1" name="NwoResults">
+      <xs:element minOccurs="0" maxOccurs="1" name="NwoDesignResults">
         <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="SafetyFactor" type="xs:double" use="optional" />
+          <xs:attribute name="Zone1SafetyFactor" 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="Zone2SafetyFactor" 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" />
@@ -23,56 +24,69 @@
           <xs:attribute name="LocationZrdEnd" type="xs:double" use="optional" />
         </xs:complexType>
       </xs:element>
-      <xs:element minOccurs="0" maxOccurs="1" name="StabilityResults">
+      <xs:element minOccurs="0" maxOccurs="1" name="StabilityDesignResults">
         <xs:complexType>
+          <xs:sequence minOccurs="0" maxOccurs="1">
+            <xs:element name="UpliftSituation" type="UpliftSituation" />
+          </xs:sequence>
           <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="SafetyFactor" type="xs:double" use="optional" />
+          <xs:attribute name="FailureProbability" type="xs:double" use="optional" />
+          <xs:attribute name="Zone1SafetyFactor" 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="Zone2SafetyFactor" 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:attribute name="NumberOfIterations" type="xs:int" />
         </xs:complexType>
       </xs:element>
-      <xs:element minOccurs="0" maxOccurs="1" name="PipingResults">
+      <xs:element minOccurs="0" maxOccurs="1" name="PipingDesignResults">
         <xs:complexType>
+          <xs:sequence minOccurs="0" maxOccurs="1">
+            <xs:element name="UpliftSituation" type="UpliftSituation" />
+          </xs:sequence>
           <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="RedesignedSurfaceLine2" />
+          <xs:attribute name="FailureProbability" 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="Sellmeijer4ForcesPipingFactor" type="xs:double" use="optional" />
-          <xs:attribute name="Sellmeijer4ForcesHCritical" type="xs:double" use="optional" />
-          <xs:attribute name="SellmeijerVnkPipingFactor" type="xs:double" use="optional" />
-          <xs:attribute name="SellmeijerVnkHCritical" type="xs:double" use="optional" />
-          <xs:attribute name="Wti2017PipingFactor" type="xs:double" use="optional" />
+          <xs:attribute name="BlighFactor" type="xs:double" use="optional" />
+          <xs:attribute name="BlighHcritical" type="xs:double" use="optional" />
+          <xs:attribute name="Sellmeijer4ForcesFactor" type="xs:double" use="optional" />
+          <xs:attribute name="Sellmeijer4ForcesHcritical" type="xs:double" use="optional" />
+          <xs:attribute name="SellmeijerVnkFactor" type="xs:double" use="optional" />
+          <xs:attribute name="SellmeijerVnkHcritical" type="xs:duration" use="optional" />
+          <xs:attribute name="Wti2017Factor" type="xs:double" use="optional" />
           <xs:attribute name="Wti2017HCritical" type="xs:double" use="optional" />
-          <xs:attribute name="LocalPipingExitPointX" type="xs:double" use="optional" />
+          <xs:attribute name="LocalExitPointX" 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="BaseFileName" type="xs:string" />
+    <xs:attribute name="LocationName" type="xs:string" />
+    <xs:attribute name="ScenarioName" type="xs:string" />
+    <xs:attribute name="ProfileName" type="xs:string" />
+    <xs:attribute name="SafetyFactor" type="xs:double" />
+    <xs:attribute name="FailureProbability" type="xs:double" />
+    <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:complexType>
 </xs:schema>
\ No newline at end of file