David Price

Merge branch 'master' into ddrpref-fix

...@@ -452,7 +452,22 @@ ep-material:hasComponent ...@@ -452,7 +452,22 @@ ep-material:hasComponent
452 rdfs:comment "A component is all part material of the class."^^xsd:string ; 452 rdfs:comment "A component is all part material of the class."^^xsd:string ;
453 rdfs:domain ep-material:Material ; 453 rdfs:domain ep-material:Material ;
454 rdfs:label "hasComponent"^^xsd:string ; 454 rdfs:label "hasComponent"^^xsd:string ;
455 - rdfs:range ep-material:Material . 455 + rdfs:range ep-material:Material ;
456 + rdfs:subPropertyOf ep-core:hasPart .
457 +
458 +ep-material:hasNonPrimaryComponent
459 + rdf:type owl:ObjectProperty ;
460 + rdfs:domain ep-material:Material ;
461 + rdfs:label "has non-primary component"^^xsd:string ;
462 + rdfs:range ep-material:Material ;
463 + rdfs:subPropertyOf ep-material:hasComponent .
464 +
465 +ep-material:hasPrimaryComponent
466 + rdf:type owl:FunctionalProperty , owl:ObjectProperty ;
467 + rdfs:domain ep-material:Material ;
468 + rdfs:label "has primary component"^^xsd:string ;
469 + rdfs:range ep-material:Material ;
470 + rdfs:subPropertyOf ep-material:hasComponent .
456 471
457 ep-material:massRatio 472 ep-material:massRatio
458 rdf:type owl:FunctionalProperty , owl:ObjectProperty ; 473 rdf:type owl:FunctionalProperty , owl:ObjectProperty ;
...@@ -460,6 +475,12 @@ ep-material:massRatio ...@@ -460,6 +475,12 @@ ep-material:massRatio
460 rdfs:label "mass ratio"^^xsd:string ; 475 rdfs:label "mass ratio"^^xsd:string ;
461 rdfs:range ep-core:Ratio . 476 rdfs:range ep-core:Ratio .
462 477
478 +ep-material:moleRatio
479 + rdf:type owl:FunctionalProperty , owl:ObjectProperty ;
480 + rdfs:domain ep-material:MaterialPair ;
481 + rdfs:label "mole ratio"^^xsd:string ;
482 + rdfs:range ep-core:Ratio .
483 +
463 ep-material:partMaterialOfPair 484 ep-material:partMaterialOfPair
464 rdf:type owl:ObjectProperty , owl:FunctionalProperty ; 485 rdf:type owl:ObjectProperty , owl:FunctionalProperty ;
465 rdfs:domain ep-material:MaterialPartWholePair ; 486 rdfs:domain ep-material:MaterialPartWholePair ;
......
...@@ -144,6 +144,19 @@ ...@@ -144,6 +144,19 @@
144 <balanceDetail> 144 <balanceDetail>
145 <owner>Bayerngas Norge AS</owner> 145 <owner>Bayerngas Norge AS</owner>
146 <share uom="%">100.0</share> 146 <share uom="%">100.0</share>
147 + <volumeValue>
148 + <volume uom="m3">743</volume>
149 + <grossCalorificValue uom="MJ/m3">41</grossCalorificValue>
150 + <temp uom="degC">15</temp>
151 + <pres uom="atm">1</pres>
152 + <work uom="MJ">4001</work>
153 + </volumeValue>
154 + <mass uom="kg">820</mass>
155 + <densityValue>
156 + <density uom="kg/m3">744</density>
157 + <temp uom="degC">15.0</temp>
158 + <pres uom="atm">1</pres>
159 + </densityValue>
147 </balanceDetail> 160 </balanceDetail>
148 </balanceSet> 161 </balanceSet>
149 <alert> 162 <alert>
......