Merge branch 'dev' into feature-1399-introduce-sector-module

CHANGELOG.md

@@ -10,7 +10,12 @@ and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/
 - regionalisation (#1639)
 - sufficiency scenario (#1642)
 - recycling (#1638)
+- flexibility, energy balancing (#1717)
 - control area, bidding zone, bidding zone role (#1718)
+- climate neutrality criterion, process climate neutrality, climate neutral process, material climate neutrality (#1722)
+- blended liquid fuel, bioethanol, E10, B7 (#1723)
+- mobility technology, electric mobility technology (#1727)
+- energy storage object hierarchy, energy storage technology hierarchy (#1728)
 
 ### Changed
 - energy transformation (#1625)
@@ -25,9 +30,11 @@ and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/
 - new module oeo-shared-axioms.omn (#1649)
 - acceptance (#1698)
 - scenario projection comparison, model intercomparison study (#1711)
+- energy balance -> energy balance data set (#1717) 
 - person, organisational role, organisation (#1716)
 - state of matter (#1720)
 - new module oeo-sectors (#1649)
+- potential energy stroage function (#1728)
 
 ### Changed
 - energy transformation (#1625)

src/ontology/edits/oeo-model.omn

@@ -1626,14 +1626,18 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1652",
 Class: OEO_00010404
 
     Annotations: 
-        <http://purl.obolibrary.org/obo/IAO_0000115> "An energy balance is an empirical data set that describes a specified set of energy transformations and a specified set of energy carriers in a spatial region for a specific time step (usually a year).",
+        <http://purl.obolibrary.org/obo/IAO_0000115> "An energy balance data set is an empirical data set that describes a specified set of energy transformations and a specified set of energy carriers in a spatial region for a specific time step (usually a year).",
         <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/1400
 pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1463
 
 rework module structure 
 issue: https://github.com/OpenEnergyPlatform/ontology/issues/1592
-pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1652",
-        rdfs:label "energy balance"
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1652
+
+change label 
+issue: https://github.com/OpenEnergyPlatform/ontology/issues/1549
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1717",
+        rdfs:label "energy balance data set"
 
     SubClassOf: 
         OEO_00000149,