Fabian Neumann
|
e097aa48ae
|
Merge branch 'master' into misc/deprecations
|
2023-12-29 11:36:19 +01:00 |
|
Fabian Neumann
|
396fdee6f1
|
Merge pull request #812 from Climact/fix/typo-prepare-sector-network
Fix typo in buses definition for oil boilers in add_industry in prepare_sectors_networks
|
2023-12-29 10:47:41 +01:00 |
|
Fabian Neumann
|
57b4724ebe
|
Merge pull request #803 from millingermarkus/master
Added co2 storage shadow price output to csv
|
2023-12-29 10:41:41 +01:00 |
|
Fabian
|
d39b579346
|
build_biomass_potentials: fix groupby and transpose
|
2023-12-18 12:56:08 +01:00 |
|
Fabian
|
cc08dff280
|
simplify_network: revert fillna
|
2023-12-18 12:44:21 +01:00 |
|
martacki
|
22acdd03a0
|
omit future deprecation
|
2023-12-18 11:49:53 +01:00 |
|
martacki
|
ea42b3797d
|
simplify_network&pandas21: nans not supported
|
2023-12-18 11:43:04 +01:00 |
|
pre-commit-ci[bot]
|
ea3fdb6c15
|
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
|
2023-12-18 08:58:15 +00:00 |
|
martacki
|
7e543ad0cc
|
base_network: fix pandas 2.1 issue
|
2023-12-18 09:57:05 +01:00 |
|
Fabian Neumann
|
43674bcee8
|
Revert "Add option for carbon capture in integrated steelworks"
|
2023-12-14 16:30:30 +01:00 |
|
pre-commit-ci[bot]
|
f0eae99a07
|
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
|
2023-12-14 12:51:51 +00:00 |
|
Markus Millinger
|
0721a29a02
|
Merge branch 'PyPSA:master' into master
|
2023-12-14 13:48:16 +01:00 |
|
Fabian Neumann
|
c304738ea5
|
fix to restore compatibility with PyPSA v0.26.0
|
2023-12-12 18:18:03 +01:00 |
|
Fabian Neumann
|
dffe784704
|
address pandas 2.1.4 deprecation warnings on applymap and fillna(method='bfill')
|
2023-12-12 17:07:33 +01:00 |
|
Fabian Neumann
|
e0ca38be6e
|
Merge pull request #719 from PyPSA/blast-furnace-with-cc
Add option for carbon capture in integrated steelworks
|
2023-12-11 20:12:26 +01:00 |
|
Fabian Neumann
|
ea7a66b873
|
Merge pull request #794 from PyPSA/mv-focus-weights
move focus_weights into clustering configuration segment
|
2023-12-11 20:10:46 +01:00 |
|
pre-commit-ci[bot]
|
aae5ffb6fd
|
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
|
2023-12-11 17:25:24 +00:00 |
|
Fabian Neumann
|
0f3fb540ef
|
finalise ukraine_hackathon branch for merge
|
2023-12-11 18:24:57 +01:00 |
|
Thomas Gilon
|
889a5dd5a2
|
Fix typo in buses definition for oil boilers in add_industry in prepare_sector_network
|
2023-12-11 17:18:31 +01:00 |
|
Fabian Neumann
|
df40fdf904
|
Merge branch 'master' into ukraine_hackathon
|
2023-12-11 16:24:40 +01:00 |
|
Fabian Neumann
|
4ed59eb4b4
|
Merge pull request #798 from tgi-climact/fix/distributed-generators
Fix nodal fraction with distributed generators
|
2023-12-11 14:02:16 +01:00 |
|
Fabian Neumann
|
8d509f4606
|
Merge pull request #796 from PyPSA/district_heating_share_0
district heating bugfix when no progress is assumed
|
2023-12-11 14:01:57 +01:00 |
|
millingermarkus
|
d6a11c28c9
|
Added co2 storage shadow price output to csv
|
2023-12-11 10:49:44 +01:00 |
|
pre-commit-ci[bot]
|
e3ba0e50a7
|
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
|
2023-12-08 09:35:15 +00:00 |
|
Thomas Gilon
|
1352f6c30e
|
Fix nodal fraction with distributed generators
|
2023-12-08 10:32:35 +01:00 |
|
pre-commit-ci[bot]
|
429b4ca680
|
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
|
2023-12-06 16:01:04 +00:00 |
|
martacki
|
fd789932dd
|
district heating bugfix when no progress is assumed
|
2023-12-06 07:58:20 -08:00 |
|
Fabian Neumann
|
a59eb821ff
|
for clustering fall back to ipopt when highs is solver
|
2023-12-06 11:07:04 +01:00 |
|
Fabian Neumann
|
e5bdb4796a
|
move focus_weights into clustering configuration segment (backward compatible)
|
2023-12-06 10:09:17 +01:00 |
|
Fabian Neumann
|
3b20b5c642
|
Merge branch 'master' of github.com:PyPSA/pypsa-eur
|
2023-12-04 14:39:33 +01:00 |
|
Fabian Neumann
|
4df6370198
|
update environment: matplotlib, xarray, pypsa
|
2023-12-04 14:39:23 +01:00 |
|
lisazeyen
|
b8e72683cb
|
improve style
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
|
2023-12-04 12:28:54 +01:00 |
|
pre-commit-ci[bot]
|
92ccb517f3
|
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
|
2023-12-04 11:20:40 +00:00 |
|
lisazeyen
|
53b9e23dd8
|
fixes for new package versions
|
2023-12-04 12:18:03 +01:00 |
|
pre-commit-ci[bot]
|
71dbe2aaf2
|
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
|
2023-12-04 09:53:03 +00:00 |
|
lisazeyen
|
54c2128419
|
add heat vent
|
2023-12-04 10:47:41 +01:00 |
|
Fabian Neumann
|
98797e2e30
|
follow-up to 7ca769bc
|
2023-11-29 13:46:28 +01:00 |
|
Fabian Neumann
|
803b860923
|
move load_raw.csv to resources since it's config file dependent
|
2023-11-29 13:41:26 +01:00 |
|
lisazeyen
|
afcf5e7d2e
|
add load shedding for all carriers
|
2023-11-24 09:53:22 +01:00 |
|
pre-commit-ci[bot]
|
4c66908b74
|
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
|
2023-11-23 11:11:49 +00:00 |
|
Fabian Neumann
|
5d6d01f8c0
|
make CC in blast furnaces optional
|
2023-11-23 12:11:12 +01:00 |
|
Fabian Neumann
|
dfecf35bae
|
add focus_weights to documentation
|
2023-11-20 19:45:10 +01:00 |
|
Fabian Neumann
|
065a49c2d7
|
Merge pull request #772 from PyPSA/land-transport-oil
madd oil generator to bus EU oil
|
2023-11-12 18:23:07 +01:00 |
|
Fabian Neumann
|
c7a4ff7a4d
|
use existing add_carrier_buses function
|
2023-11-12 18:22:22 +01:00 |
|
pre-commit-ci[bot]
|
4779d076dc
|
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
|
2023-11-03 13:16:13 +00:00 |
|
Irieo
|
cb2c782dba
|
scripts: annotate selected functions
|
2023-11-03 12:51:44 +01:00 |
|
Irieo
|
e61da8618e
|
bug fix: add_electricity breaks in specific cases
|
2023-11-03 12:36:40 +01:00 |
|
pre-commit-ci[bot]
|
b9128002bb
|
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
|
2023-10-31 16:14:33 +00:00 |
|
martacki
|
5b45fa303c
|
madd oil generator to bus EU oil
|
2023-10-31 17:11:06 +01:00 |
|
Fabian
|
75e66be571
|
helpers: adjust mock_snakemake to be callable with different root dirs
|
2023-10-31 12:09:39 +01:00 |
|