diff --git a/config/config.default.yaml b/config/config.default.yaml index a5e49539..b9e8dc91 100644 --- a/config/config.default.yaml +++ b/config/config.default.yaml @@ -90,7 +90,6 @@ co2_budget: # docs in https://pypsa-eur.readthedocs.io/en/latest/configuration.html#electricity electricity: - voltages: [220., 300., 380.] voltages: [220., 300., 380., 500., 750.] gaslimit_enable: false gaslimit: false diff --git a/doc/release_notes.rst b/doc/release_notes.rst index 88f05854..7a045866 100644 --- a/doc/release_notes.rst +++ b/doc/release_notes.rst @@ -10,6 +10,11 @@ Release Notes Upcoming Release ================ +* More wildcard options now have a corresponding config entry. If the wildcard + is given, then its value is used. If the wildcard is not given but the options + in config are enabled, then the value from config is used. If neither is + given, the options are skipped. + * Distinguish between stored and sequestered CO2. Stored CO2 is stored overground in tanks and can be used for CCU (e.g. methanolisation). Sequestered CO2 is stored underground and can no longer be used for CCU. This