Merge pull request #1468 from OpenEnergyPlatform/releases-v1.13.0

Releases v1.13.0 to master branch
OpenEnergyPlatform · Feb 1, 2023 · e95a4a3 · e95a4a3
2 parents 93199ef + 71b9094
commit e95a4a3
Show file tree

Hide file tree

Showing 26 changed files with 7,388 additions and 3,048 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -1,13 +1,3 @@
----
-name: "New Pull Request (PR)"
-about: For including new features into the ontology
-title: Your title should make sense if said after "This PR is solving <your issue>"
-labels: "Pull Request Template"
-assignees: ''
-
----
-
-
 ## Summary of the discussion
 
 Describe the findings of the discussion in the issue or meeting.

diff --git a/.github/workflows/PostReleaseScripts.yml b/.github/workflows/PostReleaseScripts.yml
@@ -0,0 +1,64 @@
+name: Post Release Scripts
+# on:
+#   workflow_dispatch: {}
+#   push:
+#     branches:
+#       - 'feature-1020-export-of-existing-terms-and-definitions'
+# First we test the setup, to see if the files are building correctly once that is checked we introduce the wiki upload each release.
+on:
+ push:
+   tags:
+     - "v*"
+   branches:
+     - 'feature-1020-export-of-existing-terms-and-definitions'
+jobs:
+  exportTermsDefinitions:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.7'
+          architecture: x64
+      - uses: actions/setup-java@v2
+        with:
+          distribution: 'adopt'
+          java-version: '11'
+      - name: install python dependencies
+        run: pip install -r src/scripts/requirements.txt
+      - name: setup robot
+        run: |
+          wget https://github.com/ontodev/robot/releases/download/v1.9.0/robot.jar -O src/robot.jar
+      - name: Build ETD xlsx
+        run: |
+          java -jar src/robot.jar merge --input "src/ontology/oeo.omn" \
+            --input "src/ontology/edits/oeo-model.omn" \
+            --input "src/ontology/edits/oeo-physical.omn" \
+            --input "src/ontology/edits/oeo-shared.omn" \
+            --input "src/ontology/edits/oeo-social.omn" \
+            --include-annotations true \
+          export  --header "ID|LABEL|definition" \
+                  --prefix "OEO: http://openenergy-platform.org/ontology/oeo/OEO_" \
+                  --sort "LABEL" \
+                  --export "src/scripts/etd/etd.xlsx"
+      - name: Build ETD md
+        run: |
+          python src/scripts/etd/etd.py
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: existing-terms-and-definitions
+          path: src/scripts/etd/glossary
+      # - name: Checkout wiki
+      #   uses: actions/checkout@v2
+      #   with:
+      #     repository: ${{github.repository}}.wiki
+      #     path: wiki
+      # - name: Push list to wiki
+      #   run: |
+      #     cd wiki
+      #     cp -a ../src/scripts/etd/glossary/. .
+      #     git config --local user.email "[email protected]"
+      #     git config --local user.name "GitHub Action"
+      #     git add .
+      #     git diff-index --quiet HEAD || git commit -m "Add changes" && git push
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,68 @@ 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).
 
+## [1.13.0] - 2023-02-01
+
+### Added
+- oeo-import-edits as a unified file for custom extensions of imported concepts + properties (#1268)
+- tank, fuel tank, volume (#1356)
+- heat generating unit, heat plant, heat transfer unit, solar heat plant, solar heat unit (#1360)
+- combustion-based heater, electrical heater, geothermal heat unit, geothermal heat plant (#1360)
+- thermo-chemical heat storage object, chemical heat storage object, sorption heat storage object, adsorption, desorption (#1363)
+- sensible heat storage object, sensible solid heat storage object, sensible fluid heat storage object (#1363)
+- phase transition, evaporation, melting, latent heat storage object, latent fluid-gaseous heat storage object, latent solid-fluid heat storage object (#1363)
+- filling station, hydrogen station, hydrogen transport (#1357)
+- OEP user, qualitist, quantitist, apinist (#1383)
+- sustainability criterion, material sustainability, process sustainability, process sustainability, sustainable process (#1385)
+- vehicle-kilometre (#1388)
+- electricity demand, fuel demand (#1389)
+- based on (#1391)
+- bidirectional vehicle charging station (#1393)
+- charging (#1394)
+- non-energy use, cold start, cooperative programming, distribution, (electricity) export/import, frequency control, request, service, chemical reaction (#1395)
+- ton of oil equivalent, ton of coal equivalent, kilo ton of oil equivalent, kilo ton of coal equivalent, million ton of oil equivalent, million ton of coal equivalent (#1398)
+- sustainable biofuel, non-sustainable biofuel (#1409)
+- source category (#1428)
+- scenario bundle (#1429)
+- gas turbine process, combined cycle electricity generation, steam power unit (#1362)
+- rotary heat exchanger, plate heat exchanger, boiler, tube collector, flat-plate collector (#1432)
+- explorative and target driven scenario (#1459)
+- utilisation value (#1435)
+- amortisation time, economic life time (#1436)
+- renewable power unit, renewable power plant (#1437)
+- CRF sector individuals 2.A.2, 2.A.3, 2.A.4, 2.B.1 to 2.B.10, 2.C.2 to 2.C.7, 2.E.1 to 2.E.5, 2.F.1 to 2.F.6 and 2.G.1 to 2.G.4 (#1440)
+- has spatial region (#1441)
+- (renewable) electrolytic hydrogen, (fossil/abated) steam reforming hydrogen, renewable electrical energy (#1442)
+- energy transformation function and subclasses (#1445)
+- RED sector individuals (#1446)
+- direct/diffuse solar radiation, non-scattered radiant flux density, (single/two axis) solar tracking, (single/two axis) solar tracked receiving surface (#1448)
+- power-only generating unit (#1456)
+- energy balance, energy balance collection, energy balance calculation method, energy balance sector division (#1463)
+
+### Changed
+- bearer of -> has characteristic (#1268)
+- ro-module -> ro-extracted (#1268)
+- power plant, power generating unit, combined heat and power plant, combined heat and power generating unit, solar thermal collector (#1360)
+- internal combustion vehicle, plug-in hybrid electric vehicle, fuel cell electric vehicle, tank ship, gas turbine vehicle (#1356)
+- gas turbine, gas power unit (#1362)
+- model descriptor (#1387)
+- passenger-kilometre, ton-kilometre (#1388)
+- SMES -> superconducting magnetic energy storage (#1396)
+- biofuel; competency questions Q1 and Q2 (#1409)
+- global warming potential, binary file format, text file format, source code file format, generation time series, optimisation, simulation (#1410)
+- has economic value, economic value of (#1422)
+- solar thermal collector (#1432)
+- net capacity factor (#1435)
+- yield profile, geothermal power unit, marine current/tidal/wave energy converting unit, solar power unit, wind energy converting unit (#1437)
+- CRF sector individual 2.C.1 (#1440)
+- has study region, has considered region, has interacting region, has study region (#1441)
+- synthetic hydrogen, fossil hydrogen (#1442)
+- renewable_energy_directive_sectors -> Renewable Energy Directive sector division (#1446)
+- radiation (#1447)
+- german/eurostat energy balances -> German/Eurostat energy balance sector division; empirical/synthetic/test data set (#1463)
+- replaced owl:equivalentClass with 'may be identical to' in annotation properties
+
+
 ## [1.12.0] - 2022-11-02
 
 ### Added
@@ -27,10 +89,11 @@ and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/
 - data file format, and subclasses (#1326)
 - mineral oil, mineral oil product, mineral oil refinery, mineral oil refining, mineral oil refining sector (#1331)
 - international transport sector (#1334)
+- has study region, has study subregio, has considered region, has interacting region, has scenario year (#1347)
 - equivalence subclasses for car and truck (#1345)
 - refinery gas, petroleum coke (#1351)
 - chemical/electrical/kinetic/potential energy storage function; underground fuel storage object (#1348)
-- data center, sewage plant, industrial waste thermal energy, recovered heat, aerothermal energy (#1265)
+- data center, sewage plant, industrial waste thermal energy, recovered heat, aerothermal energy (#1359)
 
 ### Changed
 - github: update the description of the readme file (#1292)
@@ -63,7 +126,7 @@ and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/
 - realized in, greenhouse effect disposition, combustible energy carrier disposition (#1353)
 - energy storage -> energy storage function; thermal energy storage function; energy storage object; storage unit (#1348)
 - methanation gas storage -> power-to-methane system; power-to-liquid system; pumped water, pumped hydro storage power plant (#1348)
-- energy converting component, energy storage object, hardware, solar receiving object, vehicle, waste thermal energy (#1265)
+- energy converting component, energy storage object, hardware, solar receiving object, vehicle, waste thermal energy (#1359)
 
 ### Removed
 - battery storage (#1348)

diff --git a/CITATION.cff b/CITATION.cff
@@ -134,7 +134,7 @@ authors:
 title: "Open Energy Ontology (OEO)"
 type: software
 license: CC0-1.0
-version: 1.12.0
+version: 1.13.0
 doi: 
-date-released: 2022-07-04
+date-released: 2023-02-01
 url: "https://github.com/OpenEnergyPlatform/ontology"
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.12.0
+1.13.0
diff --git a/src/ontology/catalog-v001.xml b/src/ontology/catalog-v001.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <catalog prefer="public" xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+    <uri id="Imports Wizard Entry" name="http://openenergy-platform.org/ontology/oeo/dev/oeo-import-edits.owl" uri="edits/oeo-import-edits.owl"/>
     <uri id="User Entered Import Resolution" name="http://openenergy-platform.org/ontology/oeo/dev/oeo-physical-axioms.omn" uri="edits/oeo-physical-axioms.owl"/>
     <uri id="User Edited Redirect" name="http://openenergy-platform.org/ontology/oeo/dev/oeo-physical-axioms.owl" uri="edits/oeo-physical-axioms.owl"/>
     <uri id="Imports Wizard Entry" name="http://openenergy-platform.org/ontology/oeo/dev/imports/iao-module.owl" uri="imports/iao-module.owl"/>
     <uri id="Imports Wizard Entry" name="http://openenergy-platform.org/ontology/oeo/dev/imports/uo-module.owl" uri="imports/uo-module.owl"/>
     <uri id="Imports Wizard Entry" name="http://openenergy-platform.org/ontology/oeo/dev/imports/iao-minimal-module.owl" uri="imports/iao-minimal-module.owl"/>
     <uri id="Imports Wizard Entry" name="http://openenergy-platform.org/ontology/oeo/dev/imports/iao-annotation-module.owl" uri="imports/iao-annotation-module.owl"/>
-    <uri id="Imports Wizard Entry" name="http://openenergy-platform.org/ontology/oeo/dev/imports/ro-module.owl" uri="imports/ro-module.owl"/>
+    <uri id="Imports Wizard Entry" name="http://openenergy-platform.org/ontology/oeo/dev/imports/ro-extracted.owl" uri="imports/ro-extracted.owl"/>
     <uri id="Imports Wizard Entry" name="http://openenergy-platform.org/ontology/oeo/dev/oeo-shared.omn" uri="edits/oeo-shared.omn"/>
     <uri id="Imports Wizard Entry" name="http://openenergy-platform.org/ontology/oeo/dev/oeo-social.omn" uri="edits/oeo-social.omn"/>
     <uri id="Imports Wizard Entry" name="http://openenergy-platform.org/ontology/oeo/dev/oeo-physical.omn" uri="edits/oeo-physical.omn"/>

diff --git a/src/ontology/edits/catalog-v001.xml b/src/ontology/edits/catalog-v001.xml
@@ -5,9 +5,9 @@
     <uri id="Imports Wizard Entry" name="http://openenergy-platform.org/ontology/oeo/dev/imports/iao-minimal-module.owl" uri="../imports/iao-minimal-module.owl"/>
     <uri id="Imports Wizard Entry" name="http://openenergy-platform.org/ontology/oeo/dev/imports/iao-annotation-module.owl" uri="../imports/iao-annotation-module.owl"/>
     <uri id="Imports Wizard Entry" name="http://openenergy-platform.org/ontology/oeo/dev/imports/iao-module.owl" uri="../imports/iao-module.owl"/>
-    <uri id="Imports Wizard Entry" name="http://openenergy-platform.org/ontology/oeo/dev/imports/ro-module.owl" uri="../imports/ro-module.owl"/>
+    <uri id="Imports Wizard Entry" name="http://openenergy-platform.org/ontology/oeo/dev/imports/ro-extracted.owl" uri="../imports/ro-extracted.owl"/>
     <uri id="Imports Wizard Entry" name="http://openenergy-platform.org/ontology/oeo/dev/imports/uo-module.owl" uri="../imports/uo-module.owl"/>
     <group id="Folder Repository, directory=, recursive=true, Auto-Update=true, version=2" prefer="public" xml:base="">
-        <uri id="Automatically generated entry, Timestamp=1659681204458" name="http://openenergy-platform.org/ontology/oeo/oeo-physical-axioms/" uri="oeo-physical-axioms.owl"/>
+        <uri id="Automatically generated entry, Timestamp=1670253962125" name="http://openenergy-platform.org/ontology/oeo/oeo-physical-axioms/" uri="oeo-physical-axioms.owl"/>
     </group>
 </catalog>