288 water to water heat pump bypass mode by samvanderzwan · Pull Request #344 · Project-OMOTES/simulator-core

samvanderzwan · 2026-03-12T07:36:18Z

Unit test are not yet working but code seems to be working

… in heattransfer solver asset.

Copilot

Pull request overview

This PR introduces a bypass mode for the water-to-water heat pump / heat transfer asset and propagates related sign/setpoint and controller-path/factor changes through the controller layer, solver asset equations, and unit/integration tests.

Changes:

Add bypass_mode support to the solver HeatTransferAsset, with separate “normal” vs “bypass” equation generation.
Extend heat pump/controller setpoints to support bypass and primary-side mass-flow/pressure control, and adjust network factor/path handling.
Update a broad set of unit/integration tests to reflect new sign conventions, setpoint keys, and solver behavior.

Reviewed changes

Copilot reviewed 22 out of 22 changed files in this pull request and generated 12 comments.

Show a summary per file

File	Description
unit_test/solver/network/assets/test_heat_transfer_asset.py	Updates expectations for equation selection/call counts and mass-flow setup in solver-level tests.
unit_test/integration/test_heat_transfer_asset.py	Adjusts integration scenarios for updated mass-flow initialization and new prescribe flags.
unit_test/entities/test_production_cluster.py	Adapts convergence test to new sign convention behavior.
unit_test/entities/test_heat_pump.py	Updates heat pump tests for new sign conventions and additional solver state; currently misaligned with new required setpoint keys.
unit_test/entities/test_heat_exchanger.py	Updates mass-flow setup and expected output sign.
unit_test/entities/test_ates_cluster.py	Adjusts expected well temperatures due to changed ATES behavior.
unit_test/entities/controller/test_controller_new_class.py	Updates expectations for `factor_to_first_network` now being a list of factors.
unit_test/entities/controller/test_controller_network.py	Updates factor representation and storage setpoint expectations; adapts pressure-setting behavior.
src/omotes_simulator_core/solver/network/assets/heat_transfer_asset.py	Implements bypass mode and refactors equation generation; changes flow-direction handling and electric power computation.
src/omotes_simulator_core/infrastructure/app.py	Changes default simulation window/timestep and hardcodes a bypass test run + CSV export in `__main__`.
src/omotes_simulator_core/entities/network_controller.py	Refactors factor/path application, storage charge/discharge logic, heat-transfer setpoints, and pressure-setting key selection.
src/omotes_simulator_core/entities/assets/utils.py	Changes heat-demand↔mass-flow conversion to use internal energy difference instead of heat capacity approximation.
src/omotes_simulator_core/entities/assets/production_cluster.py	Adjusts mass-flow calculation sign and convergence criterion.
src/omotes_simulator_core/entities/assets/heat_pump.py	Adds bypass setpoint support, primary-side control flag, and updates setpoint parsing/sign conventions.
src/omotes_simulator_core/entities/assets/heat_exchanger.py	Adjusts heat-loss sign convention in outputs.
src/omotes_simulator_core/entities/assets/demand_cluster.py	Updates convergence check sign usage (now sensitive to negative allocations).
src/omotes_simulator_core/entities/assets/controller/controller_network.py	Changes factor tracking to list-of-factors and uses a product; extends storage setpoints; updates pressure-setting API.
src/omotes_simulator_core/entities/assets/controller/controller_heat_transfer.py	Adds bypass option and updates how primary/secondary heat demand is set (factor vs bypass behavior).
src/omotes_simulator_core/entities/assets/ates_cluster.py	Updates temperature assignment and convergence logic; tweaks ROSIM initialization/run cadence; adds heat supplied computation.
src/omotes_simulator_core/entities/assets/asset_defaults.py	Adds `PROPERTY_BYPASS` constant.
src/omotes_simulator_core/entities/assets/asset_abstract.py	Removes `solver_asset` type annotation from the base abstract asset.
src/omotes_simulator_core/adapter/transforms/controller_mapper.py	Changes “root network” selection for path computation and updates how paths are generated.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

You can also share your feedback on Copilot code review. Take the survey.

src/omotes_simulator_core/solver/network/assets/heat_transfer_asset.py

src/omotes_simulator_core/entities/assets/heat_pump.py

unit_test/entities/test_heat_pump.py

src/omotes_simulator_core/adapter/transforms/controller_mapper.py

src/omotes_simulator_core/entities/assets/demand_cluster.py

src/omotes_simulator_core/solver/network/assets/heat_transfer_asset.py

unit_test/entities/test_heat_pump.py

src/omotes_simulator_core/infrastructure/app.py

src/omotes_simulator_core/entities/assets/controller/controller_network.py

src/omotes_simulator_core/solver/network/assets/heat_transfer_asset.py

vanmeerkerk

Er is erg veel gewijzgd waarvan sommige onderdelen naar mijn mening een apart issue hadden moeten worden. Over het algemeen ziet het er oké uit nog wat docstring opmerkingen.

Ik vermoed wel dat er nu een fout wordt gemaakt in het heat_transfer asset met de huidige implementatie.

vanmeerkerk · 2026-03-12T08:58:00Z

src/omotes_simulator_core/entities/assets/controller/controller_heat_transfer.py

-                SECONDARY + PROPERTY_TEMPERATURE_OUT: 273.15 + 80,
-                SECONDARY + PROPERTY_TEMPERATURE_IN: 273.15 + 50,
-                PROPERTY_SET_PRESSURE: False,
+        if bypass:


Ik heb hier wel een vraag over. Zetten we nu standaard temperaturen in dit asset met set_asset of is dit alleen een initialisatie stap?

Klopt de volgorder van de temperaturen; ik zou verwachtten dat PRIM_OUT gleijk moet zijn aan SEC_IN. Dit lijkt nu niet het geval?

Ja temepraturen worden nu hard gezet,
Voor Bypass mode maakt het niet uit, want dan worden ze niet gebruikt.
In normale modus moeten we eigenlijk nog de waardes ophalen uit de carrier en die gebruiken.
Maar dit zat in de vorige implementatie ook nog niet

src/omotes_simulator_core/entities/assets/controller/controller_network.py

vanmeerkerk · 2026-03-12T09:01:53Z

src/omotes_simulator_core/entities/assets/controller/controller_network.py

        for storage in self.storages:
            storage_settings[storage.id] = {
                PROPERTY_HEAT_DEMAND: +1 * storage.effective_max_charge_power * factor,
+                PROPERTY_TEMPERATURE_OUT: storage.temperature_out,


Waarom heb je de temperatuur nodig voor een storage? Deze wordt toch niet geset maar gebasseerd op de internal state?

ATES gebruikt ze om mass flow uit te rekenen. en ideal storage zal dat ook doen. In iede geval voor initiele gok

src/omotes_simulator_core/entities/assets/asset_abstract.py

src/omotes_simulator_core/entities/assets/ates_cluster.py

src/omotes_simulator_core/solver/network/assets/heat_transfer_asset.py

vanmeerkerk · 2026-03-12T09:28:56Z

src/omotes_simulator_core/solver/network/assets/heat_transfer_asset.py

@@ -270,7 +281,7 @@ def get_equations(self) -> list[EquationObject]:
        ) = self.get_ordered_connection_point_list()

        if np.all(np.abs(self.prev_sol[0:-1:3]) < MASSFLOW_ZERO_LIMIT):


Klopt het nu dat we alleen de richting zetten op basis van de vorige oplossing als de stroming 0 was (< MASSFLOW_ZERO_LIMIT); ik vraag mij af of dit goed gaat.

Nee niet helemaal, want anders zetten wegebruiken we flow_direction_rpimary en die heb ik nu ook gezet op mass flow richting van vorige iteratie

vanmeerkerk · 2026-03-12T09:29:40Z

src/omotes_simulator_core/solver/network/assets/heat_transfer_asset.py

-            if iteration_flow_direction_secondary == FlowDirection.ZERO:
-                mset = 0.0
+            if self.iteration_flow_direction_secondary == FlowDirection.ZERO:
+                mset = self.mass_flow_rate_rate_set_point_secondary


Dus als 0 forceren we niet langer 0 maar gaan we terug naar het setpoint; dit kan niet juist zijn?

Als je dit doet kan je net zo goed deze if loop weghalen en altijd het setpoint zetten. Ik denk dat je hier een fout maakt om het te laten werken. Ik herinner mij dat het zetten van mset=0.0 resulteerde in een matrix fout maar dat zit eerder in hoe je je setpoints zet op basis van een vorige oplossing.

Het lijkt nu allemaal te werekn, ook zero flow. Misschien overgang niet, maar denk dat het ook goed gaat omdat je telkens met nul als vorige oplossing begint

vanmeerkerk · 2026-03-12T09:32:47Z

src/omotes_simulator_core/solver/network/assets/heat_transfer_asset.py

+            if (self.iteration_flow_direction_primary != FlowDirection.ZERO) or (
+                self.iteration_flow_direction_secondary != FlowDirection.ZERO
+            ):
+                equations.append(


Hier gaat echt iets fout met het zetten vvan m=0.0

Nee want dat gaat goed, je kunt gewoon nul zetten en dan zal het ook nog werekn

src/omotes_simulator_core/solver/network/assets/heat_transfer_asset.py

samvanderzwan · 2026-03-25T16:35:01Z

@vanmeerkerk ik heb alles bijgewerkt. Implementatie is iets verandert waardoor sommige zaken net iets anders gaan, dus misschien goed om even samen te zitten om door te lopen.

samvanderzwan added 10 commits February 12, 2026 13:10

Added possibility in controller to set the heatpump to bypass mode

ae3a6a0

Fixed two small errors which occured due to rebasing

085e6db

Small fixes in the controller to get the correct output

30065d2

Added bypass mode to heatpump

0d2ff22

Rewrote equations setting of heatpump.

23d3025

Corrected flow direction setting

d6167d0

Fixed unit test and made bug fixes based ont he test

4300c03

Fxiing typing and linting issues

86feca1

Added bypass option to controller output. Added bypass mode equations…

1341a82

… in heattransfer solver asset.

Fixed issues, now have mode for normal and bypass operation

4c11a17

samvanderzwan requested review from Copilot and vanmeerkerk March 12, 2026 07:36

samvanderzwan linked an issue Mar 12, 2026 that may be closed by this pull request

Water to water heat pump bypass mode #288

Open

Copilot started reviewing on behalf of samvanderzwan March 12, 2026 07:36 View session

Copilot AI reviewed Mar 12, 2026

View reviewed changes

vanmeerkerk requested changes Mar 12, 2026

View reviewed changes

samvanderzwan added 9 commits March 25, 2026 10:06

Removed changes which should not have been comitted

c661c40

Fixed copilots comments

303e5db

Fixes based on review and fixed unit testing

ce7226e

Fixed linting erros and error in carrier setting of esdl

40a9cec

moved type ignore to fix erro

8bb13c2

Fixed formatting

21d44ba

Fixed final linting problem

ce6bd0a

Small fixes in logic of ATES

b6c74cd

Added missing .

6a81349

samvanderzwan requested a review from vanmeerkerk March 25, 2026 16:34

vanmeerkerk mentioned this pull request Mar 26, 2026

Fix heat pump controller heat transfer set_asset #345

Open

		@@ -270,7 +281,7 @@ def get_equations(self) -> list[EquationObject]:
		) = self.get_ordered_connection_point_list()

		if np.all(np.abs(self.prev_sol[0:-1:3]) < MASSFLOW_ZERO_LIMIT):

Conversation

samvanderzwan commented Mar 12, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

vanmeerkerk left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

samvanderzwan commented Mar 25, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants