David Leal

Merged core and production-core schemas. Some utility properties left in production-core.

Showing 30 changed files with 30 additions and 31 deletions
This diff could not be displayed because it is too large.
...@@ -1208,7 +1208,7 @@ ep-prodact:samplingPerformedAtPointInSpace ...@@ -1208,7 +1208,7 @@ ep-prodact:samplingPerformedAtPointInSpace
1208 rdf:type owl:FunctionalProperty ; 1208 rdf:type owl:FunctionalProperty ;
1209 rdf:type owl:ObjectProperty ; 1209 rdf:type owl:ObjectProperty ;
1210 rdfs:domain ep-prodact:FluidSamplingAndAnalysis ; 1210 rdfs:domain ep-prodact:FluidSamplingAndAnalysis ;
1211 - rdfs:range <http://www.reportinghub.no/ep/schema/production-core#TemporalPartOfAPointInSpace> ; 1211 + rdfs:range ep-core:TemporalPartOfAPointInSpace ;
1212 . 1212 .
1213 ep-prodact:seller 1213 ep-prodact:seller
1214 rdf:type owl:ObjectProperty ; 1214 rdf:type owl:ObjectProperty ;
......
...@@ -48,7 +48,7 @@ sp:if ...@@ -48,7 +48,7 @@ sp:if
48 48
49 <http://www.reportinghub.no/ep/dpr/spin/1.1/lib> 49 <http://www.reportinghub.no/ep/dpr/spin/1.1/lib>
50 rdf:type owl:Ontology ; 50 rdf:type owl:Ontology ;
51 - owl:imports <http://www.reportinghub.no/ep/spin/1.1/lib> , <http://www.reportinghub.no/ep/schema/1.0/production-core> , <http://www.witsml.org/schemas/131/addendum/combo> , <http://www.reportinghub.no/ep/schema/1.0/production> , <http://spinrdf.org/spin> ; 51 + owl:imports <http://spinrdf.org/spin> , <http://www.reportinghub.no/ep/schema/1.0/production> , <http://www.witsml.org/schemas/131/addendum/combo> , <http://www.reportinghub.no/ep/schema/1.0/production-core> , <http://www.reportinghub.no/ep/spin/1.1/lib> ;
52 owl:versionInfo "Created with TopBraid Composer"^^xsd:string . 52 owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
53 53
54 ep-dpr-spin-lib:Function 54 ep-dpr-spin-lib:Function
...@@ -1190,20 +1190,20 @@ ep-dpr-spin-lib:selectDensityAtStandardTemperaturePressureType ...@@ -1190,20 +1190,20 @@ ep-dpr-spin-lib:selectDensityAtStandardTemperaturePressureType
1190 sp:arg1 spin:_arg1 ; 1190 sp:arg1 spin:_arg1 ;
1191 sp:arg2 <http://www.witsml.org/schemas/131/addendum/combo#STP_15degC1atm> 1191 sp:arg2 <http://www.witsml.org/schemas/131/addendum/combo#STP_15degC1atm>
1192 ] ; 1192 ] ;
1193 - sp:arg2 ep-prodcore:DensityAt15degC1atm ; 1193 + sp:arg2 <http://www.reportinghub.no/ep/schema/core#DensityAt15degC1atm> ;
1194 sp:arg3 [ rdf:type sp:if ; 1194 sp:arg3 [ rdf:type sp:if ;
1195 sp:arg1 [ rdf:type sp:eq ; 1195 sp:arg1 [ rdf:type sp:eq ;
1196 sp:arg1 spin:_arg1 ; 1196 sp:arg1 spin:_arg1 ;
1197 sp:arg2 <http://www.witsml.org/schemas/131/addendum/combo#STP_60degF1atm> 1197 sp:arg2 <http://www.witsml.org/schemas/131/addendum/combo#STP_60degF1atm>
1198 ] ; 1198 ] ;
1199 - sp:arg2 ep-prodcore:DensityAt60degF1atm ; 1199 + sp:arg2 <http://www.reportinghub.no/ep/schema/core#DensityAt60degF1atm> ;
1200 sp:arg3 [ rdf:type sp:if ; 1200 sp:arg3 [ rdf:type sp:if ;
1201 sp:arg1 [ rdf:type sp:eq ; 1201 sp:arg1 [ rdf:type sp:eq ;
1202 sp:arg1 spin:_arg1 ; 1202 sp:arg1 spin:_arg1 ;
1203 sp:arg2 <http://www.witsml.org/schemas/131/addendum/combo#STP_0degC1atm> 1203 sp:arg2 <http://www.witsml.org/schemas/131/addendum/combo#STP_0degC1atm>
1204 ] ; 1204 ] ;
1205 - sp:arg2 ep-prodcore:DensityAt0degC1atm ; 1205 + sp:arg2 <http://www.reportinghub.no/ep/schema/core#DensityAt0degC1atm> ;
1206 - sp:arg3 ep-prodcore:MeasureOfDensityOfMaterial 1206 + sp:arg3 <http://www.reportinghub.no/ep/schema/core#MeasureOfDensityOfMaterial>
1207 ] 1207 ]
1208 ] 1208 ]
1209 ] ; 1209 ] ;
...@@ -5792,6 +5792,22 @@ ep-dpr-spin-lib:selectSpecificVolumeScale_MASS_CONCENTRATION ...@@ -5792,6 +5792,22 @@ ep-dpr-spin-lib:selectSpecificVolumeScale_MASS_CONCENTRATION
5792 rdfs:subClassOf ep-dpr-spin-lib:Function ; 5792 rdfs:subClassOf ep-dpr-spin-lib:Function ;
5793 spin:body 5793 spin:body
5794 [ rdf:type sp:Select ; 5794 [ rdf:type sp:Select ;
5795 + sp:resultVariables (_:b22) ;
5796 + sp:where ([ rdf:type sp:Bind ;
5797 + sp:expression
5798 + [ rdf:type sp:if ;
5799 + sp:arg1 [ rdf:type sp:eq ;
5800 + sp:arg1 spin:_arg1 ;
5801 + sp:arg2 <http://www.witsml.org/schemas/131/addendum/combo#VPVU_m3m3>
5802 + ] ;
5803 + sp:arg2 <http://www.reportinghub.no/ep/schema/core#fractionByVolume> ;
5804 + sp:arg3 <http://www.reportinghub.no/ep/schema/core#undefinedScale>
5805 + ] ;
5806 + sp:variable _:b22
5807 + ])
5808 + ] ;
5809 + spin:body
5810 + [ rdf:type sp:Select ;
5795 sp:resultVariables ([ sp:varName "myVar"^^xsd:string 5811 sp:resultVariables ([ sp:varName "myVar"^^xsd:string
5796 ]) ; 5812 ]) ;
5797 sp:where ([ rdf:type sp:Bind ; 5813 sp:where ([ rdf:type sp:Bind ;
...@@ -5871,22 +5887,6 @@ ep-dpr-spin-lib:selectSpecificVolumeScale_MASS_CONCENTRATION ...@@ -5871,22 +5887,6 @@ ep-dpr-spin-lib:selectSpecificVolumeScale_MASS_CONCENTRATION
5871 [ sp:varName "myVar"^^xsd:string 5887 [ sp:varName "myVar"^^xsd:string
5872 ] 5888 ]
5873 ]) 5889 ])
5874 - ] ;
5875 - spin:body
5876 - [ rdf:type sp:Select ;
5877 - sp:resultVariables (_:b22) ;
5878 - sp:where ([ rdf:type sp:Bind ;
5879 - sp:expression
5880 - [ rdf:type sp:if ;
5881 - sp:arg1 [ rdf:type sp:eq ;
5882 - sp:arg1 spin:_arg1 ;
5883 - sp:arg2 <http://www.witsml.org/schemas/131/addendum/combo#VPVU_m3m3>
5884 - ] ;
5885 - sp:arg2 <http://www.reportinghub.no/ep/schema/core#fractionByVolume> ;
5886 - sp:arg3 <http://www.reportinghub.no/ep/schema/core#undefinedScale>
5887 - ] ;
5888 - sp:variable _:b22
5889 - ])
5890 ] . 5890 ] .
5891 5891
5892 ep-dpr-spin-lib:selectTemperatureScale 5892 ep-dpr-spin-lib:selectTemperatureScale
...@@ -6261,7 +6261,7 @@ ep-dpr-spin-lib:selectVolumeAtStandardTemperaturePressureType ...@@ -6261,7 +6261,7 @@ ep-dpr-spin-lib:selectVolumeAtStandardTemperaturePressureType
6261 sp:arg1 spin:_arg1 ; 6261 sp:arg1 spin:_arg1 ;
6262 sp:arg2 <http://www.witsml.org/schemas/131/addendum/combo#STP_0degC1atm> 6262 sp:arg2 <http://www.witsml.org/schemas/131/addendum/combo#STP_0degC1atm>
6263 ] ; 6263 ] ;
6264 - sp:arg2 ep-prodcore:VolumeAt0degC1atm ; 6264 + sp:arg2 <http://www.reportinghub.no/ep/schema/core#VolumeAt0degC1atm> ;
6265 sp:arg3 <http://www.reportinghub.no/ep/schema/core#MeasureOfAmountOfMaterial> 6265 sp:arg3 <http://www.reportinghub.no/ep/schema/core#MeasureOfAmountOfMaterial>
6266 ] 6266 ]
6267 ] 6267 ]
......
...@@ -182,7 +182,7 @@ ep-mpr-spin-lib:selectAverageAmountOfMaterialPeriodType ...@@ -182,7 +182,7 @@ ep-mpr-spin-lib:selectAverageAmountOfMaterialPeriodType
182 sp:arg2 <http://www.epim.no/schemas/mprml/1#RP_dailyyeartodate> 182 sp:arg2 <http://www.epim.no/schemas/mprml/1#RP_dailyyeartodate>
183 ] ; 183 ] ;
184 sp:arg2 <http://www.reportinghub.no/ep/schema/flow#yearlyAverageAmountOfMaterial> ; 184 sp:arg2 <http://www.reportinghub.no/ep/schema/flow#yearlyAverageAmountOfMaterial> ;
185 - sp:arg3 <http://www.reportinghub.no/ep/schema/core#derivedFrom> 185 + sp:arg3 <http://www.reportinghub.no/ep/schema/production-core#derivedFrom>
186 ] 186 ]
187 ] ; 187 ] ;
188 sp:variable 188 sp:variable
...@@ -336,20 +336,20 @@ ep-mpr-spin-lib:selectDensityAtStandardTemperaturePressureType ...@@ -336,20 +336,20 @@ ep-mpr-spin-lib:selectDensityAtStandardTemperaturePressureType
336 sp:arg1 spin:_arg1 ; 336 sp:arg1 spin:_arg1 ;
337 sp:arg2 <http://www.epim.no/schemas/mprml/1#STP_15degC1atm> 337 sp:arg2 <http://www.epim.no/schemas/mprml/1#STP_15degC1atm>
338 ] ; 338 ] ;
339 - sp:arg2 <http://www.reportinghub.no/ep/schema/production-core#DensityAt15degC1atm> ; 339 + sp:arg2 <http://www.reportinghub.no/ep/schema/core#DensityAt15degC1atm> ;
340 sp:arg3 [ rdf:type sp:if ; 340 sp:arg3 [ rdf:type sp:if ;
341 sp:arg1 [ rdf:type sp:eq ; 341 sp:arg1 [ rdf:type sp:eq ;
342 sp:arg1 spin:_arg1 ; 342 sp:arg1 spin:_arg1 ;
343 sp:arg2 <http://www.epim.no/schemas/mprml/1#STP_60degF1atm> 343 sp:arg2 <http://www.epim.no/schemas/mprml/1#STP_60degF1atm>
344 ] ; 344 ] ;
345 - sp:arg2 <http://www.reportinghub.no/ep/schema/production-core#DensityAt60degF1atm> ; 345 + sp:arg2 <http://www.reportinghub.no/ep/schema/core#DensityAt60degF1atm> ;
346 sp:arg3 [ rdf:type sp:if ; 346 sp:arg3 [ rdf:type sp:if ;
347 sp:arg1 [ rdf:type sp:eq ; 347 sp:arg1 [ rdf:type sp:eq ;
348 sp:arg1 spin:_arg1 ; 348 sp:arg1 spin:_arg1 ;
349 sp:arg2 <http://www.epim.no/schemas/mprml/1#STP_0degC1atm> 349 sp:arg2 <http://www.epim.no/schemas/mprml/1#STP_0degC1atm>
350 ] ; 350 ] ;
351 - sp:arg2 <http://www.reportinghub.no/ep/schema/production-core#DensityAt0degC1atm> ; 351 + sp:arg2 <http://www.reportinghub.no/ep/schema/core#DensityAt0degC1atm> ;
352 - sp:arg3 <http://www.reportinghub.no/ep/schema/production-core#MeasureOfDensityOfMaterial> 352 + sp:arg3 <http://www.reportinghub.no/ep/schema/core#MeasureOfDensityOfMaterial>
353 ] 353 ]
354 ] 354 ]
355 ] ; 355 ] ;
...@@ -6453,7 +6453,7 @@ ep-mpr-spin-lib:selectVolumeAtStandardTemperaturePressureType ...@@ -6453,7 +6453,7 @@ ep-mpr-spin-lib:selectVolumeAtStandardTemperaturePressureType
6453 sp:arg1 spin:_arg1 ; 6453 sp:arg1 spin:_arg1 ;
6454 sp:arg2 <http://www.epim.no/schemas/mprml/1#STP_0degC1atm> 6454 sp:arg2 <http://www.epim.no/schemas/mprml/1#STP_0degC1atm>
6455 ] ; 6455 ] ;
6456 - sp:arg2 <http://www.reportinghub.no/ep/schema/production-core#VolumeAt0degC1atm> ; 6456 + sp:arg2 <http://www.reportinghub.no/ep/schema/core#VolumeAt0degC1atm> ;
6457 sp:arg3 <http://www.reportinghub.no/ep/schema/core#MeasureOfAmountOfMaterial> 6457 sp:arg3 <http://www.reportinghub.no/ep/schema/core#MeasureOfAmountOfMaterial>
6458 ] 6458 ]
6459 ] 6459 ]
...@@ -6491,7 +6491,7 @@ ep-mpr-spin-lib:selectVolumeFlowRateAtStandardTemperaturePressureType ...@@ -6491,7 +6491,7 @@ ep-mpr-spin-lib:selectVolumeFlowRateAtStandardTemperaturePressureType
6491 sp:arg1 spin:_arg1 ; 6491 sp:arg1 spin:_arg1 ;
6492 sp:arg2 <http://www.epim.no/schemas/mprml/1#STP_0degC1atm> 6492 sp:arg2 <http://www.epim.no/schemas/mprml/1#STP_0degC1atm>
6493 ] ; 6493 ] ;
6494 - sp:arg2 <http://www.reportinghub.no/ep/schema/production-core#VolumeFlowRateAt0degC1atm> ; 6494 + sp:arg2 <http://www.reportinghub.no/ep/schema/core#VolumeFlowRateAt0degC1atm> ;
6495 sp:arg3 <http://www.reportinghub.no/ep/schema/core#MeasureOfFlowOfMaterial> 6495 sp:arg3 <http://www.reportinghub.no/ep/schema/core#MeasureOfFlowOfMaterial>
6496 ] 6496 ]
6497 ] 6497 ]
......
1 -# Saved by TopBraid on Sat Oct 08 12:56:31 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#> .
......
This diff could not be displayed because it is too large.