data.posccaesar.org / npd

Go to a project
Toggle navigation Toggle navigation pinning
David Price
52d6b3bf 1 parent b130d0e3

DPR2 HTML now only uses normalized UoM and value strings

Inline Side-by-side
Showing 2 changed files with 65 additions and 47 deletions
...@@ -2929,21 +2929,25 @@ ep-core:partPerMillionByVolume ...@@ -2929,21 +2929,25 @@ ep-core:partPerMillionByVolume
2929 ep-core:pascal 2929 ep-core:pascal
2930 rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ; 2930 rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
2931 rdfs:domain ep-core:Pressure ; 2931 rdfs:domain ep-core:Pressure ;
2932 - rdfs:label "Pascal"^^xsd:string . 2932 + rdfs:label "Pascal"^^xsd:string ;
2933 + ep-core:unitSymbol "Pa"^^xsd:string .
2933 2934
2934 ep-core:pascal-1 2935 ep-core:pascal-1
2935 rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ; 2936 rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
2936 rdfs:domain ep-core:Compressibility ; 2937 rdfs:domain ep-core:Compressibility ;
2937 - rdfs:label "per Pascal"^^xsd:string . 2938 + rdfs:label "per Pascal"^^xsd:string ;
2939 + ep-core:unitSymbol "per Pa"^^xsd:string .
2938 2940
2939 ep-core:pascal_m-1 2941 ep-core:pascal_m-1
2940 rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ; 2942 rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
2941 - rdfs:label "Pascal per metre"^^xsd:string . 2943 + rdfs:label "Pascal per metre"^^xsd:string ;
2944 + ep-core:unitSymbol "Pa/m"^^xsd:string .
2942 2945
2943 ep-core:pascal_second 2946 ep-core:pascal_second
2944 rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ; 2947 rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
2945 rdfs:domain ep-core:PlasticViscosity ; 2948 rdfs:domain ep-core:PlasticViscosity ;
2946 - rdfs:label "Pa.second"^^xsd:string . 2949 + rdfs:label "Pa.second"^^xsd:string ;
2950 + ep-core:unitSymbol "Pa s"^^xsd:string .
2947 2951
2948 ep-core:pdl 2952 ep-core:pdl
2949 rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ; 2953 rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
......
...@@ -136,12 +136,14 @@ dpr-tables:FluidSampleAnalysisResults ...@@ -136,12 +136,14 @@ dpr-tables:FluidSampleAnalysisResults
136 sp:subject 136 sp:subject
137 [ sp:varName "materialPair"^^xsd:string 137 [ sp:varName "materialPair"^^xsd:string
138 ] 138 ]
139 - ] [ sp:object 139 + ] [ rdf:type sp:Bind ;
140 - [ sp:varName "massRatioPercent"^^xsd:string 140 + sp:expression
141 + [ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
142 + sp:arg1 [ sp:varName "massRatio"^^xsd:string
143 + ]
141 ] ; 144 ] ;
142 - sp:predicate <http://www.reportinghub.no/ep/schema/core#percent> ; 145 + sp:variable
143 - sp:subject 146 + [ sp:varName "massRatioPercent"^^xsd:string
144 - [ sp:varName "massRatio"^^xsd:string
145 ] 147 ]
146 ]) 148 ])
147 ] [ rdf:type sp:Optional ; 149 ] [ rdf:type sp:Optional ;
...@@ -152,20 +154,20 @@ dpr-tables:FluidSampleAnalysisResults ...@@ -152,20 +154,20 @@ dpr-tables:FluidSampleAnalysisResults
152 sp:subject 154 sp:subject
153 [ sp:varName "materialPair"^^xsd:string 155 [ sp:varName "materialPair"^^xsd:string
154 ] 156 ]
155 - ] [ sp:object 157 + ] [ rdf:type sp:Bind ;
156 - [ sp:varName "moleRatioPercent"^^xsd:string 158 + sp:expression
159 + [ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
160 + sp:arg1 [ sp:varName "moleRatio"^^xsd:string
161 + ]
157 ] ; 162 ] ;
158 - sp:predicate <http://www.reportinghub.no/ep/schema/core#percent> ; 163 + sp:variable
159 - sp:subject 164 + [ sp:varName "moleRatioPercent"^^xsd:string
160 - [ sp:varName "moleRatio"^^xsd:string
161 ] 165 ]
162 ]) 166 ])
163 ]) 167 ])
164 ]) 168 ])
165 ] ; 169 ] ;
166 - rhspin:tableHeaders ("Fluid Sample Name"^^xsd:string "Component"^^xsd:string """Mole Ratio 170 + rhspin:tableHeaders ("Fluid Sample Name"^^xsd:string "Component"^^xsd:string "Mole Ratio"^^xsd:string "Mass Ratio"^^xsd:string) .
167 -Percent"""^^xsd:string """Mass Ratio
168 -Percent"""^^xsd:string) .
169 171
170 dpr-tables:FluidSamples 172 dpr-tables:FluidSamples
171 rdf:type rhspin:TableTemplate ; 173 rdf:type rhspin:TableTemplate ;
...@@ -871,12 +873,14 @@ dpr-tables:ProductFlows ...@@ -871,12 +873,14 @@ dpr-tables:ProductFlows
871 sp:subject 873 sp:subject
872 [ sp:varName "pressure"^^xsd:string 874 [ sp:varName "pressure"^^xsd:string
873 ] 875 ]
874 - ] [ sp:object 876 + ] [ rdf:type sp:Bind ;
875 - [ sp:varName "pressureValue"^^xsd:string 877 + sp:expression
878 + [ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
879 + sp:arg1 [ sp:varName "pressure"^^xsd:string
880 + ]
876 ] ; 881 ] ;
877 - sp:predicate <http://www.reportinghub.no/ep/schema/core#pascal> ; 882 + sp:variable
878 - sp:subject 883 + [ sp:varName "pressureValue"^^xsd:string
879 - [ sp:varName "pressure"^^xsd:string
880 ] 884 ]
881 ]) 885 ])
882 ] [ rdf:type sp:Optional ; 886 ] [ rdf:type sp:Optional ;
...@@ -892,12 +896,14 @@ dpr-tables:ProductFlows ...@@ -892,12 +896,14 @@ dpr-tables:ProductFlows
892 sp:subject 896 sp:subject
893 [ sp:varName "temperature"^^xsd:string 897 [ sp:varName "temperature"^^xsd:string
894 ] 898 ]
895 - ] [ sp:object 899 + ] [ rdf:type sp:Bind ;
896 - [ sp:varName "temperatureValue"^^xsd:string 900 + sp:expression
901 + [ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
902 + sp:arg1 [ sp:varName "temperature"^^xsd:string
903 + ]
897 ] ; 904 ] ;
898 - sp:predicate <http://www.reportinghub.no/ep/schema/core#kelvin> ; 905 + sp:variable
899 - sp:subject 906 + [ sp:varName "temperatureValue"^^xsd:string
900 - [ sp:varName "temperature"^^xsd:string
901 ] 907 ]
902 ]) 908 ])
903 ] [ rdf:type sp:Optional ; 909 ] [ rdf:type sp:Optional ;
...@@ -913,12 +919,14 @@ dpr-tables:ProductFlows ...@@ -913,12 +919,14 @@ dpr-tables:ProductFlows
913 sp:subject 919 sp:subject
914 [ sp:varName "density"^^xsd:string 920 [ sp:varName "density"^^xsd:string
915 ] 921 ]
916 - ] [ sp:object 922 + ] [ rdf:type sp:Bind ;
917 - [ sp:varName "densityValue"^^xsd:string 923 + sp:expression
924 + [ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
925 + sp:arg1 [ sp:varName "density"^^xsd:string
926 + ]
918 ] ; 927 ] ;
919 - sp:predicate <http://www.reportinghub.no/ep/schema/core#kilogram_m-3> ; 928 + sp:variable
920 - sp:subject 929 + [ sp:varName "densityValue"^^xsd:string
921 - [ sp:varName "density"^^xsd:string
922 ] 930 ]
923 ]) 931 ])
924 ]) 932 ])
...@@ -1263,26 +1271,32 @@ dpr-tables:ProductionVolumes ...@@ -1263,26 +1271,32 @@ dpr-tables:ProductionVolumes
1263 sp:subject 1271 sp:subject
1264 [ sp:varName "temperature"^^xsd:string 1272 [ sp:varName "temperature"^^xsd:string
1265 ] 1273 ]
1266 - ] [ sp:object 1274 + ] [ rdf:type sp:Bind ;
1267 - [ sp:varName "temperatureValue"^^xsd:string 1275 + sp:expression
1276 + [ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
1277 + sp:arg1 [ sp:varName "temperature"^^xsd:string
1278 + ]
1268 ] ; 1279 ] ;
1269 - sp:predicate <http://www.reportinghub.no/ep/schema/core#kelvin> ; 1280 + sp:variable
1270 - sp:subject 1281 + [ sp:varName "temperatureValue"^^xsd:string
1271 - [ sp:varName "temperature"^^xsd:string 1282 + ]
1283 + ] [ rdf:type sp:Bind ;
1284 + sp:expression
1285 + [ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
1286 + sp:arg1 [ sp:varName "pressure"^^xsd:string
1272 ] 1287 ]
1273 - ] [ sp:object
1274 - [ sp:varName "pressureValue"^^xsd:string
1275 ] ; 1288 ] ;
1276 - sp:predicate <http://www.reportinghub.no/ep/schema/core#pascal> ; 1289 + sp:variable
1277 - sp:subject 1290 + [ sp:varName "pressureValue"^^xsd:string
1278 - [ sp:varName "pressure"^^xsd:string 1291 + ]
1292 + ] [ rdf:type sp:Bind ;
1293 + sp:expression
1294 + [ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
1295 + sp:arg1 [ sp:varName "density"^^xsd:string
1279 ] 1296 ]
1280 - ] [ sp:object
1281 - [ sp:varName "densityValue"^^xsd:string
1282 ] ; 1297 ] ;
1283 - sp:predicate <http://www.reportinghub.no/ep/schema/core#kilogram_m-3> ; 1298 + sp:variable
1284 - sp:subject 1299 + [ sp:varName "densityValue"^^xsd:string
1285 - [ sp:varName "density"^^xsd:string
1286 ] 1300 ]
1287 ]) 1301 ])
1288 ]) 1302 ])
......