Merge branch 'master' into bitdiam

-# Saved by TopBraid on Fri Oct 07 13:43:12 BST 2011
+# Saved by TopBraid on Fri Oct 28 15:25:05 BST 2011
 # baseURI: null
 
 @prefix composite:  <http://www.topbraid.org/2007/05/composite.owl#> .

-# Saved by TopBraid on Tue Oct 25 15:10:35 BST 2011
+# Saved by TopBraid on Fri Oct 28 15:17:22 BST 2011
 # baseURI: http://www.reportinghub.no/ep/schema/1.0/production-core
 # imports: http://www.reportinghub.no/ep/schema/1.0/core
 
@@ -14,64 +14,180 @@
       owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
 
 ep-core:MeasureOfFlowOfMaterial
-      rdf:type rdfs:Class , ep-core:PropertySpace ;
+      rdf:type ep-core:PropertySpace , rdfs:Class ;
       rdfs:label "measure of flow of material"^^xsd:string ;
       rdfs:subClassOf owl:Class .
 
 ep-core:VolumeFlowRateAt15degC1atm
-      rdf:type ep-core:PropertySpace , rdfs:Class ;
+      rdf:type rdfs:Class , ep-core:PropertySpace ;
       rdfs:label "volume flow rate at 15 degrees C 1 atmosphere"^^xsd:string ;
       rdfs:subClassOf ep-core:MeasureOfFlowOfMaterial .
 
 ep-core:VolumeFlowRateAt1degC1atm
-      rdf:type ep-core:PropertySpace , rdfs:Class ;
+      rdf:type rdfs:Class , ep-core:PropertySpace ;
       rdfs:label "volume flow rate at 1 degrees C 1 atmosphere"^^xsd:string ;
       rdfs:subClassOf ep-core:MeasureOfFlowOfMaterial .
 
 ep-core:VolumeFlowRateAt60degF1atm
-      rdf:type ep-core:PropertySpace , rdfs:Class ;
+      rdf:type rdfs:Class , ep-core:PropertySpace ;
       rdfs:label "volume flow rate at 60 degrees F 1 atmosphere"^^xsd:string ;
       rdfs:subClassOf ep-core:MeasureOfFlowOfMaterial .
 
-ep-core:atmosphere
+ep-core:apiDensity
       rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
+      rdfs:label "API Density"^^xsd:string .
+
+ep-core:atmosphere
+      rdf:type owl:FunctionalProperty , owl:DatatypeProperty , ep-core:Scale ;
       rdfs:domain ep-core:Pressure ;
       rdfs:label "atmosphere"^^xsd:string .
 
 ep-core:barrel_day-1
-      rdf:type owl:FunctionalProperty , owl:DatatypeProperty , ep-core:Scale ;
+      rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
       rdfs:domain ep-core:VolumetricFlowRate ;
       rdfs:label "barrel day-1"^^xsd:string .
 
 ep-core:centimetre
-      rdf:type ep-core:Scale , owl:FunctionalProperty , owl:DatatypeProperty ;
+      rdf:type owl:DatatypeProperty , owl:FunctionalProperty , ep-core:Scale ;
       rdfs:domain ep-core:Length ;
       rdfs:label "centimetre"^^xsd:string .
 
 ep-core:count
-      rdf:type ep-core:Scale , owl:FunctionalProperty , owl:DatatypeProperty ;
+      rdf:type owl:DatatypeProperty , owl:FunctionalProperty , ep-core:Scale ;
       rdfs:label "count"^^xsd:string .
 
 ep-core:fahrenheit
-      rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
+      rdf:type owl:FunctionalProperty , owl:DatatypeProperty , ep-core:Scale ;
       rdfs:domain ep-core:Temperature ;
       rdfs:label "fahrenheit"^^xsd:string .
 
+ep-core:grain_100ft-3
+      rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
+      rdfs:label "grain per 100ft3"^^xsd:string .
+
+ep-core:grain_ft-3_1
+      rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
+      rdfs:label "grain per ft3"^^xsd:string .
+
+ep-core:grain_usGallon-1
+      rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
+      rdfs:label "grain per US Gallon"^^xsd:string .
+
+ep-core:gram_dm-3
+      rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
+      rdfs:label "gram dm-3"^^xsd:string .
+
+ep-core:gram_l-1
+      rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
+      rdfs:label "grams per litre"^^xsd:string .
+
+ep-core:gram_m-3
+      rdf:type owl:DatatypeProperty , owl:FunctionalProperty , ep-core:Scale ;
+      rdfs:label "gram m-3"^^xsd:string .
+
+ep-core:gram_ukGallon-1
+      rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
+      rdfs:label "grams per UK Gallon"^^xsd:string .
+
+ep-core:gram_usGallon-1
+      rdf:type owl:DatatypeProperty , owl:FunctionalProperty , ep-core:Scale ;
+      rdfs:label "grams per US Gallon"^^xsd:string .
+
 ep-core:hasSetOfAllPartsOfType
       rdf:type owl:ObjectProperty ;
       rdfs:domain ep-core:PhysicalThing ;
       rdfs:label "basis for"^^xsd:string .
 
 ep-core:inch_64
-      rdf:type ep-core:Scale , owl:FunctionalProperty , owl:DatatypeProperty ;
+      rdf:type owl:DatatypeProperty , owl:FunctionalProperty , ep-core:Scale ;
       rdfs:domain ep-core:Length ;
       rdfs:label "inch/64"^^xsd:string .
 
-ep-core:metre3_hour-1
+ep-core:kilogram_dm-3
+      rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
+      rdfs:label "kilogram dm-3"^^xsd:string .
+
+ep-core:kilogram_l-1
+      rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
+      rdfs:label "kilogram per litre"^^xsd:string .
+
+ep-core:kilogram_m-3
+      rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
+      rdfs:label "kilogram m-3"^^xsd:string .
+
+ep-core:lbm_1000bbl-1
+      rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
+      rdfs:label "pounds (mass) per 1000 barrels"^^xsd:string .
+
+ep-core:lbm_1000ukGallon-1
       rdf:type owl:FunctionalProperty , owl:DatatypeProperty , ep-core:Scale ;
+      rdfs:label "pounds(mass) per 1000 UK Gallons"^^xsd:string .
+
+ep-core:lbm_1000usGallon-1
+      rdf:type owl:FunctionalProperty , owl:DatatypeProperty , ep-core:Scale ;
+      rdfs:label "pounds(mass) per 1000 US Gallons"^^xsd:string .
+
+ep-core:lbm_10bbl-1
+      rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
+      rdfs:label "pounds (mass) per 10 barrels"^^xsd:string .
+
+ep-core:lbm_bbl-1
+      rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
+      rdfs:label "pounds (mass) per barrel"^^xsd:string .
+
+ep-core:lbm_ft-3
+      rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
+      rdfs:label "pounds (mass) per cubic foot"^^xsd:string .
+
+ep-core:lbm_in-3
+      rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
+      rdfs:label "pounds (mass) per cubic inch"^^xsd:string .
+
+ep-core:lbm_millibarrel-1
+      rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
+      rdfs:label "pounds (mass) per milli-barrel"^^xsd:string .
+
+ep-core:lbm_ukGallon-1
+      rdf:type owl:FunctionalProperty , owl:DatatypeProperty , ep-core:Scale ;
+      rdfs:label "pounds(mass) per UK Gallon"^^xsd:string .
+
+ep-core:lbm_usGallon-1
+      rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
+      rdfs:label "pounds (mass) per US Gallon"^^xsd:string .
+
+ep-core:megagram_m-3
+      rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
+      rdfs:label "Megagram m-3"^^xsd:string .
+
+ep-core:metre3_hour-1
+      rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
       rdfs:domain ep-core:VolumetricFlowRate ;
       rdfs:label "metre3 hour-1"^^xsd:string .
 
-ep-core:thousand_barrel
+ep-core:microgram_cm-3
+      rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
+      rdfs:label "microgram cm-3"^^xsd:string .
+
+ep-core:milligram_dm-3
+      rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
+      rdfs:label "milligram dm-3"^^xsd:string .
+
+ep-core:milligram_l-1
+      rdf:type owl:FunctionalProperty , owl:DatatypeProperty , ep-core:Scale ;
+      rdfs:label "milligrams per litre"^^xsd:string .
+
+ep-core:milligram_m-3
       rdf:type owl:DatatypeProperty , owl:FunctionalProperty , ep-core:Scale ;
+      rdfs:label "milligram m-3"^^xsd:string .
+
+ep-core:milligram_usGallon-1
+      rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
+      rdfs:label "milligrams per US Gallon"^^xsd:string .
+
+ep-core:ten_megagram_m-3
+      rdf:type owl:FunctionalProperty , owl:DatatypeProperty , ep-core:Scale ;
+      rdfs:label "10 Megagram m-3"^^xsd:string .
+
+ep-core:thousand_barrel
+      rdf:type ep-core:Scale , owl:FunctionalProperty , owl:DatatypeProperty ;
       rdfs:label "thousand barrel"^^xsd:string .

-# Saved by TopBraid on Tue Oct 25 15:34:42 BST 2011
+# Saved by TopBraid on Fri Oct 28 15:14:15 BST 2011
 # baseURI: null
 
 @prefix composite:  <http://www.topbraid.org/2007/05/composite.owl#> .

+# Saved by TopBraid on Fri Oct 28 14:13:15 BST 2011
 # baseURI: null
 
 @prefix composite:  <http://www.topbraid.org/2007/05/composite.owl#> .

+# Saved by TopBraid on Fri Oct 28 14:48:47 BST 2011
 # baseURI: null
 
 @prefix composite:  <http://www.topbraid.org/2007/05/composite.owl#> .

+# Saved by TopBraid on Fri Oct 28 14:50:19 BST 2011
 # baseURI: null
 
 @prefix composite:  <http://www.topbraid.org/2007/05/composite.owl#> .

+# Saved by TopBraid on Fri Oct 28 15:23:33 BST 2011
 # baseURI: null
 
 @prefix composite:  <http://www.topbraid.org/2007/05/composite.owl#> .

+# Saved by TopBraid on Fri Oct 28 15:43:00 BST 2011
 # baseURI: null
 
 @prefix composite:  <http://www.topbraid.org/2007/05/composite.owl#> .

+# Saved by TopBraid on Fri Oct 28 15:51:07 BST 2011
 # baseURI: null
 
 @prefix composite:  <http://www.topbraid.org/2007/05/composite.owl#> .

+# Saved by TopBraid on Fri Oct 28 15:57:02 BST 2011
 # baseURI: null
 
 @prefix composite:  <http://www.topbraid.org/2007/05/composite.owl#> .

+# Saved by TopBraid on Fri Oct 28 16:11:37 BST 2011
 # baseURI: null
 
 @prefix composite:  <http://www.topbraid.org/2007/05/composite.owl#> .

-# Saved by TopBraid on Tue Oct 25 15:30:47 BST 2011
+# Saved by TopBraid on Fri Oct 28 14:12:33 BST 2011
 # baseURI: null
 
 @prefix composite:  <http://www.topbraid.org/2007/05/composite.owl#> .