From bfeb9439c29809c063d7417e781ac875ca9508f5 Mon Sep 17 00:00:00 2001 From: akleinau <56925445+akleinau@users.noreply.github.com> Date: Thu, 5 Mar 2020 11:08:03 +0100 Subject: [PATCH 01/44] implement outer structure implement - EnergyTransformer - PowerGneratingUnit - Powerplant --- src/ontology/catalog-v001.xml | 6 ++-- src/ontology/edits/oeo-physical.omn | 46 ++++++++++++++++++----------- 2 files changed, 33 insertions(+), 19 deletions(-) diff --git a/src/ontology/catalog-v001.xml b/src/ontology/catalog-v001.xml index 8825051ed..06018902d 100644 --- a/src/ontology/catalog-v001.xml +++ b/src/ontology/catalog-v001.xml @@ -8,7 +8,9 @@ - - + + + + diff --git a/src/ontology/edits/oeo-physical.omn b/src/ontology/edits/oeo-physical.omn index 02e642cb7..b8993af15 100644 --- a/src/ontology/edits/oeo-physical.omn +++ b/src/ontology/edits/oeo-physical.omn @@ -13,8 +13,8 @@ Prefix: xsd: Ontology: -Import: Import: +Import: Import: Import: @@ -270,6 +270,15 @@ Class: Energy +Class: + + Annotations: + rdfs:comment "rename later to EnergyConverter" + + SubClassOf: + ArtificialObject + + Class: Annotations: @@ -321,6 +330,12 @@ Class: has_origin value +Class: + + SubClassOf: + ArtificialObject + + Class: EquivalentTo: @@ -1044,7 +1059,7 @@ Class: FossilGeneratorTechnology Class: FossilePowerplant SubClassOf: - PowerGeneratingUnit + Class: Fusion @@ -1096,7 +1111,7 @@ Class: Generator Source: https://en.wikipedia.org/wiki/Electric_generator"@en SubClassOf: - ArtificialObject, + , uses some EnergyCarrier, uses some EnergyGeneratorTechnology @@ -1289,7 +1304,7 @@ Class: HydroEnergy Class: HydroPowerplant SubClassOf: - ArtificialObject + Class: HydroelectricPowerplant @@ -1298,7 +1313,7 @@ Class: HydroelectricPowerplant "A hydroelectric powerplant uses water to generate electricity."@en SubClassOf: - PowerGeneratingUnit, + , some WaterTurbine @@ -1446,7 +1461,7 @@ Class: InstalledPowerQuantity Class: InternalCombustion SubClassOf: - EnergyGeneratorTechnology + ArtificialObject Class: InternalCombustionVehicle @@ -1707,7 +1722,7 @@ Class: Ocean Class: OceanPowerplant SubClassOf: - ArtificialObject + HydroPowerplant Class: OffShoreWindElectricityGenerator @@ -1777,7 +1792,7 @@ Class: PVPanel "https://en.wikipedia.org/w/index.php?title=Solar_panel&oldid=906976047"@en SubClassOf: - EnergyGeneratorTechnology, + Generator, has_physical_output some Power, has_physical_input only SolarPhotovoltaic @@ -1820,7 +1835,7 @@ Class: PhotovoltaicElectricityGenerator "A photovoltaic electricity generator is a renewable energy generator that uses power from the sun to generate electricity."@en SubClassOf: - RenewableGeneratorTechnology + Generator Class: PhotovoltaicGenerator @@ -2416,7 +2431,7 @@ Source: https://en.wikipedia.org/wiki/Power_(physics)"@en Class: PowerGeneratingUnit SubClassOf: - NetworkNode, + ArtificialObject, uses some EnergyGeneratorTechnology, uses some EnergyStorageTechnology, uses some EnergyTransferTechnology @@ -2488,14 +2503,14 @@ Class: Rail Class: ReactivePowerplant SubClassOf: - PowerGeneratingUnit, + , some Turbine Class: RegenerativePowerplant SubClassOf: - PowerGeneratingUnit, + , some WindTurbine @@ -2652,7 +2667,7 @@ Class: SolarPowerPlant "https://en.wikipedia.org/w/index.php?title=Solar_power&oldid=904827092"@en SubClassOf: - PowerGeneratingUnit, + , Turbine or ( some PVPanel) @@ -2858,7 +2873,7 @@ Class: Turbine "https://en.wikipedia.org/w/index.php?title=Turbine&oldid=905470312" SubClassOf: - EnergyGenerator + Class: UndergroundHydrogenStorage @@ -3320,9 +3335,6 @@ DisjointClasses: DisjointClasses: BiomassPowerplant,CoalPowerplant,GasPowerplant,GeothermalGenerator,HydroPowerplant,NuclearPowerplant,OceanPowerplant,OilPowerplant,PhotovoltaicGenerator,WastePowerplant,WindTurbine -DisjointClasses: - Bus,Generator,PowerGeneratingUnit,ShuntImpedance,StorageUnit,Subgrid,Transformer - DisjointClasses: CoalElectricityGenerator,NaturalGasGenerator,NuclearPowerGenerator,OilElectricityGenerator From 96effe5379e44ffb26a7b9b84c12b6c115c8b4a9 Mon Sep 17 00:00:00 2001 From: akleinau <56925445+akleinau@users.noreply.github.com> Date: Thu, 5 Mar 2020 11:24:46 +0100 Subject: [PATCH 02/44] add defs to generators etc --- src/ontology/edits/oeo-physical.omn | 63 ++++++++++++++++++++--------- 1 file changed, 43 insertions(+), 20 deletions(-) diff --git a/src/ontology/edits/oeo-physical.omn b/src/ontology/edits/oeo-physical.omn index b8993af15..b3abce615 100644 --- a/src/ontology/edits/oeo-physical.omn +++ b/src/ontology/edits/oeo-physical.omn @@ -270,6 +270,15 @@ Class: Energy +Class: + + Annotations: + "An ElectroMotiveGenerator is a Generator that converts kinetic energy into electric energy." + + SubClassOf: + Generator + + Class: Annotations: @@ -309,6 +318,12 @@ Class: +Class: + + SubClassOf: + PowerGeneratingUnit + + Class: Annotations: @@ -318,6 +333,15 @@ Class: EnergyCarrier +Class: + + Annotations: + "A PVCell is a generator that converts light into electrical energy." + + SubClassOf: + Generator + + Class: Annotations: @@ -332,6 +356,9 @@ Class: Class: + Annotations: + "A Powerplant is an aggregate of EnergyConverters that is connected to an electric grid." + SubClassOf: ArtificialObject @@ -364,6 +391,14 @@ Class: +Class: + + SubClassOf: + PowerGeneratingUnit, + some , + some Turbine + + Class: @@ -1080,7 +1115,7 @@ Class: GasPowerplant SubClassOf: FossilePowerplant, - some GasTurbine + some Class: GasTurbine @@ -1467,7 +1502,7 @@ Class: InternalCombustion Class: InternalCombustionVehicle SubClassOf: - Generator + ArtificialObject Class: Land @@ -1792,8 +1827,9 @@ Class: PVPanel "https://en.wikipedia.org/w/index.php?title=Solar_panel&oldid=906976047"@en SubClassOf: - Generator, + PowerGeneratingUnit, has_physical_output some Power, + some , has_physical_input only SolarPhotovoltaic @@ -1838,13 +1874,6 @@ Class: PhotovoltaicElectricityGenerator Generator -Class: PhotovoltaicGenerator - - SubClassOf: - Generator, - uses some SolarEnergy - - Class: PhotovoltaicPowerplant Annotations: @@ -2432,9 +2461,7 @@ Class: PowerGeneratingUnit SubClassOf: ArtificialObject, - uses some EnergyGeneratorTechnology, - uses some EnergyStorageTechnology, - uses some EnergyTransferTechnology + some Generator Class: PowerPlantData @@ -3010,12 +3037,11 @@ Class: WindEnergy Class: WindFarm Annotations: - "A wind farm uses wind turbines and and wind to generate renewable energy."@en, - "https://en.wikipedia.org/w/index.php?title=Wind_turbine&oldid=867838943" + "A wind farm is an aggregate of WindEnergyConverter that are connected to electricity."@en SubClassOf: RegenerativePowerplant, - some WindTurbine + some Class: WindOffshore @@ -3031,7 +3057,7 @@ Class: WindOnshore "Onshore wind power is the complement to Offshore wind power. It is harvested on land."@en SubClassOf: - RegenerativePowerplant, + ArtificialObject, some WindTurbine @@ -3332,9 +3358,6 @@ Individual: synthetic DisjointClasses: BioElectricityGenerator,PhotovoltaicElectricityGenerator,WaterElectricityGenerator,WindElectricityGenerator -DisjointClasses: - BiomassPowerplant,CoalPowerplant,GasPowerplant,GeothermalGenerator,HydroPowerplant,NuclearPowerplant,OceanPowerplant,OilPowerplant,PhotovoltaicGenerator,WastePowerplant,WindTurbine - DisjointClasses: CoalElectricityGenerator,NaturalGasGenerator,NuclearPowerGenerator,OilElectricityGenerator From 81aac05e13a91ccb8c5b17de76cbd3b1971db6c8 Mon Sep 17 00:00:00 2001 From: akleinau <56925445+akleinau@users.noreply.github.com> Date: Thu, 5 Mar 2020 11:58:38 +0100 Subject: [PATCH 03/44] reorder generators and powerplants --- src/ontology/edits/oeo-physical.omn | 67 ++++++++--------------------- 1 file changed, 18 insertions(+), 49 deletions(-) diff --git a/src/ontology/edits/oeo-physical.omn b/src/ontology/edits/oeo-physical.omn index b3abce615..c1987c4e8 100644 --- a/src/ontology/edits/oeo-physical.omn +++ b/src/ontology/edits/oeo-physical.omn @@ -336,10 +336,10 @@ Class: Class: Annotations: - "A PVCell is a generator that converts light into electrical energy." + "A PVCell is a RenewableGenerator that converts light into electrical energy." SubClassOf: - Generator + RenewableGenerator Class: @@ -948,12 +948,6 @@ Class: EnergyFromElectricityInTraffic EnergyCarrierQuantity -Class: EnergyGenerator - - SubClassOf: - Generator - - Class: EnergyGeneratorTechnology Annotations: @@ -1015,13 +1009,13 @@ Class: FederalState Class: FieldPhotovoltaicGenerator Annotations: - "A field photovoltaic electricity generator is a photovoltaic electricity generator that is installed out in the open on the ground."@en + "A field photovoltaic electricity powerplant is a PhotovoltaicPowerplant that is installed out in the open on the ground."@en SubClassOf: - PhotovoltaicElectricityGenerator + PhotovoltaicPowerplant DisjointWith: - RooftopPhotovoltaicGenerator + RooftopPhotovoltaicPowerplant Class: Fission @@ -1760,16 +1754,16 @@ Class: OceanPowerplant HydroPowerplant -Class: OffShoreWindElectricityGenerator +Class: OffShoreWindFarm Annotations: "An off shore wind electricity generator is a wind electricity generator that is build off shore above or in the ocean."@en SubClassOf: - WindElectricityGenerator + WindFarm DisjointWith: - OnShoreWindElectricityGenerator + OnShoreWindFarm Class: Office @@ -1794,16 +1788,16 @@ Class: OilPowerplant some SteamTurbine -Class: OnShoreWindElectricityGenerator +Class: OnShoreWindFarm Annotations: "An on shore wind electricity generator is a wind electricity generator that is build on land."@en SubClassOf: - WindElectricityGenerator + WindFarm DisjointWith: - OffShoreWindElectricityGenerator + OffShoreWindFarm Class: PFC @@ -1865,19 +1859,10 @@ Class: Perfluorocarbon FluorinatedGreenhouseGas -Class: PhotovoltaicElectricityGenerator - - Annotations: - "A photovoltaic electricity generator is a renewable energy generator that uses power from the sun to generate electricity."@en - - SubClassOf: - Generator - - Class: PhotovoltaicPowerplant Annotations: - "A photovoltaic generator uses PVPanels and solar energy to generate electricity."@en + "A PhotovoltaicPowerplant is a Powerplant having an aggregate of PVPanels as its PowerGeneratingUnits."@en SubClassOf: SolarPowerPlant, @@ -2595,13 +2580,13 @@ Class: Retail CommericalDemand -Class: RooftopPhotovoltaicGenerator +Class: RooftopPhotovoltaicPowerplant Annotations: - "A rooftop photovoltaic electricity generator is a photovoltaic electricity generator that is installed on top of the roof of a building."@en + "A rooftop photovoltaic electricity powerplant is a photovoltaic powerplant that is installed on top of the roof of a building."@en SubClassOf: - PhotovoltaicElectricityGenerator + PhotovoltaicPowerplant DisjointWith: FieldPhotovoltaicGenerator @@ -2694,7 +2679,7 @@ Class: SolarPowerPlant "https://en.wikipedia.org/w/index.php?title=Solar_power&oldid=904827092"@en SubClassOf: - , + RegenerativePowerplant, Turbine or ( some PVPanel) @@ -2705,7 +2690,7 @@ Class: SolarThermalCollector "https://en.wikipedia.org/w/index.php?title=Solar_thermal_collector&oldid=903948846"@en SubClassOf: - EnergyGenerator, + Generator, has_physical_output some Power, has_physical_input only SolarThermalHeat @@ -2841,7 +2826,7 @@ Class: TidalStreamGenerator "A tidal stream generator uses tidal movement, wave motion or water current for electricity generation."@en SubClassOf: - EnergyGenerator, + Generator, has_physical_output some Power, has_physical_input only TideWaveOcean @@ -3051,16 +3036,6 @@ Class: WindOffshore some Sea -Class: WindOnshore - - Annotations: - "Onshore wind power is the complement to Offshore wind power. It is harvested on land."@en - - SubClassOf: - ArtificialObject, - some WindTurbine - - Class: WindTurbine Annotations: @@ -3355,15 +3330,9 @@ Individual: synthetic has_origin some origin -DisjointClasses: - BioElectricityGenerator,PhotovoltaicElectricityGenerator,WaterElectricityGenerator,WindElectricityGenerator - DisjointClasses: CoalElectricityGenerator,NaturalGasGenerator,NuclearPowerGenerator,OilElectricityGenerator -DisjointClasses: - ElectricityGenerator,EnergyGenerator,EnergyStorage,EnergyTransfer,HeatGenerator - DisjointClasses: ElectricityGeneratorTechnology,EnergyStorageTechnology,EnergyTransferTechnology From 8f1354411be00ad02953f28b2b0cb2b163756b27 Mon Sep 17 00:00:00 2001 From: akleinau <56925445+akleinau@users.noreply.github.com> Date: Thu, 5 Mar 2020 12:00:00 +0100 Subject: [PATCH 04/44] delete Technology subclasses delete all Technology subclasses with -Technology suffix, the rest already got moved to ArtificialObject. --- src/ontology/edits/oeo-physical.omn | 96 ++--------------------------- 1 file changed, 4 insertions(+), 92 deletions(-) diff --git a/src/ontology/edits/oeo-physical.omn b/src/ontology/edits/oeo-physical.omn index c1987c4e8..d9a381b34 100644 --- a/src/ontology/edits/oeo-physical.omn +++ b/src/ontology/edits/oeo-physical.omn @@ -152,9 +152,6 @@ ObjectProperty: has_physical_input Irreflexive, Asymmetric - Domain: - EnergyGeneratorTechnology - Range: some EnergyCarrier @@ -820,17 +817,7 @@ Class: ElectricityExport Class: ElectricityGenerator SubClassOf: - Generator, - applies_technology some ElectricityGeneratorTechnology - - -Class: ElectricityGeneratorTechnology - - Annotations: - "An electricity generator technology is an technology used to transform energy from some source into electricity."@en - - SubClassOf: - EnergyGeneratorTechnology + Generator Class: ElectricityGrid @@ -948,17 +935,6 @@ Class: EnergyFromElectricityInTraffic EnergyCarrierQuantity -Class: EnergyGeneratorTechnology - - Annotations: - "An energy generator technology is an technology used to transform energy into a form such that it is useable."@en - - SubClassOf: - Technology, - has_physical_input some ( some EnergyCarrier), - has_physical_output some Power - - Class: EnergyProduction SubClassOf: @@ -968,33 +944,13 @@ Class: EnergyProduction Class: EnergyStorage SubClassOf: - ArtificialObject, - applies_technology some EnergyStorageTechnology - - -Class: EnergyStorageTechnology - - Annotations: - "An energy storage technology is a technology used for storing energy."@en - - SubClassOf: - Technology + ArtificialObject Class: EnergyTransfer SubClassOf: - ArtificialObject, - applies_technology some EnergyTransferTechnology - - -Class: EnergyTransferTechnology - - Annotations: - "An energy transfer technology is a technology used to transport energy or a carrier of energy."@en - - SubClassOf: - Technology + ArtificialObject Class: FederalState @@ -1073,18 +1029,6 @@ Class: FossilGenerator RenewableGenerator -Class: FossilGeneratorTechnology - - Annotations: - "A fossil electricity generator technology is an electricity generator techonolgy that uses fossil fuels such as oil, coal and natural gas to generate electricity."@en - - SubClassOf: - ElectricityGeneratorTechnology - - DisjointWith: - RenewableGeneratorTechnology - - Class: FossilePowerplant SubClassOf: @@ -1141,8 +1085,7 @@ Source: https://en.wikipedia.org/wiki/Electric_generator"@en SubClassOf: , - uses some EnergyCarrier, - uses some EnergyGeneratorTechnology + uses some EnergyCarrier DisjointWith: Line @@ -1302,15 +1245,6 @@ Class: HeatGenerator Generator -Class: HeatGeneratorTechnology - - Annotations: - "A heat generator technology is an technology used to transform energy from some source into heat."@en - - SubClassOf: - EnergyGeneratorTechnology - - Class: HeatPumpHeatGenerator Annotations: @@ -2535,18 +2469,6 @@ Class: RenewableGenerator FossilGenerator -Class: RenewableGeneratorTechnology - - Annotations: - "A renewable electricity generator technology is an electricity generator techonolgy that uses resources that are practically unlimited or regenerate quickly to generate electricity."@en - - SubClassOf: - ElectricityGeneratorTechnology - - DisjointWith: - FossilGeneratorTechnology - - Class: RenewableMunicipalWasteFuel Annotations: @@ -2761,7 +2683,6 @@ Class: StorageUnit SubClassOf: ElectricityGridComponent, - uses some EnergyStorageTechnology, some ElectricityGrid @@ -3333,15 +3254,6 @@ Individual: synthetic DisjointClasses: CoalElectricityGenerator,NaturalGasGenerator,NuclearPowerGenerator,OilElectricityGenerator -DisjointClasses: - ElectricityGeneratorTechnology,EnergyStorageTechnology,EnergyTransferTechnology - -DisjointClasses: - ElectricityGeneratorTechnology,EnergyStorageTechnology,EnergyTransferTechnology,HeatGeneratorTechnology - -DisjointClasses: - EnergyGeneratorTechnology,EnergyStorageTechnology,EnergyTransferTechnology - DisjointClasses: Generator,ShuntImpedance,StorageUnit,Subgrid,Transformer From 4a3644c4636192439f0c82048c4d0c3730c11654 Mon Sep 17 00:00:00 2001 From: akleinau <56925445+akleinau@users.noreply.github.com> Date: Thu, 5 Mar 2020 12:06:37 +0100 Subject: [PATCH 05/44] merge ElectricityGenerator and ElectromotiveGenerator --- src/ontology/edits/oeo-physical.omn | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/src/ontology/edits/oeo-physical.omn b/src/ontology/edits/oeo-physical.omn index d9a381b34..33887769e 100644 --- a/src/ontology/edits/oeo-physical.omn +++ b/src/ontology/edits/oeo-physical.omn @@ -814,12 +814,6 @@ Class: ElectricityExport Quantity -Class: ElectricityGenerator - - SubClassOf: - Generator - - Class: ElectricityGrid Annotations: @@ -1023,7 +1017,7 @@ There are four types: hydrofluorocarbons (HFCs), perfluorocarbons (PFCs), sulfur Class: FossilGenerator SubClassOf: - ElectricityGenerator + DisjointWith: RenewableGenerator @@ -1074,7 +1068,7 @@ Class: GasTurbineGenerator "A gas turbine generator is a electricity generator that uses hot or high pressure gas to produce electricity."@en SubClassOf: - ElectricityGenerator + Class: Generator @@ -2463,7 +2457,7 @@ Class: RegenerativePowerplant Class: RenewableGenerator SubClassOf: - ElectricityGenerator + DisjointWith: FossilGenerator @@ -2747,7 +2741,7 @@ Class: TidalStreamGenerator "A tidal stream generator uses tidal movement, wave motion or water current for electricity generation."@en SubClassOf: - Generator, + WaterElectricityGenerator, has_physical_output some Power, has_physical_input only TideWaveOcean @@ -2950,13 +2944,6 @@ Class: WindFarm some -Class: WindOffshore - - SubClassOf: - WindTurbine, - some Sea - - Class: WindTurbine Annotations: From b499f41da0ecee3158308e193035b4577d6e708f Mon Sep 17 00:00:00 2001 From: akleinau <56925445+akleinau@users.noreply.github.com> Date: Thu, 5 Mar 2020 12:16:27 +0100 Subject: [PATCH 06/44] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 29428bdec..2ea6268f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 (#179) ### Removed From 1f117138417384bb09331dfb64a493601549fddb Mon Sep 17 00:00:00 2001 From: akleinau <56925445+akleinau@users.noreply.github.com> Date: Fri, 6 Mar 2020 12:35:34 +0100 Subject: [PATCH 07/44] delete reactivePowerplant --- src/ontology/edits/oeo-physical.omn | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/src/ontology/edits/oeo-physical.omn b/src/ontology/edits/oeo-physical.omn index 33887769e..965e6b4e7 100644 --- a/src/ontology/edits/oeo-physical.omn +++ b/src/ontology/edits/oeo-physical.omn @@ -315,7 +315,7 @@ Class: -Class: +Class: SubClassOf: PowerGeneratingUnit @@ -390,6 +390,9 @@ Class: Class: + Annotations: + rdfs:comment "A WindEnergyConverter is the PowerGeneratingUnit that uses wind energy." + SubClassOf: PowerGeneratingUnit, some , @@ -941,12 +944,6 @@ Class: EnergyStorage ArtificialObject -Class: EnergyTransfer - - SubClassOf: - ArtificialObject - - Class: FederalState Annotations: @@ -1047,7 +1044,7 @@ Class: GasPowerplant SubClassOf: FossilePowerplant, - some + some Class: GasTurbine @@ -1260,6 +1257,9 @@ Class: HydroEnergy Class: HydroPowerplant + Annotations: + rdfs:comment "will be discussed later" + SubClassOf: @@ -1270,7 +1270,7 @@ Class: HydroelectricPowerplant "A hydroelectric powerplant uses water to generate electricity."@en SubClassOf: - , + HydroPowerplant, some WaterTurbine @@ -1303,7 +1303,7 @@ Class: HydrogenPowerplant "A hydrogen powerplant uses hydrogen to generate electricity."@en SubClassOf: - ReactivePowerplant, + , some HydrogenTurbine @@ -1663,7 +1663,7 @@ Class: NuclearPowerplant "https://en.wikipedia.org/w/index.php?title=Nuclear_power_plant&oldid=867102016" SubClassOf: - ReactivePowerplant, + , some SteamTurbine @@ -2440,13 +2440,6 @@ Class: Rail TransportDemand -Class: ReactivePowerplant - - SubClassOf: - , - some Turbine - - Class: RegenerativePowerplant SubClassOf: From b8aefcd3d95e2065a918a51df0133e1b3d34c3a5 Mon Sep 17 00:00:00 2001 From: akleinau <56925445+akleinau@users.noreply.github.com> Date: Fri, 6 Mar 2020 12:59:28 +0100 Subject: [PATCH 08/44] rename FieldPhotovoltaicGenerator to SolarPark --- src/ontology/edits/oeo-physical.omn | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/ontology/edits/oeo-physical.omn b/src/ontology/edits/oeo-physical.omn index 965e6b4e7..6ba821a61 100644 --- a/src/ontology/edits/oeo-physical.omn +++ b/src/ontology/edits/oeo-physical.omn @@ -953,18 +953,6 @@ Class: FederalState Land -Class: FieldPhotovoltaicGenerator - - Annotations: - "A field photovoltaic electricity powerplant is a PhotovoltaicPowerplant that is installed out in the open on the ground."@en - - SubClassOf: - PhotovoltaicPowerplant - - DisjointWith: - RooftopPhotovoltaicPowerplant - - Class: Fission Annotations: @@ -2498,7 +2486,7 @@ Class: RooftopPhotovoltaicPowerplant PhotovoltaicPowerplant DisjointWith: - FieldPhotovoltaicGenerator + SolarPark Class: RunOfRiverElectricityGenerator @@ -2571,6 +2559,18 @@ Class: SolarEnergy some +Class: SolarPark + + Annotations: + "A solar park (also: solar farm, field photovoltaic electricity powerplant) is a PhotovoltaicPowerplant that is installed out in the open on the ground."@en + + SubClassOf: + PhotovoltaicPowerplant + + DisjointWith: + RooftopPhotovoltaicPowerplant + + Class: SolarPhotovoltaic Annotations: From 09dba41231b01b3d2cfe8d7af8607f437481ec4f Mon Sep 17 00:00:00 2001 From: akleinau <56925445+akleinau@users.noreply.github.com> Date: Mon, 9 Mar 2020 11:58:40 +0100 Subject: [PATCH 09/44] add PowerUnit subclasses - add PowerUnits for all Perplant classes - add 'has part' relations --- src/ontology/edits/oeo-physical.omn | 116 +++++++++++++++++++++++++--- 1 file changed, 106 insertions(+), 10 deletions(-) diff --git a/src/ontology/edits/oeo-physical.omn b/src/ontology/edits/oeo-physical.omn index 6ba821a61..6ea32b993 100644 --- a/src/ontology/edits/oeo-physical.omn +++ b/src/ontology/edits/oeo-physical.omn @@ -258,6 +258,12 @@ ObjectProperty: uses is_used_by +Class: + + SubClassOf: + + + Class: Annotations: @@ -267,6 +273,12 @@ Class: Energy +Class: + + SubClassOf: + + + Class: Annotations: @@ -315,12 +327,48 @@ Class: +Class: + + SubClassOf: + PowerGeneratingUnit + + Class: + SubClassOf: + + + +Class: + + SubClassOf: + + + +Class: + + SubClassOf: + + + +Class: + SubClassOf: PowerGeneratingUnit +Class: + + SubClassOf: + PowerGeneratingUnit + + +Class: + + SubClassOf: + + + Class: Annotations: @@ -330,6 +378,18 @@ Class: EnergyCarrier +Class: + + SubClassOf: + PowerGeneratingUnit + + +Class: + + SubClassOf: + + + Class: Annotations: @@ -360,6 +420,12 @@ Class: ArtificialObject +Class: + + SubClassOf: + PowerGeneratingUnit + + Class: EquivalentTo: @@ -370,6 +436,18 @@ Class: + + SubClassOf: + + + +Class: + + SubClassOf: + + + Class: Annotations: @@ -379,6 +457,12 @@ Class: +Class: + + SubClassOf: + + + Class: Annotations: @@ -394,7 +478,7 @@ Class: , some , some Turbine @@ -603,6 +687,7 @@ Class: BiomassPowerplant SubClassOf: RegenerativePowerplant, + some , some SteamTurbine @@ -660,6 +745,7 @@ Class: CoalPowerplant SubClassOf: FossilePowerplant, + some , some SteamTurbine @@ -1011,7 +1097,8 @@ Class: FossilGenerator Class: FossilePowerplant SubClassOf: - + , + some Class: Fusion @@ -1091,7 +1178,7 @@ Class: GeothermalGenerator "A geothermal generator uses geothermal energy to generate electricity." SubClassOf: - Generator, + RenewableGenerator, uses some Heat @@ -1115,6 +1202,7 @@ Class: GeothermalPowerplant SubClassOf: RegenerativePowerplant, + some , some SteamTurbine @@ -1175,7 +1263,8 @@ Class: HardCoalPowerplant "A hard coal powerplant burns coal to generate electricity."@en SubClassOf: - CoalPowerplant + CoalPowerplant, + some Class: Hardware @@ -1249,7 +1338,8 @@ Class: HydroPowerplant rdfs:comment "will be discussed later" SubClassOf: - + , + some Class: HydroelectricPowerplant @@ -1292,6 +1382,7 @@ Class: HydrogenPowerplant SubClassOf: , + some , some HydrogenTurbine @@ -1437,7 +1528,8 @@ Class: LignitePowerplant "A lignite powerplant burns lignite to generate electricity."@en SubClassOf: - CoalPowerplant + CoalPowerplant, + some Class: Line @@ -1641,7 +1733,7 @@ Class: NuclearPowerGenerator "A nuclear generator technology is a fossil electricity generator that uses nuclear reactions to generate electricity."@en SubClassOf: - FossilGenerator + Generator Class: NuclearPowerplant @@ -1652,6 +1744,7 @@ Class: NuclearPowerplant SubClassOf: , + some , some SteamTurbine @@ -1701,6 +1794,7 @@ Class: OilPowerplant SubClassOf: FossilePowerplant, + some , some SteamTurbine @@ -1737,7 +1831,7 @@ Class: PVPanel "https://en.wikipedia.org/w/index.php?title=Solar_panel&oldid=906976047"@en SubClassOf: - PowerGeneratingUnit, + , has_physical_output some Power, some , has_physical_input only SolarPhotovoltaic @@ -2432,7 +2526,7 @@ Class: RegenerativePowerplant SubClassOf: , - some WindTurbine + some Class: RenewableGenerator @@ -2589,7 +2683,7 @@ Class: SolarPowerPlant SubClassOf: RegenerativePowerplant, - Turbine or ( some PVPanel) + some PVPanel Class: SolarThermalCollector @@ -2632,6 +2726,7 @@ Class: SolarThermalPowerplant SubClassOf: SolarPowerPlant, + some , some SteamTurbine @@ -2864,6 +2959,7 @@ Class: WastePowerplant SubClassOf: FossilePowerplant, + some , some SteamTurbine From 152eb4ffd4f723d0c73cc69a3407b60b11d59486 Mon Sep 17 00:00:00 2001 From: akleinau <56925445+akleinau@users.noreply.github.com> Date: Mon, 9 Mar 2020 12:11:46 +0100 Subject: [PATCH 10/44] update and unify Powerplant definitions --- src/ontology/edits/oeo-physical.omn | 80 +++++++++++++++-------------- 1 file changed, 42 insertions(+), 38 deletions(-) diff --git a/src/ontology/edits/oeo-physical.omn b/src/ontology/edits/oeo-physical.omn index 6ea32b993..1390c7b16 100644 --- a/src/ontology/edits/oeo-physical.omn +++ b/src/ontology/edits/oeo-physical.omn @@ -396,7 +396,7 @@ Class: "A PVCell is a RenewableGenerator that converts light into electrical energy." SubClassOf: - RenewableGenerator + RegenerativeGenerator Class: @@ -639,7 +639,7 @@ Class: BioElectricityGenerator "A bio electricity generator is a renewable energy generator that uses biomass or biogas to generate electricity."@en SubClassOf: - RenewableGenerator + RegenerativeGenerator Class: Biofuel @@ -683,7 +683,7 @@ Class: BiomassElectricityGenerator Class: BiomassPowerplant Annotations: - "A biomass powerplant uses biomass to generate electricity or heat."@en + "A BiomassPowerplant is a RegenerativePowerplant having an aggregate of BiomassPowerUnits as its PowerGeneratingUnits."@en SubClassOf: RegenerativePowerplant, @@ -734,14 +734,13 @@ Class: CoalElectricityGenerator "A coal electricity generator technology uses coal to generate electricity."@en SubClassOf: - FossilGenerator + FossileGenerator Class: CoalPowerplant Annotations: - "A coal-fired power station or coal power plant is a thermal power station which burns coal to generate electricity."@en, - "https://en.wikipedia.org/w/index.php?title=Coal-fired_power_station&oldid=905322370" + "A CoalPowerplant is a FossilePowerplant having an aggregate of CoalPowerUnits as its PowerGeneratingUnits."@en SubClassOf: FossilePowerplant, @@ -1085,17 +1084,20 @@ There are four types: hydrofluorocarbons (HFCs), perfluorocarbons (PFCs), sulfur some GreenhouseGas -Class: FossilGenerator +Class: FossileGenerator SubClassOf: DisjointWith: - RenewableGenerator + RegenerativeGenerator Class: FossilePowerplant + Annotations: + "A FossilePowerplant is a Powerplant having an aggregate of one kind of FossilePowerUnits as its PowerGeneratingUnits." + SubClassOf: , some @@ -1114,8 +1116,7 @@ Class: Fusion Class: GasPowerplant Annotations: - "A gas-fired power plant or gas-fired power station or natural gas power plant is a thermal power station which burns natural gas to generate electricity. Natural gas power stations generate a quarter of world electricity and a significant part of global greenhouse gas emissions and thus global warming."@en, - "https://en.wikipedia.org/w/index.php?title=Gas-fired_power_plant&oldid=905149105"@en + "A GasPowerplant is a FossilePowerplant having an aggregate of GasFiredPowerUnits as its PowerGeneratingUnits."@en SubClassOf: FossilePowerplant, @@ -1178,7 +1179,7 @@ Class: GeothermalGenerator "A geothermal generator uses geothermal energy to generate electricity." SubClassOf: - RenewableGenerator, + RegenerativeGenerator, uses some Heat @@ -1198,7 +1199,7 @@ Class: GeothermalHeat Class: GeothermalPowerplant Annotations: - "A geothermal generator uses geothermal energy to generate electricity."@en + "A GeothermalPowerplant is a RegenerativePowerplant having an aggregate of GeothermalPowerUnits as its PowerGeneratingUnits."@en SubClassOf: RegenerativePowerplant, @@ -1260,7 +1261,7 @@ Class: HFC Class: HardCoalPowerplant Annotations: - "A hard coal powerplant burns coal to generate electricity."@en + "A HardCoalPowerplant is a CoalPowerplant having an aggregate of HardCoalPowerUnits as its PowerGeneratingUnits."@en SubClassOf: CoalPowerplant, @@ -1378,7 +1379,7 @@ Class: Hydrofluorocarbon Class: HydrogenPowerplant Annotations: - "A hydrogen powerplant uses hydrogen to generate electricity."@en + "A HydrogenPowerplant is a Powerplant having an aggregate of HydrogenPowerUnits as its PowerGeneratingUnits."@en SubClassOf: , @@ -1525,7 +1526,7 @@ Class: Li-ionBattery Class: LignitePowerplant Annotations: - "A lignite powerplant burns lignite to generate electricity."@en + "A LignitePowerplant is a CoalPowerplant having an aggregate of LignitePowerUnits as its PowerGeneratingUnits."@en SubClassOf: CoalPowerplant, @@ -1656,7 +1657,7 @@ Class: NaturalGasGenerator "A natural gas electricity generator technology uses natural gas to generate electricity."@en SubClassOf: - FossilGenerator + FossileGenerator Class: NetworkNode @@ -1739,8 +1740,7 @@ Class: NuclearPowerGenerator Class: NuclearPowerplant Annotations: - "A nuclear power plant or nuclear power station is a thermal power station in which the heat source is a nuclear reactor. As it is typical of thermal power stations, heat is used to generate steam that drives a steam turbine connected to a generator that produces electricity.", - "https://en.wikipedia.org/w/index.php?title=Nuclear_power_plant&oldid=867102016" + "A NuclearPowerplant is a Powerplant having an aggregate of NuclearPowerUnits as its PowerGeneratingUnits." SubClassOf: , @@ -1766,7 +1766,7 @@ Class: OceanPowerplant Class: OffShoreWindFarm Annotations: - "An off shore wind electricity generator is a wind electricity generator that is build off shore above or in the ocean."@en + "An off shore wind electricity generator is a WindFarm that is build off shore above or in the ocean."@en SubClassOf: WindFarm @@ -1787,11 +1787,14 @@ Class: OilElectricityGenerator "A oil electricity generator technology uses oil to generate electricity."@en SubClassOf: - FossilGenerator + FossileGenerator Class: OilPowerplant + Annotations: + "An OilPowerplant is a FossilePowerplant having an aggregate of OilPowerUnits as its PowerGeneratingUnits." + SubClassOf: FossilePowerplant, some , @@ -1801,7 +1804,7 @@ Class: OilPowerplant Class: OnShoreWindFarm Annotations: - "An on shore wind electricity generator is a wind electricity generator that is build on land."@en + "An on shore wind electricity generator is a WindFarm that is build on land."@en SubClassOf: WindFarm @@ -1872,7 +1875,7 @@ Class: Perfluorocarbon Class: PhotovoltaicPowerplant Annotations: - "A PhotovoltaicPowerplant is a Powerplant having an aggregate of PVPanels as its PowerGeneratingUnits."@en + "A PhotovoltaicPowerplant is a RegenerativePowerplant having an aggregate of PVPanels as its PowerGeneratingUnits."@en SubClassOf: SolarPowerPlant, @@ -2522,20 +2525,23 @@ Class: Rail TransportDemand -Class: RegenerativePowerplant +Class: RegenerativeGenerator SubClassOf: - , - some + + + DisjointWith: + FossileGenerator -Class: RenewableGenerator +Class: RegenerativePowerplant - SubClassOf: - + Annotations: + rdfs:comment "A RegenerativePowerplant is a Powerplant having an aggregate of one kind of RegenerativePowerUnits as its PowerGeneratingUnits." - DisjointWith: - FossilGenerator + SubClassOf: + , + some Class: RenewableMunicipalWasteFuel @@ -2678,8 +2684,7 @@ Class: SolarPhotovoltaic Class: SolarPowerPlant Annotations: - "Solar power is the conversion of energy from sunlight into electricity, either directly using photovoltaics (PV), indirectly using concentrated solar power, or a combination. Concentrated solar power systems use lenses or mirrors and tracking systems to focus a large area of sunlight into a small beam. Photovoltaic cells convert light into an electric current using the photovoltaic effect."@en, - "https://en.wikipedia.org/w/index.php?title=Solar_power&oldid=904827092"@en + "A SolarPowerplant is a Powerplant having an aggregate of SolarPowerUnits as its PowerGeneratingUnits."@en SubClassOf: RegenerativePowerplant, @@ -2722,7 +2727,7 @@ Class: SolarThermalHeatGenerator Class: SolarThermalPowerplant Annotations: - "uses solar thermal energy to generate electrical energy"@en + "A SolarThermalPowerplant is a Powerplant consisting of SolarThermalPowerUnits."@en SubClassOf: SolarPowerPlant, @@ -2954,8 +2959,7 @@ Class: WasteFuel Class: WastePowerplant Annotations: - "A waste-to-energy plant is a waste management facility that combusts wastes to produce electricity. This type of power plant is sometimes called a trash-to-energy, municipal waste incineration, energy recovery, or resource recovery plant."@en, - "https://en.wikipedia.org/w/index.php?title=Waste-to-energy_plant&oldid=904634168" + "A WastePowerplant is a FossilePowerplant having an aggregate of WastePowerUnits as its PowerGeneratingUnits."@en SubClassOf: FossilePowerplant, @@ -2969,7 +2973,7 @@ Class: WaterElectricityGenerator "A water electricity generator is a renewable energy generator that uses power from water to generate electricity."@en SubClassOf: - RenewableGenerator + RegenerativeGenerator Class: WaterTurbine @@ -3007,7 +3011,7 @@ Class: WindElectricityGenerator "A wind electricity generator technology uses wind power to generate electricity."@en SubClassOf: - RenewableGenerator + RegenerativeGenerator Class: WindEnergy @@ -3026,7 +3030,7 @@ Class: WindEnergy Class: WindFarm Annotations: - "A wind farm is an aggregate of WindEnergyConverter that are connected to electricity."@en + "A WindFarm is a RegenerativePowerplant having an aggregate of WindEnergyConverters as its PowerGeneratingUnits."@en SubClassOf: RegenerativePowerplant, From 7ecf240add784cd60bfeb3878a6715fad9b2f359 Mon Sep 17 00:00:00 2001 From: akleinau <56925445+akleinau@users.noreply.github.com> Date: Mon, 9 Mar 2020 12:30:15 +0100 Subject: [PATCH 11/44] restructure generator and add 'has part' relations --- src/ontology/edits/oeo-physical.omn | 84 ++++++++++++++++++++--------- 1 file changed, 58 insertions(+), 26 deletions(-) diff --git a/src/ontology/edits/oeo-physical.omn b/src/ontology/edits/oeo-physical.omn index 1390c7b16..4b3c59d36 100644 --- a/src/ontology/edits/oeo-physical.omn +++ b/src/ontology/edits/oeo-physical.omn @@ -261,7 +261,8 @@ ObjectProperty: uses Class: SubClassOf: - + , + some BiomassElectricityGenerator Class: @@ -276,7 +277,8 @@ Class: Class: SubClassOf: - + , + some CoalElectricityGenerator Class: @@ -330,7 +332,8 @@ Class: SubClassOf: - PowerGeneratingUnit + PowerGeneratingUnit, + some FossileGenerator Class: @@ -342,7 +345,8 @@ Class: Class: SubClassOf: - + , + some GeothermalGenerator Class: @@ -351,16 +355,35 @@ Class: +Class: + + Annotations: + rdfs:comment "will be discussed later" + + SubClassOf: + + + Class: + Annotations: + rdfs:comment "will be discussed later" + SubClassOf: PowerGeneratingUnit +Class: + + SubClassOf: + Generator + + Class: SubClassOf: - PowerGeneratingUnit + PowerGeneratingUnit, + some Class: @@ -381,13 +404,15 @@ Class: Class: SubClassOf: - PowerGeneratingUnit + PowerGeneratingUnit, + some NuclearPowerGenerator Class: SubClassOf: - + , + some OilElectricityGenerator Class: @@ -396,7 +421,7 @@ Class: "A PVCell is a RenewableGenerator that converts light into electrical energy." SubClassOf: - RegenerativeGenerator + Class: @@ -423,7 +448,8 @@ Class: Class: SubClassOf: - PowerGeneratingUnit + PowerGeneratingUnit, + some RegenerativeGenerator Class: @@ -436,16 +462,24 @@ Class: + + SubClassOf: + RegenerativeGenerator + + Class: SubClassOf: - + , + some Class: SubClassOf: - + , + some SolarThermalHeatGenerator Class: @@ -457,10 +491,17 @@ Class: +Class: + + SubClassOf: + FossileGenerator + + Class: SubClassOf: - + , + some Class: @@ -479,8 +520,8 @@ Class: , - some , - some Turbine + some Turbine, + some WindElectricityGenerator Class: @@ -1135,15 +1176,6 @@ Class: GasTurbine has_physical_input only PortionOfNaturalGas -Class: GasTurbineGenerator - - Annotations: - "A gas turbine generator is a electricity generator that uses hot or high pressure gas to produce electricity."@en - - SubClassOf: - - - Class: Generator Annotations: @@ -2698,7 +2730,7 @@ Class: SolarThermalCollector "https://en.wikipedia.org/w/index.php?title=Solar_thermal_collector&oldid=903948846"@en SubClassOf: - Generator, + ArtificialObject, has_physical_output some Power, has_physical_input only SolarThermalHeat @@ -2721,7 +2753,7 @@ Class: SolarThermalHeatGenerator "A solar thermal heat generator is a heat generator that uses solar power to produce heat."@en SubClassOf: - HeatGenerator + Class: SolarThermalPowerplant @@ -2973,7 +3005,7 @@ Class: WaterElectricityGenerator "A water electricity generator is a renewable energy generator that uses power from water to generate electricity."@en SubClassOf: - RegenerativeGenerator + Class: WaterTurbine From 68bd99870d33fdf583766b93bbf93f34a70f897d Mon Sep 17 00:00:00 2001 From: akleinau <56925445+akleinau@users.noreply.github.com> Date: Mon, 9 Mar 2020 12:49:13 +0100 Subject: [PATCH 12/44] take hydroGenerator out of the hierarchy to discuss it later --- src/ontology/edits/oeo-physical.omn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ontology/edits/oeo-physical.omn b/src/ontology/edits/oeo-physical.omn index 4b3c59d36..6cb976024 100644 --- a/src/ontology/edits/oeo-physical.omn +++ b/src/ontology/edits/oeo-physical.omn @@ -361,7 +361,7 @@ Class: rdfs:comment "will be discussed later" SubClassOf: - + Generator Class: From 7798edbdb0d52a786298b7a24dd807cd1b730e7a Mon Sep 17 00:00:00 2001 From: akleinau <56925445+akleinau@users.noreply.github.com> Date: Thu, 12 Mar 2020 11:22:44 +0100 Subject: [PATCH 13/44] restructure Generator class - make Biomass, Biogass etc PowerPlants - restructure to subclasses: ElectromotiveGenerator, PVCell, FuelCell --- src/ontology/edits/oeo-physical.omn | 264 +++++++--------------------- src/ontology/oeo.omn | 5 +- 2 files changed, 61 insertions(+), 208 deletions(-) diff --git a/src/ontology/edits/oeo-physical.omn b/src/ontology/edits/oeo-physical.omn index 6cb976024..bbb0e8efc 100644 --- a/src/ontology/edits/oeo-physical.omn +++ b/src/ontology/edits/oeo-physical.omn @@ -258,11 +258,28 @@ ObjectProperty: uses is_used_by +Class: + + SubClassOf: + + + +Class: + + SubClassOf: + + + +Class: + + SubClassOf: + BiofuelPowerplant + + Class: SubClassOf: - , - some BiomassElectricityGenerator + Class: @@ -277,8 +294,7 @@ Class: Class: SubClassOf: - , - some CoalElectricityGenerator + Class: @@ -329,39 +345,34 @@ Class: -Class: +Class: SubClassOf: - PowerGeneratingUnit, - some FossileGenerator + PowerGeneratingUnit -Class: +Class: SubClassOf: - + Generator -Class: +Class: SubClassOf: - , - some GeothermalGenerator + -Class: +Class: SubClassOf: - + -Class: +Class: - Annotations: - rdfs:comment "will be discussed later" - SubClassOf: - Generator + Class: @@ -373,17 +384,10 @@ Class: PowerGeneratingUnit -Class: - - SubClassOf: - Generator - - Class: SubClassOf: - PowerGeneratingUnit, - some + PowerGeneratingUnit Class: @@ -404,15 +408,13 @@ Class: Class: SubClassOf: - PowerGeneratingUnit, - some NuclearPowerGenerator + PowerGeneratingUnit Class: SubClassOf: - , - some OilElectricityGenerator + Class: @@ -421,7 +423,7 @@ Class: "A PVCell is a RenewableGenerator that converts light into electrical energy." SubClassOf: - + Generator Class: @@ -448,8 +450,7 @@ Class: Class: SubClassOf: - PowerGeneratingUnit, - some RegenerativeGenerator + PowerGeneratingUnit Class: @@ -462,24 +463,28 @@ Class: +Class: SubClassOf: - RegenerativeGenerator + -Class: +Class: SubClassOf: - , - some + -Class: +Class: SubClassOf: - , - some SolarThermalHeatGenerator + + + +Class: + + SubClassOf: + BiomassPowerplant Class: @@ -491,17 +496,10 @@ Class: -Class: - - SubClassOf: - FossileGenerator - - Class: SubClassOf: - , - some + Class: @@ -520,8 +518,7 @@ Class: , - some Turbine, - some WindElectricityGenerator + some Turbine Class: @@ -674,15 +671,6 @@ Class: BatteryStorage MethanationGasStorage -Class: BioElectricityGenerator - - Annotations: - "A bio electricity generator is a renewable energy generator that uses biomass or biogas to generate electricity."@en - - SubClassOf: - RegenerativeGenerator - - Class: Biofuel Annotations: @@ -697,28 +685,10 @@ Biofuels can be derived directly from plants (i.e. energy crops), or indirectly has_origin value renewable -Class: BiogasElectricityGenerator - - Annotations: - "A biogas electricity generator is a bio energy generator that uses biogas to generate electricity."@en - - SubClassOf: - BioElectricityGenerator - - DisjointWith: - BiomassElectricityGenerator - - -Class: BiomassElectricityGenerator +Class: BiofuelPowerplant - Annotations: - "A biomass electricity generator is a bio energy generator that uses biomass to generate electricity."@en - SubClassOf: - BioElectricityGenerator - - DisjointWith: - BiogasElectricityGenerator + RegenerativePowerplant Class: BiomassPowerplant @@ -727,8 +697,8 @@ Class: BiomassPowerplant "A BiomassPowerplant is a RegenerativePowerplant having an aggregate of BiomassPowerUnits as its PowerGeneratingUnits."@en SubClassOf: - RegenerativePowerplant, - some , + BiofuelPowerplant, + some , some SteamTurbine @@ -769,22 +739,13 @@ Class: City Land -Class: CoalElectricityGenerator - - Annotations: - "A coal electricity generator technology uses coal to generate electricity."@en - - SubClassOf: - FossileGenerator - - Class: CoalPowerplant Annotations: "A CoalPowerplant is a FossilePowerplant having an aggregate of CoalPowerUnits as its PowerGeneratingUnits."@en SubClassOf: - FossilePowerplant, + FossilPowerplant, some , some SteamTurbine @@ -1125,23 +1086,14 @@ There are four types: hydrofluorocarbons (HFCs), perfluorocarbons (PFCs), sulfur some GreenhouseGas -Class: FossileGenerator - - SubClassOf: - - - DisjointWith: - RegenerativeGenerator - - -Class: FossilePowerplant +Class: FossilPowerplant Annotations: "A FossilePowerplant is a Powerplant having an aggregate of one kind of FossilePowerUnits as its PowerGeneratingUnits." SubClassOf: , - some + some Class: Fusion @@ -1160,7 +1112,7 @@ Class: GasPowerplant "A GasPowerplant is a FossilePowerplant having an aggregate of GasFiredPowerUnits as its PowerGeneratingUnits."@en SubClassOf: - FossilePowerplant, + FossilPowerplant, some @@ -1205,16 +1157,6 @@ Class: GeographicRegion -Class: GeothermalGenerator - - Annotations: - "A geothermal generator uses geothermal energy to generate electricity." - - SubClassOf: - RegenerativeGenerator, - uses some Heat - - Class: GeothermalHeat Annotations: @@ -1425,7 +1367,7 @@ Class: HydrogenTurbine "A hydrogen turbine is a turbine fueled with liquid hydrogen."@en SubClassOf: - Turbine, + GasTurbine, has_physical_output some Power, has_physical_input only PortionOfHydrogen @@ -1683,15 +1625,6 @@ Class: MunicipalWasteFuel WasteFuel -Class: NaturalGasGenerator - - Annotations: - "A natural gas electricity generator technology uses natural gas to generate electricity."@en - - SubClassOf: - FossileGenerator - - Class: NetworkNode Annotations: @@ -1760,15 +1693,6 @@ Class: NuclearEnergyProduction EnergyProduction -Class: NuclearPowerGenerator - - Annotations: - "A nuclear generator technology is a fossil electricity generator that uses nuclear reactions to generate electricity."@en - - SubClassOf: - Generator - - Class: NuclearPowerplant Annotations: @@ -1813,22 +1737,13 @@ Class: Office CommericalDemand -Class: OilElectricityGenerator - - Annotations: - "A oil electricity generator technology uses oil to generate electricity."@en - - SubClassOf: - FossileGenerator - - Class: OilPowerplant Annotations: "An OilPowerplant is a FossilePowerplant having an aggregate of OilPowerUnits as its PowerGeneratingUnits." SubClassOf: - FossilePowerplant, + FossilPowerplant, some , some SteamTurbine @@ -2557,15 +2472,6 @@ Class: Rail TransportDemand -Class: RegenerativeGenerator - - SubClassOf: - - - DisjointWith: - FossileGenerator - - Class: RegenerativePowerplant Annotations: @@ -2621,15 +2527,6 @@ Class: RooftopPhotovoltaicPowerplant SolarPark -Class: RunOfRiverElectricityGenerator - - Annotations: - "A run of river electricity generator is a water energy generator that stores little or no water and produces electricity."@en - - SubClassOf: - WaterElectricityGenerator - - Class: RunOfRiverPowerplant Annotations: @@ -2747,15 +2644,6 @@ Class: SolarThermalHeat Heat -Class: SolarThermalHeatGenerator - - Annotations: - "A solar thermal heat generator is a heat generator that uses solar power to produce heat."@en - - SubClassOf: - - - Class: SolarThermalPowerplant Annotations: @@ -2860,17 +2748,6 @@ Class: TidalPowerPlant RunOfRiverPowerplant -Class: TidalStreamGenerator - - Annotations: - "A tidal stream generator uses tidal movement, wave motion or water current for electricity generation."@en - - SubClassOf: - WaterElectricityGenerator, - has_physical_output some Power, - has_physical_input only TideWaveOcean - - Class: TidalStreamPowerplant Annotations: @@ -2994,20 +2871,11 @@ Class: WastePowerplant "A WastePowerplant is a FossilePowerplant having an aggregate of WastePowerUnits as its PowerGeneratingUnits."@en SubClassOf: - FossilePowerplant, + FossilPowerplant, some , some SteamTurbine -Class: WaterElectricityGenerator - - Annotations: - "A water electricity generator is a renewable energy generator that uses power from water to generate electricity."@en - - SubClassOf: - - - Class: WaterTurbine Annotations: @@ -3037,15 +2905,6 @@ Class: WavePowerPlant uses some Wave -Class: WindElectricityGenerator - - Annotations: - "A wind electricity generator technology uses wind power to generate electricity."@en - - SubClassOf: - RegenerativeGenerator - - Class: WindEnergy Annotations: @@ -3363,9 +3222,6 @@ Individual: synthetic has_origin some origin -DisjointClasses: - CoalElectricityGenerator,NaturalGasGenerator,NuclearPowerGenerator,OilElectricityGenerator - DisjointClasses: Generator,ShuntImpedance,StorageUnit,Subgrid,Transformer diff --git a/src/ontology/oeo.omn b/src/ontology/oeo.omn index e3a42111a..ff625089d 100644 --- a/src/ontology/oeo.omn +++ b/src/ontology/oeo.omn @@ -455,10 +455,7 @@ Class: Class: - -Class: Model - - + From 4ac0747019e193f0c218cb08c9da08b6378cd70c Mon Sep 17 00:00:00 2001 From: akleinau <56925445+akleinau@users.noreply.github.com> Date: Thu, 12 Mar 2020 12:14:44 +0100 Subject: [PATCH 14/44] add term tracker item --- src/ontology/edits/oeo-physical.omn | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/ontology/edits/oeo-physical.omn b/src/ontology/edits/oeo-physical.omn index bbb0e8efc..01d5c9c39 100644 --- a/src/ontology/edits/oeo-physical.omn +++ b/src/ontology/edits/oeo-physical.omn @@ -34,6 +34,9 @@ AnnotationProperty: AnnotationProperty: +AnnotationProperty: + + AnnotationProperty: @@ -309,6 +312,8 @@ Class: Annotations: + "issue: https://github.com/OpenEnergyPlatform/ontology/issues/173 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/273", rdfs:comment "rename later to EnergyConverter" SubClassOf: @@ -441,7 +446,9 @@ Class: Class: Annotations: - "A Powerplant is an aggregate of EnergyConverters that is connected to an electric grid." + "A Powerplant is an aggregate of EnergyConverters that is connected to an electric grid.", + "issue: https://github.com/OpenEnergyPlatform/ontology/issues/173 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/273" SubClassOf: ArtificialObject @@ -1132,7 +1139,9 @@ Class: Generator Annotations: "A generator is a grid component that converts motive power (mechanical energy) into electrical power for use in an external circuit. -Source: https://en.wikipedia.org/wiki/Electric_generator"@en +Source: https://en.wikipedia.org/wiki/Electric_generator"@en, + "issue: https://github.com/OpenEnergyPlatform/ontology/issues/173 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/273" SubClassOf: , @@ -2404,6 +2413,10 @@ Source: https://en.wikipedia.org/wiki/Power_(physics)"@en Class: PowerGeneratingUnit + Annotations: + "issue: https://github.com/OpenEnergyPlatform/ontology/issues/173 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/273" + SubClassOf: ArtificialObject, some Generator From f6beed1269f989adc99c2dae471764b92817d420 Mon Sep 17 00:00:00 2001 From: akleinau <56925445+akleinau@users.noreply.github.com> Date: Fri, 13 Mar 2020 10:33:44 +0100 Subject: [PATCH 15/44] rename HeatGenerator HeatGenerator: Heater HeatPumpHeatGenerator: HeatPump --- src/ontology/edits/oeo-physical.omn | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/src/ontology/edits/oeo-physical.omn b/src/ontology/edits/oeo-physical.omn index 01d5c9c39..6eabe6d00 100644 --- a/src/ontology/edits/oeo-physical.omn +++ b/src/ontology/edits/oeo-physical.omn @@ -312,6 +312,7 @@ Class: Annotations: + "An energy transformer is an artificial object that transforms or changes a certain type of energy.", "issue: https://github.com/OpenEnergyPlatform/ontology/issues/173 pull request: https://github.com/OpenEnergyPlatform/ontology/pull/273", rdfs:comment "rename later to EnergyConverter" @@ -521,7 +522,7 @@ Class: Class: Annotations: - rdfs:comment "A WindEnergyConverter is the PowerGeneratingUnit that uses wind energy." + rdfs:comment "A WindEnergyConverter is a RegenerativePowerUnit that uses wind energy." SubClassOf: , @@ -1138,8 +1139,7 @@ Class: GasTurbine Class: Generator Annotations: - "A generator is a grid component that converts motive power (mechanical energy) into electrical power for use in an external circuit. -Source: https://en.wikipedia.org/wiki/Electric_generator"@en, + "A generator is an energy transformer that converts other forms of energy into electrical energy."@en, "issue: https://github.com/OpenEnergyPlatform/ontology/issues/173 pull request: https://github.com/OpenEnergyPlatform/ontology/pull/273" @@ -1291,19 +1291,22 @@ Class: HeatDemand Demand -Class: HeatGenerator +Class: HeatPump + Annotations: + "A heat pump heat generator is a heat generator that uses a heat pump to generate heat."@en + SubClassOf: - Generator + Heater -Class: HeatPumpHeatGenerator +Class: Heater Annotations: - "A heat pump heat generator is a heat generator that uses a heat pump to generate heat."@en + "A Heater is an energy transformer that converts other forms of energy into useful heat." SubClassOf: - HeatGenerator + Class: HydroEnergy @@ -2414,6 +2417,7 @@ Source: https://en.wikipedia.org/wiki/Power_(physics)"@en Class: PowerGeneratingUnit Annotations: + "A power generating unit is an artificial object that contains a generator, among other parts.", "issue: https://github.com/OpenEnergyPlatform/ontology/issues/173 pull request: https://github.com/OpenEnergyPlatform/ontology/pull/273" @@ -2640,7 +2644,7 @@ Class: SolarThermalCollector "https://en.wikipedia.org/w/index.php?title=Solar_thermal_collector&oldid=903948846"@en SubClassOf: - ArtificialObject, + Heater, has_physical_output some Power, has_physical_input only SolarThermalHeat From 2c2bdb8a385c329de444abc05ecc194cad1e88ff Mon Sep 17 00:00:00 2001 From: akleinau <56925445+akleinau@users.noreply.github.com> Date: Mon, 16 Mar 2020 16:04:11 +0100 Subject: [PATCH 16/44] change solarThermalCollector, turbine defs --- src/ontology/edits/oeo-physical.omn | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/ontology/edits/oeo-physical.omn b/src/ontology/edits/oeo-physical.omn index 6eabe6d00..3dbf09ad4 100644 --- a/src/ontology/edits/oeo-physical.omn +++ b/src/ontology/edits/oeo-physical.omn @@ -315,7 +315,7 @@ Class: "An energy transformer is an artificial object that transforms or changes a certain type of energy.", "issue: https://github.com/OpenEnergyPlatform/ontology/issues/173 pull request: https://github.com/OpenEnergyPlatform/ontology/pull/273", - rdfs:comment "rename later to EnergyConverter" + rdfs:comment "rename later to EnergyConvertingDevice" SubClassOf: ArtificialObject @@ -2640,7 +2640,7 @@ Class: SolarPowerPlant Class: SolarThermalCollector Annotations: - "A solar thermal collector collects heat by absorbing sunlight. The term \"solar collector\" commonly refers to a device for solar hot water heating, but may refer to large power generating installations such as solar parabolic troughs and solar towers or non water heating devices such as solar air heaters."@en, + "A solar thermal collector is a heater that absorbs solar radiation to convert it into heat."@en, "https://en.wikipedia.org/w/index.php?title=Solar_thermal_collector&oldid=903948846"@en SubClassOf: @@ -2815,8 +2815,7 @@ Class: TransportDemand Class: Turbine Annotations: - "A turbine [...] is a rotary mechanical device that extracts energy from a fluid flow and converts it into useful work. The work produced by a turbine can be used for generating electrical power when combined with a generator."@en, - "https://en.wikipedia.org/w/index.php?title=Turbine&oldid=905470312" + "a turbine is a energy transformer that converts energy from a moving fluid flow into useful work."@en SubClassOf: From 3922cc5d2a8a3c23856fc69410906b748edb68dd Mon Sep 17 00:00:00 2001 From: akleinau <56925445+akleinau@users.noreply.github.com> Date: Mon, 16 Mar 2020 16:15:21 +0100 Subject: [PATCH 17/44] add definitions to Heater, FuelCell --- src/ontology/edits/oeo-physical.omn | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/ontology/edits/oeo-physical.omn b/src/ontology/edits/oeo-physical.omn index 3dbf09ad4..dc1318d21 100644 --- a/src/ontology/edits/oeo-physical.omn +++ b/src/ontology/edits/oeo-physical.omn @@ -359,6 +359,9 @@ Class: Class: + Annotations: + "A FuelCell is a Generator that converts chemical energy into electricity using redox reactions." + SubClassOf: Generator @@ -1294,7 +1297,7 @@ Class: HeatDemand Class: HeatPump Annotations: - "A heat pump heat generator is a heat generator that uses a heat pump to generate heat."@en + "A HeatPump is a heater that transforms energy from air, ground or water into useful heat."@en SubClassOf: Heater @@ -1303,7 +1306,9 @@ Class: HeatPump Class: Heater Annotations: - "A Heater is an energy transformer that converts other forms of energy into useful heat." + "A Heater is an energy transformer that converts other forms of energy into useful heat.", + "issue: https://github.com/OpenEnergyPlatform/ontology/issues/173 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/273" SubClassOf: From 9f73852a52b5cc4de5c0f504c2474f74c6aea83b Mon Sep 17 00:00:00 2001 From: akleinau <56925445+akleinau@users.noreply.github.com> Date: Mon, 16 Mar 2020 16:30:04 +0100 Subject: [PATCH 18/44] add PowerGeneratingUnit definitions --- src/ontology/edits/oeo-physical.omn | 56 +++++++++++++++++++++++++++-- 1 file changed, 54 insertions(+), 2 deletions(-) diff --git a/src/ontology/edits/oeo-physical.omn b/src/ontology/edits/oeo-physical.omn index dc1318d21..65145c1d1 100644 --- a/src/ontology/edits/oeo-physical.omn +++ b/src/ontology/edits/oeo-physical.omn @@ -263,12 +263,18 @@ ObjectProperty: uses Class: + Annotations: + "A BiofuelPowerUnit is a RegenerativePowerUnit using biofuel as fuel." + SubClassOf: Class: + Annotations: + "A BioGasPowerUnit is a BiofuelPowerUnit using biogas as fuel." + SubClassOf: @@ -281,6 +287,9 @@ Class: Class: + Annotations: + "A BiomassPowerUnit is a BiofuelPowerUnit using biomass as fuel." + SubClassOf: @@ -296,6 +305,9 @@ Class: Class: + Annotations: + "A CoalPowerUnit is a FossilPowerUnit using Coal as Fuel." + SubClassOf: @@ -353,6 +365,9 @@ Class: + Annotations: + "A FossilPowerUnit is a PowerGeneratingUnit using FossilCombustionFuel as Fuel." + SubClassOf: PowerGeneratingUnit @@ -368,18 +383,27 @@ Class: Class: + Annotations: + "A GasFiredPowerUnit is a FossilPowerUnit using gas as Fuel." + SubClassOf: Class: + Annotations: + "A GeothermalPowerUnit is a RegenerativePowerUnit using geothermal heat." + SubClassOf: Class: + Annotations: + "A HardCoalPowerUnit is a CoalPowerUnit using HardCoal as Fuel." + SubClassOf: @@ -387,6 +411,7 @@ Class: Class: Annotations: + "A HydroPowerUnit is a PowerGeneratingUnit using hydrogen as fuel.", rdfs:comment "will be discussed later" SubClassOf: @@ -395,12 +420,18 @@ Class: Class: + Annotations: + "A HydrogenPowerUnit is a PowerGeneratingUnit using hydrogen as fuel." + SubClassOf: PowerGeneratingUnit Class: + Annotations: + "A LignitePowerUnit is a CoalPowerUnit using Lignite as Fuel." + SubClassOf: @@ -416,12 +447,18 @@ Class: Class: + Annotations: + "A NuclearPowerUnit is a PowerGeneratingUnit using nuclear fuel as fuel." + SubClassOf: PowerGeneratingUnit Class: + Annotations: + "A OilPowerUnit is a FossilPowerUnit using oil as Fuel." + SubClassOf: @@ -460,6 +497,9 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/273" Class: + Annotations: + "A RegenerativePowerUnit is a PowerGeneratingUnit using regenerative fuels as fuel." + SubClassOf: PowerGeneratingUnit @@ -476,18 +516,27 @@ Class: + Annotations: + "A SolarPowerUnit is a RegenerativePowerUnit using solar power." + SubClassOf: Class: + Annotations: + "A SolarThermalPowerUnit is a SolarPowerUnit using solar thermal energy." + SubClassOf: Class: + Annotations: + "A SolidBiomassPowerUnit is a BiomassPowerUnit using solid biomass as fuel." + SubClassOf: @@ -509,6 +558,9 @@ Class: Class: + Annotations: + "A WastePowerUnit is a FossilPowerUnit using waste as fuel." + SubClassOf: @@ -1794,8 +1846,8 @@ Class: PFC Class: PVPanel Annotations: - "hotovoltaic solar panels absorb sunlight as a source of energy to generate electricity. A photovoltaic (PV) module is a packaged, connected assembly of typically 6x10 photovoltaic solar cells. Photovoltaic modules constitute the photovoltaic array of a photovoltaic system that generates and supplies solar electricity in commercial and residential applications."@en, - "https://en.wikipedia.org/w/index.php?title=Solar_panel&oldid=906976047"@en + "A PVPanel (photovoltaic panel) is a SolarPowerUnit absorbing sunlight as a source of energy to generate electricity."@en, + rdfs:comment "A photovoltaic (PV) module is a packaged, connected assembly of typically 6x10 photovoltaic solar cells. Photovoltaic modules constitute the photovoltaic array of a photovoltaic system that generates and supplies solar electricity in commercial and residential applications." SubClassOf: , From e7348680cda716dce3fc623dc414ea18a99ec211 Mon Sep 17 00:00:00 2001 From: akleinau <56925445+akleinau@users.noreply.github.com> Date: Mon, 16 Mar 2020 16:36:39 +0100 Subject: [PATCH 19/44] update definitions of turbine, heatpump, electricheatpump --- src/ontology/edits/oeo-physical.omn | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/ontology/edits/oeo-physical.omn b/src/ontology/edits/oeo-physical.omn index 65145c1d1..42d5a7279 100644 --- a/src/ontology/edits/oeo-physical.omn +++ b/src/ontology/edits/oeo-physical.omn @@ -312,6 +312,15 @@ Class: +Class: + + Annotations: + rdfs:comment "An electric heat pump is a heat pump that uses electric energy as drive energy." + + SubClassOf: + HeatPump + + Class: Annotations: @@ -1349,7 +1358,7 @@ Class: HeatDemand Class: HeatPump Annotations: - "A HeatPump is a heater that transforms energy from air, ground or water into useful heat."@en + "A heat pump is a heater that transforms low temperature heat to high temperature heat using a drive energy."@en SubClassOf: Heater @@ -2872,7 +2881,7 @@ Class: TransportDemand Class: Turbine Annotations: - "a turbine is a energy transformer that converts energy from a moving fluid flow into useful work."@en + "A turbine is an energy transformer that converts energy from a moving fluid flow into rotational energy."@en SubClassOf: From a10111f387c61da11d9d2480b3ea3cfb1438ae5a Mon Sep 17 00:00:00 2001 From: akleinau <56925445+akleinau@users.noreply.github.com> Date: Mon, 16 Mar 2020 16:52:27 +0100 Subject: [PATCH 20/44] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2ea6268f2..5dbb390c6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -56,7 +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 (#179) +- Generator (#273) ### Removed From 27a7e914dba77deff5a47808a16de4a8e7b2b722 Mon Sep 17 00:00:00 2001 From: akleinau <56925445+akleinau@users.noreply.github.com> Date: Tue, 17 Mar 2020 10:13:33 +0100 Subject: [PATCH 21/44] add missing definitions - BiofuelPowerplant and subclasses - correct PVCell def --- src/ontology/edits/oeo-physical.omn | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/ontology/edits/oeo-physical.omn b/src/ontology/edits/oeo-physical.omn index 42d5a7279..a98a91aa6 100644 --- a/src/ontology/edits/oeo-physical.omn +++ b/src/ontology/edits/oeo-physical.omn @@ -281,6 +281,9 @@ Class: Class: + Annotations: + "A BiogasPowerplant is a BiofuelPowerplant having an aggregate of BiogasPowerUnits as its PowerGeneratingUnits." + SubClassOf: BiofuelPowerplant @@ -475,7 +478,7 @@ Class: Class: Annotations: - "A PVCell is a RenewableGenerator that converts light into electrical energy." + "A PVCell is a Generator that converts light into electrical energy." SubClassOf: Generator @@ -552,6 +555,9 @@ Class: + Annotations: + "A SolidBiomassPowerplant is a BiomassPowerplant having an aggregate of SolidBiomassPowerUnits as its PowerGeneratingUnits." + SubClassOf: BiomassPowerplant @@ -759,6 +765,9 @@ Biofuels can be derived directly from plants (i.e. energy crops), or indirectly Class: BiofuelPowerplant + Annotations: + "A BiofuelPowerplant is a RegenerativePowerplant having an aggregate of BiofuelPowerUnits as its PowerGeneratingUnits." + SubClassOf: RegenerativePowerplant @@ -766,7 +775,7 @@ Class: BiofuelPowerplant Class: BiomassPowerplant Annotations: - "A BiomassPowerplant is a RegenerativePowerplant having an aggregate of BiomassPowerUnits as its PowerGeneratingUnits."@en + "A BiomassPowerplant is a BiofuelPowerplant having an aggregate of BiomassPowerUnits as its PowerGeneratingUnits."@en SubClassOf: BiofuelPowerplant, From 3fc8ad8ebf4c5058e11b0e096e55f3a7e53e2002 Mon Sep 17 00:00:00 2001 From: akleinau <56925445+akleinau@users.noreply.github.com> Date: Mon, 23 Mar 2020 11:23:08 +0100 Subject: [PATCH 22/44] fix merge errors --- src/ontology/edits/oeo-physical.omn | 59 ++--------------------------- 1 file changed, 4 insertions(+), 55 deletions(-) diff --git a/src/ontology/edits/oeo-physical.omn b/src/ontology/edits/oeo-physical.omn index cad15377b..3c724fe6a 100644 --- a/src/ontology/edits/oeo-physical.omn +++ b/src/ontology/edits/oeo-physical.omn @@ -498,8 +498,6 @@ Class: SubClassOf: - -Class: Class: @@ -1485,8 +1483,8 @@ There are four types: hydrofluorocarbons (HFCs), perfluorocarbons (PFCs), sulfur "Adapted from https://en.wikipedia.org/w/index.php?title=Fluorinated_gases&oldid=902170998"@en SubClassOf: - GreenhouseGas, - some GreenhouseGas + , + some Class: FossilPowerplant @@ -1588,11 +1586,7 @@ Class: Generator pull request: https://github.com/OpenEnergyPlatform/ontology/pull/273" SubClassOf: - , - uses some EnergyCarrier - - DisjointWith: - Line + Class: GeographicCoordinate @@ -1863,7 +1857,7 @@ Class: HydrogenTurbine SubClassOf: GasTurbine, has_physical_output some Power, - has_physical_input only PortionOfHydrogen + has_physical_input only Hydrogen Class: HydrogenVehicle @@ -2418,34 +2412,7 @@ Class: PhotovoltaicPowerplant SubClassOf: SolarPowerPlant, some PVPanel - -Class: OilElectricityGenerator - - Annotations: - "A oil electricity generator technology uses oil to generate electricity."@en - - SubClassOf: - FossilGenerator - - -Class: OilPowerplant - - SubClassOf: - FossilePowerplant, - some SteamTurbine - - -Class: OnShoreWindElectricityGenerator - - Annotations: - "An on shore wind electricity generator is a wind electricity generator that is build on land."@en - - SubClassOf: - WindElectricityGenerator - - DisjointWith: - OffShoreWindElectricityGenerator Class: ParticulateMatter @@ -3286,21 +3253,3 @@ Individual: synthetic has_origin some origin -DisjointClasses: - BioElectricityGenerator,PhotovoltaicElectricityGenerator,WaterElectricityGenerator,WindElectricityGenerator - -DisjointClasses: - BiomassPowerplant,CoalPowerplant,GasPowerplant,GeothermalGenerator,HydroPowerplant,NuclearPowerplant,OceanPowerplant,OilPowerplant,PhotovoltaicGenerator,WastePowerplant,WindTurbine - -DisjointClasses: - CoalElectricityGenerator,NaturalGasGenerator,NuclearPowerGenerator,OilElectricityGenerator - -DisjointClasses: - ElectricityGeneratorTechnology,EnergyStorageTechnology,EnergyTransferTechnology - -DisjointClasses: - ElectricityGeneratorTechnology,EnergyStorageTechnology,EnergyTransferTechnology,HeatGeneratorTechnology - -DisjointClasses: - EnergyGeneratorTechnology,EnergyStorageTechnology,EnergyTransferTechnology - From 0dcb94d5e2a76119112551ae6704aa42bcd1d880 Mon Sep 17 00:00:00 2001 From: akleinau <56925445+akleinau@users.noreply.github.com> Date: Mon, 23 Mar 2020 11:27:39 +0100 Subject: [PATCH 23/44] fix merge errors #2 --- src/ontology/edits/oeo-physical.omn | 292 +++++++++++++--------------- 1 file changed, 138 insertions(+), 154 deletions(-) diff --git a/src/ontology/edits/oeo-physical.omn b/src/ontology/edits/oeo-physical.omn index 3c724fe6a..96558e5b0 100644 --- a/src/ontology/edits/oeo-physical.omn +++ b/src/ontology/edits/oeo-physical.omn @@ -267,6 +267,17 @@ ObjectProperty: uses is_used_by +Class: + + Annotations: + "A fuel role is a role of a portion of matter that has the disposition to be an energy carrier and is used in a process that releases the carried energy by transforming the portion of matter into a different kind of portion of matter in a way that releases heat or does work.", + "issue: https://github.com/OpenEnergyPlatform/ontology/issues/227 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/279" + + SubClassOf: + + + Class: Annotations: @@ -301,16 +312,6 @@ Class: SubClassOf: - -Class: - - Annotations: - "A fuel role is a role of a portion of matter that has the disposition to be an energy carrier and is used in a process that releases the carried energy by transforming the portion of matter into a different kind of portion of matter in a way that releases heat or does work.", - "issue: https://github.com/OpenEnergyPlatform/ontology/issues/227 -pull request: https://github.com/OpenEnergyPlatform/ontology/pull/279" - - SubClassOf: - Class: @@ -322,7 +323,6 @@ Class: SubClassOf: PortionOfMatter, some GreenhouseEffectDisposition - Class: @@ -361,17 +361,6 @@ Class: - - Annotations: - "An energy transformer is an artificial object that transforms or changes a certain type of energy.", - "issue: https://github.com/OpenEnergyPlatform/ontology/issues/173 -pull request: https://github.com/OpenEnergyPlatform/ontology/pull/273", - rdfs:comment "rename later to EnergyConvertingDevice" - - SubClassOf: - ArtificialObject - Class: Annotations: @@ -384,6 +373,18 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/276" +Class: + + Annotations: + "An energy transformer is an artificial object that transforms or changes a certain type of energy.", + "issue: https://github.com/OpenEnergyPlatform/ontology/issues/173 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/273", + rdfs:comment "rename later to EnergyConvertingDevice" + + SubClassOf: + ArtificialObject + + Class: Annotations: @@ -394,7 +395,6 @@ Class: - Class: @@ -462,6 +462,21 @@ Class: +Class: + + Annotations: + "A GreenhouseGas is a portion of matter that has the disposition to contribute to the greenhouse effect.", + "issue: https://github.com/OpenEnergyPlatform/ontology/issues/56 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/234" + + EquivalentTo: + PortionOfMatter + and ( some GreenhouseEffectDisposition) + + SubClassOf: + PortionOfMatter + + Class: Annotations: @@ -498,49 +513,6 @@ Class: SubClassOf: - -Class: - - - Annotations: - "A GreenhouseGas is a portion of matter that has the disposition to contribute to the greenhouse effect.", - "issue: https://github.com/OpenEnergyPlatform/ontology/issues/56 -pull request: https://github.com/OpenEnergyPlatform/ontology/pull/234" - - EquivalentTo: - PortionOfMatter - and ( some GreenhouseEffectDisposition) - - SubClassOf: - PortionOfMatter - - -Class: - - Annotations: - "A NuclearPowerUnit is a PowerGeneratingUnit using nuclear fuel as fuel." - - SubClassOf: - PowerGeneratingUnit - - -Class: - - Annotations: - "A OilPowerUnit is a FossilPowerUnit using oil as Fuel." - - SubClassOf: - - - -Class: - - Annotations: - "A PVCell is a Generator that converts light into electrical energy." - - SubClassOf: - Generator - Class: @@ -586,69 +558,64 @@ Class: +Class: Annotations: - "A Powerplant is an aggregate of EnergyConverters that is connected to an electric grid.", - "issue: https://github.com/OpenEnergyPlatform/ontology/issues/173 -pull request: https://github.com/OpenEnergyPlatform/ontology/pull/273" + "A NuclearPowerUnit is a PowerGeneratingUnit using nuclear fuel as fuel." SubClassOf: - ArtificialObject + PowerGeneratingUnit -Class: +Class: Annotations: - "A RegenerativePowerUnit is a PowerGeneratingUnit using regenerative fuels as fuel." + "A OilPowerUnit is a FossilPowerUnit using oil as Fuel." SubClassOf: - PowerGeneratingUnit + + +Class: -Class: Annotations: - "A RenewableFuel is a portion of matter that has a renewable origin and an energy carrier disposition that is used as a fuel." - - EquivalentTo: - Fuel - and (has_origin value renewable) + "A PVCell is a Generator that converts light into electrical energy." SubClassOf: - some CombustibleEnergyCarrierDisposition + Generator -Class: +Class: Annotations: - "Sulphur hexafluoride is a portion of matter with the chemical formula SF6. It can work as a potent greenhouse gas and has an anthropogenic origin.", - "SF6" + "A Powerplant is an aggregate of EnergyConverters that is connected to an electric grid.", + "issue: https://github.com/OpenEnergyPlatform/ontology/issues/173 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/273" SubClassOf: - PortionOfMatter, - has_origin value + ArtificialObject -Class: +Class: Annotations: - "A ThermalEnergyStorage is an EnergyStorage that stores thermal energy for later use." + "A RegenerativePowerUnit is a PowerGeneratingUnit using regenerative fuels as fuel." SubClassOf: - + PowerGeneratingUnit -Class: +Class: Annotations: - "Uranium is a PortionOfMatter that has the atomic number 92. It is a silver-grey metal." + "A RenewableFuel is a portion of matter that has a renewable origin and an energy carrier disposition that is used as a fuel." + + EquivalentTo: + Fuel + and (has_origin value renewable) SubClassOf: - PortionOfMatter, - some , - some , - has_normal_state_of_matter value solid, - has_origin value + some CombustibleEnergyCarrierDisposition Class: @@ -687,12 +654,37 @@ Class: +Class: + Annotations: - "WasteRole is a role of an object aggregate that has been discarded after primary use." + "Sulphur hexafluoride is a portion of matter with the chemical formula SF6. It can work as a potent greenhouse gas and has an anthropogenic origin.", + "SF6" SubClassOf: - + PortionOfMatter, + has_origin value + + +Class: + + Annotations: + "A ThermalEnergyStorage is an EnergyStorage that stores thermal energy for later use." + + SubClassOf: + + + +Class: + + Annotations: + "Uranium is a PortionOfMatter that has the atomic number 92. It is a silver-grey metal." + + SubClassOf: + PortionOfMatter, + some , + some , + has_normal_state_of_matter value solid, + has_origin value Class: @@ -704,6 +696,15 @@ Class: +Class: + + Annotations: + "WasteRole is a role of an object aggregate that has been discarded after primary use." + + SubClassOf: + + + Class: Annotations: @@ -918,7 +919,7 @@ Class: BatteryStorage DisjointWith: MethanationGasStorage - + Class: Biodiesel Annotations: @@ -932,7 +933,7 @@ Class: Biodiesel has_normal_state_of_matter value liquid, has_origin value biogenic - + Class: Biofuel Annotations: @@ -951,6 +952,16 @@ Biofuels can be derived directly from plants (i.e. energy crops), or indirectly has_origin value biogenic, has_origin value renewable + +Class: BiofuelPowerplant + + Annotations: + "A BiofuelPowerplant is a RegenerativePowerplant having an aggregate of BiofuelPowerUnits as its PowerGeneratingUnits." + + SubClassOf: + RegenerativePowerplant + + Class: Biogas Annotations: @@ -963,14 +974,7 @@ Class: Biogas some CombustibleEnergyCarrierDisposition, has_origin value biogenic -Class: BiofuelPowerplant - Annotations: - "A BiofuelPowerplant is a RegenerativePowerplant having an aggregate of BiofuelPowerUnits as its PowerGeneratingUnits." - - SubClassOf: - RegenerativePowerplant - Class: Biogasoline Annotations: @@ -987,7 +991,6 @@ Class: Biogasoline has_origin value biogenic - Class: BiomassPowerplant Annotations: @@ -1050,7 +1053,7 @@ Class: City SubClassOf: Land - + Class: Coal Annotations: @@ -1064,6 +1067,7 @@ Class: Coal has_normal_state_of_matter value solid, has_origin value fossil + Class: CoalPowerplant Annotations: @@ -1474,19 +1478,6 @@ Class: FlowBattery Battery -Class: FluorinatedGreenhouseGas - - Annotations: - "Fluorinated greenhouse gases (F-gases) are man-made gases that can stay in the atmosphere for centuries. As they contribute to a global greenhouse effect they are greenhouse gases. - -There are four types: hydrofluorocarbons (HFCs), perfluorocarbons (PFCs), sulfur hexafluoride (SF6) and nitrogen trifluoride (NF3)."@en, - "Adapted from https://en.wikipedia.org/w/index.php?title=Fluorinated_gases&oldid=902170998"@en - - SubClassOf: - , - some - - Class: FossilPowerplant Annotations: @@ -1588,6 +1579,9 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/273" SubClassOf: + DisjointWith: + Line + Class: GeographicCoordinate @@ -2205,7 +2199,8 @@ It does not include gases created by anaerobic digestion of biomass (e.g. munici some CombustibleEnergyCarrierDisposition, has_normal_state_of_matter value gaseous, has_origin value fossil - + + Class: NegativeEmission Annotations: @@ -2307,7 +2302,7 @@ Class: NuclearFuel SubClassOf: Fuel - + Class: NuclearPowerplant Annotations: @@ -2352,6 +2347,21 @@ Class: Office CommericalDemand +Class: OilAndPetroleumProducts + + Annotations: + "Petroleum (/pəˈtroʊliəm/) is a naturally occurring, yellowish-black liquid found in geological formations beneath the Earth's surface. It is commonly refined into various types of fuels. Components of petroleum are separated using a technique called fractional distillation, i.e. separation of a liquid mixture into fractions differing in boiling point by means of distillation, typically using a fractionating column. + +It consists of hydrocarbons of various molecular weights and other organic compounds. The name petroleum covers both naturally occurring unprocessed crude oil and petroleum products that are made up of refined crude oil. A fossil fuel, petroleum is formed when large quantities of dead organisms, mostly zooplankton and algae, are buried underneath sedimentary rock and subjected to both intense heat and pressure."@en, + "https://en.wikipedia.org/w/index.php?title=Petroleum&oldid=868006507"@en + + SubClassOf: + PortionOfMatter, + some , + some CombustibleEnergyCarrierDisposition, + has_origin value fossil + + Class: OilPowerplant Annotations: @@ -2375,21 +2385,6 @@ Class: OnShoreWindFarm OffShoreWindFarm -Class: OilAndPetroleumProducts - - Annotations: - "Petroleum (/pəˈtroʊliəm/) is a naturally occurring, yellowish-black liquid found in geological formations beneath the Earth's surface. It is commonly refined into various types of fuels. Components of petroleum are separated using a technique called fractional distillation, i.e. separation of a liquid mixture into fractions differing in boiling point by means of distillation, typically using a fractionating column. - -It consists of hydrocarbons of various molecular weights and other organic compounds. The name petroleum covers both naturally occurring unprocessed crude oil and petroleum products that are made up of refined crude oil. A fossil fuel, petroleum is formed when large quantities of dead organisms, mostly zooplankton and algae, are buried underneath sedimentary rock and subjected to both intense heat and pressure."@en, - "https://en.wikipedia.org/w/index.php?title=Petroleum&oldid=868006507"@en - - SubClassOf: - PortionOfMatter, - some , - some CombustibleEnergyCarrierDisposition, - has_origin value fossil - - Class: PVPanel Annotations: @@ -2403,18 +2398,6 @@ Class: PVPanel has_physical_input only SolarPhotovoltaic - -Class: PhotovoltaicPowerplant - - Annotations: - "A PhotovoltaicPowerplant is a RegenerativePowerplant having an aggregate of PVPanels as its PowerGeneratingUnits."@en - - SubClassOf: - SolarPowerPlant, - some PVPanel - - - Class: ParticulateMatter Annotations: @@ -2461,7 +2444,7 @@ Class: Perfluorocarbon PortionOfMatter, has_origin value - + Class: PhotovoltaicGenerator SubClassOf: @@ -2472,6 +2455,7 @@ Class: PhotovoltaicGenerator Class: PhotovoltaicPowerplant Annotations: + "A PhotovoltaicPowerplant is a RegenerativePowerplant having an aggregate of PVPanels as its PowerGeneratingUnits."@en, "A photovoltaic generator uses PVPanels and solar energy to generate electricity."@en SubClassOf: @@ -3028,7 +3012,7 @@ Class: Water SubClassOf: PortionOfMatter, some EnergyCarrierDisposition - + Class: WaterTurbine From 112ebcd2fbf1abf5f451c0f1bb76e733f7258e10 Mon Sep 17 00:00:00 2001 From: akleinau <56925445+akleinau@users.noreply.github.com> Date: Mon, 23 Mar 2020 11:31:04 +0100 Subject: [PATCH 24/44] fix merge errors #3 --- src/ontology/edits/oeo-physical.omn | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/ontology/edits/oeo-physical.omn b/src/ontology/edits/oeo-physical.omn index 96558e5b0..38a611b1e 100644 --- a/src/ontology/edits/oeo-physical.omn +++ b/src/ontology/edits/oeo-physical.omn @@ -2445,13 +2445,6 @@ Class: Perfluorocarbon has_origin value -Class: PhotovoltaicGenerator - - SubClassOf: - Generator, - uses some SolarEnergy - - Class: PhotovoltaicPowerplant Annotations: From e94fdd01f96600839ab37c8823c2c4088740d030 Mon Sep 17 00:00:00 2001 From: akleinau <56925445+akleinau@users.noreply.github.com> Date: Mon, 23 Mar 2020 11:47:52 +0100 Subject: [PATCH 25/44] add relations between power unit and fuel --- src/ontology/edits/oeo-physical.omn | 36 ++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/src/ontology/edits/oeo-physical.omn b/src/ontology/edits/oeo-physical.omn index 38a611b1e..96281691d 100644 --- a/src/ontology/edits/oeo-physical.omn +++ b/src/ontology/edits/oeo-physical.omn @@ -284,7 +284,8 @@ Class: "A BiofuelPowerUnit is a RegenerativePowerUnit using biofuel as fuel." SubClassOf: - + , + uses some Biofuel Class: @@ -293,7 +294,8 @@ Class: "A BioGasPowerUnit is a BiofuelPowerUnit using biogas as fuel." SubClassOf: - + , + uses some Biogas Class: @@ -340,7 +342,8 @@ Class: "A CoalPowerUnit is a FossilPowerUnit using Coal as Fuel." SubClassOf: - + , + uses some Coal Class: @@ -432,7 +435,8 @@ Class: "A FossilPowerUnit is a PowerGeneratingUnit using FossilCombustionFuel as Fuel." SubClassOf: - PowerGeneratingUnit + PowerGeneratingUnit, + uses some Class: @@ -483,7 +487,8 @@ Class: "A HardCoalPowerUnit is a CoalPowerUnit using HardCoal as Fuel." SubClassOf: - + , + uses some HardCoal Class: @@ -502,7 +507,8 @@ Class: "A HydrogenPowerUnit is a PowerGeneratingUnit using hydrogen as fuel." SubClassOf: - PowerGeneratingUnit + PowerGeneratingUnit, + uses some Hydrogen Class: @@ -510,6 +516,9 @@ Class: Annotations: "A LignitePowerUnit is a CoalPowerUnit using Lignite as Fuel." + EquivalentTo: + uses some Lignite + SubClassOf: @@ -564,7 +573,8 @@ Class: "A NuclearPowerUnit is a PowerGeneratingUnit using nuclear fuel as fuel." SubClassOf: - PowerGeneratingUnit + PowerGeneratingUnit, + uses some NuclearFuel Class: @@ -573,7 +583,8 @@ Class: "A OilPowerUnit is a FossilPowerUnit using oil as Fuel." SubClassOf: - + , + uses some OilAndPetroleumProducts Class: @@ -602,7 +613,8 @@ Class: "A RegenerativePowerUnit is a PowerGeneratingUnit using regenerative fuels as fuel." SubClassOf: - PowerGeneratingUnit + PowerGeneratingUnit, + uses some Class: @@ -642,7 +654,8 @@ Class: "A SolidBiomassPowerUnit is a BiomassPowerUnit using solid biomass as fuel." SubClassOf: - + , + uses some PortionOfSolidBiomass Class: @@ -693,7 +706,8 @@ Class: "A WastePowerUnit is a FossilPowerUnit using waste as fuel." SubClassOf: - + , + uses some WasteFuel Class: From f40d5a5080214a548619cded719d330a48a3cd8f Mon Sep 17 00:00:00 2001 From: akleinau <56925445+akleinau@users.noreply.github.com> Date: Mon, 23 Mar 2020 11:50:21 +0100 Subject: [PATCH 26/44] update heatpump definition --- src/ontology/edits/oeo-physical.omn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ontology/edits/oeo-physical.omn b/src/ontology/edits/oeo-physical.omn index 96281691d..d0911ab36 100644 --- a/src/ontology/edits/oeo-physical.omn +++ b/src/ontology/edits/oeo-physical.omn @@ -1752,7 +1752,7 @@ Class: HeatDemand Class: HeatPump Annotations: - "A heat pump is a heater that transforms low temperature heat to high temperature heat using a drive energy."@en + "A heat pump is a heater that transforms low temperature heat to high temperature heat using external energy."@en SubClassOf: Heater From ae0c7ee3d0b2c23c6913cde0644f13a3f060cb34 Mon Sep 17 00:00:00 2001 From: akleinau <56925445+akleinau@users.noreply.github.com> Date: Mon, 23 Mar 2020 11:56:16 +0100 Subject: [PATCH 27/44] rename EnergyTransformer to EnergyConvertingDevice --- src/ontology/edits/oeo-physical.omn | 36 ++++++++++++++--------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/ontology/edits/oeo-physical.omn b/src/ontology/edits/oeo-physical.omn index d0911ab36..8669c49b3 100644 --- a/src/ontology/edits/oeo-physical.omn +++ b/src/ontology/edits/oeo-physical.omn @@ -364,28 +364,28 @@ Class: +Class: Annotations: - "EnergyStorage is a function of an ArtificialObject that has been engineered to contain energy for conversion as usable energy later.", - "issue: https://github.com/OpenEnergyPlatform/ontology/issues/209 -pull request: https://github.com/OpenEnergyPlatform/ontology/pull/276" + "An energy converting device is an artificial object that transforms or changes a certain type of energy.", + "issue: https://github.com/OpenEnergyPlatform/ontology/issues/173 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/273", + rdfs:comment "formerly called EnergyTransformer" SubClassOf: - EnergyCarrierDisposition, - + ArtificialObject -Class: +Class: Annotations: - "An energy transformer is an artificial object that transforms or changes a certain type of energy.", - "issue: https://github.com/OpenEnergyPlatform/ontology/issues/173 -pull request: https://github.com/OpenEnergyPlatform/ontology/pull/273", - rdfs:comment "rename later to EnergyConvertingDevice" + "EnergyStorage is a function of an ArtificialObject that has been engineered to contain energy for conversion as usable energy later.", + "issue: https://github.com/OpenEnergyPlatform/ontology/issues/209 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/276" SubClassOf: - ArtificialObject + EnergyCarrierDisposition, + Class: @@ -1586,12 +1586,12 @@ The production of other coal gases (i.e. coke oven gas, blast furnace gas and ox Class: Generator Annotations: - "A generator is an energy transformer that converts other forms of energy into electrical energy."@en, + "A generator is an energy converting device that converts other forms of energy into electrical energy."@en, "issue: https://github.com/OpenEnergyPlatform/ontology/issues/173 pull request: https://github.com/OpenEnergyPlatform/ontology/pull/273" SubClassOf: - + DisjointWith: Line @@ -1761,12 +1761,12 @@ Class: HeatPump Class: Heater Annotations: - "A Heater is an energy transformer that converts other forms of energy into useful heat.", + "A Heater is an energy converting device that converts other forms of energy into useful heat.", "issue: https://github.com/OpenEnergyPlatform/ontology/issues/173 pull request: https://github.com/OpenEnergyPlatform/ontology/pull/273" SubClassOf: - + Class: HeatingOil @@ -2933,10 +2933,10 @@ Class: TransportDemand Class: Turbine Annotations: - "A turbine is an energy transformer that converts energy from a moving fluid flow into rotational energy."@en + "A turbine is an energy converting device that converts energy from a moving fluid flow into rotational energy."@en SubClassOf: - + Class: UndergroundHydrogenStorage From 697be52ceafff01b60559def03ed41d61a7812ce Mon Sep 17 00:00:00 2001 From: l-emele <36884905+l-emele@users.noreply.github.com> Date: Mon, 23 Mar 2020 12:25:54 +0100 Subject: [PATCH 28/44] Update src/ontology/edits/oeo-physical.omn Fix typo --- src/ontology/edits/oeo-physical.omn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ontology/edits/oeo-physical.omn b/src/ontology/edits/oeo-physical.omn index 8669c49b3..8a3ad3c7b 100644 --- a/src/ontology/edits/oeo-physical.omn +++ b/src/ontology/edits/oeo-physical.omn @@ -2346,7 +2346,7 @@ Class: OceanPowerplant Class: OffShoreWindFarm Annotations: - "An off shore wind electricity generator is a WindFarm that is build off shore above or in the ocean."@en + "An offshore wind electricity generator is a WindFarm that is build off shore above or in the ocean."@en SubClassOf: WindFarm From c3338dd718ed92d3b34dece4c38e1296d67a64ca Mon Sep 17 00:00:00 2001 From: l-emele <36884905+l-emele@users.noreply.github.com> Date: Mon, 23 Mar 2020 12:26:48 +0100 Subject: [PATCH 29/44] Update src/ontology/edits/oeo-physical.omn Fix typo --- src/ontology/edits/oeo-physical.omn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ontology/edits/oeo-physical.omn b/src/ontology/edits/oeo-physical.omn index 8a3ad3c7b..068c34417 100644 --- a/src/ontology/edits/oeo-physical.omn +++ b/src/ontology/edits/oeo-physical.omn @@ -2390,7 +2390,7 @@ Class: OilPowerplant Class: OnShoreWindFarm Annotations: - "An on shore wind electricity generator is a WindFarm that is build on land."@en + "An onshore wind electricity generator is a WindFarm that is build on land."@en SubClassOf: WindFarm From f10cc4a0e7be788852ffe7ea7a3635cc0e85d4eb Mon Sep 17 00:00:00 2001 From: l-emele <36884905+l-emele@users.noreply.github.com> Date: Mon, 23 Mar 2020 12:32:03 +0100 Subject: [PATCH 30/44] Update src/ontology/edits/oeo-physical.omn Fix spaces --- src/ontology/edits/oeo-physical.omn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ontology/edits/oeo-physical.omn b/src/ontology/edits/oeo-physical.omn index 068c34417..2121c9f58 100644 --- a/src/ontology/edits/oeo-physical.omn +++ b/src/ontology/edits/oeo-physical.omn @@ -2732,7 +2732,7 @@ Class: SolarEnergy Class: SolarPark Annotations: - "A solar park (also: solar farm, field photovoltaic electricity powerplant) is a PhotovoltaicPowerplant that is installed out in the open on the ground."@en + "A solar park (also: solar farm, field photovoltaic electricity powerplant) is a PhotovoltaicPowerplant that is installed out in the open on the ground."@en SubClassOf: PhotovoltaicPowerplant From 7b3308ea2844b7d220c27afc282728ba52196b4b Mon Sep 17 00:00:00 2001 From: akleinau <56925445+akleinau@users.noreply.github.com> Date: Tue, 24 Mar 2020 09:43:52 +0100 Subject: [PATCH 31/44] change def of hydrogenpowerunit Co-Authored-By: l-emele <36884905+l-emele@users.noreply.github.com> --- src/ontology/edits/oeo-physical.omn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ontology/edits/oeo-physical.omn b/src/ontology/edits/oeo-physical.omn index 2121c9f58..cfdb3c65c 100644 --- a/src/ontology/edits/oeo-physical.omn +++ b/src/ontology/edits/oeo-physical.omn @@ -494,7 +494,7 @@ Class: Class: Annotations: - "A HydroPowerUnit is a PowerGeneratingUnit using hydrogen as fuel.", + "A HydroPowerUnit is a PowerGeneratingUnit using the potential and/or kinetic energy of water.", rdfs:comment "will be discussed later" SubClassOf: From af521512b9950ca0922d7471ecb3474183ac8480 Mon Sep 17 00:00:00 2001 From: akleinau <56925445+akleinau@users.noreply.github.com> Date: Tue, 24 Mar 2020 09:48:10 +0100 Subject: [PATCH 32/44] update SolarThermalPowerUnit --- src/ontology/edits/oeo-physical.omn | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/ontology/edits/oeo-physical.omn b/src/ontology/edits/oeo-physical.omn index cfdb3c65c..b506969d2 100644 --- a/src/ontology/edits/oeo-physical.omn +++ b/src/ontology/edits/oeo-physical.omn @@ -642,10 +642,11 @@ Class: Class: Annotations: - "A SolarThermalPowerUnit is a SolarPowerUnit using solar thermal energy." + "A SolarThermalPowerUnit is a SolarPowerUnit that has SolarThermalCollectors as parts." SubClassOf: - + , + some SolarThermalCollector Class: From 2b64f655d6a55dd090783f42f0310db4b0c2bedb Mon Sep 17 00:00:00 2001 From: akleinau <56925445+akleinau@users.noreply.github.com> Date: Tue, 24 Mar 2020 09:52:04 +0100 Subject: [PATCH 33/44] delete BiomassPowerUnit and update GasFiredPowerUnit --- src/ontology/edits/oeo-physical.omn | 29 ++++++----------------------- 1 file changed, 6 insertions(+), 23 deletions(-) diff --git a/src/ontology/edits/oeo-physical.omn b/src/ontology/edits/oeo-physical.omn index b506969d2..43674b446 100644 --- a/src/ontology/edits/oeo-physical.omn +++ b/src/ontology/edits/oeo-physical.omn @@ -307,15 +307,6 @@ Class: BiofuelPowerplant -Class: - - Annotations: - "A BiomassPowerUnit is a BiofuelPowerUnit using biomass as fuel." - - SubClassOf: - - - Class: Annotations: @@ -655,7 +646,7 @@ Class: "A SolidBiomassPowerUnit is a BiomassPowerUnit using solid biomass as fuel." SubClassOf: - , + , uses some PortionOfSolidBiomass @@ -665,7 +656,7 @@ Class: "A SolidBiomassPowerplant is a BiomassPowerplant having an aggregate of SolidBiomassPowerUnits as its PowerGeneratingUnits." SubClassOf: - BiomassPowerplant + BiofuelPowerplant Class: @@ -1006,17 +997,6 @@ Class: Biogasoline has_origin value biogenic -Class: BiomassPowerplant - - Annotations: - "A BiomassPowerplant is a BiofuelPowerplant having an aggregate of BiomassPowerUnits as its PowerGeneratingUnits."@en - - SubClassOf: - BiofuelPowerplant, - some , - some SteamTurbine - - Class: BlastFurnaceGas Annotations: @@ -1515,7 +1495,10 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/279" and ( some EnergyCarrierDisposition) SubClassOf: - PortionOfMatter + PortionOfMatter, + uses some + (Fuel + and (has_state_of_matter value gaseous)) Class: Fusion From 1e6aad3aaa64953dfd72230421bd96b70fc7545c Mon Sep 17 00:00:00 2001 From: akleinau <56925445+akleinau@users.noreply.github.com> Date: Tue, 24 Mar 2020 09:56:45 +0100 Subject: [PATCH 34/44] delete fuel doubles in defs --- src/ontology/edits/oeo-physical.omn | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ontology/edits/oeo-physical.omn b/src/ontology/edits/oeo-physical.omn index 43674b446..f8b50c2a6 100644 --- a/src/ontology/edits/oeo-physical.omn +++ b/src/ontology/edits/oeo-physical.omn @@ -281,7 +281,7 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/279" Class: Annotations: - "A BiofuelPowerUnit is a RegenerativePowerUnit using biofuel as fuel." + "A BiofuelPowerUnit is a RegenerativePowerUnit using biofuel." SubClassOf: , @@ -423,7 +423,7 @@ Class: Annotations: - "A FossilPowerUnit is a PowerGeneratingUnit using FossilCombustionFuel as Fuel." + "A FossilPowerUnit is a PowerGeneratingUnit using FossilCombustionFuel." SubClassOf: PowerGeneratingUnit, @@ -561,7 +561,7 @@ Class: Annotations: - "A NuclearPowerUnit is a PowerGeneratingUnit using nuclear fuel as fuel." + "A NuclearPowerUnit is a PowerGeneratingUnit using nuclear fuel." SubClassOf: PowerGeneratingUnit, @@ -601,7 +601,7 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/273" Class: Annotations: - "A RegenerativePowerUnit is a PowerGeneratingUnit using regenerative fuels as fuel." + "A RegenerativePowerUnit is a PowerGeneratingUnit using regenerative fuels." SubClassOf: PowerGeneratingUnit, From 18a39d199a25ed3918388f411b2d328d50fe3c88 Mon Sep 17 00:00:00 2001 From: akleinau <56925445+akleinau@users.noreply.github.com> Date: Tue, 24 Mar 2020 17:49:28 +0100 Subject: [PATCH 35/44] update Powerplant defs - delete "one kind of" in Powerplant defs --- src/ontology/edits/oeo-physical.omn | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/ontology/edits/oeo-physical.omn b/src/ontology/edits/oeo-physical.omn index f8b50c2a6..eb69c7aab 100644 --- a/src/ontology/edits/oeo-physical.omn +++ b/src/ontology/edits/oeo-physical.omn @@ -1476,7 +1476,7 @@ Class: FlowBattery Class: FossilPowerplant Annotations: - "A FossilePowerplant is a Powerplant having an aggregate of one kind of FossilePowerUnits as its PowerGeneratingUnits." + "A FossilePowerplant is a Powerplant having an aggregate of FossilePowerUnits as its PowerGeneratingUnits." SubClassOf: , @@ -2446,8 +2446,7 @@ Class: Perfluorocarbon Class: PhotovoltaicPowerplant Annotations: - "A PhotovoltaicPowerplant is a RegenerativePowerplant having an aggregate of PVPanels as its PowerGeneratingUnits."@en, - "A photovoltaic generator uses PVPanels and solar energy to generate electricity."@en + "A PhotovoltaicPowerplant is a RegenerativePowerplant having an aggregate of PVPanels as its PowerGeneratingUnits."@en SubClassOf: SolarPowerPlant, @@ -2589,7 +2588,7 @@ Class: Rail Class: RegenerativePowerplant Annotations: - rdfs:comment "A RegenerativePowerplant is a Powerplant having an aggregate of one kind of RegenerativePowerUnits as its PowerGeneratingUnits." + "A RegenerativePowerplant is a Powerplant having an aggregate of RegenerativePowerUnits as its PowerGeneratingUnits." SubClassOf: , From 487b9b7b7325448209877e04c4de9cdf8a5f97f3 Mon Sep 17 00:00:00 2001 From: akleinau <56925445+akleinau@users.noreply.github.com> Date: Thu, 26 Mar 2020 09:20:41 +0100 Subject: [PATCH 36/44] Apply suggestions from code review Co-Authored-By: stap-m <38690039+stap-m@users.noreply.github.com> --- src/ontology/edits/oeo-physical.omn | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ontology/edits/oeo-physical.omn b/src/ontology/edits/oeo-physical.omn index eb69c7aab..4d7f40720 100644 --- a/src/ontology/edits/oeo-physical.omn +++ b/src/ontology/edits/oeo-physical.omn @@ -2330,7 +2330,7 @@ Class: OceanPowerplant Class: OffShoreWindFarm Annotations: - "An offshore wind electricity generator is a WindFarm that is build off shore above or in the ocean."@en + "An offshore wind farm is a WindFarm that is build in a body of water, usually the ocean."@en SubClassOf: WindFarm @@ -2374,7 +2374,7 @@ Class: OilPowerplant Class: OnShoreWindFarm Annotations: - "An onshore wind electricity generator is a WindFarm that is build on land."@en + "An onshore wind farm is a WindFarm that is build on land."@en SubClassOf: WindFarm @@ -2631,7 +2631,7 @@ Class: Retail Class: RooftopPhotovoltaicPowerplant Annotations: - "A rooftop photovoltaic electricity powerplant is a photovoltaic powerplant that is installed on top of the roof of a building."@en + "A rooftop photovoltaic powerplant is a photovoltaic powerplant that is installed on top of the roof of a building."@en SubClassOf: PhotovoltaicPowerplant From e2de87f2f36a65a9923337b05cb601522314f949 Mon Sep 17 00:00:00 2001 From: akleinau <56925445+akleinau@users.noreply.github.com> Date: Thu, 26 Mar 2020 09:27:30 +0100 Subject: [PATCH 37/44] rename WindEnergyConverter and Solarpark - WindEnergyConverter to WindEnergyConvertingUnit - SolarPark to FieldPhotovolaicPowerplant --- src/ontology/edits/oeo-physical.omn | 33 +++++++++++++++-------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/src/ontology/edits/oeo-physical.omn b/src/ontology/edits/oeo-physical.omn index 4d7f40720..5a7b68ad3 100644 --- a/src/ontology/edits/oeo-physical.omn +++ b/src/ontology/edits/oeo-physical.omn @@ -720,10 +720,10 @@ Class: -Class: +Class: Annotations: - rdfs:comment "A WindEnergyConverter is a RegenerativePowerUnit that uses wind energy." + definition "A WindEnergyConvertiongUnit is a RegenerativePowerUnit that uses wind energy." SubClassOf: , @@ -1440,6 +1440,19 @@ Class: FederalState Land +Class: FieldPhotovoltaicPowerplant + + Annotations: + "A FieldPhotovoltaicPowerplant (also: solar farm, solar park) is a PhotovoltaicPowerplant that is installed out in the open on the ground."@en, + "Solar park" + + SubClassOf: + PhotovoltaicPowerplant + + DisjointWith: + RooftopPhotovoltaicPowerplant + + Class: Fission Annotations: @@ -2637,7 +2650,7 @@ Class: RooftopPhotovoltaicPowerplant PhotovoltaicPowerplant DisjointWith: - SolarPark + FieldPhotovoltaicPowerplant Class: RunOfRiverPowerplant @@ -2712,18 +2725,6 @@ Class: SolarEnergy some -Class: SolarPark - - Annotations: - "A solar park (also: solar farm, field photovoltaic electricity powerplant) is a PhotovoltaicPowerplant that is installed out in the open on the ground."@en - - SubClassOf: - PhotovoltaicPowerplant - - DisjointWith: - RooftopPhotovoltaicPowerplant - - Class: SolarPhotovoltaic Annotations: @@ -3053,7 +3054,7 @@ Class: WindFarm SubClassOf: RegenerativePowerplant, - some + some Class: WindTurbine From 1e9a87bcfafb40316743d94d3673fdaba33a359c Mon Sep 17 00:00:00 2001 From: l-emele <36884905+l-emele@users.noreply.github.com> Date: Mon, 30 Mar 2020 09:45:25 +0200 Subject: [PATCH 38/44] Update src/ontology/edits/oeo-physical.omn Fix typo --- src/ontology/edits/oeo-physical.omn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ontology/edits/oeo-physical.omn b/src/ontology/edits/oeo-physical.omn index 5a7b68ad3..64e54a0d4 100644 --- a/src/ontology/edits/oeo-physical.omn +++ b/src/ontology/edits/oeo-physical.omn @@ -1489,7 +1489,7 @@ Class: FlowBattery Class: FossilPowerplant Annotations: - "A FossilePowerplant is a Powerplant having an aggregate of FossilePowerUnits as its PowerGeneratingUnits." + "A FossilPowerplant is a Powerplant having an aggregate of FossilPowerUnits as its PowerGeneratingUnits." SubClassOf: , From 45b6bc07842e228e496836b643de9fb7385f7299 Mon Sep 17 00:00:00 2001 From: l-emele <36884905+l-emele@users.noreply.github.com> Date: Mon, 30 Mar 2020 10:07:07 +0200 Subject: [PATCH 39/44] Update src/ontology/edits/oeo-physical.omn Fix typo --- src/ontology/edits/oeo-physical.omn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ontology/edits/oeo-physical.omn b/src/ontology/edits/oeo-physical.omn index 64e54a0d4..d0b011938 100644 --- a/src/ontology/edits/oeo-physical.omn +++ b/src/ontology/edits/oeo-physical.omn @@ -1538,7 +1538,7 @@ Class: GasDieselOil Class: GasPowerplant Annotations: - "A GasPowerplant is a FossilePowerplant having an aggregate of GasFiredPowerUnits as its PowerGeneratingUnits."@en + "A GasPowerplant is a FossilPowerplant having an aggregate of GasFiredPowerUnits as its PowerGeneratingUnits."@en SubClassOf: FossilPowerplant, From dd9f96ea77852160c5a4ea7578cee85daa0c18bb Mon Sep 17 00:00:00 2001 From: l-emele <36884905+l-emele@users.noreply.github.com> Date: Mon, 30 Mar 2020 10:09:08 +0200 Subject: [PATCH 40/44] Update src/ontology/edits/oeo-physical.omn Fix typo --- src/ontology/edits/oeo-physical.omn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ontology/edits/oeo-physical.omn b/src/ontology/edits/oeo-physical.omn index d0b011938..1c466b97e 100644 --- a/src/ontology/edits/oeo-physical.omn +++ b/src/ontology/edits/oeo-physical.omn @@ -2376,7 +2376,7 @@ It consists of hydrocarbons of various molecular weights and other organic compo Class: OilPowerplant Annotations: - "An OilPowerplant is a FossilePowerplant having an aggregate of OilPowerUnits as its PowerGeneratingUnits." + "An OilPowerplant is a FossilPowerplant having an aggregate of OilPowerUnits as its PowerGeneratingUnits." SubClassOf: FossilPowerplant, From 4546877fc5d4cb3915059b1d4da2f106fd1cb114 Mon Sep 17 00:00:00 2001 From: l-emele <36884905+l-emele@users.noreply.github.com> Date: Mon, 30 Mar 2020 10:15:56 +0200 Subject: [PATCH 41/44] Update src/ontology/edits/oeo-physical.omn Fix typo --- src/ontology/edits/oeo-physical.omn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ontology/edits/oeo-physical.omn b/src/ontology/edits/oeo-physical.omn index 1c466b97e..005f56f66 100644 --- a/src/ontology/edits/oeo-physical.omn +++ b/src/ontology/edits/oeo-physical.omn @@ -2986,7 +2986,7 @@ Class: WasteFuel Class: WastePowerplant Annotations: - "A WastePowerplant is a FossilePowerplant having an aggregate of WastePowerUnits as its PowerGeneratingUnits."@en + "A WastePowerplant is a FossilPowerplant having an aggregate of WastePowerUnits as its PowerGeneratingUnits."@en SubClassOf: FossilPowerplant, From 2f96b7eba80725e9c3c9edfb9a49afe40e19b034 Mon Sep 17 00:00:00 2001 From: akleinau <56925445+akleinau@users.noreply.github.com> Date: Mon, 30 Mar 2020 11:04:08 +0200 Subject: [PATCH 42/44] add 'has physical output' to EnergyConvertingDevice subclasses --- src/ontology/edits/oeo-physical.omn | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/ontology/edits/oeo-physical.omn b/src/ontology/edits/oeo-physical.omn index 005f56f66..2d9876b69 100644 --- a/src/ontology/edits/oeo-physical.omn +++ b/src/ontology/edits/oeo-physical.omn @@ -1508,10 +1508,7 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/279" and ( some EnergyCarrierDisposition) SubClassOf: - PortionOfMatter, - uses some - (Fuel - and (has_state_of_matter value gaseous)) + PortionOfMatter Class: Fusion @@ -1588,7 +1585,8 @@ Class: Generator pull request: https://github.com/OpenEnergyPlatform/ontology/pull/273" SubClassOf: - + , + has_physical_output some ElectricalEnergy DisjointWith: Line @@ -1763,7 +1761,8 @@ Class: Heater pull request: https://github.com/OpenEnergyPlatform/ontology/pull/273" SubClassOf: - + , + has_physical_output some Heat Class: HeatingOil From ab72b0eac00463c8d8e319b4e8260fa7c4d03f6c Mon Sep 17 00:00:00 2001 From: akleinau <56925445+akleinau@users.noreply.github.com> Date: Mon, 30 Mar 2020 11:10:56 +0200 Subject: [PATCH 43/44] add suggestions from code review --- src/ontology/edits/oeo-physical.omn | 1 - 1 file changed, 1 deletion(-) diff --git a/src/ontology/edits/oeo-physical.omn b/src/ontology/edits/oeo-physical.omn index 2d9876b69..ecb305e18 100644 --- a/src/ontology/edits/oeo-physical.omn +++ b/src/ontology/edits/oeo-physical.omn @@ -2752,7 +2752,6 @@ Class: SolarThermalCollector SubClassOf: Heater, - has_physical_output some Power, has_physical_input only SolarThermalHeat From 90424a1f74207affe4e13f1fcf7e2a5230fa1417 Mon Sep 17 00:00:00 2001 From: akleinau <56925445+akleinau@users.noreply.github.com> Date: Mon, 30 Mar 2020 13:01:05 +0200 Subject: [PATCH 44/44] make EnergyConvertingDevice subclasses disjoint --- src/ontology/edits/oeo-physical.omn | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/ontology/edits/oeo-physical.omn b/src/ontology/edits/oeo-physical.omn index ecb305e18..8ffdef2da 100644 --- a/src/ontology/edits/oeo-physical.omn +++ b/src/ontology/edits/oeo-physical.omn @@ -1588,9 +1588,6 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/273" , has_physical_output some ElectricalEnergy - DisjointWith: - Line - Class: GeographicCoordinate @@ -2050,9 +2047,6 @@ Class: Line SubClassOf: Link - DisjointWith: - Generator - Class: Link @@ -3226,3 +3220,6 @@ Individual: synthetic has_origin some origin +DisjointClasses: + Generator,Heater,Turbine +