Commit Graph

1154 Commits

Author SHA1 Message Date
Fabian Neumann
f0b44a91ec
Merge branch 'master' into fneum/line-rating 2023-07-03 19:27:05 +02:00
Fabian Neumann
191eba2009 dlr: add documentation of settings to lines.csv 2023-07-03 19:25:01 +02:00
pre-commit-ci[bot]
ac264282da [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-07-03 01:38:04 +00:00
virio-andreyana
9138901e5d add table for biomass, energy, existing capacities, solar thermal, plotting (need suggestion) 2023-07-03 03:37:41 +02:00
virio-andreyana
b2c4a5a4cb
Merge branch 'master' into describe-config 2023-07-02 23:58:55 +02:00
Fabian Neumann
86708838da
Merge branch 'master' into linemaxext-config 2023-06-30 14:51:29 +02:00
euronion
16dcad0176 Prevent attempt to re-add existing carriers. 2023-06-30 13:25:20 +02:00
Fabian Hofmann
934879d94e
Merge branch 'master' into validation 2023-06-29 19:45:17 +02:00
Fabian Hofmann
07224751e5
Merge branch 'master' into validation 2023-06-29 08:10:52 +02:00
pre-commit-ci[bot]
febd293374 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-06-28 08:05:18 +00:00
virio-andreyana
d943e3bb68 add sector and industry table. In progress 2023-06-27 23:16:15 +02:00
virio-andreyana
678792009a preparing sector config data 2023-06-22 10:23:54 +02:00
Fabian Hofmann
ab0963540f
Merge branch 'master' into complete-carrier-set 2023-06-21 09:53:19 +02:00
Fabian Neumann
86e5f08fbf
Merge branch 'master' into linemaxext-config 2023-06-20 13:33:18 +02:00
virio-andreyana
0bf693c585 general update of .rst files 2023-06-16 01:31:59 +02:00
virio-andreyana
12b9356245 add info to release_notes 2023-06-14 11:03:07 +02:00
Max Parzen
8d6d661071
Update support.rst 2023-05-16 20:44:22 +01:00
Lissy Langer
7fad9e2635
Update supply_demand.rst
Heat pump COP equations signs are wrong: https://pubs.rsc.org/en/content/articlelanding/2012/EE/c2ee22653g
2023-05-16 14:57:45 +02:00
pre-commit-ci[bot]
e431a9675c [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-05-15 13:02:41 +00:00
Fabian Hofmann
824e6bb18c
Merge branch 'master' into complete-carrier-set 2023-05-15 15:01:57 +02:00
Fabian Neumann
99963edaaf add option to limit maximum extension per line/link; linemaxext 2023-05-12 09:29:38 +02:00
Fabian Neumann
5be21dfc5a add option for piecewise linear transmission loss approximation 2023-05-12 09:07:16 +02:00
Fabian Neumann
e29571535b remove references to memory logfile in *.smk, add release note 2023-05-12 07:11:41 +02:00
Max Parzen
8a42ff77ad add myst_parser to conf.py 2023-05-07 14:24:58 +01:00
Max Parzen
510e544a4f add release note 2023-05-07 14:19:37 +01:00
Max Parzen
e9c5af27a3 bump python version and add setuptools, myst-parser 2023-05-07 14:10:18 +01:00
pre-commit-ci[bot]
b5f5b35f41 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-05-05 10:16:35 +00:00
virio-andreyana
f6597f43a0
Update release_notes.rst 2023-05-05 12:16:16 +02:00
pre-commit-ci[bot]
f0453c42c0 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-05-03 09:05:28 +00:00
energyls
da022db624 docs: add reference to contributing 2023-05-03 11:03:54 +02:00
energyls
a4e31f8cd9 Merge branch 'add_so_docs' of https://github.com/PyPSA/pypsa-eur into add_so_docs 2023-05-03 10:58:53 +02:00
energyls
673aab2925 fix: fix typo in index.rst 2023-05-03 10:58:46 +02:00
pre-commit-ci[bot]
817e82a805 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-05-03 08:54:49 +00:00
energyls
e9787e77e4 docs: remove hyperref to check CI 2023-05-03 10:53:47 +02:00
energyls
d5b1a05e37 docs: add licence information to support.rst 2023-05-03 10:40:58 +02:00
pre-commit-ci[bot]
93d79da903 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-05-03 08:37:23 +00:00
energyls
a6948ad39e docs: add support.rst and add to TOC 2023-05-03 10:36:54 +02:00
energyls
42a9f40680 docs: add shield to rst 2023-05-02 17:49:26 +02:00
Fabian Neumann
4bc6a3af4d
Merge branch 'master' into multiyear 2023-04-30 10:54:34 +02:00
pre-commit-ci[bot]
add135fe05 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-04-30 08:53:00 +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
Fabian Neumann
e16fa286ec merge master 2023-04-29 12:41:37 +02:00
Fabian Neumann
30beee0959 Merge branch 'master' into multiyear 2023-04-29 12:40:55 +02:00
Laurent Drouet
f3ca907fb0
Update installation.rst 2023-04-28 15:23:44 +02:00
Fabian
8994561569 Merge branch 'master' into validation 2023-04-25 16:58:48 +02:00
chrstphtrs
7bdb58fdf6 update link for OPSD retrieval to latest, adjust config settings 2023-04-25 16:46:30 +02:00
Fabian
9b631189c5 retrieve.smk: rename retrieve_load_data -> retrieve_electricity_demand 2023-04-25 16:37:01 +02:00
Fabian Hofmann
f4ff3dffc2
Update doc/release_notes.rst 2023-04-24 13:09:04 +02:00
Fabian Neumann
e20e7bf844 fix addition of load shedding 2023-04-24 12:33:55 +02:00
euronion
54346b071e Address pandas deprecation of date_parser for pandas.read_csv 2023-04-22 20:33:38 +02:00
Fabian Neumann
f2e53b59bf add plain hydrogen turbine option for re-electrification 2023-04-22 09:44:13 +02:00
Fabian
8c19a74fa5 add release notes
fix config references in configuration.rst
2023-04-21 11:33:06 +02:00
Fabian
1f6f7a2039 replace config.yaml by config/config.yaml in doc and docstrings 2023-04-21 10:41:44 +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
Ahmad
2984b3bb99
updated docs from build_load_data to build_electricity_demand
Signed-off-by: Ahmad <ahmedwahid16101@gmail.com>
2023-04-14 21:26:25 +02:00
Adrian Odenweller
a39d611df3 Update release note with CPLEX bugfix 2023-03-25 13:34:45 +01:00
Fabian Neumann
72471e9d99 add release notes for v0.8.0 2023-03-22 10:52:08 +01:00
Fabian Neumann
f8830fcf69 doc: implement review feedback (amend) 2023-03-17 12:39:43 +01:00
Fabian Neumann
1716656549 doc: implement review feedback 2023-03-17 12:39:13 +01:00
Fabian Neumann
4f40e4bd19 fix license specification of doc/publications.bib 2023-03-17 11:07:12 +01:00
pre-commit-ci[bot]
cae7d2db30 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-03-17 08:55:11 +01:00
Fabian Neumann
419282080b Merge branch 'merge-pypsa-eur-sec' of github.com:PyPSA/pypsa-eur into merge-pypsa-eur-sec 2023-03-16 16:46:12 +01:00
Fabian Neumann
dbc3ea6258 doc: add list of publications 2023-03-16 16:46:06 +01:00
Fabian Neumann
12372fb478 doc: add ways to cite PyPSA-Eur 2023-03-16 16:17:37 +01:00
pre-commit-ci[bot]
58eab3cf2f [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-03-16 15:02:29 +00:00
Fabian Neumann
beae5e5111 doc: fix number of columns for sector-oprt 2023-03-16 16:02:02 +01:00
lisazeyen
28dbea7c53 correct snakemake call for sector coupled networks 2023-03-16 15:24:55 +01:00
Fabian Neumann
21a60d7859 docs: limit matplotlib>3.5.1,<3.6 2023-03-16 15:18:10 +01:00
Fabian Neumann
492673471b docs: limit matplotlib<3.6 2023-03-16 15:11:15 +01:00
lisazeyen
07568b3464 add more sector_opts wildcards 2023-03-16 15:09:23 +01:00
pre-commit-ci[bot]
7cff6b5e1d [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-03-16 11:16:31 +00:00
Fabian Neumann
fdd49b2809 docs: complete instructions for sector-coupling tutorial2 2023-03-16 12:14:08 +01:00
Fabian Neumann
0a86828edd docs: cartopy cannot be installed from pip alone 2023-03-16 12:07:53 +01:00
pre-commit-ci[bot]
4357320218 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-03-16 11:06:17 +00:00
Fabian Neumann
17f9496f9b Merge branch 'merge-pypsa-eur-sec' of github.com:PyPSA/pypsa-eur into merge-pypsa-eur-sec 2023-03-16 12:05:43 +01:00
Fabian Neumann
2586969995 docs: add missing configuration options 2023-03-16 12:05:36 +01:00
pre-commit-ci[bot]
c24b119928 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-03-16 10:42:46 +00:00
Fabian Neumann
12d38bd867 docs: add release notes and document new config options 2023-03-16 11:41:50 +01:00
pre-commit-ci[bot]
23c92ca436 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-03-15 16:01:11 +00:00
Fabian Neumann
55395c5465 enhance documentation, with instructions for sector-coupled / electricity-only studies 2023-03-15 17:00:06 +01:00
Fabian
e0f8952218 codespell: fix typo & add word to exception list 2023-03-14 13:05:51 +01:00
Fabian Neumann
6444640c1f Merge branch 'master' into ukraine_hackathon 2023-03-11 14:28:10 +01: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
91ea0a3f55 docs: rearrange sections 2023-03-09 13:28:42 +01:00
Fabian Neumann
abe4df543e add minimal description of all scripts 2023-03-09 12:45:43 +01:00
Fabian Neumann
483f3e1b82 eliminate manual country code conversion, adjust mock_snakemake to ll wildcard 2023-03-09 08:36:18 +01:00
Fabian
5cf2b8174a scripts: apply linting fixes 2023-03-07 17:21:00 +01:00
Fabian Neumann
4e719b99a1 doc: update landing page 2023-03-06 19:49:01 +01:00
Fabian Neumann
a16e600f64 reuse compatibility for pypsa-eur-sec code 2023-03-06 19:35:33 +01:00
Fabian Neumann
ab501f3eb6 remove plot_p_nom_max 2023-03-06 17:41:09 +01:00
Fabian Hofmann
9b7e4d3bee
Merge branch 'master' into merge-pypsa-eur-sec 2023-03-06 16:09:42 +01:00
pre-commit-ci[bot]
8db3780fce [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-03-06 14:43:47 +00:00
Fabian Neumann
ca087eb0aa doc: reorganise pre-merge PyPSA-Eur release notes 2023-03-06 14:30:00 +01:00
Fabian Neumann
0bd8523999 how to handle upcoming releases 2023-03-06 14:27:32 +01:00
Fabian Neumann
29af354883 trigger readthedocs webhook II 2023-03-06 12:56:32 +01:00
Fabian Neumann
0ecb28dc83 Merge branch 'merge-pypsa-eur-sec' of github.com:PyPSA/pypsa-eur into merge-pypsa-eur-sec 2023-03-06 12:51:35 +01:00
Fabian Neumann
e1928e2c76 trigger readthedocs webhook 2023-03-06 12:51:29 +01:00
pre-commit-ci[bot]
7c7da754bb [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-03-06 11:45:07 +00:00
Fabian Neumann
4cc1f5cd72 merge docs 2023-03-06 12:44:44 +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
0332216891 update release notes 2023-03-06 09:46:18 +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
26a26b5b78 Merge branch 'master' of github.com:pypsa/pypsa-eur-sec 2023-02-16 21:38:58 +01:00
Fabian Neumann
df1bba0817 remove gitter 2023-02-16 21:38:30 +01:00
Fabian Neumann
2280baeb29 add workflow rulegraph 2023-02-16 21:27:25 +01:00
Fabian Neumann
63a5a39b0c organise release notes 2023-02-16 21:19:25 +01:00
Fabian Neumann
b14d657042 minor fixes and address deprecation warnings 2023-02-16 20:13:26 +01:00
Fabian Neumann
b2ea0576cd add release note 2023-02-16 17:32:36 +01:00
Fabian Neumann
dc7194c068 bumb version number 2023-02-16 15:34:18 +01:00
Fabian Neumann
f7b1dd6882 finalise release notes 2023-02-16 14:56:24 +01:00
Fabian Neumann
b6732bf6c4 documentation updates 2023-02-16 12:37:30 +01:00
Fabian Neumann
9c1182fe96 prepare release 0.7 2023-02-16 11:50:55 +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
d2f2af9245 add release note 2023-02-15 19:04:52 +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 Hofmann
f94be5c2f5
Merge branch 'master' into fix/deprecation-warning-pandas-1.4 2023-02-07 11:00:02 +01:00
Fabian Neumann
5bb35d188e
Merge branch 'master' into ukraine_hackathon 2023-01-30 18:58:55 +01:00
Fabian Neumann
a870b603f4 automatically retrieve technology-data, no git clone 2023-01-28 08:15:43 +01:00
martavp
5ca969ab14
Merge pull request #24 from Adam-Dvorak1/refine-doc
Refine doc
2023-01-13 09:06:24 +01:00
Fabian Neumann
1ebe53cdac merge master 2023-01-06 18:45:36 +01:00
Fabian Neumann
27414ac010 new config options for demand in aviation + HVC, control of ICE shares in land transport and agriculture 2022-12-29 11:46:57 +01:00
Fabian Neumann
8edc9042b9 add release note 2022-12-28 15:46:11 +01:00
Fabian Neumann
8bab9300ec add release note 2022-12-28 13:50:55 +01:00
Max Parzen
545a734b7b
Merge branch 'master' into pz-max-patch-2 2022-12-16 12:20:58 +00:00
Max Parzen
17a8bc3c39
Update release_notes.rst 2022-12-16 11:06:36 +00:00
Max Parzen
3dac13ac3b
Update release_notes.rst 2022-12-16 10:58:24 +00:00
Adam-Dvorak1
985cd8bae1 Refine math in myopic.rst 2022-12-09 10:37:41 +01:00
Adam-Dvorak1
bf0b52b8ae More refining 2022-12-02 16:15:28 +01:00
Adam-Dvorak1
2eefba3b95 Start refining
Fixing typos
2022-12-02 15:58:57 +01:00
Fabian Neumann
88db7a458f minor fixes 2022-11-27 18:38:32 +01:00
Fabian Neumann
f295064df2
Update doc/supply_demand.rst
Co-authored-by: energyLS <89515385+energyLS@users.noreply.github.com>
2022-11-27 18:21:17 +01:00
Fabian Neumann
7f1a0f7c9a
Update doc/supply_demand.rst
Co-authored-by: energyLS <89515385+energyLS@users.noreply.github.com>
2022-11-27 18:20:15 +01:00
martavp
d5758f2863
Merge branch 'master' into improve-doc 2022-11-27 14:11:51 +01:00
martavp
cfff99054a
Update doc/supply_demand.rst
Co-authored-by: energyLS <89515385+energyLS@users.noreply.github.com>
2022-11-27 14:00:06 +01:00
martavp
55025e1234
Update doc/spatial_resolution.rst
Co-authored-by: energyLS <89515385+energyLS@users.noreply.github.com>
2022-11-27 13:49:55 +01:00
martavp
dac1eb1792
Update doc/spatial_resolution.rst
Co-authored-by: energyLS <89515385+energyLS@users.noreply.github.com>
2022-11-27 13:49:43 +01:00
martavp
e002804d26
Update doc/spatial_resolution.rst
Co-authored-by: energyLS <89515385+energyLS@users.noreply.github.com>
2022-11-27 13:49:30 +01:00
martavp
97a9365a22
Update doc/supply_demand.rst
Co-authored-by: energyLS <89515385+energyLS@users.noreply.github.com>
2022-11-27 13:49:08 +01:00
martavp
95273ea1ed
Update doc/spatial_resolution.rst
Co-authored-by: energyLS <89515385+energyLS@users.noreply.github.com>
2022-11-27 13:48:55 +01:00
martavp
dc937d6533
Update doc/supply_demand.rst
Co-authored-by: energyLS <89515385+energyLS@users.noreply.github.com>
2022-11-27 13:47:30 +01:00
martavp
d5da1e32e1
Update doc/myopic.rst
Co-authored-by: energyLS <89515385+energyLS@users.noreply.github.com>
2022-11-27 13:46:31 +01:00
martavp
79fe300a6a
Update doc/myopic.rst
Co-authored-by: energyLS <89515385+energyLS@users.noreply.github.com>
2022-11-27 13:45:48 +01:00
martavp
bf74b17884
Update doc/myopic.rst
Co-authored-by: energyLS <89515385+energyLS@users.noreply.github.com>
2022-11-27 13:45:13 +01:00
martavp
f3e36e9b9a
Update doc/supply_demand.rst
Co-authored-by: energyLS <89515385+energyLS@users.noreply.github.com>
2022-11-27 13:01:26 +01:00
martavp
c4868cdf19
Update doc/supply_demand.rst
Co-authored-by: energyLS <89515385+energyLS@users.noreply.github.com>
2022-11-27 13:01:16 +01:00
martavp
3ef935c262
Update doc/supply_demand.rst
Co-authored-by: energyLS <89515385+energyLS@users.noreply.github.com>
2022-11-27 13:00:55 +01:00
martavp
f76562d53a
Update doc/supply_demand.rst
Co-authored-by: energyLS <89515385+energyLS@users.noreply.github.com>
2022-11-27 13:00:20 +01:00
martavp
f3ef8011f4
Update doc/supply_demand.rst
Co-authored-by: energyLS <89515385+energyLS@users.noreply.github.com>
2022-11-27 12:59:58 +01:00
martavp
28f4fa1b56
Update doc/supply_demand.rst
Co-authored-by: energyLS <89515385+energyLS@users.noreply.github.com>
2022-11-27 12:59:29 +01:00
martavp
d0237356d4
Update doc/supply_demand.rst
Co-authored-by: energyLS <89515385+energyLS@users.noreply.github.com>
2022-11-27 12:59:14 +01:00
martavp
436c7cd086
Update doc/supply_demand.rst
Co-authored-by: energyLS <89515385+energyLS@users.noreply.github.com>
2022-11-27 12:58:51 +01:00
Adam-Dvorak1
12b5ad1e3d Replacing $$ with rst format (.. math ::) etc 2022-11-23 15:53:39 +01:00
Adam-Dvorak1
928420ef3e
Update supply_demand.rst 2022-11-23 14:12:51 +01:00
Adam-Dvorak1
2ba44b1749
Update supply_demand.rst 2022-11-23 14:11:51 +01:00
Adam-Dvorak1
556cec5c17
test 2022-11-23 14:09:21 +01:00
Adam-Dvorak1
ba184321b1
Update supply_demand.rst 2022-11-23 14:08:59 +01:00
Adam-Dvorak1
ecf1df8b50
Test 2022-11-23 14:07:45 +01:00
Adam-Dvorak1
6c7727e3aa
Update supply_demand.rst 2022-11-23 14:01:57 +01:00
Adam-Dvorak1
98cac560ac
Test 2022-11-23 14:01:28 +01:00
Adam-Dvorak1
cb8a645036
Test 2022-11-23 13:58:35 +01:00
Adam-Dvorak1
63ad6d42bf
Update supply_demand.rst 2022-11-23 13:58:04 +01:00
Adam-Dvorak1
2eef75e0f9
Update supply_demand.rst 2022-11-23 13:57:28 +01:00
Adam-Dvorak1
14f88652bf
Test math 2022-11-23 13:57:02 +01:00
Adam-Dvorak1
bfdc333858
Testing math format 2022-11-23 13:52:11 +01:00
martavp
7cc336e89e Update myopic.rst 2022-11-21 18:21:53 +01:00
martavp
f83be559e4
Update doc/technology_assumptions.rst
Co-authored-by: energyLS <89515385+energyLS@users.noreply.github.com>
2022-11-21 18:12:00 +01:00
martavp
8ab2d5f0e6
Update doc/spatial_resolution.rst
Co-authored-by: energyLS <89515385+energyLS@users.noreply.github.com>
2022-11-21 18:11:33 +01:00
martavp
c935ed151b
Update doc/spatial_resolution.rst
Co-authored-by: energyLS <89515385+energyLS@users.noreply.github.com>
2022-11-21 18:11:20 +01:00
martavp
ab71254aeb
Update doc/spatial_resolution.rst
Co-authored-by: energyLS <89515385+energyLS@users.noreply.github.com>
2022-11-21 18:11:03 +01:00
martavp
bf374c75be
Update doc/spatial_resolution.rst
Co-authored-by: energyLS <89515385+energyLS@users.noreply.github.com>
2022-11-21 18:10:48 +01:00
martavp
cfcf5cf490
Update doc/myopic.rst
Co-authored-by: energyLS <89515385+energyLS@users.noreply.github.com>
2022-11-21 18:10:31 +01:00
martavp
24ea8448da
Update doc/myopic.rst
Co-authored-by: energyLS <89515385+energyLS@users.noreply.github.com>
2022-11-21 18:10:11 +01:00
martavp
b20130eb2f
Update doc/myopic.rst
Co-authored-by: energyLS <89515385+energyLS@users.noreply.github.com>
2022-11-21 18:09:51 +01:00
martavp
6b5b8b2d3b
Update doc/myopic.rst
Co-authored-by: energyLS <89515385+energyLS@users.noreply.github.com>
2022-11-21 18:09:36 +01:00
Fabian
df4eb85a19 fix typos 2022-11-18 09:08:07 +01:00
Fabian Neumann
3815d0da61 add release note 2022-11-10 15:31:25 +01:00
Max Parzen
d04e19f9a8 fix tutorial config links 2022-11-01 10:39:14 +00:00
martavp
f6e017257e correct small spelling mistakes 2022-10-25 09:29:49 +02:00
martavp
11585429b0 small spelling corrections 2022-10-25 09:28:18 +02:00
martavp
9bc0e2afb7 update description of mechanical and chemical recycling of plastics 2022-10-25 09:23:35 +02:00
Adam-Dvorak1
e9ffaac223 Small edits 2022-10-07 19:10:05 +02:00
Adam-Dvorak1
a3268604c2 config file. 2022-10-07 19:02:12 +02:00
Adam-Dvorak1
b4457a75e3 latex formatting 2022-10-07 18:49:37 +02:00
Adam-Dvorak1
87c444c898 formatting latex math 2022-10-07 18:46:39 +02:00
Adam-Dvorak1
c3d2213402 Typos 2022-10-07 18:39:07 +02:00
Adam-Dvorak1
0f86d52c03 Typos and formatting 2022-10-07 18:37:43 +02:00
Adam-Dvorak1
5ca89f8955 Typos and modeled to modelled (UK version) 2022-10-07 18:31:36 +02:00
Adam-Dvorak1
c2cf870876 Minor edits 2022-10-07 18:24:52 +02:00
Adam-Dvorak1
6bc99291c9 Other industry subsectors 2022-10-07 18:10:58 +02:00
Adam-Dvorak1
dfd0d080ed Update supply_demand.rst 2022-10-07 17:05:34 +02:00
Adam-Dvorak1
59027615c8 Replacing CO2 2022-10-07 16:54:57 +02:00
Adam-Dvorak1
9e40a0f5f2
Add non-metallic mineral products title 2022-10-07 16:42:43 +02:00
Adam-Dvorak1
9cd701496c
Adding chemistry section 2022-10-07 16:38:50 +02:00
Adam-Dvorak1
f3f08340af
Update supply_demand.rst 2022-10-07 16:23:39 +02:00
Adam-Dvorak1
e13292da71
Update supply_demand.rst 2022-10-07 16:22:09 +02:00
Adam-Dvorak1
374a7900f3
Linking test 2022-10-07 16:17:54 +02:00
martavp
c6b997547a
Merge pull request #21 from ebbekyhl/patch-2
Update myopic and extend carbon budget description
2022-10-03 10:28:21 +02:00
Fabian Neumann
1611d63a8a
Merge branch 'master' into nh3 2022-10-01 16:01:39 +02:00
Fabian Hofmann
62ca32b274
Merge branch 'master' into fix/deprecation-warning-pandas-1.4 2022-09-26 12:33:13 +02:00
Fabian Hofmann
9d1a0e2c13
Merge branch 'master' into exclude_carrier_clustering 2022-09-22 12:33:19 +02:00
Ebbe Kyhl
ffb5a5a10d
Update myopic and extend carbon budget description 2022-09-21 09:08:39 +02:00
Fabian Neumann
fcb80190c4 bump version to 0.6.1 2022-09-20 18:33:21 +02:00
Fabian Neumann
73032241ff
Merge branch 'master' into exclude_carrier_clustering 2022-09-20 17:09:10 +02:00
Philipp Glaum
04dae75779 Merge branch 'exclude_carrier_clustering' of github.com:p-glaum/pypsa-eur into exclude_carrier_clustering 2022-09-20 08:43:00 +02:00
Philipp Glaum
d532424e5d update release_notes 2022-09-20 08:42:45 +02:00
pre-commit-ci[bot]
85d01bceb0 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-09-19 14:34:48 +00:00
Philipp Glaum
c8b67776fa Merge branch 'master' into exclude_carrier_clustering 2022-09-19 16:34:21 +02:00
Parisra
8fae517881
Update supply_demand.rst 2022-09-19 16:17:30 +02:00
Fabian
2629582357 update readme figure 2022-09-19 16:15:58 +02:00
Parisra
ac35725423
Update supply_demand.rst 2022-09-19 15:30:36 +02:00
Parisra
b535a3f405
Update supply_demand.rst 2022-09-19 15:23:48 +02:00
Parisra
af99cd63cc
Update supply_demand.rst 2022-09-19 15:11:44 +02:00
Parisra
98d94a21fe
Update supply_demand.rst 2022-09-19 15:10:02 +02:00
Parisra
ac2747e25c
Update supply_demand.rst 2022-09-19 15:06:12 +02:00
Parisra
1d8e964e12
Update supply_demand.rst 2022-09-19 15:02:42 +02:00
Parisra
b3f66561c8
Update supply_demand.rst 2022-09-19 14:51:46 +02:00
Parisra
77e2e53aa5
Update supply_demand.rst 2022-09-19 14:46:38 +02:00
Parisra
5eb20ebdd5
Update supply_demand.rst 2022-09-19 14:40:56 +02:00
Fabian Hofmann
9d46cf7659
Merge branch 'master' into default-res-installations 2022-09-19 13:50:34 +02:00
Fabian
e2a4140663 add_electricity: calculate marginal costs from plant efficiency 2022-09-19 13:08:03 +02:00
Fabian
54f602ed94 config: enable res installations per default 2022-09-19 13:00:12 +02:00
Parisra
5efb0abe02
Create supply_demand.rst 2022-09-19 12:50:09 +02:00
Philipp Glaum
d51ca8695b update Fabians comments 2022-09-19 11:46:58 +02:00
Parisra
c668ce3c0c
Update supply_demand.rst 2022-09-19 09:46:07 +02:00
Parisra
cc325b73af
Update supply_demand.rst 2022-09-19 09:27:50 +02:00
Parisra
ffb296c06d
Update conf.py 2022-09-18 11:02:52 +02:00
pre-commit-ci[bot]
5d1ef8a640 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-09-16 13:04:06 +00:00
Fabian
e9ea4c5e53 update release notes 2022-09-16 15:03:22 +02:00
Fabian Hofmann
affa1c2b88
Merge branch 'master' into misc/precommit-ci-2 2022-09-16 14:38:49 +02:00
Fabian
1536cc2787 codespell: fix typos
Snakefile: fix unformattable parst
pre-commit: fix codespell ignore
2022-09-16 14:36:43 +02:00
Fabian
b694337541 scenario management: use "shared_cutouts" instead of "dedicated_cutouts" 2022-09-13 14:54:58 +02:00
Fabian Hofmann
8cfe975247
Update doc/configuration.rst
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2022-09-13 14:50:16 +02:00
Fabian Hofmann
863dbf0417
Merge branch 'master' into scenario-management 2022-09-12 15:45:51 +02:00
Fabian Neumann
5f08dca2fd prepare release 0.6.0 2022-09-10 15:31:43 +02:00
Fabian
02725e00f0 add precommit-yaml config 2022-09-08 11:05:56 +02:00
Fabian
71ba743e46 enable scneario management for different configs 2022-09-08 10:28:07 +02:00
Fabian
2eb26f7334 address #314 2022-09-05 12:55:46 +02:00
martavp
ce9e4ab2be Merge branch 'improve-doc' of https://github.com/martavp/pypsa-eur-sec into improve-doc 2022-09-02 14:28:34 +02:00
martavp
b3b40f75ab Update release_notes.rst 2022-09-02 14:28:31 +02:00
martavp
f6636d43f2
Merge pull request #19 from GormBruunAndresen/improve-doc
Minor updates to the transport documentation
2022-09-02 14:20:43 +02:00
Gorm Bruun Andresen
108effd300 Minor updates to the transport documentation
Some minor errors in the transport documentation was corrected.
2022-09-02 14:16:10 +02:00
Parisra
dcbe5e5593
Update spatial_resolution.rst 2022-09-02 13:48:27 +02:00
Adam-Dvorak1
0f6c2cd479
Inserting iron section 2022-08-30 14:18:31 +02:00
Adam-Dvorak1
8afa575a0c
Equation edits 2022-08-24 10:46:05 +02:00
Adam-Dvorak1
35c2e5354e
Equation edits 2022-08-24 10:13:01 +02:00
Adam-Dvorak1
1727fc7999
Equation edits 2022-08-24 10:12:23 +02:00
Adam-Dvorak1
66a465aad7
Eq insert in iron and steel 2022-08-24 10:08:59 +02:00
Adam-Dvorak1
efc7304f4b
Merge branch 'martavp:improve-doc' into improve-doc 2022-08-24 09:46:25 +02:00
Adam-Dvorak1
d859738b7d
Incorporating Marta changes 2022-08-24 09:45:34 +02:00
Adam-Dvorak1
18c31495a8
Remove test 2022-08-24 09:43:22 +02:00
martavp
bbc4e78587
Merge pull request #16 from GormBruunAndresen/improve-doc
Added land transport
2022-08-19 18:03:02 +02:00
Gorm Bruun Andresen
79ed33aa0a Small change to land transport
Very minor change
2022-08-19 16:10:36 +02:00
Gorm Bruun Andresen
aa3b1f957c Description of land transport
The description of land transport is added. It needs a review since that has not been done yet.
2022-08-19 16:10:02 +02:00
martavp
ef35190804
Merge pull request #12 from Parisra/Spatial_res_doc
Spatial res doc
2022-08-19 14:24:43 +02:00
martavp
b0d06c0031
Merge pull request #13 from GormBruunAndresen/improve-doc
Updated the aviation section
2022-08-19 14:24:29 +02:00
martavp
544625e6d7
Merge pull request #14 from Parisra/Carbon-capture
Carbon capture
2022-08-19 14:24:18 +02:00
Adam-Dvorak1
5d5ecd73b6
Update supply_demand.rst 2022-08-19 14:06:18 +02:00
Adam-Dvorak1
44db7bc233
Update supply_demand.rst 2022-08-19 14:02:27 +02:00
Parisra
8789f2c26b
Update technology_assumptions.rst 2022-08-19 14:02:04 +02:00
Adam-Dvorak1
e68105584c
Update supply_demand.rst 2022-08-19 14:00:10 +02:00
Adam-Dvorak1
fbb6acdc7c
Update supply_demand.rst 2022-08-19 13:58:59 +02:00
Parisra
b2026c6448
Update supply_demand.rst 2022-08-19 13:57:22 +02:00
Parisra
0477a84e33
Update supply_demand.rst 2022-08-19 13:56:33 +02:00
Adam-Dvorak1
44248986c2
Testing 2022-08-19 13:55:00 +02:00
Adam-Dvorak1
0a7c3bbb86
Testing 2022-08-19 13:54:38 +02:00
Adam-Dvorak1
8c738437df
Test of link to other section 2022-08-19 13:53:52 +02:00
Gorm Bruun Andresen
f229a5c374 Updated the aviation section
Very minor update of the aviation section.
2022-08-19 13:52:34 +02:00
martavp
cc4e39db1b Merge branch 'improve-doc' of https://github.com/martavp/pypsa-eur-sec into improve-doc 2022-08-19 13:49:28 +02:00
martavp
9518d35381 add file to describe technology assumptions 2022-08-19 13:49:25 +02:00
Parisra
817a0894bb
Update spatial_resolution.rst 2022-08-19 13:43:06 +02:00
Gorm Bruun Andresen
d5d7b65b7c
Merge branch 'improve-doc' into improve-doc 2022-08-19 13:41:54 +02:00
Adam-Dvorak1
6e2a6c8a5e
Small edit to heating 2022-08-19 13:37:51 +02:00
Gorm Bruun Andresen
1050394170 Merge branch 'improve-doc' of https://github.com/GormBruunAndresen/pypsa-eur-sec-mvp into improve-doc 2022-08-19 13:36:05 +02:00
Gorm Bruun Andresen
d8a6e2134e Updated the Shipping section
Updated the Shipping section to the most recent version. The (small) changes include the review comments.
2022-08-19 13:35:50 +02:00
Parisra
0bfab39a4e
Update spatial_resolution.rst 2022-08-19 13:35:49 +02:00
Adam-Dvorak1
59d213b4c0
Biomass with Marta edits 2022-08-19 13:33:49 +02:00
Parisra
c0c8d92a0b
Update spatial_resolution.rst 2022-08-19 13:31:55 +02:00
Adam-Dvorak1
86bc60fd28
Merge branch 'martavp:improve-doc' into improve-doc 2022-08-19 11:48:53 +02:00
Adam-Dvorak1
3e884ed58b
parentheses 2022-08-19 11:48:25 +02:00
Adam-Dvorak1
9457704c18
editing eq 2022-08-19 11:47:17 +02:00
martavp
f217c31974 add perfect 2022-08-19 11:46:28 +02:00
Adam-Dvorak1
0c4d948d5b
Editing eq 2022-08-19 11:45:40 +02:00
Adam-Dvorak1
8fef2f0940
Editing eq in chemicals 2022-08-19 11:44:22 +02:00
Adam-Dvorak1
3416a1a5b3
Industry sector--chemicals 2022-08-19 11:43:35 +02:00
Adam-Dvorak1
c6413c84f5
Edit of space heating subsection title 2022-08-19 11:27:50 +02:00
Adam-Dvorak1
69c140a8b3
Editing subsection headings 2022-08-19 11:26:37 +02:00
Adam-Dvorak1
7bb6197bdf
Updating subsection headings in heating 2022-08-19 11:23:18 +02:00
martavp
fbda00e399 Update limitations.rst 2022-08-19 11:17:08 +02:00
Adam-Dvorak1
b565730617
Industry section overview--including figures 2022-08-19 11:11:31 +02:00
Parisra
1554dae40b
Update supply_demand.rst 2022-08-19 10:54:14 +02:00
martavp
f11d9d5129
Merge branch 'improve-doc' into improve-doc 2022-08-19 09:28:22 +02:00
martavp
d6265ed81b Update index.rst 2022-08-19 09:20:55 +02:00
martavp
eb882a0d02
Merge pull request #4 from Adam-Dvorak1/improve-doc
Adding hydrogen and oil-based products sections. Add one figure
2022-08-11 15:00:35 +02:00
Gorm Bruun Andresen
aefef9b091 Update supply_demand.rst
Description of aviation. It is pretty simple.
2022-08-11 14:55:25 +02:00
Gorm Bruun Andresen
c17061be96 Update supply_demand.rst
General comment on transport.
2022-08-11 14:53:51 +02:00
Adam-Dvorak1
02ee751a37
Adding oil-based products section 2022-08-11 14:46:33 +02:00
Ebbe Kyhl
495b6eab2c
add section on methane 2022-08-11 14:45:06 +02:00
Adam-Dvorak1
8b29e36b01
Update supply_demand.rst 2022-08-11 14:26:26 +02:00
Gorm Bruun Andresen
78b91b55a7 Update supply_demand.rst
Adding text for shipping. Internal links needs to be updated.
2022-08-11 14:17:47 +02:00
Gorm Bruun Andresen
b9a47b34ab Update supply_demand.rst
Adding some headlines for transportation.
2022-08-11 14:17:00 +02:00
Adam-Dvorak1
ed2ca5ec3c
Edit format of headings 2022-08-11 14:06:26 +02:00
Adam-Dvorak1
c6b7f05c73
Add hydrogen to supply and demand 2022-08-11 14:05:24 +02:00
Gorm Bruun Andresen
8d41534109 Update supply_demand.rst
Updated version of the biomass description. Links to other parts of the documentation still needs to be added.
2022-08-11 13:54:42 +02:00
martavp
c4f639edef Revert "Add one extra line to supply_demand as example"
This reverts commit 1627e36c02.
2022-08-11 13:50:11 +02:00
martavp
8a3fc0813a Revert "Revert "Add one extra line to supply_demand as example""
This reverts commit 06d592281d.
2022-08-11 13:50:06 +02:00
martavp
00c05668f8 Revert "Merge pull request #1 from GormBruunAndresen/improve-doc"
This reverts commit c3e1a55049, reversing
changes made to 06d592281d.
2022-08-11 13:49:57 +02:00
martavp
9e698eede0 Revert "Merge pull request #2 from Parisra/improve-doc"
This reverts commit a978f78a96, reversing
changes made to c3e1a55049.
2022-08-11 13:49:35 +02:00
martavp
56a154fd6e Revert "Revert "Merge pull request #2 from Parisra/improve-doc""
This reverts commit 1ef8416307.
2022-08-11 13:49:17 +02:00
martavp
1ef8416307 Revert "Merge pull request #2 from Parisra/improve-doc"
This reverts commit a978f78a96, reversing
changes made to c3e1a55049.
2022-08-11 13:48:59 +02:00
martavp
a978f78a96
Merge pull request #2 from Parisra/improve-doc
Improve doc
2022-08-11 13:46:14 +02:00
Parisra
71a94d5ef6
Update heat demand 2022-08-11 13:41:13 +02:00
martavp
c3e1a55049
Merge pull request #1 from GormBruunAndresen/improve-doc
Test commit
2022-08-11 13:32:33 +02:00
Gorm Bruun Andresen
3f78c83cf2 Update supply_demand.rst
Test number two. Let's hope for the best.
2022-08-11 13:30:16 +02:00
martavp
06d592281d Revert "Add one extra line to supply_demand as example"
This reverts commit 1627e36c02.
2022-08-11 13:26:49 +02:00
martavp
1627e36c02 Add one extra line to supply_demand as example 2022-08-11 13:02:33 +02:00
martavp
f129547b9d include agriculture in covered sectors 2022-08-10 07:24:18 +02:00
lisazeyen
4accfff1bb update release notes 2022-08-08 08:53:16 +02:00
lisazeyen
9752b4b4e6
Merge branch 'master' into pellet-boiler 2022-08-05 12:25:01 +02:00
lisazeyen
8f92f08579 update relase notes 2022-08-05 12:21:32 +02:00
lisazeyen
274e7df5af update release notes 2022-08-04 16:03:32 +02:00
Philipp Glaum
16ab4703da add release note 2022-07-29 15:12:19 +02:00
Philipp Glaum
ebf54a7c9d update configtables in the documentation 2022-07-29 12:11:46 +02:00
Fabian Neumann
df6d74a087 add release docs where to change versions 2022-07-27 13:12:52 +02:00
Fabian Neumann
885316002c release_notes: markdown to rst syntax 2022-07-27 11:58:23 +02:00
Fabian Neumann
3c64ecf057 doc: fix syntax of electricity.csv 2022-07-27 11:55:37 +02:00
Fabian Neumann
c9c1910699 doc: remove gitter 2022-07-27 11:50:42 +02:00
Fabian Neumann
4dcb47f74b release notes: update date 2022-07-27 11:49:30 +02:00
Fabian Neumann
8d132464bd
Merge branch 'release-v0.5' into introduce_modularity_clustering 2022-07-27 09:04:39 +02:00
Fabian Neumann
87388d4b4a update author affiliations 2022-07-26 15:32:48 +02:00
Fabian Neumann
6027ade0ed prepare release notes 2022-07-26 15:30:07 +02:00
Fabian Neumann
8fc0c57ed6 update copyright years 2022-07-26 15:05:59 +02:00
Fabian Neumann
e523cb4cb5 doc: minor updates 2022-07-26 15:01:21 +02:00
Fabian Neumann
239dcfdd1e
Merge branch 'master' into introduce_modularity_clustering 2022-07-26 14:04:56 +02:00
Fabian Neumann
5bb432141d hydro: add documentation for eia approximation/correction options 2022-07-22 18:34:16 +02:00
Fabian Neumann
f52c8cd974 merge master 2022-07-22 18:30:16 +02:00
Fabian Hofmann
3ba7e2ab90
Merge branch 'master' into technology-data 2022-07-21 15:36:12 +02:00
Fabian Neumann
b04a55a248 merge former countries hydro profiles 2022-07-20 15:03:48 +02:00
Tom Brown
ec1aa1b76b README, doc: add reference to hydrogen network paper as showcase of model 2022-07-18 20:40:21 +02:00
martacki
90ffc35f05 documentation 2022-07-13 15:39:46 +02:00
Fabian Neumann
27e5dec4e6 documentation fixes 2022-06-30 09:01:49 +02:00
lisazeyen
187c9cbaa3 add release notes 2022-06-29 08:49:29 +02:00
martacki
e9e00291c5 update configtables/opts to include CH4L option 2022-06-28 13:40:14 +02:00
Fabian Neumann
74f8ca1c7f
Merge branch 'master' into eu-energy-security 2022-06-28 08:09:39 +02:00
Fabian Neumann
971e970250
Merge branch 'master' into landlock-fix-alterative 2022-06-28 07:47:13 +02:00
martacki
f1dedd9429 hierarchical clustering: release notes & revert to old default clustering algorithm (kmeans) 2022-06-27 21:11:49 +02:00
Martha Frysztacki
50a518a155
Merge branch 'master' into introduce_hac_clustering 2022-06-27 20:45:40 +02:00
Fabian Neumann
51de606aab
Revert "remove build/retrieve natura raster, directly use shapefile" 2022-06-27 19:00:41 +02:00
Fabian
b56d1f6f4d conventional config section: update to more general attribute assignment scheme 2022-06-27 17:35:19 +02:00
Martha Frysztacki
5587327be3
Merge branch 'master' into harmonize_clustering_strategies 2022-06-27 14:02:45 +02:00
Fabian Hofmann
8349e85252
Apply suggestions from code review
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2022-06-27 11:48:45 +02:00
Fabian Neumann
9c6c6d243f
Adaptations to match current PyPSA-Eur version 2022-06-27 10:21:08 +02:00
Fabian Neumann
8e57d68b73
Merge branch 'master' into landlock-fix-alterative 2022-06-27 09:44:42 +02:00
Fabian Neumann
5ca231824e
Merge branch 'master' into eu-energy-security 2022-06-27 08:58:37 +02:00
Fabian Neumann
520f7e440e
Merge branch 'master' into technology-data 2022-06-25 11:05:41 +02:00
Fabian Neumann
4c5ec8e5f1
Merge branch 'master' into introduce_hac_clustering 2022-06-24 20:22:47 +02:00
Fabian Neumann
d321b2b762 resolve merge conflicts 2022-06-24 20:15:32 +02:00
Fabian
b37c1d98d3 update release notes 2022-06-24 18:44:03 +02:00
Fabian Hofmann
17d7403f20
build_powerplants: apply suggestions from code review
Co-authored-by: Martha Frysztacki <martha.frysztacki@kit.edu>
2022-06-24 15:34:26 +02:00
Fabian
c42d2bd97d refactor save to geojson file functionality to allow import/export of empty geodfs 2022-06-24 15:11:21 +02:00
Fabian Neumann
e1a6e13f75 add release note [no ci] 2022-06-23 15:28:00 +02:00
martacki
8dba48c412 clustering strats to configurables: documentation and testing 2022-06-21 19:08:22 +02:00
Fabian Neumann
5cc6e9e18a doc: add reference to new config settings 2022-06-15 14:07:48 +02:00
Fabian Neumann
9a37fe6572 merge master 2022-06-15 09:22:51 +02:00
Fabian
8cbe4e4f9d update release notes and doc 2022-06-10 00:33:09 +02:00
Fabian
76cd0751b4 Merge branch 'eu-energy-security' of github.com:PyPSA/pypsa-eur into eu-energy-security 2022-06-09 20:36:35 +02:00
Fabian
26a56d1836 update release notes 2022-06-09 20:33:13 +02:00
Fabian Hofmann
619b471f72
Merge branch 'master' into eu-energy-security 2022-06-07 10:05:11 +02:00
Max Parzen
e974a30fd3 add release note 2022-06-03 17:14:30 +01:00
Tom Brown
292d713817 README,doc: soften warnings, add limitations section to doc 2022-06-03 12:33:33 +02:00
Max Parzen
edb81a9e6a add release note 2022-05-28 14:50:44 +01:00
Fabian Neumann
3acc4a2236 update country reference from Germany to Belgium in tutorial 2022-04-12 14:52:37 +02:00
euronion
c412a61013
Add country-specific EAF restriction for NPPs. (#361)
* Add country-specific EAF restriction for NPPs.

Based on historic figures from IAEA.

* Update release_notes.rst
2022-04-08 15:41:23 +02:00
Fabian Neumann
3678e5c523 Add operational reserve margin constraint analogous to GenX
Co-authored-by: FabianHofmann <hofmann@fias.uni-frankfurt.de>
2022-04-07 14:39:34 +02:00
Fabian Neumann
c4bb470b93 add release note and instructions on global gas limit 2022-04-05 17:05:50 +02:00
Fabian
1fd6a685ab powerplants: filter out powerplants with shut down date < 2021 2022-04-05 15:12:01 +02:00
Fabian Neumann
ade22bf4f0 add existing wind and solar capacities based on IRENASTATS 2022-04-04 19:03:09 +02:00
Fabian Neumann
70640cc336 doc: fix tutorial config line references 2022-04-03 09:42:07 +02:00
Fabian Neumann
7fee2944d8
Merge branch 'master' into rm-raster-natura 2022-03-28 12:07:33 +02:00
Fabian Neumann
03e6764a9d
Merge branch 'master' into issue-301 2022-03-25 13:46:46 +01:00
Fabian Neumann
85387bded2
Merge branch 'master' into skip-if-no-lv 2022-03-25 13:46:04 +01:00
Fabian Neumann
d94719a33d fix tutorial and add release notes 2022-03-24 15:53:02 +01:00
Fabian Neumann
c54ddab4a3 remove unused simple_hvdc_costs 2022-03-24 14:47:00 +01:00
Fabian Neumann
62e7653d7e add release notes 2022-03-24 14:37:18 +01:00
Fabian Neumann
12a5a5f86a add release notes 2022-03-24 14:34:08 +01:00
Martha Frysztacki
24e103c53e
Merge branch 'master' into introduce_hac_clustering 2022-03-24 13:17:28 +01:00
Fabian Neumann
5a7c0d7967 remove build/retrieve natura raster, directly use shapefile 2022-03-20 10:03:17 +01:00
martacki
bf0df49332 update elec_s_X.png (ppls in md) 2022-03-18 10:27:42 +01:00
martacki
748e1b1f5c update imgs used in README 2022-03-18 08:52:11 +01:00
Fabian Hofmann
88757bcc8c
Merge branch 'master' into ukraine_hackathon 2022-03-17 18:44:15 +01:00
Fabian Neumann
c4423d43a8 add synchronisation release, release notes 2022-03-17 18:19:06 +01:00
Fabian Neumann
b30c559537 add image to release notes 2022-03-17 18:16:18 +01:00
Fabian Neumann
ce6c15224f add release notes 2022-03-17 18:05:52 +01:00
Martha Frysztacki
69c0341145
Merge branch 'master' into introduce_hac_clustering 2022-03-17 17:40:46 +01:00
Fabian Neumann
b23b3ff1a7
Merge branch 'master' into ukraine_hackathon 2022-03-17 08:48:58 +01:00
Fabian Neumann
4868b3b91a update cutout links 2022-03-13 14:01:02 +01:00
Seth
323fdc651a
update toplevel.csv to include quotation marks in focus_weights
fixes #328
2022-03-11 15:52:34 +01:00
Martha Frysztacki
3e07fdfd54
Merge branch 'master' into introduce_hac_clustering 2022-03-07 11:44:29 +01:00
martacki
f02d5fe821 fix clustering setup for hac according to fneum suggestions 2022-03-07 11:43:04 +01:00
euronion
c729d0dd74 Update release_notes.rst 2022-03-04 21:21:49 +01:00
euronion
519c7a4700 Update snapshots.csv 2022-03-04 21:21:44 +01:00
euronion
76ee8c617a Update release_notes.rst 2022-03-04 21:15:35 +01:00
martacki
b63271f12f release_notes, old format of base_network with updated docstrings 2022-03-03 17:16:23 +01:00
Fabian Neumann
52b0d29fae merge master 2022-02-18 10:24:26 +01:00
Koen van Greevenbroek
a2d3edd82b Document the k-means random state fix 2022-02-10 16:07:31 +01:00
Martha Frysztacki
25b3245923
Merge branch 'master' into introduce_hac_clustering 2022-02-04 14:35:14 +01:00
Fabian Neumann
090b4908a4 Snakefile: use standard resource mem_mb rather than mem 2022-01-27 21:04:50 +01:00
Fabian Neumann
598b75358d
Update installation.rst 2022-01-24 12:42:53 +01:00
Fabian Neumann
a747c88d08 disable solar PV CF correction factor for default satellite data (closes #285) 2022-01-13 15:42:48 +01:00
Fabian Neumann
7535a0d385
update data bundle (#216) 2022-01-06 10:29:59 +01:00
Fabian Neumann
d1762919c5
add option 'seqXXX' to sweep global co2 sequestration potentials (#208)
* add option 'seqXXX' to sweep global co2 sequestration potentials

* add release notes
2021-12-10 12:05:38 +01:00
Fabian Neumann
82096f92e8
fix for GlobalConstraints mu with "co2_sequestration_limit" (#211)
* fix for GlobalConstraints mu with co2_sequestration_limit

* add release notes
2021-12-06 11:31:48 +01:00
Fabian Neumann
a2459881ef
allow H2 retrofitting from CH4 pipelines without endogenous CH4 grid (#204)
* allow H2 retrofitting from CH4 pipelines without endogenous CH4 grid

* add small capital cost to gas pipelines to incentivise decommissioning

* add release notes
2021-11-29 12:42:10 +01:00
Fabian Neumann
d04f6c02a7
Merge branch 'master' into retrofit-gas-pipelines 2021-11-29 09:13:51 +01:00
Fabian Neumann
263628fa22
add option to automatically download and extract sector databundle (#198) 2021-11-29 09:12:55 +01:00
Fabian Neumann
3ecb761b57
add regionalised hydrogen salt cavern storage potentials (#191)
* add regionalised hydrogen salt cavern storage potentials

* fix reading in salt-cavern potentials and typo in imports

* by default disable nearshore and offshore salt cavern potentials

Co-authored-by: lisazeyen <lisa.zeyen@web.de>
2021-11-29 09:12:07 +01:00
martacki
299e71e2b3 introduce hierarchical agglomeratice clustering (hac) 2021-11-17 13:46:33 +01:00
Francesco Witte
bac7e54d23 Add missing code directive and hyphon in tar 2021-11-16 13:36:46 +01:00
Fabian Neumann
1ff5d76a0c gas_network: add release notes 2021-11-13 18:16:10 +01:00
Francesco Witte
9379c135fd Fix link appearence and missing parentheses 2021-11-09 15:56:59 +01:00
Fabian Neumann
e6f4479544 doc: add EMP-E presentation and speed preprint 2021-10-28 09:58:45 +02:00
Fabian Hofmann
0425817a7b
Merge branch 'master' into doc-fix-css-theme 2021-10-06 14:09:00 +02:00
Fabian Neumann
a431bbd5a7
Merge branch 'master' into master 2021-10-06 12:23:14 +02:00
Fabian
fccf5323d2 doc: fix css theme 2021-10-06 12:16:12 +02:00
Fabian Neumann
1b2c6e17c5 add release note for offshore density reduction 2021-10-05 12:21:45 +02:00
Koen van Greevenbroek
66524bf797 Update obsolete link to CPLEX documentation 2021-10-05 11:21:17 +02:00
Fabian Neumann
e872595c79 release_notes: correct version 2021-10-04 18:02:05 +02:00
Fabian Neumann
47e6badd58 doc: fix typo in conf.py 2021-10-04 17:57:18 +02:00
Fabian Neumann
c5452d9882 release_notes: opener 2021-10-04 17:45:54 +02:00
Fabian Neumann
b915f08ac2 installation: update to new databundle location 2021-10-04 17:44:17 +02:00
Fabian Neumann
1f8c1678b8 add fneum 2021-10-04 14:28:27 +02:00
Fabian Neumann
692f4705c4 merge master 2021-10-04 13:21:33 +02:00
Fabian Neumann
c168fd60d3 add release note for agriculture, forestry and fishing 2021-10-04 11:19:15 +02:00
Fabian Neumann
7f0ed1372c organise release notes 2021-10-04 10:02:47 +02:00
Fabian Neumann
aca1023c3d bump version to 0.6.0 2021-10-02 11:17:29 +02:00
Fabian Neumann
2bfc091f8b update data bundle 2021-10-02 11:12:45 +02:00
Fabian Neumann
2e6e9c6802
Merge branch 'master' into agriculture-energy-co2 2021-10-02 10:51:28 +02:00
Fabian Neumann
b560d95b6a merge master 2021-10-02 10:41:56 +02:00
Fabian Neumann
4400658099 edit release note 2021-10-02 10:40:01 +02:00
Fabian Neumann
7987fd23cf add release note 2021-10-02 10:33:56 +02:00
Fabian Neumann
ff6d736a89
Merge branch 'master' into myopic-low-clustering-gens 2021-09-30 14:51:45 +02:00
Fabian Neumann
90079248a3
Merge branch 'master' into dh-share 2021-09-30 14:48:26 +02:00
lisazeyen
f6bb498730 include PR review 2021-09-29 16:13:23 +02:00
Fabian Neumann
5fb169c31f
Merge branch 'master' into enspreso-biomass 2021-09-29 15:46:11 +02:00
Fabian Neumann
8cf8a49b48 Merge branch 'master' of github.com:nworbmot/PyPSA-Eur-Sec 2021-09-28 17:24:09 +02:00
Fabian Neumann
488b93a079 extend release notes on plastics recycling 2021-09-28 17:24:00 +02:00
Fabian Neumann
fcc10aa950
Merge branch 'master' into master 2021-09-28 17:15:26 +02:00
Fabian Neumann
9f4e1f2176 make HVC recycling ready for pathway, minor edits 2021-09-28 17:08:03 +02:00
lisazeyen
dadfa8691b update mocksnakemake for testing 2021-09-28 16:36:40 +02:00
Fabian Neumann
385779fbbf
Merge branch 'master' into biomass-transport 2021-09-28 11:33:21 +02:00
Fabian Neumann
ec04d7909a
Merge pull request #148 from PyPSA/co2-network
Add CO2 network
2021-09-28 11:29:20 +02:00
Fabian Neumann
04c8d1fd02 add correction factor to offshore wind for wake losses 2021-09-23 08:57:18 +02:00
Fabian Neumann
b4af3f3fa3 change license 2021-09-22 18:03:25 +02:00
Fabian Neumann
089fc5b747 final tweaks of release notes 2021-09-22 16:46:23 +02:00
Fabian Neumann
2f2ac89c87 update main affiliation 2021-09-20 11:43:04 +02:00
Fabian Neumann
780b60cc46 add release note 2021-09-14 16:38:48 +02:00
Fabian Neumann
2e02af8b4b change license 2021-09-14 16:37:41 +02:00
Fabian Neumann
b88322587f
Release 0.4 (#274)
* update release notes [skip ci]

* update fixed versions environment.yaml

* format release notes
2021-09-14 16:15:25 +02:00
Fabian
ea50abab6d doc: fix build warnings 2021-08-27 12:30:29 +02:00
Martha Frysztacki
f30ca8a18a
Merge branch 'master' into simplify_to_substations 2021-08-26 15:22:02 +02:00
Fabian Neumann
148450e496 adjust documentation and add release notes 2021-08-18 16:38:34 +02:00
Fabian Neumann
5b9f64354f
xarray 0.19 compatibility (#158) 2021-08-18 12:17:31 +02:00
Martha Frysztacki
1c173567b5
solve_operations_network: include optimized stores to operation (#269)
* remove stores-buses from load generators

* include optimized stores to operation network

* add release notes

* Update doc/release_notes.rst

Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>

* Update doc/release_notes.rst

Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>

* Update release_notes.rst

* Update scripts/solve_network.py

Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2021-08-18 10:38:51 +02:00
Fabian Neumann
99e602f7b2 add ENSPRESO release notes and doc 2021-08-16 14:00:30 +02:00
Fabian Neumann
0fa3888b0e restore REUSE compliance [skip ci] 2021-08-13 10:15:06 +02:00
Fabian Neumann
b82c55543b
Readthedocs documentation with pip (#267)
* Use pip with requirements.txt file for setting up doc environment

* Try w/o cartopy

* Try w/o cartopy take 2

* Try w/o cartopy take 3

* try pip

* try pip ii

* python 3.8

* fix links

* remove conda docs and fix line references

* remove conda on .readthedocs.yml

* correct ambiguous line reference

Co-authored-by: Jonas Hoersch <coroa@posteo.de>
2021-08-13 10:11:35 +02:00
Fabian Neumann
2e2a66ef3c biomass_transport: add release notes and documentation 2021-08-09 18:20:07 +02:00
Fabian Neumann
54a509f3dd
Merge branch 'master' into co2-network 2021-08-06 15:51:40 +02:00
Fabian Neumann
d7a290df31 add release note 2021-08-06 15:51:07 +02:00
Fabian Neumann
4cc5e49ca8
Adapt to new snapshot weightings (#259)
* for now use n.snapshot_weightings.generators

* require pypsa master; use .objective for Nyears

* implement suggestions from code review

* add release note
2021-08-06 13:43:12 +00:00
Fabian Neumann
87596dd015
add H2 liquefaction cost to H2 shipping demand (#145)
* add H2 liquefaction cost to H2 shipping demand

* rename bus to 'H2 liquid'

* add release note

* make consideration of liquefaction costs for shipping optional

* update release notes
2021-08-04 18:28:18 +02:00
martavp
fab31e6524
Exogenous transition path for shipping, Steel, and Aluminum production (#136)
* Update .gitignore

* Add fictitious load to account for non-transformed shipping emissions

The share of shipping demand that is transformed is defined now for different years to be used with the myopic code.
The carbon emission from the remaining share is treated as a negative load on the atmospheric carbon dioxide bus, just like aviation and land transport emissions.

* Split colours for H2 in Industry and H2 in shipping when plotting balances.

When plotting the balance for H2, the rename dictionary merges all the demands containing H2.
This commit disables such merging and keeps different colours for H2 in shipping and H2 in industry. This is useful when one wants to look at the H2 balance and have an overview of where the H2 is consumed in the model.

* Make transformation of Steel and Aluminum production depends on year

Previously, the transformation of the Steel and Aluminum production was assumed to occur overnight.
This commit enables the definition of a transformation path via the config.yaml file.
This requires adding the {planning_horizon} to the input and output file name of the following rules:
build_industrial_production_per_country_tomorrow
build_industrial_production_per_node
build_industry_energy_demand_per_node
prepare_sector_network

* small follow-up to merge

* Add oil consumed in shipping as a load to EU oil bus

* Update scripts/prepare_sector_network.py

* add planning_horizons wildcard to benchmark paths

* fixup: double fraction_primary for steel

Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2021-08-04 18:19:02 +02:00
Fabian Neumann
ac3ce07d67
Merge branch 'master' into simplify_to_substations 2021-08-03 15:53:49 +02:00
martavp
3a6a1f90ab
Sensitivity e nom max (#143)
* Update .gitignore

* include e_nom_max sensitivity

* remove change in gitignore

* Update doc/release_notes.rst

Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2021-07-06 17:12:39 +02:00
martavp
cc24859d78 Update release_notes.rst 2021-07-05 12:26:11 +02:00
Fabian Neumann
b2872cc6b0
Cherry-pick from #137 (#142)
* Update config.default.yaml

Some people find it counterintuitive that battery and H2 storage are not kept from PyPSA-Eur. An explicit mention can help here.

* Update installation.rst

We only use one config.yaml file

* Add an arrow from biomass to carbon dioxide.

This signals that we also have BECCS in the model.

Co-authored-by: martavp <martavictoriaperez@gmail.com>
2021-07-03 12:59:09 +02:00
martacki
15ebe63b38 release_notes: style 2021-07-02 10:43:32 +02:00
martacki
6983be337a release_notes: add PR reference 2021-07-02 10:26:46 +02:00
martacki
34578bf16b update release_notes 2021-07-02 10:24:30 +02:00
Fabian Neumann
de46177e1a Merge branch 'master' of github.com:PyPSA/pypsa-eur-sec 2021-07-01 20:22:20 +02:00
Fabian Neumann
a967faf0f9 doc: release notes format 2021-07-01 20:22:08 +02:00
lisazeyen
ca685a10af
add home battery storage and inverter costs (#99)
* add home battery storage and inverter costs

* Update prepare_sector_network.py

* add release note

Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2021-07-01 20:16:12 +02:00
Fabian Neumann
1fc1d2a17d
Revision complete (#139)
* ammonia_production: minor cleaning and move into __main__ (#106)

* biomass_potentials: code cleaning and automatic country index inferral (#107)

* Revision: build energy totals (#111)

* blacken

* energy_totals: preliminaries

* energy_totals: update build_swiss

* energy_totals: update build_eurostat

* energy_totals: update build_idees

* energy_totals: update build_energy_totals

* energy_totals: update build_eea_co2

* energy_totals: update build_eurostat_co2

* energy_totals: update build_co2_totals

* energy_totals: update build_transport_data

* energy_totals: add tqdm progressbar to idees

* energy_totals: adjust __main__ section

* energy_totals: handle inputs via Snakefile and config

* energy_totals: handle data and emissions year via config

* energy_totals: fix reading in eurostat for different years

* energy_totals: fix erroneous drop duplicates
This caused problems for waste management in HU and SI

* energy_totals: make scope selection of CO2 or GHG a config option

* Revision: build industrial production per country (#114)

* industry-ppc: format

* industry-ppc: rewrite for performance

* industry-ppc: move reference year to config

* industry-ppct: tidy up and format (#115)

* remove stale industry demand rules (#116)

* industry-epc: rewrite for performance (#117)

* Revision: industrial distribution key (#118)

* industry-distribution: first tidying

* industry-distribution: first tidying

* industry-distribution: fix syntax

* Revision: industrial energy demand per node today (#119)

* industry-epn: minor code cleaning

* industry-epn: remove accidental artifact

* industry-epn: remove accidental artifact II

* industry-ppn: code cleaning (#120)

* minor code cleaning (#121)

* Revision: industry sector ratios (#122)

* sector-ratios: basic reformatting

* sector-ratios: add new read_excel function that filters year already

* sector-ratios: rename jrc to idees

* sector-ratios: rename conv_factor to toe_to_MWh

* sector-ratios: modularise into functions

* Move overriding of component attributes to function and into data (#123)

* move overriding of component attributes to central function and store in separate folder

* fix return of helper.override_component_attrs

* prepare: fix accidental syntax error

* override_component_attrs: bugfix that aligns with pypsa components

* Revision: build population layout (#108)

* population_layouts: move inside __main__ and blacken

* population_layouts: misc code cleaning and multiprocessing

* population_layouts: fix fill_values assignment of urban fractions

* population_layouts: bugfig for UK-GB naming ambiguity

* population_layouts: sort countries alphabetically for better overview

* config: change path to atlite cutout

* Revision: build clustered population layouts (#112)

* population_layouts: move inside __main__ and blacken

* population_layouts: misc code cleaning and multiprocessing

* population_layouts: fix fill_values assignment of urban fractions

* population_layouts: bugfig for UK-GB naming ambiguity

* population_layouts: sort countries alphabetically for better overview

* cl_pop_layout: blacken

* cl_pop_layout: turn GeoDataFrame into GeoSeries + code cleaning

* cl_pop_layout: add fraction column which is repeatedly calculated downstream

* Revision: build various heating-related time series (#113)

* population_layouts: move inside __main__ and blacken

* population_layouts: misc code cleaning and multiprocessing

* population_layouts: fix fill_values assignment of urban fractions

* population_layouts: bugfig for UK-GB naming ambiguity

* population_layouts: sort countries alphabetically for better overview

* cl_pop_layout: blacken

* cl_pop_layout: turn GeoDataFrame into GeoSeries + code cleaning

* gitignore: add .vscode

* heating_profiles: update to new atlite and move into __main__

* heating_profiles: remove extra cutout

* heating_profiles: load regions with .buffer(0) and remove clean_invalid_geometries

* heating_profiles: load regions with .buffer(0) before squeeze()

* heating_profiles: account for transpose of dataarray

* heating_profiles: account for transpose of dataarray in add_exiting_baseyear

* Reduce verbosity of Snakefile (2) (#128)

* tidy Snakefile light

* Snakefile: fix indents

* Snakefile: add missing RDIR

* tidy config by removing quotes and expanding lists (#109)

* bugfix: reorder squeeze() and buffer()

* plot/summary: cosmetic changes including: (#131)

- matplotlibrc for default style and backend
- remove unused config options
- option to configure geomap colors
- option to configure geomap bounds

* solve: align with pypsa-eur using ilopf (#129)

* tidy myopic code scripts (#132)

* use mock_snakemake from pypsa-eur (#133)

* Snakefile: add benchmark files to each rule

* Snakefile: only run build_retro_cost if endogenously optimised

* Snakefile: remove old {network} wildcard constraints

* WIP: Revision: prepare_sector_network (#124)

* population_layouts: move inside __main__ and blacken

* population_layouts: misc code cleaning and multiprocessing

* population_layouts: fix fill_values assignment of urban fractions

* population_layouts: bugfig for UK-GB naming ambiguity

* population_layouts: sort countries alphabetically for better overview

* cl_pop_layout: blacken

* cl_pop_layout: turn GeoDataFrame into GeoSeries + code cleaning

* move overriding of component attributes to central function and store in separate folder

* prepare: sort imports and remove six dependency

* prepare: remove add_emission_prices

* prepare: remove unused set_line_s_max_pu
This is a function from prepare_network

* prepare: remove unused set_line_volume_limit
This is a PyPSA-Eur function from prepare_network

* prepare: tidy add_co2limit

* remove six dependency

* prepare: tidy code first batch

* prepare: extend override_component_attrs to avoid hacky madd

* prepare: remove hacky madd() for individual components

* prepare: tidy shift function

* prepare: nodes and countries from n.buses not pop_layout

* prepare: tidy loading of pop_layout

* prepare: fix prepare_costs function

* prepare: optimise loading of traffic data

* prepare: move localizer into generate_periodic profiles

* prepare: some formatting of transport data

* prepare: eliminate some code duplication

* prepare: fix remove_h2_network
- only try to remove EU H2 store if it exists
- remove readding nodal Stores because they are never removed

* prepare: move cost adjustment to own function

* prepare: fix a syntax error

* prepare: add investment_year to get() assuming global variable

* prepare: move co2_totals out of prepare_data()

* Snakefile: remove unused prepare_sector_network inputs

* prepare: move limit p/s_nom of lines/links into function

* prepare: tidy add_co2limit file handling

* Snakefile: fix tabs

* override_component_attrs: add n/a defaults

* README: Add network picture to make scope clear

* README: Fix date of preprint (was too optimistic...)

* prepare: move some more config options to config.yaml

* prepare: runtime bugfixes

* fix benchmark path

* adjust plot ylims

* add unit attribute to bus, correct cement capture efficiency

* bugfix: land usage constrained missed inplace operation

Co-authored-by: Tom Brown <tom@nworbmot.org>

* add release notes

* remove old fix_branches() function

* deps: make geopy optional, remove unused imports

* increase default BarConvTol

* get ready for upcoming PyPSA release

* re-remove ** bug

* amend release notes

Co-authored-by: Tom Brown <tom@nworbmot.org>
2021-07-01 20:09:04 +02:00
Fabian Neumann
c5e59dab2f
Merge branch 'master' into simplify_to_substations 2021-06-30 10:34:44 +02:00
euronion
8654077519
Fix creation of renewable profiles for offshore wind. (#255)
* Update build_renewable_profiles.py

* Update release_notes.rst

* Update release_notes.rst

* Update release_notes.rst

* Update scripts/build_renewable_profiles.py

Co-authored-by: FabianHofmann <hofmann@fias.uni-frankfurt.de>

* Adjust doc string

Co-authored-by: FabianHofmann <hofmann@fias.uni-frankfurt.de>
Co-authored-by: Fabian <fab.hof@gmx.de>
2021-06-28 16:20:29 +02:00
Tom Brown
96711aab39
doc: Create 0.0.x versions for old PyPSA-Eur-Sec-30(-Path)
This is for easier identification of models in the IPCC AR6 model
registration.
2021-06-27 14:42:44 +02:00
Fabian Neumann
7b68e8be0c
GitHub actions CI (#252)
* add github action ci

* only one environment update call

* line break in echo did not work

* fix syntax

* fix version syntax

* switch to glpk

* reduce time from month to week

* list environment

* use new ipopt version
https://github.com/conda-forge/ipopt-feedstock/issues/55

* remove accidental additions

* request ipopt lower than 3.13.3
https://github.com/conda-forge/ipopt-feedstock/issues/64

* add badges and release notes

* add badge to readme and make ci.yaml cc-0
2021-06-22 11:01:33 +02:00
martacki
0f5934f534 release notes 2021-06-01 12:06:56 +02:00
martacki
cec9dcc41c adapt configuration options 2021-06-01 12:02:43 +02:00
Fabian Neumann
bfeb429c27
base: add escape if all TYNDP links already in network (#246) 2021-05-25 15:55:39 +02:00
Martha Frysztacki [frɨʂtat͡skʲ]
f5a0d566d9
solve_operations_network: integrate all extendable links, not only DC (#244)
* add_electricity.py Resolve FutureWarning 771 Index.__or__ operating as set operation is deprecated

* solve_operations_network: bug fix

* release notes

* Update doc/release_notes.rst

Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2021-05-21 15:31:50 +02:00
Chiara Anselmetti
11c29ac6cc
Adding focus_weights to pre-clustering (#241)
* Add focus_weights to pre-clustering

Hey guys,
another quick fix since I noticed it wasn't implemented yet: When pre-clustering the network, the focus_weights have not yet been considered. This may distort clustering results when pre-clustering to a low resolution.

* Update release_notes.rst
2021-05-21 15:27:34 +02:00
Tom Brown
1ede513990 doc: Fix badge link for doc and clarifications in release notes 2021-05-21 13:40:22 +02:00
Tom Brown
e4848d603d PyPSA-Eur-Sec Version 0.5.0
See the release notes:

https://pypsa-eur-sec.readthedocs.io/en/latest/release_notes.html#pypsa-eur-sec-0-5-0-21st-may-2021
2021-05-21 12:37:02 +02:00
lisazeyen
42a78262d8 Merge branch 'master' into technology-data 2021-05-10 16:05:48 +02:00
Tom Brown
8bfb1490c1
Merge branch 'master' into retro-updated 2021-04-30 18:12:20 +02:00
Tom Brown
3a5c47b2e5 doc: Link new retrofitting section from the release notes 2021-04-30 18:05:17 +02:00
FabianHofmann
b8a7685931
Atlite availability (#224)
* adjust buil_cutout.py and Snakefile

* try adjusting build_renewable_profiles, currently crashing due to weird pyproj error

* build_renewable_profiles: -remove printing gid

* build_renewable_profiles: use dask for paralellization, use dense functions

* build_renewable_profiles:
	- revise imports
	- add logging for long calculation
	- revise explaining comment
	- revise distance calculation

* build profiles: adjust to cutout.grid

* * fix area to square km
* rename potmatrix -> capacity_potential
* rename available to availibility

* config.default update cutout params
build_renewable_potentials: major refactoring and simplification
hydro_profiles: update code

* build profiles: fix weight output dimensions

* build profiles: fix typo, fix selection of buses

* build profiles: reinsert paths variable

* follow up

* build profiles: move to dask calculation only

* CI: set build cutout to true (add CDSAPI)

* build profiles: use pyproj, test with gleas and geokit upstream

* environment.yaml fix atlite version

* build profiles: use dask 'processes' for more than 25 regions

* build profiles: specify dask scheduler according to number of regions

* backpedal a bit, only allow scheduler='processes'

* follow up, code style and fixup

* build profiles: add logger info for underwater fraction calc

* config adjust cutout parameters
Snakefile fixup

* config.default.yaml: adjust resolution

* config: use one cutout in total
build_cutout: automatic detetection of geographical boundaries

* env: add python>=3.8 requirement
build_cutout: fixup for region bound

* config: allow base cutout

* folllow up, fix up

* follow up II

* clean up

* clean up II

* build profiles: move back to multiprocessing due to performance issues

* small code style corrections

* move in pool context

* swqitch to ratsterio

* switch to rasterio for availibility calculation

* tiny fixup

* * build continental raster for offshore distance calculation
* adjust Snakefile to new script build_raster

* rename continental raster to onshore raster
add projected_mask function (not yet tested)
add docstrings, modularize

* Snakefile: remove build_onhore_raster rule, build mask directly from geometry instead
build_natura_raster: adjust code, add function for exporting
build_profiles:
	* add buffer to shore distance to init_globals function
	* update docstrings
	* improve handling of nodata grid codes
	* add geometry mask if natura raster not activated
	(the 255 value is an 'eligible' value for the corine data base,
	do this for excluding data outside the shape)

* build_profiles: adjust docstrings

* update environment

* build profiles: fixup reproject woth padding

* follow up, small fixups

* fix resampling method

checkpoint: reproduces solar profile in tut data

* reintegrate plot map
code style

* config: rename cutout into "base"

* build profiles: adjust to new atlite code

* natura raster: small fixup

* build natura raster: compress tiff file

* config: adjust cutout names

* build profiles: cover case if no or partial overlap between natura raster and cutout

* config-tutorial: adjust cutout params

* buid-profifiles: fixup in gebco filter

* follow up

* update config files

* build profiles: select layoutmatrix != 0

* build profiles: speed up average_distance and underwaterfraction

* build profiles: fix typo

* update release notes
build_cutout: only build needed features

* update envs

* config: add temperature to sarah features

* temporary fix for atlite v0.2.1 and new xarray version release

* env: remove xarray specification

* * remove rule build_country_flh
* build profiles: remove sneaked in line

* doc: update configuration.rst (section atlite) and corresponding csv table

* release notes: fix quotes

* build profiles: use 3035 for area calculation

* Update envs/environment.docs.yaml

* Update scripts/build_cutout.py

* Update doc/release_notes.rst

Co-authored-by: euronion <42553970+euronion@users.noreply.github.com>

* Update doc/configuration.rst

Co-authored-by: euronion <42553970+euronion@users.noreply.github.com>

* Update scripts/build_cutout.py

Co-authored-by: euronion <42553970+euronion@users.noreply.github.com>

* update release notes

* release notes: add deprecation of 'keep_all_available_areas'
build profiles: remove warning for 'keep_all_available_areas'

* build cutout: rearrage code, set buffer correctly

* Rename tutorial cutout to remove name clash with real cutout.

* Update release_notes.rst: Rename tutorial cutout.

* retrieve: update cutouts and downloads (alternative) (#237)

* retrieve: update cutouts and downloads

* retrieve: remove unnecessary import

* use snakemake remote file functionality

* Snakefile: update zenodo link

* update natura remote link (closes #234)

* env: update atlite version to 0.2.2

* env: fix dask version due to memory issues

* test: retrieve cutout instead of build

* test: use tutorial cutout for CI

Co-authored-by: euronion <42553970+euronion@users.noreply.github.com>
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2021-04-27 17:58:31 +02:00
Fabian Neumann
70078d03b2 add unresolved merge conflict to be addressed 2021-04-27 16:14:52 +02:00
Fabian Neumann
175b14e248 merge master follow-up 2021-04-27 14:49:27 +02:00
Fabian Neumann
4ec06f54bc merge master 2021-04-27 14:47:15 +02:00
Fabian Neumann
164c168a30 minor revisions on pz-max's PR 2021-04-27 14:36:34 +02:00
euronion
d3dc2e924a
Correct co2base in config.default.yaml . (#233)
* Correct co2base in config.default.yaml .

Based on PyPSA-EUR-SEC data.

* Update release_notes.rst

* Fix .rst .
2021-04-23 11:41:55 +02:00
lisazeyen
677aee5606 add documentation to the updated modelling of building retrofitting 2021-04-19 17:19:34 +02:00
Tom Brown
3da1c0d6b7 Update data bundle to include Episcope-TABULA data 2021-04-18 18:56:29 +02:00
Fabian Neumann
6765ffda8f fix electricity.csv 2021-04-06 13:27:21 +02:00
Tom Brown
93eb86eec8 doc: Release note on ICE emissions bugfix 2021-03-05 10:38:41 +01:00
Tom Brown
cd8bf1edfc doc: Include renaming of liquid hydrocarbon bus in release notes 2021-01-29 16:34:52 +01:00
Tom Brown
4fd164f73c config.yaml: Remove battery and H2 Stores from PyPSA-Eur
I.e. what's taken over from PyPSA-Eur in config["pypsa_eur"] from
"Store" is [].

PyPSA-Eur-Sec adds its own batteries and H2 Stores.
2021-01-25 14:17:31 +01:00
Tom Brown
39a5134ab9 doc: Add latest EEA emissions stats UNFCCC_v23.csv to data bundle 2021-01-25 11:10:13 +01:00
martavp
2555b66ba9 allowing a factor to alter the cost or p_nom_max via the config file
This substitutes the previous way of doing it. Now, to multiply the reference p_nom_max by 3, one should include in the config file 'solar+p3' (instead of the previous solarx3)
2021-01-14 13:49:17 +01:00
martavp
d7e9dc2466 update documentation and release notes 2021-01-12 10:58:38 +01:00
Fabian Neumann
8f2ace03ee doc: fix electricity.csv format [skip travis] 2020-12-15 15:17:37 +01:00
Tom Brown
27cc2935be PyPSA-Eur-Sec Version 0.4.0
See the release notes:

https://pypsa-eur-sec.readthedocs.io/en/latest/release_notes.html#pypsa-eur-sec-0-4-0-11th-december-2020
2020-12-11 17:13:18 +01:00
Tom Brown
f34728c0c4 doc: Document supply and demand options in the different sectors 2020-12-07 16:23:25 +01:00
Fabian Neumann
5a917dc5a9 doc: change zenodo links to latest [skip travis] 2020-12-07 09:43:17 +01:00
Fabian Neumann
08674a6cda
Release v0.3 (#213)
* release_notes: order for release

* doc: fix smaller typos and tidy up

* config: bump version

* doc: fix line references

* doc: bump confpy version

* envs: update fixed versions yaml

* Snakefile: simplify all_elec to all
2020-12-05 17:54:50 +01:00
Fabian
f563b612e4 doc/configuration.rst: update lines 2020-12-03 23:47:38 +01:00
FabianHofmann
3fa5bbad1c
Opsd renewable ppls (#212)
* fix clustering of offwind-ac and offwind-dc in sites option

* add release nodes

* attach renewable assets by location (lat and lon) from OPSD register to network

* adapt default config to changes

* undo changes from a differen PR in cluster_network.py

* undo changes from a different PR, add release notes for this PR

* correct release notes

* add comments for relevant settings in add_electricity.py

* adjust configtable for electricity to OPSD renewable option and add estimate_renewable_capacities_from_capacitiy_stats

* reset cluster_network to HEAD

* add_electricity: Capacity is float

* config: add GB to OPSD_VRE_countries

* review and modify implementation

* update release notes

* Update envs/environment.yaml

Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>

Co-authored-by: martha.frysztacki <eb5194@iai-esm003.iai.kit.edu>
Co-authored-by: eb5194 <martha.frysztacki@kit.edu>
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2020-12-03 23:13:41 +01:00
Fabian Neumann
2fc1ea0255
some refactoring and code cleaning (#190)
* some refactoring and code cleaning

* execute pre-commit

* pre-commit: limit large files

* add license to .pre-commit

* add pre-commit to env

* solve: tidy memory logger

* travis: add conda list for easier debugging

* undo config test/tutorial without plotting, rm matplotlibrc, .licenses

* remove {networks} wildcard

* unadd pre-commit config

* add release notes

* restore REUSE compliance

* fix docs environment python version

* env: remove gurobi from dependencies

* fix unclean merge block

* fix elif to if

* lighter rtd style

* lighter rtd style II
2020-12-03 19:50:53 +01:00
Fabian Neumann
84edde8f63
add time series segmentation with tsam package (#186)
* add time segmentation with tsam

* cut off SEG

* Snakefile: adjust memory function

* untangle memory reservation calculation

* prepare: document segmentation option

* correct typo
2020-12-03 16:02:21 +01:00
Martha Maria
cfb979a0d0
Custom busmap for clustering (#193)
* add option to use custom clustermaps from data folder

* adapt default config to custom busmap

* input file from Snakefile

* adapt input description

* add option to use custom clustermaps from data folder

* adapt default config to custom busmap

* input file from Snakefile

* adapt input description

* Snakefile: custom_busmap in cluster_network input is now csv

* cluster_network: custom_busmap is now read as csv file, adaptions of description

* simplify_network: adapt descriptions

* configfiles: add cutom_clustermaps switch

* unify clustarmap and busmap names

* unify clustermap and busmap names

* test/config: unify clustermap and busmap names

* cluster_network: make clustering_for_n_clusters compatible with simplify_network

* simplify_network: make compatible with changes in cluster_network.py

* Update scripts/cluster_network.py

* Update scripts/simplify_network.py

* Update scripts/simplify_network.py

* Update scripts/cluster_network.py

* Update scripts/cluster_network.py

* cluster_network: move custom_busmap flag to enable; simplify names

* cluster_network: move custom_busmap flag to enable; simplify names

* custom_busmap: add documentation

* cluster_network: add default for custom_busmap for compatibility with old configs

* cluster_network: add default for custom_busmap for compatibility with old configs

Co-authored-by: martha.frysztacki <eb5194@iai-esm003.iai.kit.edu>
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2020-12-03 15:17:16 +01:00
FabianHofmann
9792069ab3
Update load processing (#211)
* build_load_data

* Add documentation

* updating load data import

* Update Config files

* Update load.csv

* Update add_electricity.py

* change log file name

* Update scripts/add_electricity.py

Co-authored-by: FabianHofmann <hofmann@fias.uni-frankfurt.de>

* Update scripts/build_load_data.py

Co-authored-by: FabianHofmann <hofmann@fias.uni-frankfurt.de>

* Update scripts/build_load_data.py

Co-authored-by: FabianHofmann <hofmann@fias.uni-frankfurt.de>

* Update scripts/build_load_data.py

Co-authored-by: FabianHofmann <hofmann@fias.uni-frankfurt.de>

* Update build_load_data.py

* Update build_load_data.py

* Update scripts/build_load_data.py

Co-authored-by: FabianHofmann <hofmann@fias.uni-frankfurt.de>

* update gap handling in build_load_data

* Update build_load_data.py

* Update config.test1.yaml

* update test.config

* Update config.tutorial.yaml

* update load csv function for load data

* Update build_load_data.py

* Update config.test1.yaml

* Update add_electricity.py

* Update build_load_data.py

* Added error messages if load data contains gaps after modifications

* general adjustments:
	- reduce data source to only entsoe statistics
	- sanitize code
	- adjust logging messages
	- adjust daocstrings

* update Snakefile config and docs

* update release notes
rename build_load -> build_load_data in config

* small follow up

* - reintroduce choice between powerstatistics and transparency
- remove load_ timeseries from databundle
- always build load_data
- reinsert scaling factor in config
- fix url to 2019 version

* update doc: configtable, release notes
update config.yaml

* follow up

Co-authored-by: Jan Frederick <jan.frederick.unnewehr@inatech.uni-freiburg.de>
Co-authored-by: JanFrederickUnnewehr <50404069+JanFrederickUnnewehr@users.noreply.github.com>
2020-12-03 12:49:04 +01:00
Fabian Neumann
f18b7b02cb
StorageUnit correct efficiency_dispatch/store (counter-proposal 2) (#202)
* fix efficiencies of storage units counter proposal

* extra_components: fix roundtrip efficiency

* add_electricity: remove misleading roundtrip efficiency for storageunit

* add release notes
2020-12-03 10:02:23 +01:00
lisazeyen
c861ab940d add data sources for building retrofitting 2020-12-02 14:04:38 +01:00
Tom Brown
801f0a403d Remove config.myopic.yaml to avoid many duplicated parameters
It is identical to config.default.yaml except for two parameters
(foresight and planning_horizons) so I decided to consolidate the
example configs. Instructions for how to use the myopic foresight can
be found in the documentation (now updated).
2020-11-30 16:10:11 +01:00
Fabian Neumann
03170f4aaf
add option for p_nom_max factors in {opts} wildcard (#207)
* prepare: add option for potential reduction sweeps

* prepare: fix attr lookup for potential/cost reduction sweeps

* prepare: fix attr naming cost -> capital_cost

* add release notes
2020-11-26 17:25:14 +01:00
Fabian Neumann
bfbf595ad8
Parameter corrections for East-Western and Anglo-Scottish interconnection (#206)
* data: parameter corrections for East-Western and Anglo-Scottish interconnector

* add release notes
2020-11-26 17:20:48 +01:00
Fabian Neumann
de0478968c
config: make storage modelling with Store and Link default (#205) 2020-11-25 13:18:30 +01:00
Tom Brown
5b4f8837db doc: Update information on spatial distribution of industry demand 2020-10-28 18:54:30 +01:00
Fabian Neumann
ca0ad08438 reflect filename changes in documentation 2020-10-18 14:47:46 +02:00
Fabian Neumann
8a323b7267 cost: move defaults to config and improve documentation 2020-10-16 11:38:26 +02:00
Tom Brown
9e91d2c1f0 doc: Document sources for input data 2020-10-12 15:37:47 +02:00
Tom Brown
8f6b551efb Update data bundle to include hotmaps industrial site database 2020-10-12 14:59:15 +02:00
Fabian Neumann
bcd7f86b5c remove {networks} wildcard 2020-10-09 17:03:49 +02:00
Fabian Neumann
f3b1d3d513 undo config test/tutorial without plotting, rm matplotlibrc, .licenses 2020-10-03 11:38:51 +02:00
Fabian Neumann
6deac6ced3 merge master 2020-10-03 11:15:39 +02:00
Martha Maria
52683236cd
prepare_network: fix nmo security margin (#199)
* prepare_network: fix nmo security margin

* Update doc/release_notes.rst

Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>

* Update scripts/prepare_network.py

Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>

Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2020-10-02 15:55:22 +02:00
Martha Maria
2e76b88ec8
simplify_ and cluster_network: clustermaps to csv (#198)
* simplify and clustering: output and input from HDF format to CSV

* add release notes

* simplify and clustering: output files from Snakefile
2020-10-02 12:53:56 +02:00
Tom Brown
72653c3a42 PyPSA-Eur-Sec Version 0.3.0
Please see the release notes:

https://pypsa-eur-sec.readthedocs.io/en/latest/release_notes.html#pypsa-eur-sec-0-3-0-27th-september-2020

for more information.
2020-09-27 18:01:52 +02:00
Fabian Neumann
ab6dc633bf
Options for regional equity and autarky (#166)
* solve: add option for equity constraints

* solve: scale more

* prepare: add option to limit line/link capacity

* solve: add inflow to EQ constraints

* solve: reindex inflow to match load

* update config files and references

* add autarky option

* move release notes

* add spillage to equity requirements

* prepare: fix accidental code removal

* prepare: add country autarky option

* consider snapshot_weightings for inflow

* trigger CI
2020-09-26 13:10:50 +02:00
Fabian Neumann
b756773b9d merge master 2020-09-26 11:21:16 +02:00
Fabian Neumann
456daa6260
travis: use mamba for faster builds (#196)
* travis: use mamba for faster builds

* doc: add release notes [skip travis]
2020-09-25 14:08:46 +02:00
Martha Maria
047276b2dc
Fix clustering sites (#191)
* fix clustering of offwind-ac and offwind-dc in sites option

* add release nodes

Co-authored-by: martha.frysztacki <eb5194@iai-esm003.iai.kit.edu>
2020-09-24 10:13:13 +02:00
Tom Brown
df4c675f58
Merge pull request #67 from leonsn/patch-1
Update installation notes
2020-09-22 20:15:10 +02:00
Leon
0ebad1a2e9
Remove the reminder to activate the conda environment 2020-09-21 20:07:48 +02:00
Tom Brown
d727a981a2 Update data bundle to include USGS ammonia production by country 2020-09-21 13:12:03 +02:00
Leon
82d7c8719e
Update installation notes: PyPSA-Eur datafiles are part of the snakemake flow 2020-09-17 16:37:47 +02:00
Fabian Neumann
cbd22c2efd execute pre-commit 2020-09-11 15:26:43 +02:00
Fabian Neumann
f6dd2e12f3 some refactoring and code cleaning 2020-09-11 12:40:53 +02:00