From 845a747f5bda13409da6cc5b524dc521ee1717a9 Mon Sep 17 00:00:00 2001 From: Michaja Pehl Date: Tue, 12 May 2020 17:27:33 +0200 Subject: [PATCH 1/8] add "capacity" terms #320 --- src/ontology/catalog-v001.xml | 10 +++---- src/ontology/edits/oeo-physical.omn | 44 +++++++++++++++++++++++++++++ src/ontology/oeo.omn | 3 +- 3 files changed, 51 insertions(+), 6 deletions(-) diff --git a/src/ontology/catalog-v001.xml b/src/ontology/catalog-v001.xml index 53129be14..bc0b3a34f 100644 --- a/src/ontology/catalog-v001.xml +++ b/src/ontology/catalog-v001.xml @@ -8,10 +8,10 @@ - - - - - + + + + + diff --git a/src/ontology/edits/oeo-physical.omn b/src/ontology/edits/oeo-physical.omn index e215a7ae2..ad973c453 100644 --- a/src/ontology/edits/oeo-physical.omn +++ b/src/ontology/edits/oeo-physical.omn @@ -2871,6 +2871,50 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/130", +Class: + + Annotations: + "Storage Capacity is the maximum energy an energy storage object can store."@en, + "issue: https://github.com/OpenEnergyPlatform/ontology/issues/320"@en, + rdfs:label "storage capacity"@en + + SubClassOf: + + + +Class: + + Annotations: + "Power rating is the maximum power an energy converting device can convert."@en, + "issue: https://github.com/OpenEnergyPlatform/ontology/issues/320"@en, + rdfs:label "power rating"@en + + SubClassOf: + + + +Class: + + Annotations: + "Declared net capacity is the maximum power a power plant can deliver to the electrical grid. It equals the sum of the rated powers of all plant generators minus all power used internally within the plant."@en, + "issue: https://github.com/OpenEnergyPlatform/ontology/issues/320"@en, + rdfs:label "declared net capacity"@en + + SubClassOf: + + + +Class: + + Annotations: + "Nameplate capacity is the maximum power a power plan tcan generate, and the sum of the power ratings of all energy converting devices of that power plant."@en, + "issue: https://github.com/OpenEnergyPlatform/ontology/issues/320"@en, + rdfs:label "nameplate capacity"@en + + SubClassOf: + + + Class: diff --git a/src/ontology/oeo.omn b/src/ontology/oeo.omn index 8e079004c..d52aa0c67 100644 --- a/src/ontology/oeo.omn +++ b/src/ontology/oeo.omn @@ -30,12 +30,13 @@ Annotations: dc:contributor "Ludwig Hülk (@Ludee)", dc:contributor "Lukas Emele (@l-emele)", dc:contributor "Martin Glauer (@MGlauer)", + dc:contributor "Michaja Pehl (@0UmfHxcvx5J7JoaOhFSs5mncnisTJJ6q)", dc:contributor "Mirjam Stappel (@stap-m)", dc:contributor "Patrick Kuckertz (@p-kuckertz)", dc:contributor "Pierre-Francois Duc (@Bachibouzouk)", dc:contributor "Sebastian Cordes (@sebcordes)", - dc:contributor "Vera Sehn (@Vera-IER)", dc:contributor "Ulrich Frey (@ufrey)", + dc:contributor "Vera Sehn (@Vera-IER)", "Open Energy Ontology", rdfs:comment "The Open Energy Ontology is an ontology for all aspects of the energy modelling domain. From d54bbe1c6b223816252d29d063106201c81367e8 Mon Sep 17 00:00:00 2001 From: Michaja Pehl Date: Wed, 13 May 2020 17:11:30 +0200 Subject: [PATCH 2/8] fix typo in src/ontology/edits/oeo-physical.omn Co-authored-by: akleinau <56925445+akleinau@users.noreply.github.com> --- src/ontology/edits/oeo-physical.omn | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/ontology/edits/oeo-physical.omn b/src/ontology/edits/oeo-physical.omn index ad973c453..82cace9ac 100644 --- a/src/ontology/edits/oeo-physical.omn +++ b/src/ontology/edits/oeo-physical.omn @@ -2907,7 +2907,7 @@ Class: Class: Annotations: - "Nameplate capacity is the maximum power a power plan tcan generate, and the sum of the power ratings of all energy converting devices of that power plant."@en, + "Nameplate capacity is the maximum power a power plant can generate, and the sum of the power ratings of all energy converting devices of that power plant."@en, "issue: https://github.com/OpenEnergyPlatform/ontology/issues/320"@en, rdfs:label "nameplate capacity"@en @@ -3035,4 +3035,3 @@ Individual: DisjointClasses: ,, - From 4fd737f7f265bf98a4a536fee08f43faa2581383 Mon Sep 17 00:00:00 2001 From: Michaja Pehl Date: Wed, 13 May 2020 17:23:45 +0200 Subject: [PATCH 3/8] add pull request links to term tracker --- src/ontology/edits/oeo-physical.omn | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/ontology/edits/oeo-physical.omn b/src/ontology/edits/oeo-physical.omn index 82cace9ac..573bfdf59 100644 --- a/src/ontology/edits/oeo-physical.omn +++ b/src/ontology/edits/oeo-physical.omn @@ -1542,12 +1542,13 @@ Class: Class: - Annotations: + + Annotations: "In thermodynamics, heat is energy in transfer to or from a thermodynamic system, by mechanisms other than thermodynamic work or transfer of matter. The mechanisms include conduction, through direct contact of immobile bodies, or through a wall or barrier that is impermeable to matter; or radiation between separated bodies; or isochoric mechanical work done by the surroundings on the system of interest; or Joule heating by an electric current driven through the system of interest by an external system; or a combination of these."@en, "https://en.wikipedia.org/w/index.php?title=Heat&oldid=90563031157"@en, rdfs:label "heat" - + SubClassOf: @@ -2876,6 +2877,7 @@ Class: Annotations: "Storage Capacity is the maximum energy an energy storage object can store."@en, "issue: https://github.com/OpenEnergyPlatform/ontology/issues/320"@en, + "pull request: https://github.com/OpenEnergyPlatform/ontology/pull/391", rdfs:label "storage capacity"@en SubClassOf: @@ -2887,6 +2889,7 @@ Class: Annotations: "Power rating is the maximum power an energy converting device can convert."@en, "issue: https://github.com/OpenEnergyPlatform/ontology/issues/320"@en, + "pull request: https://github.com/OpenEnergyPlatform/ontology/pull/391", rdfs:label "power rating"@en SubClassOf: @@ -2898,6 +2901,7 @@ Class: Annotations: "Declared net capacity is the maximum power a power plant can deliver to the electrical grid. It equals the sum of the rated powers of all plant generators minus all power used internally within the plant."@en, "issue: https://github.com/OpenEnergyPlatform/ontology/issues/320"@en, + "pull request: https://github.com/OpenEnergyPlatform/ontology/pull/391", rdfs:label "declared net capacity"@en SubClassOf: @@ -2909,6 +2913,7 @@ Class: Annotations: "Nameplate capacity is the maximum power a power plant can generate, and the sum of the power ratings of all energy converting devices of that power plant."@en, "issue: https://github.com/OpenEnergyPlatform/ontology/issues/320"@en, + "pull request: https://github.com/OpenEnergyPlatform/ontology/pull/391", rdfs:label "nameplate capacity"@en SubClassOf: @@ -2992,7 +2997,7 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/371", SubClassOf: - + Individual: Annotations: @@ -3035,3 +3040,4 @@ Individual: DisjointClasses: ,, + From 605f04d7ae97208eb5b957a8bbfe7cb454331f4f Mon Sep 17 00:00:00 2001 From: Michaja Pehl Date: Thu, 14 May 2020 09:17:13 +0200 Subject: [PATCH 4/8] fix duplicate contributors (w/ and w/o IDs) --- src/ontology/oeo.omn | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/ontology/oeo.omn b/src/ontology/oeo.omn index efde3a2aa..4252ce218 100644 --- a/src/ontology/oeo.omn +++ b/src/ontology/oeo.omn @@ -35,12 +35,9 @@ Annotations: dc:contributor "Lara Christmann", dc:contributor "Martin Glauer (@MGlauer)", dc:contributor "(0023) Michaja Pehl (@0UmfHxcvx5J7JoaOhFSs5mncnisTJJ6q)", - dc:contributor "Mirjam Stappel (@stap-m)", - dc:contributor "Patrick Kuckertz (@p-kuckertz)", dc:contributor "Pierre-Francois Duc (@Bachibouzouk)", dc:contributor "Sebastian Cordes (@sebcordes)", dc:contributor "Ulrich Frey (@ufrey)", - dc:contributor "Vera Sehn (@Vera-IER)", "Open Energy Ontology", rdfs:comment "The Open Energy Ontology is an ontology for all aspects of the energy modelling domain. From 2aab689ad1b9c632322079e86890d74f01119859 Mon Sep 17 00:00:00 2001 From: l-emele <36884905+l-emele@users.noreply.github.com> Date: Tue, 19 May 2020 17:14:00 +0200 Subject: [PATCH 5/8] Update src/ontology/edits/oeo-physical.omn --- src/ontology/edits/oeo-physical.omn | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/ontology/edits/oeo-physical.omn b/src/ontology/edits/oeo-physical.omn index 573bfdf59..76572ded3 100644 --- a/src/ontology/edits/oeo-physical.omn +++ b/src/ontology/edits/oeo-physical.omn @@ -2875,7 +2875,7 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/130", Class: Annotations: - "Storage Capacity is the maximum energy an energy storage object can store."@en, + "Storage capacity is the maximum energy an energy storage object can store."@en, "issue: https://github.com/OpenEnergyPlatform/ontology/issues/320"@en, "pull request: https://github.com/OpenEnergyPlatform/ontology/pull/391", rdfs:label "storage capacity"@en @@ -3040,4 +3040,3 @@ Individual: DisjointClasses: ,, - From 5bbd84ee10505bbf4637e4eb53c71921c967df8c Mon Sep 17 00:00:00 2001 From: Michaja Pehl Date: Tue, 19 May 2020 18:30:28 +0200 Subject: [PATCH 6/8] include power generating units in definitions for declared net capacitiy and nameplate capacitiy --- src/ontology/edits/oeo-physical.omn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ontology/edits/oeo-physical.omn b/src/ontology/edits/oeo-physical.omn index 76572ded3..334ab1a4e 100644 --- a/src/ontology/edits/oeo-physical.omn +++ b/src/ontology/edits/oeo-physical.omn @@ -2899,7 +2899,7 @@ Class: Class: Annotations: - "Declared net capacity is the maximum power a power plant can deliver to the electrical grid. It equals the sum of the rated powers of all plant generators minus all power used internally within the plant."@en, + "Declared net capacity is the maximum power a power generating unit or a power plant can deliver to the electrical grid. It equals the sum of the rated powers of all plant generators minus all power used internally within the plant."@en, "issue: https://github.com/OpenEnergyPlatform/ontology/issues/320"@en, "pull request: https://github.com/OpenEnergyPlatform/ontology/pull/391", rdfs:label "declared net capacity"@en @@ -2911,7 +2911,7 @@ Class: Class: Annotations: - "Nameplate capacity is the maximum power a power plant can generate, and the sum of the power ratings of all energy converting devices of that power plant."@en, + "Nameplate capacity is the maximum power a power generating unit or a power plant can generate, and the sum of the power ratings of all energy converting devices of that power plant."@en, "issue: https://github.com/OpenEnergyPlatform/ontology/issues/320"@en, "pull request: https://github.com/OpenEnergyPlatform/ontology/pull/391", rdfs:label "nameplate capacity"@en From 072a7cbd28ef7ef2f5be8dda83a0718d89f71f2c Mon Sep 17 00:00:00 2001 From: l-emele <36884905+l-emele@users.noreply.github.com> Date: Tue, 2 Jun 2020 12:23:09 +0200 Subject: [PATCH 7/8] Update src/ontology/edits/oeo-physical.omn --- src/ontology/edits/oeo-physical.omn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ontology/edits/oeo-physical.omn b/src/ontology/edits/oeo-physical.omn index 334ab1a4e..78364c70b 100644 --- a/src/ontology/edits/oeo-physical.omn +++ b/src/ontology/edits/oeo-physical.omn @@ -2878,7 +2878,7 @@ Class: "Storage capacity is the maximum energy an energy storage object can store."@en, "issue: https://github.com/OpenEnergyPlatform/ontology/issues/320"@en, "pull request: https://github.com/OpenEnergyPlatform/ontology/pull/391", - rdfs:label "storage capacity"@en + rdfs:label "storage capacity" SubClassOf: From c04dbb9ac5763c59b1d062c7672e5725a390d929 Mon Sep 17 00:00:00 2001 From: akleinau <56925445+akleinau@users.noreply.github.com> Date: Wed, 3 Jun 2020 10:26:45 +0200 Subject: [PATCH 8/8] move classes to quantity value --- src/ontology/edits/oeo-physical.omn | 58 +++++++++++++++-------------- src/ontology/oeo.omn | 2 +- 2 files changed, 32 insertions(+), 28 deletions(-) diff --git a/src/ontology/edits/oeo-physical.omn b/src/ontology/edits/oeo-physical.omn index 5207fb370..44819b009 100644 --- a/src/ontology/edits/oeo-physical.omn +++ b/src/ontology/edits/oeo-physical.omn @@ -2929,64 +2929,65 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/130", +Class: + + Annotations: + "A process attribute is a dependent occurrent that existentially depends on a process.", + "issue: https://github.com/OpenEnergyPlatform/ontology/issues/205 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/386", + rdfs:label "process attribute"@de + + SubClassOf: + + + Class: Annotations: - "Storage capacity is the maximum energy an energy storage object can store."@en, - "issue: https://github.com/OpenEnergyPlatform/ontology/issues/320"@en, - "pull request: https://github.com/OpenEnergyPlatform/ontology/pull/391", + "Storage capacity is the quantity value stating the maximum energy an energy storage object can store.", + "issue: https://github.com/OpenEnergyPlatform/ontology/issues/320 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/391", rdfs:label "storage capacity" SubClassOf: - + Class: Annotations: - "Power rating is the maximum power an energy converting device can convert."@en, - "issue: https://github.com/OpenEnergyPlatform/ontology/issues/320"@en, - "pull request: https://github.com/OpenEnergyPlatform/ontology/pull/391", + "Power rating is the quantity value stating the maximum power an energy converting device can convert.", + "issue: https://github.com/OpenEnergyPlatform/ontology/issues/320 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/391", rdfs:label "power rating"@en SubClassOf: - + Class: Annotations: - "Declared net capacity is the maximum power a power generating unit or a power plant can deliver to the electrical grid. It equals the sum of the rated powers of all plant generators minus all power used internally within the plant."@en, - "issue: https://github.com/OpenEnergyPlatform/ontology/issues/320"@en, - "pull request: https://github.com/OpenEnergyPlatform/ontology/pull/391", + "Declared net capacity is the quantity value stating the maximum power a power generating unit or a power plant can deliver to the electrical grid. It equals the sum of the rated powers of all plant generators minus all power used internally within the plant.", + "issue: https://github.com/OpenEnergyPlatform/ontology/issues/320 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/391", rdfs:label "declared net capacity"@en SubClassOf: - + Class: Annotations: - "Nameplate capacity is the maximum power a power generating unit or a power plant can generate, and the sum of the power ratings of all energy converting devices of that power plant."@en, - "issue: https://github.com/OpenEnergyPlatform/ontology/issues/320"@en, - "pull request: https://github.com/OpenEnergyPlatform/ontology/pull/391", + "Nameplate capacity is the quantity value stating the maximum power a power generating unit or a power plant can generate, and the sum of the power ratings of all energy converting devices of that power plant.", + "issue: https://github.com/OpenEnergyPlatform/ontology/issues/320 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/391", rdfs:label "nameplate capacity"@en SubClassOf: - - -Class: - - Annotations: - "A process attribute is a dependent occurrent that existentially depends on a process.", - "issue: https://github.com/OpenEnergyPlatform/ontology/issues/205 -pull request: https://github.com/OpenEnergyPlatform/ontology/pull/386", - rdfs:label "process attribute"@de + - SubClassOf: - - Class: @@ -3068,6 +3069,7 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/371", SubClassOf: + Class: OEO_00020004 Annotations: @@ -3093,6 +3095,7 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/385", , some + Individual: Annotations: @@ -3135,3 +3138,4 @@ Individual: DisjointClasses: ,, + diff --git a/src/ontology/oeo.omn b/src/ontology/oeo.omn index 4252ce218..023fb3326 100644 --- a/src/ontology/oeo.omn +++ b/src/ontology/oeo.omn @@ -30,11 +30,11 @@ Annotations: dc:contributor "(0009) Christian (@christian-rli)", dc:contributor "(0011) Ludwig Hülk (@Ludee)", dc:contributor "(0012) Izzet Kilicarslan (@Izzet91)", + dc:contributor "(0023) Michaja Pehl (@0UmfHxcvx5J7JoaOhFSs5mncnisTJJ6q)", dc:contributor "Christian Winger (@wingechr)", dc:contributor "Fabian Neuhaus (@fabianneuhaus)", dc:contributor "Lara Christmann", dc:contributor "Martin Glauer (@MGlauer)", - dc:contributor "(0023) Michaja Pehl (@0UmfHxcvx5J7JoaOhFSs5mncnisTJJ6q)", dc:contributor "Pierre-Francois Duc (@Bachibouzouk)", dc:contributor "Sebastian Cordes (@sebcordes)", dc:contributor "Ulrich Frey (@ufrey)",