Progress on commonPropertiesProductVolume

@@ -37,6 +37,11 @@ ep-core:AmountOfSubstancePair
       rdfs:label "amount of substance pair"^^xsd:string ;
       rdfs:subClassOf ep-core:Pair .
 
+ep-core:AmountOfSubstancePerAmountOfSubstance
+      rdf:type ep-core:PropertySpace , rdfs:Class ;
+      rdfs:label "amount of substance per amount of substance"^^xsd:string ;
+      rdfs:subClassOf ep-core:Ratio .
+
 ep-core:AmountOfSubstancePerMass
       rdf:type ep-core:PropertySpace , rdfs:Class ;
       rdfs:comment "the amount of substance per unit mass.  The SI unit is mole kilogram-1."^^xsd:string ;
@@ -1955,6 +1960,17 @@ ep-core:hasCompositionOfAllPartsOfDefinedType
       rdfs:label "has composition of all parts of defined type"^^xsd:string ;
       rdfs:range ep-core:CompositionOfAllPartsOfDefinedType .
 
+ep-core:hasCorrespondingTemporal
+      rdfs:comment "temporal part that is the corresponding temporal part in the preceding reporting period"^^xsd:string ;
+      rdfs:domain ep-core:PhysicalThing ;
+      rdfs:label "has corresponding temporal part in previous reporting period"^^xsd:string ;
+      rdfs:range ep-core:PhysicalThing .
+
+ep-core:hasCorrespondingTemporalPartInPrecedingReportingPeriod
+      rdf:type owl:ObjectProperty ;
+      rdfs:domain ep-core:PhysicalThing ;
+      rdfs:range ep-core:PhysicalThing .
+
 ep-core:hasFeature
       rdf:type owl:ObjectProperty ;
       rdfs:comment "physical feature that is of a physical thing"^^xsd:string ;

@@ -12,7 +12,7 @@
 
 <http://www.reportinghub.no/ep/schema/1.0/production-facility>
       rdf:type owl:Ontology ;
-      owl:imports <http://www.reportinghub.no/ep/schema/1.0/facility> , <http://www.reportinghub.no/ep/schema/1.0/organization> , <http://www.reportinghub.no/ep/schema/1.0/production-well> ;
+      owl:imports <http://www.reportinghub.no/ep/schema/1.0/production-well> , <http://www.reportinghub.no/ep/schema/1.0/organization> , <http://www.reportinghub.no/ep/schema/1.0/facility> ;
       owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
 
 <http://www.reportinghub.no/ep/schema/equipment#Compressor>
@@ -37,7 +37,7 @@
       rdfs:subClassOf ep-core:PhysicalObject .
 
 <http://www.reportinghub.no/ep/schema/facility#Field>
-      rdf:type ep-core:ClassNotInheritedByAStrictTemporalPart , ep-prodfac:ReportingFacilityType .
+      rdf:type ep-prodfac:ReportingFacilityType , ep-core:ClassNotInheritedByAStrictTemporalPart .
 
 <http://www.reportinghub.no/ep/schema/facility#Flowline>
       rdf:type ep-prodfac:ReportingFacilityType .
@@ -55,7 +55,7 @@
       rdf:type ep-core:ClassNotInheritedByAStrictTemporalPart .
 
 <http://www.reportinghub.no/ep/schema/facility#ProductionFacilityToDate>
-      rdf:type ep-core:ClassNotInheritedByAStrictTemporalPart , owl:Class ;
+      rdf:type owl:Class , ep-core:ClassNotInheritedByAStrictTemporalPart ;
       rdfs:comment "production facility that is for all of its life up to a point in time"^^xsd:string ;
       rdfs:label "production facility to date"^^xsd:string ;
       rdfs:subClassOf <http://www.reportinghub.no/ep/schema/facility#TemporalPartOfAProductionFacility> .
@@ -76,56 +76,56 @@
       rdf:type ep-prodfac:ReportingFacilityType .
 
 <http://www.reportinghub.no/ep/schema/facility#averageHighestThirdWaveHeight>
-      rdf:type owl:ObjectProperty , ep-core:Class_of_indirect_property , owl:FunctionalProperty ;
+      rdf:type owl:FunctionalProperty , ep-core:Class_of_indirect_property , owl:ObjectProperty ;
       rdfs:comment "length that is the average of the higher 1/3 of the wave heights passing during a sample period (typically 20 to 30 minutes) (source: MPR-XSD)"^^xsd:string ;
       rdfs:domain <http://www.reportinghub.no/ep/schema/facility#SurfaceWaves> ;
       rdfs:label "average highest third wave height"^^xsd:string ;
       rdfs:range ep-core:Length .
 
 <http://www.reportinghub.no/ep/schema/facility#averageWaveHeight>
-      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:comment "length that is the average height of surface waves"^^xsd:string ;
       rdfs:domain <http://www.reportinghub.no/ep/schema/facility#SurfaceWaves> ;
       rdfs:label "average wave height"^^xsd:string ;
       rdfs:range ep-core:Length .
 
 <http://www.reportinghub.no/ep/schema/facility#cloudCeilingHeight>
-      rdf:type owl:ObjectProperty , ep-core:Class_of_indirect_property , owl:FunctionalProperty ;
+      rdf:type owl:FunctionalProperty , ep-core:Class_of_indirect_property , owl:ObjectProperty ;
       rdfs:comment "length that is the height of the cloud ceiling"^^xsd:string ;
       rdfs:domain <http://www.reportinghub.no/ep/schema/facility#CloudCover> ;
       rdfs:label "cloud ceiling height"^^xsd:string ;
       rdfs:range ep-core:Length .
 
 <http://www.reportinghub.no/ep/schema/facility#facilityOperator>
-      rdf:type owl:ObjectProperty , owl:FunctionalProperty , ep-core:Class_of_indirect_property ;
+      rdf:type ep-core:Class_of_indirect_property , owl:FunctionalProperty , owl:ObjectProperty ;
       rdfs:comment "organization that operates a facility"^^xsd:string ;
       rdfs:domain <http://www.reportinghub.no/ep/schema/facility#Facility> ;
       rdfs:label "facility operator"^^xsd:string ;
       rdfs:range <http://www.reportinghub.no/ep/schema/organization#Organization> .
 
 <http://www.reportinghub.no/ep/schema/facility#maximumWaveHeight>
-      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:comment "length that is the maximum height of surface waves"^^xsd:string ;
       rdfs:domain <http://www.reportinghub.no/ep/schema/facility#SurfaceWaves> ;
       rdfs:label "maximum wave height"^^xsd:string ;
       rdfs:range ep-core:Length .
 
 <http://www.reportinghub.no/ep/schema/facility#surfaceWavePeriod>
-      rdf:type owl:ObjectProperty , owl:FunctionalProperty , ep-core:Class_of_indirect_property ;
+      rdf:type ep-core:Class_of_indirect_property , owl:FunctionalProperty , owl:ObjectProperty ;
       rdfs:comment "time duration that is the period of surface waves"^^xsd:string ;
       rdfs:domain <http://www.reportinghub.no/ep/schema/facility#SurfaceWaves> ;
       rdfs:label "period"^^xsd:string ;
       rdfs:range ep-core:TimeDuration .
 
 <http://www.reportinghub.no/ep/schema/facility#visibility>
-      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:comment "length that is the maximum distance at which things can be seen through surrounding air"^^xsd:string ;
       rdfs:domain <http://www.reportinghub.no/ep/schema/facility#SurroundingAir> ;
       rdfs:label "visibility"^^xsd:string ;
       rdfs:range ep-core:Length .
 
 <http://www.reportinghub.no/ep/schema/facility#windChillTemperature>
-      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:comment "temperature that is the wind chill temperature of surrounding air"^^xsd:string ;
       rdfs:domain <http://www.reportinghub.no/ep/schema/facility#SurroundingAir> ;
       rdfs:label "wind chill temperature"^^xsd:string ;
@@ -147,7 +147,7 @@
       rdfs:label "flow meter"^^xsd:string .
 
 ep-prodfac:AvailableFacility
-      rdf:type owl:Class , ep-prodfac:FacilityAvailabilityType ;
+      rdf:type ep-prodfac:FacilityAvailabilityType , owl:Class ;
       rdfs:label "available facility"^^xsd:string ;
       rdfs:subClassOf <http://www.reportinghub.no/ep/schema/facility#Facility> ;
       owl:disjointWith ep-prodfac:UnavailableFacility .
@@ -208,6 +208,12 @@ ep-prodfac:Plant-processing
       rdfs:label "plant - processing"^^xsd:string ;
       rdfs:subClassOf ep-prodfac:Plant .
 
+ep-prodfac:Port
+      rdf:type owl:Class ;
+      rdfs:comment "facility that enables a flow into or out of a facility of which it is a part"^^xsd:string ;
+      rdfs:label "port"^^xsd:string ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/facility#Facility> .
+
 ep-prodfac:ProcessingFacility
       rdf:type owl:Class ;
       rdfs:comment "single production processing facility (source: MPR-XSD)"^^xsd:string ;
@@ -251,13 +257,13 @@ ep-prodfac:TrunkLine
       rdfs:subClassOf <http://www.reportinghub.no/ep/schema/facility#Facility> .
 
 ep-prodfac:UnavailableFacility
-      rdf:type owl:Class , ep-prodfac:FacilityAvailabilityType ;
+      rdf:type ep-prodfac:FacilityAvailabilityType , owl:Class ;
       rdfs:label "unavailable facility"^^xsd:string ;
       rdfs:subClassOf <http://www.reportinghub.no/ep/schema/facility#Facility> ;
       owl:disjointWith ep-prodfac:AvailableFacility .
 
 ep-prodfac:facilityPressureAlarm-low
-      rdf:type owl:ObjectProperty , ep-core:Class_of_indirect_property , owl:FunctionalProperty ;
+      rdf:type owl:FunctionalProperty , ep-core:Class_of_indirect_property , owl:ObjectProperty ;
       rdfs:comment "pressure below which an alarm will be raised"^^xsd:string ;
       rdfs:domain <http://www.reportinghub.no/ep/schema/facility#Facility> ;
       rdfs:label "facility pressure alarm - low"^^xsd:string ;
@@ -270,21 +276,21 @@ ep-prodfac:numberOfBedsAvailable
       rdfs:range xsd:integer .
 
 ep-prodfac:operatingTime
-      rdf:type owl:ObjectProperty , owl:FunctionalProperty , ep-core:Class_of_indirect_property ;
+      rdf:type ep-core:Class_of_indirect_property , owl:FunctionalProperty , owl:ObjectProperty ;
       rdfs:comment "time duration that is the operating time of a temporal part of a facility"^^xsd:string ;
       rdfs:domain <http://www.reportinghub.no/ep/schema/facility#Facility> ;
       rdfs:label "operating time"^^xsd:string ;
       rdfs:range ep-core:TimeDuration .
 
 ep-prodfac:pipelineEfficiencyFactor
-      rdf:type owl:ObjectProperty , ep-core:Class_of_indirect_property , owl:FunctionalProperty ;
+      rdf:type owl:FunctionalProperty , ep-core:Class_of_indirect_property , owl:ObjectProperty ;
       rdfs:comment "Factor by which theoretical volumetric flow rates are multiplied to account for water, condenate and solids in a pipeline"^^xsd:string ;
       rdfs:domain <http://www.reportinghub.no/ep/schema/facility#Facility> ;
       rdfs:label "pipeline efficiency factor"^^xsd:string ;
       rdfs:range ep-core:VolumePerVolume .
 
 ep-prodfac:scheduledTimeUnavailable
-      rdf:type owl:FunctionalProperty , ep-core:Class_of_indirect_property , owl:ObjectProperty ;
+      rdf:type owl:ObjectProperty , ep-core:Class_of_indirect_property , owl:FunctionalProperty ;
       rdfs:domain <http://www.reportinghub.no/ep/schema/facility#Facility> ;
       rdfs:label "scheduled time unavailable"^^xsd:string ;
       rdfs:range ep-core:TimeDuration .
@@ -296,7 +302,7 @@ ep-prodfac:shutDownSequenceNumber
       rdfs:range xsd:integer .
 
 ep-prodfac:timeAvailable
-      rdf:type owl:FunctionalProperty , ep-core:Class_of_indirect_property , owl:ObjectProperty ;
+      rdf:type owl:ObjectProperty , ep-core:Class_of_indirect_property , owl:FunctionalProperty ;
       rdfs:domain <http://www.reportinghub.no/ep/schema/facility#Facility> ;
       rdfs:label "time available"^^xsd:string ;
       rdfs:range ep-core:TimeDuration .

@@ -23,7 +23,7 @@
 
 <http://www.reportinghub.no/ep/mpr/spin/1.1/lib>
       rdf:type owl:Ontology ;
-      owl:imports <http://spinrdf.org/spin> , <http://www.epim.no/schemas/mprml/1> , <http://www.reportinghub.no/ep/schema/1.0/production> , <http://www.reportinghub.no/ep/schema/1.0/production-activity> , <http://www.reportinghub.no/ep/schema/1.0/production-equipment> , <http://www.reportinghub.no/ep/spin/1.1/lib> , <http://www.reportinghub.no/ep/transform/transform-helper-schema> ;
+      owl:imports <http://www.reportinghub.no/ep/transform/transform-helper-schema> , <http://www.reportinghub.no/ep/spin/1.1/lib> , <http://www.reportinghub.no/ep/schema/1.0/production-equipment> , <http://www.reportinghub.no/ep/schema/1.0/production-activity> , <http://www.reportinghub.no/ep/schema/1.0/production> , <http://www.epim.no/schemas/mprml/1> , <http://spinrdf.org/spin> ;
       owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
 
 ep-mpr-spin-lib:Function
@@ -74,6 +74,28 @@ ep-mpr-spin-lib:buildPersonRoleTypeURI
                           ])
               ] .
 
+ep-mpr-spin-lib:buildPortURI
+      rdf:type spin:Function ;
+      rdfs:label "build Port URI"^^xsd:string ;
+      rdfs:subClassOf ep-mpr-spin-lib:Function ;
+      spin:body
+              [ rdf:type sp:Select ;
+                sp:resultVariables ([ sp:varName "uri"^^xsd:string
+                          ]) ;
+                sp:where ([ rdf:type sp:Bind ;
+                            sp:expression
+                                    [ rdf:type ep-spin-lib:buildURI ;
+                                      sp:arg1 "https://www.reportinghub.no/ep/data/port/" ;
+                                      sp:arg2 [ rdf:type ep-spin-lib:normalizeString ;
+                                                sp:arg1 spin:_arg1
+                                              ]
+                                    ] ;
+                            sp:variable
+                                    [ sp:varName "uri"^^xsd:string
+                                    ]
+                          ])
+              ] .
+
 ep-mpr-spin-lib:buildPrecipitationTypeURI
       rdf:type spin:Function ;
       rdfs:label "build PrecipitationType URI"^^xsd:string ;