AmosSchledorn
0e8fb80bc4
clean up, improve docs
2024-08-05 16:11:18 +02:00
AmosSchledorn
2e35bef480
rename "enums" to "definitions" and write modules in snake case
2024-08-05 15:08:05 +02:00
AmosSchledorn
7bd0c16ddd
Merge remote-tracking branch 'origin/master' into update-district-heating-cops
2024-08-05 11:42:18 +02:00
AmosSchledorn
5362c37696
update myopic mode to heat system declarations
2024-08-05 11:27:52 +02:00
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
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
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
