Commit Graph

  • 217780263d store config and wildcards in n.meta Fabian Neumann 2022-06-30 08:39:03 +0200
  • b4d0a8404c change unit from carrier gas from MWh_th -> MWh_LHV lisazeyen 2022-06-29 08:57:08 +0200
  • 187c9cbaa3 add release notes lisazeyen 2022-06-29 08:49:29 +0200
  • 7604bb1654 Document units of bus carriers Irieo 2022-06-28 18:31:45 +0200
  • a8171ec9f3 color adaptations, new features Fabian Neumann 2022-06-28 18:03:29 +0200
  • 080075ec9f
    Merge pull request #353 from PyPSA/eu-energy-security Fabian Hofmann 2022-06-28 17:19:54 +0200
  • 20e1fb40fb update mock_snakemake for new snakemake versions Fabian Neumann 2022-06-28 17:18:09 +0200
  • 03265373c7
    Merge pull request #388 from PyPSA/eu-energy-security-conventional-attrs Fabian Hofmann 2022-06-28 16:38:28 +0200
  • 67ac464b6a add_electricity: use conventional_inputs from snakemake.input for attach_conventional_generators Fabian 2022-06-28 16:33:46 +0200
  • 8b134405dd
    Merge pull request #243 from ebbekyhl/Coal-carbon-capture Fabian Neumann 2022-06-28 14:04:31 +0200
  • e9e00291c5 update configtables/opts to include CH4L option martacki 2022-06-28 13:40:14 +0200
  • e9f2d65cda
    Indent by two layers Ebbe Kyhl 2022-06-28 13:35:44 +0200
  • e175d1aa0e
    Merge branch 'eu-energy-security' into eu-energy-security-conventional-attrs Fabian Hofmann 2022-06-28 13:22:39 +0200
  • c9ee3e7b36 Merge branch 'eu-energy-security-conventional-attrs' of github.com:PyPSA/pypsa-eur into eu-energy-security-conventional-attrs Fabian 2022-06-28 13:17:08 +0200
  • 82013fd081
    Update scripts/add_electricity.py Fabian Hofmann 2022-06-28 13:16:55 +0200
  • 522f218eed Snakefile: rename attrs to attr in add_electricity input function Fabian 2022-06-28 13:15:37 +0200
  • 3294ad92eb
    Update scripts/solve_network.py Fabian Hofmann 2022-06-28 13:14:47 +0200
  • 917f41ef21
    Update Snakefile Fabian Hofmann 2022-06-28 13:11:08 +0200
  • 9d997fbd79 generalize conventional attr handling through config Fabian 2022-06-28 10:14:26 +0200
  • 74f8ca1c7f
    Merge branch 'master' into eu-energy-security Fabian Neumann 2022-06-28 08:09:39 +0200
  • 452d8cd63f
    Merge pull request #383 from PyPSA/landlock-fix-alterative Fabian Neumann 2022-06-28 08:02:48 +0200
  • 971e970250
    Merge branch 'master' into landlock-fix-alterative Fabian Neumann 2022-06-28 07:47:13 +0200
  • f9a996e5df
    Merge pull request #293 from PyPSA/introduce_hac_clustering Fabian Neumann 2022-06-28 07:44:52 +0200
  • f1dedd9429 hierarchical clustering: release notes & revert to old default clustering algorithm (kmeans) martacki 2022-06-27 21:11:49 +0200
  • 29fe0fb7fb hierarchical clustering: account for changes from merging master martacki 2022-06-27 21:02:45 +0200
  • 50a518a155
    Merge branch 'master' into introduce_hac_clustering Martha Frysztacki 2022-06-27 20:45:40 +0200
  • cc1c9fd752
    Merge pull request #386 from PyPSA/revert-336-rm-raster-natura Fabian Neumann 2022-06-27 19:01:19 +0200
  • 51de606aab
    Revert "remove build/retrieve natura raster, directly use shapefile" Fabian Neumann 2022-06-27 19:00:41 +0200
  • 5ae56cca7c
    Apply suggestions from code review Ebbe Kyhl 2022-06-27 18:06:59 +0200
  • b56d1f6f4d conventional config section: update to more general attribute assignment scheme Fabian 2022-06-27 17:35:19 +0200
  • d3afd21377
    Merge pull request #380 from PyPSA/harmonize_clustering_strategies Martha Frysztacki 2022-06-27 14:35:05 +0200
  • a3af137b74 clustering strats to configurables: move duplicate code to _helpers script & import martacki 2022-06-27 14:18:47 +0200
  • 5587327be3
    Merge branch 'master' into harmonize_clustering_strategies Martha Frysztacki 2022-06-27 14:02:45 +0200
  • 2dfa2753ba clustering strats to configurables: config spacing martacki 2022-06-27 13:59:04 +0200
  • 8349e85252
    Apply suggestions from code review Fabian Hofmann 2022-06-27 11:48:45 +0200
  • fa43038564 remove params from input as they are not exposed to input Fabian Neumann 2022-06-27 10:35:39 +0200
  • 4d79a0dc96
    Apply suggestions from code review Fabian Neumann 2022-06-27 10:23:22 +0200
  • 9c6c6d243f
    Adaptations to match current PyPSA-Eur version Fabian Neumann 2022-06-27 10:21:08 +0200
  • 8e57d68b73
    Merge branch 'master' into landlock-fix-alterative Fabian Neumann 2022-06-27 09:44:42 +0200
  • 5ca231824e
    Merge branch 'master' into eu-energy-security Fabian Neumann 2022-06-27 08:58:37 +0200
  • 520f7e440e
    Merge branch 'master' into technology-data Fabian Neumann 2022-06-25 11:05:41 +0200
  • 77e3debebb
    Merge pull request #336 from PyPSA/rm-raster-natura Fabian Neumann 2022-06-24 23:23:38 +0200
  • 4e8d510332
    Merge branch 'master' into rm-raster-natura Fabian Neumann 2022-06-24 23:12:39 +0200
  • c9c738e96b clustering strats to configurables: set defaults for yaml-incompatible strats + include in stubaggregation martacki 2022-06-24 20:57:53 +0200
  • 4c5ec8e5f1
    Merge branch 'master' into introduce_hac_clustering Fabian Neumann 2022-06-24 20:22:47 +0200
  • 54f88b871a
    Merge pull request #320 from PyPSA/load-shedding-carrier Fabian Neumann 2022-06-24 20:20:05 +0200
  • 2a55ad2162
    Merge branch 'master' into load-shedding-carrier Fabian Neumann 2022-06-24 20:19:37 +0200
  • d321b2b762 resolve merge conflicts Fabian Neumann 2022-06-24 20:15:32 +0200
  • 4722099a7b
    Merge branch 'master' into harmonize_clustering_strategies Martha Frysztacki 2022-06-24 20:10:05 +0200
  • 8d9bbacd9b
    Merge pull request #365 from PyPSA/bugfixes_manual_load Fabian Neumann 2022-06-24 20:06:31 +0200
  • ac966c0a99
    Merge branch 'master' into bugfixes_manual_load Fabian Neumann 2022-06-24 19:57:16 +0200
  • 34c75fc59e
    Merge branch 'master' into harmonize_clustering_strategies Fabian Neumann 2022-06-24 19:49:26 +0200
  • b37c1d98d3 update release notes Fabian 2022-06-24 18:44:03 +0200
  • a1ee747dc6 data: add nuclear_eafs Fabian 2022-06-24 18:37:43 +0200
  • 3dbd8d1492 add_electricity: fix read_csv Fabian 2022-06-24 18:31:39 +0200
  • 17d7403f20
    build_powerplants: apply suggestions from code review Fabian Hofmann 2022-06-24 15:34:26 +0200
  • a019034f80 Merge branch 'master' into eu-energy-security Fabian 2022-06-24 15:28:07 +0200
  • c42d2bd97d refactor save to geojson file functionality to allow import/export of empty geodfs Fabian 2022-06-23 14:25:30 +0200
  • 467a1eb5e7
    Merge pull request #384 from PyPSA/dask-distributed Fabian Hofmann 2022-06-24 14:27:41 +0200
  • 75f9719076 build_renewable_profiles: use LocalCluster instance Fabian 2022-06-24 14:07:51 +0200
  • 743fdea874 add dask-worker-space to gitignore Fabian 2022-06-23 21:39:28 +0200
  • d18867ce61 build_renewable_profiles: use dask client instead of kwargs Fabian 2022-06-23 21:27:18 +0200
  • b581e7afc6 build_hydro_profiles: revert changes Fabian 2022-06-23 21:19:41 +0200
  • 0fd7d689a1 Merge branch 'master' into eu-energy-security Fabian 2022-06-23 20:53:43 +0200
  • 2d2f5ba409
    Merge pull request #238 from PyPSA/config-export Fabian Neumann 2022-06-23 17:19:08 +0200
  • bf61e83be0
    Merge pull request #239 from PyPSA/ci-summaries Fabian Neumann 2022-06-23 17:18:44 +0200
  • 2c5643a5f8 add_electricity: fix conventional config Fabian 2022-06-23 16:36:22 +0200
  • 2e212fb436
    Update test/config.test1.yaml Fabian Hofmann 2022-06-23 16:16:36 +0200
  • 348b14b052
    Update scripts/build_hydro_profile.py Fabian Hofmann 2022-06-23 16:15:37 +0200
  • d6930b878a
    Update scripts/cluster_network.py Fabian Hofmann 2022-06-23 16:14:20 +0200
  • 95e8a9534a env: remove duplicated ppm dependency Fabian 2022-06-23 16:07:33 +0200
  • 441d7d56f9 fix eafs and conventional setttings Fabian 2022-06-23 16:04:49 +0200
  • db78f9cd2a
    Update scripts/add_electricity.py Fabian Hofmann 2022-06-23 15:54:22 +0200
  • e1a6e13f75 add release note [no ci] Fabian Neumann 2022-06-23 15:28:00 +0200
  • 2037534557 prepare: only add ammonia to spatial if config selected Fabian Neumann 2022-06-23 15:24:44 +0200
  • d69efe3d1f add ammonia color to config.default.yaml Fabian Neumann 2022-06-23 15:22:21 +0200
  • 9f91af28e7 fix syntax errors Fabian Neumann 2022-06-23 15:17:41 +0200
  • f6b7317d04
    Update config.tutorial.yaml Fabian Hofmann 2022-06-23 15:14:38 +0200
  • 37c052667a handle absent ammonia config flag Fabian Neumann 2022-06-22 15:50:32 +0200
  • 8dba48c412 clustering strats to configurables: documentation and testing martacki 2022-06-21 19:08:22 +0200
  • e004b27f40
    Merge branch 'master' into harmonize_clustering_strategies Martha Frysztacki 2022-06-21 18:44:28 +0200
  • bdd0cc3aa1 clustering strats to configurables: review suggestions martacki 2022-06-21 18:42:49 +0200
  • 4e60e8d675
    Merge pull request #381 from p-glaum/fix_snakemake_error Fabian Neumann 2022-06-21 16:32:16 +0200
  • fe5467e4e4
    Merge branch 'master' into fix_snakemake_error Fabian Neumann 2022-06-21 16:21:32 +0200
  • cc657b7628
    Update scripts/_helpers.py Fabian Neumann 2022-06-21 16:21:21 +0200
  • 51ff3f02bb helpers: check snakemake version for bug fix Philipp Glaum 2022-06-21 16:13:16 +0200
  • 6fb3520fc1
    Merge branch 'master' into eu-energy-security Fabian Hofmann 2022-06-21 14:12:43 +0200
  • b4d8dd8ecb add changes from PR #379 martacki 2022-06-20 19:21:08 +0200
  • bef4967e84 clustering strategies moved to configurables martacki 2022-06-20 18:58:23 +0200
  • 21183f7b23
    Merge pull request #379 from PyPSA/cluster-strategy-conventionals Fabian Hofmann 2022-06-20 18:48:20 +0200
  • 8c704c024e
    Merge branch 'master' into cluster-strategy-conventionals Fabian Hofmann 2022-06-20 18:23:02 +0200
  • c2413aeef4 cluster-network: add strategies for conventionals Fabian 2022-06-20 18:20:28 +0200
  • 8e93fe9fb7
    Merge pull request #378 from p-glaum/fix_snakemake_error Fabian Neumann 2022-06-20 13:34:19 +0200
  • 5df588ccb8 fix snakemake error introduced after v7.7.0 Philipp Glaum 2022-06-20 12:45:28 +0200
  • 173ab7b318 add_electricity: make drop_leap_year own function Fabian Neumann 2022-06-16 09:00:33 +0200
  • e9bab1622c resolve merge conflicts Fabian Neumann 2022-06-16 08:53:42 +0200
  • b4c819c757 config: add fixed_year parameter for load Fabian Neumann 2022-06-16 08:51:06 +0200
  • cb0554f609 config: add fixed_year parameter for load Fabian Neumann 2022-06-16 08:51:06 +0200
  • 6713317bbe add_electricity: fix missing variable assignment Fabian Neumann 2022-06-16 08:46:47 +0200
  • a2e26004d7 add further missing handling of weather_year wildcard Fabian Neumann 2022-06-15 15:36:37 +0200