David Price

Removed cases of 2 rdfs:label in classes and improved DPR tables fluids section.

...@@ -1074,7 +1074,7 @@ ep-core:definingType ...@@ -1074,7 +1074,7 @@ ep-core:definingType
1074 ep-core:degreesOfAngle 1074 ep-core:degreesOfAngle
1075 rdf:type owl:FunctionalProperty , owl:DatatypeProperty , ep-core:Scale ; 1075 rdf:type owl:FunctionalProperty , owl:DatatypeProperty , ep-core:Scale ;
1076 rdfs:domain ep-core:PlaneAngle ; 1076 rdfs:domain ep-core:PlaneAngle ;
1077 - rdfs:label "degree of an angle"^^xsd:string , "degrees of angle"^^xsd:string ; 1077 + rdfs:label "degrees of angle"^^xsd:string ;
1078 ep-core:seeReferenceData 1078 ep-core:seeReferenceData
1079 "http://posccaesar.org/rdl/RDS43166353217"^^xsd:string . 1079 "http://posccaesar.org/rdl/RDS43166353217"^^xsd:string .
1080 1080
...@@ -3955,6 +3955,13 @@ ep-core:secondOfPair ...@@ -3955,6 +3955,13 @@ ep-core:secondOfPair
3955 ep-core:seeReferenceData 3955 ep-core:seeReferenceData
3956 rdf:type owl:AnnotationProperty . 3956 rdf:type owl:AnnotationProperty .
3957 3957
3958 +ep-core:shortName
3959 + rdf:type owl:DatatypeProperty ;
3960 + rdfs:comment "a short or abbreviated name"^^xsd:string ;
3961 + rdfs:label "short name"^^xsd:string ;
3962 + rdfs:range xsd:string ;
3963 + rdfs:subPropertyOf ep-core:name .
3964 +
3958 ep-core:sm3_sm-3 3965 ep-core:sm3_sm-3
3959 rdf:type owl:FunctionalProperty , owl:DatatypeProperty , ep-core:Scale ; 3966 rdf:type owl:FunctionalProperty , owl:DatatypeProperty , ep-core:Scale ;
3960 rdfs:domain ep-core:VolumePerVolume ; 3967 rdfs:domain ep-core:VolumePerVolume ;
......
...@@ -31,7 +31,7 @@ ep-material:AqueousMaterial ...@@ -31,7 +31,7 @@ ep-material:AqueousMaterial
31 31
32 ep-material:BasicSedimentAndWater 32 ep-material:BasicSedimentAndWater
33 rdf:type owl:Class , ep-material:SubstanceType ; 33 rdf:type owl:Class , ep-material:SubstanceType ;
34 - rdfs:label "bsw"^^xsd:string , "basic sediment and water"^^xsd:string ; 34 + rdfs:label "basic sediment and water"^^xsd:string ;
35 rdfs:subClassOf ep-material:Fluid ; 35 rdfs:subClassOf ep-material:Fluid ;
36 ep-core:seeReferenceData 36 ep-core:seeReferenceData
37 "http://posccaesar.org/rdl/RDS16681480"^^xsd:string . 37 "http://posccaesar.org/rdl/RDS16681480"^^xsd:string .
...@@ -326,8 +326,9 @@ ep-material:HydrogenSulfide ...@@ -326,8 +326,9 @@ ep-material:HydrogenSulfide
326 326
327 ep-material:Isobutane 327 ep-material:Isobutane
328 rdf:type owl:Class , ep-material:SubstanceType ; 328 rdf:type owl:Class , ep-material:SubstanceType ;
329 - rdfs:label "isobutane"^^xsd:string , "IC4"^^xsd:string ; 329 + rdfs:label "IC4"^^xsd:string ;
330 rdfs:subClassOf ep-material:Material ; 330 rdfs:subClassOf ep-material:Material ;
331 + ep-core:name "isobutane"^^xsd:string ;
331 ep-core:seeReferenceData 332 ep-core:seeReferenceData
332 "http://posccaesar.org/rdl/RDS419309"^^xsd:string . 333 "http://posccaesar.org/rdl/RDS419309"^^xsd:string .
333 334
...@@ -338,8 +339,9 @@ ep-material:Isobutane-component ...@@ -338,8 +339,9 @@ ep-material:Isobutane-component
338 339
339 ep-material:Isopentane 340 ep-material:Isopentane
340 rdf:type owl:Class , ep-material:SubstanceType ; 341 rdf:type owl:Class , ep-material:SubstanceType ;
341 - rdfs:label "isopentane"^^xsd:string , "IC5"^^xsd:string ; 342 + rdfs:label "IC5"^^xsd:string ;
342 rdfs:subClassOf ep-material:Material ; 343 rdfs:subClassOf ep-material:Material ;
344 + ep-core:name "isopentane"^^xsd:string ;
343 ep-core:seeReferenceData 345 ep-core:seeReferenceData
344 "http://posccaesar.org/rdl/RDS419399"^^xsd:string . 346 "http://posccaesar.org/rdl/RDS419399"^^xsd:string .
345 347
...@@ -447,8 +449,9 @@ ep-material:NonHcGas ...@@ -447,8 +449,9 @@ ep-material:NonHcGas
447 449
448 ep-material:NormalButane 450 ep-material:NormalButane
449 rdf:type owl:Class , ep-material:SubstanceType ; 451 rdf:type owl:Class , ep-material:SubstanceType ;
450 - rdfs:label "normal butane"^^xsd:string , "NC4"^^xsd:string ; 452 + rdfs:label "NC4"^^xsd:string ;
451 - rdfs:subClassOf ep-material:Material . 453 + rdfs:subClassOf ep-material:Material ;
454 + ep-core:name "normal butane"^^xsd:string .
452 455
453 ep-material:NormalButane-component 456 ep-material:NormalButane-component
454 rdf:type owl:Class ; 457 rdf:type owl:Class ;
...@@ -457,8 +460,9 @@ ep-material:NormalButane-component ...@@ -457,8 +460,9 @@ ep-material:NormalButane-component
457 460
458 ep-material:NormalPentane 461 ep-material:NormalPentane
459 rdf:type owl:Class , ep-material:SubstanceType ; 462 rdf:type owl:Class , ep-material:SubstanceType ;
460 - rdfs:label "normal pentane"^^xsd:string , "NC5"^^xsd:string ; 463 + rdfs:label "NC5"^^xsd:string ;
461 - rdfs:subClassOf ep-material:Material . 464 + rdfs:subClassOf ep-material:Material ;
465 + ep-core:name "normal pentane"^^xsd:string .
462 466
463 ep-material:Oil 467 ep-material:Oil
464 rdf:type owl:Class ; 468 rdf:type owl:Class ;
...@@ -525,8 +529,9 @@ ep-material:PlusFraction ...@@ -525,8 +529,9 @@ ep-material:PlusFraction
525 529
526 ep-material:Propane 530 ep-material:Propane
527 rdf:type owl:Class , ep-material:SubstanceType ; 531 rdf:type owl:Class , ep-material:SubstanceType ;
528 - rdfs:label "propane"^^xsd:string , "C3"^^xsd:string ; 532 + rdfs:label "C3"^^xsd:string ;
529 rdfs:subClassOf ep-material:Material ; 533 rdfs:subClassOf ep-material:Material ;
534 + ep-core:name "propane"^^xsd:string ;
530 ep-core:seeReferenceData 535 ep-core:seeReferenceData
531 "http://posccaesar.org/rdl/RDS419264"^^xsd:string . 536 "http://posccaesar.org/rdl/RDS419264"^^xsd:string .
532 537
...@@ -800,8 +805,9 @@ ep-material:substance-3mPentane ...@@ -800,8 +805,9 @@ ep-material:substance-3mPentane
800 805
801 ep-material:substance-Ar 806 ep-material:substance-Ar
802 rdf:type owl:Class , ep-material:SubstanceType ; 807 rdf:type owl:Class , ep-material:SubstanceType ;
803 - rdfs:label "Argon"^^xsd:string , "Ar"^^xsd:string ; 808 + rdfs:label "Argon"^^xsd:string ;
804 - rdfs:subClassOf ep-material:Material . 809 + rdfs:subClassOf ep-material:Material ;
810 + ep-core:shortName "Ar"^^xsd:string .
805 811
806 ep-material:substance-Benzene 812 ep-material:substance-Benzene
807 rdf:type owl:Class , ep-material:SubstanceType ; 813 rdf:type owl:Class , ep-material:SubstanceType ;
...@@ -1053,8 +1059,9 @@ ep-material:substance-EtcyPentane ...@@ -1053,8 +1059,9 @@ ep-material:substance-EtcyPentane
1053 1059
1054 ep-material:substance-Ethane 1060 ep-material:substance-Ethane
1055 rdf:type owl:Class , ep-material:SubstanceType ; 1061 rdf:type owl:Class , ep-material:SubstanceType ;
1056 - rdfs:label "ethane"^^xsd:string , "C2"^^xsd:string ; 1062 + rdfs:label "C2"^^xsd:string ;
1057 rdfs:subClassOf ep-material:Material ; 1063 rdfs:subClassOf ep-material:Material ;
1064 + ep-core:name "ethane"^^xsd:string ;
1058 ep-core:seeReferenceData 1065 ep-core:seeReferenceData
1059 "http://posccaesar.org/rdl/RDS419219"^^xsd:string . 1066 "http://posccaesar.org/rdl/RDS419219"^^xsd:string .
1060 1067
...@@ -1107,8 +1114,9 @@ ep-material:substance-McyPentane ...@@ -1107,8 +1114,9 @@ ep-material:substance-McyPentane
1107 1114
1108 ep-material:substance-Methane 1115 ep-material:substance-Methane
1109 rdf:type owl:Class , ep-material:SubstanceType ; 1116 rdf:type owl:Class , ep-material:SubstanceType ;
1110 - rdfs:label "methane"^^xsd:string , "C1"^^xsd:string ; 1117 + rdfs:label "C1"^^xsd:string ;
1111 - rdfs:subClassOf ep-material:Material . 1118 + rdfs:subClassOf ep-material:Material ;
1119 + ep-core:name "methane"^^xsd:string .
1112 1120
1113 ep-material:substance-N2 1121 ep-material:substance-N2
1114 rdf:type owl:Class , ep-material:SubstanceType ; 1122 rdf:type owl:Class , ep-material:SubstanceType ;
......