Skip to content

Merge links into nodes: Merge nodes on links if there are no node injection sensors - #1584

Merged
figueroa1395 merged 6 commits into
mainfrom
pgm/feature/actually-register-links-for-merge
Sep 10, 2026
Merged

figueroa1395 merged 6 commits into
mainfrom
pgm/feature/actually-register-links-for-merge

Conversation

@mgovers

@mgovers mgovers commented Sep 9, 2026

Copy link
Copy Markdown
Member

This is the actual enablement of merging nodes on links (a.k.a. merging links into nodes).

As described in #1550, a dual code path is chosen:

  • If there are no node injection sensors:
    • Follow the v2 behavior: run a multi-scale calculation:
      • Links are modeled to have infinite admittance at the macro-scale, and link power/current flows are distributed in a micro-scale calculation after obtaining the macro-scale results.
      • Details are explained in Merge links into nodes: Documentation #1553 .
  • Otherwise:

Documentation is in #1553 .

This reverts commit e743f9c.

Fixes #35

Signed-off-by: Nitish Bharambe <nitish.bharambe@alliander.com>
@mgovers mgovers self-assigned this Sep 9, 2026
@mgovers mgovers added feature New feature or request do-not-merge This should not be merged temporarily labels Sep 9, 2026
@mgovers

mgovers commented Sep 9, 2026

Copy link
Copy Markdown
Member Author

Benchmark run vs v1.13.163; looks OK

figueroa1395
figueroa1395 previously approved these changes Sep 9, 2026

@figueroa1395 figueroa1395 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

We only merge after #1583 has been merged into #1550 and then once #1550 has been merged into main and released.

We want two explicit releases with the differences so we can pinpoint to an exact, very contained version, if anything was to go wrong at any point in time.

@mgovers
mgovers force-pushed the pgm/feature/prepare-link-registration branch from 10342c9 to 90f60cc Compare September 9, 2026 12:40
This reverts commit 90f60cc.

Signed-off-by: Martijn Govers <Martijn.Govers@Alliander.com>
@mgovers
mgovers force-pushed the pgm/feature/actually-register-links-for-merge branch from ee827d6 to 8a8e92a Compare September 9, 2026 12:47
nitbharambe
nitbharambe previously approved these changes Sep 9, 2026
Base automatically changed from pgm/feature/prepare-link-registration to feature/link-registration-dual-code-path September 9, 2026 12:50
…/fix/multiple-faults-post-merge-links

Signed-off-by: Martijn Govers <martijn.govers@alliander.com>
…post-merge-links

Multiple infinite faults on a bus incorrect fault output: 2nd test post merge links with nodes

@mgovers mgovers left a comment

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

This PR now depends on both #1550 and #1566 (for the right reasons). All LGTM, but main needs to be merged into this branch after those PRs are merged.

Base automatically changed from feature/link-registration-dual-code-path to main September 9, 2026 17:16
@mgovers
mgovers dismissed stale reviews from nitbharambe and figueroa1395 September 9, 2026 17:16

The base branch was changed.

@mgovers mgovers removed the do-not-merge This should not be merged temporarily label Sep 9, 2026
@sonarqubecloud

sonarqubecloud Bot commented Sep 9, 2026

Copy link
Copy Markdown

@figueroa1395 figueroa1395 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

#1566 and then #1550 merged correctly and there aren't any conflicts nor changes in this PR. Hence this is good to go.

@figueroa1395
figueroa1395 added this pull request to the merge queue Sep 10, 2026
Merged via the queue into main with commit e291f3c Sep 10, 2026
34 of 35 checks passed
@figueroa1395
figueroa1395 deleted the pgm/feature/actually-register-links-for-merge branch September 10, 2026 08:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

feature New feature or request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[FEATURE] merge nodes connected by link into one bus in mathematical model

3 participants