bjoern/pypsa-eur
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
2,886 Commits 1 Branch 0 Tags 133 MiB
9687fef2e2
Commit Graph

1452 Commits

Author SHA1 Message Date
virio-andreyana
654f46f868
alpha testing complete vresutils removal 2023-05-11 16:58:35 +02:00
pre-commit-ci[bot]
b21965a986 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-05-10 08:09:47 +00:00
virio-andreyana
e91068196b
replace vresutils annuity function with add_electricity.py calculate_annuity 2023-05-10 10:02:41 +02:00
virio-andreyana
5c2e3c9fc1
add Shape2Shapes in add_electricit.py 2023-05-10 09:58:25 +02:00
Fabian Hofmann
de16f19bce
Merge branch 'master' into complete-carrier-set 2023-05-03 17:42:29 +02:00
Fabian
13b4327e01 add_extra_components: revert carrier addition 2023-05-03 14:00:10 +02:00
Fabian
4e8bbd67b4 use sanitize_carriers to harmonize carrier adjustments 2023-05-03 13:24:57 +02:00
pre-commit-ci[bot]
f6a40d3696 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-05-01 22:14:45 +00:00
Fabian Neumann
67303deedd
Merge pull request #647 from PyPSA/hydrogen-turbine 
add plain hydrogen turbine option for re-electrification
 2023-04-30 10:44:30 +02:00
pre-commit-ci[bot]
bdeab82b49 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-04-30 08:44:07 +00:00
Fabian Neumann
51e09f5e61
Address review comments 2023-04-30 10:43:49 +02:00
pre-commit-ci[bot]
699a4bd2e8 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-04-28 01:43:41 +00:00
virio-andreyana
72b75fd9fe
merge add_nice_carrier_names with add_missing_carrier to become add_missing_carrier_with_nice_names(n, config) 2023-04-28 03:43:20 +02:00
virio-andreyana
e24ca89a05
Update scripts/add_electricity.py 
Co-authored-by: Fabian Hofmann <fab.hof@gmx.de>
 2023-04-27 17:29:20 +02:00
lisazeyen
a2e3e91630
fix bug in load shedding constraint 2023-04-26 18:05:56 +02:00
virio-andreyana
e38a0a9d34
Merge branch 'master' into complete-carrier-set 2023-04-26 09:21:49 +02:00
virio-andreyana
df38edab0a
fix bug in prepare_network.py 2023-04-26 04:28:36 +02:00
pre-commit-ci[bot]
74e9d56adb [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-04-25 15:26:28 +00:00
virio-andreyana
756a814c63
Update prepare_sector_network.py 2023-04-25 17:17:32 +02:00
virio-andreyana
d9f9d4853a
Update add_extra_components.py 2023-04-25 17:06:17 +02:00
virio-andreyana
56b6718ba6
Update add_existing_baseyear.py 2023-04-25 17:04:28 +02:00
virio-andreyana
71c1a7fbef
add the function add_missing_carrier 
add_missing_carrier() are applied on python script where new components are added. The function runs ideally after all of the new components are added and before add_nice_carrier_names()
 2023-04-25 14:43:04 +02:00
pre-commit-ci[bot]
3625d401c6 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-04-24 22:09:09 +00:00
virio-andreyana
e550ba915d
Update add_extra_components.py 
Note: 
- battery charger and battery discharger has no nice name nor plot_color
- H2 electrolysis is similar to H2 Electrolysis in the tech_color
- H2 fuel cell is similar to H2 Fuel cell in the tech_color
- H2 pipeline do have have nice name and tech_color, but the addition of it depends on the link being true in config
 2023-04-24 14:08:25 +02:00
Fabian Neumann
e20e7bf844 fix addition of load shedding 2023-04-24 12:33:55 +02:00
virio-andreyana
ad9a67509f
Add carrier "AC" and "DC" in base_network.py 2023-04-24 05:05:43 +02:00
pre-commit-ci[bot]
0a3c177f4b [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-04-22 07:44:59 +00:00
Fabian Neumann
f2e53b59bf add plain hydrogen turbine option for re-electrification 2023-04-22 09:44:13 +02:00
Fabian
97bdbe636c follow-up: rename configs to config 2023-04-21 11:05:18 +02:00
Fabian
1f6f7a2039 replace config.yaml by config/config.yaml in doc and docstrings 2023-04-21 10:41:44 +02:00
Fabian
e40011cb3c Merge branch 'master' into configs-in-one-folder 2023-04-21 10:26:45 +02:00
Fabian
5c8e0080c8 pre-commit: update docformatter version 2023-04-21 10:11:44 +02:00
Fabian Neumann
92895ec378
Merge branch 'master' into fix-reserve-constraint 2023-04-21 10:06:29 +02:00
Fabian
79501b5741 build_biomass: fix geopandas compat with pandas v2.0 2023-04-20 20:37:27 +02:00
Fabian
6d7eae8ad2 build_ship_raster: save reduced ship raster as tif file 2023-04-20 19:56:23 +02:00
Fabian Hofmann
691e0dbb9d
Merge branch 'master' into rioxarray-to-envs 2023-04-20 18:36:31 +02:00
lisazeyen
1cd658c03f
rename constraint 
rename constraint to fit to other syntax

Co-authored-by: Fabian Hofmann <fab.hof@gmx.de>
 2023-04-20 09:55:50 +02:00
pre-commit-ci[bot]
51785524a3 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-04-20 07:39:18 +00:00
lisazeyen
27dc9cedfd fix bugs in reserve constraint 2023-04-20 09:35:53 +02:00
pre-commit-ci[bot]
05b0a81808 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-04-16 13:32:24 +00:00
virio-andreyana
eca0a89152
Merge branch 'master' into configs-in-one-folder 2023-04-16 15:32:07 +02:00
Ahmad
b877b41019
- incorporated the remaining changes 
- added a released note about the renaming of build_load_data to build_electricity_demand
 2023-04-16 02:28:56 +02:00
pre-commit-ci[bot]
763d77d19d [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-04-14 19:05:46 +00:00
Ahmad
90d8f0ac3f
rename build_load_data to build_electricity_demand 
Signed-off-by: Ahmad <ahmedwahid16101@gmail.com>
 2023-04-14 20:58:38 +02:00
virio-andreyana
f3872c9433
Update copy_config.py 
insert the new path for config for the copying process, solve the error in rule copy_config
 2023-04-12 02:45:28 +02:00
pre-commit-ci[bot]
460bbd080f [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-04-10 22:02:35 +00:00
pre-commit-ci[bot]
423c3d6999 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-03-17 11:40:05 +00:00
Fabian Neumann
f8830fcf69 doc: implement review feedback (amend) 2023-03-17 12:39:43 +01:00
pre-commit-ci[bot]
e83b1b0291 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-03-16 14:56:46 +00:00
Fabian Neumann
6dbfd798b9 encapsulate imports in helpers to minimise requirements for docs 2023-03-16 15:54:52 +01:00
Fabian Neumann
55395c5465 enhance documentation, with instructions for sector-coupled / electricity-only studies 2023-03-15 17:00:06 +01:00
Fabian
8ff4685531 follow up 2023-03-10 17:30:51 +01:00
Fabian
373c64a592 solve_network: check if sector_opts is in wildcard 2023-03-10 17:14:01 +01:00
Fabian
6034cc1669 build_sequestration: fix url with docformatter 2023-03-10 16:56:32 +01:00
Fabian
ebc5a99338 follow up: fix img path 2023-03-10 16:12:02 +01:00
Fabian
e9bf639f2d solve_network: add line breaks in docstring 2023-03-10 16:10:01 +01:00
Fabian
5fe4032e47 solve_network: reinsert docstring 2023-03-10 16:07:21 +01:00
Fabian Hofmann
30b8bb3c94
Update scripts/solve_network.py 
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
 2023-03-10 16:00:52 +01:00
Fabian
99a9ea8beb adress review comments 2023-03-10 15:58:53 +01:00
Fabian
f8d178c714 prepare_sector: revert taking mean 
config.overnight: revert hourly resolution
 2023-03-10 14:26:31 +01:00
Fabian
4f0ddf2e95 fix Nyears scaling 2023-03-10 14:12:22 +01:00
Fabian
2baf8f5ba4 harmonive solve_network across workflow 2023-03-09 23:56:12 +01:00
pre-commit-ci[bot]
a9b09e4ae4 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-03-09 13:27:08 +00:00
Max Parzen
4cb21f05ec add Linopy to PyPSA 2023-03-09 13:24:25 +00:00
pre-commit-ci[bot]
3a80ac2027 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-03-09 12:29:15 +00:00
Fabian Neumann
3f74b6bec7 Merge branch 'merge-pypsa-eur-sec' of github.com:PyPSA/pypsa-eur into merge-pypsa-eur-sec 2023-03-09 13:28:50 +01:00
Fabian Neumann
91ea0a3f55 docs: rearrange sections 2023-03-09 13:28:42 +01:00
pre-commit-ci[bot]
ce6df71399 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-03-09 11:48:04 +00:00
Fabian
5356feab49 helpers: allow to overwrite config in mock_snakemake and allow mock_snakemake to be called from repo root 2023-03-09 12:46:40 +01:00
Fabian Neumann
abe4df543e add minimal description of all scripts 2023-03-09 12:45:43 +01:00
pre-commit-ci[bot]
3402908834 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-03-09 10:39:59 +00:00
Fabian Neumann
f5edafd00d speed-up CI, just a week rather than a month, 4 nodes, 40H 2023-03-09 11:37:34 +01:00
Fabian Neumann
8f5775d9cc Merge branch 'merge-pypsa-eur-sec' into sec-subset-countries 2023-03-09 11:28:07 +01:00
Fabian Neumann
89a3570c18 sort countries 2023-03-09 11:24:10 +01:00
Fabian Neumann
22846d7b1b sector-coupled: run on subset of selected countries 2023-03-09 11:04:41 +01:00
pre-commit-ci[bot]
f128cc3e3c [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-03-09 07:36:43 +00:00
Fabian Neumann
483f3e1b82 eliminate manual country code conversion, adjust mock_snakemake to ll wildcard 2023-03-09 08:36:18 +01:00
Fabian
104fc68fb0 allow to disable progressbar 2023-03-07 20:37:47 +01:00
pre-commit-ci[bot]
d45bee628e [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-03-07 17:25:45 +00:00
Fabian
5cf2b8174a scripts: apply linting fixes 2023-03-07 17:21:00 +01:00
pre-commit-ci[bot]
54f0cde490 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-03-07 11:22:08 +00:00
Fabian
5260e0c71f build industrial demand/production: ensure compat with multiprocesses on win/mac 2023-03-07 12:21:47 +01:00
pre-commit-ci[bot]
0b57626387 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-03-07 09:36:26 +00:00
Fabian
6761c50782 build industrial production: fix partial function in imap 2023-03-07 10:35:21 +01:00
Fabian
ba6e0c2e4a move snakemake object out of imap process functions 2023-03-07 08:59:01 +01:00
pre-commit-ci[bot]
27c0d3a2d2 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-03-06 18:18:20 +00:00
Fabian Neumann
265fa098ae Merge branch 'merge-pypsa-eur-sec' of github.com:PyPSA/pypsa-eur into merge-pypsa-eur-sec 2023-03-06 19:16:45 +01:00
Fabian Neumann
541b83b049 merge helper.py into _helpers.py 2023-03-06 19:16:37 +01:00
pre-commit-ci[bot]
8fa29865b6 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-03-06 18:13:35 +00:00
Fabian Neumann
939f23f5a4 remove unused function in _helpers 2023-03-06 19:13:15 +01:00
Fabian Neumann
bd16f01397 use progress_retrieve from single source 2023-03-06 19:11:29 +01:00
Fabian Neumann
3bdf3b6f5e use mock_snakemake from pypsa-eur 2023-03-06 19:09:45 +01:00
Fabian Neumann
93d9e13f52 add spdx identifiers to scripts 2023-03-06 18:49:23 +01:00
Fabian
504e5b0b9c delete unnecessary log files 
fix make_summary for myopic
 2023-03-06 18:23:31 +01:00
Fabian Neumann
ab501f3eb6 remove plot_p_nom_max 2023-03-06 17:41:09 +01:00
pre-commit-ci[bot]
b7c58883b7 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-03-06 16:19:25 +00:00
Fabian Neumann
76d57731ec fix all lv references to ll, pickup right location of default lifetime 2023-03-06 17:18:07 +01:00
pre-commit-ci[bot]
9026e0920d [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-03-06 15:54:38 +00:00
Fabian
bffb7cc17c scripts/ remove summary_dir and results_dir references 2023-03-06 16:53:20 +01:00
Fabian Hofmann
9b7e4d3bee
Merge branch 'master' into merge-pypsa-eur-sec 2023-03-06 16:09:42 +01:00
Fabian Hofmann
4e259c1c6e
Merge branch 'master' into ci-config 2023-03-06 15:44:24 +01:00
Fabian
bf969424a2 ci modularization fix cutout retrieval and profile in dag 2023-03-06 15:41:02 +01:00
Fabian Neumann
7334913e11 add input file handling of pypsa-eur-sec rules using cutout 2023-03-06 15:07:09 +01:00
Fabian Neumann
d27fee7e77 align cost fill values to pypsa-eur implementation 2023-03-06 14:47:46 +01:00
Fabian Neumann
b30ff67458 remove unneeded currency conversion USD to EUR 2023-03-06 14:38:04 +01:00
Fabian Neumann
0673430eec use line length factor from single config source 2023-03-06 14:33:56 +01:00
Fabian Neumann
ee5a0c4e73 conform to pypsa-eur logging level definition 2023-03-06 14:27:15 +01:00
Fabian Neumann
43f226b2a3 split solve network rules, take summary scripts from Sec 2023-03-06 12:10:23 +01:00
Fabian Neumann
97bbafdd70 Merge remote-tracking branch 'pypsa-eur-sec/master' into merge-pypsa-eur-sec 2023-03-06 11:54:08 +01:00
Fabian Neumann
604d086016 resolve merge conflict 2023-03-06 09:46:56 +01:00
Fabian Neumann
9dbeea17ec fix: handle overlooked merge conflict 2023-03-06 09:45:28 +01:00
pre-commit-ci[bot]
d0e0880b19 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-03-06 08:43:17 +00:00
pre-commit-ci[bot]
5ab10eae37 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-03-06 08:40:21 +00:00
Fabian Neumann
ad6a490f57 resolve merge conflict 2023-03-06 09:39:10 +01:00
Fabian Neumann
5f61bc4bae fix isort compatibility 2023-03-06 09:35:40 +01:00
Fabian
3bbd321b82 config: separate solver_options 
solve_network: adjust code to new solver_options config
 2023-03-06 09:35:11 +01:00
pre-commit-ci[bot]
13769f90af [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-03-06 08:27:46 +00:00
Fabian Neumann
2f39280f14 spelling corrections 2023-03-06 09:23:30 +01:00
Fabian Neumann
b2295278f3
Merge branch 'master' into ci-config 2023-03-05 16:01:57 +01:00
pre-commit-ci[bot]
36003c9627 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-03-05 14:12:39 +00:00
Fabian Neumann
8837ba6a5f allow false for max_depth 2023-03-05 15:12:20 +01:00
Fabian Neumann
6d98edb320
Merge pull request #314 from PyPSA/loggin-replace-print 
Replacing print statement with logging
 2023-03-05 15:07:10 +01:00
virio-andreyana
0985aa17b3
fix SettingwithCopyWarning in plot_network.py 
Fix SettingwithCopyWarning in plot_network.py by using pandas clip and replace.
 2023-03-01 12:35:51 +01:00
virio-andreyana
f75cec93d6
lower log level in plot_summary.py and fix warning 
reduce the level of "Dropping technology energy balance smaller than {snakemake.config['plotting']['energy_threshold']/10} {units}" and "Total energy balance for {v} of {round(df.sum()[0],2)} {units}" from INFO-> DEBUG. 

Extra warning fix
Add `plt.cla()` in the `for k, v in balances.items()` and take out fig, ax = plt.subplots(figsize=(12,8)) from that for loop to fix RuntimeWarning: More than 20 figures have been opened. Figures created through the pyplot interface (`matplotlib.pyplot.figure`) are retained until explicitly closed and may consume too much memory. (To control this warning, see the rcParam `figure.max_open_warning`).
 2023-03-01 12:29:36 +01:00
virio-andreyana
379ed0da93 Sentence capitalized 2023-02-24 14:42:51 +01:00
virio-andreyana
d237e60b25 Replacing print statement with logging 2023-02-23 10:30:32 +01:00
Fabian Neumann
e74e5d9864
Merge pull request #312 from PyPSA/myopic-p_nom_max 
myopic: adjust p_nom_max if existing larger
 2023-02-22 19:14:20 +01:00
Fabian Neumann
8512129f2c
Merge branch 'master' into cluster-m 2023-02-22 18:57:21 +01:00
Fabian Neumann
846049770e cluster option 'm' only aggregates conventional carriers not excluded 2023-02-22 18:55:05 +01:00
lisazeyen
332936bcec adjust p_nom_max if existing larger 2023-02-22 17:44:05 +01:00
Fabian
3642d5c834 build_renewable_profiles: remove progressbar import 2023-02-22 15:07:57 +01:00
pre-commit-ci[bot]
b134a395b4 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-02-22 13:40:37 +00:00
Fabian
44bb81af46 helpers: undo position fixing in tqdm 2023-02-22 14:40:02 +01:00
pre-commit-ci[bot]
64745e7ec2 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-02-22 13:21:28 +00:00
Fabian
825d3e84d2 replace progressbar by tqdm 2023-02-22 14:20:18 +01:00
Fabian
dad7d2050e build_population_layouts: replace vresutils area calculation 2023-02-22 13:26:17 +01:00
virio-andreyana
e80cab63ca
Update build_biomass_potentials.py 
Maybe something in the middle? swiss is a list, while pop was a panda series.
 2023-02-22 13:00:06 +01:00
virio-andreyana
74d31c4554 fixing some warnings in build_biomass_potentials.py, build_gas_input_locations.py, scripts/build_population_layouts.py 2023-02-22 12:17:30 +01:00
Fabian Hofmann
8215510f09
Merge pull request #282 from PyPSA/ci-review 
Transition to `linopy` implementation
 2023-02-22 09:18:29 +01:00
Fabian
19c35f8a6a use muting of excel read with context manager 2023-02-21 23:20:02 +01:00
Fabian
7e87044424 solve_network: warn if network is not optimal 2023-02-21 21:58:42 +01:00
Fabian
8bf6238785 Merge branch 'master' into ci-review 2023-02-21 17:57:27 +01:00
virio-andreyana
f276b130bd Hide uninformative text caused by subprocess outputs 2023-02-18 13:47:34 +01:00
Fabian Neumann
b14d657042 minor fixes and address deprecation warnings 2023-02-16 20:13:26 +01:00
Fabian Neumann
35b8425b3b cherry-pick from #282 
Co-authored-by: Fabian Hofmann <hofmann@fias.uni-frankfurt.de>
 2023-02-16 18:42:19 +01:00
Fabian Neumann
82939ca546 resolve merge conflicts 2023-02-16 18:34:24 +01:00
Fabian Neumann
ece64a73c1 gas_input: use HTTP remote, rename conversion factors, fix undesired rule removal 2023-02-16 18:27:57 +01:00
Fabian Neumann
963e7cdbcf Merge branch 'master' into update-lng-ports 2023-02-16 17:56:05 +01:00
Fabian Neumann
ccde2e7f93 make sequestration options configurable 2023-02-16 17:21:58 +01:00
Fabian Neumann
03ac301238 build_shapes: crs 2023-02-16 14:04:13 +01:00