David Price

Updated to final new MPR XSD

This diff could not be displayed because it is too large.
...@@ -22,18 +22,7 @@ to be ...@@ -22,18 +22,7 @@ to be
22 22
23 <xsd:element name="componentName" type="witsml:FluidSampleComponents"/> 23 <xsd:element name="componentName" type="witsml:FluidSampleComponents"/>
24 24
25 -3) NEW Introduced new attribute group for flow uid making it mandatory: 25 +3) uid mandatory was dropped in the end.
26 -
27 -<xsd:attributeGroup name="flow_attgrp_uid">
28 - <xsd:attribute name="uid" type="witsml:uidString" use="required">
29 - <xsd:annotation>
30 - <xsd:documentation>The unique identifier of a container element. This attribute is generally required within the context of a WITSML server. There should be no
31 - assumption as to the semantic content of this attribute. This should only be used with recurring container types (i.e., maxOccurs greater than one). The value is only
32 - required to be unique within the context of the nearest recurring parent element.</xsd:documentation>
33 - </xsd:annotation>
34 - </xsd:attribute>
35 - </xsd:attributeGroup>
36 -
37 26
38 4) Made installation mandatory in production operation report 27 4) Made installation mandatory in production operation report
39 28
......
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
11 <!-- 25/10-2011, changed global namespace to be http://www.epim.no/schemas/mprml/1--> 11 <!-- 25/10-2011, changed global namespace to be http://www.epim.no/schemas/mprml/1-->
12 <!-- 25/10-2011, changed version attribute to reflect correct version and name from 1.0.0.0(PRODML) to 1.0(MPRML)--> 12 <!-- 25/10-2011, changed version attribute to reflect correct version and name from 1.0.0.0(PRODML) to 1.0(MPRML)-->
13 <!-- 25/10-2011, added salt to grp_commonPropertiesProductVolume --> 13 <!-- 25/10-2011, added salt to grp_commonPropertiesProductVolume -->
14 -
15 <xsd:simpleType name="WellTestType"> 14 <xsd:simpleType name="WellTestType">
16 <xsd:annotation> 15 <xsd:annotation>
17 <xsd:documentation>Defines allowed types of well tests</xsd:documentation> 16 <xsd:documentation>Defines allowed types of well tests</xsd:documentation>
...@@ -32,7 +31,6 @@ ...@@ -32,7 +31,6 @@
32 <xsd:documentation>Drawdown test</xsd:documentation> 31 <xsd:documentation>Drawdown test</xsd:documentation>
33 </xsd:annotation> 32 </xsd:annotation>
34 </xsd:enumeration> 33 </xsd:enumeration>
35 -
36 <xsd:enumeration value="Gas - flow after flow"> 34 <xsd:enumeration value="Gas - flow after flow">
37 <xsd:annotation> 35 <xsd:annotation>
38 <xsd:documentation>Gas flow after flow test</xsd:documentation> 36 <xsd:documentation>Gas flow after flow test</xsd:documentation>
...@@ -83,27 +81,18 @@ ...@@ -83,27 +81,18 @@
83 <xsd:documentation>Pressure build-up test</xsd:documentation> 81 <xsd:documentation>Pressure build-up test</xsd:documentation>
84 </xsd:annotation> 82 </xsd:annotation>
85 </xsd:enumeration> 83 </xsd:enumeration>
86 -
87 <xsd:enumeration value="Single rate"> 84 <xsd:enumeration value="Single rate">
88 <xsd:annotation> 85 <xsd:annotation>
89 <xsd:documentation>Single rate test</xsd:documentation> 86 <xsd:documentation>Single rate test</xsd:documentation>
90 </xsd:annotation> 87 </xsd:annotation>
91 </xsd:enumeration> 88 </xsd:enumeration>
92 -
93 -
94 -
95 -
96 <xsd:enumeration value="Water - flow after flow"> 89 <xsd:enumeration value="Water - flow after flow">
97 <xsd:annotation> 90 <xsd:annotation>
98 <xsd:documentation>Water flow after flow test</xsd:documentation> 91 <xsd:documentation>Water flow after flow test</xsd:documentation>
99 </xsd:annotation> 92 </xsd:annotation>
100 </xsd:enumeration> 93 </xsd:enumeration>
101 -
102 -
103 </xsd:restriction> 94 </xsd:restriction>
104 </xsd:simpleType> 95 </xsd:simpleType>
105 -
106 -
107 <xsd:simpleType name="FluidSampleComponents"> 96 <xsd:simpleType name="FluidSampleComponents">
108 <xsd:annotation> 97 <xsd:annotation>
109 <xsd:documentation>Defines allowed product composition types as used in the fluidSampleComposition setup during labanalysis</xsd:documentation> 98 <xsd:documentation>Defines allowed product composition types as used in the fluidSampleComposition setup during labanalysis</xsd:documentation>
...@@ -4097,7 +4086,7 @@ ...@@ -4097,7 +4086,7 @@
4097 </xsd:annotation> 4086 </xsd:annotation>
4098 </xsd:element> 4087 </xsd:element>
4099 </xsd:sequence> 4088 </xsd:sequence>
4100 - <xsd:attributeGroup ref="witsml:flow_attgrp_uid"> 4089 + <xsd:attributeGroup ref="witsml:attgrp_uid">
4101 <xsd:annotation> 4090 <xsd:annotation>
4102 <xsd:documentation>Unique identifier for the Product Volume Flow.</xsd:documentation> 4091 <xsd:documentation>Unique identifier for the Product Volume Flow.</xsd:documentation>
4103 </xsd:annotation> 4092 </xsd:annotation>
......