@@ -1406,7 +1406,7 @@ related to the central object `EnergyDemand`, defined for different end-uses
(e.g. space heating, electrical appliances) and acquisition methods (e.g.
measurements, simulation).
## Energy amounts and types
## Energy demands
### EnergyDemand
...
...
@@ -1471,75 +1471,7 @@ The XML examples below detail the two end-uses of a same building.
</bldg:Building>
```
### EnergySource
Final energy consumed (and sometimes produced) by the `EnergyConversionSystem`.
It is defined by an `energyAmount`, a time series containing the amount of consumed or produced energy,
and an `energyCarrier` of type `EnergyCarrier`.
`FinalEnergy` is linked to `EnergyConversionSystem` via `produces` or `consumes`. Each `EnergyConversionSystem` can have multiple `FinalEnergies` that it consumes or produces. With `produces` and `consumes`, it is possible to link multiple `EnergyConversionSystem` if one consumes energy produced by another.
The XML example below shows a typical use of `FinalEnergy`.
```xml
<!--Heat pump and CHP with EnergySource objects-->
Energy carrier for `FinalEnergy`, described by `co2EmissionFactor` (with unit of measure), `primaryEnergyFactor` (with unit of measure and EnergyCarrierType`, see example.
List of energy carriers as coal, chilled water or electricity.
## Energy distribution
## Energy distribution and storage
### EnergyDistributionSystem
...
...
@@ -1566,8 +1498,6 @@ Type for electrical distribution systems, described by current and voltage.
This list is a collection of medium types as air and water.
## Energy storage
### StorageSystem
System storing energy. A same storage may store the energy of different
...
...
@@ -1738,6 +1668,86 @@ The XML example below shows how to define a PV panel in a surface of a building.
</bldg:Building>
```
### FinalEnergy
Final energy consumed (and sometimes produced) by the `EnergyConversionSystem`.
It is defined by an `energyAmount`, a time series containing the amount of consumed or produced energy,
and an `energyCarrier` of type `EnergyCarrier`.
`FinalEnergy` is linked to `EnergyConversionSystem` via `produces` or `consumes`. Each `EnergyConversionSystem` can have multiple `FinalEnergies` that it consumes or produces. With `produces` and `consumes`, it is possible to link multiple `EnergyConversionSystem` if one consumes energy produced by another.
The XML example below shows a typical use of `FinalEnergy`.
```xml
<!--Heat pump and CHP with EnergySource objects-->
Energy carrier for `FinalEnergy`, described by `co2EmissionFactor` (with unit of measure), `primaryEnergyFactor` (with unit of measure and energy carrier `type`, see example.