Commit Graph

595 Commits

Author SHA1 Message Date
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