David Price

Cleanup mostly UoM

1 -# Saved by TopBraid on Fri Oct 28 20:21:33 BST 2011
2 # baseURI: null 1 # baseURI: null
3 2
4 @prefix composite: <http://www.topbraid.org/2007/05/composite.owl#> . 3 @prefix composite: <http://www.topbraid.org/2007/05/composite.owl#> .
......
1 -# Saved by TopBraid on Wed Sep 28 16:02:41 BST 2011
2 # baseURI: http://www.reportinghub.no/ep/schema/1.0/report 1 # baseURI: http://www.reportinghub.no/ep/schema/1.0/report
3 -# imports: http://www.reportinghub.no/ep/schema/1.0/well 2 +# imports: http://www.reportinghub.no/ep/schema/1.0/activity
4 # imports: http://www.reportinghub.no/ep/schema/1.0/core 3 # imports: http://www.reportinghub.no/ep/schema/1.0/core
5 # imports: http://www.reportinghub.no/ep/schema/1.0/equipment 4 # imports: http://www.reportinghub.no/ep/schema/1.0/equipment
6 -# imports: http://www.reportinghub.no/ep/schema/1.0/activity 5 +# imports: http://www.reportinghub.no/ep/schema/1.0/well
7 6
8 -@prefix ep-core: <http://www.reportinghub.no/ep/schema/core#> .
9 @prefix ep-report: <http://www.reportinghub.no/ep/schema/report#> . 7 @prefix ep-report: <http://www.reportinghub.no/ep/schema/report#> .
10 @prefix owl: <http://www.w3.org/2002/07/owl#> . 8 @prefix owl: <http://www.w3.org/2002/07/owl#> .
11 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> . 9 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
...@@ -14,7 +12,7 @@ ...@@ -14,7 +12,7 @@
14 12
15 <http://www.reportinghub.no/ep/schema/1.0/report> 13 <http://www.reportinghub.no/ep/schema/1.0/report>
16 rdf:type owl:Ontology ; 14 rdf:type owl:Ontology ;
17 - owl:imports <http://www.reportinghub.no/ep/schema/1.0/activity> , <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/well> ; 15 + owl:imports <http://www.reportinghub.no/ep/schema/1.0/well> , <http://www.reportinghub.no/ep/schema/1.0/equipment> , <http://www.reportinghub.no/ep/schema/1.0/core> , <http://www.reportinghub.no/ep/schema/1.0/activity> ;
18 owl:versionInfo "0.1.0"^^xsd:string . 16 owl:versionInfo "0.1.0"^^xsd:string .
19 17
20 ep-report:DailyDrillingReport 18 ep-report:DailyDrillingReport
...@@ -27,7 +25,7 @@ ep-report:DailyDrillingReportFinalisationType ...@@ -27,7 +25,7 @@ ep-report:DailyDrillingReportFinalisationType
27 rdfs:subClassOf owl:Class . 25 rdfs:subClassOf owl:Class .
28 26
29 ep-report:FinalDailyDrillingReport 27 ep-report:FinalDailyDrillingReport
30 - rdf:type ep-report:DailyDrillingReportFinalisationType , owl:Class ; 28 + rdf:type owl:Class , ep-report:DailyDrillingReportFinalisationType ;
31 rdfs:label "final daily drilling report"^^xsd:string ; 29 rdfs:label "final daily drilling report"^^xsd:string ;
32 rdfs:subClassOf ep-report:DailyDrillingReport . 30 rdfs:subClassOf ep-report:DailyDrillingReport .
33 31
...@@ -36,13 +34,8 @@ ep-report:NonProductivetimeReport ...@@ -36,13 +34,8 @@ ep-report:NonProductivetimeReport
36 rdfs:subClassOf ep-report:Report ; 34 rdfs:subClassOf ep-report:Report ;
37 rdfs:subClassOf 35 rdfs:subClassOf
38 [ rdf:type owl:Restriction ; 36 [ rdf:type owl:Restriction ;
39 - owl:allValuesFrom xsd:dateTime ;
40 - owl:onProperty ep-report:createdAt
41 - ] ;
42 - rdfs:subClassOf
43 - [ rdf:type owl:Restriction ;
44 owl:cardinality "1"^^xsd:nonNegativeInteger ; 37 owl:cardinality "1"^^xsd:nonNegativeInteger ;
45 - owl:onProperty ep-report:createdAt 38 + owl:onProperty ep-report:reportOn
46 ] ; 39 ] ;
47 rdfs:subClassOf 40 rdfs:subClassOf
48 [ rdf:type owl:Restriction ; 41 [ rdf:type owl:Restriction ;
...@@ -52,16 +45,21 @@ ep-report:NonProductivetimeReport ...@@ -52,16 +45,21 @@ ep-report:NonProductivetimeReport
52 rdfs:subClassOf 45 rdfs:subClassOf
53 [ rdf:type owl:Restriction ; 46 [ rdf:type owl:Restriction ;
54 owl:cardinality "1"^^xsd:nonNegativeInteger ; 47 owl:cardinality "1"^^xsd:nonNegativeInteger ;
55 - owl:onProperty ep-report:reportOn 48 + owl:onProperty ep-report:createdAt
49 + ] ;
50 + rdfs:subClassOf
51 + [ rdf:type owl:Restriction ;
52 + owl:allValuesFrom xsd:dateTime ;
53 + owl:onProperty ep-report:createdAt
56 ] . 54 ] .
57 55
58 ep-report:NormalDailyDrillingReport 56 ep-report:NormalDailyDrillingReport
59 - rdf:type ep-report:DailyDrillingReportFinalisationType , owl:Class ; 57 + rdf:type owl:Class , ep-report:DailyDrillingReportFinalisationType ;
60 rdfs:label "normal daily drilling report"^^xsd:string ; 58 rdfs:label "normal daily drilling report"^^xsd:string ;
61 rdfs:subClassOf ep-report:DailyDrillingReport . 59 rdfs:subClassOf ep-report:DailyDrillingReport .
62 60
63 ep-report:PreliminaryDailyDrillingReport 61 ep-report:PreliminaryDailyDrillingReport
64 - rdf:type ep-report:DailyDrillingReportFinalisationType , owl:Class ; 62 + rdf:type owl:Class , ep-report:DailyDrillingReportFinalisationType ;
65 rdfs:label "preliminary daily drilling report"^^xsd:string ; 63 rdfs:label "preliminary daily drilling report"^^xsd:string ;
66 rdfs:subClassOf ep-report:DailyDrillingReport . 64 rdfs:subClassOf ep-report:DailyDrillingReport .
67 65
...@@ -75,32 +73,32 @@ ep-report:WeeklyDrillingReport ...@@ -75,32 +73,32 @@ ep-report:WeeklyDrillingReport
75 rdfs:subClassOf ep-report:Report ; 73 rdfs:subClassOf ep-report:Report ;
76 rdfs:subClassOf 74 rdfs:subClassOf
77 [ rdf:type owl:Restriction ; 75 [ rdf:type owl:Restriction ;
78 - owl:allValuesFrom ep-report:DailyDrillingReport ; 76 + owl:cardinality "1"^^xsd:nonNegativeInteger ;
79 - owl:onProperty ep-report:reportOn 77 + owl:onProperty ep-report:createdAt
80 ] ; 78 ] ;
81 rdfs:subClassOf 79 rdfs:subClassOf
82 [ rdf:type owl:Restriction ; 80 [ rdf:type owl:Restriction ;
83 - owl:cardinality "7"^^xsd:nonNegativeInteger ; 81 + owl:allValuesFrom xsd:dateTime ;
84 - owl:onProperty ep-report:reportOn 82 + owl:onProperty ep-report:createdAt
85 ] ; 83 ] ;
86 rdfs:subClassOf 84 rdfs:subClassOf
87 [ rdf:type owl:Restriction ; 85 [ rdf:type owl:Restriction ;
88 - owl:allValuesFrom xsd:dateTime ; 86 + owl:cardinality "7"^^xsd:nonNegativeInteger ;
89 - owl:onProperty ep-report:createdAt 87 + owl:onProperty ep-report:reportOn
90 ] ; 88 ] ;
91 rdfs:subClassOf 89 rdfs:subClassOf
92 [ rdf:type owl:Restriction ; 90 [ rdf:type owl:Restriction ;
93 - owl:cardinality "1"^^xsd:nonNegativeInteger ; 91 + owl:allValuesFrom ep-report:DailyDrillingReport ;
94 - owl:onProperty ep-report:createdAt 92 + owl:onProperty ep-report:reportOn
95 ] . 93 ] .
96 94
97 ep-report:createdAt 95 ep-report:createdAt
98 - rdf:type owl:DatatypeProperty , owl:FunctionalProperty ; 96 + rdf:type owl:FunctionalProperty , owl:DatatypeProperty ;
99 rdfs:domain ep-report:Report ; 97 rdfs:domain ep-report:Report ;
100 rdfs:label "created at"^^xsd:string . 98 rdfs:label "created at"^^xsd:string .
101 99
102 ep-report:dailyDrillingReportNumber 100 ep-report:dailyDrillingReportNumber
103 - rdf:type owl:DatatypeProperty , owl:FunctionalProperty ; 101 + rdf:type owl:FunctionalProperty , owl:DatatypeProperty ;
104 rdfs:domain ep-report:DailyDrillingReport ; 102 rdfs:domain ep-report:DailyDrillingReport ;
105 rdfs:label "daily drilling report number"^^xsd:string . 103 rdfs:label "daily drilling report number"^^xsd:string .
106 104
...@@ -108,16 +106,16 @@ ep-report:datumObjectForDailyDrillingReport ...@@ -108,16 +106,16 @@ ep-report:datumObjectForDailyDrillingReport
108 rdf:type owl:ObjectProperty ; 106 rdf:type owl:ObjectProperty ;
109 rdfs:domain ep-report:DailyDrillingReport ; 107 rdfs:domain ep-report:DailyDrillingReport ;
110 rdfs:label "datum object for daily drilling report"^^xsd:string ; 108 rdfs:label "datum object for daily drilling report"^^xsd:string ;
111 - rdfs:range ep-core:PhysicalObject . 109 + rdfs:range <http://www.reportinghub.no/ep/schema/core#PhysicalObject> .
112 110
113 ep-report:hasContent 111 ep-report:hasContent
114 - rdf:type owl:DatatypeProperty , owl:FunctionalProperty ; 112 + rdf:type owl:FunctionalProperty , owl:DatatypeProperty ;
115 rdfs:domain ep-report:Report ; 113 rdfs:domain ep-report:Report ;
116 rdfs:label "has content"^^xsd:string . 114 rdfs:label "has content"^^xsd:string .
117 115
118 ep-report:nameAsDatumObject 116 ep-report:nameAsDatumObject
119 - rdf:type owl:DatatypeProperty , owl:FunctionalProperty ; 117 + rdf:type owl:FunctionalProperty , owl:DatatypeProperty ;
120 - rdfs:domain ep-core:PhysicalObject ; 118 + rdfs:domain <http://www.reportinghub.no/ep/schema/core#PhysicalObject> ;
121 rdfs:label "name as datum object"^^xsd:string . 119 rdfs:label "name as datum object"^^xsd:string .
122 120
123 ep-report:reportOn 121 ep-report:reportOn
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
22 <http://www.reportinghub.no/ep/spin/ddr-tables> 22 <http://www.reportinghub.no/ep/spin/ddr-tables>
23 rdf:type owl:Ontology ; 23 rdf:type owl:Ontology ;
24 rdfs:comment "A collection of SELECT templates that can be used to assemble tables in DD reports."^^xsd:string ; 24 rdfs:comment "A collection of SELECT templates that can be used to assemble tables in DD reports."^^xsd:string ;
25 - owl:imports <http://spinrdf.org/spin> , <http://www.reportinghub.no/ep/schema/1.0/activity-purpose> , <http://www.reportinghub.no/ep/schema/1.0/ddr> , <http://www.reportinghub.no/spin/rh> ; 25 + owl:imports <http://www.reportinghub.no/spin/rh> , <http://www.reportinghub.no/ep/schema/1.0/ddr> , <http://www.reportinghub.no/ep/schema/1.0/activity-purpose> , <http://spinrdf.org/spin> ;
26 owl:versionInfo "0.1.0"^^xsd:string . 26 owl:versionInfo "0.1.0"^^xsd:string .
27 27
28 ddr-tables:BitRecord 28 ddr-tables:BitRecord
...@@ -880,7 +880,7 @@ ddr-tables:CementFluidInformation ...@@ -880,7 +880,7 @@ ddr-tables:CementFluidInformation
880 sp:subject 880 sp:subject
881 [ sp:varName "fluid"^^xsd:string 881 [ sp:varName "fluid"^^xsd:string
882 ] 882 ]
883 - ] [ sp:object <http://www.reportinghub.no/ep/schema/core#SpecificVolume> ; 883 + ] [ sp:object <http://www.reportinghub.no/ep/schema/core#VolumeMassRatio> ;
884 sp:predicate rdf:type ; 884 sp:predicate rdf:type ;
885 sp:subject 885 sp:subject
886 [ sp:varName "ratio"^^xsd:string 886 [ sp:varName "ratio"^^xsd:string
...@@ -901,7 +901,7 @@ ddr-tables:CementFluidInformation ...@@ -901,7 +901,7 @@ ddr-tables:CementFluidInformation
901 sp:subject 901 sp:subject
902 [ sp:varName "fluid"^^xsd:string 902 [ sp:varName "fluid"^^xsd:string
903 ] 903 ]
904 - ] [ sp:object <http://www.reportinghub.no/ep/schema/core#SpecificVolume> ; 904 + ] [ sp:object <http://www.reportinghub.no/ep/schema/core#VolumePerUnitVolumeConcentration> ;
905 sp:predicate rdf:type ; 905 sp:predicate rdf:type ;
906 sp:subject 906 sp:subject
907 [ sp:varName "fw"^^xsd:string 907 [ sp:varName "fw"^^xsd:string
......
This diff could not be displayed because it is too large.
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
20 20
21 <http://www.reportinghub.no/ep/transform/1.1/ddr/gasReadingInfo> 21 <http://www.reportinghub.no/ep/transform/1.1/ddr/gasReadingInfo>
22 rdf:type owl:Ontology ; 22 rdf:type owl:Ontology ;
23 - owl:imports <http://spinrdf.org/spin> , <http://www.reportinghub.no/ep/schema/1.0/activity> , <http://www.reportinghub.no/ep/schema/1.0/core> , <http://www.reportinghub.no/ep/spin/1.1/lib> , <http://www.witsml.org/schemas/1series> ; 23 + owl:imports <http://www.witsml.org/schemas/1series> , <http://www.reportinghub.no/ep/spin/1.1/lib> , <http://www.reportinghub.no/ep/schema/1.0/core> , <http://www.reportinghub.no/ep/schema/1.0/activity> , <http://spinrdf.org/spin> ;
24 owl:versionInfo "Created with TopBraid Composer"^^xsd:string . 24 owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
25 25
26 <http://www.witsml.org/schemas/1series#Obj_drillReport> 26 <http://www.witsml.org/schemas/1series#Obj_drillReport>
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
142 ] [ sp:object <http://www.reportinghub.no/ep/schema/well#Gas> ; 142 ] [ sp:object <http://www.reportinghub.no/ep/schema/well#Gas> ;
143 sp:predicate rdf:type ; 143 sp:predicate rdf:type ;
144 sp:subject _:b10 144 sp:subject _:b10
145 - ] [ sp:object <http://www.reportinghub.no/ep/schema/core#SpecificVolume> ; 145 + ] [ sp:object <http://www.reportinghub.no/ep/schema/core#VolumePerUnitVolumeConcentration> ;
146 sp:predicate rdf:type ; 146 sp:predicate rdf:type ;
147 sp:subject _:b8 147 sp:subject _:b8
148 ] [ sp:object 148 ] [ sp:object
...@@ -152,7 +152,7 @@ ...@@ -152,7 +152,7 @@
152 [ sp:varName "concentrationScaleGasHigh"^^xsd:string 152 [ sp:varName "concentrationScaleGasHigh"^^xsd:string
153 ] ; 153 ] ;
154 sp:subject _:b8 154 sp:subject _:b8
155 - ] [ sp:object <http://www.reportinghub.no/ep/schema/core#SpecificVolume> ; 155 + ] [ sp:object <http://www.reportinghub.no/ep/schema/core#VolumePerUnitVolumeConcentration> ;
156 sp:predicate rdf:type ; 156 sp:predicate rdf:type ;
157 sp:subject _:b9 157 sp:subject _:b9
158 ] [ sp:object 158 ] [ sp:object
...@@ -165,7 +165,7 @@ ...@@ -165,7 +165,7 @@
165 ] [ sp:object _:b11 ; 165 ] [ sp:object _:b11 ;
166 sp:predicate <http://www.reportinghub.no/ep/schema/well#methaneConcentration> ; 166 sp:predicate <http://www.reportinghub.no/ep/schema/well#methaneConcentration> ;
167 sp:subject _:b10 167 sp:subject _:b10
168 - ] [ sp:object <http://www.reportinghub.no/ep/schema/core#SpecificVolume> ; 168 + ] [ sp:object <http://www.reportinghub.no/ep/schema/core#VolumePerUnitVolumeConcentration> ;
169 sp:predicate rdf:type ; 169 sp:predicate rdf:type ;
170 sp:subject _:b11 170 sp:subject _:b11
171 ] [ sp:object 171 ] [ sp:object
...@@ -178,7 +178,7 @@ ...@@ -178,7 +178,7 @@
178 ] [ sp:object _:b12 ; 178 ] [ sp:object _:b12 ;
179 sp:predicate <http://www.reportinghub.no/ep/schema/well#ethaneConcentration> ; 179 sp:predicate <http://www.reportinghub.no/ep/schema/well#ethaneConcentration> ;
180 sp:subject _:b10 180 sp:subject _:b10
181 - ] [ sp:object <http://www.reportinghub.no/ep/schema/core#SpecificVolume> ; 181 + ] [ sp:object <http://www.reportinghub.no/ep/schema/core#VolumePerUnitVolumeConcentration> ;
182 sp:predicate rdf:type ; 182 sp:predicate rdf:type ;
183 sp:subject _:b12 183 sp:subject _:b12
184 ] [ sp:object 184 ] [ sp:object
...@@ -191,7 +191,7 @@ ...@@ -191,7 +191,7 @@
191 ] [ sp:object _:b13 ; 191 ] [ sp:object _:b13 ;
192 sp:predicate <http://www.reportinghub.no/ep/schema/well#propaneConcentration> ; 192 sp:predicate <http://www.reportinghub.no/ep/schema/well#propaneConcentration> ;
193 sp:subject _:b10 193 sp:subject _:b10
194 - ] [ sp:object <http://www.reportinghub.no/ep/schema/core#SpecificVolume> ; 194 + ] [ sp:object <http://www.reportinghub.no/ep/schema/core#VolumePerUnitVolumeConcentration> ;
195 sp:predicate rdf:type ; 195 sp:predicate rdf:type ;
196 sp:subject _:b13 196 sp:subject _:b13
197 ] [ sp:object 197 ] [ sp:object
...@@ -204,7 +204,7 @@ ...@@ -204,7 +204,7 @@
204 ] [ sp:object _:b14 ; 204 ] [ sp:object _:b14 ;
205 sp:predicate <http://www.reportinghub.no/ep/schema/well#isoButaneConcentration> ; 205 sp:predicate <http://www.reportinghub.no/ep/schema/well#isoButaneConcentration> ;
206 sp:subject _:b10 206 sp:subject _:b10
207 - ] [ sp:object <http://www.reportinghub.no/ep/schema/core#SpecificVolume> ; 207 + ] [ sp:object <http://www.reportinghub.no/ep/schema/core#VolumePerUnitVolumeConcentration> ;
208 sp:predicate rdf:type ; 208 sp:predicate rdf:type ;
209 sp:subject _:b14 209 sp:subject _:b14
210 ] [ sp:object 210 ] [ sp:object
...@@ -217,7 +217,7 @@ ...@@ -217,7 +217,7 @@
217 ] [ sp:object _:b15 ; 217 ] [ sp:object _:b15 ;
218 sp:predicate <http://www.reportinghub.no/ep/schema/well#norButaneConcentration> ; 218 sp:predicate <http://www.reportinghub.no/ep/schema/well#norButaneConcentration> ;
219 sp:subject _:b10 219 sp:subject _:b10
220 - ] [ sp:object <http://www.reportinghub.no/ep/schema/core#SpecificVolume> ; 220 + ] [ sp:object <http://www.reportinghub.no/ep/schema/core#VolumePerUnitVolumeConcentration> ;
221 sp:predicate rdf:type ; 221 sp:predicate rdf:type ;
222 sp:subject _:b15 222 sp:subject _:b15
223 ] [ sp:object 223 ] [ sp:object
...@@ -230,7 +230,7 @@ ...@@ -230,7 +230,7 @@
230 ] [ sp:object _:b16 ; 230 ] [ sp:object _:b16 ;
231 sp:predicate <http://www.reportinghub.no/ep/schema/well#isoPentaneConcentration> ; 231 sp:predicate <http://www.reportinghub.no/ep/schema/well#isoPentaneConcentration> ;
232 sp:subject _:b10 232 sp:subject _:b10
233 - ] [ sp:object <http://www.reportinghub.no/ep/schema/core#SpecificVolume> ; 233 + ] [ sp:object <http://www.reportinghub.no/ep/schema/core#VolumePerUnitVolumeConcentration> ;
234 sp:predicate rdf:type ; 234 sp:predicate rdf:type ;
235 sp:subject _:b16 235 sp:subject _:b16
236 ] [ sp:object 236 ] [ sp:object
...@@ -633,7 +633,7 @@ ...@@ -633,7 +633,7 @@
633 ] 633 ]
634 ] [ rdf:type sp:Bind ; 634 ] [ rdf:type sp:Bind ;
635 sp:expression 635 sp:expression
636 - [ rdf:type ep-spin-lib:selectSpecificVolumeScale ; 636 + [ rdf:type ep-spin-lib:selectVolumePerUnitVolumeConcentrationScale ;
637 sp:arg1 [ sp:varName "uomGasHigh"^^xsd:string 637 sp:arg1 [ sp:varName "uomGasHigh"^^xsd:string
638 ] 638 ]
639 ] ; 639 ] ;
...@@ -642,7 +642,7 @@ ...@@ -642,7 +642,7 @@
642 ] 642 ]
643 ] [ rdf:type sp:Bind ; 643 ] [ rdf:type sp:Bind ;
644 sp:expression 644 sp:expression
645 - [ rdf:type ep-spin-lib:selectSpecificVolumeScale ; 645 + [ rdf:type ep-spin-lib:selectVolumePerUnitVolumeConcentrationScale ;
646 sp:arg1 [ sp:varName "uomGasLow"^^xsd:string 646 sp:arg1 [ sp:varName "uomGasLow"^^xsd:string
647 ] 647 ]
648 ] ; 648 ] ;
...@@ -651,7 +651,7 @@ ...@@ -651,7 +651,7 @@
651 ] 651 ]
652 ] [ rdf:type sp:Bind ; 652 ] [ rdf:type sp:Bind ;
653 sp:expression 653 sp:expression
654 - [ rdf:type ep-spin-lib:selectSpecificVolumeScale ; 654 + [ rdf:type ep-spin-lib:selectVolumePerUnitVolumeConcentrationScale ;
655 sp:arg1 [ sp:varName "uomMeth"^^xsd:string 655 sp:arg1 [ sp:varName "uomMeth"^^xsd:string
656 ] 656 ]
657 ] ; 657 ] ;
...@@ -660,7 +660,7 @@ ...@@ -660,7 +660,7 @@
660 ] 660 ]
661 ] [ rdf:type sp:Bind ; 661 ] [ rdf:type sp:Bind ;
662 sp:expression 662 sp:expression
663 - [ rdf:type ep-spin-lib:selectSpecificVolumeScale ; 663 + [ rdf:type ep-spin-lib:selectVolumePerUnitVolumeConcentrationScale ;
664 sp:arg1 [ sp:varName "uomEth"^^xsd:string 664 sp:arg1 [ sp:varName "uomEth"^^xsd:string
665 ] 665 ]
666 ] ; 666 ] ;
...@@ -669,7 +669,7 @@ ...@@ -669,7 +669,7 @@
669 ] 669 ]
670 ] [ rdf:type sp:Bind ; 670 ] [ rdf:type sp:Bind ;
671 sp:expression 671 sp:expression
672 - [ rdf:type ep-spin-lib:selectSpecificVolumeScale ; 672 + [ rdf:type ep-spin-lib:selectVolumePerUnitVolumeConcentrationScale ;
673 sp:arg1 [ sp:varName "uomProp"^^xsd:string 673 sp:arg1 [ sp:varName "uomProp"^^xsd:string
674 ] 674 ]
675 ] ; 675 ] ;
...@@ -678,7 +678,7 @@ ...@@ -678,7 +678,7 @@
678 ] 678 ]
679 ] [ rdf:type sp:Bind ; 679 ] [ rdf:type sp:Bind ;
680 sp:expression 680 sp:expression
681 - [ rdf:type ep-spin-lib:selectSpecificVolumeScale ; 681 + [ rdf:type ep-spin-lib:selectVolumePerUnitVolumeConcentrationScale ;
682 sp:arg1 [ sp:varName "uomIbut"^^xsd:string 682 sp:arg1 [ sp:varName "uomIbut"^^xsd:string
683 ] 683 ]
684 ] ; 684 ] ;
...@@ -687,7 +687,7 @@ ...@@ -687,7 +687,7 @@
687 ] 687 ]
688 ] [ rdf:type sp:Bind ; 688 ] [ rdf:type sp:Bind ;
689 sp:expression 689 sp:expression
690 - [ rdf:type ep-spin-lib:selectSpecificVolumeScale ; 690 + [ rdf:type ep-spin-lib:selectVolumePerUnitVolumeConcentrationScale ;
691 sp:arg1 [ sp:varName "uomNbut"^^xsd:string 691 sp:arg1 [ sp:varName "uomNbut"^^xsd:string
692 ] 692 ]
693 ] ; 693 ] ;
...@@ -696,7 +696,7 @@ ...@@ -696,7 +696,7 @@
696 ] 696 ]
697 ] [ rdf:type sp:Bind ; 697 ] [ rdf:type sp:Bind ;
698 sp:expression 698 sp:expression
699 - [ rdf:type ep-spin-lib:selectSpecificVolumeScale ; 699 + [ rdf:type ep-spin-lib:selectVolumePerUnitVolumeConcentrationScale ;
700 sp:arg1 [ sp:varName "uomIpent"^^xsd:string 700 sp:arg1 [ sp:varName "uomIpent"^^xsd:string
701 ] 701 ]
702 ] ; 702 ] ;
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
20 20
21 <http://www.reportinghub.no/ep/transform/1.1/ddr/wellTestInfo> 21 <http://www.reportinghub.no/ep/transform/1.1/ddr/wellTestInfo>
22 rdf:type owl:Ontology ; 22 rdf:type owl:Ontology ;
23 - owl:imports <http://spinrdf.org/spin> , <http://www.reportinghub.no/ep/schema/1.0/activity> , <http://www.reportinghub.no/ep/schema/1.0/core> , <http://www.reportinghub.no/ep/spin/1.1/lib> , <http://www.witsml.org/schemas/1series> ; 23 + owl:imports <http://www.witsml.org/schemas/1series> , <http://www.reportinghub.no/ep/spin/1.1/lib> , <http://www.reportinghub.no/ep/schema/1.0/core> , <http://www.reportinghub.no/ep/schema/1.0/activity> , <http://spinrdf.org/spin> ;
24 owl:versionInfo "Created with TopBraid Composer"^^xsd:string . 24 owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
25 25
26 <http://www.witsml.org/schemas/1series#Obj_drillReport> 26 <http://www.witsml.org/schemas/1series#Obj_drillReport>
...@@ -163,7 +163,7 @@ ...@@ -163,7 +163,7 @@
163 ] [ sp:object _:b10 ; 163 ] [ sp:object _:b10 ;
164 sp:predicate <http://www.reportinghub.no/ep/schema/well#waterOilRatio> ; 164 sp:predicate <http://www.reportinghub.no/ep/schema/well#waterOilRatio> ;
165 sp:subject _:b9 165 sp:subject _:b9
166 - ] [ sp:object <http://www.reportinghub.no/ep/schema/core#SpecificVolume> ; 166 + ] [ sp:object <http://www.reportinghub.no/ep/schema/core#VolumePerUnitVolumeConcentration> ;
167 sp:predicate rdf:type ; 167 sp:predicate rdf:type ;
168 sp:subject _:b10 168 sp:subject _:b10
169 ] [ sp:object 169 ] [ sp:object
...@@ -176,7 +176,7 @@ ...@@ -176,7 +176,7 @@
176 ] [ sp:object _:b11 ; 176 ] [ sp:object _:b11 ;
177 sp:predicate <http://www.reportinghub.no/ep/schema/well#gasOilRatio> ; 177 sp:predicate <http://www.reportinghub.no/ep/schema/well#gasOilRatio> ;
178 sp:subject _:b9 178 sp:subject _:b9
179 - ] [ sp:object <http://www.reportinghub.no/ep/schema/core#SpecificVolume> ; 179 + ] [ sp:object <http://www.reportinghub.no/ep/schema/core#VolumePerUnitVolumeConcentration> ;
180 sp:predicate rdf:type ; 180 sp:predicate rdf:type ;
181 sp:subject _:b11 181 sp:subject _:b11
182 ] [ sp:object 182 ] [ sp:object
...@@ -369,7 +369,7 @@ ...@@ -369,7 +369,7 @@
369 ] [ sp:object _:b27 ; 369 ] [ sp:object _:b27 ;
370 sp:predicate <http://www.reportinghub.no/ep/schema/well#chlorideConcentration> ; 370 sp:predicate <http://www.reportinghub.no/ep/schema/well#chlorideConcentration> ;
371 sp:subject _:b20 371 sp:subject _:b20
372 - ] [ sp:object <http://www.reportinghub.no/ep/schema/core#SpecificMass> ; 372 + ] [ sp:object <http://www.reportinghub.no/ep/schema/core#MassPerUnitMassConcentration> ;
373 sp:predicate rdf:type ; 373 sp:predicate rdf:type ;
374 sp:subject _:b27 374 sp:subject _:b27
375 ] [ sp:object 375 ] [ sp:object
...@@ -382,7 +382,7 @@ ...@@ -382,7 +382,7 @@
382 ] [ sp:object _:b28 ; 382 ] [ sp:object _:b28 ;
383 sp:predicate <http://www.reportinghub.no/ep/schema/well#carbonDioxideConcentration> ; 383 sp:predicate <http://www.reportinghub.no/ep/schema/well#carbonDioxideConcentration> ;
384 sp:subject _:b20 384 sp:subject _:b20
385 - ] [ sp:object <http://www.reportinghub.no/ep/schema/core#SpecificMass> ; 385 + ] [ sp:object <http://www.reportinghub.no/ep/schema/core#MassPerUnitMassConcentration> ;
386 sp:predicate rdf:type ; 386 sp:predicate rdf:type ;
387 sp:subject _:b28 387 sp:subject _:b28
388 ] [ sp:object 388 ] [ sp:object
...@@ -395,7 +395,7 @@ ...@@ -395,7 +395,7 @@
395 ] [ sp:object _:b29 ; 395 ] [ sp:object _:b29 ;
396 sp:predicate <http://www.reportinghub.no/ep/schema/well#hydrogenSulfideConcentration> ; 396 sp:predicate <http://www.reportinghub.no/ep/schema/well#hydrogenSulfideConcentration> ;
397 sp:subject _:b20 397 sp:subject _:b20
398 - ] [ sp:object <http://www.reportinghub.no/ep/schema/core#SpecificMass> ; 398 + ] [ sp:object <http://www.reportinghub.no/ep/schema/core#MassPerUnitMassConcentration> ;
399 sp:predicate rdf:type ; 399 sp:predicate rdf:type ;
400 sp:subject _:b29 400 sp:subject _:b29
401 ] [ sp:object 401 ] [ sp:object
...@@ -1048,7 +1048,7 @@ ...@@ -1048,7 +1048,7 @@
1048 ] 1048 ]
1049 ] [ rdf:type sp:Bind ; 1049 ] [ rdf:type sp:Bind ;
1050 sp:expression 1050 sp:expression
1051 - [ rdf:type ep-spin-lib:selectSpecificVolumeScale ; 1051 + [ rdf:type ep-spin-lib:selectVolumePerUnitVolumeConcentrationScale ;
1052 sp:arg1 [ sp:varName "uomWaterOil"^^xsd:string 1052 sp:arg1 [ sp:varName "uomWaterOil"^^xsd:string
1053 ] 1053 ]
1054 ] ; 1054 ] ;
...@@ -1057,7 +1057,7 @@ ...@@ -1057,7 +1057,7 @@
1057 ] 1057 ]
1058 ] [ rdf:type sp:Bind ; 1058 ] [ rdf:type sp:Bind ;
1059 sp:expression 1059 sp:expression
1060 - [ rdf:type ep-spin-lib:selectSpecificVolumeScale ; 1060 + [ rdf:type ep-spin-lib:selectVolumePerUnitVolumeConcentrationScale ;
1061 sp:arg1 [ sp:varName "uomGasOil"^^xsd:string 1061 sp:arg1 [ sp:varName "uomGasOil"^^xsd:string
1062 ] 1062 ]
1063 ] ; 1063 ] ;
...@@ -1183,7 +1183,7 @@ ...@@ -1183,7 +1183,7 @@
1183 ] 1183 ]
1184 ] [ rdf:type sp:Bind ; 1184 ] [ rdf:type sp:Bind ;
1185 sp:expression 1185 sp:expression
1186 - [ rdf:type ep-spin-lib:selectSpecificMassScale ; 1186 + [ rdf:type ep-spin-lib:selectMassPerUnitMassConcentrationScale ;
1187 sp:arg1 [ sp:varName "uomChloride"^^xsd:string 1187 sp:arg1 [ sp:varName "uomChloride"^^xsd:string
1188 ] 1188 ]
1189 ] ; 1189 ] ;
...@@ -1192,7 +1192,7 @@ ...@@ -1192,7 +1192,7 @@
1192 ] 1192 ]
1193 ] [ rdf:type sp:Bind ; 1193 ] [ rdf:type sp:Bind ;
1194 sp:expression 1194 sp:expression
1195 - [ rdf:type ep-spin-lib:selectSpecificMassScale ; 1195 + [ rdf:type ep-spin-lib:selectMassPerUnitMassConcentrationScale ;
1196 sp:arg1 [ sp:varName "uomCarbonDioxide"^^xsd:string 1196 sp:arg1 [ sp:varName "uomCarbonDioxide"^^xsd:string
1197 ] 1197 ]
1198 ] ; 1198 ] ;
...@@ -1201,7 +1201,7 @@ ...@@ -1201,7 +1201,7 @@
1201 ] 1201 ]
1202 ] [ rdf:type sp:Bind ; 1202 ] [ rdf:type sp:Bind ;
1203 sp:expression 1203 sp:expression
1204 - [ rdf:type ep-spin-lib:selectSpecificMassScale ; 1204 + [ rdf:type ep-spin-lib:selectMassPerUnitMassConcentrationScale ;
1205 sp:arg1 [ sp:varName "uomHydrogenSulfide"^^xsd:string 1205 sp:arg1 [ sp:varName "uomHydrogenSulfide"^^xsd:string
1206 ] 1206 ]
1207 ] ; 1207 ] ;
......