From fd208090ce6414af3241c823607f0b57796ae779 Mon Sep 17 00:00:00 2001 From: hcasperfu Date: Tue, 14 May 2024 13:03:32 -0700 Subject: [PATCH 01/23] merged from Buildings - correct FlowMachineInterface --- .../Movers/BaseClasses/FlowMachineInterface.mo | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/IBPSA/Fluid/Movers/BaseClasses/FlowMachineInterface.mo b/IBPSA/Fluid/Movers/BaseClasses/FlowMachineInterface.mo index 3459f16f67..55e54d7198 100644 --- a/IBPSA/Fluid/Movers/BaseClasses/FlowMachineInterface.mo +++ b/IBPSA/Fluid/Movers/BaseClasses/FlowMachineInterface.mo @@ -611,7 +611,7 @@ equation P_internal=PEle; eta_internal=eta; WHyd = WFlo / IBPSA.Utilities.Math.Functions.smoothMax( - x1=etaMot, x2=1E-2, deltaX=1E-3); + x1=etaHyd, x2=1E-2, deltaX=1E-3); end if; if per.etaHydMet== IBPSA.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod.Power_VolumeFlowRate then @@ -642,21 +642,15 @@ equation else eta_internal = cha.efficiency(per=per.efficiency, V_flow=V_flow, d=etaDer, r_N=r_N, delta=delta); end if; - if per.powerOrEfficiencyIsHydraulic then - P_internal=WFlo/IBPSA.Utilities.Math.Functions.smoothMax( - x1=eta_internal, x2=1E-2, deltaX=1E-3); - else - P_internal=WHyd/IBPSA.Utilities.Math.Functions.smoothMax( - x1=eta_internal, x2=1E-2, deltaX=1E-3); - end if; + P_internal=WFlo/IBPSA.Utilities.Math.Functions.smoothMax( + x1=eta_internal, x2=1E-2, deltaX=1E-3); else // Not provided if per.powerOrEfficiencyIsHydraulic then eta_internal=0.7; - P_internal=WFlo/eta_internal; else eta_internal=0.49; - P_internal=WHyd/eta_internal; end if; + P_internal=WFlo/eta_internal; end if; // Motor efficiency etaMot From 005063e17f4490223b9729823db5388b3756e744 Mon Sep 17 00:00:00 2001 From: hcasperfu Date: Tue, 14 May 2024 13:04:03 -0700 Subject: [PATCH 02/23] merged from Buildings - sync changes in #1879 --- .../FMI/ExportContainers/Examples/FMUs/Fan.mo | 8 ++++ .../Examples/FMUs/HVACZones.mo | 9 +++++ .../Examples/RectangularBorefield.mo | 8 ++++ IBPSA/Fluid/Movers/Data/Generic.mo | 14 +++++-- IBPSA/Fluid/Movers/Examples/MoverParameter.mo | 8 ++++ .../Movers/Validation/FlowControlled_dp.mo | 9 +++++ .../Validation/FlowControlled_dpSystem.mo | 9 +++++ .../Validation/FlowControlled_m_flow.mo | 9 +++++ .../Movers/Validation/PumpCurveDerivatives.mo | 8 ++++ .../Fluid/Movers/Validation/Pump_y_stratos.mo | 37 ++++++++++++++----- 10 files changed, 106 insertions(+), 13 deletions(-) diff --git a/IBPSA/Fluid/FMI/ExportContainers/Examples/FMUs/Fan.mo b/IBPSA/Fluid/FMI/ExportContainers/Examples/FMUs/Fan.mo index 3437dbe556..6286308383 100644 --- a/IBPSA/Fluid/FMI/ExportContainers/Examples/FMUs/Fan.mo +++ b/IBPSA/Fluid/FMI/ExportContainers/Examples/FMUs/Fan.mo @@ -3,6 +3,7 @@ block Fan "Declaration of an FMU that exports a fan" extends IBPSA.Fluid.FMI.ExportContainers.ReplaceableTwoPort( redeclare replaceable package Medium = IBPSA.Media.Air, redeclare final Movers.FlowControlled_dp com( + nominalValuesDefineDefaultPressureCurve=true, final m_flow_nominal=m_flow_nominal, final use_inputFilter= false, @@ -44,6 +45,13 @@ IBPSA.Fluid.Movers.FlowControlled_m_flow. ", revisions="