David Price

Merge branch 'master' into dpr2-sep26

This diff could not be displayed because it is too large.
......@@ -19,7 +19,7 @@
<http://www.reportinghub.no/ep/dpr/spin/1.1/lib>
rdf:type owl:Ontology ;
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/spin/1.1/lib> ;
owl:imports <http://www.reportinghub.no/ep/spin/1.1/lib> , <http://www.witsml.org/schemas/131/addendum/combo> , <http://www.reportinghub.no/ep/schema/1.0/production> , <http://spinrdf.org/spin> ;
owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
ep-dpr-spin-lib:Function
......@@ -3028,7 +3028,7 @@ ep-dpr-spin-lib:selectLengthScale
sp:arg1 spin:_arg1 ;
sp:arg2 <http://www.witsml.org/schemas/131/addendum/combo#LU_in64>
] ;
sp:arg2 <http://www.reportinghub.no/ep/schema/core#sixtyFourth_Inch> ;
sp:arg2 <http://www.reportinghub.no/ep/schema/core#inch_64-1> ;
sp:arg3 [ rdf:type sp:if ;
sp:arg1 [ rdf:type sp:eq ;
sp:arg1 spin:_arg1 ;
......@@ -3040,7 +3040,7 @@ ep-dpr-spin-lib:selectLengthScale
sp:arg1 spin:_arg1 ;
sp:arg2 <http://www.witsml.org/schemas/131/addendum/combo#LU_in16>
] ;
sp:arg2 <http://www.reportinghub.no/ep/schema/core#sixteenth_inch> ;
sp:arg2 <http://www.reportinghub.no/ep/schema/core#inch_16-1> ;
sp:arg3 [ rdf:type sp:if ;
sp:arg1 [ rdf:type sp:eq ;
sp:arg1 spin:_arg1 ;
......@@ -5944,22 +5944,6 @@ ep-dpr-spin-lib:selectSpecificVolumeScale_MASS_CONCENTRATION
rdfs:subClassOf ep-dpr-spin-lib:Function ;
spin:body
[ rdf:type sp:Select ;
sp:resultVariables (_:b21) ;
sp:where ([ rdf:type sp:Bind ;
sp:expression
[ rdf:type sp:if ;
sp:arg1 [ rdf:type sp:eq ;
sp:arg1 spin:_arg1 ;
sp:arg2 <http://www.witsml.org/schemas/131/addendum/combo#VPVU_m3m3>
] ;
sp:arg2 <http://www.reportinghub.no/ep/schema/core#fractionByVolume> ;
sp:arg3 <http://www.reportinghub.no/ep/schema/core#undefinedScale>
] ;
sp:variable _:b21
])
] ;
spin:body
[ rdf:type sp:Select ;
sp:resultVariables ([ sp:varName "myVar"^^xsd:string
]) ;
sp:where ([ rdf:type sp:Bind ;
......@@ -6039,6 +6023,22 @@ ep-dpr-spin-lib:selectSpecificVolumeScale_MASS_CONCENTRATION
[ sp:varName "myVar"^^xsd:string
]
])
] ;
spin:body
[ rdf:type sp:Select ;
sp:resultVariables (_:b21) ;
sp:where ([ rdf:type sp:Bind ;
sp:expression
[ rdf:type sp:if ;
sp:arg1 [ rdf:type sp:eq ;
sp:arg1 spin:_arg1 ;
sp:arg2 <http://www.witsml.org/schemas/131/addendum/combo#VPVU_m3m3>
] ;
sp:arg2 <http://www.reportinghub.no/ep/schema/core#fractionByVolume> ;
sp:arg3 <http://www.reportinghub.no/ep/schema/core#undefinedScale>
] ;
sp:variable _:b21
])
] .
ep-dpr-spin-lib:selectTemperatureScale
......