David Price

Merge branch 'master' into CleanMar3

This diff could not be displayed because it is too large.
...@@ -342,6 +342,12 @@ ep-flow:Inventory ...@@ -342,6 +342,12 @@ ep-flow:Inventory
342 rdfs:label "inventory"^^xsd:string ; 342 rdfs:label "inventory"^^xsd:string ;
343 rdfs:subClassOf ep-core:PhysicalObject . 343 rdfs:subClassOf ep-core:PhysicalObject .
344 344
345 +ep-flow:InventoryInAStandardState
346 + rdf:type owl:Class ;
347 + rdfs:comment "inventory that is in a standard state"^^xsd:string ;
348 + rdfs:label "inventory in a standard state"^^xsd:string ;
349 + rdfs:subClassOf ep-flow:Inventory .
350 +
345 ep-flow:MassAdjustedFlow 351 ep-flow:MassAdjustedFlow
346 rdf:type owl:Class , ep-flow:ProductionFlowDefinitionType ; 352 rdf:type owl:Class , ep-flow:ProductionFlowDefinitionType ;
347 rdfs:comment "flow that <not documented in XSD>"^^xsd:string ; 353 rdfs:comment "flow that <not documented in XSD>"^^xsd:string ;
...@@ -745,13 +751,6 @@ ep-flow:flowMeasuredBy ...@@ -745,13 +751,6 @@ ep-flow:flowMeasuredBy
745 rdfs:label "flow measured by"^^xsd:string ; 751 rdfs:label "flow measured by"^^xsd:string ;
746 rdfs:range <http://www.reportinghub.no/ep/schema/facility#Facility> . 752 rdfs:range <http://www.reportinghub.no/ep/schema/facility#Facility> .
747 753
748 -ep-flow:flowMeasuredOrCalculatedAt
749 - rdf:type owl:ObjectProperty ;
750 - rdfs:comment "facility at which a flow is measured or calculated"^^xsd:string ;
751 - rdfs:domain ep-flow:Flow ;
752 - rdfs:label "flow measured or calculated at"^^xsd:string ;
753 - rdfs:range <http://www.reportinghub.no/ep/schema/facility#Facility> .
754 -
755 ep-flow:flowOutOf 754 ep-flow:flowOutOf
756 rdf:type owl:ObjectProperty ; 755 rdf:type owl:ObjectProperty ;
757 rdfs:comment "physical thing that a flow is out of"^^xsd:string ; 756 rdfs:comment "physical thing that a flow is out of"^^xsd:string ;
...@@ -825,6 +824,13 @@ ep-flow:materialThatFlows ...@@ -825,6 +824,13 @@ ep-flow:materialThatFlows
825 rdfs:label "material that flows"^^xsd:string ; 824 rdfs:label "material that flows"^^xsd:string ;
826 rdfs:range ep-material:QuantityOfMaterial . 825 rdfs:range ep-material:QuantityOfMaterial .
827 826
827 +ep-flow:measuredOrCalculatedAt
828 + rdf:type owl:ObjectProperty ;
829 + rdfs:comment "facility at which a flow or inventory is measured or calculated"^^xsd:string ;
830 + rdfs:domain ep-core:PhysicalThing ;
831 + rdfs:label "measured or calculated at"^^xsd:string ;
832 + rdfs:range <http://www.reportinghub.no/ep/schema/facility#Facility> .
833 +
828 ep-flow:reidVapourPressure 834 ep-flow:reidVapourPressure
829 rdf:type ep-core:Class_of_indirect_property , owl:ObjectProperty , owl:FunctionalProperty ; 835 rdf:type ep-core:Class_of_indirect_property , owl:ObjectProperty , owl:FunctionalProperty ;
830 rdfs:comment "Reid vapor pressure of stabilized crude."^^xsd:string ; 836 rdfs:comment "Reid vapor pressure of stabilized crude."^^xsd:string ;
......