Index: DamEngine/trunk/xsd/DamTimeSerie.xsd
===================================================================
diff -u -r6096 -r6154
--- DamEngine/trunk/xsd/DamTimeSerie.xsd	(.../DamTimeSerie.xsd)	(revision 6096)
+++ DamEngine/trunk/xsd/DamTimeSerie.xsd	(.../DamTimeSerie.xsd)	(revision 6154)
@@ -2,11 +2,6 @@
 <!-- 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=".\Common\Point2D.xsd" />
-  <xs:include schemaLocation=".\OutputTypes\WaternetCalculation.xsd" />
-  <xs:include schemaLocation=".\OutputTypes\BishopCalculationGridTypeDefinition.xsd" />
-  <xs:include schemaLocation=".\OutputTypes\UpliftVanCalculationGridTypeDefinition.xsd" />
-  <xs:include schemaLocation=".\OutputTypes\BishopCalculatedSlipPlaneTypeDefinition.xsd" />
-  <xs:include schemaLocation=".\OutputTypes\UpliftVanCalculatedSlipPlaneTypeDefinition.xsd" />
   <xs:complexType name="TimeSerie">
     <xs:sequence>
       <xs:element minOccurs="1" maxOccurs="1" name="TimeStep">
@@ -36,13 +31,6 @@
           <xs:sequence minOccurs="1" maxOccurs="unbounded">
             <xs:element name="TimeSerieEntry">
               <xs:complexType>
-                <xs:sequence>
-                  <xs:element minOccurs="0" maxOccurs="1" name="Waternet" type="WaternetType" />
-                  <xs:element minOccurs="0" maxOccurs="1" name="BishopCalculationGrid" type="BishopCalculationGridType" />
-                  <xs:element minOccurs="0" maxOccurs="1" name="UpliftVanCalculationGrid" type="UpliftVanCalculationGridType" />
-                  <xs:element minOccurs="0" maxOccurs="1" name="BishopCalculatedSlipPlane" type="BishopCalculatedSlipPlaneType" />
-                  <xs:element minOccurs="0" maxOccurs="1" name="UpliftVanCalculatedSlipPlane" type="UpliftVanCalculatedSlipPlaneType" />
-                </xs:sequence>
                 <xs:attribute name="DateTime" type="xs:dateTime" use="required" />
                 <xs:attribute name="Value" type="xs:double" use="required" />
                 <xs:attribute name="IsUplift" type="xs:boolean" />
@@ -53,19 +41,12 @@
       </xs:element>
     </xs:sequence>
     <xs:attribute name="ForecastDateTime" type="xs:dateTime" use="required" />
-    <xs:attribute name="Type" type="xs:string" use="required" />
     <xs:attribute name="LocationId" type="xs:string" use="required" />
     <xs:attribute name="ParameterId" type="xs:string" use="required" />
     <xs:attribute name="StartDateTime" type="xs:dateTime" use="required" />
     <xs:attribute name="EndDateTime" type="xs:dateTime" use="required" />
     <xs:attribute name="MissVal" type="xs:double" use="required" />
-    <xs:attribute name="LongName" type="xs:string" use="required" />
-    <xs:attribute name="StationName" type="xs:string" use="required" />
     <xs:attribute name="Units" type="xs:string" use="required" />
-    <xs:attribute name="SourceOrganisation" type="xs:string" use="required" />
-    <xs:attribute name="SourceSystem" type="xs:string" use="required" />
-    <xs:attribute name="FileDescription" type="xs:string" use="required" />
-    <xs:attribute name="Region" type="xs:string" use="required" />
     <xs:attribute name="Comment" type="xs:string" use="required" />
     <xs:attribute name="CreationDateTime" type="xs:dateTime" use="optional" />
   </xs:complexType>