Merge branch 'dev' into feature-1565-fix-trade-axiom

OpenEnergyPlatform · Jul 21, 2023 · ee13248 · ee13248
2 parents 5fd2066 + 9554807
commit ee13248
Show file tree

Hide file tree

Showing 5 changed files with 362 additions and 185 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,13 +11,17 @@ and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/
 - material transformation, fuel production (#1575)
 - life cycle assessment (#1576)
 - energy technology (#1591)
+- policy scenario, reference role, reference scenario (#1614)
+
 
 ### Changed
 - boolean variable, true, false (#1255)
 - production (#1575)
 - technology (#1591)
 - quantity value (#1606)
 - trade (#1613)
+- secondary energy production (#1619)
+- hydro energy, solar energy, wind energy (#1620)
 
 ### Removed
 

diff --git a/src/ontology/edits/oeo-model.omn b/src/ontology/edits/oeo-model.omn
@@ -1019,27 +1019,8 @@ Class: OEO_00000353
     SubClassOf: 
         <http://purl.obolibrary.org/obo/IAO_0000030>
 
-
-Class: OEO_00000364
-
-    Annotations: 
-        OEO_00040001 "http://openenergy-platform.org/ontology/oeo/oeo-model"^^xsd:string,
-        <http://purl.obolibrary.org/obo/IAO_0000115> "A scenario is an information content entity that contains statements about a possible future development based on a coherent and internally consistent set of assumptions and their motivation."@en,
-        <http://purl.obolibrary.org/obo/IAO_0000118> "narrative",
-        <http://purl.obolibrary.org/obo/IAO_0000118> "storyline",
-        <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/328
-pull request: https://github.com/OpenEnergyPlatform/ontology/pull/344
-add is about-relation
-pull request: https://github.com/OpenEnergyPlatform/ontology/pull/764
 
-Add 'narrative' and 'storyline' as alternative label
-issue: https://github.com/OpenEnergyPlatform/ontology/issues/1232
-pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1296",
-        rdfs:label "scenario"
-
-    SubClassOf: 
-        <http://purl.obolibrary.org/obo/IAO_0000030>,
-        <http://purl.obolibrary.org/obo/IAO_0000136> some OEO_00020072
+Class: OEO_00000364
 
 
 Class: OEO_00000365
@@ -1409,24 +1390,6 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1113",
 
 
 Class: OEO_00020016
-
-    Annotations: 
-        OEO_00040001 "http://openenergy-platform.org/ontology/oeo/oeo-model"^^xsd:string,
-        <http://purl.obolibrary.org/obo/IAO_0000115> "A model descriptor is an information content entity that contains information about some model."@en,
-        <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/82
-pull request: https://github.com/OpenEnergyPlatform/ontology/pull/577
-
-Add SubclassOf axiom:
-issue: https://github.com/OpenEnergyPlatform/ontology/issues/1386
-pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1387",
-        rdfs:label "model descriptor"@en
-
-    EquivalentTo: 
-        <http://purl.obolibrary.org/obo/IAO_0000030>
-         and (<http://purl.obolibrary.org/obo/IAO_0000136> some OEO_00000274)
-
-    SubClassOf: 
-        <http://purl.obolibrary.org/obo/IAO_0000030>
 
 
 Class: OEO_00020017
@@ -1445,20 +1408,6 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/981",
 
 
 Class: OEO_00020018
-
-    Annotations: 
-        OEO_00040001 "http://openenergy-platform.org/ontology/oeo/oeo-model"^^xsd:string,
-        <http://purl.obolibrary.org/obo/IAO_0000115> "A methodical focus is a model descriptor that specifies the primary calculation method used in a model.",
-        <http://purl.obolibrary.org/obo/IAO_0000118> "methodology",
-        <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/82
-pull request: https://github.com/OpenEnergyPlatform/ontology/pull/577
-alternative term
-pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1011",
-        rdfs:label "methodical focus"@en
-
-    SubClassOf: 
-        OEO_00020016,
-        <http://purl.obolibrary.org/obo/IAO_0000136> some OEO_00000275
 
 
 Class: OEO_00020019
@@ -1531,20 +1480,6 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1302",
 
 
 Class: OEO_00020032
-
-    Annotations: 
-        OEO_00040001 "http://openenergy-platform.org/ontology/oeo/oeo-model"^^xsd:string,
-        <http://purl.obolibrary.org/obo/IAO_0000112> "In a study, the spatial focus of the investigation lies on one European country, e.g. Germany. This is the study region.
-The study region is not modelled as a whole, but several subregions are modelled, e.g. German Federal States. These are study subregions.
-In the study, a spatial region outside the study region plays a role. E.g. for modelling the electricity transfer between Germany and its neighbouring countries. In this example, the neighbouring countries represent the interacting / external region.
-The union of the study region and the interacting/ external region ist the considered region.",
-        <http://purl.obolibrary.org/obo/IAO_0000115> "A study region is a spatial region that is under investigation and consists entirely of one or more subregions.",
-        <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/475
-pull request: https://github.com/OpenEnergyPlatform/ontology/pull/585",
-        rdfs:label "study region"
-
-    SubClassOf: 
-        <http://purl.obolibrary.org/obo/BFO_0000006>
 
 
 Class: OEO_00020033
@@ -1578,20 +1513,6 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/585",
 
 
 Class: OEO_00020035
-
-    Annotations: 
-        OEO_00040001 "http://openenergy-platform.org/ontology/oeo/oeo-model"^^xsd:string,
-        <http://purl.obolibrary.org/obo/IAO_0000112> "In a study, the spatial focus of the investigation lies on one European country, e.g. Germany. This is the study region.
-The study region is not modelled as a whole, but several subregions are modelled, e.g. German Federal States. These are study subregions.
-In the study, a spatial region outside the study region plays a role. E.g. for modelling the electricity transfer between Germany and its neighbouring countries. In this example, the neighbouring countries represent the interacting / external region.
-The union of the study region and the interacting/ external region ist the considered region.",
-        <http://purl.obolibrary.org/obo/IAO_0000115> "A considered region is a spatial region that is used in an analysis.",
-        <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/475
-pull request: https://github.com/OpenEnergyPlatform/ontology/pull/585",
-        rdfs:label "considered region"
-
-    SubClassOf: 
-        <http://purl.obolibrary.org/obo/BFO_0000006>
 
 
 Class: OEO_00020036
@@ -1616,26 +1537,6 @@ Class: OEO_00020039
 
 
 Class: OEO_00020072
-
-    Annotations: 
-        OEO_00040001 "http://openenergy-platform.org/ontology/oeo/oeo-model"^^xsd:string,
-        <http://purl.obolibrary.org/obo/IAO_0000115> "An analysis scope is an information content entity that describes the boundaries of what a study or scenario covers.",
-        <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/638
-pull request: https://github.com/OpenEnergyPlatform/ontology/pull/764
-
-Add 'is about' axioms:
-issue: https://github.com/OpenEnergyPlatform/ontology/issues/1059
-pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1286",
-        rdfs:label "analysis scope"
-
-    SubClassOf: 
-        <http://purl.obolibrary.org/obo/IAO_0000030>,
-        <http://purl.obolibrary.org/obo/IAO_0000136> some OEO_00000367,
-        <http://purl.obolibrary.org/obo/IAO_0000136> some OEO_00020018,
-        <http://purl.obolibrary.org/obo/IAO_0000136> some OEO_00020032,
-        <http://purl.obolibrary.org/obo/IAO_0000136> some OEO_00020035,
-        <http://purl.obolibrary.org/obo/IAO_0000136> some OEO_00020097,
-        <http://purl.obolibrary.org/obo/IAO_0000136> some OEO_00020098
 
 
 Class: OEO_00020089
@@ -1715,38 +1616,9 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/881",
 
 
 Class: OEO_00020097
-
-    Annotations: 
-        OEO_00040001 "http://openenergy-platform.org/ontology/oeo/oeo-model"^^xsd:string,
-        <http://purl.obolibrary.org/obo/IAO_0000115> "A scenario year is a time step that has a duration of one year and is part of a scenario horizon.",
-        <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/474
-pull request: https://github.com/OpenEnergyPlatform/ontology/pull/882",
-        rdfs:label "scenario year"
-
-    SubClassOf: 
-        OEO_00030033,
-        <http://purl.obolibrary.org/obo/BFO_0000050> some OEO_00020098,
-        <http://purl.obolibrary.org/obo/BFO_0000051> some 
-            (OEO_00030035
-             and (OEO_00040010 some <http://purl.obolibrary.org/obo/UO_0000036>)
-             and (OEO_00140178 value 1))
 
 
 Class: OEO_00020098
-
-    Annotations: 
-        OEO_00040001 "http://openenergy-platform.org/ontology/oeo/oeo-model"^^xsd:string,
-        <http://purl.obolibrary.org/obo/IAO_0000115> "A scenario horizon is a time step that is under investigation and consists entirely of one or more scenario years.",
-        <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/474
-pull request: https://github.com/OpenEnergyPlatform/ontology/pull/882",
-        rdfs:label "scenario horizon"
-
-    SubClassOf: 
-        OEO_00030033,
-        <http://purl.obolibrary.org/obo/BFO_0000051> some OEO_00020097,
-        <http://purl.obolibrary.org/obo/BFO_0000051> some 
-            (OEO_00030035
-             and (OEO_00040010 some <http://purl.obolibrary.org/obo/UO_0000036>))
 
 
 Class: OEO_00020099
@@ -1841,6 +1713,9 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1459",
         OEO_00000364
 
 
+Class: OEO_00020309
+
+
 Class: OEO_00030007
 
     Annotations: 

diff --git a/src/ontology/edits/oeo-physical.omn b/src/ontology/edits/oeo-physical.omn
@@ -2428,11 +2428,15 @@ Class: OEO_00000218
         <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/679
 pull request: https://github.com/OpenEnergyPlatform/ontology/pull/681
 change axiom from participates in to is energy participant of
-pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1065",
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1065
+added axiom
+issue: https://github.com/OpenEnergyPlatform/ontology/issues/1600
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1620",
         rdfs:label "hydro energy"
 
     SubClassOf: 
         OEO_00230020,
+        OEO_00010121 some OEO_00000441,
 
             Annotations: <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/762
 pull request: https://github.com/OpenEnergyPlatform/ontology/pull/806
@@ -3246,7 +3250,7 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/766"
 
 
 Class: OEO_00000350
-    
+
 
 Class: OEO_00000356
 
@@ -3347,12 +3351,16 @@ issue: https://github.com/OpenEnergyPlatform/ontology/issues/663
 pull request: https://github.com/OpenEnergyPlatform/ontology/pull/672
 remove disposition renewable fuel
 issue: https://github.com/OpenEnergyPlatform/ontology/issues/726
-pull request: https://github.com/OpenEnergyPlatform/ontology/pull/732",
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/732
+added axiom
+issue: https://github.com/OpenEnergyPlatform/ontology/issues/1600
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1620",
         rdfs:label "solar energy"
 
     SubClassOf: 
         OEO_00020040,
-        OEO_00000530 some OEO_00030004
+        OEO_00000530 some OEO_00030004,
+        OEO_00010121 some OEO_00230021
 
 
 Class: OEO_00000386
@@ -3766,12 +3774,16 @@ remove disposition renewable fuel
 issue: https://github.com/OpenEnergyPlatform/ontology/issues/726
 pull request: https://github.com/OpenEnergyPlatform/ontology/pull/732
 add and change axioms
-pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1065",
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1065
+added axiom
+issue: https://github.com/OpenEnergyPlatform/ontology/issues/1600
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1620",
         rdfs:label "wind energy"
 
     SubClassOf: 
         OEO_00230020,
         OEO_00000530 some OEO_00030004,
+        OEO_00010121 some OEO_00000054,
 
             Annotations: <http://purl.obolibrary.org/obo/IAO_0000233> "change axiom to 'participates in'
 issue: https://github.com/OpenEnergyPlatform/ontology/issues/850