Commit Graph

972 Commits

Author SHA1 Message Date
ekatef
4ae4be966e Fix a typo in the execution call 2023-09-09 19:23:55 +03:00
euronion
02bffdbd06
Fix bug preventing inclusion of custom_powerplants (#732) 2023-09-05 17:21:11 +02:00
lisazeyen
9ec7442c69 merge master 2023-08-30 12:03:49 +02:00
lisazeyen
3247fb59e0 clean up 2023-08-30 11:50:49 +02:00
Fabian
c7e6d36014 fix separators in run.csv 2023-08-24 13:33:26 +02:00
Fabian
04a2bea176 scenario-management: use list for including wildcards with shared resource 2023-08-24 13:20:11 +02:00
Fabian Neumann
d0f2d52853 apply protected() to zenodo downloads; only retrieve monthly fuel/CO2 prices when necessary 2023-08-24 11:11:33 +02:00
Fabian Hofmann
3f3f752e8f
Merge branch 'master' into scenario-management 2023-08-24 10:19:14 +02:00
Fabian
62c6143863 scenario-management: reenable shared resources, make shared resources wildcards dependent 2023-08-23 17:14:57 +02:00
Fabian Neumann
8cdba1c8e4
Merge branch 'master' into blast-furnace-with-cc 2023-08-23 09:37:07 +02:00
martavp
b2e8efea19 add small comment to release note 2023-08-22 08:36:21 +02:00
Fabian
9d4ce430cc electricity demand: remove powerstastics flag, merge sources in retrieve_electricity_demand 2023-08-17 10:17:12 +02:00
Fabian Hofmann
72e6c2fd80
Merge branch 'master' into scenario-management 2023-08-15 15:16:05 +02:00
Fabian
6df2742cb9 update release notes 2023-08-15 15:14:55 +02:00
Fabian
e28ae59375 introduce scenario-management 2023-08-15 15:06:59 +02:00
Fabian Neumann
def61ae769 industry distribution: use EPRTR as fallback if ETS missing 2023-08-14 12:39:33 +02:00
Fabian Neumann
91be48e36f Add option for carbon capture in integrated steelworks. 2023-08-09 10:58:14 +02:00
Fabian
ad6322bcb3 address review commments 2023-08-04 12:58:31 +02:00
Fabian Hofmann
8622398ceb
Apply suggestions from code review
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2023-08-04 12:23:02 +02:00
virio-andreyana
657dd08b53 edit configtables and accept Fneum suggestion 2023-08-02 11:11:41 +02:00
Fabian
bc6cc6c983 retrieve: update opsd electricity demand url to fixed date 2023-08-02 11:00:21 +02:00
Fabian
fc140c5f38 draft validation section in config 2023-08-01 12:11:42 +02:00
Fabian Neumann
23eb3548c5 Merge branch 'master' into ukraine_hackathon 2023-08-01 08:42:47 +02:00
Fabian Hofmann
1ea8cf47d8
Merge branch 'master' into validation 2023-07-31 11:20:11 +02:00
Fabian Neumann
2c586e76e0 update global energy monitor LNG terminal data 2023-07-31 09:07:10 +02:00
virio-andreyana
c771f3fac0 Merge branch 'validation' of github.com:PyPSA/pypsa-eur into validation 2023-07-31 01:27:36 +02:00
virio-andreyana
6bf6ec603c fix cross border flow coloring, country color are more contrasted, and update the config documentations 2023-07-31 01:27:15 +02:00
Fabian Neumann
f147cd2923 restore reuse compatibility in environment.fixed.yaml 2023-07-27 11:42:04 +02:00
Fabian Neumann
c4fe27fe51 fix typo 2023-07-27 11:39:44 +02:00
pre-commit-ci[bot]
54151d384a [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-07-27 09:38:32 +00:00
Fabian Neumann
8e6a70b468 prepare release 0.8.1 2023-07-27 11:23:02 +02:00
Fabian Hofmann
6a96931833
Merge branch 'master' into misc/deprecations 2023-07-26 15:04:24 +02:00
Fabian Hofmann
1d5c8c7242
Merge branch 'master' into fneum/line-rating 2023-07-26 14:56:35 +02:00
Fabian
d60be3fece Merge branch 'master' into validation 2023-07-26 13:01:34 +02:00
Fabian Neumann
ddd1840981 Merge remote-tracking branch 'origin/master' into multiyear 2023-07-26 10:23:32 +02:00
Fabian
491345d504 config: move cutout specification to line-rating section
test/config: use be-cutout for testing line-rating
2023-07-25 15:08:44 +02:00
Fabian Hofmann
269a08006f
Merge branch 'master' into validation 2023-07-25 12:30:32 +02:00
Fabian Neumann
1b3554750d
Merge branch 'master' into fneum/line-rating 2023-07-23 11:21:04 +02:00
Fabian Neumann
264e7ca2f0
Merge branch 'master' into multilinks-default 2023-07-23 11:20:44 +02:00
Fabian Neumann
9cc5be1c25 add note about supported operating systemds (closes #697) [no ci] 2023-07-23 11:02:48 +02:00
Fabian Hofmann
844a495180
Merge branch 'master' into validation 2023-07-19 11:37:47 +02:00
Fabian Neumann
56e93fe821
Merge branch 'master' into fneum/line-rating 2023-07-18 14:06:11 +02:00
Fabian Neumann
a0366fb2bc
Merge branch 'master' into multilinks-default 2023-07-18 14:05:57 +02:00
Fabian Neumann
f39d737aa1
Merge pull request #694 from PyPSA/misc/autoretrieve
Add test and option to disable online retrieve rules
2023-07-17 21:44:40 +02:00
Fabian Hofmann
40b87cac04
Merge branch 'master' into validation 2023-07-17 19:24:13 +02:00
pre-commit-ci[bot]
aa7a2c823a [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-07-14 11:42:08 +00:00
euronion
7437f32c0f Update enable.csv 2023-07-14 13:41:25 +02:00
euronion
328e413b12 Update release_notes.rst 2023-07-14 13:41:22 +02:00
Fabian Hofmann
9f4c227def
Merge branch 'master' into describe-config 2023-07-14 13:34:20 +02:00
pre-commit-ci[bot]
5482c27e8b [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-07-14 10:26:10 +00:00
virio-andreyana
23b154de36 adjust config table spacing 2023-07-14 12:25:23 +02:00
Fabian Neumann
b110810669 no more override_component_attrs for multilinks 2023-07-13 22:31:55 +02:00
pre-commit-ci[bot]
a03574ba14 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-07-13 10:55:58 +00:00
Win_Surface_virio_andreyana
551e068136 Merge branch 'describe-config' of github.com:PyPSA/pypsa-eur into describe-config 2023-07-13 12:53:00 +02:00
Win_Surface_virio_andreyana
604e4f2a83 add description on technology_mapping 2023-07-13 12:52:18 +02:00
virio-andreyana
56fd99a10e
Apply three Fabian Neumann suggestions from code review
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2023-07-13 11:45:46 +02:00
Fabian Neumann
3582c27e2e
Update doc/configuration.rst 2023-07-13 10:31:40 +02:00
virio-andreyana
8c4299ee10
Delete .~lock.sector.csv# 2023-07-12 12:42:54 +02:00
pre-commit-ci[bot]
4ecc7ae439 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-07-12 10:42:48 +00:00
virio-andreyana
d734529031
Apply Fabian Neumann suggestions from code review
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2023-07-12 12:42:31 +02:00
Fabian Hofmann
f90ef3bb73
Merge branch 'master' into validation 2023-07-12 12:32:35 +02:00
Fabian Neumann
6af92fcf67
Merge branch 'master' into fneum/line-rating 2023-07-11 14:37:17 +02:00
Fabian
9c6e5e0ed0 config: remove unneeded plotting entries 2023-07-05 11:34:07 +02:00
Fabian Hofmann
9c3f89160a
Merge branch 'master' into validation 2023-07-05 11:21:09 +02:00
pre-commit-ci[bot]
0664f1050f [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-07-04 23:58:07 +00:00
virio-andreyana
1639014b40 Merge remote-tracking branch 'refs/remotes/origin/describe-config' into describe-config 2023-07-05 01:56:30 +02:00
virio-andreyana
55add4c785 finalized config documentation 2023-07-05 01:51:50 +02:00
pre-commit-ci[bot]
39c963dd38 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-07-03 17:27:25 +00:00
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