Commit Graph

2546 Commits

Author SHA1 Message Date
pre-commit-ci[bot]
dcd16e32a8 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-10-25 13:23:20 +00:00
Adrian Odenweller
73b0645c13 Fix network directory path in make_summary 2022-10-25 14:29:07 +02:00
Fabian Neumann
de0e21aec3 Merge branch 'improve-doc' of github.com:martavp/pypsa-eur-sec into martavp-improve-doc 2022-10-25 09:46:28 +02: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
martavp
0b53e34f58
Merge pull request #22 from Adam-Dvorak1/improve-doc
Final industry sections, latex math edits, formatting unification, typo fixes
2022-10-25 09:04:07 +02:00
Fabian Neumann
776596ab9a
Merge pull request #270 from nnhjy/master
untrack *.json
2022-10-18 13:55:57 +02:00
Fabian Neumann
041abadf3c
Merge pull request #431 from PyPSA/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2022-10-17 22:27:59 +02:00
pre-commit-ci[bot]
26fa33b414
[pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/codespell-project/codespell: v2.2.1 → v2.2.2](https://github.com/codespell-project/codespell/compare/v2.2.1...v2.2.2)
2022-10-17 20:01:25 +00:00
Fabian Neumann
d2f757eff4
Merge pull request #430 from PyPSA/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2022-10-11 06:43:53 +02:00
pre-commit-ci[bot]
721c8f9235
[pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/psf/black: 22.8.0 → 22.10.0](https://github.com/psf/black/compare/22.8.0...22.10.0)
2022-10-10 20:31:00 +00: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
nnhjy
4f7b2b9868 untrack *.json 2022-10-06 18:43:41 +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
martavp
9eea4a8fba
Merge pull request #20 from Parisra/Improve-Doc-final-edit
Improve doc final edit
2022-10-03 10:27:36 +02:00
Fabian Neumann
5c6ff44e13
Merge pull request #242 from PyPSA/nh3
add ammonia as carrier: with Haber-Bosch, crackers, store, load
2022-10-01 16:01:45 +02:00
Fabian Neumann
1611d63a8a
Merge branch 'master' into nh3 2022-10-01 16:01:39 +02:00
Fabian Neumann
7ed88d5ff1
Merge pull request #268 from PyPSA/co2seq_sector_opt
update sector opt for co2 seq potential
2022-10-01 15:58:47 +02:00
lisazeyen
9a74e3d699 set co2seq to limit of sequestration potential 2022-09-29 09:12:36 +02:00
Fabian Hofmann
faba4f1833
Merge pull request #429 from nnhjy/master
update deprecated syntax
2022-09-29 08:57:39 +02:00
nnhjy
d29441d871 update deprecated syntax 2022-09-28 20:33:50 +02:00
lisazeyen
7606562449 update sector opt for co2 seq potential 2022-09-28 16:09:53 +02:00
Fabian Neumann
ee8f502d5b
Merge pull request #427 from PyPSA/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2022-09-27 06:13:39 +02:00
pre-commit-ci[bot]
2fa4c25240
[pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/fsfe/reuse-tool: v0.14.0 → v1.0.0](https://github.com/fsfe/reuse-tool/compare/v0.14.0...v1.0.0)
2022-09-26 20:05:58 +00:00
Fabian Hofmann
62ca32b274
Merge branch 'master' into fix/deprecation-warning-pandas-1.4 2022-09-26 12:33:13 +02:00
Fabian Hofmann
6a31548d64
Merge pull request #425 from PyPSA/clarify_config
add explanation for capacity_per_sqkm
2022-09-22 13:32:44 +02:00
Fabian Hofmann
3350463b13
Merge branch 'master' into clarify_config 2022-09-22 13:16:20 +02:00
Fabian Neumann
899acb38da
Merge pull request #415 from p-glaum/exclude_carrier_clustering
add feature: aggregate carrier exclusion
2022-09-22 12:52:34 +02:00
Fabian Hofmann
9d1a0e2c13
Merge branch 'master' into exclude_carrier_clustering 2022-09-22 12:33:19 +02:00
lisazeyen
108e3c0ff5
fix typo 2022-09-21 17:19:01 +02:00
lisazeyen
8dd10dfd23
add explanation for capacity_per_sqkm 2022-09-21 17:15:31 +02:00
Ebbe Kyhl
ffb5a5a10d
Update myopic and extend carbon budget description 2022-09-21 09:08:39 +02:00
Fabian Neumann
f139025100 update test configs to include recent biomass additions 2022-09-21 07:41:31 +02:00
Fabian Neumann
d53f1fe031 update test configs to inclode cost year 2022-09-21 07:36:06 +02:00