Commit Graph

822 Commits

Author SHA1 Message Date
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 Hofmann
3ba7e2ab90
Merge branch 'master' into technology-data 2022-07-21 15:36:12 +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
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