Fabian Neumann
|
861e7b5fe5
|
Merge branch 'master' into biogas-upgrade-cc
|
2024-01-02 18:55:29 +01:00 |
|
Fabian Neumann
|
a10a60b951
|
rename setting from biomass_upgrading_cc to biogas_upgrading_cc
|
2024-01-02 18:52:22 +01:00 |
|
Fabian Neumann
|
c5bd95d124
|
Merge branch 'biogas-upgrade-cc' of github.com:PyPSA/pypsa-eur into biogas-upgrade-cc
|
2024-01-02 18:49:26 +01:00 |
|
Fabian Neumann
|
9884dee7a0
|
remove biogas upgrading CC in normal link
|
2024-01-02 18:48:52 +01:00 |
|
pre-commit-ci[bot]
|
6714858e17
|
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
|
2024-01-02 17:47:49 +00:00 |
|
Fabian Neumann
|
4b178a7fa1
|
Merge branch 'master' into biogas-upgrade-cc
|
2024-01-02 18:46:54 +01:00 |
|
Fabian Neumann
|
fd81058008
|
add VOM of PtX processes (closes #747)
|
2024-01-02 18:35:10 +01:00 |
|
pre-commit-ci[bot]
|
2678fdef99
|
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
|
2024-01-02 17:13:37 +00:00 |
|
Fabian Neumann
|
f2a636c62c
|
bugfix: correct unit of capital_cost of Haber-Bosch
|
2024-01-02 18:12:49 +01:00 |
|
Fabian Neumann
|
fac257ca97
|
Merge pull request #821 from PyPSA/md5-checksums
validate checksums for zenodo downloads
|
2024-01-02 17:23:06 +01:00 |
|
pre-commit-ci[bot]
|
e580ac85d9
|
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
|
2024-01-02 15:33:11 +00:00 |
|
Fabian Neumann
|
30c1a1c857
|
address deprecation warnings
|
2024-01-02 16:31:48 +01:00 |
|
Fabian Neumann
|
e3539b0e69
|
heat vent: add bus
|
2024-01-02 16:31:16 +01:00 |
|
Fabian Neumann
|
fa13eae277
|
Merge branch 'custom-extra-functionality' of github.com:PyPSA/pypsa-eur into custom-extra-functionality
|
2023-12-29 17:23:24 +01:00 |
|
Fabian Neumann
|
4b6dd29083
|
add dummy file and assert path exists
|
2023-12-29 17:23:11 +01:00 |
|
pre-commit-ci[bot]
|
fba320bfa7
|
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
|
2023-12-29 16:20:26 +00:00 |
|
Fabian Neumann
|
8a11bdb4b1
|
solve_network: option to inject custom extra functionalities from source file
|
2023-12-29 17:19:19 +01:00 |
|
pre-commit-ci[bot]
|
de3b6c9573
|
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
|
2023-12-29 11:38:43 +00:00 |
|
Fabian Neumann
|
71985d5e3a
|
validate checksums for zenodo downloads
|
2023-12-29 12:34:14 +01:00 |
|
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
|
014a4cd62e
|
fix for losses with multi-period investment
|
2023-11-12 18:42:53 +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 |
|
pre-commit-ci[bot]
|
a31b421c12
|
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
|
2023-10-25 17:35:12 +00:00 |
|
ekatef
|
c1150dfab3
|
Merge remote-tracking branch 'origin/retrofit_data_fixes' into retrofit_data_fixes
|
2023-10-25 20:34:43 +03:00 |
|
ekatef
|
8ec0664253
|
Move column fix for u-values for Poland
|
2023-10-25 20:33:59 +03:00 |
|
martacki
|
55807898a0
|
update solar global radiation according to TABULA project
|
2023-10-25 16:23:41 +02:00 |
|
pre-commit-ci[bot]
|
f24bd46173
|
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
|
2023-10-25 14:11:51 +00:00 |
|
ekatef
|
2952d99dfa
|
Fix column with total values
|
2023-10-25 16:42:05 +03:00 |
|
ekatef
|
1ad7035ec4
|
Fix a column for Poland
|
2023-10-25 16:28:38 +03:00 |
|
Fabian Neumann
|
7884392326
|
Merge pull request #748 from PyPSA/follow-up-637
follow-up to #637: remove duplicate code and update tsam version
|
2023-10-18 10:27:29 +02:00 |
|
Fabian Neumann
|
df5b9e9943
|
Merge pull request #759 from ekatef/fix_retrofit
Update calculations of retrofit costs
|
2023-10-18 10:26:32 +02:00 |
|
pre-commit-ci[bot]
|
21148e3cc5
|
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
|
2023-10-13 10:36:50 +00:00 |
|
Ekaterina
|
b0a95aefaa
|
Merge branch 'PyPSA:master' into fix_retrofit
|
2023-10-13 13:30:04 +03:00 |
|
ekatef
|
460fa00b28
|
Fix file name
|
2023-10-11 21:43:51 +03:00 |
|
Thomas Gilon
|
4c5ea9e207
|
Specify input files required to retrieve irena data
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
|
2023-10-11 16:27:08 +02:00 |
|
Fabian Neumann
|
97a5be1e84
|
Merge branch 'master' into feature/retrieve-irena
|
2023-10-11 16:17:15 +02:00 |
|
Thomas Gilon
|
124177b6db
|
Add option for SMR CC
|
2023-10-11 14:32:47 +02:00 |
|
pre-commit-ci[bot]
|
230c1a327c
|
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
|
2023-10-11 12:27:29 +00:00 |
|
Thomas Gilon
|
43e20a26e6
|
Add rule to update IRENA data for existing infrastructure
|
2023-10-11 14:26:04 +02:00 |
|
ekatef
|
fcef194566
|
Reference to a multiindex level by number instead of name
|
2023-10-11 12:29:38 +03:00 |
|
ekatef
|
7ad60cb7f9
|
Fix calculation of averages
|
2023-10-11 12:28:34 +03:00 |
|
ekatef
|
5ee9df000b
|
Make an argument of pd.concat to a list
|
2023-10-11 12:28:08 +03:00 |
|
ekatef
|
b51d908bfa
|
Fix computation of the mean
|
2023-10-11 12:27:31 +03:00 |
|
ekatef
|
5ec00c5d9d
|
Fix type definition for a call of difference function
|
2023-10-11 12:27:10 +03:00 |
|
ekatef
|
f825544c3b
|
Remove duplication in column names
|
2023-10-11 12:26:30 +03:00 |
|
ekatef
|
4294248518
|
Re-map country codes to account for "GB"
|
2023-10-11 12:26:10 +03:00 |
|
pre-commit-ci[bot]
|
326aeb682b
|
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
|
2023-10-09 14:28:08 +00:00 |
|
Fabian Neumann
|
ce609b6ebe
|
Merge branch 'master' into ukraine_hackathon
|
2023-10-09 16:25:49 +02:00 |
|
Fabian Neumann
|
42692c3ca5
|
UA-MD availability matrix: plot shape_availability
|
2023-10-09 16:21:04 +02:00 |
|
Fabian Neumann
|
27ebbaba24
|
UA-MD availability matrix: consider WDPA protection areas as substitute for Natura
|
2023-10-09 16:20:23 +02:00 |
|
Fabian Neumann
|
9d7b250230
|
UA-MD availability matrix: consider ship density
|
2023-10-09 16:19:31 +02:00 |
|
Fabian Neumann
|
9a13748d34
|
UA-MD availability matrix: adjust corine/copernicus code selection
|
2023-10-09 16:18:58 +02:00 |
|