Skip to content

Commit

Permalink
Merge pull request #1720 from OpenEnergyPlatform/feature-1672-edit-de…
Browse files Browse the repository at this point in the history
…finition-state-of-matter

make the definition of state of matter Aristotelian #1672
  • Loading branch information
viktorwichern authored Oct 16, 2023
2 parents 460bff5 + 0312ae8 commit ca5daea
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/
- acceptance (#1698)
- scenario projection comparison, model intercomparison study (#1711)
- person, organisational role, organisation (#1716)

- state of matter (#1720)

### Changed
- energy transformation (#1625)
Expand Down
9 changes: 7 additions & 2 deletions src/ontology/edits/oeo-physical.omn
Original file line number Diff line number Diff line change
Expand Up @@ -4149,7 +4149,8 @@ Class: OEO_00000395

Annotations:
OEO_00040001 "http://openenergy-platform.org/ontology/oeo/oeo-physical",
<http://purl.obolibrary.org/obo/IAO_0000115> "In physics, a state of matter is one of the distinct forms in which matter can exist. Four states of matter are observable in everyday life: solid, liquid, gas, and plasma. Many intermediate states are known to exist, such as liquid crystal, and some states only exist under extreme conditions",
<http://purl.obolibrary.org/obo/IAO_0000115> "A state of matter is a quality of a portion of matter that describes the distinct physical form in which the matter exists."@en,
<http://purl.obolibrary.org/obo/IAO_0000116> "Four states of matter are observable in everyday life: solid, liquid, gas, and plasma. Many intermediate states are known to exist, such as liquid crystal, and some states only exist under extreme conditions."@en,
<http://purl.obolibrary.org/obo/IAO_0000119> "https://en.wikipedia.org/w/index.php?title=State_of_matter&oldid=903680856",
<http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/38
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/39
Expand All @@ -4164,7 +4165,11 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1390

rework module structure
issue: https://github.com/OpenEnergyPlatform/ontology/issues/1592
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1652",
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1652

make definition aristotelian
issue: https://github.com/OpenEnergyPlatform/ontology/issues/1672
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1720",
rdfs:label "state of matter"

SubClassOf:
Expand Down

0 comments on commit ca5daea

Please sign in to comment.