Merge branch 'MPR_03-22'

David Leal
Commit 24157f1b882a202d7e64391f33a19dc437c1ebb5 24157f1b 2 parents f905d757 578aba72
Showing 2 changed files with 197 additions and 192 deletions
www.reportinghub.no/ep/schema/1.0/SCHEMA_EP-FLOW-v1.0.ttl
www.reportinghub.no/test/mpr/testcase/complete_population_of_mpr_productVolume_data.xml
--- a/www.reportinghub.no/ep/schema/1.0/SCHEMA_EP-FLOW-v1.0.ttl
View file @24157f1
+++ b/www.reportinghub.no/ep/schema/1.0/SCHEMA_EP-FLOW-v1.0.ttl
View file @24157f1
@@ -19,16 +19,16 @@
 <http://www.reportinghub.no/ep/schema/1.0/flow>
       rdf:type owl:Ontology ;
-      owl:imports <http://www.reportinghub.no/ep/schema/1.0/production-activity> , <http://www.reportinghub.no/ep/schema/1.0/production-core> , <http://www.reportinghub.no/ep/schema/1.0/material> , <http://www.reportinghub.no/ep/schema/1.0/core> , <http://www.reportinghub.no/ep/schema/1.0/facility> ;
+      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/material> , <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
-      rdf:type owl:Class , ep-flow:ProductionFlowDefinitionType ;
+      rdf:type ep-flow:ProductionFlowDefinitionType , owl:Class ;
       rdfs:label "allocated flow"^^xsd:string ;
       rdfs:subClassOf ep-flow:WholeLifeFlow .
 ep-flow:BudgetFlow
-      rdf:type owl:Class , ep-flow:ProductionFlowDefinitionType ;
+      rdf:type ep-flow:ProductionFlowDefinitionType , owl:Class ;
       rdfs:label "budget flow"^^xsd:string ;
       rdfs:subClassOf ep-flow:WholeLifeFlow .
@@ -38,82 +38,82 @@ ep-flow:ClassOfMaterialWithMassCriterion
       rdfs:subClassOf owl:Class .
 ep-flow:Condensate-grossFlow
-      rdf:type owl:Class , ep-flow:ProductMaterialType ;
+      rdf:type ep-flow:ProductMaterialType , owl:Class ;
       rdfs:label "condensate - gross flow"^^xsd:string ;
       rdfs:subClassOf ep-flow:WholeLifeFlow .
 ep-flow:Condensate-netFlow
-      rdf:type owl:Class , ep-flow:ProductMaterialType ;
+      rdf:type ep-flow:ProductMaterialType , owl:Class ;
       rdfs:label "condensate - net flow"^^xsd:string ;
       rdfs:subClassOf ep-flow:WholeLifeFlow .
 ep-flow:ConstraintFlow
-      rdf:type ep-flow:ProductionFlowDefinitionType , owl:Class ;
+      rdf:type owl:Class , ep-flow:ProductionFlowDefinitionType ;
       rdfs:label "constraint flow"^^xsd:string ;
       rdfs:subClassOf ep-flow:WholeLifeFlow .
 ep-flow:ConstraintFlow-fixed
-      rdf:type owl:Class , ep-flow:ProductionFlowDefinitionType ;
+      rdf:type ep-flow:ProductionFlowDefinitionSubType , owl:Class ;
       rdfs:label "constraint flow - fixed"^^xsd:string ;
       rdfs:subClassOf ep-flow:ConstraintFlow .
 ep-flow:ConstraintFlow-maximum
-      rdf:type owl:Class , ep-flow:ProductionFlowDefinitionType ;
+      rdf:type ep-flow:ProductionFlowDefinitionSubType , owl:Class ;
       rdfs:label "constraint flow - maximum"^^xsd:string ;
       rdfs:subClassOf ep-flow:ConstraintFlow .
 ep-flow:ConstraintFlow-minimum
-      rdf:type owl:Class , ep-flow:ProductionFlowDefinitionType ;
+      rdf:type ep-flow:ProductionFlowDefinitionSubType , owl:Class ;
       rdfs:label "constraint flow - minimum"^^xsd:string ;
       rdfs:subClassOf ep-flow:ConstraintFlow .
 ep-flow:Consume
-      rdf:type owl:Class , ep-flow:ProductionFlowPurposeType ;
+      rdf:type ep-flow:ProductionFlowPurposeType , owl:Class ;
       rdfs:label "consume"^^xsd:string ;
       rdfs:subClassOf ep-flow:WholeLifeFlow .
 ep-flow:Consume-HPflare
-      rdf:type owl:Class , ep-flow:ProductionFlowPurposeType ;
+      rdf:type ep-flow:ProductionFlowPurposeType , owl:Class ;
       rdfs:label "consume - HP flare"^^xsd:string ;
       rdfs:subClassOf ep-flow:Consume-flare .
 ep-flow:Consume-LPflare
-      rdf:type owl:Class , ep-flow:ProductionFlowPurposeType ;
+      rdf:type ep-flow:ProductionFlowPurposeType , owl:Class ;
       rdfs:label "consume - LP flare"^^xsd:string ;
       rdfs:subClassOf ep-flow:Consume-flare .
 ep-flow:Consume-blackstart
-      rdf:type owl:Class , ep-flow:ProductionFlowPurposeType ;
+      rdf:type ep-flow:ProductionFlowPurposeType , owl:Class ;
       rdfs:label "consume - blackstart"^^xsd:string ;
       rdfs:subClassOf ep-flow:Consume .
 ep-flow:Consume-compressor
-      rdf:type owl:Class , ep-flow:ProductionFlowPurposeType ;
+      rdf:type ep-flow:ProductionFlowPurposeType , owl:Class ;
       rdfs:label "consume - compressor"^^xsd:string ;
       rdfs:subClassOf ep-flow:Consume .
 ep-flow:Consume-emitted
-      rdf:type owl:Class , ep-flow:ProductionFlowPurposeType ;
+      rdf:type ep-flow:ProductionFlowPurposeType , owl:Class ;
       rdfs:label "consume - emitted"^^xsd:string ;
       rdfs:subClassOf ep-flow:Consume .
 ep-flow:Consume-flare
-      rdf:type owl:Class , ep-flow:ProductionFlowPurposeType ;
+      rdf:type ep-flow:ProductionFlowPurposeType , owl:Class ;
       rdfs:label "consume - flare"^^xsd:string ;
       rdfs:subClassOf ep-flow:Consume .
 ep-flow:Consume-fuel
-      rdf:type owl:Class , ep-flow:ProductionFlowPurposeType ;
+      rdf:type ep-flow:ProductionFlowPurposeType , owl:Class ;
       rdfs:label "consume - fuel"^^xsd:string ;
       rdfs:subClassOf ep-flow:Consume .
 ep-flow:Consume-noncompressor
-      rdf:type owl:Class , ep-flow:ProductionFlowPurposeType ;
+      rdf:type ep-flow:ProductionFlowPurposeType , owl:Class ;
       rdfs:label "consume - non-compressor"^^xsd:string ;
       rdfs:subClassOf ep-flow:Consume .
 ep-flow:Consume-venting
-      rdf:type owl:Class , ep-flow:ProductionFlowPurposeType ;
+      rdf:type ep-flow:ProductionFlowPurposeType , owl:Class ;
       rdfs:label "consume - venting"^^xsd:string ;
       rdfs:subClassOf ep-flow:Consume .
@@ -123,17 +123,17 @@ ep-flow:DailyProductionFlow
       rdfs:subClassOf ep-flow:ProductionFlow .
 ep-flow:DerivedFlow
-      rdf:type ep-flow:ProductionFlowDefinitionType , owl:Class ;
+      rdf:type owl:Class , ep-flow:ProductionFlowDefinitionType ;
       rdfs:label "derived flow"^^xsd:string ;
       rdfs:subClassOf ep-flow:WholeLifeFlow .
 ep-flow:DerivedFlow-difference
-      rdf:type ep-flow:ProductionFlowDefinitionType , owl:Class ;
+      rdf:type ep-flow:ProductionFlowDefinitionSubType , owl:Class ;
       rdfs:label "derived flow - difference"^^xsd:string ;
       rdfs:subClassOf ep-flow:DerivedFlow .
 ep-flow:DifferenceFlow
-      rdf:type ep-flow:ProductionFlowDefinitionType , owl:Class ;
+      rdf:type owl:Class , ep-flow:ProductionFlowDefinitionType ;
       rdfs:label "difference flow"^^xsd:string ;
       rdfs:subClassOf ep-flow:WholeLifeFlow .
@@ -143,27 +143,27 @@ ep-flow:ElectricPowerFlow
       rdfs:subClassOf ep-flow:Flow .
 ep-flow:EstimatedFlow
-      rdf:type owl:Class , ep-flow:ProductionFlowDefinitionType ;
+      rdf:type ep-flow:ProductionFlowDefinitionType , owl:Class ;
       rdfs:label "estimated flow"^^xsd:string ;
       rdfs:subClassOf ep-flow:WholeLifeFlow .
 ep-flow:Export
-      rdf:type owl:Class , ep-flow:ProductionFlowPurposeType ;
+      rdf:type ep-flow:ProductionFlowPurposeType , owl:Class ;
       rdfs:label "export"^^xsd:string ;
       rdfs:subClassOf ep-flow:WholeLifeFlow .
 ep-flow:Export-nominated
-      rdf:type owl:Class , ep-flow:ProductionFlowPurposeType ;
+      rdf:type ep-flow:ProductionFlowPurposeType , owl:Class ;
       rdfs:label "export nominated"^^xsd:string ;
       rdfs:subClassOf ep-flow:Export .
 ep-flow:Export-requested
-      rdf:type owl:Class , ep-flow:ProductionFlowPurposeType ;
+      rdf:type ep-flow:ProductionFlowPurposeType , owl:Class ;
       rdfs:label "export requested"^^xsd:string ;
       rdfs:subClassOf ep-flow:Export .
 ep-flow:Export-shortfall
-      rdf:type owl:Class , ep-flow:ProductionFlowPurposeType ;
+      rdf:type ep-flow:ProductionFlowPurposeType , owl:Class ;
       rdfs:label "export shortfall"^^xsd:string ;
       rdfs:subClassOf ep-flow:Export .
@@ -173,42 +173,42 @@ ep-flow:Flow
       rdfs:subClassOf ep-core:PhysicalThing .
 ep-flow:FlowAtInstant
-      rdf:type owl:Class , ep-flow:TemporalPartOfAFlowDurationType ;
+      rdf:type ep-flow:TemporalPartOfAFlowDurationType , owl:Class ;
       rdfs:label "flow at instant"^^xsd:string ;
       rdfs:subClassOf ep-flow:Flow .
 ep-flow:FlowDuringDay
-      rdf:type owl:Class , ep-flow:TemporalPartOfAFlowDurationType ;
+      rdf:type ep-flow:TemporalPartOfAFlowDurationType , owl:Class ;
       rdfs:label "flow during day"^^xsd:string ;
       rdfs:subClassOf ep-flow:FlowDuringPeriod .
 ep-flow:FlowDuringMonth
-      rdf:type ep-flow:TemporalPartOfAFlowDurationType , owl:Class ;
+      rdf:type owl:Class , ep-flow:TemporalPartOfAFlowDurationType ;
       rdfs:label "flow during month"^^xsd:string ;
       rdfs:subClassOf ep-flow:FlowDuringPeriod .
 ep-flow:FlowDuringMonthToDate
-      rdf:type ep-flow:TemporalPartOfAFlowDurationType , owl:Class ;
+      rdf:type owl:Class , ep-flow:TemporalPartOfAFlowDurationType ;
       rdfs:label "flow during month to date"^^xsd:string ;
       rdfs:subClassOf ep-flow:FlowDuringPeriod .
 ep-flow:FlowDuringPeriod
-      rdf:type owl:Class , ep-flow:TemporalPartOfAFlowDurationType ;
+      rdf:type ep-flow:TemporalPartOfAFlowDurationType , owl:Class ;
       rdfs:label "flow during period"^^xsd:string ;
       rdfs:subClassOf ep-flow:Flow .
 ep-flow:FlowDuringWeek
-      rdf:type ep-flow:TemporalPartOfAFlowDurationType , owl:Class ;
+      rdf:type owl:Class , ep-flow:TemporalPartOfAFlowDurationType ;
       rdfs:label "flow during week"^^xsd:string ;
       rdfs:subClassOf ep-flow:FlowDuringPeriod .
 ep-flow:FlowDuringYear
-      rdf:type owl:Class , ep-flow:TemporalPartOfAFlowDurationType ;
+      rdf:type ep-flow:TemporalPartOfAFlowDurationType , owl:Class ;
       rdfs:label "flow during year"^^xsd:string ;
       rdfs:subClassOf ep-flow:FlowDuringPeriod .
 ep-flow:FlowDuringYearToDate
-      rdf:type ep-flow:TemporalPartOfAFlowDurationType , owl:Class ;
+      rdf:type owl:Class , ep-flow:TemporalPartOfAFlowDurationType ;
       rdfs:label "flow during year to date"^^xsd:string ;
       rdfs:subClassOf ep-flow:FlowDuringPeriod .
@@ -218,122 +218,122 @@ ep-flow:FlowOfLiquid
       rdfs:subClassOf ep-core:PhysicalThing .
 ep-flow:ForecastFlow
-      rdf:type ep-flow:ProductionFlowDefinitionType , owl:Class ;
+      rdf:type owl:Class , ep-flow:ProductionFlowDefinitionType ;
       rdfs:label "forecast flow"^^xsd:string ;
       rdfs:subClassOf ep-flow:WholeLifeFlow .
 ep-flow:ForecastFlow-declineCurve
-      rdf:type owl:Class , ep-flow:ProductionFlowDefinitionType ;
+      rdf:type ep-flow:ProductionFlowDefinitionSubType , owl:Class ;
       rdfs:label "forecast flow - decline curve"^^xsd:string ;
       rdfs:subClassOf ep-flow:ForecastFlow .
 ep-flow:ForecastFlow-standard
-      rdf:type owl:Class , ep-flow:ProductionFlowDefinitionType ;
+      rdf:type ep-flow:ProductionFlowDefinitionSubType , owl:Class ;
       rdfs:label "forecast flow - standard"^^xsd:string ;
       rdfs:subClassOf ep-flow:ForecastFlow .
 ep-flow:Gaslift
-      rdf:type owl:Class , ep-flow:ProductionFlowPurposeType ;
+      rdf:type ep-flow:ProductionFlowPurposeType , owl:Class ;
       rdfs:label "gas lift"^^xsd:string ;
       rdfs:subClassOf ep-flow:WholeLifeFlow .
 ep-flow:GrossProductFlow
-      rdf:type owl:Class , ep-flow:ProductFlowGrossOrNetType ;
+      rdf:type ep-flow:ProductFlowGrossOrNetType , owl:Class ;
       rdfs:label "gross product flow"^^xsd:string ;
       rdfs:subClassOf ep-flow:ProductFlow .
 ep-flow:HydrocarbonAccounting
-      rdf:type owl:Class , ep-flow:ProductionFlowPurposeType ;
+      rdf:type ep-flow:ProductionFlowPurposeType , owl:Class ;
       rdfs:label "hydrocarbon accounting"^^xsd:string ;
       rdfs:subClassOf ep-flow:WholeLifeFlow .
 ep-flow:Import
-      rdf:type owl:Class , ep-flow:ProductionFlowPurposeType ;
+      rdf:type ep-flow:ProductionFlowPurposeType , owl:Class ;
       rdfs:label "import"^^xsd:string ;
       rdfs:subClassOf ep-flow:WholeLifeFlow .
 ep-flow:Injection
-      rdf:type owl:Class , ep-flow:ProductionFlowPurposeType ;
+      rdf:type ep-flow:ProductionFlowPurposeType , owl:Class ;
       rdfs:label "injection"^^xsd:string ;
       rdfs:subClassOf ep-flow:WholeLifeFlow .
 ep-flow:Inventory
-      rdf:type owl:Class , ep-flow:ProductionFlowPurposeType ;
+      rdf:type ep-flow:ProductionFlowPurposeType , owl:Class ;
       rdfs:label "inventory"^^xsd:string ;
       rdfs:subClassOf ep-flow:WholeLifeFlow .
 ep-flow:MeasuredFlow
-      rdf:type owl:Class , ep-flow:ProductionFlowDefinitionType ;
+      rdf:type ep-flow:ProductionFlowDefinitionType , owl:Class ;
       rdfs:label "measured flow"^^xsd:string ;
       rdfs:subClassOf ep-flow:WholeLifeFlow .
 ep-flow:MeasuredFlow-fiscal
-      rdf:type owl:Class , ep-flow:ProductionFlowDefinitionType ;
+      rdf:type ep-flow:ProductionFlowDefinitionSubType , owl:Class ;
       rdfs:label "measured flow - fiscal"^^xsd:string ;
       rdfs:subClassOf ep-flow:MeasuredFlow .
 ep-flow:MeasuredFlow-raw
-      rdf:type owl:Class , ep-flow:ProductionFlowDefinitionType ;
+      rdf:type ep-flow:ProductionFlowDefinitionSubType , owl:Class ;
       rdfs:label "measured flow - raw"^^xsd:string ;
       rdfs:subClassOf ep-flow:MeasuredFlow .
 ep-flow:MeasuredFlow-recalibrated
-      rdf:type owl:Class , ep-flow:ProductionFlowDefinitionType ;
+      rdf:type ep-flow:ProductionFlowDefinitionSubType , owl:Class ;
       rdfs:label "measured flow - recalibrated"^^xsd:string ;
       rdfs:subClassOf ep-flow:MeasuredFlow .
 ep-flow:NetProductFlow
-      rdf:type owl:Class , ep-flow:ProductFlowGrossOrNetType ;
+      rdf:type ep-flow:ProductFlowGrossOrNetType , owl:Class ;
       rdfs:label "net product flow"^^xsd:string ;
       rdfs:subClassOf ep-flow:ProductFlow .
 ep-flow:NominatedFlow
-      rdf:type ep-flow:ProductionFlowDefinitionType , owl:Class ;
+      rdf:type owl:Class , ep-flow:ProductionFlowDefinitionType ;
       rdfs:label "nominated flow"^^xsd:string ;
       rdfs:subClassOf ep-flow:WholeLifeFlow .
 ep-flow:ObjectThatLastsOneDay
-      rdf:type ep-flow:TemporalPartDurationType , owl:Class ;
+      rdf:type owl:Class , ep-flow:TemporalPartDurationType ;
       rdfs:label "object that lasts one day"^^xsd:string ;
       rdfs:subClassOf ep-core:PhysicalObject .
 ep-flow:ObjectThatLastsOneMonth
-      rdf:type ep-flow:TemporalPartDurationType , owl:Class ;
+      rdf:type owl:Class , ep-flow:TemporalPartDurationType ;
       rdfs:label "object that lasts one month"^^xsd:string ;
       rdfs:subClassOf ep-core:PhysicalObject .
 ep-flow:ObjectThatLastsOneWeek
-      rdf:type ep-flow:TemporalPartDurationType , owl:Class ;
+      rdf:type owl:Class , ep-flow:TemporalPartDurationType ;
       rdfs:label "object that lasts one week"^^xsd:string ;
       rdfs:subClassOf ep-core:PhysicalObject .
 ep-flow:ObjectThatLastsOneYear
-      rdf:type ep-flow:TemporalPartDurationType , owl:Class ;
+      rdf:type owl:Class , ep-flow:TemporalPartDurationType ;
       rdfs:label "object that lasts one year"^^xsd:string ;
       rdfs:subClassOf ep-core:PhysicalObject .
 ep-flow:Oil-grossFlow
-      rdf:type owl:Class , ep-flow:ProductMaterialType ;
+      rdf:type ep-flow:ProductMaterialType , owl:Class ;
       rdfs:label "oil - gross flow"^^xsd:string ;
       rdfs:subClassOf ep-flow:WholeLifeFlow .
 ep-flow:Oil-netFlow
-      rdf:type owl:Class , ep-flow:ProductMaterialType ;
+      rdf:type ep-flow:ProductMaterialType , owl:Class ;
       rdfs:label "oil - net flow"^^xsd:string ;
       rdfs:subClassOf ep-flow:WholeLifeFlow .
 ep-flow:Overboard
-      rdf:type owl:Class , ep-flow:ProductionFlowPurposeType ;
+      rdf:type ep-flow:ProductionFlowPurposeType , owl:Class ;
       rdfs:label "overboard"^^xsd:string ;
       rdfs:subClassOf ep-flow:WholeLifeFlow .
 ep-flow:PotentialFlow
-      rdf:type ep-flow:ProductionFlowDefinitionType , owl:Class ;
+      rdf:type owl:Class , ep-flow:ProductionFlowDefinitionType ;
       rdfs:label "potential flow"^^xsd:string ;
       rdfs:subClassOf ep-flow:WholeLifeFlow .
 ep-flow:ProcessedFlow
-      rdf:type ep-flow:ProductionFlowDefinitionType , owl:Class ;
+      rdf:type owl:Class , ep-flow:ProductionFlowDefinitionType ;
       rdfs:label "processed flow"^^xsd:string ;
       rdfs:subClassOf ep-flow:WholeLifeFlow .
@@ -358,27 +358,27 @@ ep-flow:ProductInventory
       rdfs:subClassOf ep-material:QuantityOfMaterial .
 ep-flow:ProductInventoryAdjustedClosingBalance
-      rdf:type ep-flow:ProductInventoryType , owl:Class ;
+      rdf:type owl:Class , ep-flow:ProductInventoryType ;
       rdfs:label "product inventory adjusted closing balance"^^xsd:string ;
       rdfs:subClassOf ep-flow:ProductInventory .
 ep-flow:ProductInventoryClosingBalance
-      rdf:type ep-flow:ProductInventoryType , owl:Class ;
+      rdf:type owl:Class , ep-flow:ProductInventoryType ;
       rdfs:label "product inventory closing balance"^^xsd:string ;
       rdfs:subClassOf ep-flow:ProductInventory .
 ep-flow:ProductInventoryClosingStorageBalance
-      rdf:type ep-flow:ProductInventoryType , owl:Class ;
+      rdf:type owl:Class , ep-flow:ProductInventoryType ;
       rdfs:label "product inventory closing storage balance"^^xsd:string ;
       rdfs:subClassOf ep-flow:ProductInventory .
 ep-flow:ProductInventoryOpFlex
-      rdf:type ep-flow:ProductInventoryType , owl:Class ;
+      rdf:type owl:Class , ep-flow:ProductInventoryType ;
       rdfs:label "product inventory opFlex"^^xsd:string ;
       rdfs:subClassOf ep-flow:ProductInventory .
 ep-flow:ProductInventoryOpeningBalance
-      rdf:type ep-flow:ProductInventoryType , owl:Class ;
+      rdf:type owl:Class , ep-flow:ProductInventoryType ;
       rdfs:label "product inventory opening balance"^^xsd:string ;
       rdfs:subClassOf ep-flow:ProductInventory .
@@ -393,7 +393,7 @@ ep-flow:ProductMaterialType
       rdfs:subClassOf owl:Class .
 ep-flow:Production
-      rdf:type owl:Class , ep-flow:ProductionFlowPurposeType ;
+      rdf:type ep-flow:ProductionFlowPurposeType , owl:Class ;
       rdfs:label "production"^^xsd:string ;
       rdfs:subClassOf ep-flow:WholeLifeFlow .
@@ -402,6 +402,11 @@ ep-flow:ProductionFlow
       rdfs:label "(temporal part of a) production flow"^^xsd:string ;
       rdfs:subClassOf ep-flow:Flow .
+ep-flow:ProductionFlowDefinitionSubType
+      rdf:type rdfs:Class ;
+      rdfs:label " production flow definition subtype"^^xsd:string ;
+      rdfs:subClassOf owl:Class .
+
 ep-flow:ProductionFlowDefinitionType
       rdf:type rdfs:Class ;
       rdfs:label " production flow definition type"^^xsd:string ;
@@ -423,37 +428,37 @@ ep-flow:ProductionInventory
       rdfs:subClassOf ep-material:QuantityOfMaterial .
 ep-flow:ProductionInventoryAllocatedMaterial
-      rdf:type owl:Class , ep-flow:ProductionInventoryMaterialType ;
+      rdf:type ep-flow:ProductionInventoryMaterialType , owl:Class ;
       rdfs:label "production inventory allocated material"^^xsd:string ;
       rdfs:subClassOf ep-flow:ProductionInventory .
 ep-flow:ProductionInventoryBudgetMaterial
-      rdf:type owl:Class , ep-flow:ProductionInventoryMaterialType ;
+      rdf:type ep-flow:ProductionInventoryMaterialType , owl:Class ;
       rdfs:label "production inventory budget  material"^^xsd:string ;
       rdfs:subClassOf ep-flow:ProductionInventory .
 ep-flow:ProductionInventoryConstraintMaterial
-      rdf:type owl:Class , ep-flow:ProductionInventoryMaterialType ;
+      rdf:type ep-flow:ProductionInventoryMaterialType , owl:Class ;
       rdfs:label "production inventory constraint  material"^^xsd:string ;
       rdfs:subClassOf ep-flow:ProductionInventory .
 ep-flow:ProductionInventoryDerivedMaterial
-      rdf:type owl:Class , ep-flow:ProductionInventoryMaterialType ;
+      rdf:type ep-flow:ProductionInventoryMaterialType , owl:Class ;
       rdfs:label "production inventory derived  material"^^xsd:string ;
       rdfs:subClassOf ep-flow:ProductionInventory .
 ep-flow:ProductionInventoryDifferenceMaterial
-      rdf:type ep-flow:ProductionInventoryMaterialType , owl:Class ;
+      rdf:type owl:Class , ep-flow:ProductionInventoryMaterialType ;
       rdfs:label "production inventory difference  material"^^xsd:string ;
       rdfs:subClassOf ep-flow:ProductionInventory .
 ep-flow:ProductionInventoryEstimatedMaterial
-      rdf:type owl:Class , ep-flow:ProductionInventoryMaterialType ;
+      rdf:type ep-flow:ProductionInventoryMaterialType , owl:Class ;
       rdfs:label "production inventory estimated  material"^^xsd:string ;
       rdfs:subClassOf ep-flow:ProductionInventory .
 ep-flow:ProductionInventoryForecastMaterial
-      rdf:type owl:Class , ep-flow:ProductionInventoryMaterialType ;
+      rdf:type ep-flow:ProductionInventoryMaterialType , owl:Class ;
       rdfs:label "production inventory forecast material"^^xsd:string ;
       rdfs:subClassOf ep-flow:ProductionInventory .
@@ -463,47 +468,47 @@ ep-flow:ProductionInventoryMaterialType
       rdfs:subClassOf owl:Class .
 ep-flow:ProductionInventoryMeasuredMaterial
-      rdf:type owl:Class , ep-flow:ProductionInventoryMaterialType ;
+      rdf:type ep-flow:ProductionInventoryMaterialType , owl:Class ;
       rdfs:label "production inventory measured material"^^xsd:string ;
       rdfs:subClassOf ep-flow:ProductionInventory .
 ep-flow:ProductionInventoryNominatedMaterial
-      rdf:type owl:Class , ep-flow:ProductionInventoryMaterialType ;
+      rdf:type ep-flow:ProductionInventoryMaterialType , owl:Class ;
       rdfs:label "production inventory nominated material"^^xsd:string ;
       rdfs:subClassOf ep-flow:ProductionInventory .
 ep-flow:ProductionInventoryPotentialMaterial
-      rdf:type owl:Class , ep-flow:ProductionInventoryMaterialType ;
+      rdf:type ep-flow:ProductionInventoryMaterialType , owl:Class ;
       rdfs:label "production inventory potential material"^^xsd:string ;
       rdfs:subClassOf ep-flow:ProductionInventory .
 ep-flow:ProductionInventoryProcessedMaterial
-      rdf:type owl:Class , ep-flow:ProductionInventoryMaterialType ;
+      rdf:type ep-flow:ProductionInventoryMaterialType , owl:Class ;
       rdfs:label "production inventory processed material"^^xsd:string ;
       rdfs:subClassOf ep-flow:ProductionInventory .
 ep-flow:ProductionInventoryQuotaMaterial
-      rdf:type owl:Class , ep-flow:ProductionInventoryMaterialType ;
+      rdf:type ep-flow:ProductionInventoryMaterialType , owl:Class ;
       rdfs:label "production inventory quota material"^^xsd:string ;
       rdfs:subClassOf ep-flow:ProductionInventory .
 ep-flow:ProductionInventoryRecommendedMaterial
-      rdf:type owl:Class , ep-flow:ProductionInventoryMaterialType ;
+      rdf:type ep-flow:ProductionInventoryMaterialType , owl:Class ;
       rdfs:label "production inventory recommended material"^^xsd:string ;
       rdfs:subClassOf ep-flow:ProductionInventory .
 ep-flow:ProductionInventorySaleableMaterial
-      rdf:type owl:Class , ep-flow:ProductionInventoryMaterialType ;
+      rdf:type ep-flow:ProductionInventoryMaterialType , owl:Class ;
       rdfs:label "production inventory saleable material"^^xsd:string ;
       rdfs:subClassOf ep-flow:ProductionInventory .
 ep-flow:ProductionInventorySimulatedMaterial
-      rdf:type owl:Class , ep-flow:ProductionInventoryMaterialType ;
+      rdf:type ep-flow:ProductionInventoryMaterialType , owl:Class ;
       rdfs:label "production inventory simulated material"^^xsd:string ;
       rdfs:subClassOf ep-flow:ProductionInventory .
 ep-flow:ProductionInventoryTargetMaterial
-      rdf:type owl:Class , ep-flow:ProductionInventoryMaterialType ;
+      rdf:type ep-flow:ProductionInventoryMaterialType , owl:Class ;
       rdfs:label "production inventory target material"^^xsd:string ;
       rdfs:subClassOf ep-flow:ProductionInventory .
@@ -533,22 +538,22 @@ ep-flow:ProductionTestWellHeadFlow
       rdfs:subClassOf ep-flow:WholeLifeFlow .
 ep-flow:QuotaFlow
-      rdf:type owl:Class , ep-flow:ProductionFlowDefinitionType ;
+      rdf:type ep-flow:ProductionFlowDefinitionType , owl:Class ;
       rdfs:label "quota flow"^^xsd:string ;
       rdfs:subClassOf ep-flow:WholeLifeFlow .
 ep-flow:RecommendedFlow
-      rdf:type ep-flow:ProductionFlowDefinitionType , owl:Class ;
+      rdf:type owl:Class , ep-flow:ProductionFlowDefinitionType ;
       rdfs:label "recommended flow"^^xsd:string ;
       rdfs:subClassOf ep-flow:WholeLifeFlow .
 ep-flow:Sale
-      rdf:type owl:Class , ep-flow:ProductionFlowPurposeType ;
+      rdf:type ep-flow:ProductionFlowPurposeType , owl:Class ;
       rdfs:label "sale"^^xsd:string ;
       rdfs:subClassOf ep-flow:WholeLifeFlow .
 ep-flow:SaleableFlow
-      rdf:type ep-flow:ProductionFlowDefinitionType , owl:Class ;
+      rdf:type owl:Class , ep-flow:ProductionFlowDefinitionType ;
       rdfs:label "saleable flow"^^xsd:string ;
       rdfs:subClassOf ep-flow:WholeLifeFlow .
@@ -557,17 +562,17 @@ ep-flow:SampleOfMaterial
       rdfs:subClassOf ep-material:QuantityOfMaterial .
 ep-flow:SimulatedFlow
-      rdf:type owl:Class , ep-flow:ProductionFlowDefinitionType ;
+      rdf:type ep-flow:ProductionFlowDefinitionType , owl:Class ;
       rdfs:label "simulated flow"^^xsd:string ;
       rdfs:subClassOf ep-flow:WholeLifeFlow .
 ep-flow:Storage
-      rdf:type owl:Class , ep-flow:ProductionFlowPurposeType ;
+      rdf:type ep-flow:ProductionFlowPurposeType , owl:Class ;
       rdfs:label "storage"^^xsd:string ;
       rdfs:subClassOf ep-flow:WholeLifeFlow .
 ep-flow:TargetFlow
-      rdf:type ep-flow:ProductionFlowDefinitionType , owl:Class ;
+      rdf:type owl:Class , ep-flow:ProductionFlowDefinitionType ;
       rdfs:label "target flow"^^xsd:string ;
       rdfs:subClassOf ep-flow:WholeLifeFlow .
@@ -589,7 +594,7 @@ ep-flow:WholeLifeFlow
 ep-flow:WholeLifeProductFlow
       rdf:type owl:Class ;
       rdfs:label "whole life product flow"^^xsd:string ;
-      rdfs:subClassOf ep-flow:ProductFlow , ep-flow:WholeLifeFlow .
+      rdfs:subClassOf ep-flow:WholeLifeFlow , ep-flow:ProductFlow .
 ep-flow:WholeLifeProductInventory
       rdf:type owl:Class ;
@@ -599,7 +604,7 @@ ep-flow:WholeLifeProductInventory
 ep-flow:WholeLifeProductionFlow
       rdf:type owl:Class ;
       rdfs:label "whole life production flow"^^xsd:string ;
-      rdfs:subClassOf ep-flow:ProductionFlow , ep-flow:WholeLifeFlow .
+      rdfs:subClassOf ep-flow:WholeLifeFlow , ep-flow:ProductionFlow .
 ep-flow:WholeLifeProductionInventory
       rdf:type owl:Class ;
@@ -607,13 +612,13 @@ ep-flow:WholeLifeProductionInventory
       rdfs:subClassOf ep-flow:ProductionInventory .
 ep-flow:dailyAverageAmountOfMaterial
-      rdf:type owl:ObjectProperty , owl:FunctionalProperty ;
+      rdf:type owl:FunctionalProperty , owl:ObjectProperty ;
       rdfs:domain ep-flow:Flow ;
       rdfs:label "daily average amount of material"^^xsd:string ;
       rdfs:range ep-flow:ClassOfMaterialWithMassCriterion .
 ep-flow:energyContent
-      rdf:type ep-core:Class_of_indirect_property , owl:FunctionalProperty , owl:ObjectProperty ;
+      rdf:type owl:ObjectProperty , owl:FunctionalProperty , ep-core:Class_of_indirect_property ;
       rdfs:domain ep-material:QuantityOfMaterial ;
       rdfs:label "energy content"^^xsd:string ;
       rdfs:range ep-core:Work .
@@ -645,7 +650,7 @@ ep-flow:flowOutOf
       rdfs:subPropertyOf ep-flow:flowIntoOrOutOf .
 ep-flow:grossCalorificValue
-      rdf:type ep-core:Class_of_indirect_property , owl:FunctionalProperty , owl:ObjectProperty ;
+      rdf:type owl:ObjectProperty , owl:FunctionalProperty , ep-core:Class_of_indirect_property ;
       rdfs:domain ep-material:QuantityOfMaterial ;
       rdfs:label "gross calorific value"^^xsd:string ;
       rdfs:range ep-core:EnergyPerVolume .
@@ -665,23 +670,23 @@ ep-flow:hasNetworkPart
       rdfs:subPropertyOf ep-core:hasPart .
 ep-flow:materialThatFlows
-      rdf:type owl:ObjectProperty , owl:FunctionalProperty ;
+      rdf:type owl:FunctionalProperty , owl:ObjectProperty ;
       rdfs:domain ep-flow:Flow ;
       rdfs:label "material that flows"^^xsd:string ;
       rdfs:range ep-material:QuantityOfMaterial .
 ep-flow:rateOfFlowOfMaterial
-      rdf:type owl:FunctionalProperty , owl:ObjectProperty ;
+      rdf:type owl:ObjectProperty , owl:FunctionalProperty ;
       rdfs:label "rate of flow of material"^^xsd:string ;
       rdfs:range ep-core:MeasureOfAmountOfMaterial .
 ep-flow:totalVolumeOfMaterial-deprecated
-      rdf:type owl:ObjectProperty , owl:FunctionalProperty ;
+      rdf:type owl:FunctionalProperty , owl:ObjectProperty ;
       rdfs:label "total volume of material"^^xsd:string ;
       rdfs:range ep-core:MeasureOfAmountOfMaterial .
 ep-flow:yearlyAverageAmountOfMaterial
-      rdf:type owl:FunctionalProperty , owl:ObjectProperty ;
+      rdf:type owl:ObjectProperty , owl:FunctionalProperty ;
       rdfs:domain ep-flow:Flow ;
       rdfs:label "yearly average amount of material"^^xsd:string ;
       rdfs:range ep-flow:ClassOfMaterialWithMassCriterion .
@@ -792,7 +797,7 @@ ep-material:Gas-wet
       rdf:type ep-flow:ProductMaterialType .
 ep-material:HeliumGas
-      rdf:type ep-flow:ProductMaterialType , owl:Class .
+      rdf:type owl:Class , ep-flow:ProductMaterialType .
 ep-material:Heptane
       rdf:type ep-flow:ProductMaterialType .
@@ -870,14 +875,14 @@ ep-material:Oleic
       rdf:type ep-flow:ProductMaterialType .
 ep-material:Pentane
-      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
+      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_pentane> .
 ep-material:PetroleumGasLiquid
       rdf:type ep-flow:ProductMaterialType .
 ep-material:Propane
-      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType , ep-flow:ProductMaterialType ;
+      rdf:type ep-flow:ProductMaterialType , ep-well:FluidComponentType , ep-prodact:SubstanceType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_propane> .
 ep-material:Propane-component
@@ -905,361 +910,361 @@ ep-material:Water-processed
       rdf:type ep-flow:ProductMaterialType .
 ep-material:substance-11dmcyPentane
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_11dmcypentane> .
 ep-material:substance-124tmBenzene
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_124tmbenzene> .
 ep-material:substance-12dmBenzene
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_12dmbenzene> .
 ep-material:substance-13dmBenzene
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_13dmbenzene> .
 ep-material:substance-14dmBenzene
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_14dmbenzene> .
 ep-material:substance-223tmButane
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_223tmbutane> .
 ep-material:substance-223tmPentane
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_223tmpentane> .
 ep-material:substance-22dmButane
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_22dmbutane> .
 ep-material:substance-22dmHexane
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_22dmhexane> .
 ep-material:substance-22dmPentane
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_22dmpentane> .
 ep-material:substance-22dmPropane
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_22dmpropane> .
 ep-material:substance-23dmButane
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_23dmbutane> .
 ep-material:substance-23dmPentane
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_23dmpentane> .
 ep-material:substance-24dmHexane
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_24dmhexane> .
 ep-material:substance-24dmPentane
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_24dmpentane> .
 ep-material:substance-25dmHexane
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_25dmhexane> .
 ep-material:substance-2mButane
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_2mbutane> .
 ep-material:substance-2mHexane
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_2mhexane> .
 ep-material:substance-2mPentane
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_2mpentane> .
 ep-material:substance-2mPropane
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_2mpropane> .
 ep-material:substance-33dmPentane
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_33dmpentane> .
 ep-material:substance-3etPentane
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_3etpentane> .
 ep-material:substance-3mHexane
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_3mhexane> .
 ep-material:substance-3mPentane
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_3mpentane> .
 ep-material:substance-Ar
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_Ar> .
 ep-material:substance-Benzene
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_benzene> .
 ep-material:substance-Butane
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_butane> .
 ep-material:substance-C11F
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_C11F> .
 ep-material:substance-C12F
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_C12F> .
 ep-material:substance-C13F
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_C13F> .
 ep-material:substance-C13dmcyPentane
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_c13dmcypentane> .
 ep-material:substance-C14F
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_C14F> .
 ep-material:substance-C15F
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_C15F> .
 ep-material:substance-C16F
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_C16F> .
 ep-material:substance-C17F
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_C17F> .
 ep-material:substance-C18F
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_C18F> .
 ep-material:substance-C19F
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_C19F> .
 ep-material:substance-C20F
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_C20F> .
 ep-material:substance-C21F
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_C21F> .
 ep-material:substance-C22F
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_C22F> .
 ep-material:substance-C23F
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_C23F> .
 ep-material:substance-C24F
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_C24F> .
 ep-material:substance-C25F
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_C25F> .
 ep-material:substance-C26F
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_C26F> .
 ep-material:substance-C27F
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_C27F> .
 ep-material:substance-C28F
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_C28F> .
 ep-material:substance-C29F
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_C29F> .
 ep-material:substance-C30F
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_C30F> .
 ep-material:substance-C31F
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_C31F> .
 ep-material:substance-C32F
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_C32F> .
 ep-material:substance-C33F
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_C33F> .
 ep-material:substance-C34F
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_C34F> .
 ep-material:substance-C35F
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_C35F> .
 ep-material:substance-C36F
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_C36F> .
 ep-material:substance-C37F
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_C37F> .
 ep-material:substance-C38F
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_C38F> .
 ep-material:substance-C39F
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_C39F> .
 ep-material:substance-C40F
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_C40F> .
 ep-material:substance-C41F
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_C41F> .
 ep-material:substance-C42F
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_C42F> .
 ep-material:substance-C43F
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_C43F> .
 ep-material:substance-C44F
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_C44F> .
 ep-material:substance-C45F
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_C45F> .
 ep-material:substance-C46F
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_C46F> .
 ep-material:substance-C47F
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_C47F> .
 ep-material:substance-C48F
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_C48F> .
 ep-material:substance-C49F
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_C49F> .
 ep-material:substance-CO2
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_CO2> .
 ep-material:substance-Cyclohexane
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_cyclohexane> .
 ep-material:substance-Cyclopentane
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_cyclopentane> .
 ep-material:substance-Decanes
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_decanes> .
 ep-material:substance-EtBenzene
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_etbenzene> .
 ep-material:substance-EtcyPentane
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_etcypentane> .
 ep-material:substance-Ethane
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_ethane> .
 ep-material:substance-H2
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_H2> .
 ep-material:substance-H2O
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_H2O> .
 ep-material:substance-H2S
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_H2S> .
 ep-material:substance-Heptanes
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_heptanes> .
 ep-material:substance-Hexane
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_hexane> .
 ep-material:substance-Hexanes
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_hexanes> .
 ep-material:substance-MBenzene
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_mbenzene> .
 ep-material:substance-McyHexane
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_mcyhexane> .
 ep-material:substance-McyPentane
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_mcypentane> .
 ep-material:substance-Methane
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_methane> .
 ep-material:substance-N2
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_N2> .
 ep-material:substance-Nonanes
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_nonanes> .
 ep-material:substance-O2
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_O2> .
 ep-material:substance-Octanes
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_octanes> .
 ep-material:substance-T12dmcyPentane
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_t12dmcypentane> .
 ep-material:substance-T13dmcyPentane
-      rdf:type ep-well:FluidComponentType , ep-prodact:SubstanceType ;
+      rdf:type ep-prodact:SubstanceType , ep-well:FluidComponentType ;
       ep-prodcore:mapsTo <http://www.epim.no/schemas/mprml/1#FC_t13dmcypentane> .
--- a/www.reportinghub.no/test/mpr/testcase/complete_population_of_mpr_productVolume_data.xml
View file @24157f1
+++ b/www.reportinghub.no/test/mpr/testcase/complete_population_of_mpr_productVolume_data.xml
View file @24157f1
@@ -62,7 +62,7 @@
               <dateStart>2011-07-01</dateStart>
               <dateEnd>2011-07-31</dateEnd>
               <volumeValue>
-                <volume uom="m3">524.83</volume>
+                <volume uom="m3">624.83</volume>
                 <grossCalorificValue uom="MJ/m3">20</grossCalorificValue>
                 <temp uom="degC">15</temp>
                 <pres uom="atm">1</pres>
@@ -70,7 +70,7 @@
               </volumeValue>
               <mass uom="kg">62</mass>
               <densityValue>
-                <density uom="kg/m3">799.04</density>
+                <density uom="kg/m3">899.04</density>
                 <temp uom="degC">15</temp>
                 <pres uom="atm">1</pres>
               </densityValue>