Fabian
27eea273bd
harmonize params names
2023-06-15 19:12:30 +02:00
Fabian
1d10073514
review params implementation; reproduce objective values in CI
2023-06-15 18:52:25 +02:00
Fabian Hofmann
862e54770f
Merge branch 'master' into post-merge-param
2023-06-14 10:11:26 +02:00
virio-andreyana
e581ca930c
made params more specific
2023-05-27 15:50:37 +02:00
Koen van Greevenbroek
312dd81f21
Fix bug with underground H2 storage creation
...
For some small model regions, none of the H2 cavern types specified in
the configuration might actually be available, in which case the line
`h2_caverns = h2_caverns[cavern_types].sum(axis=1)` throws an error.
2023-05-24 11:13:37 +02:00
virio-andreyana
28d39680c6
Merge branch 'master' into post-merge-param
2023-05-19 16:19:58 +02:00
virio-andreyana
8af1fe5649
replace the word "config" to "params" in functions
2023-05-17 19:25:45 +02:00
virio-andreyana
8208ac033b
convert param back to config for "logging" and "run", made "enable" more specific
2023-05-17 18:43:30 +02:00
pre-commit-ci[bot]
e431a9675c
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-05-15 13:02:41 +00:00
Fabian Hofmann
824e6bb18c
Merge branch 'master' into complete-carrier-set
2023-05-15 15:01:57 +02:00
virio-andreyana
1fc48d8753
using python algorithm to edit rules and script
2023-05-15 10:33:17 +02:00
Fabian Neumann
99963edaaf
add option to limit maximum extension per line/link; linemaxext
2023-05-12 09:29:38 +02:00
pre-commit-ci[bot]
b21965a986
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-05-10 08:09:47 +00:00
virio-andreyana
e91068196b
replace vresutils annuity function with add_electricity.py calculate_annuity
2023-05-10 10:02:41 +02:00
Fabian Hofmann
de16f19bce
Merge branch 'master' into complete-carrier-set
2023-05-03 17:42:29 +02:00
Fabian
4e8bbd67b4
use sanitize_carriers to harmonize carrier adjustments
2023-05-03 13:24:57 +02:00
pre-commit-ci[bot]
bdeab82b49
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-04-30 08:44:07 +00:00
Fabian Neumann
51e09f5e61
Address review comments
2023-04-30 10:43:49 +02:00
virio-andreyana
72b75fd9fe
merge add_nice_carrier_names with add_missing_carrier to become add_missing_carrier_with_nice_names(n, config)
2023-04-28 03:43:20 +02:00
pre-commit-ci[bot]
74e9d56adb
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-04-25 15:26:28 +00:00
virio-andreyana
756a814c63
Update prepare_sector_network.py
2023-04-25 17:17:32 +02:00
pre-commit-ci[bot]
0a3c177f4b
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-04-22 07:44:59 +00:00
Fabian Neumann
f2e53b59bf
add plain hydrogen turbine option for re-electrification
2023-04-22 09:44:13 +02:00
Fabian
5c8e0080c8
pre-commit: update docformatter version
2023-04-21 10:11:44 +02:00
pre-commit-ci[bot]
460bbd080f
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-04-10 22:02:35 +00:00
pre-commit-ci[bot]
5f554ab28f
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-04-06 13:57:30 +00:00
lisazeyen
b50954aee4
remove snakemake from function
2023-04-05 15:43:02 +02:00
lisazeyen
00544ee6f9
add lifetimes for perfect
2023-04-03 16:39:59 +02:00
Fabian
99a9ea8beb
adress review comments
2023-03-10 15:58:53 +01:00
Fabian
f8d178c714
prepare_sector: revert taking mean
...
config.overnight: revert hourly resolution
2023-03-10 14:26:31 +01:00
Fabian
4f0ddf2e95
fix Nyears scaling
2023-03-10 14:12:22 +01:00
Fabian Neumann
abe4df543e
add minimal description of all scripts
2023-03-09 12:45:43 +01:00
Fabian Neumann
8f5775d9cc
Merge branch 'merge-pypsa-eur-sec' into sec-subset-countries
2023-03-09 11:28:07 +01:00
Fabian Neumann
22846d7b1b
sector-coupled: run on subset of selected countries
2023-03-09 11:04:41 +01:00
pre-commit-ci[bot]
f128cc3e3c
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-03-09 07:36:43 +00:00
Fabian Neumann
483f3e1b82
eliminate manual country code conversion, adjust mock_snakemake to ll wildcard
2023-03-09 08:36:18 +01:00
pre-commit-ci[bot]
d45bee628e
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-03-07 17:25:45 +00:00
Fabian
5cf2b8174a
scripts: apply linting fixes
2023-03-07 17:21:00 +01:00
pre-commit-ci[bot]
27c0d3a2d2
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-03-06 18:18:20 +00:00
Fabian Neumann
541b83b049
merge helper.py into _helpers.py
2023-03-06 19:16:37 +01:00
Fabian Neumann
3bdf3b6f5e
use mock_snakemake from pypsa-eur
2023-03-06 19:09:45 +01:00
Fabian Neumann
93d9e13f52
add spdx identifiers to scripts
2023-03-06 18:49:23 +01:00
pre-commit-ci[bot]
9026e0920d
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-03-06 15:54:38 +00:00
Fabian
bffb7cc17c
scripts/ remove summary_dir and results_dir references
2023-03-06 16:53:20 +01:00
Fabian Neumann
d27fee7e77
align cost fill values to pypsa-eur implementation
2023-03-06 14:47:46 +01:00
Fabian Neumann
b30ff67458
remove unneeded currency conversion USD to EUR
2023-03-06 14:38:04 +01:00
Fabian Neumann
0673430eec
use line length factor from single config source
2023-03-06 14:33:56 +01:00
Fabian Neumann
ee5a0c4e73
conform to pypsa-eur logging level definition
2023-03-06 14:27:15 +01:00
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
virio-andreyana
379ed0da93
Sentence capitalized
2023-02-24 14:42:51 +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
ccde2e7f93
make sequestration options configurable
2023-02-16 17:21:58 +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 Neumann
01db4f4408
compatibility with technology-data v0.5
2023-02-10 07:49:45 +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 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
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
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
Fabian Neumann
64969c2dee
add methanol store
2023-01-05 13:42:01 +01:00
Fabian Neumann
383aef7e1c
rename shipping_average_efficiency to shipping_oil_efficiency
2023-01-03 08:38:10 +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
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
3999afdb5a
fixes to methanol implementation
2022-12-28 12:19:20 +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
Fabian Neumann
0c62bfc9ee
complete methanol for shipping
2022-12-03 12:22:05 +01:00
Fabian Neumann
c44f1d61c7
remove hard-coded methanol efficiency
2022-11-27 18:28:57 +01:00
Fabian
df4eb85a19
fix typos
2022-11-18 09:08:07 +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 Neumann
1611d63a8a
Merge branch 'master' into nh3
2022-10-01 16:01:39 +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
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
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
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
lisazeyen
34a3d9aaad
remove depreciated distutils.version
2022-08-02 09:27:37 +02:00
lisazeyen
339ccc6026
remove snakemake dependencies
2022-08-02 09:16:25 +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
