Commit Graph

  • f710923320 Merge branch 'master' into scenario-management Fabian Neumann 2024-02-18 09:48:12 +0100
  • e1ce8a3590 Merge branch 'master' of github.com:PyPSA/pypsa-eur Fabian Neumann 2024-02-18 09:47:01 +0100
  • 3e612950c2 revert part of #925 so that config.default.yaml is still copied and config.yaml remains untracked Fabian Neumann 2024-02-18 09:45:37 +0100
  • d7935e1c06 revert part of #925 so that config.default.yaml is still copied and config.yaml remains untracked Fabian Neumann 2024-02-18 09:45:37 +0100
  • df0eb38a68 _helpers: generalise regular expression in find_opt Fabian Neumann 2024-02-17 23:38:59 +0100
  • cf7018c8c4 plot_summary: remove leftover references to opts wildcard Fabian Neumann 2024-02-17 23:38:00 +0100
  • 770d352652 handle that time_resolution can be float Fabian Neumann 2024-02-17 23:37:31 +0100
  • 945180f153 allow_missing in collection rules, fixes for myopic, wildcard constraints without function Fabian Neumann 2024-02-17 23:36:46 +0100
  • b543bf37c9 retrieve.smk: do not protect gas network data Fabian Neumann 2024-02-17 20:48:46 +0100
  • 68f2e086c5 postprocess.smk: add missing wildcard call Fabian Neumann 2024-02-17 20:48:17 +0100
  • 9f643ea429 _helpers: add inplace keyword argument to update_config_from_wildcards Fabian Neumann 2024-02-17 20:45:23 +0100
  • 388ea65847 common.smk: use update_config to simplify merge_configs Fabian Neumann 2024-02-17 20:44:22 +0100
  • d335275e0f build_electricity: add missing wildcard call Fabian Neumann 2024-02-17 20:43:11 +0100
  • 16793d1335 Snakefile: don't use {run} wildcard if just specifying a run name Fabian Neumann 2024-02-17 20:42:37 +0100
  • cc3d7a4cbb [pre-commit.ci] auto fixes from pre-commit.com hooks pre-commit-ci[bot] 2024-02-17 17:35:52 +0000
  • e898781fda use wildcard input functions where applicable Fabian Neumann 2024-02-17 18:35:26 +0100
  • 95853bb59d _helpers: allow specifying dedicated shared_resources folder Fabian Neumann 2024-02-17 18:27:59 +0100
  • 2521dd49b0 Merge branch 'scenario-management' of github.com:PyPSA/pypsa-eur into scenario-management Fabian Neumann 2024-02-17 18:16:51 +0100
  • 84c3852c2e _helpers: remove resource folder separation by wildcard Fabian Neumann 2024-02-17 18:15:43 +0100
  • db7c983950 mock_snakemake: remove dangeours empty list as default argument Fabian Neumann 2024-02-17 18:14:18 +0100
  • de244414df [pre-commit.ci] auto fixes from pre-commit.com hooks pre-commit-ci[bot] 2024-02-17 16:56:01 +0000
  • b14d84eb39 Merge branch 'scenario-management' of github.com:PyPSA/pypsa-eur into scenario-management Fabian Neumann 2024-02-17 17:55:35 +0100
  • 709b831e06 further adjustments where config_provider needs to be called Fabian Neumann 2024-02-17 17:51:26 +0100
  • b8d57a6566 [pre-commit.ci] auto fixes from pre-commit.com hooks pre-commit-ci[bot] 2024-02-17 16:39:10 +0000
  • 89d0fa24b6 further adjustments to latest master branch commits Fabian Neumann 2024-02-17 17:38:46 +0100
  • 35b2228891 Merge branch 'wc-to-cf' into scenario-management Fabian Neumann 2024-02-17 17:16:28 +0100
  • d2a66879de Merge branch 'master' into scenario-management Fabian Neumann 2024-02-17 17:04:36 +0100
  • dd2416a59e handle all {opts} and {sector_opts} wildcard values in config Fabian Neumann 2024-02-17 11:57:16 +0100
  • a3c0ffac44
    Merge pull request #937 from PyPSA/h2-myopic-plot Fabian Neumann 2024-02-16 16:42:21 +0100
  • 7f1ff0c324 Fix plotting of retrofitted hydrogen pipelines with pathway optimisation. Fabian Neumann 2024-02-16 16:41:21 +0100
  • f59ede8af4
    Merge pull request #929 from PyPSA/industry-pathway Fabian Neumann 2024-02-16 16:28:34 +0100
  • 27f9fb8cba add back in to_csv export (accidentally deleted) Fabian Neumann 2024-02-16 16:18:31 +0100
  • 77753fff0d Merge branch 'master' into industry-pathway Fabian Neumann 2024-02-16 15:31:54 +0100
  • 8ae0669b33 Revert "add_electricity: set locations and units of electricity buses" Fabian Neumann 2024-02-16 15:31:17 +0100
  • e9174d4f14
    Merge branch 'master' into industry-pathway Fabian Neumann 2024-02-16 15:15:27 +0100
  • 93bb4e5f54 add release note, simplify build_industry_sector_ratios_intermediate script Fabian Neumann 2024-02-16 15:14:18 +0100
  • 60406f1bc4
    Merge pull request #933 from PyPSA/h2-pipe-losses Fabian Neumann 2024-02-16 13:32:30 +0100
  • 9e8ed7394d
    Update config/config.default.yaml Fabian Neumann 2024-02-16 13:32:24 +0100
  • 472a099881 add_electricity: set locations and units of electricity buses Fabian Neumann 2024-02-16 13:30:52 +0100
  • 4d4badc519 Merge branch 'master' into industry-pathway Fabian Neumann 2024-02-16 13:01:40 +0100
  • 6a8ae68aec Merge branch 'industry-coal-bug' Fabian Neumann 2024-02-16 12:47:34 +0100
  • 6d80b332e6 add release note Fabian Neumann 2024-02-16 12:47:01 +0100
  • 3f6f17cef6
    Merge pull request #930 from PyPSA/cl-meoh-unit Fabian Neumann 2024-02-16 12:40:37 +0100
  • 6bedca13c4
    Merge branch 'master' into cl-meoh-unit Fabian Neumann 2024-02-16 12:40:29 +0100
  • 7e66c1428d add release note Fabian Neumann 2024-02-16 12:40:05 +0100
  • be3472dee9
    Merge pull request #931 from PyPSA/ammonia Fabian Neumann 2024-02-16 12:14:07 +0100
  • 84fc63d7a1
    Merge branch 'master' into ammonia Fabian Neumann 2024-02-16 12:14:00 +0100
  • 67484f9cf0 remove numpy import, add release ntoe Fabian Neumann 2024-02-16 12:13:35 +0100
  • dc14082985
    Merge pull request #922 from PyPSA/bus-regions Fabian Neumann 2024-02-16 12:07:53 +0100
  • c22e47cd58 add release note Fabian Neumann 2024-02-16 12:07:37 +0100
  • abc4538251
    Merge pull request #934 from PyPSA/swiss_all_years Fabian Neumann 2024-02-16 11:45:15 +0100
  • 16e42c8fe6 further progress and bugfixes Fabian Neumann 2024-02-16 11:17:00 +0100
  • ccbf835976 fix typo to make pre-commit.ci happy martacki 2024-02-16 09:49:00 +0100
  • 6196fd6892 change default energy totals year to 2013 to comply with default weather year martacki 2024-02-15 16:29:29 +0100
  • a22b19dcc4 use new swiss data for building energy totals martacki 2024-02-15 16:28:24 +0100
  • 16955d24ab data: upload swiss energy totals data for all years martacki 2024-02-15 16:27:44 +0100
  • 8464415b35
    update for 70 bars instead of 140 lisazeyen 2024-02-15 15:14:32 +0100
  • 87ab0a5575
    update h2 pipe losses lisazeyen 2024-02-15 14:58:53 +0100
  • 4fa504b0db [pre-commit.ci] auto fixes from pre-commit.com hooks pre-commit-ci[bot] 2024-02-14 17:32:20 +0000
  • b45df1724b [pre-commit.ci] auto fixes from pre-commit.com hooks pre-commit-ci[bot] 2024-02-14 17:31:48 +0000
  • e14bae345b new script to interpolate industry sector ratios today to tomorrow Tom Brown 2024-02-14 18:15:18 +0100
  • 7f3ad792a9 use production to determine today's energy demand for basic chemicals Tom Brown 2024-02-14 12:24:58 +0100
  • cc57952402 industrial prod: use EU28 total for denominator for distribution key Tom Brown 2024-02-14 10:33:50 +0100
  • cbf7ed0d38 for today's industry energy demand, separate MeOH, Cl and HVC Tom Brown 2024-02-14 10:09:13 +0100
  • c54626cc1a bugfix: correct units of subtracted chlorine and methanol Tom Brown 2024-02-12 18:19:25 +0100
  • ecedea02d6 bugfix: include all countries in ammonia production resource Tom Brown 2024-02-12 18:17:53 +0100
  • 234f2f247c
    Merge branch 'master' into bus-regions Martha Frysztacki 2024-02-14 17:05:43 +0100
  • 9c592d9f73 add config/config.yaml to .gitignore Fabian Neumann 2024-02-14 10:49:40 +0100
  • dbbfbaf1f3 Merge branch 'master' into scenario-management Fabian Neumann 2024-02-14 10:45:43 +0100
  • 44d0859640
    Merge pull request #925 from PyPSA/default-config Fabian Neumann 2024-02-13 07:39:56 +0100
  • a13da7bab7
    Merge pull request #926 from PyPSA/efficient-helper-source-path Fabian Neumann 2024-02-13 07:38:39 +0100
  • 78b184ad0f [pre-commit.ci] auto fixes from pre-commit.com hooks pre-commit-ci[bot] 2024-02-12 15:57:45 +0000
  • c3feb0e283 handle complicated config-dependent inputs using unpack() with input functions Fabian Neumann 2024-02-12 16:56:00 +0100
  • c83db4e84e add retrieve_cost_data.py script to handle config_provider and move to resources since dependent on config setting Fabian Neumann 2024-02-12 16:54:33 +0100
  • f024412301 simplify test cases Fabian Neumann 2024-02-12 16:49:15 +0100
  • b725a754cc Merge branch 'default-config' of github.com:PyPSA/pypsa-eur into default-config Fabian Neumann 2024-02-12 13:57:04 +0100
  • 69e20e3448 need at least one entry for config/config.yaml to read as yaml Fabian Neumann 2024-02-12 13:55:32 +0100
  • fa931cc2b1 alternative approach 2 Fabian Neumann 2024-02-12 13:54:28 +0100
  • 1e5163b66b alternative approach Fabian Neumann 2024-02-12 13:45:42 +0100
  • 5840a9aa11 remove inefficient _helper.py file search Fabian Neumann 2024-02-12 12:17:13 +0100
  • abe06a68fb [pre-commit.ci] auto fixes from pre-commit.com hooks pre-commit-ci[bot] 2024-02-12 11:11:02 +0000
  • fe143ff8fe use default config as base configuration Fabian Neumann 2024-02-12 12:10:05 +0100
  • e0b6ebd174 [pre-commit.ci] auto fixes from pre-commit.com hooks pre-commit-ci[bot] 2024-02-12 10:54:13 +0000
  • 87f5a11bbe Merge branch 'scenario-management' of github.com:PyPSA/pypsa-eur into scenario-management Fabian Neumann 2024-02-12 11:53:49 +0100
  • 9400b6dd75 do not use config_provider outside rule definitions Fabian Neumann 2024-02-12 11:53:37 +0100
  • 40b27b4107 use set_scenario_config everywhere Fabian Neumann 2024-02-12 11:53:20 +0100
  • bb7b65eebd move create_scenarios.py to config directory Fabian Neumann 2024-02-12 11:52:07 +0100
  • 1a883debb5 [pre-commit.ci] auto fixes from pre-commit.com hooks pre-commit-ci[bot] 2024-02-12 10:00:02 +0000
  • 6b013dbd40 Merge branch 'master' into scenario-management Fabian Neumann 2024-02-12 10:59:37 +0100
  • e8c8d72b3f
    Merge pull request #924 from PyPSA/merged-electricity-demand Fabian Neumann 2024-02-12 10:56:13 +0100
  • 09ada56bf1 finishing touches and release notes Fabian Neumann 2024-02-12 10:49:45 +0100
  • 49171901d7 selective cherry-pick from 91eff472a7 Fabian Neumann 2024-02-12 10:12:03 +0100
  • 94f72d7276 electricity demand: remove powerstastics flag, merge sources in retrieve_electricity_demand Fabian 2023-08-17 10:17:12 +0200
  • 2bd8021058 retrieve electricity demand: make online version snakemake params Fabian 2023-08-16 11:47:27 +0200
  • 5c7bbcd94d retrieve electricity demand: use script in order to concat time-series Fabian 2023-08-16 11:41:48 +0200
  • 17105b8125 [pre-commit.ci] auto fixes from pre-commit.com hooks pre-commit-ci[bot] 2024-02-10 18:17:57 +0000
  • 8781e69066 bugfix: coal emissions for industry weren't tracked Tom Brown 2024-02-09 18:36:16 +0100
  • 4ff06046fc [pre-commit.ci] auto fixes from pre-commit.com hooks pre-commit-ci[bot] 2024-02-10 17:09:46 +0000
  • a9dad3f34e add new resources(), logs(), benchmarks(), config_providers() Fabian Neumann 2024-02-10 18:09:23 +0100
  • e838b63ded [pre-commit.ci] auto fixes from pre-commit.com hooks pre-commit-ci[bot] 2024-02-10 16:22:36 +0000