data.posccaesar.org / npd

Go to a project
Toggle navigation Toggle navigation pinning
David Price
709f1e69 2 parents 79a5c0ff 65c645d1

Merge branch 'tq-mprxsd'

Expand all
Inline Side-by-side
Showing 8 changed files with 229 additions and 2 deletions
......@@ -11,6 +11,206 @@
<!-- 25/10-2011, changed global namespace to be http://www.epim.no/schemas/mprml/1-->
<!-- 25/10-2011, changed version attribute to reflect correct version and name from 1.0.0.0(PRODML) to 1.0(MPRML)-->
<!-- 25/10-2011, added salt to grp_commonPropertiesProductVolume -->
<xsd:simpleType name="anyUom">
<xsd:annotation>
<xsd:documentation>areaUom is not specified elsewhere, so not included here.</xsd:documentation>
</xsd:annotation>
<!-- xsd:union memberTypes="witsml:pressureUom witsml:volumeUom witsml:thermodynamicTemperatureUom witsml:lengthUom witsml:densityUom witsml:lengthPerLengthUom witsml:timeUom" -->
<xsd:restriction base="witsml:abstractUomEnum">
<xsd:enumeration value="s"/>
<xsd:enumeration value="a"/>
<xsd:enumeration value="cs"/>
<xsd:enumeration value="d"/>
<xsd:enumeration value="Ga"/>
<xsd:enumeration value="h"/>
<xsd:enumeration value="100s"/>
<xsd:enumeration value="Ma"/>
<xsd:enumeration value="min"/>
<xsd:enumeration value="ms"/>
<xsd:enumeration value="ms/2"/>
<xsd:enumeration value="ns"/>
<xsd:enumeration value="ps"/>
<xsd:enumeration value="us"/>
<xsd:enumeration value="wk"/>
<xsd:enumeration value="100ka"/>
<xsd:enumeration value="%"/>
<xsd:enumeration value="ft/100ft"/>
<xsd:enumeration value="ft/ft"/>
<xsd:enumeration value="ft/in"/>
<xsd:enumeration value="ft/m"/>
<xsd:enumeration value="ft/mi"/>
<xsd:enumeration value="km/cm"/>
<xsd:enumeration value="m/30m"/>
<xsd:enumeration value="m/cm"/>
<xsd:enumeration value="m/km"/>
<xsd:enumeration value="m/m"/>
<xsd:enumeration value="mi/in"/>
<xsd:enumeration value="kg/m3"/>
<xsd:enumeration value="10Mg/m3"/>
<xsd:enumeration value="dAPI"/>
<xsd:enumeration value="g/cm3"/>
<xsd:enumeration value="g/dm3"/>
<xsd:enumeration value="g/galUK"/>
<xsd:enumeration value="g/galUS"/>
<xsd:enumeration value="g/L"/>
<xsd:enumeration value="g/m3"/>
<xsd:enumeration value="grain/ft3"/>
<xsd:enumeration value="grain/galUS"/>
<xsd:enumeration value="grain/100ft3"/>
<xsd:enumeration value="kg/dm3"/>
<xsd:enumeration value="kg/L"/>
<xsd:enumeration value="Mg/m3"/>
<xsd:enumeration value="lbm/10bbl"/>
<xsd:enumeration value="lbm/bbl"/>
<xsd:enumeration value="lbm/ft3"/>
<xsd:enumeration value="lbm/galUK"/>
<xsd:enumeration value="lbm/1000galUK"/>
<xsd:enumeration value="lbm/galUS"/>
<xsd:enumeration value="lbm/1000galUS"/>
<xsd:enumeration value="lbm/in3"/>
<xsd:enumeration value="lbm/Mbbl"/>
<xsd:enumeration value="mg/dm3"/>
<xsd:enumeration value="mg/galUS"/>
<xsd:enumeration value="mg/L"/>
<xsd:enumeration value="mg/m3"/>
<xsd:enumeration value="ug/cm3"/>
<xsd:enumeration value="m"/>
<xsd:enumeration value="angstrom"/>
<xsd:enumeration value="chBnA"/>
<xsd:enumeration value="chBnB"/>
<xsd:enumeration value="chCla"/>
<xsd:enumeration value="chSe"/>
<xsd:enumeration value="chUS"/>
<xsd:enumeration value="cm"/>
<xsd:enumeration value="dm"/>
<xsd:enumeration value="fathom"/>
<xsd:enumeration value="fm"/>
<xsd:enumeration value="ft"/>
<xsd:enumeration value="ftBnA"/>
<xsd:enumeration value="ftBnB"/>
<xsd:enumeration value="ftBr(65)"/>
<xsd:enumeration value="ftCla"/>
<xsd:enumeration value="ftGC"/>
<xsd:enumeration value="ftInd"/>
<xsd:enumeration value="ftInd(37)"/>
<xsd:enumeration value="ftInd(62)"/>
<xsd:enumeration value="ftInd(75)"/>
<xsd:enumeration value="ftMA"/>
<xsd:enumeration value="ftSe"/>
<xsd:enumeration value="ftUS"/>
<xsd:enumeration value="in"/>
<xsd:enumeration value="in/10"/>
<xsd:enumeration value="in/16"/>
<xsd:enumeration value="in/32"/>
<xsd:enumeration value="in/64"/>
<xsd:enumeration value="inUS"/>
<xsd:enumeration value="km"/>
<xsd:enumeration value="lkBnA"/>
<xsd:enumeration value="lkBnB"/>
<xsd:enumeration value="lkCla"/>
<xsd:enumeration value="lkSe"/>
<xsd:enumeration value="lkUS"/>
<xsd:enumeration value="mGer"/>
<xsd:enumeration value="mi"/>
<xsd:enumeration value="mil"/>
<xsd:enumeration value="miUS"/>
<xsd:enumeration value="mm"/>
<xsd:enumeration value="Mm"/>
<xsd:enumeration value="nautmi"/>
<xsd:enumeration value="nm"/>
<xsd:enumeration value="pm"/>
<xsd:enumeration value="um"/>
<xsd:enumeration value="yd"/>
<xsd:enumeration value="ydBnA"/>
<xsd:enumeration value="ydBnB"/>
<xsd:enumeration value="ydCla"/>
<xsd:enumeration value="ydIm"/>
<xsd:enumeration value="ydInd"/>
<xsd:enumeration value="ydInd(37)"/>
<xsd:enumeration value="ydInd(62)"/>
<xsd:enumeration value="ydInd(75)"/>
<xsd:enumeration value="ydSe"/>
<xsd:enumeration value="K"/>
<xsd:enumeration value="degC"/>
<xsd:enumeration value="degF"/>
<xsd:enumeration value="degR"/>
<xsd:enumeration value="Pa"/>
<xsd:enumeration value="at"/>
<xsd:enumeration value="atm"/>
<xsd:enumeration value="bar"/>
<xsd:enumeration value="cmH2O(4degC)"/>
<xsd:enumeration value="dyne/cm2"/>
<xsd:enumeration value="GPa"/>
<xsd:enumeration value="hbar"/>
<xsd:enumeration value="inH2O(39.2F)"/>
<xsd:enumeration value="inH2O(60F)"/>
<xsd:enumeration value="inHg(32F)"/>
<xsd:enumeration value="inHg(60F)"/>
<xsd:enumeration value="kgf/cm2"/>
<xsd:enumeration value="kgf/mm2"/>
<xsd:enumeration value="kN/m2"/>
<xsd:enumeration value="kPa"/>
<xsd:enumeration value="kpsi"/>
<xsd:enumeration value="lbf/ft2"/>
<xsd:enumeration value="lbf/100ft2"/>
<xsd:enumeration value="lbf/in2"/>
<xsd:enumeration value="mbar"/>
<xsd:enumeration value="mmHg(0C)"/>
<xsd:enumeration value="mPa"/>
<xsd:enumeration value="MPa"/>
<xsd:enumeration value="Mpsi"/>
<xsd:enumeration value="N/m2"/>
<xsd:enumeration value="N/mm2"/>
<xsd:enumeration value="Pa(g)"/>
<xsd:enumeration value="pPa"/>
<xsd:enumeration value="psi"/>
<xsd:enumeration value="psia"/>
<xsd:enumeration value="psig"/>
<xsd:enumeration value="tonfUS/ft2"/>
<xsd:enumeration value="tonfUS/in2"/>
<xsd:enumeration value="torr"/>
<xsd:enumeration value="ubar"/>
<xsd:enumeration value="umHg(0C)"/>
<xsd:enumeration value="uPa"/>
<xsd:enumeration value="upsi"/>
<xsd:enumeration value="m3"/>
<xsd:enumeration value="acre.ft"/>
<xsd:enumeration value="bbl"/>
<xsd:enumeration value="bcf"/>
<xsd:enumeration value="cm3"/>
<xsd:enumeration value="dm3"/>
<xsd:enumeration value="flozUK"/>
<xsd:enumeration value="flozUS"/>
<xsd:enumeration value="ft3"/>
<xsd:enumeration value="galUK"/>
<xsd:enumeration value="galUS"/>
<xsd:enumeration value="ha.m"/>
<xsd:enumeration value="hL"/>
<xsd:enumeration value="in3"/>
<xsd:enumeration value="1000ft3"/>
<xsd:enumeration value="km3"/>
<xsd:enumeration value="L"/>
<xsd:enumeration value="Mbbl"/>
<xsd:enumeration value="Mcf"/>
<xsd:enumeration value="M(ft3)"/>
<xsd:enumeration value="mi3"/>
<xsd:enumeration value="mL"/>
<xsd:enumeration value="M(m3)"/>
<xsd:enumeration value="mm3"/>
<xsd:enumeration value="MMbbl"/>
<xsd:enumeration value="ptUK"/>
<xsd:enumeration value="ptUS"/>
<xsd:enumeration value="qtUK"/>
<xsd:enumeration value="qtUS"/>
<xsd:enumeration value="tcf"/>
<xsd:enumeration value="um2.m"/>
<xsd:enumeration value="yd3"/>
</xsd:restriction>
</xsd:simpleType>
<xsd:simpleType name="WellTestType">
<xsd:annotation>
<xsd:documentation>Defines allowed types of well tests</xsd:documentation>
......@@ -11802,9 +12002,9 @@
<xsd:documentation>The kind of the value component. For example, "X" in a tuple of X and Y.</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="uom" type="witsml:uomString" use="required">
<xsd:attribute name="uom" type="witsml:anyUom" use="required">
<xsd:annotation>
<xsd:documentation>The unit of measure for the value. This value must conform to the values allowed by the measure class.</xsd:documentation>
<xsd:documentation>The unit of measure for the value. This value must conform to the values allowed by the measure class. The scheme has been updated to make this the union of all the UOM enumerations.</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
</xsd:extension>
......
2013-07-19 David Price and David Leal
1) NEW Introduced new anyUoM enumeration:
<xsd:simpleType name="anyUom">
<xsd:annotation>
<xsd:documentation>areaUom is not specified elsewhere, so not included here.</xsd:documentation>
</xsd:annotation>
Merged in all UoM enum values from : witsml:pressureUom witsml:volumeUom
witsml:thermodynamicTemperatureUom witsml:lengthUom witsml:densityUom witsml:lengthPerLengthUom
witsml:timeUom
</xsd:simpleType>
and changed generalQualifiedMeasure to use it rather than <xsd:attribute name="uom" type="witsml:uomString" use="required">
<xsd:complexType name="generalQualifiedMeasure">
...
<xsd:attribute name="uom" type="witsml:anyUom" use="required">
<xsd:annotation>
<xsd:documentation>The unit of measure for the value. This value must conform to the values allowed by the measure class. The scheme has been updated to make this the union of all the UOM enumerations.</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
...
</xsd:complexType>
\ No newline at end of file