Function added to DPR-lib + minor updates elsewhere.

@@ -14,46 +14,123 @@
       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-well:FluidComponentType , owl:Class , ep-prodwell:InjectionFluidType ;
+      rdfs:label "air"^^xsd:string ;
+      rdfs:subClassOf ep-prodwell:NonHcGas .
+
+ep-prodwell:Brine
+      rdf:type ep-well:FluidComponentType , owl:Class , ep-prodwell:InjectionFluidType ;
+      rdfs:label "brine"^^xsd:string ;
+      rdfs:subClassOf ep-well:Water .
+
+ep-prodwell:Co2
+      rdf:type owl:Class , ep-prodwell:InjectionFluidType ;
+      rdfs:label "CO2"^^xsd:string ;
+      rdfs:subClassOf ep-prodwell:NonHcGas .
+
+ep-prodwell:DryFluid
+      rdf:type ep-well:FluidComponentType , owl:Class , ep-prodwell:InjectionFluidType ;
+      rdfs:label "dry fluid"^^xsd:string ;
+      rdfs:subClassOf ep-well:Fluid .
+
+ep-prodwell:FreshWater
+      rdf:type ep-well:FluidComponentType , owl:Class , ep-prodwell:InjectionFluidType ;
+      rdfs:label "fresh water"^^xsd:string ;
+      rdfs:subClassOf ep-well:Water .
+
+ep-prodwell:GasAndWater
+      rdf:type ep-well:FluidComponentType , owl:Class , ep-prodwell:InjectionFluidType ;
+      rdfs:label "gas and water"^^xsd:string ;
+      rdfs:subClassOf ep-well:Fluid .
+
+ep-prodwell:InjectionFluidType
+      rdf:type rdfs:Class ;
+      rdfs:label "injection fluid type"^^xsd:string ;
+      rdfs:subClassOf owl:Class .
+
 ep-prodwell:NaturalGasClass
       rdf:type rdfs:Class ;
       rdfs:label "natural gas class"^^xsd:string ;
       rdfs:subClassOf owl:Class .
 
+ep-prodwell:NonHcGas
+      rdf:type ep-prodwell:InjectionFluidType , owl:Class ;
+      rdfs:label "non-HC gas"^^xsd:string ;
+      rdfs:subClassOf ep-well:Gas .
+
+ep-prodwell:OilAndGas
+      rdf:type ep-prodwell:InjectionFluidType , owl:Class , ep-well:FluidComponentType ;
+      rdfs:label "oil and gas"^^xsd:string ;
+      rdfs:subClassOf ep-well:Fluid .
+
+ep-prodwell:OilAndWater
+      rdf:type ep-prodwell:InjectionFluidType , ep-well:FluidComponentType , owl:Class ;
+      rdfs:label "oil and water"^^xsd:string ;
+      rdfs:subClassOf ep-well:Fluid .
+
+ep-prodwell:OtherInjectionFluid
+      rdf:type ep-well:FluidComponentType , owl:Class , ep-prodwell:InjectionFluidType ;
+      rdfs:label "other injection fluid"^^xsd:string ;
+      rdfs:subClassOf ep-well:Fluid .
+
 ep-prodwell:Sand
-      rdf:type ep-well:FluidComponentType , owl:Class ;
+      rdf:type owl:Class , ep-well:FluidComponentType ;
       rdfs:label "sand"^^xsd:string ;
       rdfs:subClassOf ep-well:Fluid .
 
+ep-prodwell:Steam
+      rdf:type ep-well:FluidComponentType , owl:Class , ep-prodwell:InjectionFluidType ;
+      rdfs:label "steam"^^xsd:string ;
+      rdfs:subClassOf ep-prodwell:NonHcGas .
+
+ep-prodwell:UnknownFluid
+      rdf:type ep-well:FluidComponentType , owl:Class , ep-prodwell:InjectionFluidType ;
+      rdfs:label "unknown fluid"^^xsd:string ;
+      rdfs:subClassOf ep-well:Fluid .
+
 ep-prodwell:basicSedimentAndWater
-      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:label "basic sediment and water"^^xsd:string ;
       rdfs:range ep-core:SpecificVolume .
 
 ep-prodwell:condensateYield
-      rdf:type ep-core:Class_of_indirect_property , owl:ObjectProperty , owl:FunctionalProperty ;
+      rdf:type owl:FunctionalProperty , owl:ObjectProperty , ep-core:Class_of_indirect_property ;
       rdfs:label "condensate yield"^^xsd:string ;
       rdfs:range ep-core:SpecificVolume .
 
 ep-prodwell:depthOfBaseUsableWaterFromSurface
-      rdf:type ep-core:Class_of_indirect_property , owl:ObjectProperty , owl:FunctionalProperty ;
+      rdf:type owl:FunctionalProperty , owl:ObjectProperty , ep-core:Class_of_indirect_property ;
       rdfs:domain ep-well:Fluid ;
       rdfs:label "depth of base of usable water from surface"^^xsd:string ;
       rdfs:range ep-core:Length .
 
 ep-prodwell:depthOfFluidSurfaceFromTopOfWell
-      rdf:type ep-core:Class_of_indirect_property , owl:ObjectProperty , owl:FunctionalProperty ;
+      rdf:type owl:FunctionalProperty , owl:ObjectProperty , ep-core:Class_of_indirect_property ;
       rdfs:domain ep-well:Fluid ;
       rdfs:label "depth of fluid surface from top of well"^^xsd:string ;
       rdfs:range ep-core:Length .
 
 ep-prodwell:potentialGasProduction
-      rdf:type ep-core:Class_of_indirect_property , owl:ObjectProperty , owl:FunctionalProperty ;
+      rdf:type owl:FunctionalProperty , owl:ObjectProperty , ep-core:Class_of_indirect_property ;
       rdfs:domain ep-well:WellBore ;
       rdfs:label "potential gas production"^^xsd:string ;
       rdfs:range ep-core:VolumetricFlowRate .
 
 ep-prodwell:potentialOilProduction
-      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:domain ep-well:WellBore ;
       rdfs:label "potential oil production"^^xsd:string ;
       rdfs:range ep-core:VolumetricFlowRate .
+
+ep-well:Condensate
+      rdf:type ep-prodwell:InjectionFluidType .
+
+ep-well:Gas
+      rdf:type ep-prodwell:InjectionFluidType .
+
+ep-well:Oil
+      rdf:type ep-prodwell:InjectionFluidType .
+
+ep-well:Water
+      rdf:type ep-prodwell:InjectionFluidType .