Skip to content

Comments

IBPSA merge#1459

Merged
jelgerjansen merged 7 commits intoopen-ideas:masterfrom
lucasverleyen:ibpsa_merged
Aug 20, 2025
Merged

IBPSA merge#1459
jelgerjansen merged 7 commits intoopen-ideas:masterfrom
lucasverleyen:ibpsa_merged

Conversation

@lucasverleyen
Copy link
Member

Latest IBPSA merge: ibpsa/modelica-ibpsa@b6cff3b

# Conflicts:
#	IDEAS/Airflow/Multizone/BaseClasses/DoorDiscretized.mo
#	IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Airflow_Multizone_Examples_ChimneyShaftWithVolume.txt
#	IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Airflow_Multizone_Examples_ClosedDoors.txt
#	IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Airflow_Multizone_Examples_OneEffectiveAirLeakageArea.txt
#	IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Airflow_Multizone_Examples_OneOpenDoor.txt
#	IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Airflow_Multizone_Examples_PressurizationData.txt
#	IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Airflow_Multizone_Examples_ReverseBuoyancy.txt
#	IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Airflow_Multizone_Examples_ReverseBuoyancy3Zones.txt
#	IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Airflow_Multizone_Examples_TrickleVent.txt
#	IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Airflow_Multizone_Validation_OneWayFlow.txt
#	IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Controls_Continuous_Examples_LimPIDWithReset.txt
#	IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Controls_Continuous_Examples_SignalRanker.txt
#	IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Electrical_AC_ThreePhasesUnbalanced_Validation_IEEETests_Test4NodesFeeder_BalancedStepDown_DD.txt
#	IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Electrical_AC_ThreePhasesUnbalanced_Validation_IEEETests_Test4NodesFeeder_BalancedStepDown_YD.txt
#	IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Electrical_AC_ThreePhasesUnbalanced_Validation_IEEETests_Test4NodesFeeder_BalancedStepUp_DD.txt
#	IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Electrical_AC_ThreePhasesUnbalanced_Validation_IEEETests_Test4NodesFeeder_BalancedStepUp_YD.txt
#	IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Electrical_AC_ThreePhasesUnbalanced_Validation_IEEETests_Test4NodesFeeder_UnbalancedStepDown_DD.txt
#	IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Electrical_AC_ThreePhasesUnbalanced_Validation_IEEETests_Test4NodesFeeder_UnbalancedStepDown_YD.txt
#	IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Electrical_AC_ThreePhasesUnbalanced_Validation_IEEETests_Test4NodesFeeder_UnbalancedStepUp_DD.txt
#	IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Electrical_AC_ThreePhasesUnbalanced_Validation_IEEETests_Test4NodesFeeder_UnbalancedStepUp_YD.txt
#	IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Fluid_Examples_FlowSystem_Basic.txt
#	IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Fluid_Examples_FlowSystem_Simplified1.txt
#	IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Fluid_Examples_FlowSystem_Simplified2.txt
#	IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Fluid_Examples_FlowSystem_Simplified4.txt
#	IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Fluid_FMI_ExportContainers_Examples_FMUs_HVACZone.txt
#	IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Fluid_FMI_ExportContainers_Examples_FMUs_HVACZones.txt
#	IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Fluid_FMI_ExportContainers_Examples_FMUs_ThermalZone.txt
#	IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Fluid_FMI_ExportContainers_Examples_FMUs_ThermalZones.txt
#	IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Fluid_FixedResistances_Examples_FlowJunction.txt
#	IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Fluid_FixedResistances_Validation_PlugFlowPipes_PlugFlowAIT.txt
#	IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Fluid_FixedResistances_Validation_PlugFlowPipes_TransportWaterAir.txt
#	IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Fluid_Geothermal_Borefields_BaseClasses_HeatTransfer_ThermalResponseFactors_Validation_GFunction_100boreholes.txt
#	IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Fluid_HeatExchangers_ActiveBeams_Examples_HeatingOnly.txt
#	IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Fluid_HeatExchangers_Examples_AirHeater_u.txt
#	IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Fluid_HeatExchangers_Examples_DryCoilEffectivenessNTUPControl.txt
#	IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Fluid_HeatExchangers_Examples_WaterCooler_T.txt
#	IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Fluid_HeatExchangers_Examples_WaterHeater_T.txt
#	IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Fluid_HeatExchangers_Examples_WaterHeater_u.txt
#	IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Fluid_HeatExchangers_Validation_ConstantEffectiveness.txt
#	IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Fluid_HeatExchangers_Validation_DryCoilEffectivenessNTU.txt
#	IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Fluid_HeatExchangers_Validation_WetCoilEffectivenessNTU.txt
#	IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Fluid_HeatPumps_ModularReversible_Controls_Safety_Examples_Safety.txt
#	IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Fluid_HeatPumps_ModularReversible_Examples_Modular_OneRoomRadiator.txt
#	IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Fluid_Movers_Examples_ClosedLoop_y.txt
#	IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Fluid_Movers_Examples_MoverParameter.txt
#	IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Fluid_Movers_Preconfigured_Validation_ControlledFlowMachinePreconfigured.txt
#	IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Fluid_Movers_Validation_ControlledFlowMachine.txt
#	IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Fluid_Movers_Validation_ControlledFlowMachineDynamic.txt
#	IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Fluid_Movers_Validation_FlowControlled_m_flow.txt
#	IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Fluid_Movers_Validation_PumpCurveDerivatives.txt
#	IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Fluid_Movers_Validation_SpeedControlled_y.txt
#	IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Fluid_SolarCollectors_Examples_FlatPlate.txt
#	IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Fluid_SolarCollectors_Examples_Tubular.txt
#	IDEAS/Resources/ReferenceResults/Dymola/IDEAS_ThermalZones_ISO13790_Examples_FreeFloating.txt
#	IDEAS/Resources/ReferenceResults/Dymola/IDEAS_ThermalZones_ISO13790_Examples_FreeFloatingHVAC.txt
#	IDEAS/Resources/ReferenceResults/Dymola/IDEAS_ThermalZones_ISO13790_Examples_HeatingCooling.txt
#	IDEAS/Resources/ReferenceResults/Dymola/IDEAS_ThermalZones_ISO13790_Examples_HeatingCoolingHVAC.txt
#	IDEAS/Resources/ReferenceResults/Dymola/IDEAS_ThermalZones_ReducedOrder_Examples_SimpleRoomFourElements.txt
#	IDEAS/Resources/ReferenceResults/Dymola/IDEAS_ThermalZones_ReducedOrder_Examples_SimpleRoomOneElement.txt
#	IDEAS/Resources/ReferenceResults/Dymola/IDEAS_ThermalZones_ReducedOrder_Examples_SimpleRoomThreeElements.txt
#	IDEAS/Resources/ReferenceResults/Dymola/IDEAS_ThermalZones_ReducedOrder_Examples_SimpleRoomTwoElements.txt
#	IDEAS/Resources/ReferenceResults/Dymola/IDEAS_ThermalZones_ReducedOrder_Validation_VDI6007_TestCase11.txt
#	IDEAS/Resources/ReferenceResults/Dymola/IDEAS_ThermalZones_ReducedOrder_Validation_VDI6007_TestCase7.txt
@lucasverleyen lucasverleyen self-assigned this Aug 14, 2025
@lucasverleyen lucasverleyen mentioned this pull request Aug 14, 2025
@lucasverleyen
Copy link
Member Author

@jelgerjansen could you please follow up this PR? There are issues with the IDEAS.Controls package unit tests, but I have some issues with my local setup, and I will not be able to solve them before the new release...

@jelgerjansen jelgerjansen merged commit 7fd01b8 into open-ideas:master Aug 20, 2025
1 check failed
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