Fixed tube type function and labels in schema

David Price
Commit a854afc3c99f054a40ddbe32b93074c67cea6342 a854afc3 1 parent 72561b7b
Showing 2 changed files with 209 additions and 211 deletions
www.reportinghub.no/ep/schema/1.0/SCHEMA_EP-EQUIPMENT-v1.0.ttl
www.reportinghub.no/ep/spin/SPIN_EPIM-lib-v1.1.spin.ttl
--- a/www.reportinghub.no/ep/schema/1.0/SCHEMA_EP-EQUIPMENT-v1.0.ttl
View file @a854afc
+++ b/www.reportinghub.no/ep/schema/1.0/SCHEMA_EP-EQUIPMENT-v1.0.ttl
View file @a854afc
-# Saved by TopBraid on Fri Oct 07 17:58:08 BST 2011
 # baseURI: http://www.reportinghub.no/ep/schema/1.0/equipment
-# imports: http://www.reportinghub.no/ep/schema/1.0/organization
 # imports: http://www.reportinghub.no/ep/schema/1.0/core
+# imports: http://www.reportinghub.no/ep/schema/1.0/organization
 # imports: http://www.reportinghub.no/ep/schema/1.0/well
 @prefix ep-core:  <http://www.reportinghub.no/ep/schema/core#> .
@@ -14,7 +13,7 @@
 <http://www.reportinghub.no/ep/schema/1.0/equipment>
       rdf:type owl:Ontology ;
-      owl:imports <http://www.reportinghub.no/ep/schema/1.0/organization> , <http://www.reportinghub.no/ep/schema/1.0/well> , <http://www.reportinghub.no/ep/schema/1.0/core> ;
+      owl:imports <http://www.reportinghub.no/ep/schema/1.0/core> , <http://www.reportinghub.no/ep/schema/1.0/well> , <http://www.reportinghub.no/ep/schema/1.0/organization> ;
       owl:versionInfo "0.1.0"^^xsd:string .
 ep-core:PhysicalThing
@@ -31,8 +30,8 @@ ep-eqt:BlowOutPreventer
       rdfs:subClassOf ep-eqt:Equipment .
 ep-eqt:Casing
-      rdf:type owl:Class , ep-eqt:CasingLinerTubingType ;
+      rdf:type ep-eqt:CasingLinerTubingType , owl:Class ;
-      rdfs:label "casing"^^xsd:string ;
+      rdfs:label "Casing"^^xsd:string ;
       rdfs:subClassOf ep-eqt:CasingLinerTubing ;
       owl:disjointWith ep-eqt:Liner , ep-eqt:Tubing .
@@ -58,7 +57,7 @@ ep-eqt:CasingRoleType
 ep-eqt:CasingString
       rdf:type owl:Class ;
       rdfs:label "casing string"^^xsd:string ;
-      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/well#SpatialPartOfAWellBore> , ep-eqt:Casing .
+      rdfs:subClassOf ep-eqt:Casing , <http://www.reportinghub.no/ep/schema/well#SpatialPartOfAWellBore> .
 ep-eqt:ChokeValve
       rdf:type owl:Class ;
@@ -71,12 +70,12 @@ ep-eqt:ClassOfSupplyDefinedByAManufacturer
       rdfs:subClassOf owl:Class .
 ep-eqt:Compressor
-      rdf:type ep-fac:ProductionFacilityType , owl:Class ;
+      rdf:type owl:Class , ep-fac:ProductionFacilityType ;
       rdfs:label "compressor"^^xsd:string ;
       rdfs:subClassOf ep-eqt:Equipment .
 ep-eqt:Controller-lift
-      rdf:type ep-fac:ProductionFacilityType , owl:Class ;
+      rdf:type owl:Class , ep-fac:ProductionFacilityType ;
       rdfs:label "controller - lift"^^xsd:string ;
       rdfs:subClassOf ep-eqt:Equipment .
@@ -109,25 +108,25 @@ ep-eqt:InnerBarrel-aluminum
       rdf:type owl:Class ;
       rdfs:label "inner barrel - aluminum"^^xsd:string ;
       rdfs:subClassOf ep-eqt:InnerBarrel ;
-      owl:disjointWith ep-eqt:InnerBarrel-fiberglass , ep-eqt:InnerBarrel-gel .
+      owl:disjointWith ep-eqt:InnerBarrel-gel , ep-eqt:InnerBarrel-fiberglass .
 ep-eqt:InnerBarrel-fiberglass
       rdf:type owl:Class ;
       rdfs:label "inner barrel - fiberglass"^^xsd:string ;
       rdfs:subClassOf ep-eqt:InnerBarrel ;
-      owl:disjointWith ep-eqt:InnerBarrel-gel , ep-eqt:InnerBarrel-aluminum .
+      owl:disjointWith ep-eqt:InnerBarrel-aluminum , ep-eqt:InnerBarrel-gel .
 ep-eqt:InnerBarrel-gel
       rdf:type owl:Class ;
       rdfs:label "inner barrel - gel"^^xsd:string ;
       rdfs:subClassOf ep-eqt:InnerBarrel ;
-      owl:disjointWith ep-eqt:InnerBarrel-fiberglass , ep-eqt:InnerBarrel-aluminum .
+      owl:disjointWith ep-eqt:InnerBarrel-aluminum , ep-eqt:InnerBarrel-fiberglass .
 ep-eqt:IntermediateCasing
-      rdf:type ep-eqt:CasingRoleType , owl:Class ;
+      rdf:type owl:Class , ep-eqt:CasingRoleType ;
       rdfs:label "intermediate casing"^^xsd:string ;
       rdfs:subClassOf ep-eqt:Casing ;
-      owl:disjointWith ep-eqt:ProductionCasing , ep-eqt:TopCasing .
+      owl:disjointWith ep-eqt:TopCasing , ep-eqt:ProductionCasing .
 ep-eqt:KellyBushing
       rdf:type owl:Class ;
@@ -137,49 +136,49 @@ ep-eqt:KellyBushing
 ep-eqt:LastCasingOfAWellBore
       rdf:type owl:Class ;
       rdfs:label "last casing of a wellbore"^^xsd:string ;
-      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/well#SpatialPartOfAWellBore> , ep-eqt:Casing .
+      rdfs:subClassOf ep-eqt:Casing , <http://www.reportinghub.no/ep/schema/well#SpatialPartOfAWellBore> .
 ep-eqt:Liner
-      rdf:type owl:Class , ep-eqt:CasingLinerTubingType ;
+      rdf:type ep-eqt:CasingLinerTubingType , owl:Class ;
-      rdfs:label "liner"^^xsd:string ;
+      rdfs:label "Liner"^^xsd:string ;
       rdfs:subClassOf ep-eqt:CasingLinerTubing ;
       owl:disjointWith ep-eqt:Casing , ep-eqt:Tubing .
 ep-eqt:Manifold-injection
-      rdf:type ep-fac:ProductionFacilityType , owl:Class ;
+      rdf:type owl:Class , ep-fac:ProductionFacilityType ;
       rdfs:label "manifold - injection"^^xsd:string ;
       rdfs:subClassOf ep-eqt:Equipment .
 ep-eqt:Manifold-production
-      rdf:type ep-fac:ProductionFacilityType , owl:Class ;
+      rdf:type owl:Class , ep-fac:ProductionFacilityType ;
       rdfs:label "manifold - production"^^xsd:string ;
       rdfs:subClassOf ep-eqt:Equipment .
 ep-eqt:ProductionCasing
-      rdf:type ep-eqt:CasingRoleType , owl:Class ;
+      rdf:type owl:Class , ep-eqt:CasingRoleType ;
       rdfs:label "production casing"^^xsd:string ;
       rdfs:subClassOf ep-eqt:Casing ;
-      owl:disjointWith ep-eqt:TopCasing , ep-eqt:IntermediateCasing .
+      owl:disjointWith ep-eqt:IntermediateCasing , ep-eqt:TopCasing .
 ep-eqt:Separator
-      rdf:type ep-fac:ProductionFacilityType , owl:Class ;
+      rdf:type owl:Class , ep-fac:ProductionFacilityType ;
       rdfs:label "separator"^^xsd:string ;
       rdfs:subClassOf ep-eqt:Equipment .
 ep-eqt:Tank
-      rdf:type ep-fac:ProductionFacilityType , owl:Class ;
+      rdf:type owl:Class , ep-fac:ProductionFacilityType ;
       rdfs:label "tank"^^xsd:string ;
       rdfs:subClassOf ep-eqt:Equipment .
 ep-eqt:TopCasing
-      rdf:type ep-eqt:CasingRoleType , owl:Class ;
+      rdf:type owl:Class , ep-eqt:CasingRoleType ;
       rdfs:label "top casing"^^xsd:string ;
       rdfs:subClassOf ep-eqt:Casing ;
-      owl:disjointWith ep-eqt:ProductionCasing , ep-eqt:IntermediateCasing .
+      owl:disjointWith ep-eqt:IntermediateCasing , ep-eqt:ProductionCasing .
 ep-eqt:Tubing
-      rdf:type owl:Class , ep-eqt:CasingLinerTubingType ;
+      rdf:type ep-eqt:CasingLinerTubingType , owl:Class ;
-      rdfs:label "liner"^^xsd:string ;
+      rdfs:label "Tubing"^^xsd:string ;
       rdfs:subClassOf ep-eqt:CasingLinerTubing ;
       owl:disjointWith ep-eqt:Casing , ep-eqt:Liner .
@@ -199,7 +198,7 @@ ep-eqt:WellTestChoke
       rdfs:subClassOf ep-eqt:Equipment .
 ep-eqt:chokeOrificeSize
-      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-eqt:WellTestChoke ;
       rdfs:label "choke orifice size"^^xsd:string ;
       rdfs:range ep-core:Length .
@@ -210,67 +209,67 @@ ep-eqt:codeAssignedByAManufacturer
       rdfs:label "code assigned by manufacturer"^^xsd:string .
 ep-eqt:diameterOfACasing
-      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-eqt:Casing ;
       rdfs:label "diameter of a casing"^^xsd:string ;
       rdfs:range ep-core:Length .
 ep-eqt:diameterOfDrillBit
-      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-eqt:DrillBit ;
       rdfs:label "diameter of drill bit"^^xsd:string ;
       rdfs:range ep-core:Length .
 ep-eqt:elevationOfKellyBushing
-      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-eqt:KellyBushing ;
       rdfs:label "elevation of kelly bushing"^^xsd:string ;
       rdfs:range ep-core:Length .
 ep-eqt:hasTubularConnectionClass
-      rdf:type owl:FunctionalProperty , owl:ObjectProperty ;
+      rdf:type owl:ObjectProperty , owl:FunctionalProperty ;
       rdfs:domain ep-eqt:CasingLinerTubing ;
       rdfs:label "has tubular connection class"^^xsd:string ;
       rdfs:range ep-eqt:TubularConnectionClass .
 ep-eqt:insideDiameterOfATubular
-      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-eqt:CasingLinerTubing ;
       rdfs:label "inside diameter of a tubular"^^xsd:string ;
       rdfs:range ep-core:Length .
 ep-eqt:lengthOfInnerBarrel
-      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-eqt:InnerBarrel ;
       rdfs:label "length of inner barrel"^^xsd:string ;
       rdfs:range ep-core:Length .
 ep-eqt:manufacturedBy
-      rdf:type owl:ObjectProperty , owl:FunctionalProperty ;
+      rdf:type owl:FunctionalProperty , owl:ObjectProperty ;
       rdfs:domain ep-eqt:Equipment ;
       rdfs:label "manaufactured by"^^xsd:string ;
       rdfs:range <http://www.reportinghub.no/ep/schema/organization#Organization> .
 ep-eqt:maximumPressureForBlowOutPreventer
-      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-eqt:BlowOutPreventer ;
       rdfs:label "maximum pressure for blow out preventer"^^xsd:string ;
       rdfs:range ep-core:Pressure .
 ep-eqt:maximumPressureForChokeValve
-      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-eqt:ChokeValve ;
       rdfs:label "maximum pressure for choke valve"^^xsd:string ;
       rdfs:range ep-core:Pressure .
 ep-eqt:outsideDiameterOfATubular
-      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-eqt:CasingLinerTubing ;
       rdfs:label "outside diameter of a tubular"^^xsd:string ;
       rdfs:range ep-core:Length .
 ep-eqt:stringLengthOfATubular
-      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-eqt:CasingLinerTubing ;
       rdfs:label "string length of a tubular"^^xsd:string ;
       rdfs:range ep-core:Length .
--- a/www.reportinghub.no/ep/spin/SPIN_EPIM-lib-v1.1.spin.ttl
View file @a854afc
+++ b/www.reportinghub.no/ep/spin/SPIN_EPIM-lib-v1.1.spin.ttl
View file @a854afc
-# Saved by TopBraid on Thu Oct 27 12:21:33 BST 2011
 # baseURI: http://www.reportinghub.no/ep/spin/1.1/lib
-# imports: http://www.reportinghub.no/ep/schema/1.0/drilling-equipment-type
+# imports: http://spinrdf.org/spin
-# imports: http://www.reportinghub.no/ep/schema/1.0/report
+# imports: http://www.reportinghub.no/ep/schema/1.0/activity
-# imports: http://www.witsml.org/schemas/1series
-# imports: http://www.reportinghub.no/ep/schema/1.0/core
-# imports: http://www.reportinghub.no/ep/schema/1.0/well
 # imports: http://www.reportinghub.no/ep/schema/1.0/activity-purpose
+# imports: http://www.reportinghub.no/ep/schema/1.0/core
+# imports: http://www.reportinghub.no/ep/schema/1.0/drilling-equipment-type
 # imports: http://www.reportinghub.no/ep/schema/1.0/equipment
 # imports: http://www.reportinghub.no/ep/schema/1.0/facility
-# imports: http://www.reportinghub.no/ep/schema/1.0/activity
+# imports: http://www.reportinghub.no/ep/schema/1.0/report
-# imports: http://spinrdf.org/spin
+# imports: http://www.reportinghub.no/ep/schema/1.0/well
 # imports: http://www.reportinghub.no/spin/rh
+# imports: http://www.witsml.org/schemas/1series
 @prefix activity-purpose:  <http://www.reportinghub.no/ep/schema/1.0/activity-purpose#> .
 @prefix ddr:     <http://www.witsml.org/schemas/1series#> .
@@ -29,7 +28,7 @@
 <http://www.reportinghub.no/ep/spin/1.1/lib>
       rdf:type owl:Ontology ;
-      owl:imports <http://www.reportinghub.no/spin/rh> , <http://www.reportinghub.no/ep/schema/1.0/drilling-equipment-type> , <http://www.reportinghub.no/ep/schema/1.0/report> , <http://www.reportinghub.no/ep/schema/1.0/activity> , <http://www.reportinghub.no/ep/schema/1.0/well> , <http://spinrdf.org/spin> , <http://www.witsml.org/schemas/1series> , <http://www.reportinghub.no/ep/schema/1.0/core> , <http://www.reportinghub.no/ep/schema/1.0/equipment> , <http://www.reportinghub.no/ep/schema/1.0/facility> , <http://www.reportinghub.no/ep/schema/1.0/activity-purpose> ;
+      owl:imports <http://www.reportinghub.no/spin/rh> , <http://www.reportinghub.no/ep/schema/1.0/drilling-equipment-type> , <http://www.reportinghub.no/ep/schema/1.0/report> , <http://www.reportinghub.no/ep/schema/1.0/activity> , <http://www.reportinghub.no/ep/schema/1.0/well> , <http://spinrdf.org/spin> , <http://www.witsml.org/schemas/1series> , <http://www.reportinghub.no/ep/schema/1.0/core> , <http://www.reportinghub.no/ep/schema/1.0/equipment> , <http://www.reportinghub.no/ep/schema/1.0/activity-purpose> , <http://www.reportinghub.no/ep/schema/1.0/facility> ;
       owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
 ep-spin-lib:Function
@@ -526,12 +525,12 @@ ep-spin-lib:buildURI
               ] ;
       spin:constraint
               [ rdf:type spl:Argument ;
-                spl:predicate sp:arg1 ;
+                spl:predicate sp:arg2 ;
                 spl:valueType xsd:string
               ] ;
       spin:constraint
               [ rdf:type spl:Argument ;
-                spl:predicate sp:arg2 ;
+                spl:predicate sp:arg1 ;
                 spl:valueType xsd:string
               ] .
@@ -3080,13 +3079,14 @@ ep-spin-lib:selectTubeType
       rdfs:subClassOf ep-spin-lib:Function ;
       spin:body
               [ rdf:type sp:Select ;
-                sp:resultVariables (_:b72) ;
+                sp:resultVariables ([ sp:varName "tubeType"^^xsd:string
+                          ]) ;
                 sp:where ([ rdf:type sp:Bind ;
                             sp:expression
                                     [ rdf:type sp:if ;
                                       sp:arg1 [ rdf:type sp:eq ;
                                                 sp:arg1 spin:_arg1 ;
-                                                sp:arg2 ddr:TT_c
+                                                sp:arg2 ddr:TT_t
                                               ] ;
                                       sp:arg2 <http://www.reportinghub.no/ep/schema/equipment#Tubing> ;
                                       sp:arg3 [ rdf:type sp:if ;
@@ -3105,7 +3105,9 @@ ep-spin-lib:selectTubeType
                                                         ]
                                               ]
                                     ] ;
-                            sp:variable _:b72
+                            sp:variable
+                                    [ sp:varName "tubeType"^^xsd:string
+                                    ]
                           ])
               ] .
@@ -3115,7 +3117,7 @@ ep-spin-lib:selectVolumeScale
       rdfs:subClassOf ep-spin-lib:Function ;
       spin:body
               [ rdf:type sp:Select ;
-                sp:resultVariables (_:b73) ;
+                sp:resultVariables (_:b72) ;
                 sp:where ([ rdf:type sp:Bind ;
                             sp:expression
                                     [ rdf:type sp:if ;
@@ -3140,7 +3142,7 @@ ep-spin-lib:selectVolumeScale
                                                         ]
                                               ]
                                     ] ;
-                            sp:variable _:b73
+                            sp:variable _:b72
                           ])
               ] .
@@ -3150,7 +3152,7 @@ ep-spin-lib:selectVolumetricFlowRateScale
       rdfs:subClassOf ep-spin-lib:Function ;
       spin:body
               [ rdf:type sp:Select ;
-                sp:resultVariables (_:b74) ;
+                sp:resultVariables (_:b73) ;
                 sp:where ([ rdf:type sp:Bind ;
                             sp:expression
                                     [ rdf:type sp:if ;
@@ -3175,7 +3177,7 @@ ep-spin-lib:selectVolumetricFlowRateScale
                                                         ]
                                               ]
                                     ] ;
-                            sp:variable _:b74
+                            sp:variable _:b73
                           ])
               ] .
@@ -3185,7 +3187,7 @@ ep-spin-lib:selectWellBoreDrillingType
       rdfs:subClassOf ep-spin-lib:Function ;
       spin:body
               [ rdf:type sp:Select ;
-                sp:resultVariables (_:b75) ;
+                sp:resultVariables (_:b74) ;
                 sp:where ([ rdf:type sp:Bind ;
                             sp:expression
                                     [ rdf:type sp:if ;
@@ -3231,7 +3233,7 @@ ep-spin-lib:selectWellBoreDrillingType
                                                         ]
                                               ]
                                     ] ;
-                            sp:variable _:b75
+                            sp:variable _:b74
                           ])
               ] .
@@ -3241,7 +3243,7 @@ ep-spin-lib:selectWellBoreHphtType
       rdfs:subClassOf ep-spin-lib:Function ;
       spin:body
               [ rdf:type sp:Select ;
-                sp:resultVariables (_:b76) ;
+                sp:resultVariables (_:b75) ;
                 sp:where ([ rdf:type sp:Bind ;
                             sp:expression
                                     [ rdf:type sp:if ;
@@ -3252,7 +3254,7 @@ ep-spin-lib:selectWellBoreHphtType
                                       sp:arg2 <http://www.reportinghub.no/ep/schema/well#HphtWellBore> ;
                                       sp:arg3 <http://www.reportinghub.no/ep/schema/well#NotHphtWellBore>
                                     ] ;
-                            sp:variable _:b76
+                            sp:variable _:b75
                           ])
               ] .
@@ -3262,7 +3264,7 @@ ep-spin-lib:selectWellBoreTightnessType
       rdfs:subClassOf ep-spin-lib:Function ;
       spin:body
               [ rdf:type sp:Select ;
-                sp:resultVariables (_:b77) ;
+                sp:resultVariables (_:b76) ;
                 sp:where ([ rdf:type sp:Bind ;
                             sp:expression
                                     [ rdf:type sp:if ;
@@ -3273,7 +3275,7 @@ ep-spin-lib:selectWellBoreTightnessType
                                       sp:arg2 <http://www.reportinghub.no/ep/schema/well#TightWellBore> ;
                                       sp:arg3 <http://www.reportinghub.no/ep/schema/well#LeakyWellBore>
                                     ] ;
-                            sp:variable _:b77
+                            sp:variable _:b76
                           ])
               ] .
@@ -3283,7 +3285,7 @@ ep-spin-lib:selectWellCementJobBottomPlugType
       rdfs:subClassOf ep-spin-lib:Function ;
       spin:body
               [ rdf:type sp:Select ;
-                sp:resultVariables (_:b78) ;
+                sp:resultVariables (_:b77) ;
                 sp:where ([ rdf:type sp:Bind ;
                             sp:expression
                                     [ rdf:type sp:if ;
@@ -3294,7 +3296,7 @@ ep-spin-lib:selectWellCementJobBottomPlugType
                                       sp:arg2 <http://www.reportinghub.no/ep/schema/activity#WellCementJobWithBottomPlug> ;
                                       sp:arg3 <http://www.reportinghub.no/ep/schema/activity#WellCementJobWithoutBottomPlug>
                                     ] ;
-                            sp:variable _:b78
+                            sp:variable _:b77
                           ])
               ] .
@@ -3304,7 +3306,7 @@ ep-spin-lib:selectWellCementJobCasingReciprocationType
       rdfs:subClassOf ep-spin-lib:Function ;
       spin:body
               [ rdf:type sp:Select ;
-                sp:resultVariables (_:b79) ;
+                sp:resultVariables (_:b78) ;
                 sp:where ([ rdf:type sp:Bind ;
                             sp:expression
                                     [ rdf:type sp:if ;
@@ -3315,7 +3317,7 @@ ep-spin-lib:selectWellCementJobCasingReciprocationType
                                       sp:arg2 <http://www.reportinghub.no/ep/schema/activity#WellCementJobWithCasingReciprocation> ;
                                       sp:arg3 <http://www.reportinghub.no/ep/schema/activity#WellCementJobWithoutCasingReciprocation>
                                     ] ;
-                            sp:variable _:b79
+                            sp:variable _:b78
                           ])
               ] .
@@ -3325,7 +3327,7 @@ ep-spin-lib:selectWellCementJobCasingRotationType
       rdfs:subClassOf ep-spin-lib:Function ;
       spin:body
               [ rdf:type sp:Select ;
-                sp:resultVariables (_:b80) ;
+                sp:resultVariables (_:b79) ;
                 sp:where ([ rdf:type sp:Bind ;
                             sp:expression
                                     [ rdf:type sp:if ;
@@ -3336,7 +3338,7 @@ ep-spin-lib:selectWellCementJobCasingRotationType
                                       sp:arg2 <http://www.reportinghub.no/ep/schema/activity#WellCementJobWithCasingRotation> ;
                                       sp:arg3 <http://www.reportinghub.no/ep/schema/activity#WellCementJobWithoutCasingRotation>
                                     ] ;
-                            sp:variable _:b80
+                            sp:variable _:b79
                           ])
               ] .
@@ -3346,7 +3348,7 @@ ep-spin-lib:selectWellCementJobFloatHoldingType
       rdfs:subClassOf ep-spin-lib:Function ;
       spin:body
               [ rdf:type sp:Select ;
-                sp:resultVariables (_:b81) ;
+                sp:resultVariables (_:b80) ;
                 sp:where ([ rdf:type sp:Bind ;
                             sp:expression
                                     [ rdf:type sp:if ;
@@ -3357,7 +3359,7 @@ ep-spin-lib:selectWellCementJobFloatHoldingType
                                       sp:arg2 <http://www.reportinghub.no/ep/schema/activity#WellCementJobWithFloatHolding> ;
                                       sp:arg3 <http://www.reportinghub.no/ep/schema/activity#WellCementJobWithoutFloatHolding>
                                     ] ;
-                            sp:variable _:b81
+                            sp:variable _:b80
                           ])
               ] .
@@ -3367,7 +3369,7 @@ ep-spin-lib:selectWellCementJobPlugBumpingType
       rdfs:subClassOf ep-spin-lib:Function ;
       spin:body
               [ rdf:type sp:Select ;
-                sp:resultVariables (_:b82) ;
+                sp:resultVariables (_:b81) ;
                 sp:where ([ rdf:type sp:Bind ;
                             sp:expression
                                     [ rdf:type sp:if ;
@@ -3378,7 +3380,7 @@ ep-spin-lib:selectWellCementJobPlugBumpingType
                                       sp:arg2 <http://www.reportinghub.no/ep/schema/activity#WellCementJobWithPlugBumping> ;
                                       sp:arg3 <http://www.reportinghub.no/ep/schema/activity#WellCementJobWithoutPlugBumping>
                                     ] ;
-                            sp:variable _:b82
+                            sp:variable _:b81
                           ])
               ] .
@@ -3388,7 +3390,7 @@ ep-spin-lib:selectWellCementJobTopPlugType
       rdfs:subClassOf ep-spin-lib:Function ;
       spin:body
               [ rdf:type sp:Select ;
-                sp:resultVariables (_:b83) ;
+                sp:resultVariables (_:b82) ;
                 sp:where ([ rdf:type sp:Bind ;
                             sp:expression
                                     [ rdf:type sp:if ;
@@ -3399,7 +3401,7 @@ ep-spin-lib:selectWellCementJobTopPlugType
                                       sp:arg2 <http://www.reportinghub.no/ep/schema/activity#WellCementJobWithTopPlug> ;
                                       sp:arg3 <http://www.reportinghub.no/ep/schema/activity#WellCementJobWithoutTopPlug>
                                     ] ;
-                            sp:variable _:b83
+                            sp:variable _:b82
                           ])
               ] .
@@ -3409,7 +3411,7 @@ ep-spin-lib:selectWellCementJobType
       rdfs:subClassOf ep-spin-lib:Function ;
       spin:body
               [ rdf:type sp:Select ;
-                sp:resultVariables (_:b84) ;
+                sp:resultVariables (_:b83) ;
                 sp:where ([ rdf:type sp:Bind ;
                             sp:expression
                                     [ rdf:type sp:if ;
@@ -3441,7 +3443,7 @@ ep-spin-lib:selectWellCementJobType
                                                         ]
                                               ]
                                     ] ;
-                            sp:variable _:b84
+                            sp:variable _:b83
                           ])
               ] .
@@ -3451,7 +3453,7 @@ ep-spin-lib:selectWellControlIncidentType
       rdfs:subClassOf ep-spin-lib:Function ;
       spin:body
               [ rdf:type sp:Select ;
-                sp:resultVariables (_:b85) ;
+                sp:resultVariables (_:b84) ;
                 sp:where ([ rdf:type sp:Bind ;
                             sp:expression
                                     [ rdf:type sp:if ;
@@ -3483,7 +3485,7 @@ ep-spin-lib:selectWellControlIncidentType
                                                         ]
                                               ]
                                     ] ;
-                            sp:variable _:b85
+                            sp:variable _:b84
                           ])
               ] .
@@ -3493,7 +3495,7 @@ ep-spin-lib:selectWellKillingType
       rdfs:subClassOf ep-spin-lib:Function ;
       spin:body
               [ rdf:type sp:Select ;
-                sp:resultVariables (_:b86) ;
+                sp:resultVariables (_:b85) ;
                 sp:where ([ rdf:type sp:Bind ;
                             sp:expression
                                     [ rdf:type sp:if ;
@@ -3539,7 +3541,7 @@ ep-spin-lib:selectWellKillingType
                                                         ]
                                               ]
                                     ] ;
-                            sp:variable _:b86
+                            sp:variable _:b85
                           ])
               ] .
@@ -3549,7 +3551,7 @@ ep-spin-lib:selectWellTestType
       rdfs:subClassOf ep-spin-lib:Function ;
       spin:body
               [ rdf:type sp:Select ;
-                sp:resultVariables (_:b87) ;
+                sp:resultVariables (_:b86) ;
                 sp:where ([ rdf:type sp:Bind ;
                             sp:expression
                                     [ rdf:type sp:if ;
@@ -3567,7 +3569,7 @@ ep-spin-lib:selectWellTestType
                                                 sp:arg3 <http://www.reportinghub.no/ep/schema/activity#WellTest>
                                               ]
                                     ] ;
-                            sp:variable _:b87
+                            sp:variable _:b86
                           ])
               ] .
@@ -3577,7 +3579,7 @@ ep-spin-lib:selectWirelineFormationTestGoodnessOfSealType
       rdfs:subClassOf ep-spin-lib:Function ;
       spin:body
               [ rdf:type sp:Select ;
-                sp:resultVariables (_:b88) ;
+                sp:resultVariables (_:b87) ;
                 sp:where ([ rdf:type sp:Bind ;
                             sp:expression
                                     [ rdf:type sp:if ;
@@ -3588,7 +3590,7 @@ ep-spin-lib:selectWirelineFormationTestGoodnessOfSealType
                                       sp:arg2 <http://www.reportinghub.no/ep/schema/activity#WirelineFormationTestWithGoodSeal> ;
                                       sp:arg3 <http://www.reportinghub.no/ep/schema/activity#WirelineFormationTestWithoutGoodSeal>
                                     ] ;
-                            sp:variable _:b88
+                            sp:variable _:b87
                           ])
               ] .
@@ -3598,7 +3600,7 @@ ep-spin-lib:selectYieldPointScale
       rdfs:subClassOf ep-spin-lib:Function ;
       spin:body
               [ rdf:type sp:Select ;
-                sp:resultVariables (_:b89) ;
+                sp:resultVariables (_:b88) ;
                 sp:where ([ rdf:type sp:Bind ;
                             sp:expression
                                     [ rdf:type sp:if ;
@@ -3623,7 +3625,7 @@ ep-spin-lib:selectYieldPointScale
                                                         ]
                                               ]
                                     ] ;
-                            sp:variable _:b89
+                            sp:variable _:b88
                           ])
               ] .
@@ -3632,203 +3634,167 @@ ddr:TTUC_Enumeration_1
       rdfs:label "Enumeration"^^xsd:string ;
       dtype:value ddr:TTUC_degC .
-_:b50
+_:b1  sp:varName "uri"^^xsd:string .
-      sp:varName "drillingActivityPurposeType"^^xsd:string .
-
-_:b49
-      sp:varName "drillingActivityOutcomeType"^^xsd:string .
-
-_:b48
-      sp:varName "densityScale"^^xsd:string .
-
-_:b47
-      sp:varName "dailyDrillingReportType"^^xsd:string .
-
-_:b46
-      sp:varName "componentType"^^xsd:string .
-
-_:b45
-      sp:varName "classOfWellDatumObject"^^xsd:string .
-
-_:b44
-      sp:varName "cementingFluidReturnType"^^xsd:string .
-
-_:b43
-      sp:varName "casingRoleType"^^xsd:string .
-
-_:b42
-      sp:varName "activitySuccessType"^^xsd:string .
-
-_:b41
-      sp:varName "t4"^^xsd:string .
-
-_:b40
-      sp:varName "t3"^^xsd:string .
-_:b39
+_:b2  sp:varName "uri"^^xsd:string .
-      sp:varName "t2"^^xsd:string .
-_:b38
+_:b3  sp:varName "uri"^^xsd:string .
-      sp:varName "t1"^^xsd:string .
-_:b37
+_:b4  sp:varName "uri"^^xsd:string .
-      sp:varName "t0b"^^xsd:string .
-_:b55
+_:b5  sp:varName "uri"^^xsd:string .
-      sp:varName "gasReadingType"^^xsd:string .
-_:b36
+_:b6  sp:varName "uri"^^xsd:string .
-      sp:varName "t0a"^^xsd:string .
-_:b35
+_:b7  sp:varName "uri"^^xsd:string .
-      sp:varName "s2"^^xsd:string .
-_:b34
+_:b8  sp:varName "uri"^^xsd:string .
-      sp:varName "s1"^^xsd:string .
-_:b33
+_:b9  sp:varName "uri"^^xsd:string .
-      sp:varName "normalizedStr"^^xsd:string .
-_:b32
+_:b10
       sp:varName "uri"^^xsd:string .
-_:b31
+_:b11
       sp:varName "uri"^^xsd:string .
-_:b30
+_:b12
       sp:varName "uri"^^xsd:string .
-_:b29
+_:b13
       sp:varName "uri"^^xsd:string .
-_:b28
+_:b14
       sp:varName "uri"^^xsd:string .
-_:b27
+_:b15
       sp:varName "uri"^^xsd:string .
-_:b26
+_:b16
       sp:varName "uri"^^xsd:string .
-_:b25
+_:b17
       sp:varName "uri"^^xsd:string .
-_:b24
+_:b18
       sp:varName "uri"^^xsd:string .
-_:b23
+_:b19
       sp:varName "uri"^^xsd:string .
-_:b22
+_:b20
       sp:varName "uri"^^xsd:string .
 _:b21
       sp:varName "uri"^^xsd:string .
-_:b20
+_:b22
       sp:varName "uri"^^xsd:string .
-_:b19
+_:b23
       sp:varName "uri"^^xsd:string .
-_:b18
+_:b24
       sp:varName "uri"^^xsd:string .
-_:b17
+_:b25
       sp:varName "uri"^^xsd:string .
-_:b16
+_:b26
       sp:varName "uri"^^xsd:string .
-_:b15
+_:b27
       sp:varName "uri"^^xsd:string .
-_:b14
+_:b28
       sp:varName "uri"^^xsd:string .
-_:b13
+_:b29
       sp:varName "uri"^^xsd:string .
-_:b12
+_:b30
       sp:varName "uri"^^xsd:string .
-_:b11
+_:b31
       sp:varName "uri"^^xsd:string .
-_:b54
+_:b32
-      sp:varName "fluidType"^^xsd:string .
-
-_:b10
       sp:varName "uri"^^xsd:string .
-_:b9  sp:varName "uri"^^xsd:string .
+_:b33
-
+      sp:varName "normalizedStr"^^xsd:string .
-_:b8  sp:varName "uri"^^xsd:string .
-_:b7  sp:varName "uri"^^xsd:string .
+_:b34
+      sp:varName "s1"^^xsd:string .
-_:b6  sp:varName "uri"^^xsd:string .
+_:b35
+      sp:varName "s2"^^xsd:string .
-_:b4  sp:varName "uri"^^xsd:string .
+_:b36
+      sp:varName "t0a"^^xsd:string .
-_:b3  sp:varName "uri"^^xsd:string .
+_:b37
+      sp:varName "t0b"^^xsd:string .
-_:b2  sp:varName "uri"^^xsd:string .
+_:b38
+      sp:varName "t1"^^xsd:string .
-_:b1  sp:varName "uri"^^xsd:string .
+_:b39
+      sp:varName "t2"^^xsd:string .
-_:b53
+_:b40
-      sp:varName "fixedOrMoveableRigType"^^xsd:string .
+      sp:varName "t3"^^xsd:string .
-_:b56
+_:b41
-      sp:varName "innerBarrelType"^^xsd:string .
+      sp:varName "t4"^^xsd:string .
-_:b52
+_:b42
-      sp:varName "drillingEquipmentType"^^xsd:string .
+      sp:varName "activitySuccessType"^^xsd:string .
-_:b51
+_:b43
-      sp:varName "drillingActivityTypeAccordingToEquipmentType"^^xsd:string .
+      sp:varName "casingRoleType"^^xsd:string .
-_:b77
+_:b44
-      sp:varName "wellBoreTightnessType"^^xsd:string .
+      sp:varName "cementingFluidReturnType"^^xsd:string .
-_:b78
+_:b45
-      sp:varName "wellCementJobBottomPlugType"^^xsd:string .
+      sp:varName "classOfWellDatumObject"^^xsd:string .
-_:b79
+_:b46
-      sp:varName "wellCementJobCasingReciprocationType"^^xsd:string .
+      sp:varName "componentType"^^xsd:string .
-_:b80
+_:b47
-      sp:varName "wellCementJobCasingRotationType"^^xsd:string .
+      sp:varName "dailyDrillingReportType"^^xsd:string .
-_:b81
+_:b48
-      sp:varName "wellCementJobFloatHoldingType"^^xsd:string .
+      sp:varName "densityScale"^^xsd:string .
-_:b5  sp:varName "uri"^^xsd:string .
+_:b49
+      sp:varName "drillingActivityOutcomeType"^^xsd:string .
-_:b82
+_:b50
-      sp:varName "wellCementJobPlugBumpingType"^^xsd:string .
+      sp:varName "drillingActivityPurposeType"^^xsd:string .
-_:b83
+_:b51
-      sp:varName "wellCementJobTopPlugType"^^xsd:string .
+      sp:varName "drillingActivityTypeAccordingToEquipmentType"^^xsd:string .
-_:b84
+_:b52
-      sp:varName "wellCementJobType"^^xsd:string .
+      sp:varName "drillingEquipmentType"^^xsd:string .
-_:b85
+_:b53
-      sp:varName "wellControlIncidentType"^^xsd:string .
+      sp:varName "fixedOrMoveableRigType"^^xsd:string .
-_:b86
+_:b54
-      sp:varName "wellKillingType"^^xsd:string .
+      sp:varName "fluidType"^^xsd:string .
-_:b87
+_:b55
-      sp:varName "wellTestType"^^xsd:string .
+      sp:varName "gasReadingType"^^xsd:string .
-_:b88
+_:b56
-      sp:varName "wirelineFormationTestGoodnessOfSealType"^^xsd:string .
+      sp:varName "innerBarrelType"^^xsd:string .
-_:b89
+_:b57
-      sp:varName "yieldPointScale"^^xsd:string .
+      sp:varName "dailyDrillingReportType"^^xsd:string .
 _:b58
       sp:varName "lengthScale"^^xsd:string .
@@ -3851,9 +3817,6 @@ _:b63
 _:b64
       sp:varName "pressureScale"^^xsd:string .
-_:b57
-      sp:varName "dailyDrillingReportType"^^xsd:string .
-
 _:b65
       sp:varName "pressureTestType"^^xsd:string .
@@ -3876,16 +3839,52 @@ _:b71
       sp:varName "durationScale"^^xsd:string .
 _:b72
-      sp:varName "tubeType"^^xsd:string .
+      sp:varName "volumeScale"^^xsd:string .
 _:b73
-      sp:varName "volumeScale"^^xsd:string .
+      sp:varName "volumetricFlowRateScale"^^xsd:string .
 _:b74
-      sp:varName "volumetricFlowRateScale"^^xsd:string .
+      sp:varName "wellBoreDrillingType"^^xsd:string .
 _:b75
-      sp:varName "wellBoreDrillingType"^^xsd:string .
+      sp:varName "wellBoreHphtType"^^xsd:string .
 _:b76
-      sp:varName "wellBoreHphtType"^^xsd:string .
+      sp:varName "wellBoreTightnessType"^^xsd:string .
+
+_:b77
+      sp:varName "wellCementJobBottomPlugType"^^xsd:string .
+
+_:b78
+      sp:varName "wellCementJobCasingReciprocationType"^^xsd:string .
+
+_:b79
+      sp:varName "wellCementJobCasingRotationType"^^xsd:string .
+
+_:b80
+      sp:varName "wellCementJobFloatHoldingType"^^xsd:string .
+
+_:b81
+      sp:varName "wellCementJobPlugBumpingType"^^xsd:string .
+
+_:b82
+      sp:varName "wellCementJobTopPlugType"^^xsd:string .
+
+_:b83
+      sp:varName "wellCementJobType"^^xsd:string .
+
+_:b84
+      sp:varName "wellControlIncidentType"^^xsd:string .
+
+_:b85
+      sp:varName "wellKillingType"^^xsd:string .
+
+_:b86
+      sp:varName "wellTestType"^^xsd:string .
+
+_:b87
+      sp:varName "wirelineFormationTestGoodnessOfSealType"^^xsd:string .
+
+_:b88
+      sp:varName "yieldPointScale"^^xsd:string .