Skip to content

Commit

Permalink
Merge pull request #1615 from OpenEnergyPlatform/feature-1329-scenari…
Browse files Browse the repository at this point in the history
…o-subclasses

remaining scenario subclasses #1329
  • Loading branch information
stap-m authored Jul 21, 2023
2 parents 367cdba + 94d631d commit 8c092bd
Show file tree
Hide file tree
Showing 5 changed files with 201 additions and 96 deletions.
13 changes: 8 additions & 5 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/
- life cycle assessment (#1576)
- energy technology (#1591)
- policy scenario, reference role, reference scenario (#1614)
- greenhouse gas emission scenario, co2 emission scenario (#1615)


### Changed
Expand All @@ -20,9 +21,11 @@ and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/
- technology (#1591)
- quantity value (#1606)
- trade (#1613)
- climate scenario, climate system, energy scenario, carbon dioxide, energy system, supply system, emission scenario (#1615)
- secondary energy production (#1619)
- hydro energy, solar energy, wind energy (#1620)


### Removed

## [1.15.0] - 2023-05-31
Expand Down Expand Up @@ -305,7 +308,7 @@ and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/

### Removed

## [1.9.0] - 2022-03-01
## [1.9.0] - 2022-03-01

### Added
- memo item and CRF (2006) sector individuals relating to memo item; has information content entity (#966)
Expand Down Expand Up @@ -383,7 +386,7 @@ and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/
- power-to-gas process, power-to-methane process, methanation, oxygen, water electrolysis process (#954)
- biomass, biomethane (#952)
- variable (production) cost (#953)
- conventional (energy carrier disposition), fossil energy (#955)
- conventional (energy carrier disposition), fossil energy (#955)
- carbon tax, social cost of carbon, carbon price (#956)
- synthetic ammonia, power-to-ammonia process (#959)
- renewable waste fuel, fossil waste fuel, renewable industrial waste fuel, fossil industrial waste fuel (#961)
Expand Down Expand Up @@ -443,7 +446,7 @@ and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/
- objective variable (#878)
- metric ton (#879)
- target description (#881)
- scenario year, scenario horizon, meteorological year, weather time series, scenario time series (#882)
- scenario year, scenario horizon, meteorological year, weather time series, scenario time series (#882)
- axioms of typical period and aggregation type (#883)

### Changed
Expand Down Expand Up @@ -680,8 +683,8 @@ and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/
- Add has_normal_state_of_matter value solid/liquid/gaseous/plasmatic to fuels (#39)
- object properties: 'has_disposition', 'has_role', 'has_function',
'has_quality' (#51)
- issue templates (#92, #146)
- ArtificialObject (#121)
- issue templates (#92, #146)
- ArtificialObject (#121)
- classes for objects that apply to technologies like EnergyGenerator (#128)
- Grid class (#137)
- object properties to describe models (#109)
Expand Down
53 changes: 32 additions & 21 deletions src/ontology/edits/oeo-model.omn
Original file line number Diff line number Diff line change
Expand Up @@ -1019,9 +1019,9 @@ Class: OEO_00000353
SubClassOf:
<http://purl.obolibrary.org/obo/IAO_0000030>


Class: OEO_00000364

Class: OEO_00000364


Class: OEO_00000365

Expand Down Expand Up @@ -1390,7 +1390,7 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1113",


Class: OEO_00020016


Class: OEO_00020017

Expand All @@ -1408,7 +1408,7 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/981",


Class: OEO_00020018


Class: OEO_00020019

Expand Down Expand Up @@ -1480,7 +1480,7 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1302",


Class: OEO_00020032


Class: OEO_00020033

Expand Down Expand Up @@ -1513,7 +1513,7 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/585",


Class: OEO_00020035


Class: OEO_00020036

Expand All @@ -1537,7 +1537,7 @@ Class: OEO_00020039


Class: OEO_00020072


Class: OEO_00020089

Expand Down Expand Up @@ -1616,10 +1616,10 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/881",


Class: OEO_00020097


Class: OEO_00020098


Class: OEO_00020099

Expand Down Expand Up @@ -1713,6 +1713,9 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1459",
OEO_00000364


Class: OEO_00020252


Class: OEO_00020309


Expand All @@ -1722,9 +1725,16 @@ Class: OEO_00030007
OEO_00040001 "http://openenergy-platform.org/ontology/oeo/oeo-model"^^xsd:string,
<http://purl.obolibrary.org/obo/IAO_0000115> "A climate scenario is a scenario that describes a possible future state of a climate system.",
<http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/328
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/344",
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/344

issue: https://github.com/OpenEnergyPlatform/ontology/issues/1329
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1615",
rdfs:label "climate scenario"

EquivalentTo:
OEO_00000364
and (<http://purl.obolibrary.org/obo/IAO_0000136> some OEO_00020252)

SubClassOf:
OEO_00000364

Expand All @@ -1744,30 +1754,31 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/344",

Class: OEO_00030009

Annotations:
OEO_00040001 "http://openenergy-platform.org/ontology/oeo/oeo-model"^^xsd:string,
<http://purl.obolibrary.org/obo/IAO_0000115> "An emission scenario is a scenario that describes a possible emission trajectory.",
<http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/328
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/344",
rdfs:label "emission scenario"

SubClassOf:
OEO_00000364


Class: OEO_00030010

Annotations:
OEO_00040001 "http://openenergy-platform.org/ontology/oeo/oeo-model"^^xsd:string,
<http://purl.obolibrary.org/obo/IAO_0000115> "An energy scenario is a scenario that describes a possible future state of an energy system.",
<http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/328
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/344",
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/344

make equivalent
issue: https://github.com/OpenEnergyPlatform/ontology/issues/1329
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1615",
rdfs:label "energy scenario"

EquivalentTo:
OEO_00000364
and (<http://purl.obolibrary.org/obo/IAO_0000136> some OEO_00030024)

SubClassOf:
OEO_00000364


Class: OEO_00030024


Class: OEO_00030029


Expand Down
76 changes: 25 additions & 51 deletions src/ontology/edits/oeo-physical.omn
Original file line number Diff line number Diff line change
Expand Up @@ -887,21 +887,6 @@ Class: OEO_00000005

Class: OEO_00000006

Annotations:
OEO_00040001 "http://openenergy-platform.org/ontology/oeo/oeo-physical"^^xsd:string,
<http://purl.obolibrary.org/obo/IAO_0000115> "Carbon dioxide is a portion of matter with the chemical formula CO2. It has a gaseous normal state of matter. It occurs naturally in the atmosphere as a trace gas and can work as a greenhouse gas.",
<http://purl.obolibrary.org/obo/IAO_0000118> "CO2",

Annotations: <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/636
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/810"
<http://purl.obolibrary.org/obo/IAO_0006011> "http://purl.obolibrary.org/obo/CHEBI_16526",
rdfs:label "carbon dioxide"

SubClassOf:
OEO_00000331,
<http://purl.obolibrary.org/obo/RO_0000091> some OEO_00000198,
OEO_00000529 value OEO_00000182


Class: OEO_00000007

Expand Down Expand Up @@ -3293,6 +3278,9 @@ Class: OEO_00000361
OEO_00000165


Class: OEO_00000364


Class: OEO_00000374

Annotations:
Expand Down Expand Up @@ -7779,17 +7767,6 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1541",

Class: OEO_00020252

Annotations:
<http://purl.obolibrary.org/obo/IAO_0000115> "A climate system is a system that has five interacting components: the atmosphere (air), the hydrosphere (water), the cryosphere (ice and permafrost), the lithosphere (earth's upper rocky layer) and the biosphere (living things)."@en,
<http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/1540
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1542",
<http://purl.obolibrary.org/obo/IAO_0006011> "http://purl.obolibrary.org/obo/ENVO_01001364
A climate system is a system that has five interacting components: the atmosphere (air), the hydrosphere (water), the cryosphere (ice and permafrost), the lithosphere (earth's upper rocky layer) and the biosphere (living things).",
rdfs:label "climate system"@en

SubClassOf:
<http://purl.obolibrary.org/obo/RO_0002577>


Class: OEO_00020254

Expand Down Expand Up @@ -7834,6 +7811,22 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1561",
OEO_00020056 some OEO_00020254


Class: OEO_00020321

Annotations:
<http://purl.obolibrary.org/obo/IAO_0000115> "A CO2 emission scenario is an emission scenario that describes a possible CO2 emission trajectory.",
<http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/1329
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1615",
rdfs:label "CO2 emission scenario"

EquivalentTo:
OEO_00000364
and (<http://purl.obolibrary.org/obo/IAO_0000136> some OEO_00260007)

SubClassOf:
OEO_00030009


Class: OEO_00030000

Annotations:
Expand Down Expand Up @@ -7918,6 +7911,9 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1192",
OEO_00010121 some OEO_00000331


Class: OEO_00030009


Class: OEO_00030015

SubClassOf:
Expand All @@ -7932,34 +7928,9 @@ Class: OEO_00030019

Class: OEO_00030024

Annotations:
OEO_00040001 "http://openenergy-platform.org/ontology/oeo/oeo-physical"^^xsd:string,
<http://purl.obolibrary.org/obo/IAO_0000115> "An energy system is a supply system of spatially extended linked energy sources and sinks.",
<http://purl.obolibrary.org/obo/IAO_0000118> "energy supply system",
<http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/432
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/493

make subclass of supply system:
issue: https://github.com/OpenEnergyPlatform/ontology/issues/1071
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1123",
rdfs:label "energy system"

SubClassOf:
OEO_00030025


Class: OEO_00030025

Annotations:
OEO_00040001 "http://openenergy-platform.org/ontology/oeo/oeo-physical"^^xsd:string,
<http://purl.obolibrary.org/obo/IAO_0000115> "A supply system is a system that connects producers and consumers.",
<http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/432
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/493",
rdfs:label "supply system"

SubClassOf:
<http://purl.obolibrary.org/obo/RO_0002577>


Class: OEO_00030026

Expand Down Expand Up @@ -9778,6 +9749,9 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1395",
<http://purl.obolibrary.org/obo/RO_0000057> some OEO_00020102


Class: OEO_00260007


Class: OEO_00290000

Annotations:
Expand Down
Loading

0 comments on commit 8c092bd

Please sign in to comment.