More on MPR (update to material schema is purely additions)

@@ -452,7 +452,22 @@ ep-material:hasComponent
       rdfs:comment "A component is all part material of the class."^^xsd:string ;
       rdfs:domain ep-material:Material ;
       rdfs:label "hasComponent"^^xsd:string ;
-      rdfs:range ep-material:Material .
+      rdfs:range ep-material:Material ;
+      rdfs:subPropertyOf ep-core:hasPart .
+
+ep-material:hasNonPrimaryComponent
+      rdf:type owl:ObjectProperty ;
+      rdfs:domain ep-material:Material ;
+      rdfs:label "has non-primary component"^^xsd:string ;
+      rdfs:range ep-material:Material ;
+      rdfs:subPropertyOf ep-material:hasComponent .
+
+ep-material:hasPrimaryComponent
+      rdf:type owl:FunctionalProperty , owl:ObjectProperty ;
+      rdfs:domain ep-material:Material ;
+      rdfs:label "has primary component"^^xsd:string ;
+      rdfs:range ep-material:Material ;
+      rdfs:subPropertyOf ep-material:hasComponent .
 
 ep-material:massRatio
       rdf:type owl:FunctionalProperty , owl:ObjectProperty ;
@@ -460,6 +475,12 @@ ep-material:massRatio
       rdfs:label "mass ratio"^^xsd:string ;
       rdfs:range ep-core:Ratio .
 
+ep-material:moleRatio
+      rdf:type owl:FunctionalProperty , owl:ObjectProperty ;
+      rdfs:domain ep-material:MaterialPair ;
+      rdfs:label "mole ratio"^^xsd:string ;
+      rdfs:range ep-core:Ratio .
+
 ep-material:partMaterialOfPair
       rdf:type owl:ObjectProperty , owl:FunctionalProperty ;
       rdfs:domain ep-material:MaterialPartWholePair ;

@@ -144,6 +144,19 @@
                 <balanceDetail>
                   <owner>Bayerngas Norge AS</owner>
                   <share uom="%">100.0</share>
+                  <volumeValue>
+                    <volume uom="m3">743</volume>
+                    <grossCalorificValue uom="MJ/m3">41</grossCalorificValue>
+                    <temp uom="degC">15</temp>
+                    <pres uom="atm">1</pres>
+                    <work uom="MJ">4001</work>
+                  </volumeValue>
+                  <mass uom="kg">820</mass>
+                  <densityValue>
+                    <density uom="kg/m3">744</density>
+                    <temp uom="degC">15.0</temp>
+                    <pres uom="atm">1</pres>
+                  </densityValue> 
                 </balanceDetail>
               </balanceSet>
               <alert>