diff --git a/README.md b/README.md index fe81519b..31aaa0ef 100644 --- a/README.md +++ b/README.md @@ -21,9 +21,9 @@ it. PyPSA-Eur-Sec builds on the electricity generation and transmission model [PyPSA-Eur](https://github.com/PyPSA/pypsa-eur) to add demand and supply for the following sectors: transport, space and water -heating, biomass, industry and industrial feedstocks. This completes -the energy system and includes all greenhouse gas emitters except -waste management, agriculture, forestry and land use. +heating, biomass, industry and industrial feedstocks, agriculture, +forestry and fishing. This completes the energy system and includes +all greenhouse gas emitters except waste management and land use. Please see the [documentation](https://pypsa-eur-sec.readthedocs.io/) for installation instructions and other useful information about the snakemake workflow. diff --git a/doc/release_notes.rst b/doc/release_notes.rst index 016e19dc..0c65c8c2 100644 --- a/doc/release_notes.rst +++ b/doc/release_notes.rst @@ -67,6 +67,10 @@ Future release * The transformation of the Steel and Aluminium production can be now defined for different years in the ``config.yaml`` file. * Include the option to alter the maximum energy capacity of a store via the ``carrier+factor`` in the ``{sector_opts}`` wildcard. This can be useful for sensitivity analyses. Example: ``co2 stored+e2`` multiplies the ``e_nom_max`` by factor 2. In this example, ``e_nom_max`` represents the CO2 sequestration potential in Europe. * Compatibility with ``xarray`` version 0.19. +* Added option to include emissions and energy demands of agriculture, forestry and fishing sector via the letter ``A`` in the ``{sector_opts}`` wildcard. + Demands are separated into electricity, heat and oil for machinery. + Fuel-switching for machinery from oil to electricity can be set exogenously in the ``config.yaml`` + `#147 `_. PyPSA-Eur-Sec 0.5.0 (21st May 2021) =================================== diff --git a/doc/supply_demand.rst b/doc/supply_demand.rst index 77317094..31563c43 100644 --- a/doc/supply_demand.rst +++ b/doc/supply_demand.rst @@ -43,7 +43,7 @@ Heat demand is split into: * ``urban central``: large-scale district heating networks in urban areas with dense heat demand * ``residential/services urban decentral``: heating for individual buildings in urban areas -* ``residential/services rural``: heating for individual buildings in rural areas +* ``residential/services rural``: heating for individual buildings in rural areas, agriculture heat uses Heat supply @@ -189,7 +189,7 @@ Only wastes and residues from the JRC biomass dataset. Oil product demand ===================== -Transport fuels and naphtha as a feedstock for the chemicals industry. +Transport fuels, agriculture machinery and naphtha as a feedstock for the chemicals industry. Oil product supply ======================