More progress on MPR wellTest. Tidying things up has minor effects on DPR.

 # baseURI: http://www.reportinghub.no/ep/schema/1.0/flow
 # imports: http://www.reportinghub.no/ep/schema/1.0/core
 # imports: http://www.reportinghub.no/ep/schema/1.0/facility
+# imports: http://www.reportinghub.no/ep/schema/1.0/production-activity
 # imports: http://www.reportinghub.no/ep/schema/1.0/production-core
 
 @prefix ep-flow:  <http://www.reportinghub.no/ep/schema/flow#> .
@@ -11,7 +12,7 @@
 
 <http://www.reportinghub.no/ep/schema/1.0/flow>
       rdf:type owl:Ontology ;
-      owl:imports <http://www.reportinghub.no/ep/schema/1.0/facility> , <http://www.reportinghub.no/ep/schema/1.0/core> , <http://www.reportinghub.no/ep/schema/1.0/production-core> ;
+      owl:imports <http://www.reportinghub.no/ep/schema/1.0/facility> , <http://www.reportinghub.no/ep/schema/1.0/core> , <http://www.reportinghub.no/ep/schema/1.0/production-core> , <http://www.reportinghub.no/ep/schema/1.0/production-activity> ;
       owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
 
 ep-flow:AllocatedFlow
@@ -719,9 +720,9 @@ ep-flow:WholeLifeProductionFlow
       rdfs:label "whole life production flow"^^xsd:string ;
       rdfs:subClassOf ep-flow:WholeLifeFlow , ep-flow:ProductionFlow .
 
-ep-flow:dailyAverageAmountOfMaterial
-      rdf:type owl:FunctionalProperty , owl:ObjectProperty ;
-      rdfs:label "daily average amount of material"^^xsd:string ;
+ep-flow:dailyAverageVolumeOfMaterial
+      rdf:type owl:ObjectProperty , owl:FunctionalProperty ;
+      rdfs:label "daily average volume of material"^^xsd:string ;
       rdfs:range <http://www.reportinghub.no/ep/schema/core#MeasureOfAmountOfMaterial> .
 
 ep-flow:facilityContainsFlow
@@ -764,12 +765,18 @@ ep-flow:hasNetworkPart
       rdfs:range ep-flow:WholeLifeFlow ;
       rdfs:subPropertyOf <http://www.reportinghub.no/ep/schema/core#hasPart> .
 
+ep-flow:materialThatFlows
+      rdf:type owl:FunctionalProperty , owl:ObjectProperty ;
+      rdfs:domain ep-flow:Flow ;
+      rdfs:label "material that flows"^^xsd:string ;
+      rdfs:range <http://www.reportinghub.no/ep/schema/production-activity#QuantityOfMaterial> .
+
 ep-flow:rateOfFlowOfMaterial
       rdf:type owl:ObjectProperty , owl:FunctionalProperty ;
       rdfs:label "rate of flow of material"^^xsd:string ;
       rdfs:range <http://www.reportinghub.no/ep/schema/core#MeasureOfAmountOfMaterial> .
 
-ep-flow:totalAmountOfMaterial
+ep-flow:totalVolumeOfMaterial
       rdf:type owl:ObjectProperty , owl:FunctionalProperty ;
-      rdfs:label "total amount of material"^^xsd:string ;
+      rdfs:label "total volume of material"^^xsd:string ;
       rdfs:range <http://www.reportinghub.no/ep/schema/core#MeasureOfAmountOfMaterial> .

@@ -104,10 +104,6 @@ ep-prodact:Alarm
       rdf:type owl:Class ;
       rdfs:subClassOf ep-prodact:PartOfProductionActivity .
 
-ep-prodact:AmountOfSubstance
-      rdf:type owl:Class ;
-      rdfs:subClassOf ep-core:PhysicalObject .
-
 ep-prodact:AnnualProductionActivity
       rdf:type ep-prodact:ProductionOperationClassByDuration , owl:Class ;
       rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#ProductionActivity> .
@@ -134,8 +130,7 @@ ep-prodact:ConstructionOperation
       rdfs:subClassOf ep-prodact:PartOfProductionActivity .
 
 ep-prodact:CrudeOil
-      rdf:type owl:Class ;
-      rdfs:subClassOf ep-prodact:AmountOfSubstance .
+      rdf:type owl:Class .
 
 ep-prodact:CumulativeProductionActivitySinceProductionBegan
       rdf:type ep-prodact:ProductionOperationClassByDuration , owl:Class ;
@@ -307,8 +302,7 @@ ep-prodact:MonthlyProductionActivityToEndOfReportingPeriod
       rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#MonthlyProductionActivity> .
 
 ep-prodact:NaturalGas
-      rdf:type owl:Class ;
-      rdfs:subClassOf ep-prodact:AmountOfSubstance .
+      rdf:type owl:Class .
 
 ep-prodact:NearMiss
       rdf:type owl:Class ;
@@ -370,6 +364,10 @@ ep-prodact:ProductionVolumeActivity
       rdf:type owl:Class ;
       rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#ProductionActivity> .
 
+ep-prodact:QuantityOfMaterial
+      rdf:type owl:Class ;
+      rdfs:subClassOf ep-core:PhysicalObject .
+
 ep-prodact:ReleasedToWater
       rdf:type owl:Class ;
       rdfs:subClassOf ep-prodact:HealthSafetyAndEnvironmentActivity .
@@ -399,9 +397,9 @@ ep-prodact:SafetyMeeting
       rdf:type owl:Class , ep-prodact:SafetyActivityType ;
       rdfs:subClassOf ep-prodact:HealthSafetyAndEnvironmentActivity .
 
-ep-prodact:SampleAmountOfSubstance
+ep-prodact:SampleOfMaterial
       rdf:type owl:Class ;
-      rdfs:subClassOf ep-prodact:AmountOfSubstance .
+      rdfs:subClassOf ep-prodact:QuantityOfMaterial .
 
 ep-prodact:SentAshore
       rdf:type owl:Class ;
@@ -444,7 +442,7 @@ ep-prodact:WaterDischarge
 
 ep-prodact:WaterSample
       rdf:type owl:Class ;
-      rdfs:subClassOf ep-prodact:SampleAmountOfSubstance , <http://www.reportinghub.no/ep/schema/well#Water> .
+      rdfs:subClassOf ep-prodact:SampleOfMaterial , <http://www.reportinghub.no/ep/schema/well#Water> .
 
 ep-prodact:WellTestReasonType
       rdf:type rdfs:Class ;
@@ -489,7 +487,7 @@ ep-prodact:conveyed
 ep-prodact:conveyedAmountOfSubstance
       rdf:type owl:ObjectProperty ;
       rdfs:domain ep-prodact:TransportationActivity ;
-      rdfs:range ep-prodact:AmountOfSubstance ;
+      rdfs:range ep-prodact:QuantityOfMaterial ;
       rdfs:subPropertyOf ep-prodact:conveyed .
 
 ep-prodact:coulterCounter

@@ -3171,6 +3171,16 @@ ep-prodcore:TemporalPartOfARegionOfSpace
       rdfs:label "temporal part of a region of space"^^xsd:string ;
       rdfs:subClassOf ep-core:PhysicalObject .
 
+ep-prodcore:VolumeAt0degC1atm
+      rdf:type ep-core:PropertySpace , rdfs:Class ;
+      rdfs:label "volume at 0 degrees C 1 atmosphere"^^xsd:string ;
+      rdfs:subClassOf ep-core:MeasureOfAmountOfMaterial .
+
+ep-prodcore:VolumeFlowRateAt0degC1atm
+      rdf:type rdfs:Class , ep-core:PropertySpace ;
+      rdfs:label "volume flow rate at 0 degrees C 1 atmosphere"^^xsd:string ;
+      rdfs:subClassOf ep-core:MeasureOfFlowOfMaterial .
+
 ep-prodcore:intervalIdentifier
       rdf:type owl:DatatypeProperty , owl:FunctionalProperty ;
       rdfs:label "ph"^^xsd:string .

@@ -14,9 +14,9 @@
       owl:imports <http://www.reportinghub.no/ep/schema/1.0/well> ;
       owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
 
-ep-prodwell:Air
-      rdf:type ep-prodwell:InjectionFluidType , owl:Class , ep-well:FluidComponentType ;
-      rdfs:label "air"^^xsd:string ;
+ep-prodwell:Air-gas
+      rdf:type ep-well:FluidComponentType , owl:Class , ep-prodwell:InjectionFluidType ;
+      rdfs:label "air gas"^^xsd:string ;
       rdfs:subClassOf ep-prodwell:NonHcGas .
 
 ep-prodwell:Brine
@@ -24,9 +24,9 @@ ep-prodwell:Brine
       rdfs:label "brine"^^xsd:string ;
       rdfs:subClassOf ep-well:Water .
 
-ep-prodwell:Co2
-      rdf:type ep-prodwell:InjectionFluidType , owl:Class ;
-      rdfs:label "CO2"^^xsd:string ;
+ep-prodwell:CO2-gas
+      rdf:type owl:Class , ep-prodwell:InjectionFluidType ;
+      rdfs:label "CO2 gas"^^xsd:string ;
       rdfs:subClassOf ep-prodwell:NonHcGas .
 
 ep-prodwell:DryFluid