data.posccaesar.org / npd

Go to a project
Toggle navigation Toggle navigation pinning
David Price
f4f69a7f 2 parents 9f92dad3 7a88d7df

Merge branch 'master' into dpr2-sep26

Expand all
Inline Side-by-side
Showing 3 changed files with 19 additions and 19 deletions
This diff could not be displayed because it is too large.
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
19 19
20 <http://www.reportinghub.no/ep/dpr/spin/1.1/lib> 20 <http://www.reportinghub.no/ep/dpr/spin/1.1/lib>
21 rdf:type owl:Ontology ; 21 rdf:type owl:Ontology ;
22 - 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> ; 22 + 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> ;
23 owl:versionInfo "Created with TopBraid Composer"^^xsd:string . 23 owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
24 24
25 ep-dpr-spin-lib:Function 25 ep-dpr-spin-lib:Function
...@@ -3028,7 +3028,7 @@ ep-dpr-spin-lib:selectLengthScale ...@@ -3028,7 +3028,7 @@ ep-dpr-spin-lib:selectLengthScale
3028 sp:arg1 spin:_arg1 ; 3028 sp:arg1 spin:_arg1 ;
3029 sp:arg2 <http://www.witsml.org/schemas/131/addendum/combo#LU_in64> 3029 sp:arg2 <http://www.witsml.org/schemas/131/addendum/combo#LU_in64>
3030 ] ; 3030 ] ;
3031 - sp:arg2 <http://www.reportinghub.no/ep/schema/core#sixtyFourth_Inch> ; 3031 + sp:arg2 <http://www.reportinghub.no/ep/schema/core#inch_64-1> ;
3032 sp:arg3 [ rdf:type sp:if ; 3032 sp:arg3 [ rdf:type sp:if ;
3033 sp:arg1 [ rdf:type sp:eq ; 3033 sp:arg1 [ rdf:type sp:eq ;
3034 sp:arg1 spin:_arg1 ; 3034 sp:arg1 spin:_arg1 ;
...@@ -3040,7 +3040,7 @@ ep-dpr-spin-lib:selectLengthScale ...@@ -3040,7 +3040,7 @@ ep-dpr-spin-lib:selectLengthScale
3040 sp:arg1 spin:_arg1 ; 3040 sp:arg1 spin:_arg1 ;
3041 sp:arg2 <http://www.witsml.org/schemas/131/addendum/combo#LU_in16> 3041 sp:arg2 <http://www.witsml.org/schemas/131/addendum/combo#LU_in16>
3042 ] ; 3042 ] ;
3043 - sp:arg2 <http://www.reportinghub.no/ep/schema/core#sixteenth_inch> ; 3043 + sp:arg2 <http://www.reportinghub.no/ep/schema/core#inch_16-1> ;
3044 sp:arg3 [ rdf:type sp:if ; 3044 sp:arg3 [ rdf:type sp:if ;
3045 sp:arg1 [ rdf:type sp:eq ; 3045 sp:arg1 [ rdf:type sp:eq ;
3046 sp:arg1 spin:_arg1 ; 3046 sp:arg1 spin:_arg1 ;
...@@ -5944,22 +5944,6 @@ ep-dpr-spin-lib:selectSpecificVolumeScale_MASS_CONCENTRATION ...@@ -5944,22 +5944,6 @@ ep-dpr-spin-lib:selectSpecificVolumeScale_MASS_CONCENTRATION
5944 rdfs:subClassOf ep-dpr-spin-lib:Function ; 5944 rdfs:subClassOf ep-dpr-spin-lib:Function ;
5945 spin:body 5945 spin:body
5946 [ rdf:type sp:Select ; 5946 [ rdf:type sp:Select ;
5947 - sp:resultVariables (_:b21) ;
5948 - sp:where ([ rdf:type sp:Bind ;
5949 - sp:expression
5950 - [ rdf:type sp:if ;
5951 - sp:arg1 [ rdf:type sp:eq ;
5952 - sp:arg1 spin:_arg1 ;
5953 - sp:arg2 <http://www.witsml.org/schemas/131/addendum/combo#VPVU_m3m3>
5954 - ] ;
5955 - sp:arg2 <http://www.reportinghub.no/ep/schema/core#fractionByVolume> ;
5956 - sp:arg3 <http://www.reportinghub.no/ep/schema/core#undefinedScale>
5957 - ] ;
5958 - sp:variable _:b21
5959 - ])
5960 - ] ;
5961 - spin:body
5962 - [ rdf:type sp:Select ;
5963 sp:resultVariables ([ sp:varName "myVar"^^xsd:string 5947 sp:resultVariables ([ sp:varName "myVar"^^xsd:string
5964 ]) ; 5948 ]) ;
5965 sp:where ([ rdf:type sp:Bind ; 5949 sp:where ([ rdf:type sp:Bind ;
...@@ -6039,6 +6023,22 @@ ep-dpr-spin-lib:selectSpecificVolumeScale_MASS_CONCENTRATION ...@@ -6039,6 +6023,22 @@ ep-dpr-spin-lib:selectSpecificVolumeScale_MASS_CONCENTRATION
6039 [ sp:varName "myVar"^^xsd:string 6023 [ sp:varName "myVar"^^xsd:string
6040 ] 6024 ]
6041 ]) 6025 ])
6026 + ] ;
6027 + spin:body
6028 + [ rdf:type sp:Select ;
6029 + sp:resultVariables (_:b21) ;
6030 + sp:where ([ rdf:type sp:Bind ;
6031 + sp:expression
6032 + [ rdf:type sp:if ;
6033 + sp:arg1 [ rdf:type sp:eq ;
6034 + sp:arg1 spin:_arg1 ;
6035 + sp:arg2 <http://www.witsml.org/schemas/131/addendum/combo#VPVU_m3m3>
6036 + ] ;
6037 + sp:arg2 <http://www.reportinghub.no/ep/schema/core#fractionByVolume> ;
6038 + sp:arg3 <http://www.reportinghub.no/ep/schema/core#undefinedScale>
6039 + ] ;
6040 + sp:variable _:b21
6041 + ])
6042 ] . 6042 ] .
6043 6043
6044 ep-dpr-spin-lib:selectTemperatureScale 6044 ep-dpr-spin-lib:selectTemperatureScale
......