Merge branch 'dev' into feature-1965-add-to-wind-characteristics-defi…

…nition

CHANGELOG.md

@@ -25,17 +25,16 @@ and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/
 - 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)
+- 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, #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)
+- 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)
 - 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)
 
 
-
 ### Changed
 - gams -> General Algebraic Modeling System (#1889)
 - uo:unit (#1892)

src/ontology/edits/oeo-tasks.omn

@@ -21,6 +21,9 @@ Annotations:
 AnnotationProperty: <http://purl.obolibrary.org/obo/IAO_0000115>
 
 
+AnnotationProperty: <http://purl.obolibrary.org/obo/IAO_0000118>
+
+
 AnnotationProperty: <http://purl.org/dc/terms/title>
 
 
@@ -219,9 +222,11 @@ Class: OEO_00390017
     Annotations: 
         OEO_00020426 "Add:
 issue: https://github.com/OpenEnergyPlatform/ontology/issues/1891
-pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1940",
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1940
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1964",
         <http://purl.obolibrary.org/obo/IAO_0000115> "Wind power density calculation is an action specification that describes how wind power density (WPD) is calculated to estimate the theoretical wind power potential based on wind speed and air density.",
-        rdfs:label "Wind power density calculation"@en
+        <http://purl.obolibrary.org/obo/IAO_0000118> "wpd calculation"@en,
+        rdfs:label "wind power density calculation"@en
 
     SubClassOf: 
         OEO_00390035
@@ -271,8 +276,10 @@ Class: OEO_00390030
     Annotations: 
         OEO_00020426 "Add:
 issue: https://github.com/OpenEnergyPlatform/ontology/issues/1891
-pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1940",
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1940
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1964",
         <http://purl.obolibrary.org/obo/IAO_0000115> "Run multi-criteria secision analysis is an action specification that describes how a multi-criteria decision analysis (MCDA) method is applied to areas where exclusions are not absolute (soft exclusion criteria), allowing for weighted decision-making.",
+        <http://purl.obolibrary.org/obo/IAO_0000118> "run MCDA"@en,
         rdfs:label "run multi-criteria decision analysis"@en
 
     SubClassOf: 
@@ -578,8 +585,10 @@ Class: OEO_00390053
     Annotations: 
         OEO_00020426 "Add;
 issue: https://github.com/OpenEnergyPlatform/ontology/issues/1891
-pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1940",
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1940
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1964",
         <http://purl.obolibrary.org/obo/IAO_0000115> "Calculate levelised cost of electricity is an action specification that describes the computation of the levelised cost of electricity (LCOE) either for individual turbines or for sub-regions within the study area by applying a cost model based on the previously calculated economic parameters and the capacity factors.",
+        <http://purl.obolibrary.org/obo/IAO_0000118> "calculate LCOE"@en,
         rdfs:label "calculate levelised cost of electricity"@en
 
     SubClassOf: