Merge remote-tracking branch 'origin/dev' into feature-1962-landscape…

…-classifications

CHANGELOG.md

@@ -5,11 +5,11 @@ The format is inspired from [Keep a Changelog](http://keepachangelog.com/en/1.0.
 and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [2.X.X] - 20XX-XX-XX
-
 ### Added
 - legislation, ROG, BNatSchG (#1991)
 - protected area role, Fauna Flora Habitat role, Bird Sanctuary role (#1991)
 - Fauna Flora Habitat, Bird Sanctuary (#1991)
+- conceptual model (#1976)
 
 ### Changed
 - protected area (#1991)

src/ontology/edits/oeo-model.omn

@@ -3721,6 +3721,22 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1945",
         <http://purl.obolibrary.org/obo/BFO_0000023>
 
 
+
+Class: OEO_00400040
+
+    Annotations: 
+        <http://purl.obolibrary.org/obo/IAO_0000115> "A conceptual model is an information content entity that specifies variables and relationships within a system boundary.",
+        <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/1952
+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: 
@@ -3747,6 +3763,7 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1978",
 
     SubClassOf: 
         <http://purl.obolibrary.org/obo/BFO_0000031>
+
 
 
 Class: OEO_00410009