Merge branch 'feature-1952-add-conceptual-model' of https://github.co…

…m/OpenEnergyPlatform/ontology into feature-1952-add-conceptual-model

.github/workflows/InDiscussionProject.yml → .github/workflows/LabelInDiscussion.yml

@@ -1,13 +1,10 @@
-name: Label & Move issues to "In discussion" project column
+name: Label issues as "In discussion"
 on:
   issue_comment:
     types: [created]
-  issues: 
-    types: [labeled]
 
 jobs:
   labelIssueAsInDiscussion:
-    if: github.event_name == 'issue_comment'
     runs-on: ubuntu-latest
     permissions:
       issues: write
@@ -30,19 +27,4 @@ jobs:
         GH_REPO: ${{ github.repository }}
         NUMBER: ${{ github.event.issue.number }}
         LABELS: in discussion
-      if: steps.count.outputs.continue == 'true' 
-  moveIssueToInDiscussionColumn:
-    if: github.event_name == 'issues' && github.event.issue.state == 'open'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: PaperMC/[email protected]
-        with:
-          github-token: "${{ secrets.OEO_WORKFLOWS }}"
-          project-url: https://github.com/orgs/OpenEnergyPlatform/projects/45/views/1
-          column-field: Status
-          clear-on-no-match: false
-          label-to-column-map: |
-            {
-              "To do": "To do",
-              "in discussion": "In discussion"
-            }
+      if: steps.count.outputs.continue == 'true' 

.github/workflows/MoveInDiscussionProject.yml

@@ -0,0 +1,21 @@
+name: Move issues to "In discussion" project column
+on:
+  issues: 
+    types: [labeled]
+
+jobs:
+  moveIssueToInDiscussionColumn:
+    if: github.event_name == 'issues' && github.event.issue.state == 'open'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: PaperMC/[email protected]
+        with:
+          github-token: "${{ secrets.OEO_WORKFLOWS }}"
+          project-url: https://github.com/orgs/OpenEnergyPlatform/projects/45/views/1
+          column-field: Status
+          clear-on-no-match: false
+          label-to-column-map: |
+            {
+              "To do": "To do",
+              "in discussion": "In discussion"
+            }

CHANGELOG.md

@@ -4,9 +4,32 @@ All notable changes to this project will be documented in this file.
 The format is inspired from [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## [2.x.y] - 202x-xx-xx
+## [2.6.0] - 2024-12-06
 ### Added
+- has aggregation type, has time stamp alignment (#1944)
+- study descriptor (#1950)
+- file oeo-tasks (#1940)
+- action specification for techno-economic potential, calculate economic potential, calculate levelised cost of energy, determine capital expenditures, determine discount and interest rate, determine operational expenditures, determine wind turbine lifetime (#1940, #1964)
+- action specification for the feasible potential, apply constraints for assessment of potential, calculate feasible potential (#1940)
+- action specification for the technical wind potential, account for wake losses, calculate technical potential, determine annual energy yield, determine capacity density, determine capacity factor, place turbines within area, select appropriate turbine types (#1940, #1966)
+- action specification for wind characteristics, air density adjustment, data preparation, wind power density calculation, wind speed calculation, wind speed frequency analysis, wind variability identification (#1940, #1964, #1966)
+- action specification for wind farm development area, determine development area, determine geographical potential, improve spatial resolution, prepare exclusion criteria datasets, run multi-criteria decision analysis, select exclusion criteria (#1940, #1964)
+- determined feasible potential, determined techno-economic potential, determined wind characteristics, determined wind farm area, determined wind potential (#1940)
+- uncertainty of a model, nature of uncertainty, level of uncertainty, location of uncertainty role, ambiguous uncertainty, epistemological uncertainty, ontological uncertainty, shallow uncertainty, medium uncertainty, deep uncertainty, recognised ignorance, has uncertainty nature, has uncertainty location, has uncertainty level (#1829)
+- feasible potential determination process, techno-economic potential determination process, wind characteristics determination process, wind farm area determination process, wind potential determination process (#1940, #1966)
+- feasible potential determination method, techno-economic potential determination method, wind characteristics determination method, wind farm area determination method, wind potential determination method (#1940, #1966)
+- model system boundary (#1977)
+- technical model implementation(#1978)
+- gaseous (#1980)
+
 ### Changed
+- energy amount value / energy value (#1941)
+- rework contributing and readme file (#1937, #1946)
+- time stamp (#1944)
+- supply grid, transport network, critical infrastructure (#1947)
+- areal solar energy density (#1983)
+
+
 
 ## [2.5.0] - 2024-09-24
 ### Added
@@ -22,19 +45,6 @@ and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/
 - product (#1912)
 - term tracker annotation (#1913)
 - licence provider, licensee, has licence provider, permits (#1925)
-- has aggregation type, has time stamp alignment (#1944)
-- study descriptor (#1950)
-- file oeo-tasks (#1940)
-- action specification for techno-economic potential, calculate economic potential, calculate levelised cost of energy, determine capital expenditures, determine discount and interest rate, determine operational expenditures, determine wind turbine lifetime (#1940, #1964)
-- action specification for the feasible potential, apply constraints for assessment of potential, calculate feasible potential (#1940)
-- action specification for the technical wind potential, account for wake losses, calculate technical potential, determine annual energy yield, determine capacity density, determine capacity factor, place turbines within area, select appropriate turbine types (#1940, #1966)
-- action specification for wind characteristics, air density adjustment, data preparation, wind power density calculation, wind speed calculation, wind speed frequency analysis, wind variability identification (#1940, #1964, #1966)
-- action specification for wind farm development area, determine development area, determine geographical potential, improve spatial resolution, prepare exclusion criteria datasets, run multi-criteria decision analysis, select exclusion criteria (#1940, #1964)
-- determined feasible potential, determined techno-economic potential, determined wind characteristics, determined wind farm area, determined wind potential (#1940)
-- uncertainty of a model, nature of uncertainty, level of uncertainty, location of uncertainty role, ambiguous uncertainty, epistemological uncertainty, ontological uncertainty, shallow uncertainty, medium uncertainty, deep uncertainty, recognised ignorance, has uncertainty nature, has uncertainty location, has uncertainty level (#1829)
-- feasible potential determination process, techno-economic potential determination process, wind characteristics determination process, wind farm area determination process, wind potential determination process (#1940, #1966)
-- feasible potential determination method, techno-economic potential determination method, wind characteristics determination method, wind farm area determination method, wind potential determination method (#1940, #1966)
-- conceptual model (#1976)
 
 ### Changed
 - gams -> General Algebraic Modeling System (#1889)
@@ -47,11 +57,6 @@ and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/
 - is traded at, trades (#1912)
 - replace term tracker item with term tracker annotation (#1922, #1923)
 - replace has bearer with characteristic of (#1928)
-- energy amount value / energy value (#1941)
-- rework contributing and readme file (#1937, #1946)
-- time stamp (#1944)
-- supply grid, transport network, critical infrastructure (#1947)
-
 
 ### Obsoletion
 - economic value, has economic value, economic value (#1931)

CITATION.cff

@@ -166,6 +166,6 @@ authors:
 title: "Open Energy Ontology (OEO)"
 type: software
 license: CC0-1.0
-version: 2.5.0
-date-released: 2024-09-24
+version: 2.6.0
+date-released: 2024-12-06
 url: "https://github.com/OpenEnergyPlatform/ontology"

VERSION

@@ -1 +1 @@
-2.5.0
+2.6.0

src/ontology/edits/oeo-model.omn

@@ -3811,6 +3811,7 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1945",
         <http://purl.obolibrary.org/obo/BFO_0000023>
 
 
+
 Class: OEO_00400040
 
     Annotations: 
@@ -3821,8 +3822,38 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1976",
         rdfs:label "conceptual model"@en
 
     SubClassOf: 
+
         <http://purl.obolibrary.org/obo/IAO_0000030>,
         <http://purl.obolibrary.org/obo/RO_0000087> some OEO_00020353
+
+
+Class: OEO_00400041
+
+    Annotations: 
+        <http://purl.obolibrary.org/obo/IAO_0000115> "A model system boundary is a generically dependent continuant that is part of a model and separates aspects of the real world included in the model from those that are not.",
+        <http://purl.obolibrary.org/obo/IAO_0000119> "https://www.researchgate.net/publication/264816512_Classifying_and_communicating_uncertainties_in_model-based_policy_analysis",
+        <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/1951
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1977",
+        rdfs:label "model system boundary"@en
+
+    SubClassOf: 
+        <http://purl.obolibrary.org/obo/BFO_0000031>,
+        <http://purl.obolibrary.org/obo/BFO_0000050> some OEO_00000274
+
+
+Class: OEO_00400042
+
+    Annotations: 
+        <http://purl.obolibrary.org/obo/IAO_0000115> "A technical model implementation is a generically dependent continuant that is part of a model and consists of the hardware and software realization of a (conceptual) model.",
+        <http://purl.obolibrary.org/obo/IAO_0000118> "model code",
+        <http://purl.obolibrary.org/obo/IAO_0000119> "https://www.researchgate.net/publication/264816512_Classifying_and_communicating_uncertainties_in_model-based_policy_analysis",
+        <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/1953
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1978",
+        rdfs:label "technical model implementation"@en
+
+    SubClassOf: 
+        <http://purl.obolibrary.org/obo/BFO_0000031>
+
 
 
 Individual: OEO_00000049

src/ontology/edits/oeo-physical.omn

@@ -5505,8 +5505,12 @@ Class: OEO_00010077
 
     Annotations: 
         OEO_00020426 "issue: https://github.com/OpenEnergyPlatform/ontology/issues/597
-pull request: https://github.com/OpenEnergyPlatform/ontology/pull/615",
-        <http://purl.obolibrary.org/obo/IAO_0000115> "An areal solar energy density is an areal energy density that gives the arriving solar power per area. A synonym for areal solar power density is irradiation.",
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/615
+
+correct definition to state 'energy' instead of 'power'
+issue: https://github.com/OpenEnergyPlatform/ontology/issues/1981
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1983",
+        <http://purl.obolibrary.org/obo/IAO_0000115> "An areal solar energy density is an areal energy density that gives the arriving solar energy per area. A synonym for areal solar energy density is irradiation.",
         <http://purl.obolibrary.org/obo/IAO_0000118> "irradiation",
         rdfs:label "areal solar energy density"@en
 
@@ -6248,7 +6252,7 @@ Class: OEO_00010138
     Annotations: 
         OEO_00020426 "issue: https://github.com/OpenEnergyPlatform/ontology/issues/863
 pull request: https://github.com/OpenEnergyPlatform/ontology/pull/911",
-        <http://purl.obolibrary.org/obo/IAO_0000115> "Carbon capture is a process that captures carbon dioxide from a gas. test",
+        <http://purl.obolibrary.org/obo/IAO_0000115> "Carbon capture is a process that captures carbon dioxide from a gas.",
         <http://purl.obolibrary.org/obo/IAO_0000118> "CO2-Abscheidung"@de,
         rdfs:label "carbon capture"@en
 
@@ -11606,8 +11610,8 @@ issue: https://github.com/OpenEnergyPlatform/ontology/issues/1865
 pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1941",
         <http://purl.obolibrary.org/obo/IAO_0000115> "An energy value is a quantity value that has an energy unit as unit."@en,
         <http://purl.obolibrary.org/obo/IAO_0000118> "Energiemenge"@de,
-        <http://purl.obolibrary.org/obo/IAO_0000118> "energy quantity value",
         <http://purl.obolibrary.org/obo/IAO_0000118> "energy amount value",
+        <http://purl.obolibrary.org/obo/IAO_0000118> "energy quantity value",
         rdfs:label "energy value"@en
 
     SubClassOf: 
@@ -15880,8 +15884,11 @@ issue: https://github.com/OpenEnergyPlatform/ontology/issues/1384
 pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1390,
 restructure modules:
 issue: https://github.com/OpenEnergyPlatform/ontology/issues/1592
-pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1652",
-        <http://purl.obolibrary.org/obo/IAO_0000115> "The state of being a gas. A portion of matter is in gaseous state if and only if it has has no definite shape and no definite volume and is not electrically conductive.",
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1652
+
+Fix definition:
+https://github.com/OpenEnergyPlatform/ontology/pull/1980",
+        <http://purl.obolibrary.org/obo/IAO_0000115> "The state of being a gas. A portion of matter is in gaseous state if and only if it has no definite shape and no definite volume and is not electrically conductive.",
         <http://purl.obolibrary.org/obo/IAO_0000118> "gasförmig"@de,
         rdfs:label "gaseous"@en
 

src/ontology/edits/oeo-tasks.omn

@@ -712,8 +712,6 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1940",
 
     SubClassOf: 
         OEO_00020166,
-        (<http://purl.obolibrary.org/obo/BFO_0000051> some OEO_00390059)
-         and (<http://purl.obolibrary.org/obo/BFO_0000051> some OEO_00390060),
         <http://purl.obolibrary.org/obo/BFO_0000051> some OEO_00390061