Koen van Greevenbroek
2a6dcc4c12
Minor bugfixes for new time aggregation implementation
2024-05-21 18:09:09 +02:00
pre-commit-ci[bot]
288ccbd513
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-05-21 14:00:43 +00:00
Fabian Neumann
eb4381be4d
update energy balances April 2023 link
2024-05-21 15:59:46 +02:00
Fabian Neumann
0370deebca
apply pre-commit
2024-05-21 15:30:56 +02:00
Fabian Neumann
da10374158
apply ruff linting
2024-05-21 15:28:24 +02:00
Fabian Neumann
9545b757b0
correctly trigger add_solar_potential_constraints
2024-05-21 15:28:03 +02:00
Fabian Neumann
ca451fe9d5
ruff: safe fixes
2024-05-21 14:55:58 +02:00
Fabian Neumann
d19a3bcb64
time_aggregation: handle case where resolution is bool false
2024-05-21 14:22:21 +02:00
pre-commit-ci[bot]
b29b9e6c5d
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-05-20 20:25:43 +00:00
Fabian Neumann
3f01938eee
Merge branch 'master' into fix_biomass_transport
2024-05-20 22:24:59 +02:00
Fabian Neumann
00efffcc13
move up methanol for industry, to before shipping
2024-05-20 22:06:31 +02:00
Fabian Neumann
0ad3489d3a
Merge branch 'feature/methanol-production' of github.com:Climact/pypsa-eur-climact into Climact-feature/methanol-production
2024-05-20 22:06:15 +02:00
Fabian Neumann
eeb548c03f
Merge branch 'feature/fix-industry-intermediate' of github.com:Climact/pypsa-eur-climact into Climact-feature/fix-industry-intermediate
2024-05-20 21:44:19 +02:00
Fabian Neumann
60a26a67a0
simplify check for coal/coke industry demand
2024-05-20 21:08:44 +02:00
Fabian Neumann
476349292c
Merge branch 'feature/fix-non-steel-coal-demand' of github.com:Climact/pypsa-eur-climact into Climact-feature/fix-non-steel-coal-demand
2024-05-20 21:01:16 +02:00
Fabian Neumann
a8cd1186b8
clarify differences between Co2L in {sector_opts} and {opts} wildcard ( closes #865 )
2024-05-20 17:18:55 +02:00
Fabian Neumann
c7d8af998c
only apply rolling horizon setting in ( closes #864 )
2024-05-20 17:00:56 +02:00
Fabian Neumann
a2012d8937
pre-commit formatting [no ci]
2024-05-20 15:49:40 +02:00
Fabian Neumann
65b05e92a1
Merge branch 'feature/enhance-agg-p-nom-limits' of github.com:Climact/pypsa-eur-climact into Climact-feature/enhance-agg-p-nom-limits
2024-05-20 15:49:14 +02:00
Fabian Neumann
f76f7879f0
Merge branch 'fix_energy_totals'
2024-05-20 15:38:09 +02:00
Fabian Neumann
f25c594a07
bugfix: include total heavy-duty road freight; do not treat total transport as other but including electricity
2024-05-20 15:37:54 +02:00
Fabian Neumann
408e24de80
Merge branch 'master' of github.com:PyPSA/pypsa-eur
2024-05-20 15:01:05 +02:00
Fabian Neumann
c89ce9f045
bugfix: correctly distinguish existing OCGT and CCGT
2024-05-20 15:00:46 +02:00
Fabian Neumann
d2c48b6603
Merge pull request #1071 from SermishaNarayana/master
...
Modification to function "add_operational_reserve_margin" in solve_ne…
2024-05-20 12:45:10 +02:00
Fabian Neumann
7ce15931e5
add simplified power distribution grid losses
2024-05-20 12:41:54 +02:00
pre-commit-ci[bot]
6722e584ba
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-05-20 10:03:44 +00:00
Sermisha
d7435b6214
Modification to function "add_operational_reserve_margin" in solve_network.py
...
Typecasted pandas dataframes to xarray datasets to allow for multiplication with pypsa variables
2024-05-20 15:30:38 +05:30
Fabian Neumann
6c9fc50a1c
Merge branch 'master' of github.com:PyPSA/pypsa-eur
2024-05-20 11:54:20 +02:00
Fabian Neumann
60441ddfdd
pre-commit formatting [no ci]
2024-05-20 11:52:23 +02:00
Fabian Neumann
bf33518135
time_aggregation: add missing logger object
2024-05-20 11:51:45 +02:00
Fabian Neumann
9152425936
remove handling of tsam as optional dependency
2024-05-20 11:51:24 +02:00
Fabian Neumann
9527f4cf77
Merge branch 'split-out-time-agg' of github.com:koen-vg/pypsa-eur into koen-vg-split-out-time-agg
2024-05-20 11:38:02 +02:00
Fabian Neumann
cf8ee69f94
Merge pull request #1067 from PyPSA/fix_DC_cluster_issue
...
fix_DC_cluster_issue
2024-05-19 20:19:31 +02:00
pre-commit-ci[bot]
b890149d39
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-05-18 12:22:30 +00:00
Thomas Gilon
c3dcff8a35
Define methanol energy demand for industry
2024-05-17 16:04:48 +02:00
Philipp Glaum
ac48fdaaf4
base_network.py: connect new tyndp links only to closest AC bus
2024-05-17 14:46:20 +02:00
Parisra
ce14cd6647
Update plot_summary.py
...
-Add 2022 emissions to plot carbon budget
-Add UK emissions to the previous numbers
2024-05-16 17:06:28 +02:00
Fabian Neumann
27009f5060
double solar rooftop PV potentials ( closes #935 )
2024-05-15 18:18:15 +02:00
Fabian Neumann
e4d70fdf4a
remove exogenous rooftop_share
2024-05-15 18:13:49 +02:00
Fabian Neumann
e8779fa5a4
small follow-up to #1066 solar-hsat
2024-05-15 18:02:15 +02:00
Fabian Neumann
44fb8cad1f
Merge pull request #957 from PyPSA/land-transport-fix
...
Land transport fix
2024-05-15 17:13:56 +02:00
Fabian Neumann
1aa4f12c5e
remove adjust_transport_temporal_agg
2024-05-15 16:51:17 +02:00
Fabian Neumann
5b5be71341
use loads instead of links where possible
2024-05-15 16:41:49 +02:00
pre-commit-ci[bot]
a352cc346b
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-05-15 14:18:18 +00:00
lisazeyen
96118ab1f4
Merge branch 'master' into adding_solar_tracking_single_axis
2024-05-15 16:18:13 +02:00
lisazeyen
2223e011a0
merge master
2024-05-15 16:14:25 +02:00
Fabian Neumann
ff603f2c14
Merge branch 'master' into land-transport-fix
2024-05-15 15:25:56 +02:00
Fabian Neumann
ea8fc31a30
link_thresholds as dictionary, not float, more logging messages
2024-05-15 15:15:09 +02:00
lisazeyen
e8de4f308f
rename solar-hsat in config
2024-05-15 15:08:52 +02:00
lisazeyen
6723191031
simplify if statement
2024-05-15 15:04:04 +02:00
lisazeyen
541e267a83
replace print with logger.info
2024-05-15 15:00:42 +02:00
lisazeyen
a9be2825ec
reforumlate constraint
2024-05-15 14:59:34 +02:00
Fabian Neumann
9b50c846a0
solve: add option for post-discretization of lines and links
2024-05-15 14:56:50 +02:00
pre-commit-ci[bot]
5dc2e6862b
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-05-15 14:21:11 +02:00
JulianGeis
26184e370b
add functionality for post discretization of lines and transmission infrastructure links
2024-05-15 14:19:35 +02:00
Koen van Greevenbroek
f8f0b4cea0
Document the new time_aggregation rule
2024-05-15 13:34:20 +02:00
Koen van Greevenbroek
354fffe6f0
Split time agg into own rule; same agg for all planning horizons
2024-05-15 13:26:03 +02:00
pre-commit-ci[bot]
985aecb0c4
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-05-13 19:39:02 +00:00
Fabian Neumann
d6f9e5f4a6
Merge branch 'feature/fix-gas-retrofit' of github.com:Climact/pypsa-eur-climact into Climact-feature/fix-gas-retrofit
2024-05-13 18:05:35 +02:00
Fabian Neumann
cadd33431f
sanitize_locations: avoid attribute error for electricity-only runs ( closes #939 )
2024-05-13 17:59:21 +02:00
Fabian Neumann
788e07a0d1
bugfix to avoid duplicated offshore regions ( closes #396 )
2024-05-13 17:56:28 +02:00
Fabian Neumann
ef395cadf9
Merge pull request #1060 from PyPSA/landfill_master
...
Improve handling of plastics (for `master`)
2024-05-13 17:44:46 +02:00
Fabian Neumann
8fbd60883d
Merge branch 'master' into exclude_shared_resources_master
2024-05-13 17:42:40 +02:00
Fabian Neumann
a9333458b3
handle potentially diverging spatial resolutions of HVC
2024-05-13 17:40:10 +02:00
pre-commit-ci[bot]
c311f7bdf8
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-05-13 15:33:35 +00:00
lisazeyen
da9beaa98f
rename Greece iso-code
2024-05-13 17:33:07 +02:00
pre-commit-ci[bot]
b529ab1d3c
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-05-13 15:14:35 +00:00
Fabian Neumann
614590b98f
Merge branch 'landfill_master' of github.com:PyPSA/pypsa-eur into landfill_master
2024-05-13 17:14:04 +02:00
Fabian Neumann
649e277c7d
make waste-to-energy work without regional_oil_demand
2024-05-13 17:13:16 +02:00
pre-commit-ci[bot]
a9d0f295fb
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-05-13 13:41:41 +00:00
Michael Lindner
afa5cc5014
add heating output, correct bus ordering
2024-05-13 15:39:48 +02:00
pre-commit-ci[bot]
1d709913ed
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-05-13 15:39:37 +02:00
Tom Brown
2055fe68ef
add extra bus for HVC, which can either go to air or waste CHP
...
Here we explicitly add the option to generate energy and/or capture
the CO2 from HVC (i.e. plastics). NB: Since waste CHP is expensive,
it's not built.
2024-05-13 15:39:01 +02:00
pre-commit-ci[bot]
f7dc8a7f22
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-05-13 15:36:43 +02:00
Tom Brown
ac0d52e1c3
Allow some plastics sequestered in landfill or built environment
...
I.e. assume some fraction of plastics don't end up being burned or
decaying into air.
2024-05-13 15:36:14 +02:00
Fabian Neumann
5b2d4047df
Merge branch 'master' of github.com:PyPSA/pypsa-eur
2024-05-13 14:55:07 +02:00
Fabian Neumann
e322e21771
Merge branch 'feature/add-nodal-supply-energy' of github.com:Climact/pypsa-eur-climact into Climact-feature/add-nodal-supply-energy
2024-05-13 14:54:49 +02:00
pre-commit-ci[bot]
5364e7dfcc
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-05-13 12:25:07 +00:00
Fabian Neumann
6321a69870
rearrange config settings under 'run: shared_resources:'
2024-05-13 14:23:09 +02:00
pre-commit-ci[bot]
0fb68d11d8
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-05-13 14:22:05 +02:00
toniseibold
e75e3bd8d7
allow excluding files from shared_resources
2024-05-13 14:21:43 +02:00
pre-commit-ci[bot]
85a2e97f1e
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-05-13 08:51:21 +00:00
Fabian Neumann
e023872d44
stop using wildcard by default
2024-05-13 10:50:24 +02:00
Fabian Neumann
22b16d54e9
Merge branch 'feature/rename-existing-capacities' of github.com:Climact/pypsa-eur-climact into Climact-feature/rename-existing-capacities
2024-05-13 10:09:21 +02:00
Fabian Neumann
84d6634af0
Merge branch 'master' into implement-floating
2024-05-13 10:04:42 +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
Fabian Neumann
ff99db5cb5
Update scripts/build_hydro_profile.py
2024-05-07 10:53:07 +02:00
Johannes Schmidt
3b77b4a370
Fix that code works if either ES or PT is present
2024-05-06 18:46:04 +02:00
Johannes Schmidt
9d36d2bc9b
Fix copy_timeslice
...
copy timeslice would add data although country not present in load
2024-05-06 13:37:32 +02:00
Johannes Schmidt
97035092ac
Fix approximate_missing_eia_stats
...
Function crasehd when 'ET' or 'PT' not present in list of countries.
2024-05-06 13:20:53 +02:00
Fabian Neumann
c05cfff765
Merge pull request #1045 from Climact/feature/fix-typo
...
Fix typo
2024-05-06 10:33:19 +02:00
Koen van Greevenbroek
303b526bf1
Fix formatting of link in base_network documentation
2024-05-06 09:09:23 +02:00
Koen van Greevenbroek
ca6f803e28
Update documentation to reflect removal of build_bus_regions rule
2024-05-06 08:52:42 +02:00
Koen van Greevenbroek
76c201ef7d
Integrate build_bus_regions into base_network
...
Fixes a problem with the `build_bus_regions` writing to base.nc
without declaring base.nc as an output.
2024-05-03 14:53:18 +02:00
Thomas Gilon
02e434c8b0
Fix non steel related coal demand during transition (using sector_ratios)
2024-05-02 17:29:07 +02:00
Thomas Gilon
a139bb604a
Merge branch 'master' into feature/add-nodal-supply-energy
2024-05-02 14:28:20 +02:00
Thomas Gilon
45aa714bdc
Add calculate_nodal_supply_energy in make summary
2024-05-02 14:27:30 +02:00
Thomas Gilon
3752929cbb
Merge branch 'master' into feature/fix-typo
2024-05-02 14:22:50 +02:00
Thomas Gilon
54e3d2bb1b
Fix typo
2024-05-02 14:19:58 +02:00
