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

Ariadne2 #1223

Draft
wants to merge 260 commits into
base: master
Choose a base branch
from
Draft

Ariadne2 #1223

wants to merge 260 commits into from

Conversation

lindnemi
Copy link
Contributor

This is just to get a view of how much ariadne2 has diverged.

Eventually we will have to merge it.

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.

nworbmot and others added 30 commits January 29, 2024 10:05
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.
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).
This is required so that other models can do CO2 limits on each type
of aviation separately.
Also allow industrial coal demand to be regional (so we can include
them in regional CO2 constraints).
lindnemi and others added 11 commits September 25, 2024 15:41
* remove sector_opts; drop german chp plants from ppm

* use options variable

* apply filter only when german_chp.csv is present

* [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>
Copy link
Contributor

github-actions bot commented Oct 9, 2024

Validator Report

I am the Validator. Download all artifacts here.
I'll be back and edit this comment for each new commit.

General

Plots comparison
Main branch Feature branch
Image not available Image not available
Image not available Image not available
Image not available Image not available
Image not available Image not available
Image not available Image not available
Image not available Image not available
Files comparison
Status NRMSE MAE (norm)
prices.csv ⚠️Changed 0.000 0.16
weighted_prices.csv ⚠️Changed 0.576 0.45
market_values.csv ⚠️Changed 0.000 0.10
price_statistics.csv ⚠️Changed 0.008 0.13
metrics.csv ⚠️Changed 0.001 0.15
cfs.csv ⚠️Changed 0.040 0.06
curtailment.csv ⚠️Changed 0.000 0.12
nodal_cfs.csv ⚠️ NaN mismatch
nodal_supply_energy.csv ⚠️ NaN mismatch
nodal_costs.csv ⚠️ NaN mismatch
nodal_capacities.csv ⚠️ NaN mismatch
supply.csv ✅ Almost equal 0.000 0.03
costs.csv ✅ Almost equal 0.002 0.01
capacities.csv ✅ Almost equal 0.000 0.04
supply_energy.csv ✅ Almost equal 0.000 0.03
energy.csv ✅ Almost equal 0.000 0.04

NRMSE: Normalized (combined-min-max) Root Mean Square Error
MAE (norm): Mean Absolute Error on normalized data (min-max)
Status Threshold: MAE (norm) > 0.05 and NRMSE > 0.3

Model Metrics

Benchmarks Image not available Image not available Image not available

Comparing ariadne2 (3ab5e19) with master (5095a74).
Branch is 243 commits ahead and 1 commits behind.
Last updated on 2024-10-09 10:48:30 CEST.

lindnemi and others added 12 commits October 10, 2024 15:59
* feat: add temperature reduction to workflow

* chore: fix name change issues

* feat: update input/output of dependent rules

* feat: add {planning _horizons} wildcard to COP input in myopic rules

* fix: exponential temperature reduction

* feat: add {planning_horizons} wildcard to solve_perfect

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* style: "_today" -> "_baseyear"

* doc: update configtables

* style: "_today" -> "_baseyear" (config)

* feat: update heat pump efficiency in add_brownfield

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fix: pass planning_horizons to add_brownfield

* feat: update COPs for perfect foresight

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* update release notes

* Update doc/release_notes.rst

Co-authored-by: Fabian Neumann <[email protected]>

* Update scripts/build_central_heating_temperature_profiles/run.py

Co-authored-by: Fabian Neumann <[email protected]>

* Update scripts/build_central_heating_temperature_profiles/run.py

Co-authored-by: Fabian Neumann <[email protected]>

* Update build_central_heating_temperature_profiles.run

* style: simplify update_heat_pump_efficiency functions

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Update README.md

* [pre-commit.ci] pre-commit autoupdate (#1352)

updates:
- [github.com/pre-commit/pre-commit-hooks: v4.6.0 → v5.0.0](pre-commit/pre-commit-hooks@v4.6.0...v5.0.0)
- [github.com/psf/black-pre-commit-mirror: 24.8.0 → 24.10.0](psf/black-pre-commit-mirror@24.8.0...24.10.0)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* transmission_projects: update AC line types to high-temperature lines (#1348)

* Bugfix of solar constraint in post discretization (#1343)

* Update NEP DC20 to underground

* fix: remove broken pre-commit rule (docformatter) (#1362)

* prepare for pypsa `0.31.0` (#1340)

* prepare for pypsa `0.31.0`

* Update mock_snakemake (#1345)

* test: log env diff (#1338)

* Update mock_snakemake

---------

Co-authored-by: Lukas Trippe <[email protected]>
Co-authored-by: Fabian Neumann <[email protected]>

* resolve other deprecations

---------

Co-authored-by: Davide Fioriti <[email protected]>
Co-authored-by: Fabian Neumann <[email protected]>

* [github-actions.ci] Update fixed environment (#1363)

* [create-pull-request] automated change

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: lkstrp <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* fix: more robust `progress_retrieve` (#1361)

* madd to add

---------

Co-authored-by: Amos Schledorn <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Amos Schledorn <[email protected]>
Co-authored-by: Fabian Neumann <[email protected]>
Co-authored-by: Philipp Glaum <[email protected]>
Co-authored-by: Toni Seibold <[email protected]>
Co-authored-by: Tom Brown <[email protected]>
Co-authored-by: Lukas Trippe <[email protected]>
Co-authored-by: Davide Fioriti <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: lkstrp <[email protected]>
* add heat buses and vents for all CHP locations

* revert mock_snakemake change

* [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 compression losses for gas transport

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* add docu in configtables

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* add release_note

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Michael Lindner <[email protected]>
* Bug fix: simplify_network.py (simplify_links) - By adding preceding converter removal (#1381)

* Implemented simplify_links fix by adding a preceding function removing converters.

* Added release_notes.

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Dropped manual configfile.

* Cleaned up code.

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* Bug fix: simplify_network.py (simplify_links) - By adding preceding converter removal (#1381)

* Implemented simplify_links fix by adding a preceding function removing converters.

* Added release_notes.

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Dropped manual configfile.

* Cleaned up code.

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* Updated to osm-network version 0.5

* Added sources to doc/data_sources.rst

* Bug fix, exporting gdp_pop to geojson. (#1388)

* tech-colors for gas primary and compressing

---------

Co-authored-by: Bobby Xiong <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: bobbyxng <[email protected]>
lindnemi and others added 5 commits October 30, 2024 17:28
* Addressing edge case of already existing chp capacities in 2020 and set those p_min for extendable links

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* upsi

* update p_nom as well for n.statistics interoperability

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Michael Lindner <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.