Fabian Neumann
8bafaf25f7
plot_network: adjust limits and thresholds
2023-01-07 13:23:33 +01:00
Fabian Neumann
64969c2dee
add methanol store
2023-01-05 13:42:01 +01:00
Fabian Neumann
ddcaff0b5b
plot_network: do not plot very small pipelines
2023-01-03 13:14:16 +01:00
Fabian Neumann
383aef7e1c
rename shipping_average_efficiency to shipping_oil_efficiency
2023-01-03 08:38:10 +01:00
virio-andreyana
0cb0ad528a
Appending comments for gas_input_locations
2022-12-29 12:14:26 +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
6f901f4c50
restore compatibility with latest master version
2022-12-28 15:43:43 +01:00
Fabian Neumann
520cad53a2
address sum(level) deprecation
2022-12-28 14:11:47 +01:00
Fabian Neumann
cac724fee0
merge master
2022-12-28 13:55:36 +01:00
Fabian Neumann
b9c1fdb65e
include methanolisation in PtL
2022-12-28 13:46:31 +01:00
Fabian Neumann
292ec9d5a1
fix computation of shipping demands
2022-12-28 13:45:42 +01:00
Fabian Neumann
f645d13743
Merge branch 'master' into methanol
2022-12-28 12:51:59 +01:00
Fabian Neumann
138d151c8b
only compute solar thermal profiles if technology is included
2022-12-28 12:48:51 +01:00
Fabian Neumann
38fd51fca9
Merge branch 'master' into methanol
2022-12-28 12:22:01 +01:00
Fabian Neumann
d37ffddd4f
build_solar_thermal_profiles: parallelize
2022-12-28 12:21:46 +01:00
Fabian Neumann
494d3010eb
build_heat_demand: parallelize
2022-12-28 12:21:00 +01:00
Fabian Neumann
097d054f06
build_temperatur_profiles: parallelize
2022-12-28 12:20:34 +01:00
Fabian Neumann
3999afdb5a
fixes to methanol implementation
2022-12-28 12:19:20 +01:00
Fabian Neumann
5360eb0a2e
Merge branch 'master' of https://github.com/pypsa/pypsa-eur
2022-12-28 09:35:15 +01:00
Fabian Neumann
a08c20d7c8
build_shapes: cleanup shape union of RS and KV
2022-12-28 09:35:11 +01:00
Fabian Neumann
bb5c5bd143
simplify_networks: add control for removing stubs II
2022-12-28 09:34:28 +01:00
Fabian Neumann
e9f3d20432
simplify_networks: add control for removing stubs
2022-12-28 09:33:08 +01:00
Fabian Neumann
bb1b37e8ef
address pandas iteritems deprecation
2022-12-27 13:16:05 +01:00
Fabian Neumann
70d07d561f
address pandas deprecations
2022-12-27 11:42:32 +01:00
Fabian Neumann
3d7c354d2b
merge master
2022-12-27 11:16:39 +01:00
Fabian Neumann
99343b1221
Merge pull request #277 from PyPSA/int-ports
...
distribute international shipping by port trade volumes
2022-12-27 10:57:01 +01:00
Max Parzen
545a734b7b
Merge branch 'master' into pz-max-patch-2
2022-12-16 12:20:58 +00:00
Max Parzen
9e61e30ff4
Fix EQ constraint in case no hydro exist
2022-12-16 11:00:39 +00:00
Max Parzen
b7899787cf
Fix load variable in reserve constraint
2022-12-16 10:50:20 +00:00
virio-andreyana
e1776518c0
Merge remote-tracking branch 'origin/update-lng-ports' into update-lng-ports
2022-12-15 12:20:05 +01:00
virio-andreyana
55ff725e3b
Final edit to update LNG ports. Remove unused files
2022-12-15 11:42:21 +01:00
virio-andreyana
d37cd49f7d
add script for retrieving lng terminals
2022-12-14 12:26:16 +01:00
virio-andreyana
01f48a50e7
Replacing the IGGIELNG_LNG data with Europe-Gas-Tracker
2022-12-14 12:26:16 +01:00
virio-andreyana
4f3510e3cc
Replacing the IGGIELNG_LNG data with Europe-Gas-Tracker
2022-12-07 10:36:54 +01:00
Fabian Neumann
0c62bfc9ee
complete methanol for shipping
2022-12-03 12:22:05 +01:00
lisazeyen
5b256bfa5d
take VOM for RES from existing
2022-11-28 16:56:42 +01:00
Fabian Neumann
c44f1d61c7
remove hard-coded methanol efficiency
2022-11-27 18:28:57 +01:00
pre-commit-ci[bot]
94e5f160b0
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2022-11-25 10:16:23 +00:00
martacki
643a62049b
solve_network: move extra_functionality to args
2022-11-25 11:08:35 +01:00
Fabian
df4eb85a19
fix typos
2022-11-18 09:08:07 +01:00
Fabian
727688749c
build_bus_regions: fix shapely deprecation
2022-11-15 07:45:13 +01:00
Fabian Neumann
16a92477f0
methanol in shipping
2022-11-13 18:25:32 +01:00
Fabian Neumann
84618b3ee1
distribute international shipping by port trade volumes
2022-11-13 13:43:05 +01:00
Fabian
a73eea9379
update solve_network
2022-11-09 17:14:44 +01:00
Fabian
6d972600b1
clustering: remove old dependency
2022-11-09 17:04:31 +01:00
Fabian
992efcaa91
solve_network: fix net vres share
2022-11-09 16:50:05 +01:00
Huang, Jiangyi
80868e5f0f
Update make_summary.py
...
The value for `na_action` needs to be "ignore" or "None".
2022-11-03 13:46:20 +01:00
Fabian
0b2989c987
build_natura_raster: fix out_shapes
2022-10-31 11:47:21 +01:00
pre-commit-ci[bot]
dcd16e32a8
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2022-10-25 13:23:20 +00:00
Adrian Odenweller
73b0645c13
Fix network directory path in make_summary
2022-10-25 14:29:07 +02:00
Fabian Neumann
1611d63a8a
Merge branch 'master' into nh3
2022-10-01 16:01:39 +02:00
lisazeyen
9a74e3d699
set co2seq to limit of sequestration potential
2022-09-29 09:12:36 +02:00
nnhjy
d29441d871
update deprecated syntax
2022-09-28 20:33:50 +02:00
lisazeyen
7606562449
update sector opt for co2 seq potential
2022-09-28 16:09:53 +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
Fabian
e2a4140663
add_electricity: calculate marginal costs from plant efficiency
2022-09-19 13:08:03 +02:00
Philipp Glaum
d51ca8695b
update Fabians comments
2022-09-19 11:46:58 +02:00
Fabian
9b570a53b4
tiny doc formatting fixes
2022-09-16 15:20:10 +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
1536cc2787
codespell: fix typos
...
Snakefile: fix unformattable parst
pre-commit: fix codespell ignore
2022-09-16 14:36:43 +02:00
Philipp Glaum
24e008a98e
add feature: aggregate carrier exclusion
2022-09-16 14:25:15 +02:00
lisazeyen
14ad15da91
Merge pull request #261 from PyPSA/temporal_aggregation
...
Add more options for temporal aggregation
2022-09-14 16:28:05 +02:00
lisazeyen
ed8f783096
include code review
2022-09-14 16:16:50 +02:00
Fabian
a59e54e659
follow up: fix extendable carriers
2022-09-14 15:17:42 +02:00
Fabian
59b76d8a99
add_electricity
2022-09-12 11:13:41 +02:00
Philipp Glaum
a4c5fbfa28
add_elec: add variable voltage angle input
2022-09-07 11:58:44 +02:00
Fabian
454ffa7068
line-rating: remove wildcard from opts
2022-09-06 17:43:22 +02:00
Fabian
8798b3e203
line-rating: adjust config keys
2022-09-06 16:40:00 +02:00
Fabian
2eb26f7334
address #314
2022-09-05 12:55:46 +02:00
lisazeyen
3daff49c99
Merge pull request #256 from PyPSA/fix-bug-myopic-co2
...
Fix bug myopic co2
2022-08-09 21:33:31 +02:00
lisazeyen
b42e76040d
small clean up
2022-08-09 21:30:45 +02:00
Fabian Hofmann
10b909e691
Merge branch 'master' into patch-1
2022-08-09 16:52:04 +02:00
Irieo
1920c2bae1
temporary fix of DateIn and DateOut
2022-08-09 15:30:58 +02:00
Zoltán Marić
07ff021a6e
Use geomap=True for plotting existing lines
...
Since https://github.com/PyPSA/PyPSA/commit/e754928e#diff-1ffb543f39b9a9c1d00adfc3fb2c1a89c905c56e00b9ede9178787a8148dc0eeR210 PyPSA raises an exception for plots that have geo axes but use `geomap=False`.
2022-08-09 12:09:07 +02:00
lisazeyen
2994c91173
add bioenergy to add_existing
2022-08-08 15:28:04 +02:00
lisazeyen
58b018e624
drop powerplants which are already decommissioned
2022-08-08 13:52:41 +02:00
lisazeyen
ce6b92dd6d
add options to aggregate snapshots temporally
2022-08-08 08:53:07 +02:00
lisazeyen
8dd143f369
bug fixes for missing bracket
2022-08-05 15:55:41 +02:00
lisazeyen
9752b4b4e6
Merge branch 'master' into pellet-boiler
2022-08-05 12:25:01 +02:00
lisazeyen
ff3d171bd7
move biomass boilers to add_biomass
2022-08-05 12:19:47 +02:00
lisazeyen
14f54304a8
Merge branch 'master' into pellet-boiler
2022-08-05 11:27:28 +02:00
lisazeyen
289c252688
remove link to co2 atmosphere
2022-08-04 17:42:57 +02:00
Fabian Hofmann
e0862c6f23
Merge branch 'master' into fix_pm_no_techtype
2022-08-04 16:16:34 +02:00
lisazeyen
8c62fb1b56
Merge branch 'master' into btl
2022-08-04 16:13:09 +02:00
lisazeyen
ee458eeafb
change names of buses
2022-08-04 16:03:16 +02:00
lisazeyen
2d625f5a80
Merge pull request #254 from millingermarkus/biosng
...
BioSNG (methane from solid biomass) with and without CC
2022-08-04 15:39:55 +02:00
Irieo
f20203e623
fix NaN techtype & fix wrong tech for Nuclear
2022-08-04 15:25:00 +02:00
Fabian Neumann
9cf5be84fd
bugfix: solve_network should look for wildcard sector_opts
2022-08-03 17:07:19 +02:00
Fabian Neumann
286520f396
compatibility: fix plotting for new pypsa version
2022-08-03 17:06:41 +02:00
Philipp Glaum
29cc8021b9
build_ship_raster: make file deletion windows compatible
2022-08-03 16:13:27 +02:00
Fabian Neumann
d569d3782c
fix windows for build_ship_raster 2
2022-08-02 18:25:24 +02:00
Fabian Neumann
adbfe8b5dc
fix windows for build_ship_raster
2022-08-02 16:44:24 +02:00
Fabian Neumann
09d126706e
Merge branch 'master' into shipping_raster
2022-08-02 15:01:05 +02:00
lisazeyen
34a3d9aaad
remove depreciated distutils.version
2022-08-02 09:27:37 +02:00
lisazeyen
7c3b4b6664
split grouping years for power and heat techs
2022-08-02 09:18:06 +02:00
lisazeyen
339ccc6026
remove snakemake dependencies
2022-08-02 09:16:25 +02:00
lisazeyen
a11f7bc245
remove not needed pop_layout from plot_summary
2022-08-02 08:47:46 +02:00
Fabian Neumann
2857691367
Merge pull request #246 from PyPSA/meta
...
store config and wildcards in n.meta
2022-08-01 21:01:06 +02:00
lisazeyen
cbab86c4bc
add heat buses clustering to myopic
2022-08-01 18:15:35 +02:00
lisazeyen
973074de21
add function to cluster heat buses
2022-08-01 18:03:11 +02:00
lisazeyen
f683a93f08
adjust plot_summary to work with myopic, remove update config
2022-08-01 16:04:14 +02:00
millingermarkus
65aaa3d188
Added tech color for biomass boiler and minor adaptations to biomass boiler process
2022-08-01 15:28:53 +02:00
lisazeyen
18f4eac351
adjust script to new grouping years
2022-08-01 15:24:07 +02:00
lisazeyen
f10628930e
move snakemake dependencies out for co2limit cb option to work
2022-08-01 15:21:11 +02:00
millingermarkus
6211823514
Added color for BioSNG and minor adaptations
2022-08-01 15:13:59 +02:00
millingermarkus
46310f0a30
Minor correction to prepare_sector_network
2022-08-01 15:00:27 +02:00
Markus Millinger
5b61d2f777
Added pellet boiler process
2022-08-01 13:38:01 +02:00
Markus Millinger
0019723262
Updated spatial nodes for biomass to liquid
2022-08-01 13:26:51 +02:00
Markus Millinger
abba2a4f3e
Added BioSNG process with and w/o CC
2022-08-01 13:22:58 +02:00
Markus Millinger
4bff921cf2
Adapted biomass_to_liquid toggle reference
2022-08-01 13:13:18 +02:00
Markus Millinger
46413dd88c
Added biomass to liquid process with an w/o CC
2022-08-01 13:07:59 +02:00
Philipp Glaum
ba7a5363e7
update Fabians review comments
2022-07-29 14:56:39 +02:00
Philipp Glaum
8af09d9bec
fix raster format error due to import
2022-07-28 15:21:21 +02:00
Philipp Glaum
6d070a19e0
initial ship raster implementation
2022-07-28 10:38:24 +02:00
Fabian Neumann
bfcc08665d
make resolution of exclusion calculation a configurable option
2022-07-27 13:40:41 +02:00
Fabian Neumann
d2b8e3c3d2
Merge pull request #389 from PyPSA/meta
...
store config and wildcards in n.meta
2022-07-27 10:01:51 +02:00
Fabian Neumann
a1507124f6
Merge branch 'release-v0.5' into meta
2022-07-27 09:43:36 +02:00
Fabian Neumann
060bc49223
helpers: make copy of snakemake.config to avoid non-serializable JSON
2022-07-27 09:26:21 +02:00
Fabian Neumann
8d132464bd
Merge branch 'release-v0.5' into introduce_modularity_clustering
2022-07-27 09:04:39 +02:00
Fabian Neumann
cdd063d3b0
scripts: remove deprecated clustering methods, remove unused imports
2022-07-27 09:02:34 +02:00
lisazeyen
530e453eba
Merge pull request #251 from PyPSA/cf-sector-opts
...
option to specify any config through sector opts with CF+<label>+<value>
2022-07-26 15:53:49 +02:00
Fabian Neumann
87388d4b4a
update author affiliations
2022-07-26 15:32:48 +02:00
Fabian Neumann
8fc0c57ed6
update copyright years
2022-07-26 15:05:59 +02:00
Fabian Neumann
239dcfdd1e
Merge branch 'master' into introduce_modularity_clustering
2022-07-26 14:04:56 +02:00
Fabian Neumann
31bc87adba
Merge branch 'master' into meta
2022-07-26 14:02:26 +02:00
Fabian Neumann
2791e7bdc2
use packaging.version instead of deprecated distutils.StrictVersion
2022-07-25 14:27:31 +02:00
Fabian Neumann
503ecd2907
use + separator instead of :
2022-07-24 21:27:12 +02:00
Fabian Neumann
a65dd4e6c2
use snakemake.utils.update_config instead of mergedeep
2022-07-24 21:26:19 +02:00
Fabian Hofmann
b5308fa72b
Merge branch 'master' into technology-data
2022-07-21 17:03:36 +02:00
Fabian Hofmann
3ba7e2ab90
Merge branch 'master' into technology-data
2022-07-21 15:36:12 +02:00
Fabian Neumann
4ec95fa90e
hydro: distribute eia data for former countries to successor states by ratio
2022-07-20 13:01:14 +02:00
Fabian Neumann
cb00ba58ce
add option to specify any config through sector opts with CF:<label>:...:value
2022-07-20 11:35:12 +02:00
Martha Frysztacki
b63385444c
Merge branch 'master' into introduce_modularity_clustering
2022-07-19 09:51:06 +02:00
Fabian Neumann
a860643dd8
reduce number of columns for simplified and clustered regions
2022-07-18 17:28:09 +02:00
martacki
387271b03b
new spatial clustering method: modularity
2022-07-13 14:51:48 +02:00
Fabian Neumann
adc0dd1e0c
fix unit conversion for thermal energy storage ( closes #247 )
2022-07-11 15:46:21 +02:00
Julio Pascual
5d98cc7e97
Update build_load_data.py
2022-07-04 18:53:41 +02:00
Julio Pascual
433f0af409
Update build_load_data.py
2022-07-04 18:51:49 +02:00
Julio Pascual
ce3b193a88
Update add_electricity.py
2022-07-04 18:42:22 +02:00
Julio Pascual
0d9ffdcee3
Update build_load_data.py
2022-07-04 18:41:08 +02:00
Julio Pascual
44f793be91
Changed doc info in retrieve_databundle.py
...
Simply changed the text regarding the output directory. It said 'cutouts/bundle' but I think it should be 'data/bundle'. It only affects the documentation.
2022-07-04 11:49:55 +02:00
Fabian Neumann
3986856282
merge master
2022-07-01 10:13:33 +02:00
Fabian Neumann
5082c8761b
Merge pull request #245 from PyPSA/bus_units
...
Document units of bus carriers
2022-06-30 17:43:14 +02:00
Irieo
5d60e8c6e6
Label oil and biomass buses also as MWh_LHV
2022-06-30 17:37:40 +02:00
Iegor Riepin
53ad90095a
Update scripts/prepare_sector_network.py
...
sync it up to Fabian's feeling of useful things
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2022-06-30 17:17:12 +02:00
Iegor Riepin
eddeb227a7
Update scripts/prepare_sector_network.py
...
code style update
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2022-06-30 17:15:41 +02:00
Fabian Neumann
27e5dec4e6
documentation fixes
2022-06-30 09:01:49 +02:00
Fabian Neumann
3134bbb5c5
remove accidental file additions
2022-06-30 08:43:46 +02:00
Fabian Neumann
b96207c73e
store config and wildcards in n.meta
2022-06-30 08:42:18 +02:00
Fabian Neumann
217780263d
store config and wildcards in n.meta
2022-06-30 08:39:03 +02:00
lisazeyen
b4d0a8404c
change unit from carrier gas from MWh_th -> MWh_LHV
2022-06-29 08:57:08 +02:00
Irieo
7604bb1654
Document units of bus carriers
2022-06-28 18:31:45 +02:00
Fabian Neumann
a8171ec9f3
color adaptations, new features
2022-06-28 18:03:29 +02:00
Fabian Neumann
20e1fb40fb
update mock_snakemake for new snakemake versions
2022-06-28 17:18:09 +02:00
Fabian
67ac464b6a
add_electricity: use conventional_inputs from snakemake.input for attach_conventional_generators
2022-06-28 16:33:46 +02:00
Fabian Neumann
8b134405dd
Merge pull request #243 from ebbekyhl/Coal-carbon-capture
...
Add coal with carbon capture
2022-06-28 14:04:31 +02:00
Ebbe Kyhl
e9f2d65cda
Indent by two layers
2022-06-28 13:35:44 +02:00
Fabian Hofmann
e175d1aa0e
Merge branch 'eu-energy-security' into eu-energy-security-conventional-attrs
2022-06-28 13:22:39 +02:00
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
Ebbe Kyhl
5ae56cca7c
Apply suggestions from code review
...
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2022-06-27 18:06:59 +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 Neumann
2d2f5ba409
Merge pull request #238 from PyPSA/config-export
...
copy_config: copy actual snakemake.config
2022-06-23 17:19:08 +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
Fabian Neumann
2037534557
prepare: only add ammonia to spatial if config selected
2022-06-23 15:24:44 +02:00
Fabian Neumann
9f91af28e7
fix syntax errors
2022-06-23 15:17:41 +02:00
Fabian Neumann
37c052667a
handle absent ammonia config flag
2022-06-22 15:50:32 +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
Ebbe Kyhl
2a3b576cbd
Add coal with carbon capture
2022-06-14 15:00:53 +02:00
Fabian Neumann
4ecfccea6c
handle ammonia demand both regionalised and copperplated
2022-06-10 17:07:48 +02:00
Fabian Neumann
27ac40d2ea
use spatial namespace to manage ammonia resolution
2022-06-10 16:56:00 +02:00
Fabian Neumann
a2a4cf7c02
use config to manage conversion efficiencies
2022-06-10 16:43:29 +02:00
Fabian Neumann
2d562c1349
add coloring for ammonia
2022-06-10 14:57:03 +02:00
Fabian Neumann
6cfee1f98a
add ammonia as carrier: with Haber-Bosch, crackers, store, load
2022-06-10 14:46:39 +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
Fabian Neumann
b025622edf
fix agriculture machinery oil load with spatial.oil.nodes
2022-06-03 14:29:23 +02:00
Max Parzen
b6032fb891
fix crs bug
2022-05-28 14:48:32 +01:00
lisazeyen
dc997c6ff2
Update build_population_weighted_energy_totals.py
...
adjust mocksnakemake
2022-05-02 18:19:59 +02:00
Fabian Neumann
361100bfab
Merge branch 'master' into transport
2022-05-02 10:28:43 +02: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
548e955449
add_electriticity: add capital costs for conventionals
2022-04-28 12:30:53 +02:00
Fabian
b1edbd7563
add_electricity: determine p_nom_extendable when adding conventionals
2022-04-27 20:13:36 +02:00
Philipp Glaum
da5a5141f8
solve_network.py: fix filter bug
2022-04-21 09:54:52 +02:00
Fabian
175a030a9f
refactor add_minRenew_constraints
2022-04-20 16:18:15 +02:00
Fabian
70cfe4bbe5
cluster_network: replace np.sum/np.min by pandas.Series.sum/min
2022-04-20 15:47:50 +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
cdd56288ff
fix EU bus location with new config setting
2022-04-12 16:21:09 +02:00
Fabian Neumann
c5ca8f4c20
fix: squeeze IDEES dataframe at correct location
2022-04-12 16:11:06 +02:00
Fabian Neumann
c54b4f9920
copy_config: copy actual snakemake.config
2022-04-12 15:16:05 +02:00
Fabian Neumann
d4fd472762
Merge branch 'master' into transport
2022-04-12 14:48:57 +02:00
Fabian Neumann
d4a82a2a41
Merge pull request #217 from PyPSA/myopic-fix
...
Myopic fix
2022-04-12 14:47:22 +02:00
Fabian Neumann
1625d9db75
address recent deprecations ( #235 )
...
* address recent deprecations
* address recent deprecations in pd.read_csv
2022-04-12 14:37:05 +02:00
lisazeyen
408b494612
bug fix with augmentation object
2022-04-12 10:45:11 +02:00
lisazeyen
9322f90318
add minimum capacity for AC and DC lines depending on previous year
2022-04-12 10:04:27 +02:00
lisazeyen
cfdec7e56d
simplify pipe retrofitting constraint
2022-04-12 10:04:27 +02:00
Fabian
a9b4ca8370
build_powerplants: use index numbering only for biomass gens
2022-04-11 21:28:54 +02:00
Fabian
dad065f22f
hard pull build_powerplants from eu-security branch
2022-04-11 21:24:49 +02:00
Fabian
61ccaa495a
add_electricity: enable scaling existing capacities, enable scaling to config entries
2022-04-11 21:11:24 +02:00
Fabian Neumann
a4dab4306b
merge master
2022-04-11 17:10:17 +02:00
Fabian Neumann
6ed92475c9
Add basic CI for overnight and myopic ( #234 )
...
* Snakefile: add missing folders that are retrieved
* Snakefile: fix syntax error
* Add basic CI
* fix datafiles list to work with directories
* prepare: only add new gas pipes if augmentation not empty
* prepare: handle case where salt caverns dataframe is empty
* prepare: handle case where underwater faction not in link columns
* build_biomass: handle case where Balkan not in country list
* refer correct environment path
* fix Snakemake call
* make subworkflow dependency explicit again
* hashing pypsa-eur environment file does not seem to work
* change solver to glpk
* add data cache
* glpk without options
* try cbc
* alternative snakemake test workflow
* test: add exogenous pathways to config
2022-04-11 17:08:25 +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
e6fec5b3c8
scripts: fix bug and add estimate renewable from IRENA
2022-04-08 09:53:11 +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
95d5d8f889
prepare: move build_heat_demand closer to add_heat
2022-04-03 18:55:53 +02:00
Fabian Neumann
b112da0565
prepare: separate code for transport demand and nodal energy totals
2022-04-03 18:49:35 +02:00
