pre-commit-ci[bot]
13769f90af
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-03-06 08:27:46 +00:00
Fabian Neumann
2f39280f14
spelling corrections
2023-03-06 09:23:30 +01:00
Fabian Neumann
b2295278f3
Merge branch 'master' into ci-config
2023-03-05 16:01:57 +01:00
pre-commit-ci[bot]
36003c9627
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-03-05 14:12:39 +00:00
Fabian Neumann
8837ba6a5f
allow false for max_depth
2023-03-05 15:12:20 +01:00
Fabian Neumann
6d98edb320
Merge pull request #314 from PyPSA/loggin-replace-print
...
Replacing print statement with logging
2023-03-05 15:07:10 +01:00
virio-andreyana
0985aa17b3
fix SettingwithCopyWarning in plot_network.py
...
Fix SettingwithCopyWarning in plot_network.py by using pandas clip and replace.
2023-03-01 12:35:51 +01:00
virio-andreyana
f75cec93d6
lower log level in plot_summary.py and fix warning
...
reduce the level of "Dropping technology energy balance smaller than {snakemake.config['plotting']['energy_threshold']/10} {units}" and "Total energy balance for {v} of {round(df.sum()[0],2)} {units}" from INFO-> DEBUG.
Extra warning fix
Add `plt.cla()` in the `for k, v in balances.items()` and take out fig, ax = plt.subplots(figsize=(12,8)) from that for loop to fix RuntimeWarning: More than 20 figures have been opened. Figures created through the pyplot interface (`matplotlib.pyplot.figure`) are retained until explicitly closed and may consume too much memory. (To control this warning, see the rcParam `figure.max_open_warning`).
2023-03-01 12:29:36 +01:00
virio-andreyana
379ed0da93
Sentence capitalized
2023-02-24 14:42:51 +01:00
virio-andreyana
d237e60b25
Replacing print statement with logging
2023-02-23 10:30:32 +01:00
Fabian Neumann
e74e5d9864
Merge pull request #312 from PyPSA/myopic-p_nom_max
...
myopic: adjust p_nom_max if existing larger
2023-02-22 19:14:20 +01:00
Fabian Neumann
8512129f2c
Merge branch 'master' into cluster-m
2023-02-22 18:57:21 +01:00
Fabian Neumann
846049770e
cluster option 'm' only aggregates conventional carriers not excluded
2023-02-22 18:55:05 +01:00
lisazeyen
332936bcec
adjust p_nom_max if existing larger
2023-02-22 17:44:05 +01:00
Fabian
3642d5c834
build_renewable_profiles: remove progressbar import
2023-02-22 15:07:57 +01:00
pre-commit-ci[bot]
b134a395b4
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-02-22 13:40:37 +00:00
Fabian
44bb81af46
helpers: undo position fixing in tqdm
2023-02-22 14:40:02 +01:00
pre-commit-ci[bot]
64745e7ec2
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-02-22 13:21:28 +00:00
Fabian
825d3e84d2
replace progressbar by tqdm
2023-02-22 14:20:18 +01:00
Fabian
dad7d2050e
build_population_layouts: replace vresutils area calculation
2023-02-22 13:26:17 +01:00
virio-andreyana
e80cab63ca
Update build_biomass_potentials.py
...
Maybe something in the middle? swiss is a list, while pop was a panda series.
2023-02-22 13:00:06 +01:00
virio-andreyana
74d31c4554
fixing some warnings in build_biomass_potentials.py, build_gas_input_locations.py, scripts/build_population_layouts.py
2023-02-22 12:17:30 +01:00
Fabian Hofmann
8215510f09
Merge pull request #282 from PyPSA/ci-review
...
Transition to `linopy` implementation
2023-02-22 09:18:29 +01:00
Fabian
19c35f8a6a
use muting of excel read with context manager
2023-02-21 23:20:02 +01:00
Fabian
7e87044424
solve_network: warn if network is not optimal
2023-02-21 21:58:42 +01:00
Fabian
8bf6238785
Merge branch 'master' into ci-review
2023-02-21 17:57:27 +01:00
virio-andreyana
f276b130bd
Hide uninformative text caused by subprocess outputs
2023-02-18 13:47:34 +01:00
Fabian Neumann
b14d657042
minor fixes and address deprecation warnings
2023-02-16 20:13:26 +01:00
Fabian Neumann
35b8425b3b
cherry-pick from #282
...
Co-authored-by: Fabian Hofmann <hofmann@fias.uni-frankfurt.de>
2023-02-16 18:42:19 +01:00
Fabian Neumann
82939ca546
resolve merge conflicts
2023-02-16 18:34:24 +01:00
Fabian Neumann
ece64a73c1
gas_input: use HTTP remote, rename conversion factors, fix undesired rule removal
2023-02-16 18:27:57 +01:00
Fabian Neumann
963e7cdbcf
Merge branch 'master' into update-lng-ports
2023-02-16 17:56:05 +01:00
Fabian Neumann
ccde2e7f93
make sequestration options configurable
2023-02-16 17:21:58 +01:00
Fabian Neumann
03ac301238
build_shapes: crs
2023-02-16 14:04:13 +01:00
Fabian Neumann
b6732bf6c4
documentation updates
2023-02-16 12:37:30 +01:00
virio-andreyana
3dede28aae
merging script in retrieve_gas_input_location with build_gas_input_location
2023-02-16 11:57:33 +01:00
Fabian Neumann
9c1182fe96
prepare release 0.7
2023-02-16 11:50:55 +01:00
Fabian Neumann
6b8e69cf81
Merge branch 'master' into carbon-management
2023-02-15 20:21:12 +01:00
Fabian Neumann
809b07be86
Merge pull request #303 from PyPSA/electrolysis-wasteheat
...
add option to use electrolysis waste heat in district heating
2023-02-15 19:06:12 +01:00
Fabian Neumann
b1b289fc45
add option to use electrolysis waste heat in district heating
2023-02-15 14:01:00 +01:00
Fabian Neumann
5d08dfc2ec
add min part load for FT and methanolisation via p_min_pu
2023-02-15 13:47:57 +01:00
Fabian
7d5d48ac26
solve network: fix sequestration constraint
2023-02-10 18:58:30 +01:00
Fabian Neumann
01db4f4408
compatibility with technology-data v0.5
2023-02-10 07:49:45 +01:00
Fabian
38a58b62f7
prepare sector: fix logger percentage info
2023-02-09 17:53:27 +01:00
Fabian
a0c1d321cc
plot_network: fix empty h2 retrofit for myopic
2023-02-08 23:58:56 +01:00
Fabian
d36629a836
add_brownfield: remove basename import
2023-02-08 23:58:24 +01:00
Fabian
46e3b16959
prepare sector: harmonize logger infos
2023-02-08 23:20:52 +01:00
Fabian
98e3c7ab2c
solve_network: fix kwargs in solve_network
2023-02-08 22:59:36 +01:00
Fabian
3f98ccb9e2
update technology data version
2023-02-08 22:59:25 +01:00
Fabian
94fb6c646c
prepare sector: add allam cycle
...
build sequestration: fix input for new snakemake versions
2023-02-08 22:57:01 +01:00
Fabian
f4d0415cf0
solve_network: activate co2 seq constraint
...
Snakefile: retrieve data bundle from pypsaeur function
2023-02-08 18:19:31 +01:00
Fabian Hofmann
d144547d87
Merge branch 'ci-review' into linopy-integration
2023-02-08 15:37:00 +01:00
Fabian
faa95c500c
config: modularize solver_options
2023-02-08 15:24:17 +01:00
Fabian
69dabc367f
ci: fix test configs
2023-02-08 15:24:17 +01:00
Fabian
6c57b81a4a
config: move solver options in dedicated section
...
test configs: reduce to relative changes
CI: use snakemake --configfile options
2023-02-08 15:24:17 +01:00
Fabian
c25091ce34
solve_network.py: switch to linopy interface
2023-02-08 15:19:32 +01:00
Fabian
c8f601edf8
solve.py: start converting extra_funcionalities
2023-02-08 15:19:32 +01:00
virio-andreyana
d33547efba
importing rioxarray instead of xarray to open rasterio file
2023-02-08 11:45:18 +01:00
pre-commit-ci[bot]
9f87099dbb
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-02-07 13:12:55 +00:00
Fabian
efedfa945b
build_shapes: replace unary union from shapely by geopandas equivalent
2023-02-07 14:08:59 +01:00
pre-commit-ci[bot]
cb94e5974e
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-02-07 12:20:09 +00:00
Fabian Hofmann
0375359c82
Merge branch 'master' into fix-storage-volumes
2023-02-07 13:19:27 +01:00
pre-commit-ci[bot]
e6ecbc95d7
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-02-06 22:28:32 +00:00
Fabian Neumann
ad8ccf3b25
fix process emission localisation with co2 (not) spatially resolved
2023-02-06 09:52:35 +01:00
Fabian Neumann
a0b18a8fcd
manage process emissions in spatial
2023-02-06 09:46:24 +01:00
thomgeo
1f9d64c5d5
fixed bug that set max_hours for many plants to 6
2023-02-02 14:59:50 +01:00
Fabian Neumann
4a2da0a5f4
Update scripts/add_existing_baseyear.py
2023-01-30 11:55:40 +01:00
Fabian Neumann
984ab9350c
Update scripts/prepare_sector_network.py
2023-01-30 11:54:19 +01:00
Fabian Neumann
6996748d9b
Merge branch 'master' into cluster_heat_nodes
2023-01-30 11:53:00 +01:00
Fabian Neumann
27e6039379
Merge branch 'master' into pz-max-patch-2
2023-01-28 08:26:28 +01:00
Fabian Neumann
0681cf93ab
fix hydrogen network plotting without retrofitting
2023-01-25 09:08:51 +01:00
Fabian Neumann
697be2d9e3
fix capacities of biomass transport
...
The biomass transport links are split into either direction
because they have a marginal cost associated with the
transport. With p_nom_extendable, many decision variables
are created. This commit tries another way where
capacities are non-extendable and set to sufficiently high
values.
2023-01-25 08:41:08 +01:00
Fabian Neumann
71e2a4943c
carbon management
2023-01-24 18:44:39 +01:00
pre-commit-ci[bot]
8bdba5653a
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-01-23 21:27:20 +00:00
virio-andreyana
da6469b80c
Update scripts/build_gas_input_locations.py
...
Co-authored-by: Fabian Hofmann <hofmann@fias.uni-frankfurt.de>
2023-01-11 10:08:10 +01:00
pre-commit-ci[bot]
0cf6d47afb
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-01-10 21:56:42 +00:00
Max Parzen
9633ab9836
Merge branch 'master' into pz-max-patch-2
2023-01-10 21:56:24 +00:00
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
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
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
