Fabian Neumann
27a6f619cd
reduce min_part_load_fischer_tropsch to 50%
2024-05-13 15:24:33 +02:00
Fabian Neumann
16b1895011
revert further unintended changes
2024-05-13 14:40:43 +02:00
Fabian Neumann
8706f0411e
revert use of co2limit_enable for sector-coupled networks
2024-05-13 14:37:07 +02:00
Fabian Neumann
6321a69870
rearrange config settings under 'run: shared_resources:'
2024-05-13 14:23:09 +02:00
toniseibold
e75e3bd8d7
allow excluding files from shared_resources
2024-05-13 14:21:43 +02:00
Fabian Neumann
e023872d44
stop using wildcard by default
2024-05-13 10:50:24 +02:00
Fabian Neumann
84d6634af0
Merge branch 'master' into implement-floating
2024-05-13 10:04:42 +02:00
Fabian Neumann
a16b74f68a
Update config/config.default.yaml
2024-05-13 10:04:05 +02:00
Fabian Neumann
0d9e0f34fd
Merge branch 'master' into reduced-data-bundle
2024-05-12 15:53:08 +02:00
Philipp Glaum
da617be276
Merge branch 'master' of github.com:PyPSA/pypsa-eur into implement-floating
2024-05-10 13:29:58 +02:00
pre-commit-ci[bot]
3e93c14dd4
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-04-29 11:32:24 +00:00
Fabian Neumann
d101b8a95a
Merge branch 'master' into existing-caps-from-pm
2024-04-25 17:33:48 +02:00
Parisra
94e45168f8
Add solar-hsat to config
...
1. Solar PV with single-axis tracking is added as 'solar-hast' to carriers. 2. Capacity factors are taken from atlite. Land-use is 15% higher acc. to NREL (Land-Use Requirements for Solar Power Plants in the United States). 3. The option for adding solar-hast to the network is set to 'True' as default. 4. A color is added for solar-hsat
2024-04-25 11:26:09 +02:00
Fabian Neumann
c505ea174e
doc: update solver requirements [skip ci]
2024-04-24 16:23:43 +02:00
Thomas Gilon
3fe427a0cd
Merge branch 'master' into feature/enhance-agg-p-nom-limits
2024-04-19 17:52:01 +02:00
Thomas Gilon
e90b37e6d7
Improve agg_p_nom_minmax file management
2024-04-19 17:47:40 +02:00
Fabian Neumann
991eef6d97
update and reduce databundle size
2024-04-15 14:48:34 +02:00
lisazeyen
618ecdddeb
Merge branch 'master' into land-transport-fix
2024-04-15 09:13:28 +02:00
Thomas Gilon
ed83f1fb4a
Add aggregated constraints for wind and possibility to take existing into account in solve_network
...
# Conflicts:
# scripts/solve_network.py
2024-04-12 17:14:31 +02:00
lisazeyen
a424bd2e40
rename efficiencies in config.yaml
2024-04-12 14:37:11 +02:00
lisazeyen
53a6b91b06
clear up units
2024-04-12 14:28:52 +02:00
Michael Lindner
700b0e912a
add more grouping years to avoid errors
2024-04-11 14:11:42 +02:00
Michael Lindner
7c30a2835f
group existing capacities to the earlier grouping_year for consistency with optimized capacities
2024-04-11 14:11:22 +02:00
Koen van Greevenbroek
859212b21f
Use powerplantmatching IRENASTAT for add_existing_baseyear
2024-04-11 12:47:13 +02:00
Fabian Neumann
5ecd56d53c
Merge pull request #1010 from PyPSA/correct-co2-seq-potentials
...
Correct co2 potentials
2024-04-10 17:15:03 +02:00
pre-commit-ci[bot]
f3ad1a36c7
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-04-10 15:14:29 +00:00
Fabian Neumann
6bc1363080
allow sequestration potential attributes to be string
2024-04-10 17:13:58 +02:00
lisazeyen
9d9ab98279
add other co2 potentials
2024-04-10 12:06:53 +02:00
Philipp Glaum
74185560e0
initial implementation
2024-04-10 12:04:45 +02:00
lisazeyen
3819e64377
remove solver name
2024-04-02 16:50:09 +02:00
LukasFrankenQ
08ccd4d233
moved docs from config file to docs
2024-03-27 11:16:23 +01:00
LukasFrankenQ
0396828e3a
Merge https://github.com/pypsa/pypsa-eur
2024-03-27 00:09:02 +01:00
lisazeyen
d7fedc6235
Merge branch 'master' into land-transport-fix
2024-03-26 16:25:27 +01:00
LukasFrankenQ
97acf2f12e
included Lisas PR suggestions
2024-03-19 19:30:23 +01:00
Fabian Neumann
e459c3c89d
add release notes; rename artificial to synthetic
2024-03-15 14:28:01 +01:00
lisazeyen
fd82664292
Merge branch 'master' into land-transport-fix
2024-03-14 20:14:08 +01:00
Fabian Neumann
f695b63732
add more documentation
2024-03-14 14:31:18 +01:00
LukasFrankenQ
09765ad060
Merged https://github.com/pypsa/pypsa-eur
2024-03-14 12:03:56 +01:00
Fabian Neumann
7fa6811760
Merge branch 'master' into multiyear
2024-03-13 09:13:31 +01:00
Fabian Neumann
ed71978b92
use humanfriendly walltime specifications
2024-03-09 14:47:01 +01:00
Fabian Neumann
579cd0c756
Merge branch 'master' into multiyear
2024-03-06 16:34:53 +01:00
lisazeyen
5bfc64a658
Merge branch 'master' into land-transport-fix
2024-03-06 09:25:08 +01:00
Micha
d3283f5084
Merge branch 'master' into fix-lifetime
2024-03-06 08:22:25 +01:00
Michael Lindner
1e25f3adaf
add grouping years 1960-1975
2024-03-05 14:07:46 +01:00
Fabian Neumann
9d0724566c
Merge remote-tracking branch 'origin/master' into fneum/energy_totals
2024-03-05 13:40:49 +01:00
Fabian Neumann
3af878d69c
remove power statistics references
2024-03-05 10:33:41 +01:00
Fabian Neumann
8904943a87
integrate artificial load data supplement into build_electricity_demand
2024-03-04 19:37:52 +01:00
Fabian Neumann
c2011bce49
remove {weather_year} wildcard
2024-03-04 17:48:56 +01:00
Fabian Neumann
e6347621f9
remove operations rules to reduce amount of simultaneous changes
2024-03-04 17:42:35 +01:00
lisazeyen
f2ba96e148
add color for land transport demand
2024-03-04 11:26:06 +01:00
Koen van Greevenbroek
e891305c9d
Add selection of cutouts for heat to config
2024-03-01 14:37:16 +01:00
Koen van Greevenbroek
de0c0cd1f4
Merge remote-tracking branch 'upstream/master' into multiyear
2024-03-01 11:45:31 +01:00
lisazeyen
f08c6fe772
change technology data version to 0.8.1
2024-02-28 16:13:36 +01:00
toniseibold
d363aeb57d
removing old eurostat data reports as an option, cleaning up code
2024-02-27 12:04:07 +01:00
toniseibold
3298572ced
new energy totals from eurostat 2023 report scaling JRC IDEES data from 2015
2024-02-23 13:53:28 +01:00
Fabian Neumann
719d4dad23
Merge branch 'master' into scenario-management
2024-02-20 12:08:54 +01:00
Fabian Neumann
43159e15e9
update workflow charts
2024-02-19 17:15:20 +01:00
Fabian Neumann
16e2286188
update copyright years to 2024
2024-02-19 16:21:48 +01:00
Fabian Neumann
bbdcf0e055
bump technology-data version to 0.8.0
2024-02-19 16:20:28 +01:00
Fabian Neumann
feb0f1db19
Merge branch 'scenario-management' of github.com:PyPSA/pypsa-eur into scenario-management
2024-02-18 11:49:05 +01:00
Fabian Neumann
8e04b7a157
test.sh: add scenarios dry-run to test cases
2024-02-18 11:03:37 +01:00
pre-commit-ci[bot]
1fb90da743
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-02-18 09:42:23 +00:00
Fabian Neumann
83f1b5e41d
Add rule create_scenarios that runs config/create_scenarios.py on request
2024-02-18 10:41:31 +01:00
Fabian Neumann
20e37c232f
copy a scenarios.yaml from scenarios.template.yaml so it is not git tracked
2024-02-18 09:55:45 +01:00
Fabian Neumann
f710923320
Merge branch 'master' into scenario-management
2024-02-18 09:48:12 +01:00
Fabian Neumann
3e612950c2
revert part of #925 so that config.default.yaml is still copied and config.yaml remains untracked
2024-02-18 09:46:54 +01:00
Fabian Neumann
945180f153
allow_missing in collection rules, fixes for myopic, wildcard constraints without function
2024-02-17 23:37:03 +01:00
Fabian Neumann
35b2228891
Merge branch 'wc-to-cf' into scenario-management
2024-02-17 17:16:28 +01:00
Fabian Neumann
d2a66879de
Merge branch 'master' into scenario-management
2024-02-17 17:04:36 +01:00
Fabian Neumann
dd2416a59e
handle all {opts} and {sector_opts} wildcard values in config
2024-02-17 11:57:16 +01:00
Fabian Neumann
e9174d4f14
Merge branch 'master' into industry-pathway
2024-02-16 15:15:27 +01:00
Fabian Neumann
60406f1bc4
Merge pull request #933 from PyPSA/h2-pipe-losses
...
update h2 pipe losses
2024-02-16 13:32:30 +01:00
Fabian Neumann
9e8ed7394d
Update config/config.default.yaml
2024-02-16 13:32:24 +01:00
Fabian Neumann
4d4badc519
Merge branch 'master' into industry-pathway
2024-02-16 13:01:40 +01:00
Fabian Neumann
6a8ae68aec
Merge branch 'industry-coal-bug'
2024-02-16 12:47:34 +01:00
Fabian Neumann
16e42c8fe6
further progress and bugfixes
2024-02-16 11:17:00 +01:00
martacki
6196fd6892
change default energy totals year to 2013 to comply with default weather year
2024-02-15 16:29:29 +01:00
lisazeyen
8464415b35
update for 70 bars instead of 140
2024-02-15 15:14:32 +01:00
lisazeyen
87ab0a5575
update h2 pipe losses
2024-02-15 14:58:53 +01:00
Tom Brown
e14bae345b
new script to interpolate industry sector ratios today to tomorrow
...
For each country we gradually switch industry processes from today's
specific energy carrier usage per ton material output to the
best-in-class energy consumption of tomorrow in the
industry_sector_ratios.csv.
This is done on a per-country basis. The ratio of today to tomorrow's
energy consumption is set with the
config["industry"]["sector_ratios_fraction_future"] parameter.
2024-02-14 18:29:56 +01:00
Tom Brown
7f3ad792a9
use production to determine today's energy demand for basic chemicals
...
This uniformises how demand for basic chemicals is calculated.
We also avoid unnecessary use of ammonia production separately.
2024-02-14 18:29:50 +01:00
Tom Brown
cc57952402
industrial prod: use EU28 total for denominator for distribution key
...
This makes sure the distribution key is correct when only subsets of
countries are used. This is then consistent with the HVC, MeOH and Cl
totals being EU28 totals.
Without this change, industry production is overestimated when using
subsets of countries.
Or the user has to adjust the totals for industrial production
themselves.
2024-02-14 18:29:43 +01:00
Tom Brown
cbf7ed0d38
for today's industry energy demand, separate MeOH, Cl and HVC
...
I.e. split basic chemicals (without ammonia) into MeOH, Cl and HVC.
This now agrees with scheme for industrial sectors tomorrow.
2024-02-14 18:29:36 +01:00
Fabian Neumann
dbbfbaf1f3
Merge branch 'master' into scenario-management
2024-02-14 10:45:43 +01:00
Fabian Neumann
f024412301
simplify test cases
2024-02-12 16:49:15 +01:00
Fabian Neumann
b725a754cc
Merge branch 'default-config' of github.com:PyPSA/pypsa-eur into default-config
2024-02-12 13:57:04 +01:00
Fabian Neumann
69e20e3448
need at least one entry for config/config.yaml to read as yaml
2024-02-12 13:55:32 +01:00
pre-commit-ci[bot]
abe06a68fb
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-02-12 11:11:04 +00:00
Fabian Neumann
fe143ff8fe
use default config as base configuration
2024-02-12 12:10:05 +01:00
Fabian Neumann
bb7b65eebd
move create_scenarios.py to config directory
2024-02-12 11:52:07 +01:00
Tom Brown
8781e69066
bugfix: coal emissions for industry weren't tracked
...
Also allow industrial coal demand to be regional (so we can include
them in regional CO2 constraints).
2024-02-10 19:17:06 +01:00
Fabian Neumann
6de08bd523
Merge branch 'master' into scenario-management
2024-02-10 17:22:01 +01:00
Fabian Neumann
e0dafc50b3
add missing heat pump colors
2024-02-09 10:15:11 +01:00
Tom Brown
92d00a0c83
add new default to overdimension heating in individual buildings
...
This allows them to cover heat demand peaks e.g. 10% higher than
those in the data.
The disadvantage of manipulating the costs is that the capacity is
then not quite right. This way at least the costs are right.
Doing it properly would require introducing artificial peaks, but this
creates new problems (e.g. what is going on with wind/solar/other
demand).
2024-02-07 17:18:04 +01:00
Tom Brown
6d94439bbb
for existing heating use new default_heating_lifetime
...
This is because old costs default (25) is longer than all heating
technologies (20). Script was distributing across 25 years, then
throwing out boilers older than 20 years, an inconsistent
behaviour.
Now existing boilers are smoothly distributed across 20 years.
2024-02-07 17:15:37 +01:00
Fabian Neumann
5902be199f
powerplants_filter: phase-out status 2023 (incl. nuclear in DE)
2024-02-07 11:20:05 +01:00
Fabian Neumann
823765b353
update technology-data to 0.7.0 by default
2024-02-07 09:52:30 +01:00
Fabian
76872fa0f1
add sanitize_locations function and apply it
...
address some deprecation warnings
2024-02-05 16:16:34 +01:00
Fabian Neumann
3db6a65c04
Merge branch 'master' into encapsulate-resource-dir
2024-02-05 08:21:49 +01:00
Fabian Neumann
6d40ff1340
config: add sensible defaults for HVC recycling and reuse
2024-02-02 11:52:01 +01:00
