Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Transport growth #1026

Merged
merged 25 commits into from Apr 19, 2024
Merged

Transport growth #1026

merged 25 commits into from Apr 19, 2024

Conversation

toniseibold
Copy link
Contributor

@toniseibold toniseibold commented Apr 15, 2024 •
edited

Changes

in prepare_sector_network

  • the config aviation_demand_factor can now be a list drawing a development pathway for the aviation demand
  • the config land_transport_demand_factor is added to allow a decrease/increase in road transport demand

Checklist

  • I tested my contribution locally and it seems to work fine.
  • Code and workflow changes are sufficiently documented.
  • Changed dependencies are added to envs/environment.yaml.
  • Changes in configuration options are added in all of config.default.yaml.
  • Changes in configuration options are also documented in doc/configtables/*.csv.
  • A release note doc/release_notes.rst is added.

tgi-climact and others added 21 commits April 12, 2024 16:52
@tgi-climact
Fix p_nom_min of renewables generators for myopic approach and add ch…
98d2c4d 
…eck of existing capacities in add_land_use_constraint_m
@toniseibold
allow different aviation growth factors for each investment year
8ed006a
@toniseibold
scaling of land transport
de93326
@pre-commit-ci
[pre-commit.ci] auto fixes from pre-commit.com hooks
de60ac2 
for more information, see https://pre-commit.ci
@pre-commit-ci
[pre-commit.ci] pre-commit autoupdate
4429711 
updates:
- [github.com/psf/black-pre-commit-mirror: 24.3.0 → 24.4.0](psf/black-pre-commit-mirror@24.3.0...24.4.0)
- [github.com/snakemake/snakefmt: v0.10.0 → v0.10.1](snakemake/snakefmt@v0.10.0...v0.10.1)
@fneum @lisazeyen
skip heat bus for CHPs in places where no central heating
15345ff
@lindnemi @lisazeyen
group existing capacities to the earlier grouping_year for consistenc…
380884e 
…y with optimized capacities
@lindnemi @lisazeyen
add more grouping years to avoid errors
27f2bd7
@lisazeyen
add check if minimum grouping year< min build year
17d44d7
@lisazeyen
adjust valid_grouping_years
442c8a8 
change sign, split up conditions for better readibility
@lindnemi @lisazeyen
Add release note for serendipitous bugfix
6f09a16
@lisazeyen
rename _intervals to _years, shorten definition
dd874e0
@lisazeyen
define active assets consitently
ec96a73
@pre-commit-ci @lisazeyen
[pre-commit.ci] auto fixes from pre-commit.com hooks
da15ab3 
for more information, see https://pre-commit.ci
@fneum
Merge pull request #1028 from PyPSA/pre-commit-ci-update-config
b1433fa 
[pre-commit.ci] pre-commit autoupdate
@lisazeyen
Merge branch 'master' into Climact-feature/fix-add-land-use-constraint-m
47fa477
@lisazeyen
Merge branch 'master' into Climact-feature/fix-add-land-use-constraint-m
e3ccbc0
@lisazeyen
Merge pull request #1029 from PyPSA/Climact-feature/fix-add-land-use-…
a835f50 
…constraint-m

Climact feature/fix add land use constraint m
@toniseibold
writing documentation and release notes
c9e1dff
@toniseibold
Merge branch 'transport_growth' of https://github.com/PyPSA/pypsa-eur …
bab4555 
…into transport_growth
@toniseibold
Merge branch 'master' of https://github.com/PyPSA/pypsa-eur into tran…
4a136d5 
…sport_growth
@toniseibold toniseibold marked this pull request as ready for review April 16, 2024 08:28
@toniseibold toniseibold requested a review from fneum April 16, 2024 08:29
@lindnemi lindnemi changed the base branch from master to ariadne2 April 19, 2024 09:05
@lindnemi lindnemi merged commit bb4ebed into ariadne2 Apr 19, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fneum fneum Awaiting requested review from fneum

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@toniseibold @lindnemi @tgi-climact @fneum @lisazeyen