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.

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

Consider "urban_percentage" based on "panning_horizons" wildcard and its effect on all Rules #338

Merged
merged 3 commits into from
Jul 3, 2024

Conversation

Eddy-JV
Copy link
Collaborator

@Eddy-JV Eddy-JV commented Jun 11, 2024

Closes # (if applicable).

Changes proposed in this Pull Request

@energyLS PLEASE review this PR carefully. I added a wildcard for the urban_percentage year in Rule build_population_layouts and therefore added {planning_horizons} wildcard to all Rules after that.

This PR is part of adding Params to all Rules in Snakemake under Issue #330

The following Rules are already done including the work done in this PR:

  • add_export.py
  • build_base_energy_totals.py
  • build_base_industry_totals.py
  • build_clustered_population_layouts.py -> (Had no changes to be done)
  • build_cop_profiles.py
  • build_heat_demand.py
  • build_industrial_database.py -> (Had no changes to be done)
  • build_industrial_distribution_key.py
  • build_industry_demand.py
  • build_population_layouts.py
    build_ship_profile.py
    build_solar_thermal_profiles.py
    build_temperature_profiles.py
    copy_config.py
    helpers.py
    make_summary.py
    override_respot.py
    plot_network.py
    plot_network_eur.py
    plot_summary.py
    prepare_airports.py
    prepare_db.py
    prepare_energy_totals.py
    prepare_gas_network.py
    prepare_heat_data.py
    prepare_ports.py
    prepare_sector_network.py
    prepare_transport_data.py
    prepare_transport_data_input.py
    prepare_urban_percent.py
    solve_network.py

Checklist

  • I tested my contribution locally and it seems to work fine.
  • Code and workflow changes are sufficiently documented.
  • Newly introduced dependencies are added to envs/environment.yaml and envs/environment.docs.yaml.
  • Changes in configuration options are added in all of config.default.yaml, config.tutorial.yaml, and test/config.test1.yaml.
  • Changes in configuration options are also documented in doc/configtables/*.csv and line references are adjusted in doc/configuration.rst and doc/tutorial.rst.
  • A note for the release notes doc/release_notes.rst is amended in the format of previous release notes, including reference to the requested PR.

@Eddy-JV Eddy-JV requested a review from energyLS June 11, 2024 14:00
@Eddy-JV Eddy-JV self-assigned this Jun 11, 2024
@energyLS
Copy link
Collaborator

@Eddy-JV thanks for the PR. Only concern is regarding the wildcard; I think for tracability and transparency we should move that to a seperate PR?
Also, I think you have added the wildcard in order to work with myopic foresight? Can you elaborate on this?
At the current stage I am hesitating to merge right away, since the new wildcard is a major change for all users.

@Eddy-JV Eddy-JV changed the title Add Params and urban_percentage effect all Rules Consider "urban_percentage" based on "panning_horizons" wildcard and its effect on all Rules Jun 12, 2024
@Eddy-JV
Copy link
Collaborator Author

Eddy-JV commented Jun 12, 2024

@Eddy-JV thanks for the PR. Only concern is regarding the wildcard; I think for tracability and transparency we should move that to a seperate PR? Also, I think you have added the wildcard in order to work with myopic foresight? Can you elaborate on this? At the current stage I am hesitating to merge right away, since the new wildcard is a major change for all users.

I changed the name of the PR to be only for the urban_perecentage changes. I will do another PR to deal with the Params.

@Eddy-JV
Copy link
Collaborator Author

Eddy-JV commented Jun 12, 2024

@energyLS Regarding why I introduced this. In the current workflow, urban_percentage for planning_horitons[0] is always used. Which is let's say 2030. But if we introduce the wildcard in Rule build_population_layouts and some of the following ones whenever necessary, we will be calculating all these changed rules using the wildcard year and not the first value.

Copy link
Collaborator

@energyLS energyLS left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great. Currently testing locally as well, if that works out we could merge. @Eddy-JV are there any concerns, or could we merge (given it works locally for me)?

@energyLS
Copy link
Collaborator

Looks great. Currently testing locally as well, if that works out we could merge. @Eddy-JV are there any concerns, or could we merge (given it works locally for me)?

@Eddy-JV has agreed bilaterally. Merging now.

@Eddy-JV Eddy-JV merged commit ec4c8ed into main Jul 3, 2024
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants