diff --git a/IBPSA/Fluid/Movers/BaseClasses/FlowMachineInterface.mo b/IBPSA/Fluid/Movers/BaseClasses/FlowMachineInterface.mo index 3459f16f67..1114cfb886 100644 --- a/IBPSA/Fluid/Movers/BaseClasses/FlowMachineInterface.mo +++ b/IBPSA/Fluid/Movers/BaseClasses/FlowMachineInterface.mo @@ -109,13 +109,15 @@ model FlowMachineInterface Modelica.Blocks.Interfaces.RealOutput etaHyd( final quantity="Efficiency", - final unit="1") "Hydraulic efficiency" + final unit="1", + start = 0.7) "Hydraulic efficiency" annotation (Placement(transformation(extent={{100,-90},{120,-70}}), iconTransformation(extent={{100,-90},{120,-70}}))); Modelica.Blocks.Interfaces.RealOutput etaMot( final quantity="Efficiency", - final unit="1") "Motor efficiency" + final unit="1", + start = 0.7) "Motor efficiency" annotation (Placement(transformation(extent={{100,-110},{120,-90}}), iconTransformation(extent={{100,-110},{120,-90}}))); @@ -611,7 +613,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 +644,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 @@ -865,6 +861,15 @@ See discussions and an example of this situation in revisions="