Merge branch 'master' of [email protected]:TopQuadrant/EPIM-Ontologies.git

Holger Knublauch
Commit 2208dcc03d3c4d4e78c7de725c9370248fe82f06 2208dcc0 2 parents 58487eef 562eb277
Showing 5 changed files with 155 additions and 2 deletions
www.reportinghub.no/ep/schema/1.0/SCHEMA_EP-PRODUCTION-CORE-v1.0.ttl
www.reportinghub.no/ep/spin/SPIN_EP-DDR-tables-v1.0.spin.ttl
www.reportinghub.no/ep/spin/SPIN_EPIM-DPR-lib-v1.1.spin.ttl
www.reportinghub.no/ep/spin/SPIN_EPIM-DPR-lib-v1.1.spin.ttl.tbc
www.reportinghub.no/swp/DailyDrillingReport.uispin.html
--- a/www.reportinghub.no/ep/schema/1.0/SCHEMA_EP-PRODUCTION-CORE-v1.0.ttl
View file @2208dcc
+++ b/www.reportinghub.no/ep/schema/1.0/SCHEMA_EP-PRODUCTION-CORE-v1.0.ttl
View file @2208dcc
-# Saved by TopBraid on Fri Oct 28 15:17:22 BST 2011
 # baseURI: http://www.reportinghub.no/ep/schema/1.0/production-core
 # imports: http://www.reportinghub.no/ep/schema/1.0/core
@@ -33,6 +32,10 @@ ep-core:VolumeFlowRateAt60degF1atm
       rdfs:label "volume flow rate at 60 degrees F 1 atmosphere"^^xsd:string ;
       rdfs:subClassOf ep-core:MeasureOfFlowOfMaterial .
+ep-core:acre
+      rdf:type ep-core:Scale , owl:FunctionalProperty , owl:DatatypeProperty ;
+      rdfs:label "acres"^^xsd:string .
+
 ep-core:apiDensity
       rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
       rdfs:label "API Density"^^xsd:string .
@@ -42,25 +45,93 @@ ep-core:atmosphere
       rdfs:domain ep-core:Pressure ;
       rdfs:label "atmosphere"^^xsd:string .
+ep-core:barn
+      rdf:type ep-core:Scale , owl:FunctionalProperty , owl:DatatypeProperty ;
+      rdfs:label "barn (area)"^^xsd:string .
+
 ep-core:barrel_day-1
       rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
       rdfs:domain ep-core:VolumetricFlowRate ;
       rdfs:label "barrel day-1"^^xsd:string .
+ep-core:centiEuclid
+      rdf:type owl:FunctionalProperty , ep-core:Scale , owl:DatatypeProperty ;
+      rdfs:label "CentiEuclid"^^xsd:string .
+
 ep-core:centimetre
       rdf:type owl:DatatypeProperty , owl:FunctionalProperty , ep-core:Scale ;
       rdfs:domain ep-core:Length ;
       rdfs:label "centimetre"^^xsd:string .
+ep-core:cm2
+      rdf:type owl:FunctionalProperty , owl:DatatypeProperty , ep-core:Scale ;
+      rdfs:label "square centimetres"^^xsd:string .
+
+ep-core:cm_s-2
+      rdf:type owl:DatatypeProperty , owl:FunctionalProperty , ep-core:Scale ;
+      rdfs:label "centimetres per second squared"^^xsd:string .
+
 ep-core:count
       rdf:type owl:DatatypeProperty , owl:FunctionalProperty , ep-core:Scale ;
       rdfs:label "count"^^xsd:string .
+ep-core:degreesOfAngle_100ft-1
+      rdf:type ep-core:Scale , owl:FunctionalProperty , owl:DatatypeProperty ;
+      rdfs:label "degrees of angle per 100ft"^^xsd:string .
+
+ep-core:degreesOfAngle_30ft-1
+      rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
+      rdfs:label "degrees of angle per 30ft"^^xsd:string .
+
+ep-core:degreesOfAngle_30m-1
+      rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
+      rdfs:label "degrees of angle per 30m"^^xsd:string .
+
+ep-core:degreesOfAngle_ft-1
+      rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
+      rdfs:label "degrees of angle per ft"^^xsd:string .
+
+ep-core:degreesOfAngle_hr-1
+      rdf:type owl:DatatypeProperty , owl:FunctionalProperty , ep-core:Scale ;
+      rdfs:label "degrees of angle per hour"^^xsd:string .
+
+ep-core:degreesOfAngle_m-1
+      rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
+      rdfs:label "degrees of angle per m"^^xsd:string .
+
+ep-core:degreesOfAngle_min-1
+      rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
+      rdfs:label "degrees of angle per minute"^^xsd:string .
+
+ep-core:degreesOfAngle_s-1
+      rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
+      rdfs:label "degrees of angle per second"^^xsd:string .
+
+ep-core:euclid
+      rdf:type owl:FunctionalProperty , ep-core:Scale , owl:DatatypeProperty ;
+      rdfs:label "Euclid"^^xsd:string .
+
 ep-core:fahrenheit
       rdf:type owl:FunctionalProperty , owl:DatatypeProperty , ep-core:Scale ;
       rdfs:domain ep-core:Temperature ;
       rdfs:label "fahrenheit"^^xsd:string .
+ep-core:foot_s-2
+      rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
+      rdfs:label "feet per second squared"^^xsd:string .
+
+ep-core:ft2
+      rdf:type ep-core:Scale , owl:FunctionalProperty , owl:DatatypeProperty ;
+      rdfs:label "square feet"^^xsd:string .
+
+ep-core:galileo
+      rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
+      rdfs:label "galileo"^^xsd:string .
+
+ep-core:gn
+      rdf:type owl:DatatypeProperty , owl:FunctionalProperty , ep-core:Scale ;
+      rdfs:label "normal acceleration Gn"^^xsd:string .
+
 ep-core:grain_100ft-3
       rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
       rdfs:label "grain per 100ft3"^^xsd:string .
@@ -98,6 +169,14 @@ ep-core:hasSetOfAllPartsOfType
       rdfs:domain ep-core:PhysicalThing ;
       rdfs:label "basis for"^^xsd:string .
+ep-core:hectare
+      rdf:type ep-core:Scale , owl:FunctionalProperty , owl:DatatypeProperty ;
+      rdfs:label "hectares"^^xsd:string .
+
+ep-core:in2
+      rdf:type ep-core:Scale , owl:FunctionalProperty , owl:DatatypeProperty ;
+      rdfs:label "square inches"^^xsd:string .
+
 ep-core:inch_64
       rdf:type owl:DatatypeProperty , owl:FunctionalProperty , ep-core:Scale ;
       rdfs:domain ep-core:Length ;
@@ -115,6 +194,10 @@ ep-core:kilogram_m-3
       rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
       rdfs:label "kilogram m-3"^^xsd:string .
+ep-core:km2
+      rdf:type ep-core:Scale , owl:FunctionalProperty , owl:DatatypeProperty ;
+      rdfs:label "square kilometres"^^xsd:string .
+
 ep-core:lbm_1000bbl-1
       rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
       rdfs:label "pounds (mass) per 1000 barrels"^^xsd:string .
@@ -155,6 +238,10 @@ ep-core:lbm_usGallon-1
       rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
       rdfs:label "pounds (mass) per US Gallon"^^xsd:string .
+ep-core:m2
+      rdf:type ep-core:Scale , owl:FunctionalProperty , owl:DatatypeProperty ;
+      rdfs:label "square metres"^^xsd:string .
+
 ep-core:megagram_m-3
       rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
       rdfs:label "Megagram m-3"^^xsd:string .
@@ -164,10 +251,34 @@ ep-core:metre3_hour-1
       rdfs:domain ep-core:VolumetricFlowRate ;
       rdfs:label "metre3 hour-1"^^xsd:string .
+ep-core:metre_s-2
+      rdf:type owl:DatatypeProperty , owl:FunctionalProperty , ep-core:Scale ;
+      rdfs:label "metres per second squared"^^xsd:string .
+
+ep-core:mgn
+      rdf:type owl:DatatypeProperty , owl:FunctionalProperty , ep-core:Scale ;
+      rdfs:label "milliGn - normal acceleration"^^xsd:string .
+
+ep-core:mi2
+      rdf:type ep-core:Scale , owl:FunctionalProperty , owl:DatatypeProperty ;
+      rdfs:label "square miles"^^xsd:string .
+
+ep-core:microEuclid
+      rdf:type owl:FunctionalProperty , ep-core:Scale , owl:DatatypeProperty ;
+      rdfs:label "MicroEuclid"^^xsd:string .
+
 ep-core:microgram_cm-3
       rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
       rdfs:label "microgram cm-3"^^xsd:string .
+ep-core:milliEuclid
+      rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
+      rdfs:label "MilliEuclid"^^xsd:string .
+
+ep-core:milligalileo
+      rdf:type owl:DatatypeProperty , owl:FunctionalProperty , ep-core:Scale ;
+      rdfs:label "milligalileo"^^xsd:string .
+
 ep-core:milligram_dm-3
       rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
       rdfs:label "milligram dm-3"^^xsd:string .
@@ -184,6 +295,34 @@ ep-core:milligram_usGallon-1
       rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
       rdfs:label "milligrams per US Gallon"^^xsd:string .
+ep-core:mm2
+      rdf:type ep-core:Scale , owl:FunctionalProperty , owl:DatatypeProperty ;
+      rdfs:label "square millimetres"^^xsd:string .
+
+ep-core:nanoEuclid
+      rdf:type owl:FunctionalProperty , ep-core:Scale , owl:DatatypeProperty ;
+      rdfs:label "NanoEuclid"^^xsd:string .
+
+ep-core:radian_ft-1
+      rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
+      rdfs:label "radians per ft"^^xsd:string .
+
+ep-core:radian_m-1
+      rdf:type owl:DatatypeProperty , owl:FunctionalProperty , ep-core:Scale ;
+      rdfs:label "radians per m"^^xsd:string .
+
+ep-core:radian_s-1
+      rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
+      rdfs:label "radians per s"^^xsd:string .
+
+ep-core:rev_min-1
+      rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
+      rdfs:label "revolutions per minute"^^xsd:string .
+
+ep-core:rev_s-1
+      rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
+      rdfs:label "revolutions per second"^^xsd:string .
+
 ep-core:ten_megagram_m-3
       rdf:type owl:FunctionalProperty , owl:DatatypeProperty , ep-core:Scale ;
       rdfs:label "10 Megagram m-3"^^xsd:string .
@@ -191,3 +330,16 @@ ep-core:ten_megagram_m-3
 ep-core:thousand_barrel
       rdf:type ep-core:Scale , owl:FunctionalProperty , owl:DatatypeProperty ;
       rdfs:label "thousand barrel"^^xsd:string .
+
+ep-core:um2
+      rdf:type ep-core:Scale , owl:FunctionalProperty , owl:DatatypeProperty ;
+      rdfs:label "square micrometres"^^xsd:string .
+
+ep-core:us_mi2
+      rdf:type ep-core:Scale , owl:FunctionalProperty , owl:DatatypeProperty ;
+      rdfs:comment "According to everything I can find, there is no difference between this an mi2"^^xsd:string ;
+      rdfs:label "square miles (US)"^^xsd:string .
+
+ep-core:yd2
+      rdf:type ep-core:Scale , owl:FunctionalProperty , owl:DatatypeProperty ;
+      rdfs:label "square yards"^^xsd:string .
--- a/www.reportinghub.no/ep/spin/SPIN_EP-DDR-tables-v1.0.spin.ttl
View file @2208dcc
+++ b/www.reportinghub.no/ep/spin/SPIN_EP-DDR-tables-v1.0.spin.ttl
View file @2208dcc
--- a/www.reportinghub.no/ep/spin/SPIN_EPIM-DPR-lib-v1.1.spin.ttl
View file @2208dcc
+++ b/www.reportinghub.no/ep/spin/SPIN_EPIM-DPR-lib-v1.1.spin.ttl
View file @2208dcc
--- a/www.reportinghub.no/ep/spin/SPIN_EPIM-DPR-lib-v1.1.spin.ttl.tbc
View file @2208dcc
+++ b/www.reportinghub.no/ep/spin/SPIN_EPIM-DPR-lib-v1.1.spin.ttl.tbc
View file @2208dcc
-# Saved by TopBraid on Fri Oct 28 15:14:15 BST 2011
 # baseURI: null
 @prefix composite:  <http://www.topbraid.org/2007/05/composite.owl#> .
--- a/www.reportinghub.no/swp/DailyDrillingReport.uispin.html
View file @2208dcc
+++ b/www.reportinghub.no/swp/DailyDrillingReport.uispin.html
View file @2208dcc
@@ -87,6 +87,8 @@
 		<ddrswp:Table arg:report="{= ?report }" arg:template="ddr-tables:CementFluidInformation" />
+		<ddrswp:Table arg:report="{= ?report }" arg:template="ddr-tables:DrillingFluidInformation" />
+
 		<ddrswp:Table arg:report="{= ?report }" arg:template="ddr-tables:PorePressure" />		
 		<ddrswp:Table arg:report="{= ?report }" arg:template="ddr-tables:SurveyStation" />