bjoern/pypsa-eur
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
1,156 Commits 1 Branch 0 Tags 133 MiB
727688749c
Commit Graph

588 Commits

Author SHA1 Message Date
Fabian Hofmann
82013fd081
Update scripts/add_electricity.py 
Co-authored-by: Martha Frysztacki <martha.frysztacki@kit.edu>
 2022-06-28 13:16:55 +02:00
Fabian Hofmann
3294ad92eb
Update scripts/solve_network.py 
Co-authored-by: Martha Frysztacki <martha.frysztacki@kit.edu>
 2022-06-28 13:14:47 +02:00
Fabian
9d997fbd79 generalize conventional attr handling through config 2022-06-28 10:14:26 +02:00
Fabian Neumann
74f8ca1c7f
Merge branch 'master' into eu-energy-security 2022-06-28 08:09:39 +02:00
Fabian Neumann
971e970250
Merge branch 'master' into landlock-fix-alterative 2022-06-28 07:47:13 +02:00
martacki
29fe0fb7fb hierarchical clustering: account for changes from merging master 2022-06-27 21:02:45 +02:00
Martha Frysztacki
50a518a155
Merge branch 'master' into introduce_hac_clustering 2022-06-27 20:45:40 +02:00
Fabian Neumann
51de606aab
Revert "remove build/retrieve natura raster, directly use shapefile" 2022-06-27 19:00:41 +02:00
Fabian
b56d1f6f4d conventional config section: update to more general attribute assignment scheme 2022-06-27 17:35:19 +02:00
martacki
a3af137b74 clustering strats to configurables: move duplicate code to _helpers script & import 2022-06-27 14:18:47 +02:00
Martha Frysztacki
5587327be3
Merge branch 'master' into harmonize_clustering_strategies 2022-06-27 14:02:45 +02:00
Fabian Hofmann
8349e85252
Apply suggestions from code review 
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
 2022-06-27 11:48:45 +02:00
Fabian Neumann
4d79a0dc96
Apply suggestions from code review 2022-06-27 10:23:22 +02:00
Fabian Neumann
9c6c6d243f
Adaptations to match current PyPSA-Eur version 2022-06-27 10:21:08 +02:00
Fabian Neumann
8e57d68b73
Merge branch 'master' into landlock-fix-alterative 2022-06-27 09:44:42 +02:00
Fabian Neumann
5ca231824e
Merge branch 'master' into eu-energy-security 2022-06-27 08:58:37 +02:00
Fabian Neumann
520f7e440e
Merge branch 'master' into technology-data 2022-06-25 11:05:41 +02:00
Fabian Neumann
4e8d510332
Merge branch 'master' into rm-raster-natura 2022-06-24 23:12:39 +02:00
martacki
c9c738e96b clustering strats to configurables: set defaults for yaml-incompatible strats + include in stubaggregation 2022-06-24 20:57:53 +02:00
Fabian Neumann
4c5ec8e5f1
Merge branch 'master' into introduce_hac_clustering 2022-06-24 20:22:47 +02:00
Fabian Neumann
2a55ad2162
Merge branch 'master' into load-shedding-carrier 2022-06-24 20:19:37 +02:00
Fabian Neumann
d321b2b762 resolve merge conflicts 2022-06-24 20:15:32 +02:00
Martha Frysztacki
4722099a7b
Merge branch 'master' into harmonize_clustering_strategies 2022-06-24 20:10:05 +02:00
Fabian Neumann
ac966c0a99
Merge branch 'master' into bugfixes_manual_load 2022-06-24 19:57:16 +02:00
Fabian Neumann
34c75fc59e
Merge branch 'master' into harmonize_clustering_strategies 2022-06-24 19:49:26 +02:00
Fabian
3dbd8d1492 add_electricity: fix read_csv 2022-06-24 18:31:39 +02:00
Fabian Hofmann
17d7403f20
build_powerplants: apply suggestions from code review 
Co-authored-by: Martha Frysztacki <martha.frysztacki@kit.edu>
 2022-06-24 15:34:26 +02:00
Fabian
a019034f80 Merge branch 'master' into eu-energy-security 2022-06-24 15:28:07 +02:00
Fabian
c42d2bd97d refactor save to geojson file functionality to allow import/export of empty geodfs 2022-06-24 15:11:21 +02:00
Fabian
75f9719076 build_renewable_profiles: use LocalCluster instance 2022-06-24 14:07:51 +02:00
Fabian
d18867ce61 build_renewable_profiles: use dask client instead of kwargs 2022-06-23 21:27:18 +02:00
Fabian
b581e7afc6 build_hydro_profiles: revert changes 2022-06-23 21:19:41 +02:00
Fabian
0fd7d689a1 Merge branch 'master' into eu-energy-security 2022-06-23 20:53:43 +02:00
Fabian
2c5643a5f8 add_electricity: fix conventional config 2022-06-23 16:36:22 +02:00
Fabian Hofmann
348b14b052
Update scripts/build_hydro_profile.py 
Co-authored-by: Martha Frysztacki <martha.frysztacki@kit.edu>
 2022-06-23 16:15:37 +02:00
Fabian Hofmann
d6930b878a
Update scripts/cluster_network.py 
Co-authored-by: Martha Frysztacki <martha.frysztacki@kit.edu>
 2022-06-23 16:14:20 +02:00
Fabian
441d7d56f9 fix eafs and conventional setttings 2022-06-23 16:04:49 +02:00
Fabian Hofmann
db78f9cd2a
Update scripts/add_electricity.py 
Co-authored-by: Martha Frysztacki <martha.frysztacki@kit.edu>
 2022-06-23 15:54:22 +02:00
Martha Frysztacki
e004b27f40
Merge branch 'master' into harmonize_clustering_strategies 2022-06-21 18:44:28 +02:00
martacki
bdd0cc3aa1 clustering strats to configurables: review suggestions 2022-06-21 18:42:49 +02:00
Fabian Neumann
fe5467e4e4
Merge branch 'master' into fix_snakemake_error 2022-06-21 16:21:32 +02:00
Fabian Neumann
cc657b7628
Update scripts/_helpers.py 2022-06-21 16:21:21 +02:00
Philipp Glaum
51ff3f02bb helpers: check snakemake version for bug fix 2022-06-21 16:13:16 +02:00
Fabian Hofmann
6fb3520fc1
Merge branch 'master' into eu-energy-security 2022-06-21 14:12:43 +02:00
martacki
bef4967e84 clustering strategies moved to configurables 2022-06-20 18:58:23 +02:00
Fabian Hofmann
8c704c024e
Merge branch 'master' into cluster-strategy-conventionals 2022-06-20 18:23:02 +02:00
Fabian
c2413aeef4 cluster-network: add strategies for conventionals 2022-06-20 18:20:28 +02:00
Philipp Glaum
5df588ccb8 fix snakemake error introduced after v7.7.0 2022-06-20 12:45:28 +02:00
Fabian Hofmann
bebbb003e5
Merge branch 'master' into eu-energy-security 2022-06-15 15:02:21 +02:00
Fabian Hofmann
6b9932f5e8
build_renewable_profiles: set show progress default to False 2022-06-14 15:24:10 +02:00
Fabian
1c0975181e add_electricity: fix missing config key 2022-06-10 11:23:35 +02:00
Fabian
13992125bd cluster_network: adjust generator strategy for new columns 2022-06-10 11:23:26 +02:00
Fabian
f5a9a27a5d Merge branch 'eu-energy-security' of github.com:PyPSA/pypsa-eur into eu-energy-security 2022-06-10 00:36:55 +02:00
Fabian
c68aa028ff add_electricity: fix missing config key 2022-06-10 00:36:07 +02:00
Fabian Hofmann
12bed0745d
Merge branch 'master' into eu-energy-security 2022-06-09 23:41:48 +02:00
Fabian
f45803ff10 add_electricity: fix missing backwards compat and warnings 2022-06-09 23:40:32 +02:00
Fabian
76cd0751b4 Merge branch 'eu-energy-security' of github.com:PyPSA/pypsa-eur into eu-energy-security 2022-06-09 20:36:35 +02:00
Fabian
0ec3a8638b add_electricity & config: 
- refactor attachment of conventional carriers
  - refactor scaling of renewable carriers
 2022-06-09 20:31:50 +02:00
zoltanmaric
1a7b439f2d Remove usages of retrieve_snakemake_keys 2022-06-08 17:32:33 +02:00
martacki
cd92d8092b plot_summary: remove deprecated retrieve_snakemake_keys function 2022-06-08 15:49:06 +02:00
Fabian Neumann
a2f39abee2
Merge branch 'master' into voronoi 2022-06-07 15:23:30 +02:00
Fabian
8b855f0478 add_elecitricity: scale only missing renewable capacities from OPSD 2022-06-07 15:17:49 +02:00
Fabian Hofmann
bdd094d796
Update scripts/build_bus_regions.py 2022-06-07 15:01:40 +02:00
Fabian Hofmann
97fbf77ff8
Update scripts/build_bus_regions.py 2022-06-07 15:01:18 +02:00
Fabian Hofmann
aa867cb704
Update scripts/build_bus_regions.py 
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
 2022-06-07 15:00:57 +02:00
Fabian Neumann
d5db3b8d80
Update scripts/build_bus_regions.py 
Co-authored-by: Fabian Hofmann <fab.hof@gmx.de>
 2022-06-07 10:57:01 +02:00
Fabian Hofmann
619b471f72
Merge branch 'master' into eu-energy-security 2022-06-07 10:05:11 +02:00
Max Parzen
b6032fb891 fix crs bug 2022-05-28 14:48:32 +01:00
martacki
2e4c30e28e abbreviate 2022-04-29 15:18:22 +02:00
martacki
8a49697a51 bugfixes for manual load adjustments 2022-04-29 15:09:10 +02:00
martacki
ac7c94337e respect stores for supply.csv 2022-04-29 13:51:54 +02:00
martacki
d12405d848 respect stores for energy_supply.csv 2022-04-29 13:48:58 +02:00
martacki
dcac3ea6e1 respect stores in make_summary script 2022-04-28 12:59:25 +02:00
Fabian Neumann
49f1c0f629
Merge pull request #348 from PyPSA/annuity 
add_electricity: remove vresutils.costdata.annuity dependency
 2022-04-15 18:36:37 +02:00
Fabian Neumann
a3d6e296e8
Merge branch 'master' into eu-energy-security 2022-04-08 19:56:26 +02:00
Fabian Neumann
4712bfc893 fix nuclear EAF processing code 2022-04-08 19:55:40 +02:00
Fabian Neumann
8af21f3355 Merge remote-tracking branch 'origin/eu-energy-security' into results-dir 2022-04-08 15:46:37 +02:00
euronion
c412a61013
Add country-specific EAF restriction for NPPs. (#361) 
* Add country-specific EAF restriction for NPPs.

Based on historic figures from IAEA.

* Update release_notes.rst
 2022-04-08 15:41:23 +02:00
Fabian Neumann
6aefcee030 Merge branch 'eu-energy-security' into results-dir 2022-04-08 15:28:57 +02:00
Fabian
40425a7767 build powerplants: use map_country bus function for bus attachement 2022-04-08 15:25:05 +02:00
Fabian Neumann
50ca0d0ddc Merge branch 'eu-energy-security' into results-dir 2022-04-08 14:51:10 +02:00
Fabian
65790cd065 build_powerplants: remove non-assigned ppls 2022-04-08 14:34:52 +02:00
Fabian
d53487f822 build_powerplants: fix duplicated names per bus 2022-04-08 14:23:33 +02:00
Fabian Neumann
40c882f0e9 solve: allow to parse load shedding cost in config 2022-04-08 13:19:25 +02:00
Fabian Neumann
4a18d59789 Merge branch 'eu-energy-security' into results-dir 2022-04-08 12:34:11 +02:00
Fabian
e37a3f57ab adjust biomass capacities 2022-04-08 12:23:24 +02:00
Fabian Neumann
2403650be2 prepare: allow varying emission prices in opts wc: e.g. Ep80.5 2022-04-08 10:27:55 +02:00
Fabian Neumann
02c06017d3 prepare: add gas consumption limit through wildcard: CH4L 2022-04-08 10:27:23 +02:00
Fabian Neumann
bd75953674 add logging to co2limit2 2022-04-08 10:26:38 +02:00
Fabian Neumann
f9ede37a02 allow varying marginal cost of carrier in opts wc: CCGT+m2.0 2022-04-08 10:26:16 +02:00
Fabian Neumann
630fb9783f fix to operational reserve margin to work without any extendable gens 2022-04-07 17:20:56 +02:00
Fabian Neumann
84e146834c Apply suggestion from code review to add switch 2022-04-07 15:22:10 +02:00
Fabian Neumann
3678e5c523 Add operational reserve margin constraint analogous to GenX 
Co-authored-by: FabianHofmann <hofmann@fias.uni-frankfurt.de>
 2022-04-07 14:39:34 +02:00
Fabian Neumann
4862dcf865
Merge pull request #357 from PyPSA/hvdc-links 
Hvdc links
 2022-04-05 17:13:15 +02:00
Fabian Neumann
bfcc20aa13
Revert "update TYNDP links which are already built" 2022-04-05 17:10:12 +02:00
Fabian Neumann
51dffbefa3 add gas usage limit constraint 2022-04-05 16:59:51 +02:00
Fabian Neumann
9812e64e82 resolve cherry merge conflict 2 2022-04-05 16:34:02 +02:00
Fabian Neumann
7a52b6bc45 resolve cherry merge conflict 1 2022-04-05 16:22:31 +02:00
Fabian Neumann
aa6e98a563 label built TYNDP links as not under_construction 2022-04-05 16:11:02 +02:00
Fabian Neumann
eca4a017db implement TYNDP link overriding for link_id not oid 2022-04-05 16:07:30 +02:00