Merge branch 'dev' into feature-1683-robust

OpenEnergyPlatform · May 6, 2024 · 6543fe8 · 6543fe8
2 parents c43aada + 25f7dd8
commit 6543fe8
Show file tree

Hide file tree

Showing 2 changed files with 99 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,10 +12,11 @@ and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/
 - quantity (#1839)
 - model coupling, sector coupling, sector coupling technology (#1842)
 - system robustness, robust system scenario, statistically robust, statistically robust scenario (#1843)
-
+- emission value, greenhouse gas emission value, CO2 emission value, emission factor value (#1846)
 
 ### Changed
 - has documentation quality (#1834)
+- emission factor, emission rate, greenhouse gas emission rate, CO2 emission rate, carbon dioxide equivalent quantity value (#1846)
 
 ### Removed
 

diff --git a/src/ontology/edits/oeo-physical.omn b/src/ontology/edits/oeo-physical.omn
@@ -2299,21 +2299,26 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1652",
 Class: OEO_00000148
 
     Annotations: 
-        <http://purl.obolibrary.org/obo/IAO_0000115> "An emission factor is a process attribute that quantifies the emissions or removals of a gas per unit activity.",
+        <http://purl.obolibrary.org/obo/IAO_0000115> "An emission factor is a process attribute that describes the correlation of emissions and the activity causing that emission.",
         <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/243
 pull request: https://github.com/OpenEnergyPlatform/ontology/pull/581
 moved to oeo-shared
 https://github.com/OpenEnergyPlatform/ontology/pull/956
 
 rework module structure 
 issue: https://github.com/OpenEnergyPlatform/ontology/issues/1592
-pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1652",
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1652
+
+restructuring emission rate and emission value
+issue: https://github.com/OpenEnergyPlatform/ontology/issues/1759
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1846",
         rdfs:label "emission factor"@en
 
     SubClassOf: 
         OEO_00030019,
-        OEO_00000502 some OEO_00000147,
-        OEO_00000502 some <http://purl.obolibrary.org/obo/BFO_0000015>
+        OEO_00000502 some 
+            (<http://purl.obolibrary.org/obo/BFO_0000015>
+             and (<http://purl.obolibrary.org/obo/RO_0002418> some OEO_00000147))
 
 
 Class: OEO_00000150
@@ -11555,7 +11560,7 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/633",
 Class: OEO_00140081
 
     Annotations: 
-        <http://purl.obolibrary.org/obo/IAO_0000115> "An emission value is a process attribute that quantifies the output of an emission process. It can be calculated using the emission factor of that emission process.",
+        <http://purl.obolibrary.org/obo/IAO_0000115> "An emission rate is a process attribute that describes the output of an emission process.",
         <http://purl.obolibrary.org/obo/IAO_0000233> "class:
 issue: https://github.com/OpenEnergyPlatform/ontology/issues/420
 pull request: https://github.com/OpenEnergyPlatform/ontology/pull/651
@@ -11568,8 +11573,12 @@ add axiom to social cost of carbon
 pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1034
 rework module structure 
 issue: https://github.com/OpenEnergyPlatform/ontology/issues/1592
-pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1652",
-        rdfs:label "emission value"@en
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1652
+
+restructuring emission rate and emission value
+issue: https://github.com/OpenEnergyPlatform/ontology/issues/1759
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1846",
+        rdfs:label "emission rate"@en
 
     SubClassOf: 
         OEO_00030019,
@@ -11580,10 +11589,14 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1652",
 Class: OEO_00140082
 
     Annotations: 
-        <http://purl.obolibrary.org/obo/IAO_0000115> "A greenhouse gas emission value is an emission value that quantifies the output of a greenhouse gas emission process.",
+        <http://purl.obolibrary.org/obo/IAO_0000115> "A greenhouse gas emission rate is an emission rate that describes the output of a greenhouse gas emission process.",
         <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/420
-pull request: https://github.com/OpenEnergyPlatform/ontology/pull/651",
-        rdfs:label "greenhouse gas emission value"@en
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/651
+
+restructuring emission rate and emission value
+issue: https://github.com/OpenEnergyPlatform/ontology/issues/1759
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1846",
+        rdfs:label "greenhouse gas emission rate"@en
 
     SubClassOf: 
         OEO_00140081,
@@ -11596,11 +11609,15 @@ Class: OEO_00140083
         <http://purl.obolibrary.org/obo/IAO_0000115> "A carbon dioxide equivalent quantity is a greenhouse gas emission value that quantifies the combined effect of all emitted greenhouse gases by giving an equivalent amount of CO2 which would have the same effect on the climate.",
         <http://purl.obolibrary.org/obo/IAO_0000118> "CO2 equivalent quantity",
         <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/420
-pull request: https://github.com/OpenEnergyPlatform/ontology/pull/651",
-        rdfs:label "carbon dioxide equivalent quantity"@en
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/651
+
+restructuring emission rate and emission value
+issue: https://github.com/OpenEnergyPlatform/ontology/issues/1759
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1846",
+        rdfs:label "carbon dioxide equivalent quantity value"@en
 
     SubClassOf: 
-        OEO_00140082
+        OEO_00340064
 
 
 Class: OEO_00140091
@@ -12674,18 +12691,22 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1652"@en,
 Class: OEO_00260008
 
     Annotations: 
-        <http://purl.obolibrary.org/obo/IAO_0000115> "A CO2 emission value is greenhouse gas emission value that quantifies the output of a CO2 emission process."@en,
-        <http://purl.obolibrary.org/obo/IAO_0000118> "carbon dioxide emission value"@en,
+        <http://purl.obolibrary.org/obo/IAO_0000115> "A CO2 emission rate is a greenhouse gas emission rate that describes the output of a CO2 emission process."@en,
         <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/866
 pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1253/
 
 rework module structure 
 issue: https://github.com/OpenEnergyPlatform/ontology/issues/1592
-pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1652"@en,
-        rdfs:label "CO2 emission value"@en
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1652
+
+restructuring emission rate and emission value
+issue: https://github.com/OpenEnergyPlatform/ontology/issues/1759
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1846"@en,
+        rdfs:label "CO2 emission rate"@en
 
     SubClassOf: 
-        OEO_00140081
+        OEO_00140082,
+        OEO_00000502 some OEO_00260007
 
 
 Class: OEO_00290000
@@ -14466,6 +14487,64 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1486",
         OEO_00020056 some OEO_00000159
 
 
+Class: OEO_00340063
+
+    Annotations: 
+        <http://purl.obolibrary.org/obo/IAO_0000115> "An emission factor value is a fraction value that quantifies an emission factor as quotient of the emissions or removals of a gas per unit activity.",
+        <http://purl.obolibrary.org/obo/IAO_0000233> "restructuring emission rate and emission value
+issue: https://github.com/OpenEnergyPlatform/ontology/issues/1759
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1846",
+        rdfs:label "emission factor value"@de
+
+    SubClassOf: 
+        OEO_00140127
+
+
+Class: OEO_00340064
+
+    Annotations: 
+        <http://purl.obolibrary.org/obo/IAO_0000115> "An emission value is a quantity value that quantifies an emission rate and has a mass unit.",
+        <http://purl.obolibrary.org/obo/IAO_0000118> "emission quantity value",
+        <http://purl.obolibrary.org/obo/IAO_0000233> "restructuring emission rate and emission value
+issue: https://github.com/OpenEnergyPlatform/ontology/issues/1759
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1846",
+        <http://purl.obolibrary.org/obo/IAO_0000600> "It can be calculated using the an emission factor.",
+        rdfs:label "emission value"@en
+
+    SubClassOf: 
+        OEO_00000350,
+        OEO_00020056 some OEO_00140081,
+        OEO_00040010 some <http://purl.obolibrary.org/obo/UO_0000002>
+
+
+Class: OEO_00340065
+
+    Annotations: 
+        <http://purl.obolibrary.org/obo/IAO_0000115> "A greenhouse gas emission value is an emission value that quantifies a greenhouse gas emission rate and has a mass unit.",
+        <http://purl.obolibrary.org/obo/IAO_0000233> "restructuring emission rate and emission value
+issue: https://github.com/OpenEnergyPlatform/ontology/issues/1759
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1846",
+        rdfs:label "greenhouse gas emission value"@en
+
+    SubClassOf: 
+        OEO_00340064,
+        OEO_00020056 some OEO_00140082
+
+
+Class: OEO_00340066
+
+    Annotations: 
+        <http://purl.obolibrary.org/obo/IAO_0000115> "A CO2 emission value is a greenhouse gas emission value that quantifies a CO2 emission rate and has a mass unit.",
+        <http://purl.obolibrary.org/obo/IAO_0000233> "restructuring emission rate and emission value
+issue: https://github.com/OpenEnergyPlatform/ontology/issues/1759
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1846",
+        rdfs:label "CO2 emission value"@en
+
+    SubClassOf: 
+        OEO_00340065,
+        OEO_00020056 some OEO_00260008
+
+
 Class: OEO_00360001
 
     Annotations: