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

553 Commits

Author SHA1 Message Date
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
Fabian
1fd6a685ab powerplants: filter out powerplants with shut down date < 2021 2022-04-05 15:12:01 +02:00
Fabian
f878faac73 add_electricity: allow estimate_renewable_capacities to be commented out 2022-04-05 08:02:44 +02:00
Fabian Neumann
cb9730118b
Merge branch 'eu-energy-security' into renewable-caps 2022-04-04 19:04:44 +02:00
Fabian Neumann
ade22bf4f0 add existing wind and solar capacities based on IRENASTATS 2022-04-04 19:03:09 +02:00
Fabian
7bc9b8012c powerplants: update to ppm >= v0.5.1 2022-04-04 18:07:48 +02:00
Fabian Neumann
a7e407944c
Merge branch 'master' into issue-301 2022-03-29 09:24:40 +02:00
Fabian Neumann
621520a7b2
Merge branch 'master' into rm-raster-natura 2022-03-29 09:18:43 +02:00
Fabian Neumann
a4132919a0
Merge branch 'master' into voronoi 2022-03-29 09:08:35 +02:00
Fabian Neumann
a05881479c build_bus_regions: move voronoi partition from vresutils to script 2022-03-28 15:17:55 +02:00
Seth
c37171b01d feedback code review (opts argument and unpacking) 2022-03-28 13:42:55 +02:00
Seth
e45c7a65ff
Apply suggestions from Martha's code review 
Co-authored-by: Martha Frysztacki <martha.frysztacki@kit.edu>
 2022-03-28 12:10:51 +02:00
Fabian Neumann
7fee2944d8
Merge branch 'master' into rm-raster-natura 2022-03-28 12:07:33 +02:00
Seth
3c5212826e
Merge branch 'PyPSA:master' into fix-plotnetworkrule 2022-03-28 11:54:47 +02:00
Fabian Neumann
03e6764a9d
Merge branch 'master' into issue-301 2022-03-25 13:46:46 +01:00
Fabian Neumann
c54ddab4a3 remove unused simple_hvdc_costs 2022-03-24 14:47:00 +01:00
Fabian Neumann
1a82b87587 skip iterations if no lines are expandable 2022-03-24 14:30:28 +01:00
Fabian Neumann
7f6a00cfce
Merge branch 'master' into rm-raster-natura 2022-03-24 14:19:14 +01:00
martacki
7f29c31abe .copy() shortcut 2022-03-24 13:17:01 +01:00
martacki
8cb4c17930 unify vre treatment for hac clustering for simplify_network and cluster_network 2022-03-22 16:53:05 +01:00
Fabian Neumann
7ba1f26eb8 must read NATURA shape before add_geometry 2022-03-20 20:56:38 +01:00
Fabian Neumann
5a7c0d7967 remove build/retrieve natura raster, directly use shapefile 2022-03-20 10:03:17 +01:00
Fabian Neumann
ca94709ed3 use snakemake.threads in build_renewable_profiles 2022-03-20 09:50:38 +01:00
Martha Frysztacki
69c0341145
Merge branch 'master' into introduce_hac_clustering 2022-03-17 17:40:46 +01:00
martacki
4c1c5e3a4e suggestions by coroa and fneum 2022-03-17 17:38:30 +01:00
Fabian
1f788e0d5b cluster_network: replace np.sum/np.min by pandas.Series.sum/min 2022-03-16 16:16:15 +01:00
Seth
0384b4ff83 fix the plot_network snakemake rule 2022-03-10 13:55:53 +01:00
Martha Frysztacki
3e07fdfd54
Merge branch 'master' into introduce_hac_clustering 2022-03-07 11:44:29 +01:00
martacki
3fa8f91e73 make_summary followup on snakemake dependencies removal 2022-03-04 16:29:47 +01:00
Fabian
d16f24fc07 follow up 2022-03-03 23:08:29 +01:00
Fabian
8700f63cdb solve_network: fix load shedding attributes 2022-03-03 18:13:54 +01:00
martacki
b63271f12f release_notes, old format of base_network with updated docstrings 2022-03-03 17:16:23 +01:00
Martha Frysztacki
49cd51f463
Merge branch 'master' into update-entsoe-gridextract 2022-03-03 16:38:06 +01:00
Fabian
752ff28538 cluster_network.py: allow cluster wildcard to be 'all' 2022-03-02 14:43:04 +01:00
Fabian Neumann
8dafb7bc83
fix custom clustering by checking explicitly for series (#318) 2022-02-27 08:07:11 +01:00
Martha Frysztacki
6b6191734c
Merge branch 'master' into update-entsoe-gridextract 2022-02-16 21:41:28 +01:00