Merge branch 'master' into mprspinwork

@@ -519,3 +519,21 @@ ep-well:TemporalPartOfAWellBore
 
 ep-well:WellGroup
       rdf:type owl:Class .
+
+ep-prodwell:WellHead-flowingConditions
+      rdf:type ep-prodwell:WellHeadFlowingConditionsType , owl:Class ;
+      rdfs:comment "wellhead that is in flowing conditions"^^xsd:string ;
+      rdfs:label "well head - flowing conditions"^^xsd:string ;
+      rdfs:subClassOf ep-well:WellHead .
+
+ep-prodwell:WellHead-nonflowingConditions
+      rdf:type ep-prodwell:WellHeadFlowingConditionsType , owl:Class ;
+      rdfs:comment "wellhead that is in nonflowing conditions"^^xsd:string ;
+      rdfs:label "well head - nonflowing conditions"^^xsd:string ;
+      rdfs:subClassOf ep-well:WellHead .
+
+ep-prodwell:WellHeadFlowingConditionsType
+      rdf:type rdfs:Class ;
+      rdfs:comment "class that consists of subclasses of wellhead according to whether it is flowing or non-flowing"^^xsd:string ;
+      rdfs:label "well flowing conditions type"^^xsd:string ;
+      rdfs:subClassOf owl:Class .

@@ -15,12 +15,12 @@
 
 <http://www.reportinghub.no/ep/schema/1.0/unnamed>
       rdf:type owl:Ontology ;
-      owl:imports <http://www.epim.no/schemas/mprml/1> , <http://www.reportinghub.no/ep/transform/transform-helper-schema> , <http://spinrdf.org/spin> ;
+      owl:imports <http://spinrdf.org/spin> , <http://www.reportinghub.no/ep/transform/transform-helper-schema> , <http://www.epim.no/schemas/mprml/1> ;
       owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
 
 <http://www.reportinghub.no/ep/schema/core#Pressure>
       transhelp:rangeOfPropertyMapsToMPREnumeration
-              <http://www.epim.no/schemas/mprml/1#FP_wellheadpressureDSCP> , <http://www.epim.no/schemas/mprml/1#FP_tubingpressure> , <http://www.epim.no/schemas/mprml/1#FP_pressure> , <http://www.epim.no/schemas/mprml/1#FP_flowingtubingpressure> , <http://www.epim.no/schemas/mprml/1#FP_casingpressure> , <http://www.epim.no/schemas/mprml/1#FP_bottomholepressure> , <http://www.epim.no/schemas/mprml/1#FP_annuluspressure> , <http://www.epim.no/schemas/mprml/1#FP_wellheadpressure> .
+              <http://www.epim.no/schemas/mprml/1#FP_wellheadpressure> , <http://www.epim.no/schemas/mprml/1#FP_annuluspressure> , <http://www.epim.no/schemas/mprml/1#FP_bottomholepressure> , <http://www.epim.no/schemas/mprml/1#FP_casingpressure> , <http://www.epim.no/schemas/mprml/1#FP_flowingtubingpressure> , <http://www.epim.no/schemas/mprml/1#FP_pressure> , <http://www.epim.no/schemas/mprml/1#FP_tubingpressure> , <http://www.epim.no/schemas/mprml/1#FP_wellheadpressureDSCP> .
 
 <http://www.reportinghub.no/ep/schema/core#Temperature>
       transhelp:rangeOfPropertyMapsToMPREnumeration
@@ -28,19 +28,27 @@
 
 <http://www.reportinghub.no/ep/schema/equipment#Casing>
       transhelp:domainOfPropertyMapsToMPREnumeration
-              <http://www.epim.no/schemas/mprml/1#FP_casingtemperature> , <http://www.epim.no/schemas/mprml/1#FP_casingpressure> .
+              <http://www.epim.no/schemas/mprml/1#FP_casingpressure> , <http://www.epim.no/schemas/mprml/1#FP_casingtemperature> .
 
 <http://www.reportinghub.no/ep/schema/equipment#Tubing>
       transhelp:domainOfPropertyMapsToMPREnumeration
-              <http://www.epim.no/schemas/mprml/1#FP_flowingtubingtemperature> , <http://www.epim.no/schemas/mprml/1#FP_flowingtubingpressure> , <http://www.epim.no/schemas/mprml/1#FP_tubingpressure> , <http://www.epim.no/schemas/mprml/1#FP_tubingtemperature> .
+              <http://www.epim.no/schemas/mprml/1#FP_tubingtemperature> , <http://www.epim.no/schemas/mprml/1#FP_tubingpressure> , <http://www.epim.no/schemas/mprml/1#FP_flowingtubingpressure> , <http://www.epim.no/schemas/mprml/1#FP_flowingtubingtemperature> .
+
+<http://www.reportinghub.no/ep/schema/production-well#WellHead-flowingConditions>
+      transhelp:flowingStateMapsToMPREnumeration
+              <http://www.epim.no/schemas/mprml/1#FP_casingtemperature> , <http://www.epim.no/schemas/mprml/1#FP_casingpressure> , <http://www.epim.no/schemas/mprml/1#FP_flowingtubingtemperature> , <http://www.epim.no/schemas/mprml/1#FP_flowingtubingpressure> , <http://www.epim.no/schemas/mprml/1#FP_wellheadpressure> .
+
+<http://www.reportinghub.no/ep/schema/production-well#WellHead-nonflowingConditions>
+      transhelp:flowingStateMapsToMPREnumeration
+              <http://www.epim.no/schemas/mprml/1#FP_tubingpressure> , <http://www.epim.no/schemas/mprml/1#FP_tubingtemperature> .
 
 <http://www.reportinghub.no/ep/schema/production-well#WellHeadDownStreamChokeValve>
       transhelp:domainOfPropertyMapsToMPREnumeration
-              <http://www.epim.no/schemas/mprml/1#FP_wellheadtemperatureDSCT> , <http://www.epim.no/schemas/mprml/1#FP_wellheadpressureDSCP> .
+              <http://www.epim.no/schemas/mprml/1#FP_wellheadpressureDSCP> , <http://www.epim.no/schemas/mprml/1#FP_wellheadtemperatureDSCT> .
 
 <http://www.reportinghub.no/ep/schema/well#WellBoreBottom>
       transhelp:domainOfPropertyMapsToMPREnumeration
-              <http://www.epim.no/schemas/mprml/1#FP_bottomholepressure> , <http://www.epim.no/schemas/mprml/1#FP_bottomholetemperature> .
+              <http://www.epim.no/schemas/mprml/1#FP_bottomholetemperature> , <http://www.epim.no/schemas/mprml/1#FP_bottomholepressure> .
 
 <http://www.reportinghub.no/ep/schema/well#WellHead>
       transhelp:domainOfPropertyMapsToMPREnumeration
@@ -48,4 +56,4 @@
 
 rdf:type
       transhelp:propertyMapsToMPREnumeration
-              <http://www.epim.no/schemas/mprml/1#FP_wellheadpressure> , <http://www.epim.no/schemas/mprml/1#FP_casingtemperature> , <http://www.epim.no/schemas/mprml/1#FP_tubingpressure> , <http://www.epim.no/schemas/mprml/1#FP_flowingtubingtemperature> , <http://www.epim.no/schemas/mprml/1#FP_wellheadtemperatureDSCT> , <http://www.epim.no/schemas/mprml/1#FP_temperature> , <http://www.epim.no/schemas/mprml/1#FP_pressure> , <http://www.epim.no/schemas/mprml/1#FP_tubingtemperature> , <http://www.epim.no/schemas/mprml/1#FP_flowingtubingpressure> , <http://www.epim.no/schemas/mprml/1#FP_casingpressure> , <http://www.epim.no/schemas/mprml/1#FP_wellheadtemperature> , <http://www.epim.no/schemas/mprml/1#FP_wellheadpressureDSCP> .
+              <http://www.epim.no/schemas/mprml/1#FP_wellheadpressure> , <http://www.epim.no/schemas/mprml/1#FP_casingtemperature> , <http://www.epim.no/schemas/mprml/1#FP_tubingpressure> , <http://www.epim.no/schemas/mprml/1#FP_flowingtubingtemperature> , <http://www.epim.no/schemas/mprml/1#FP_wellheadtemperatureDSCT> , <http://www.epim.no/schemas/mprml/1#FP_temperature> , <http://www.epim.no/schemas/mprml/1#FP_pressure> , <http://www.epim.no/schemas/mprml/1#FP_tubingtemperature> , <http://www.epim.no/schemas/mprml/1#FP_flowingtubingpressure> , <http://www.epim.no/schemas/mprml/1#FP_casingpressure> , <http://www.epim.no/schemas/mprml/1#FP_wellheadpressureDSCP> , <http://www.epim.no/schemas/mprml/1#FP_wellheadtemperature> .

@@ -15,7 +15,7 @@
 <http://www.reportinghub.no/ep/transform/transform-helper-schema>
       rdf:type owl:Ontology ;
       rdfs:comment "The Transform Helper Schema is the set of properties and classes used for the creation of temporary data used as part of the ERH transformations. All instances of classes and uses of these properties is deleted before the triples are stored in the RDF database."^^xsd:string ;
-      owl:imports <http://www.epim.no/schemas/mprml/1> , <http://www.reportinghub.no/ep/schema/1.0/activity> , <http://spinrdf.org/spin> ;
+      owl:imports <http://spinrdf.org/spin> , <http://www.reportinghub.no/ep/schema/1.0/activity> , <http://www.epim.no/schemas/mprml/1> ;
       owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
 
 transhelp:buildRdlURI
@@ -44,12 +44,17 @@ transhelp:derivedFrom
       rdf:type owl:ObjectProperty .
 
 transhelp:domainOfPropertyMapsToMPREnumeration
-      rdf:type owl:ObjectProperty , owl:InverseFunctionalProperty ;
+      rdf:type owl:InverseFunctionalProperty , owl:ObjectProperty ;
       rdfs:label "domain of property maps to MPR enumeration"^^xsd:string ;
       rdfs:subPropertyOf transhelp:mapsTo .
 
 transhelp:facilityIdentifier
-      rdf:type owl:DatatypeProperty , owl:FunctionalProperty .
+      rdf:type owl:FunctionalProperty , owl:DatatypeProperty .
+
+transhelp:flowingStateMapsToMPREnumeration
+      rdf:type owl:ObjectProperty , owl:InverseFunctionalProperty ;
+      rdfs:label "flowing state maps to MPR enumeration"^^xsd:string ;
+      rdfs:subPropertyOf transhelp:mapsTo .
 
 transhelp:forComment
       rdf:type owl:ObjectProperty ;
@@ -66,43 +71,43 @@ transhelp:hasEquivalentInRDL
       rdfs:label "has equivalent in RDL"^^xsd:string .
 
 transhelp:interval
-      rdf:type owl:DatatypeProperty , owl:FunctionalProperty .
+      rdf:type owl:FunctionalProperty , owl:DatatypeProperty .
 
 transhelp:intervalEnd
-      rdf:type owl:DatatypeProperty , owl:FunctionalProperty .
+      rdf:type owl:FunctionalProperty , owl:DatatypeProperty .
 
 transhelp:intervalIdentifier
-      rdf:type owl:DatatypeProperty , owl:FunctionalProperty .
+      rdf:type owl:FunctionalProperty , owl:DatatypeProperty .
 
 transhelp:intervalStart
-      rdf:type owl:DatatypeProperty , owl:FunctionalProperty .
+      rdf:type owl:FunctionalProperty , owl:DatatypeProperty .
 
 transhelp:label
-      rdf:type owl:DatatypeProperty , owl:FunctionalProperty .
+      rdf:type owl:FunctionalProperty , owl:DatatypeProperty .
 
 transhelp:mapsTo
       rdf:type rdf:Property .
 
 transhelp:materialClassMapsToMPREnumeration
-      rdf:type owl:InverseFunctionalProperty , owl:ObjectProperty ;
+      rdf:type owl:ObjectProperty , owl:InverseFunctionalProperty ;
       rdfs:label "material class maps to MPR enumeration"^^xsd:string ;
       rdfs:subPropertyOf transhelp:mapsTo .
 
 transhelp:nominalInstant
-      rdf:type owl:DatatypeProperty , owl:FunctionalProperty .
+      rdf:type owl:FunctionalProperty , owl:DatatypeProperty .
 
 transhelp:propertyMapsToMPREnumeration
-      rdf:type owl:InverseFunctionalProperty , owl:ObjectProperty ;
+      rdf:type owl:ObjectProperty , owl:InverseFunctionalProperty ;
       rdfs:label "property maps to MPR enumeration"^^xsd:string ;
       rdfs:subPropertyOf transhelp:mapsTo .
 
 transhelp:quantitySpaceMapsToClassOfScale
-      rdf:type owl:FunctionalProperty , owl:InverseFunctionalProperty , owl:ObjectProperty ;
+      rdf:type owl:ObjectProperty , owl:InverseFunctionalProperty , owl:FunctionalProperty ;
       rdfs:label "quantity space maps to class of scale"^^xsd:string ;
       rdfs:subPropertyOf transhelp:mapsTo .
 
 transhelp:rangeOfPropertyMapsToMPREnumeration
-      rdf:type owl:ObjectProperty , owl:InverseFunctionalProperty ;
+      rdf:type owl:InverseFunctionalProperty , owl:ObjectProperty ;
       rdfs:label "range of property maps to MPR enumeration"^^xsd:string ;
       rdfs:subPropertyOf transhelp:mapsTo .