David Leal

Merge branch 'MPR_02-24'

...@@ -408,6 +408,11 @@ ep-flow:Gaslift ...@@ -408,6 +408,11 @@ ep-flow:Gaslift
408 rdfs:label "gas lift"^^xsd:string ; 408 rdfs:label "gas lift"^^xsd:string ;
409 rdfs:subClassOf ep-flow:WholeLifeFlow . 409 rdfs:subClassOf ep-flow:WholeLifeFlow .
410 410
411 +ep-flow:GrossProductFlow
412 + rdf:type ep-flow:ProductFlowGrossOrNetType , owl:Class ;
413 + rdfs:label "gross product flow"^^xsd:string ;
414 + rdfs:subClassOf ep-flow:ProductFlow .
415 +
411 ep-flow:HeliumGas 416 ep-flow:HeliumGas
412 rdf:type owl:Class , ep-flow:ProductMaterialType ; 417 rdf:type owl:Class , ep-flow:ProductMaterialType ;
413 rdfs:label "helium gas"^^xsd:string ; 418 rdfs:label "helium gas"^^xsd:string ;
...@@ -536,6 +541,11 @@ ep-flow:Neopentane ...@@ -536,6 +541,11 @@ ep-flow:Neopentane
536 rdfs:label "neopentane"^^xsd:string ; 541 rdfs:label "neopentane"^^xsd:string ;
537 rdfs:subClassOf ep-flow:QuantityOfMaterial . 542 rdfs:subClassOf ep-flow:QuantityOfMaterial .
538 543
544 +ep-flow:NetProductFlow
545 + rdf:type ep-flow:ProductFlowGrossOrNetType , owl:Class ;
546 + rdfs:label "net product flow"^^xsd:string ;
547 + rdfs:subClassOf ep-flow:ProductFlow .
548 +
539 ep-flow:NitrogenGas 549 ep-flow:NitrogenGas
540 rdf:type owl:Class , ep-flow:ProductMaterialType ; 550 rdf:type owl:Class , ep-flow:ProductMaterialType ;
541 rdfs:label "nitrogen gas"^^xsd:string ; 551 rdfs:label "nitrogen gas"^^xsd:string ;
...@@ -586,11 +596,6 @@ ep-flow:ObjectThatLastsOneYear ...@@ -586,11 +596,6 @@ ep-flow:ObjectThatLastsOneYear
586 rdfs:label "object that lasts one year"^^xsd:string ; 596 rdfs:label "object that lasts one year"^^xsd:string ;
587 rdfs:subClassOf ep-core:PhysicalObject . 597 rdfs:subClassOf ep-core:PhysicalObject .
588 598
589 -ep-flow:Oil-NetInventory
590 - rdf:type owl:Class , ep-flow:ProductInventoryType ;
591 - rdfs:label "oil-net inventory"^^xsd:string ;
592 - rdfs:subClassOf ep-flow:ProductInventory .
593 -
594 ep-flow:Oil-componentInWater 599 ep-flow:Oil-componentInWater
595 rdf:type owl:Class , ep-flow:ProductMaterialType ; 600 rdf:type owl:Class , ep-flow:ProductMaterialType ;
596 rdfs:label "oil - component in water"^^xsd:string ; 601 rdfs:label "oil - component in water"^^xsd:string ;
...@@ -647,6 +652,11 @@ ep-flow:ProductFlow ...@@ -647,6 +652,11 @@ ep-flow:ProductFlow
647 rdfs:label "(temporal part of a) product flow"^^xsd:string ; 652 rdfs:label "(temporal part of a) product flow"^^xsd:string ;
648 rdfs:subClassOf ep-flow:Flow . 653 rdfs:subClassOf ep-flow:Flow .
649 654
655 +ep-flow:ProductFlowGrossOrNetType
656 + rdf:type rdfs:Class ;
657 + rdfs:label " product flow gross or net type"^^xsd:string ;
658 + rdfs:subClassOf owl:Class .
659 +
650 ep-flow:ProductFlowToDate 660 ep-flow:ProductFlowToDate
651 rdf:type owl:Class ; 661 rdf:type owl:Class ;
652 rdfs:label "product flow to date"^^xsd:string ; 662 rdfs:label "product flow to date"^^xsd:string ;
...@@ -657,6 +667,31 @@ ep-flow:ProductInventory ...@@ -657,6 +667,31 @@ ep-flow:ProductInventory
657 rdfs:label "(temporal part of a) product inventory"^^xsd:string ; 667 rdfs:label "(temporal part of a) product inventory"^^xsd:string ;
658 rdfs:subClassOf ep-flow:QuantityOfMaterial . 668 rdfs:subClassOf ep-flow:QuantityOfMaterial .
659 669
670 +ep-flow:ProductInventoryAdjustedClosingBalance
671 + rdf:type owl:Class , ep-flow:ProductInventoryType ;
672 + rdfs:label "product inventory adjusted closing balance"^^xsd:string ;
673 + rdfs:subClassOf ep-flow:ProductInventory .
674 +
675 +ep-flow:ProductInventoryClosingBalance
676 + rdf:type owl:Class , ep-flow:ProductInventoryType ;
677 + rdfs:label "product inventory closing balance"^^xsd:string ;
678 + rdfs:subClassOf ep-flow:ProductInventory .
679 +
680 +ep-flow:ProductInventoryClosingStorageBalance
681 + rdf:type owl:Class , ep-flow:ProductInventoryType ;
682 + rdfs:label "product inventory closing storage balance"^^xsd:string ;
683 + rdfs:subClassOf ep-flow:ProductInventory .
684 +
685 +ep-flow:ProductInventoryOpFlex
686 + rdf:type owl:Class , ep-flow:ProductInventoryType ;
687 + rdfs:label "product inventory opFlex"^^xsd:string ;
688 + rdfs:subClassOf ep-flow:ProductInventory .
689 +
690 +ep-flow:ProductInventoryOpeningBalance
691 + rdf:type owl:Class , ep-flow:ProductInventoryType ;
692 + rdfs:label "product inventory opening balance"^^xsd:string ;
693 + rdfs:subClassOf ep-flow:ProductInventory .
694 +
660 ep-flow:ProductInventoryType 695 ep-flow:ProductInventoryType
661 rdf:type rdfs:Class ; 696 rdf:type rdfs:Class ;
662 rdfs:label " product inventory type"^^xsd:string ; 697 rdfs:label " product inventory type"^^xsd:string ;
...@@ -988,12 +1023,6 @@ ep-flow:materialThatFlows ...@@ -988,12 +1023,6 @@ ep-flow:materialThatFlows
988 rdfs:label "material that flows"^^xsd:string ; 1023 rdfs:label "material that flows"^^xsd:string ;
989 rdfs:range ep-flow:QuantityOfMaterial . 1024 rdfs:range ep-flow:QuantityOfMaterial .
990 1025
991 -ep-flow:mechanicalEnergyOfCompression
992 - rdf:type owl:ObjectProperty , owl:FunctionalProperty , ep-core:Class_of_indirect_property ;
993 - rdfs:domain ep-flow:QuantityOfMaterial ;
994 - rdfs:label "mechanical energy of compression"^^xsd:string ;
995 - rdfs:range ep-core:Work .
996 -
997 ep-flow:rateOfFlowOfMaterial 1026 ep-flow:rateOfFlowOfMaterial
998 rdf:type owl:ObjectProperty , owl:FunctionalProperty ; 1027 rdf:type owl:ObjectProperty , owl:FunctionalProperty ;
999 rdfs:label "rate of flow of material"^^xsd:string ; 1028 rdfs:label "rate of flow of material"^^xsd:string ;
......
...@@ -433,6 +433,11 @@ ep-prodact:ProductLiftingEntitlementRemaining ...@@ -433,6 +433,11 @@ ep-prodact:ProductLiftingEntitlementRemaining
433 rdfs:label "product lifting entitlement remaining"^^xsd:string ; 433 rdfs:label "product lifting entitlement remaining"^^xsd:string ;
434 rdfs:subClassOf ep-prodact:MovementOfProduct . 434 rdfs:subClassOf ep-prodact:MovementOfProduct .
435 435
436 +ep-prodact:ProductLinePack
437 + rdf:type owl:Class , ep-prodact:MovementOfProductType ;
438 + rdfs:label "product line pack"^^xsd:string ;
439 + rdfs:subClassOf ep-prodact:MovementOfProduct .
440 +
436 ep-prodact:ProductMassAdjustment 441 ep-prodact:ProductMassAdjustment
437 rdf:type ep-prodact:MovementOfProductType , owl:Class ; 442 rdf:type ep-prodact:MovementOfProductType , owl:Class ;
438 rdfs:label "product mass adjustment"^^xsd:string ; 443 rdfs:label "product mass adjustment"^^xsd:string ;
......
...@@ -48,7 +48,7 @@ sp:if ...@@ -48,7 +48,7 @@ sp:if
48 48
49 <http://www.reportinghub.no/ep/dpr/spin/1.1/lib> 49 <http://www.reportinghub.no/ep/dpr/spin/1.1/lib>
50 rdf:type owl:Ontology ; 50 rdf:type owl:Ontology ;
51 - owl:imports <http://www.reportinghub.no/ep/spin/1.1/lib> , <http://www.reportinghub.no/ep/schema/1.0/production-core> , <http://www.witsml.org/schemas/131/addendum/combo> , <http://www.reportinghub.no/ep/schema/1.0/production> , <http://spinrdf.org/spin> ; 51 + 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/schema/1.0/production-core> , <http://www.reportinghub.no/ep/spin/1.1/lib> ;
52 owl:versionInfo "Created with TopBraid Composer"^^xsd:string . 52 owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
53 53
54 ep-dpr-spin-lib:Function 54 ep-dpr-spin-lib:Function
...@@ -281,6 +281,34 @@ ep-dpr-spin-lib:buildProductFlowURI ...@@ -281,6 +281,34 @@ ep-dpr-spin-lib:buildProductFlowURI
281 ]) 281 ])
282 ] . 282 ] .
283 283
284 +ep-dpr-spin-lib:buildProductFlowURISuffix
285 + rdf:type spin:Function ;
286 + rdfs:label "build ProductFlow URI Suffix"^^xsd:string ;
287 + rdfs:subClassOf ep-dpr-spin-lib:Function ;
288 + spin:body
289 + [ rdf:type sp:Select ;
290 + sp:resultVariables ([ sp:varName "uriSuffix"^^xsd:string
291 + ]) ;
292 + sp:where ([ rdf:type sp:Bind ;
293 + sp:expression
294 + [ rdf:type sp:if ;
295 + sp:arg1 [ rdf:type sp:eq ;
296 + sp:arg1 spin:_arg2 ;
297 + sp:arg2 ""
298 + ] ;
299 + sp:arg2 spin:_arg1 ;
300 + sp:arg3 [ rdf:type fn:concat ;
301 + sp:arg1 spin:_arg1 ;
302 + sp:arg2 "$" ;
303 + sp:arg3 spin:_arg2
304 + ]
305 + ] ;
306 + sp:variable
307 + [ sp:varName "uriSuffix"^^xsd:string
308 + ]
309 + ])
310 + ] .
311 +
284 ep-dpr-spin-lib:buildProductInventoryURI 312 ep-dpr-spin-lib:buildProductInventoryURI
285 rdf:type spin:Function ; 313 rdf:type spin:Function ;
286 rdfs:label "build ProductInventory URI"^^xsd:string ; 314 rdfs:label "build ProductInventory URI"^^xsd:string ;
...@@ -5536,6 +5564,22 @@ ep-dpr-spin-lib:selectSpecificVolumeScale_MASS_CONCENTRATION ...@@ -5536,6 +5564,22 @@ ep-dpr-spin-lib:selectSpecificVolumeScale_MASS_CONCENTRATION
5536 rdfs:subClassOf ep-dpr-spin-lib:Function ; 5564 rdfs:subClassOf ep-dpr-spin-lib:Function ;
5537 spin:body 5565 spin:body
5538 [ rdf:type sp:Select ; 5566 [ rdf:type sp:Select ;
5567 + sp:resultVariables (_:b28) ;
5568 + sp:where ([ rdf:type sp:Bind ;
5569 + sp:expression
5570 + [ rdf:type sp:if ;
5571 + sp:arg1 [ rdf:type sp:eq ;
5572 + sp:arg1 spin:_arg1 ;
5573 + sp:arg2 <http://www.witsml.org/schemas/131/addendum/combo#VPVU_m3m3>
5574 + ] ;
5575 + sp:arg2 <http://www.reportinghub.no/ep/schema/core#fractionByVolume> ;
5576 + sp:arg3 <http://www.reportinghub.no/ep/schema/core#undefinedScale>
5577 + ] ;
5578 + sp:variable _:b28
5579 + ])
5580 + ] ;
5581 + spin:body
5582 + [ rdf:type sp:Select ;
5539 sp:resultVariables ([ sp:varName "myVar"^^xsd:string 5583 sp:resultVariables ([ sp:varName "myVar"^^xsd:string
5540 ]) ; 5584 ]) ;
5541 sp:where ([ rdf:type sp:Bind ; 5585 sp:where ([ rdf:type sp:Bind ;
...@@ -5615,22 +5659,6 @@ ep-dpr-spin-lib:selectSpecificVolumeScale_MASS_CONCENTRATION ...@@ -5615,22 +5659,6 @@ ep-dpr-spin-lib:selectSpecificVolumeScale_MASS_CONCENTRATION
5615 [ sp:varName "myVar"^^xsd:string 5659 [ sp:varName "myVar"^^xsd:string
5616 ] 5660 ]
5617 ]) 5661 ])
5618 - ] ;
5619 - spin:body
5620 - [ rdf:type sp:Select ;
5621 - sp:resultVariables (_:b28) ;
5622 - sp:where ([ rdf:type sp:Bind ;
5623 - sp:expression
5624 - [ rdf:type sp:if ;
5625 - sp:arg1 [ rdf:type sp:eq ;
5626 - sp:arg1 spin:_arg1 ;
5627 - sp:arg2 <http://www.witsml.org/schemas/131/addendum/combo#VPVU_m3m3>
5628 - ] ;
5629 - sp:arg2 <http://www.reportinghub.no/ep/schema/core#fractionByVolume> ;
5630 - sp:arg3 <http://www.reportinghub.no/ep/schema/core#undefinedScale>
5631 - ] ;
5632 - sp:variable _:b28
5633 - ])
5634 ] . 5662 ] .
5635 5663
5636 ep-dpr-spin-lib:selectTemperatureScale 5664 ep-dpr-spin-lib:selectTemperatureScale
......
1 # baseURI: http://www.reportinghub.no/test/mpr/TEST_mpr-xml-ingest 1 # baseURI: http://www.reportinghub.no/test/mpr/TEST_mpr-xml-ingest
2 +# imports: file:///EPIM-Ontologies/www.reportinghub.no/test/mpr/testcase/complete_population_of_mpr_productVolume_data.xml
2 # imports: http://spinrdf.org/spin 3 # imports: http://spinrdf.org/spin
3 # imports: http://www.epim.no/schemas/mprml/1 4 # imports: http://www.epim.no/schemas/mprml/1
4 # imports: http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-collector 5 # imports: http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-collector
...@@ -7,6 +8,7 @@ ...@@ -7,6 +8,7 @@
7 @prefix : <http://www.reportinghub.no/test/mpr/TEST_mpr-xml-ingest#> . 8 @prefix : <http://www.reportinghub.no/test/mpr/TEST_mpr-xml-ingest#> .
8 @prefix TRANSFORM_mpr-collector: <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-collector#> . 9 @prefix TRANSFORM_mpr-collector: <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-collector#> .
9 @prefix TRYM-volumes_2011-08-27_final: <file:///EPIM-Ontologies/www.reportinghub.no/test/mpr/testcase/DongEnergy/dpr-mprformat/TRYM-volumes_2011-08-27_final.xml#> . 10 @prefix TRYM-volumes_2011-08-27_final: <file:///EPIM-Ontologies/www.reportinghub.no/test/mpr/testcase/DongEnergy/dpr-mprformat/TRYM-volumes_2011-08-27_final.xml#> .
11 +@prefix complete_population_of_mpr_productVolume_data: <file:///EPIM-Ontologies/www.reportinghub.no/test/mpr/testcase/complete_population_of_mpr_productVolume_data.xml#> .
10 @prefix owl: <http://www.w3.org/2002/07/owl#> . 12 @prefix owl: <http://www.w3.org/2002/07/owl#> .
11 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> . 13 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
12 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> . 14 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
...@@ -17,5 +19,5 @@ ...@@ -17,5 +19,5 @@
17 19
18 <http://www.reportinghub.no/test/mpr/TEST_mpr-xml-ingest> 20 <http://www.reportinghub.no/test/mpr/TEST_mpr-xml-ingest>
19 rdf:type owl:Ontology ; 21 rdf:type owl:Ontology ;
20 - owl:imports <http://www.epim.no/schemas/mprml/1> , <http://www.reportinghub.no/np/data/npd> , <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-collector> , <http://spinrdf.org/spin> ; 22 + owl:imports <file:///EPIM-Ontologies/www.reportinghub.no/test/mpr/testcase/complete_population_of_mpr_productVolume_data.xml> , <http://spinrdf.org/spin> , <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-collector> , <http://www.reportinghub.no/np/data/npd> , <http://www.epim.no/schemas/mprml/1> ;
21 owl:versionInfo "Created with TopBraid Composer"^^xsd:string . 23 owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
36 <qualifier>measured</qualifier> 36 <qualifier>measured</qualifier>
37 <subQualifier>recalibrated</subQualifier> 37 <subQualifier>recalibrated</subQualifier>
38 <product> 38 <product>
39 - <kind>oil - net</kind> 39 + <kind>oil</kind>
40 <name>TRYM measured-recalibrated oil flow</name> 40 <name>TRYM measured-recalibrated oil flow</name>
41 <splitFactor>0.5</splitFactor> 41 <splitFactor>0.5</splitFactor>
42 <period> 42 <period>
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
50 <pres uom="atm">1</pres> 50 <pres uom="atm">1</pres>
51 <work uom="MJ">1000</work> 51 <work uom="MJ">1000</work>
52 </volumeValue> 52 </volumeValue>
53 - <mass uom="kg">61.1</mass> 53 + <mass uom="kg">61</mass>
54 <densityValue> 54 <densityValue>
55 <density uom="kg/m3">799.04</density> 55 <density uom="kg/m3">799.04</density>
56 <temp uom="degC">15</temp> 56 <temp uom="degC">15</temp>
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
68 <pres uom="atm">1</pres> 68 <pres uom="atm">1</pres>
69 <work uom="MJ">2000</work> 69 <work uom="MJ">2000</work>
70 </volumeValue> 70 </volumeValue>
71 - <mass uom="kg">61.1</mass> 71 + <mass uom="kg">62</mass>
72 <densityValue> 72 <densityValue>
73 <density uom="kg/m3">799.04</density> 73 <density uom="kg/m3">799.04</density>
74 <temp uom="degC">15</temp> 74 <temp uom="degC">15</temp>
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
149 <alert> 149 <alert>
150 <target>some XPATH</target> 150 <target>some XPATH</target>
151 <level>alert level</level> 151 <level>alert level</level>
152 - <kind>alert kind</kind> 152 + <type>alert type</type>
153 <description>alert description</description> 153 <description>alert description</description>
154 </alert> 154 </alert>
155 <comment> 155 <comment>
......