Tidying of MPR schemas (and a very minor change to DDR core, equipment and well …

…- moving classes between schemas without changing namespace).

@@ -505,3 +505,9 @@ ep-core:week
       rdf:type owl:DatatypeProperty , owl:FunctionalProperty , ep-core:Scale ;
       rdfs:domain ep-core:TimeDuration ;
       rdfs:label "week"^^xsd:string .
+      
+ep-core:Mass
+      rdf:type ep-core:PropertySpace , rdfs:Class ;
+      rdfs:label "mass"^^xsd:string ;
+      rdfs:subClassOf ep-core:MeasureOfAmountOfMaterial .
+

@@ -19,6 +19,9 @@
 ep-core:PhysicalThing
       rdfs:comment "Equivalent to ISO 15926-2 Possible Individual - DL"^^xsd:string .
 
+ep-eqt:Equipment
+      rdfs:subClassOf ep-core:PhysicalObject .
+      
 ep-eqt:BlowOutPreventer
       rdf:type owl:Class ;
       rdfs:label "blow out preventer"^^xsd:string ;

@@ -53,51 +53,6 @@
       rdfs:label "has flow"^^xsd:string ;
       rdfs:range <http://www.reportinghub.no/ep/schema/flow#WholeLifeFlow> .
 
-ep-core:Mass
-      rdf:type ep-core:PropertySpace , rdfs:Class ;
-      rdfs:label "mass"^^xsd:string ;
-      rdfs:subClassOf ep-core:MeasureOfAmountOfMaterial .
-
-<http://www.reportinghub.no/ep/schema/equipment#Manifold>
-      rdf:type owl:Class ;
-      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/equipment#TemporalPartOfAManifold> .
-
-<http://www.reportinghub.no/ep/schema/equipment#Manifold-Injection>
-      rdf:type owl:Class ;
-      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/equipment#Manifold> .
-
-<http://www.reportinghub.no/ep/schema/equipment#Manifold-Production>
-      rdf:type owl:Class ;
-      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/equipment#Manifold> .
-
-<http://www.reportinghub.no/ep/schema/equipment#Separator>
-      rdf:type owl:Class ;
-      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/equipment#TemporalPartOfASeparator> .
-
-<http://www.reportinghub.no/ep/schema/equipment#Tank>
-      rdf:type owl:Class ;
-      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/equipment#TemporalPartOfATank> .
-
-<http://www.reportinghub.no/ep/schema/equipment#TemporalPartOfAFlowLine>
-      rdf:type owl:Class ;
-      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/equipment#Equipment> .
-
-<http://www.reportinghub.no/ep/schema/equipment#TemporalPartOfAManifold>
-      rdf:type owl:Class ;
-      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/equipment#Equipment> .
-
-<http://www.reportinghub.no/ep/schema/equipment#TemporalPartOfASeparator>
-      rdf:type owl:Class ;
-      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/equipment#Equipment> .
-
-<http://www.reportinghub.no/ep/schema/equipment#TemporalPartOfATank>
-      rdf:type owl:Class ;
-      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/equipment#Equipment> .
-
-<http://www.reportinghub.no/ep/schema/flow#SampleOfMaterial>
-      rdf:type owl:Class ;
-      rdfs:label "(temporal part of a) sample of material"^^xsd:string .
-
 ep-prodact:AccidentOrInjury
       rdf:type owl:Class ;
       rdfs:label "accident or injury"^^xsd:string ;
@@ -226,14 +181,6 @@ ep-prodact:Fire
       rdfs:label "fire"^^xsd:string ;
       rdfs:subClassOf ep-prodact:Incident .
 
-ep-prodact:FlowLine
-      rdf:type owl:Class ;
-      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/equipment#TemporalPartOfAFlowLine> .
-
-ep-prodact:FlowLine-Production
-      rdf:type owl:Class ;
-      rdfs:subClassOf ep-prodact:FlowLine .
-
 ep-prodact:FluidLevelTest
       rdf:type owl:Class ;
       rdfs:label "fluid level test"^^xsd:string ;
@@ -752,11 +699,6 @@ ep-prodact:StrikeOrLockout
       rdfs:label "strike or lock-out"^^xsd:string ;
       rdfs:subClassOf ep-prodact:ProductionOperationProcessingLoss .
 
-ep-prodact:SubstanceType
-      rdf:type rdfs:Class ;
-      rdfs:label "substance type"^^xsd:string ;
-      rdfs:subClassOf owl:Class .
-
 ep-prodact:SupplyShipOperation
       rdf:type owl:Class ;
       rdfs:label "supply ship operation"^^xsd:string ;
@@ -1189,5 +1131,3 @@ ep-prodact:yearlyActivityToDate
       rdfs:domain ep-prodact:ProductionActivityLastingLessThanAYear ;
       rdfs:range ep-prodact:AnnualProductionActivityToDate .
 
-<http://www.reportinghub.no/ep/schema/well#WellGroup>
-      rdf:type owl:Class .

@@ -89,3 +89,69 @@ ep-prodfac:Pipeline
       rdf:type owl:Class , ep-prodfac:ProductionFacilityType ;
       rdfs:label "pipeline"^^xsd:string ;
       rdfs:subClassOf <http://www.reportinghub.no/ep/schema/facility#Facility> .
+      
+ep-prodeqt:Manifold
+      rdf:type owl:Class ;
+      rdfs:subClassOf ep-prodeqt:TemporalPartOfAManifold .
+
+ep-prodeqt:Manifold-Injection
+      rdf:type owl:Class ;
+      rdfs:subClassOf ep-prodeqt:Manifold .
+
+ep-prodeqt:Manifold-Production
+      rdf:type owl:Class ;
+      rdfs:subClassOf ep-prodeqt:Manifold .
+
+ep-prodeqt:Separator
+      rdf:type owl:Class ;
+      rdfs:subClassOf ep-prodeqt:TemporalPartOfASeparator .
+
+ep-prodeqt:Tank
+      rdf:type owl:Class ;
+      rdfs:subClassOf ep-prodeqt:TemporalPartOfATank .
+
+ep-prodeqt:TemporalPartOfAFlowLine
+      rdf:type owl:Class ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/equipment#Equipment> .
+
+ep-prodeqt:TemporalPartOfAManifold
+      rdf:type owl:Class ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/equipment#Equipment> .
+
+ep-prodeqt:TemporalPartOfASeparator
+      rdf:type owl:Class ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/equipment#Equipment> .
+
+ep-prodeqt:TemporalPartOfATank
+      rdf:type owl:Class ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/equipment#Equipment> .
+      
+ep-prodeqt:Manifold
+      rdf:type owl:Class ;
+      rdfs:subClassOf ep-prodeqt:TemporalPartOfAManifold .
+
+ep-prodeqt:Manifold-Injection
+      rdf:type owl:Class ;
+      rdfs:subClassOf ep-prodeqt:Manifold .
+
+ep-prodeqt:Manifold-Production
+      rdf:type owl:Class ;
+      rdfs:subClassOf ep-prodeqt:Manifold .
+
+ep-prodeqt:Separator
+      rdf:type owl:Class ;
+      rdfs:subClassOf ep-prodeqt:TemporalPartOfASeparator .
+
+ep-prodeqt:Tank
+      rdf:type owl:Class ;
+      rdfs:subClassOf ep-prodeqt:TemporalPartOfATank .
+
+ep-prodeqt:FlowLine
+      rdf:type owl:Class ;
+      rdfs:subClassOf ep-prodeqt:TemporalPartOfAFlowLine .
+
+ep-prodeqt:FlowLine-Production
+      rdf:type owl:Class ;
+      rdfs:subClassOf ep-prodeqt:FlowLine .
+
+

@@ -17,8 +17,7 @@
       owl:imports <http://www.reportinghub.no/ep/schema/1.0/material> , <http://www.reportinghub.no/ep/schema/1.0/facility> , <http://www.reportinghub.no/ep/schema/1.0/equipment> , <http://www.reportinghub.no/ep/schema/1.0/core> ;
       owl:versionInfo "0.1.0"^^xsd:string .
 
-<http://www.reportinghub.no/ep/schema/equipment#Equipment>
-      rdfs:subClassOf ep-core:PhysicalObject .
+
 
 <http://www.reportinghub.no/ep/schema/material#Condensate>
       rdf:type ep-well:FluidComponentType .