Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

restructure Generator and ArtificialObject classes #273

Merged
merged 45 commits into from
Mar 31, 2020
Merged

restructure Generator and ArtificialObject classes #273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
bfeb943
implement outer structure
akleinau Mar 5, 2020
96effe5
add defs to generators etc
akleinau Mar 5, 2020
81aac05
reorder generators and powerplants
akleinau Mar 5, 2020
8f13544
delete Technology subclasses
akleinau Mar 5, 2020
4a3644c
merge ElectricityGenerator and ElectromotiveGenerator
akleinau Mar 5, 2020
b499f41
Update CHANGELOG.md
akleinau Mar 5, 2020
1f11713
delete reactivePowerplant
akleinau Mar 6, 2020
b8aefcd
rename FieldPhotovoltaicGenerator to SolarPark
akleinau Mar 6, 2020
09dba41
add PowerUnit subclasses
akleinau Mar 9, 2020
152eb4f
update and unify Powerplant definitions
akleinau Mar 9, 2020
7ecf240
restructure generator and add 'has part' relations
akleinau Mar 9, 2020
68bd998
take hydroGenerator out of the hierarchy to discuss it later
akleinau Mar 9, 2020
7798edb
restructure Generator class
akleinau Mar 12, 2020
4ac0747
add term tracker item
akleinau Mar 12, 2020
f6beed1
rename HeatGenerator
akleinau Mar 13, 2020
2c2bdb8
change solarThermalCollector, turbine defs
akleinau Mar 16, 2020
3922cc5
add definitions to Heater, FuelCell
akleinau Mar 16, 2020
9f73852
add PowerGeneratingUnit definitions
akleinau Mar 16, 2020
e734868
update definitions of turbine, heatpump, electricheatpump
akleinau Mar 16, 2020
a10111f
Update CHANGELOG.md
akleinau Mar 16, 2020
27a7e91
add missing definitions
akleinau Mar 17, 2020
72cd2dc
Merge branch 'dev' into feature/Generator-#173
akleinau Mar 23, 2020
3fc8ad8
fix merge errors
akleinau Mar 23, 2020
0dcb94d
fix merge errors #2
akleinau Mar 23, 2020
112ebcd
fix merge errors #3
akleinau Mar 23, 2020
e94fdd0
add relations between power unit and fuel
akleinau Mar 23, 2020
f40d5a5
update heatpump definition
akleinau Mar 23, 2020
ae0c7ee
rename EnergyTransformer to EnergyConvertingDevice
akleinau Mar 23, 2020
697be52
Update src/ontology/edits/oeo-physical.omn
l-emele Mar 23, 2020
c3338dd
Update src/ontology/edits/oeo-physical.omn
l-emele Mar 23, 2020
f10cc4a
Update src/ontology/edits/oeo-physical.omn
l-emele Mar 23, 2020
7b3308e
change def of hydrogenpowerunit
akleinau Mar 24, 2020
af52151
update SolarThermalPowerUnit
akleinau Mar 24, 2020
2b64f65
delete BiomassPowerUnit and update GasFiredPowerUnit
akleinau Mar 24, 2020
1e6aad3
delete fuel doubles in defs
akleinau Mar 24, 2020
18a39d1
update Powerplant defs
akleinau Mar 24, 2020
487b9b7
Apply suggestions from code review
akleinau Mar 26, 2020
e2de87f
rename WindEnergyConverter and Solarpark
akleinau Mar 26, 2020
1e9a87b
Update src/ontology/edits/oeo-physical.omn
l-emele Mar 30, 2020
45b6bc0
Update src/ontology/edits/oeo-physical.omn
l-emele Mar 30, 2020
dd9f96e
Update src/ontology/edits/oeo-physical.omn
l-emele Mar 30, 2020
4546877
Update src/ontology/edits/oeo-physical.omn
l-emele Mar 30, 2020
2f96b7e
add 'has physical output' to EnergyConvertingDevice subclasses
akleinau Mar 30, 2020
ab72b0e
add suggestions from code review
akleinau Mar 30, 2020
90424a1
make EnergyConvertingDevice subclasses disjoint
akleinau Mar 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ Here is a template for new release sections
- unify -Energy and -Power classes (#225)
- ModelElement and subbclasses
- update issue templates 'workflow checklist' (#258)
- Generator (#273)
- EnergyStorage (#276)


Expand Down
1 change: 1 addition & 0 deletions src/ontology/catalog-v001.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,6 @@
<uri id="Automatically generated entry, Timestamp=1583227122675" name="http://open-energy-ontology.org/ontology/imports/iao-module.owl" uri="imports/iao-module.owl"/>
<uri id="Automatically generated entry, Timestamp=1583227122675" name="http://open-energy-ontology.org/ontology/imports/ro-module.owl" uri="imports/ro-module.owl"/>
<uri id="Automatically generated entry, Timestamp=1583227122675" name="http://purl.obolibrary.org/obo/uo.owl" uri="imports/uo-module.owl"/>

</group>
</catalog>
Loading