Commit Graph

450 Commits

Author SHA1 Message Date
Fabian Neumann
e9174d4f14
Merge branch 'master' into industry-pathway 2024-02-16 15:15:27 +01:00
Fabian Neumann
60406f1bc4
Merge pull request #933 from PyPSA/h2-pipe-losses
update h2 pipe losses
2024-02-16 13:32:30 +01:00
Fabian Neumann
9e8ed7394d
Update config/config.default.yaml 2024-02-16 13:32:24 +01:00
Fabian Neumann
4d4badc519 Merge branch 'master' into industry-pathway 2024-02-16 13:01:40 +01:00
Fabian Neumann
6a8ae68aec Merge branch 'industry-coal-bug' 2024-02-16 12:47:34 +01:00
Fabian Neumann
16e42c8fe6 further progress and bugfixes 2024-02-16 11:17:00 +01:00
martacki
6196fd6892 change default energy totals year to 2013 to comply with default weather year 2024-02-15 16:29:29 +01:00
lisazeyen
8464415b35
update for 70 bars instead of 140 2024-02-15 15:14:32 +01:00
lisazeyen
87ab0a5575
update h2 pipe losses 2024-02-15 14:58:53 +01:00
Tom Brown
e14bae345b new script to interpolate industry sector ratios today to tomorrow
For each country we gradually switch industry processes from today's
specific energy carrier usage per ton material output to the
best-in-class energy consumption of tomorrow in the
industry_sector_ratios.csv.

This is done on a per-country basis. The ratio of today to tomorrow's
energy consumption is set with the
config["industry"]["sector_ratios_fraction_future"] parameter.
2024-02-14 18:29:56 +01:00
Tom Brown
7f3ad792a9 use production to determine today's energy demand for basic chemicals
This uniformises how demand for basic chemicals is calculated.

We also avoid unnecessary use of ammonia production separately.
2024-02-14 18:29:50 +01:00
Tom Brown
cc57952402 industrial prod: use EU28 total for denominator for distribution key
This makes sure the distribution key is correct when only subsets of
countries are used. This is then consistent with the HVC, MeOH and Cl
totals being EU28 totals.

Without this change, industry production is overestimated when using
subsets of countries.

Or the user has to adjust the totals for industrial production
themselves.
2024-02-14 18:29:43 +01:00
Tom Brown
cbf7ed0d38 for today's industry energy demand, separate MeOH, Cl and HVC
I.e. split basic chemicals (without ammonia) into MeOH, Cl and HVC.

This now agrees with scheme for industrial sectors tomorrow.
2024-02-14 18:29:36 +01:00
Fabian Neumann
dbbfbaf1f3 Merge branch 'master' into scenario-management 2024-02-14 10:45:43 +01:00
Fabian Neumann
f024412301 simplify test cases 2024-02-12 16:49:15 +01:00
Fabian Neumann
b725a754cc Merge branch 'default-config' of github.com:PyPSA/pypsa-eur into default-config 2024-02-12 13:57:04 +01:00
Fabian Neumann
69e20e3448 need at least one entry for config/config.yaml to read as yaml 2024-02-12 13:55:32 +01:00
pre-commit-ci[bot]
abe06a68fb [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-02-12 11:11:04 +00:00
Fabian Neumann
fe143ff8fe use default config as base configuration 2024-02-12 12:10:05 +01:00
Fabian Neumann
bb7b65eebd move create_scenarios.py to config directory 2024-02-12 11:52:07 +01:00
Tom Brown
8781e69066 bugfix: coal emissions for industry weren't tracked
Also allow industrial coal demand to be regional (so we can include
them in regional CO2 constraints).
2024-02-10 19:17:06 +01:00
Fabian Neumann
6de08bd523 Merge branch 'master' into scenario-management 2024-02-10 17:22:01 +01:00
Fabian Neumann
e0dafc50b3 add missing heat pump colors 2024-02-09 10:15:11 +01:00
Tom Brown
92d00a0c83 add new default to overdimension heating in individual buildings
This allows them to cover heat demand peaks e.g. 10% higher than
those in the data.

The disadvantage of manipulating the costs is that the capacity is
then not quite right. This way at least the costs are right.

Doing it properly would require introducing artificial peaks, but this
creates new problems (e.g. what is going on with wind/solar/other
demand).
2024-02-07 17:18:04 +01:00
Tom Brown
6d94439bbb for existing heating use new default_heating_lifetime
This is because old costs default (25) is longer than all heating
technologies (20). Script was distributing across 25 years, then
throwing out boilers older than 20 years, an inconsistent
behaviour.

Now existing boilers are smoothly distributed across 20 years.
2024-02-07 17:15:37 +01:00
Fabian Neumann
5902be199f powerplants_filter: phase-out status 2023 (incl. nuclear in DE) 2024-02-07 11:20:05 +01:00
Fabian Neumann
823765b353 update technology-data to 0.7.0 by default 2024-02-07 09:52:30 +01:00
Fabian
76872fa0f1 add sanitize_locations function and apply it
address some deprecation warnings
2024-02-05 16:16:34 +01:00
Fabian Neumann
3db6a65c04
Merge branch 'master' into encapsulate-resource-dir 2024-02-05 08:21:49 +01:00
Fabian Neumann
6d40ff1340 config: add sensible defaults for HVC recycling and reuse 2024-02-02 11:52:01 +01:00
Fabian
d32789bd02 snakefile: allow to share resources in directory
ci: use test.sh script which can be executed locally
2024-01-31 16:53:14 +01:00
Koen van Greevenbroek
03c914bef1 Make projection selection flexible by reading directly from config 2024-01-25 14:34:03 +01:00
Koen van Greevenbroek
9aa154bd04 Add several map projection options 2024-01-25 10:44:24 +01:00
Fabian Neumann
b8a303bf1f
Merge pull request #892 from koen-vg/io-api-option
Add support for the linopy `io_api` option
2024-01-24 16:57:45 +01:00
Fabian Neumann
2ce7d78dbb revert accidental addition of personal config file 2024-01-24 16:23:44 +01:00
Koen van Greevenbroek
3e32dbccb5 Add support for the linopy io_api option 2024-01-24 11:23:56 +01:00
Fabian Neumann
2bee36be87 follow-up to #891: remove remaining solar+p3 references 2024-01-24 10:17:26 +01:00
Koen van Greevenbroek
b1ce26d270 Don't include triple solar potential option by default 2024-01-24 09:37:01 +01:00
Fabian Neumann
77f49d4404 update technology-data to 0.6.2 by default 2024-01-19 19:00:33 +01:00
Fabian Neumann
01c1b9161b COPT solver provide sensible default settings 2024-01-19 16:59:39 +01:00
Fabian Neumann
b0e23652cd
Merge branch 'master' into reformulate-co2-constraint 2024-01-18 19:34:27 +01:00
Fabian Neumann
682d3d857b cluster heat buses by default 2024-01-18 17:25:05 +01:00
lisazeyen
1613299a03 add more years to config.perfect.yaml 2024-01-12 20:57:19 +01:00
Fabian Neumann
a6edce58fb remove wave energy generator 2024-01-11 09:47:09 +01:00
Philipp Glaum
1903c51f36 Merge remote-tracking branch 'upstream/master' into implement-floating 2024-01-09 14:44:21 +01:00
euronion
01f201743d Implement everywhere_powerplants 2024-01-08 09:30:21 +01:00
Fabian Neumann
647a988c75 config: set default max_extension to finite value for loss approximation 2024-01-07 09:48:43 +01:00
Fabian Neumann
b98f1ef9dc documentation fixes 2024-01-05 17:33:32 +01:00
Fabian Neumann
66c9513fbd prepare release notes and amend documentation 2024-01-05 17:20:52 +01:00
Fabian Neumann
db54006ac8 add exogenous transitions in 5-year steps 2024-01-05 14:46:02 +01:00
Fabian Neumann
6dd9d6a9c1 Merge branch 'fneum/services_heat' 2024-01-05 14:39:29 +01:00
Fabian Neumann
558763e40c add release notes 2024-01-05 14:32:37 +01:00
Fabian Neumann
f68e8d3d61
Merge branch 'master' into wildcard-opts-config 2024-01-05 12:02:11 +01:00
Fabian
254d50b1b4 prepare sectors: allow for updating co2 network costs 2024-01-04 19:49:59 +01:00
Fabian Neumann
a0f43aeeb7 config: increase default solar deployment density to 5.1 MW/km2 2024-01-04 19:22:26 +01:00
Fabian Neumann
0418af6071 config: keep nuclear if created in prepare_network.py 2024-01-04 19:20:26 +01:00
Fabian Neumann
a67c5ea3b7 default to full land transport electrification by 2050 2024-01-04 19:03:34 +01:00
Fabian Neumann
29a95dc997 default to approximating transmission losses in HVAC lines 2024-01-04 16:02:02 +01:00
martacki
d6137f8e93 merge branch 'master' into services_heat 2024-01-04 15:38:10 +01:00
Fabian Neumann
addaecf77a move comments to documentation 2024-01-04 12:43:55 +01:00
Fabian Neumann
8316861722 Merge branch 'master' into fneum/ariadne 2024-01-04 09:54:27 +01:00
Fabian Neumann
2096131b03
Merge pull request #842 from PyPSA/luisa-2
add option to use LUISA land coverage data
2024-01-04 09:32:55 +01:00
Fabian Neumann
b4fb395158 Merge branch 'master' into custom-extra-functionality 2024-01-04 08:32:29 +01:00
Fabian Neumann
cd3eddcc3a
Merge pull request #739 from PyPSA/complete-losses
Lossy bidirectional links
2024-01-03 16:54:02 +01:00
Fabian Neumann
c3bb41c900 Merge branch 'master' into multiyear 2024-01-03 15:14:27 +01:00
Fabian Neumann
ecd85d23d3 add option to use LUISA land coverage data 2024-01-03 15:01:43 +01:00
Fabian Neumann
6242675c27
Merge pull request #836 from PyPSA/remove-helmeth
remove helmeth option
2024-01-03 13:24:43 +01:00
Fabian Neumann
c283a3c89c
Merge pull request #838 from PyPSA/remove-conservative-potential-method
renewable_profiles: remove conservative potential estimation method
2024-01-03 13:23:01 +01:00
Fabian Neumann
83ecaac4de
Merge branch 'master' into wildcard-opts-config 2024-01-03 13:08:21 +01:00
Fabian Neumann
a3cfc8cde5 add heat vent to tech_colors 2024-01-03 13:05:46 +01:00
Fabian Neumann
6b344c9901 renewable_profiles: remove conservative potential estimation method 2024-01-03 10:33:33 +01:00
Fabian Neumann
9d939fa635 remove helmeth option 2024-01-03 10:12:43 +01:00
Fabian Neumann
1245c93264
Merge branch 'master' into complete-losses 2024-01-03 09:29:55 +01:00
Fabian Neumann
4db59eddc2 Merge branch 'master' into complete-losses 2024-01-03 09:29:14 +01:00
Fabian Neumann
b5ad0f11ee
Merge pull request #834 from PyPSA/all-waste-heat-min-part-load
extended waste heat from PtX, revised minimum part loads
2024-01-03 08:21:57 +01:00
Fabian Neumann
872c92d1c0 extended waste heat from PtX, revised minimum part loads 2024-01-02 19:45:02 +01:00
Fabian Neumann
c7790d7c60 change default offshore turbine to NREL Reference 2020 ATB 5.5 MW 2024-01-02 19:16:42 +01:00
Fabian Neumann
631c794cda
Merge branch 'master' into haber-bosch-h2-input 2024-01-02 19:11:23 +01:00
Fabian Neumann
438b40cdb1 haber-bosch: use DECHEMA source for electricity input 2024-01-02 19:09:46 +01:00
Fabian Neumann
5e4a81f828 haber-bosch: use DECHEMA source for hydrogen input 2024-01-02 19:04:34 +01:00
Fabian Neumann
a10a60b951 rename setting from biomass_upgrading_cc to biogas_upgrading_cc 2024-01-02 18:52:22 +01:00
Fabian Neumann
b0cca00b70 add documentation and release note for biogas upgrading CC 2024-01-02 18:51:03 +01:00
Fabian Neumann
30c1a1c857 address deprecation warnings 2024-01-02 16:31:48 +01:00
Tom Brown
1b569dde1b move code for national CO2 budgets out of extra_functionality
This can be added by derived workflows like PyPSA-Eur via
additional_functionality.

Changed additional_functionality to pass snakemake rather than
wildcards and config separately. This gives maximal flexibility.
2024-01-02 16:02:10 +01:00
Fabian Neumann
79ca64382b correct path for custom_extra_functionality 2023-12-31 14:15:37 +01:00
Fabian Neumann
8a11bdb4b1 solve_network: option to inject custom extra functionalities from source file 2023-12-29 17:19:19 +01:00
yerbol-akhmetov
a3688a74fd add resistive_heaters option to config.default 2023-12-23 12:31:31 +06:00
Tom Brown
8a55a55d20 copperplate oil/methanol supply; allow demand to be regional
Force a single supply bus for oil/methanol (until we allow
oil/methanol transport). Introduce new config switches
"regional_oil/methanol_demand" that allow demand to be
regionalised. This is important if regional CO2 budgets need to be
enforced.
2023-12-21 16:08:43 +01:00
Fabian Neumann
43674bcee8
Revert "Add option for carbon capture in integrated steelworks" 2023-12-14 16:30:30 +01:00
Fabian Neumann
e0ca38be6e
Merge pull request #719 from PyPSA/blast-furnace-with-cc
Add option for carbon capture in integrated steelworks
2023-12-11 20:12:26 +01:00
Fabian Neumann
ea7a66b873
Merge pull request #794 from PyPSA/mv-focus-weights
move focus_weights into clustering configuration segment
2023-12-11 20:10:46 +01:00
Fabian Neumann
9b2edd076b ensure just a single focus_weights definition 2023-12-11 20:08:27 +01:00
Fabian Neumann
0f3fb540ef finalise ukraine_hackathon branch for merge 2023-12-11 18:24:57 +01:00
Fabian Neumann
df40fdf904 Merge branch 'master' into ukraine_hackathon 2023-12-11 16:24:40 +01:00
Fabian Neumann
e5bdb4796a move focus_weights into clustering configuration segment (backward compatible) 2023-12-06 10:09:17 +01:00
lisazeyen
7b24557bd3 remove minimum part load again for perfect 2023-12-04 12:27:51 +01:00
pre-commit-ci[bot]
92ccb517f3 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-12-04 11:20:40 +00:00
lisazeyen
f3fcd43eef clean up config 2023-12-04 12:18:15 +01:00
lisazeyen
54c2128419 add heat vent 2023-12-04 10:47:41 +01:00
Fabian Neumann
5d6d01f8c0 make CC in blast furnaces optional 2023-11-23 12:11:12 +01:00
Fabian Neumann
dfecf35bae add focus_weights to documentation 2023-11-20 19:45:10 +01:00
LukasFrankenQ
7555fa0d2d switched enhanced geothermal off by default 2023-11-14 10:50:36 +00:00
LukasFrankenQ
928c73138f fixed bug, first functional version 2023-11-14 01:35:37 +00:00
LukasFrankenQ
bf79b4a817 added flexible operation 2023-11-12 20:14:04 +00:00
LukasFrankenQ
6cd46bf261 added option for hourly egs capacity factors 2023-11-11 23:15:41 +00:00
LukasFrankenQ
11ecbf3fba Merge https://github.com/pypsa/pypsa-eur 2023-11-09 22:28:09 +00:00
Philipp Glaum
a78137852f default config: change technology data reference 2023-11-07 16:54:44 +01:00
Philipp Glaum
816e7b0238 do not consider floating wind min depth for CI testing 2023-11-06 16:47:05 +01:00
Philipp Glaum
728d74caa8 update floating wind settings 2023-11-06 15:46:46 +01:00
Philipp Glaum
786a2461e2 Merge commit '1bade22' into implement-floating 2023-11-06 14:08:53 +01:00
Irieo
6a8165c740 licenses: add reuse compatibility for new files 2023-11-03 12:55:29 +01:00
chrstphtrs
94afba7c5d add coal tech_color to config 2023-10-24 16:39:33 +02:00
chrstphtrs
9b9090c76c add option for additional national carbon budget constraints 2023-10-18 16:59:49 +02:00
chrstphtrs
c81b707113 Add tech_color for 'coal for industry' in config 2023-10-18 16:44:52 +02:00
Fabian Neumann
97a5be1e84
Merge branch 'master' into feature/retrieve-irena 2023-10-11 16:17:15 +02:00
Fabian Neumann
892ee30d98
Update config/config.default.yaml 2023-10-11 16:07:00 +02:00
Thomas Gilon
124177b6db Add option for SMR CC 2023-10-11 14:32:47 +02:00
Thomas Gilon
43e20a26e6 Add rule to update IRENA data for existing infrastructure 2023-10-11 14:26:04 +02:00
pre-commit-ci[bot]
326aeb682b [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-10-09 14:28:08 +00:00
Fabian Neumann
a15157c788 add optional function to restore transmission connections to Crimea 2023-10-09 16:16:53 +02:00
Fabian Neumann
a89a9670e5 no longer ignore 500 kV lines, type as 380 kV due to missing data 2023-10-09 16:15:56 +02:00
Fabian Neumann
ea99f3c43e Merge branch 'master' into ukraine_hackathon 2023-10-09 09:53:42 +02:00
Fabian Neumann
85c8812702
Merge branch 'master' into complete-losses 2023-10-08 11:58:03 +02:00
Fabian Neumann
b8fee80919 Merge branch 'master' into multiyear 2023-10-08 11:55:11 +02:00
lisazeyen
be0214be13 simplify config 2023-10-05 11:23:14 +02:00
lisazeyen
213cec729c
remove unrelated changes 2023-09-30 08:45:40 +02:00
pre-commit-ci[bot]
1e87cf0eeb [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-09-27 06:22:57 +00:00
virio-andreyana
0d1339b1d3 add wildcard options in config for solve network 2023-09-27 08:22:28 +02:00
LukasFrankenQ
a7376f542c changed config name to egs_performant, added saturation check 2023-09-24 21:31:49 +01:00
virio-andreyana
7be8cc0773 undo changes in sector networks and simplify config 2023-09-15 11:55:52 +02:00
Fabian Neumann
118cabe8a6 add option to consider compression losses in pipelines as electricity demand 2023-09-12 17:28:00 +02:00
Fabian Neumann
d7cb13246b link losses: exponential rather than linear model 2023-09-12 17:27:27 +02:00
Fabian Neumann
cc162a9e02 option for losses on bidirectional links via link splitting 2023-09-12 17:25:51 +02:00
virio-andreyana
823df52309 add backward compatible config in wildcards 2023-09-11 22:51:31 +02:00
LukasFrankenQ
e486d6bcfe changed default config to pessimism on egs 2023-09-05 14:34:11 +01:00
LukasFrankenQ
77b72dcbc3 added new params to default config, and fixes 2023-09-05 14:20:49 +01:00
pre-commit-ci[bot]
3187081ec0 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-08-31 07:56:07 +00:00
lisazeyen
457a9e23e7 fixes CI perfect 2023-08-31 09:55:38 +02:00
lisazeyen
c0152c25a4 first fixes for CI 2023-08-30 15:57:47 +02:00
lisazeyen
9d8dd81958 add co2 store lifetime 2023-08-30 14:35:30 +02:00
pre-commit-ci[bot]
bdaa646ed6 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-08-30 10:05:18 +00:00
lisazeyen
3247fb59e0 clean up 2023-08-30 11:50:49 +02:00
lisazeyen
498b22565c add CI perfect 2023-08-30 11:14:33 +02:00
lisazeyen
0c42ac4bdc remove min part for fischer tropsch 2023-08-28 17:27:01 +02:00
lisazeyen
abb584de45 add H2 boiler and constraint to avoid existing gas boiler back up 2023-08-28 13:31:02 +02:00
lisazeyen
3fcf3f2fe6 move max growth assumptions to config 2023-08-25 13:27:34 +02:00
lisazeyen
e6d779a91f first step add max_growth 2023-08-25 11:56:29 +02:00
lisazeyen
4fb2116968 set shared_resoruces true 2023-08-24 14:21:32 +02:00
Fabian
04a2bea176 scenario-management: use list for including wildcards with shared resource 2023-08-24 13:20:11 +02:00
lisazeyen
4b073b0573 add co2 store lifetime 2023-08-24 08:42:52 +02:00
Fabian
62c6143863 scenario-management: reenable shared resources, make shared resources wildcards dependent 2023-08-23 17:14:57 +02:00
lisazeyen
ba589ac7af add config for perfect foresight 2023-08-23 13:27:21 +02:00
lisazeyen
e92fc4ff4d merge master 2023-08-22 10:21:42 +02:00
Fabian
672d7b9538 force add scenarios.yaml / create_scenarios 2023-08-16 13:45:59 +02:00
Fabian
af2fb1a82e uptrack changes in scenarios.yaml/create_scenarios.py 2023-08-16 13:37:10 +02:00
Fabian
59fe665616 add exemplary scenarios.yaml
add create_scenarios.py
2023-08-16 13:25:52 +02:00
Fabian
1f38c69b76 untrack scenarios.yaml 2023-08-15 15:07:34 +02:00
Fabian
e28ae59375 introduce scenario-management 2023-08-15 15:06:59 +02:00
Fabian
e7836246ce scenario management: draft scenario yaml creator 2023-08-14 14:56:26 +02:00
Fabian
ad6322bcb3 address review commments 2023-08-04 12:58:31 +02:00
virio-andreyana
657dd08b53 edit configtables and accept Fneum suggestion 2023-08-02 11:11:41 +02:00
Fabian
3417f61f50 monthly prices: adjust manual cost assumptions 2023-08-01 12:11:42 +02:00
Fabian
fc140c5f38 draft validation section in config 2023-08-01 12:11:42 +02:00
Fabian Neumann
23eb3548c5 Merge branch 'master' into ukraine_hackathon 2023-08-01 08:42:47 +02:00
Fabian Hofmann
1ea8cf47d8
Merge branch 'master' into validation 2023-07-31 11:20:11 +02:00
Fabian
9579198162 validation: further fine-tuning 2023-07-31 11:15:50 +02:00
Fabian
241b55ddf9 config.validation: tighten hydro flatness, reduce crossborder flows further 2023-07-31 11:15:50 +02:00
Fabian Neumann
59962860ea skip testing DLR for sector-coupling part 2023-07-27 11:36:58 +02:00
Fabian Neumann
8e6a70b468 prepare release 0.8.1 2023-07-27 11:23:02 +02:00
Fabian
88c1d4cbbd validation: adjust rolling window size, tight flat hydro dispatch 2023-07-26 13:00:31 +02:00
Fabian Neumann
16eb4e644a small fixes to weather_year wildcard handling 2023-07-26 10:52:58 +02:00
Fabian Neumann
ddd1840981 Merge remote-tracking branch 'origin/master' into multiyear 2023-07-26 10:23:32 +02:00
Fabian Hofmann
225b5b2e7a
Merge branch 'master' into fneum/line-rating 2023-07-25 15:39:35 +02:00
Fabian
491345d504 config: move cutout specification to line-rating section
test/config: use be-cutout for testing line-rating
2023-07-25 15:08:44 +02:00
Fabian Hofmann
269a08006f
Merge branch 'master' into validation 2023-07-25 12:30:32 +02:00
Fabian
01aaeb730d cluster_network: introduce efficiency classes for clustering 2023-07-25 12:29:39 +02:00
Fabian
61e7dd9071 delete test config validation 2023-07-25 12:09:55 +02:00
Fabian Neumann
d96a747566 update to technology-data v0.6.0 2023-07-25 11:54:02 +02:00
Fabian
e52087a532 config: update flattened hydro parameter 2023-07-24 10:47:16 +02:00
Fabian
474321c638 add_electricity: enable flattening hydro dispatch
config.validation: reduce crossborder caps
2023-07-24 10:47:16 +02:00
Fabian
8acf57076b reconsider UC
don't consider tyndp links
2023-07-20 14:36:22 +02:00
Fabian
793573f655 validate: add line plot for price comparison 2023-07-20 14:36:22 +02:00
Fabian Hofmann
844a495180
Merge branch 'master' into validation 2023-07-19 11:37:47 +02:00
Fabian Neumann
56e93fe821
Merge branch 'master' into fneum/line-rating 2023-07-18 14:06:11 +02:00
Fabian Neumann
f39d737aa1
Merge pull request #694 from PyPSA/misc/autoretrieve
Add test and option to disable online retrieve rules
2023-07-17 21:44:40 +02:00
Fabian Hofmann
40b87cac04
Merge branch 'master' into validation 2023-07-17 19:24:13 +02:00
Fabian
65d9036ed4 adjust config validation test 2023-07-14 15:35:28 +02:00
Fabian Hofmann
9f4c227def
Merge branch 'master' into describe-config 2023-07-14 13:34:20 +02:00
Fabian
f020cfa969 validation: plot elec production fix typo 2023-07-13 18:36:14 +02:00
euronion
30a81a559f Add test and option to disable online retrieve rules 2023-07-13 08:22:22 +02:00
Fabian Hofmann
f90ef3bb73
Merge branch 'master' into validation 2023-07-12 12:32:35 +02:00
Fabian
723350c8ef solve_network: enable rolling horizon 2023-07-11 17:48:35 +02:00
Fabian Neumann
6af92fcf67
Merge branch 'master' into fneum/line-rating 2023-07-11 14:37:17 +02:00
Fabian
9fbc626862 adjustments to new due to clustering module 2023-07-11 14:24:57 +02:00
Fabian
c7f67f0641 make fuel prices flexible over years
fix marginal cost issue (on pypsa)
minor fixes
2023-07-06 19:14:01 +02:00
Fabian
406ce3d77e validation: add structure for price and crossborder comparison 2023-07-05 15:51:36 +02:00
Fabian
9c6e5e0ed0 config: remove unneeded plotting entries 2023-07-05 11:34:07 +02:00
Fabian
9958425a44 complete structure for plotting electricity production 2023-07-05 11:07:36 +02:00
pre-commit-ci[bot]
0664f1050f [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-07-04 23:58:07 +00:00
virio-andreyana
55add4c785 finalized config documentation 2023-07-05 01:51:50 +02:00
Fabian Neumann
f0b44a91ec
Merge branch 'master' into fneum/line-rating 2023-07-03 19:27:05 +02:00
Fabian Neumann
191eba2009 dlr: add documentation of settings to lines.csv 2023-07-03 19:25:01 +02:00
Fabian
879d2925f9 rename "ept" to "Ept"
restructure remote rsync with remote
2023-07-03 17:16:20 +02:00
virio-andreyana
b2c4a5a4cb
Merge branch 'master' into describe-config 2023-07-02 23:58:55 +02:00
Fabian Neumann
86708838da
Merge branch 'master' into linemaxext-config 2023-06-30 14:51:29 +02:00
Fabian
4c9b8a08e5 use differential config changes in config.validation.yaml 2023-06-29 19:45:42 +02:00
Fabian Hofmann
934879d94e
Merge branch 'master' into validation 2023-06-29 19:45:17 +02:00
Fabian
519a4f2a2a move uc assigment to add_electricity
make code backwards-compatible
2023-06-29 14:50:41 +02:00
Fabian Neumann
c5c30bcc32 Merge branch 'master' into fneum/line-rating 2023-06-29 11:42:07 +02:00
Fabian Hofmann
07224751e5
Merge branch 'master' into validation 2023-06-29 08:10:52 +02:00
pre-commit-ci[bot]
febd293374 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-06-28 08:05:18 +00:00
Fabian Hofmann
ab0963540f
Merge branch 'master' into complete-carrier-set 2023-06-21 09:53:19 +02:00
Fabian Neumann
86e5f08fbf
Merge branch 'master' into linemaxext-config 2023-06-20 13:33:18 +02:00
virio-andreyana
0bf693c585 general update of .rst files 2023-06-16 01:31:59 +02:00
Fabian
1d10073514 review params implementation; reproduce objective values in CI 2023-06-15 18:52:25 +02:00
Fabian Neumann
546d9b0610 adjust new rules to merged format 2023-06-02 17:27:24 +02:00
Fabian Neumann
2072aa4a99 add dynamic line rating to CI 2023-06-02 17:16:38 +02:00
Fabian Neumann
8a6b2667b5 fix unresolved merge conflict in config.default.yaml 2023-06-02 17:13:12 +02:00
Fabian Neumann
ff6f3a1b7e resolve remaining merge conflicts 2023-06-02 17:12:05 +02:00
Fabian Neumann
ef5320e1b8 merge master 2023-06-02 16:59:06 +02:00
lisazeyen
d6d2088360 adjust config 2023-05-17 13:07:03 +02:00
lisazeyen
6b10bfa9a6 not cluster conventional, temporal dependent co2price 2023-05-17 12:47:26 +02:00
Fabian Hofmann
824e6bb18c
Merge branch 'master' into complete-carrier-set 2023-05-15 15:01:57 +02:00
Fabian Neumann
99963edaaf add option to limit maximum extension per line/link; linemaxext 2023-05-12 09:29:38 +02:00
Fabian Neumann
5be21dfc5a add option for piecewise linear transmission loss approximation 2023-05-12 09:07:16 +02:00
virio-andreyana
5603951946
fixed little things remaining 2023-05-05 11:32:16 +02:00
virio-andreyana
a28f2c1811
add tech_colors for previously missing carrier 2023-05-05 00:40:34 +02:00
Fabian
6a102f4ab2 re-enable ship raster 2023-05-02 18:19:35 +02:00
Fabian Neumann
4bc6a3af4d
Merge branch 'master' into multiyear 2023-04-30 10:54:34 +02:00
Fabian Neumann
6acd5da4d4 Merge branch 'multiyear-sec' into multiyear 2023-04-29 18:49:49 +02:00
Fabian Neumann
30beee0959 Merge branch 'master' into multiyear 2023-04-29 12:40:55 +02:00
Fabian
9913522e09 reinsert co2 price 2023-04-27 12:11:12 +02:00
Fabian
5a3cfe4825 config: fix exclusion carrier list 2023-04-27 11:34:56 +02:00
Fabian
879f2e7d43 exclude conventional carriers via exclude list 2023-04-27 10:28:19 +02:00
pre-commit-ci[bot]
4d8f939004 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-04-27 08:26:22 +00:00
lisazeyen
05d9331deb not cluster conventionals 2023-04-27 10:25:53 +02:00
Fabian
a6ae03d133 fixup non-clustering of conventional generators 2023-04-27 10:11:35 +02:00
lisazeyen
85e02c9743 add emission price of 25eur/t 2023-04-27 09:43:06 +02:00
Fabian
9b39cdff53 do not cluster conventional gens, fix CO2 limit 2023-04-27 09:39:52 +02:00
Fabian
dcc7b4cebb solve_network: fix UC 2023-04-26 17:19:32 +02:00
Fabian
e2119d6229 fix unit_commitment function and file, add it to config.validation 2023-04-26 15:37:46 +02:00
Fabian
a88ea7a7f0 config: disable shipping raster 2023-04-26 15:05:00 +02:00
lisazeyen
c467b3acf9
adjust cost year 2023-04-26 11:44:39 +02:00
chrstphtrs
7bdb58fdf6 update link for OPSD retrieval to latest, adjust config settings 2023-04-25 16:46:30 +02:00
pre-commit-ci[bot]
2433c00dcb [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-04-25 13:52:57 +00:00
Fabian
9f4f76126b snakefile: use validation config 2023-04-25 15:33:21 +02:00
lisazeyen
c29da02653 add switch for UC and linearized UC 2023-04-25 14:57:56 +02:00
Fabian
ddd472b4da draft validation config for 2019 2023-04-25 14:44:55 +02:00
Fabian Neumann
f2e53b59bf add plain hydrogen turbine option for re-electrification 2023-04-22 09:44:13 +02:00
Fabian
7b42a2251a renamem configs to config 2023-04-21 10:28:49 +02:00