merged from Buildings - correct FlowMachineInterface

ibpsa · May 14, 2024 · fd20809 · fd20809
1 parent 83fc750
commit fd20809
Showing 1 changed file with 4 additions and 10 deletions.
diff --git 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