Commit Graph

1285 Commits

Author SHA1 Message Date
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
Fabian Neumann
b6732bf6c4 documentation updates 2023-02-16 12:37:30 +01:00
virio-andreyana
3dede28aae merging script in retrieve_gas_input_location with build_gas_input_location 2023-02-16 11:57:33 +01:00
Fabian Neumann
9c1182fe96 prepare release 0.7 2023-02-16 11:50:55 +01:00
Fabian Neumann
6b8e69cf81 Merge branch 'master' into carbon-management 2023-02-15 20:21:12 +01:00
Fabian Neumann
809b07be86
Merge pull request #303 from PyPSA/electrolysis-wasteheat
add option to use electrolysis waste heat in district heating
2023-02-15 19:06:12 +01:00
Fabian Neumann
b1b289fc45 add option to use electrolysis waste heat in district heating 2023-02-15 14:01:00 +01:00
Fabian Neumann
5d08dfc2ec add min part load for FT and methanolisation via p_min_pu 2023-02-15 13:47:57 +01:00
Fabian
7d5d48ac26 solve network: fix sequestration constraint 2023-02-10 18:58:30 +01:00
Fabian Neumann
01db4f4408 compatibility with technology-data v0.5 2023-02-10 07:49:45 +01:00
Fabian
38a58b62f7 prepare sector: fix logger percentage info 2023-02-09 17:53:27 +01:00
Fabian
a0c1d321cc plot_network: fix empty h2 retrofit for myopic 2023-02-08 23:58:56 +01:00
Fabian
d36629a836 add_brownfield: remove basename import 2023-02-08 23:58:24 +01:00
Fabian
46e3b16959 prepare sector: harmonize logger infos 2023-02-08 23:20:52 +01:00
Fabian
98e3c7ab2c solve_network: fix kwargs in solve_network 2023-02-08 22:59:36 +01:00
Fabian
3f98ccb9e2 update technology data version 2023-02-08 22:59:25 +01:00
Fabian
94fb6c646c prepare sector: add allam cycle
build sequestration: fix input for new snakemake versions
2023-02-08 22:57:01 +01:00
Fabian
f4d0415cf0 solve_network: activate co2 seq constraint
Snakefile: retrieve data bundle from pypsaeur function
2023-02-08 18:19:31 +01:00
Fabian Hofmann
d144547d87
Merge branch 'ci-review' into linopy-integration 2023-02-08 15:37:00 +01:00
Fabian
faa95c500c config: modularize solver_options 2023-02-08 15:24:17 +01:00
Fabian
69dabc367f ci: fix test configs 2023-02-08 15:24:17 +01:00
Fabian
6c57b81a4a config: move solver options in dedicated section
test configs: reduce to relative changes
CI: use snakemake --configfile options
2023-02-08 15:24:17 +01:00
Fabian
c25091ce34 solve_network.py: switch to linopy interface 2023-02-08 15:19:32 +01:00
Fabian
c8f601edf8 solve.py: start converting extra_funcionalities 2023-02-08 15:19:32 +01:00
virio-andreyana
d33547efba importing rioxarray instead of xarray to open rasterio file 2023-02-08 11:45:18 +01:00
pre-commit-ci[bot]
9f87099dbb [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-02-07 13:12:55 +00:00
Fabian
efedfa945b build_shapes: replace unary union from shapely by geopandas equivalent 2023-02-07 14:08:59 +01:00