Clean up import options #306
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* report transmission/distribution grid capacity * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * force offshore wind from NEP 2023 at correct connection point (PyPSA#191) * force offshore wind from NEP 2023 at correct connection point Projects for offshore wind connection in the North and Baltic Seas are read in and then (in a configurable way) forced into the network with the correction connection point. The default is only to do this for the projects planned until 2030, which mostly already have final investment decisions. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * fix strange input error by adding the wildcard_constraints back in * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * add comment * do not specify 2030 max offwind capacity in scenarios * force projects in 2025, increase 2025 minimum for offwind, add AC projects * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * distinguish DC / AC more robustly * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * add missing Trassenlängen * handle offwind connection cost in modify_prenetwork * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Michael Lindner <[email protected]> * Removing custom electrolysis costs (PyPSA#229) * removing custom electrolysis costs * Documenting changes --------- Co-authored-by: Micha <[email protected]> * Correct electricity net generation data in validation (PyPSA#227) * correct elec val data * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Micha <[email protected]> * Solar Correction Factor (PyPSA#225) * adding correction_factor for solar and solar-hsat * Documenting changes * update correction factor to Fraunhofer ISE data * add source for factor --------- Co-authored-by: Michael Lindner <[email protected]> * watch pypsa-eur data folder for changes (PyPSA#232) * watch pypsa-eur data folder for changes * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> * removing grid addtions from exporter * changing prefix * fix and export unsustainable BtL * export more transport variables * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * include capacity additions * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * report NEP investments * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * change capital_cost of projections after optimization * simplify code * update submodule (order of transmission projects) * fix typos * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Tom Brown <[email protected]> Co-authored-by: Michael Lindner <[email protected]> Co-authored-by: Micha <[email protected]> Co-authored-by: Julian Geis <[email protected]>
* madd to add * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* Restricting the expansion of FT in Germany * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * document changes * adding a production volume limit for FT fuels * fix typo and avoid large bounds * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * remove obsolete config * set p_nom_max=0, inactive=True for dummy offwind generator (PyPSA#249) * Restricting the expansion of FT in Germany * removing obsolete config again * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Micha <[email protected]>
* adding new constraints for the import and export of energy carriers between Germany and (non) European partners, restrict non European imports in ramp up phase 2030-2035 and cleaning up
* Fixing constraints for eu and non eu scenarios
* improving NEP plots * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * use correct values for ac onshore invest * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Bumps the github-actions group with 1 update: [lkstrp/pypsa-validator](https://github.com/lkstrp/pypsa-validator). Updates `lkstrp/pypsa-validator` from 0.2.3 to 0.2.4 - [Release notes](https://github.com/lkstrp/pypsa-validator/releases) - [Commits](PyPSA/pypsa-validator@v0.2.3...v0.2.4) --- updated-dependencies: - dependency-name: lkstrp/pypsa-validator dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
PyPSA#276) * remove length_factor because it's multiplied already during clustering * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* change plot titles to german * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Micha <[email protected]>
for more information, see https://pre-commit.ci
* calc Kernnetz invest and plot it * change unit_size of H2 post-discretisation, change pipeline diamter to p_nom mapping, exclude Kernnetz from post-discretization, add H2 capacity to exporter and function for domestic length * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * add functionality for post_discretizing h2 pipes right at the start * adress comments * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: Michael Lindner <[email protected]> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* small improvement * implement delay of BalWin 1 & 3 * reduce onwind capacity per sqkm from 3 to 2 * add correction_factor for wind, round correction factor for solar * rename scenario * increase memory resources
* improve memory efficiency of ariadne_report * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * increase available memory for process --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* add function to scale carrier capacity * add scaling for gas CHP and set lifetime of gas CHP to 40 years * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * fix negative investments * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * only select extendable links * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * make must run function more general and add lignite in 2020 * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: Michael Lindner <[email protected]> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* add functionality to revert must run conditions and do no more apply co2 price additions on fossils in 2020, 2025 * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* add maximum limit for HVC to air link * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * nov HVC to air in Germany, correct HVC_environment_sequestration_fraction * minor fix * add explanations * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * account waste CHP like normal CHP * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * add note to changelog --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* Update environment.yaml Fixing linopy to < 0.4.0 since we have trouble with the latest version. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Restrict snakemake < 8.25 --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Micha <[email protected]>
* account CHP invetment only in electricity, processes only in their output category * Add CAPTYPE|Heat|Renewable variable * rename solar thermal heat variable * update ariadne template * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* add total system cost to exporter * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * add capex and opex per sub sector * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* adjusting aviation demand and emission accounting * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * adjusting national climate target * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * calculating domestic aviation factor within additional_functionality * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * no longer use fallback_reference_scenario for aviation growth --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Micha <[email protected]> Co-authored-by: Michael Lindner <[email protected]>
* forcing onshore wind to South Germany * reduce capacity_per_sqkm 1.4 * minimum onshore wind capacity for Germany following political targets * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * For onwind capacity follow main scenarios in SupplyFocus * Revert back to old trajectory for Supply Focus --------- Co-authored-by: Micha <[email protected]> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* implement delay years for Offhsore NEP * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * add note to changelog and correct delay years in manual config. * ensure projects are only delayed, not completly abandoned * remove redundant keys * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * consistent minimum limits --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Michael Lindner <[email protected]> Co-authored-by: Micha <[email protected]>
for more information, see https://pre-commit.ci
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The option to import from non European partners was buggy since some of the import points needed to be translated to match the file
ports_s_68.csv. Some other bugs were taken care of in the rulemodify_final_network.pyBefore asking for a review for this PR make sure to complete the following checklist:
ariadne_allcompletes without errorsexport_ariadne_variableshas been adapted to the changesChangelog.mdmainhas been merged into the PRYYYYMMDDdescriptive_title