From 16b189501168ab3eb8ffcca83af49ff94d88f412 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Mon, 13 May 2024 14:40:43 +0200 Subject: [PATCH] revert further unintended changes --- config/config.entsoe-all.yaml | 2 +- config/test/config.electricity.yaml | 2 +- config/test/config.myopic.yaml | 2 -- config/test/config.overnight.yaml | 2 -- config/test/config.perfect.yaml | 2 -- doc/supply_demand.rst | 4 ++-- 6 files changed, 4 insertions(+), 10 deletions(-) diff --git a/config/config.entsoe-all.yaml b/config/config.entsoe-all.yaml index b26ea128..85eedb64 100644 --- a/config/config.entsoe-all.yaml +++ b/config/config.entsoe-all.yaml @@ -29,7 +29,7 @@ countries: ['AL', 'AT', 'BA', 'BE', 'BG', 'CH', 'CZ', 'DE', 'DK', 'EE', 'ES', 'F electricity: custom_powerplants: true - co2limit: 0 + co2limit: 9.59e+7 co2base: 1.918e+9 lines: diff --git a/config/test/config.electricity.yaml b/config/test/config.electricity.yaml index c5303027..6fdb018f 100644 --- a/config/test/config.electricity.yaml +++ b/config/test/config.electricity.yaml @@ -24,7 +24,7 @@ snapshots: end: "2013-03-08" electricity: - co2limit_enable: false + co2limit_enable: true co2limit: 100.e+6 extendable_carriers: diff --git a/config/test/config.myopic.yaml b/config/test/config.myopic.yaml index 15537520..0c3f360e 100644 --- a/config/test/config.myopic.yaml +++ b/config/test/config.myopic.yaml @@ -34,8 +34,6 @@ sector: central_heat_vent: true electricity: - co2limit_enable: false - co2limit: 100.e+6 extendable_carriers: Generator: [OCGT] diff --git a/config/test/config.overnight.yaml b/config/test/config.overnight.yaml index 12e27b4d..09342ae9 100644 --- a/config/test/config.overnight.yaml +++ b/config/test/config.overnight.yaml @@ -28,8 +28,6 @@ snapshots: end: "2013-03-08" electricity: - co2limit_enable: false - co2limit: 100.e+6 extendable_carriers: Generator: [OCGT] diff --git a/config/test/config.perfect.yaml b/config/test/config.perfect.yaml index e32ae3c8..c4dc963f 100644 --- a/config/test/config.perfect.yaml +++ b/config/test/config.perfect.yaml @@ -31,8 +31,6 @@ snapshots: end: "2013-03-08" electricity: - co2limit_enable: false - co2limit: 100.e+6 extendable_carriers: Generator: [OCGT] diff --git a/doc/supply_demand.rst b/doc/supply_demand.rst index bbb0217e..ab58368f 100644 --- a/doc/supply_demand.rst +++ b/doc/supply_demand.rst @@ -211,7 +211,7 @@ Today, most of the :math:`H_2` consumed globally is produced from natural gas by .. math:: - CH_4 + H_2O \xrightarrow{} CO + 3h_2 + CH_4 + H_2O \xrightarrow{} CO + 3H_2 combined with a water-gas shift reaction @@ -453,7 +453,7 @@ The basic chemicals consumption data from the `JRC IDEES `__ for every country. Ammonia can be made from hydrogen and nitrogen using the Haber-Bosch process. .. math:: - N_2 + 3h_2 \xrightarrow{} 2NH_3 + N_2 + 3H_2 \xrightarrow{} 2NH_3