pre-commit-ci[bot]
e0b5fe9048
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-08-05 08:46:30 +00:00
lisazeyen
a56834e51e
add switch for msw waste
2024-08-05 10:38:11 +02:00
Philipp Glaum
8579689f2a
Merge remote-tracking branch 'upstream/master' into bio_methanol
2024-08-05 10:11:55 +02:00
Philipp Glaum
acb0a8d7af
get methanol to kerosene cost form technology data
2024-08-05 10:08:04 +02:00
pre-commit-ci[bot]
6b924ecfb0
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-08-02 15:15:11 +00:00
AmosSchledorn
3ccdde3467
Merge remote-tracking branch 'origin/master' into update-district-heating-cops
2024-08-02 17:14:31 +02:00
AmosSchledorn
e5152897e1
Merge remote-tracking branch 'origin/master' into update-district-heating-cops
2024-08-02 17:03:51 +02:00
AmosSchledorn
bbf64a2fde
Refactor module structure
2024-08-02 17:03:34 +02:00
pre-commit-ci[bot]
f58322c3e5
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-08-02 15:02:11 +00:00
lisazeyen
b62db80435
fix bug with e_max_pu
2024-08-02 17:01:22 +02:00
pre-commit-ci[bot]
3149bfd926
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-08-02 14:47:24 +00:00
lisazeyen
69c6a4dca4
set e_max_pu to force municipal waste to be used
2024-08-02 16:45:57 +02:00
AmosSchledorn
318e05c9fb
refactor naming
2024-08-02 16:29:54 +02:00
lisazeyen
68e9593b01
merge master
2024-08-02 15:58:01 +02:00
AmosSchledorn
4a6dd2fe33
fix naming bugs
2024-08-02 15:56:37 +02:00
pre-commit-ci[bot]
e28c66e43c
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-08-02 13:27:42 +00:00
lisazeyen
2d79673d5e
merge master
2024-08-02 15:23:35 +02:00
lisazeyen
eb81cfb714
change units from EJ->TWh and clean up
2024-08-02 15:13:47 +02:00
lisazeyen
8c5cd4be83
Merge branch 'master' into becc_energy_penalty
2024-08-02 14:35:01 +02:00
pre-commit-ci[bot]
c7a186863e
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-08-02 12:07:18 +00:00
lisazeyen
8bfca9ce69
enable electrobiofuels also without biomass spatially resolved
2024-08-02 14:05:42 +02:00
lisazeyen
8efa832f95
Merge remote-tracking branch 'origin' into ebiofuels
2024-08-02 13:39:02 +02:00
lisazeyen
648ea20ec1
Merge branch 'master' into msw_incineration
2024-08-02 13:34:31 +02:00
pre-commit-ci[bot]
de3f679f33
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-08-01 15:54:24 +00:00
lisazeyen
b2d346f02c
some simplifications
2024-08-01 17:47:21 +02:00
lisazeyen
dcde6a9f58
Merge remote-tracking branch 'origin' into nofossil
2024-08-01 17:38:57 +02:00
AmosSchledorn
b0150bd65d
refactor prepare_sector_network.add_heat using Enums
2024-08-01 11:59:26 +02:00
Fabian Neumann
4c1ec3559d
some small adjustments to run as single node model ( #1183 )
...
* some small adjustments to run as single node model
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
---------
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2024-07-31 11:53:20 +02:00
pre-commit-ci[bot]
1fe54513cd
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-07-29 16:33:52 +00:00
AmosSchledorn
29479c50d0
pass heat source/system type to prepare_sector_network and add_existing_baseyear
2024-07-29 18:29:27 +02:00
Philipp Glaum
5c1d8178f1
Merge branch 'methanol_to_master' into bio_methanol
2024-07-29 14:51:50 +02:00
Philipp Glaum
d142717563
add methanol techs for master to branch
2024-07-29 14:49:57 +02:00
Amos Schledorn
da3ad1725e
Merge branch 'master' into update-district-heating-cops
2024-07-29 10:33:39 +02:00
Micha
f5fe0d062c
Rename ev battery master ( #1116 )
...
* rename EV battery
* add release note
* adjust tech colors
* fix for battery renaming in plot_summary
---------
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2024-07-29 09:50:02 +02:00
Toni Seibold
23ea16dc14
Lifetime of Gas Pipelines ( #1162 )
...
* inf lifetime of gas pipelines avoids adding new links each planning horizon
* p_nom_extendable for existing gas pipelines is set false if retrofitting to H2 is not allowed
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
---------
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2024-07-29 09:47:08 +02:00
AmosSchledorn
de10492e10
Merge remote-tracking branch 'origin/master' into update-district-heating-cops
2024-07-23 17:30:51 +02:00
lisazeyen
877ca3eb44
change sign sequestration store marginal cost ( #1174 )
2024-07-22 16:44:26 +02:00
pre-commit-ci[bot]
5361facbb7
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-07-22 13:39:06 +00:00
AmosSchledorn
560373a864
add DH cops to network
2024-07-19 18:54:30 +02:00
AmosSchledorn
052394fa88
change naming from individual/district heating to denctral/central heating
2024-07-19 15:57:53 +02:00
AmosSchledorn
167b056def
remove obsolete rural/urban COPs and rename cop_..._total to cop_..._individual_heating
2024-07-19 15:22:50 +02:00
Micha
4c05928766
add marginal cost to preven model degeneracy ( #1155 )
2024-07-15 16:41:32 +02:00
Micha
d3b24face6
revert to old config keys ( #1152 )
...
* revert to old config keys
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
---------
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2024-07-12 16:22:53 +02:00
pre-commit-ci[bot]
1de4db5f9c
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-07-09 12:08:57 +00:00
cpschau
f19279e7e0
Add other waste heat technologies, and adjust share
2024-07-09 14:02:45 +02:00
cpschau
e932466b05
FT and electrolyis waste heat for DH as float
2024-07-09 12:05:50 +02:00
Fabian Neumann
c3151902f6
Compatibility with geopandas version 1 ( #1136 )
...
* address geopandas and pandas deprecations/warnings
* compatibility with geopandas v1
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
---------
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2024-07-08 08:29:16 +02:00
pre-commit-ci[bot]
e42b36e83d
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-07-04 11:40:21 +00:00
millingermarkus
fbacb76e9c
Minor edits to MSW
2024-07-04 13:34:05 +02:00
millingermarkus
c81d208da2
Remove redundant Waste CHP addition
2024-07-04 11:59:32 +02:00
Markus Millinger
521cf0e753
Merge branch 'PyPSA:master' into msw_incineration
2024-07-04 11:53:00 +02:00
pre-commit-ci[bot]
5ca27837f3
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-07-04 09:21:00 +00:00
millingermarkus
5c7bb2bf51
Add option to exclude fossil fuels
2024-07-04 11:16:00 +02:00
pre-commit-ci[bot]
ee6d8b1e42
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-07-04 08:22:24 +00:00
millingermarkus
c71fa78bfa
Added biomass imports to prepare sector network
2024-07-04 10:18:19 +02:00
Markus Millinger
821eb07e98
Correct costs of BtL and BioSNG
2024-07-04 09:59:45 +02:00
pre-commit-ci[bot]
192a8eb14b
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-07-04 07:30:52 +00:00
Markus Millinger
270ce82b9f
Cost correction
2024-07-04 09:30:22 +02:00
pre-commit-ci[bot]
b934653b65
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-07-03 10:42:07 +00:00
millingermarkus
84ddfea91e
Added electrobiofuels
2024-07-03 12:38:16 +02:00
pre-commit-ci[bot]
53328e89f2
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-07-03 08:07:32 +00:00
millingermarkus
76e15d6862
Carbon capture capital cost for waste CHP
2024-07-03 09:42:15 +02:00
millingermarkus
b5ff1e8f9c
Added note on carbon capture for BioSNG and BtL
2024-07-03 09:38:08 +02:00
millingermarkus
c7ce47dffd
Energy penalty for solid biomass CHP
2024-07-03 09:22:09 +02:00
Fabian Neumann
6348c904bd
Merge pull request #1103 from PyPSA/methanol-store-capital-cost
...
non-zero capital_cost for methanol stores
2024-06-17 18:57:35 +02:00
Philipp Glaum
ad38016f6d
prepare_sector_network: add floating wind to update cost function
2024-06-17 15:22:33 +02:00
Michael Lindner
b174a53480
non-zero capital_cost for methanol stores
2024-06-14 11:29:59 +02:00
LukasFrankenQ
4752840009
improved docs on EGS cost scaling
2024-06-01 00:32:44 +01:00
LukasFrankenQ
2f1d6d20b1
final corrections, improved docs
2024-06-01 00:20:31 +01:00
millingermarkus
b29e1c196e
Added msw incineration
2024-05-30 14:28:34 +02:00
LukasFrankenQ
2801b00100
Merge https://github.com/pypsa/pypsa-eur
2024-05-26 22:38:03 +01:00
Fabian Neumann
422c37827c
time_aggregation: handle case without any temporal aggregation
2024-05-25 15:48:48 +02:00
Koen van Greevenbroek
2a6dcc4c12
Minor bugfixes for new time aggregation implementation
2024-05-21 18:09:09 +02:00
Fabian Neumann
d32feb3aae
mark downloaded files as ancient rather than protected
2024-05-20 22:37:16 +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
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
a2012d8937
pre-commit formatting [no ci]
2024-05-20 15:49:40 +02:00
Fabian Neumann
7ce15931e5
add simplified power distribution grid losses
2024-05-20 12:41:54 +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
Thomas Gilon
c3dcff8a35
Define methanol energy demand for industry
2024-05-17 16:04:48 +02:00
Fabian Neumann
27009f5060
double solar rooftop PV potentials ( closes #935 )
2024-05-15 18:18:15 +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
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
lisazeyen
e8de4f308f
rename solar-hsat in config
2024-05-15 15:08:52 +02:00
lisazeyen
541e267a83
replace print with logger.info
2024-05-15 15:00:42 +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
Fabian Neumann
a9333458b3
handle potentially diverging spatial resolutions of HVC
2024-05-13 17:40:10 +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
649e277c7d
make waste-to-energy work without regional_oil_demand
2024-05-13 17:13:16 +02: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
