further improved default guess and updated usersguide

ibpsa · Aug 21, 2024 · a79ade0 · a79ade0
1 parent 238db51
commit a79ade0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/IBPSA/Fluid/Movers/Data/Generic.mo b/IBPSA/Fluid/Movers/Data/Generic.mo
@@ -109,11 +109,13 @@ record Generic "Generic data record for movers"
     then
       if powerOrEfficiencyIsHydraulic
         then max(power.P)*1.2
-      else max(power.P)
+        else max(power.P)
     else
       if havePressureCurve
-        then V_flow_max/2 * dpMax/2 /etaMot_max*1.2
-      else 0
+        then if powerOrEfficiencyIsHydraulic
+          then V_flow_max/2 * dpMax/2 /peak.eta*1.2
+          else V_flow_max/2 * dpMax/2 /0.7*1.2
+        else 0
     "Rated motor power"
       annotation(Dialog(group="Power computation",
                         enable= etaMotMet==

diff --git a/IBPSA/Fluid/Movers/UsersGuide.mo b/IBPSA/Fluid/Movers/UsersGuide.mo
@@ -656,7 +656,8 @@ P<sub>mot,nominal</sub>=
 &frasl; &eta;<sub>hyd,p</sub>,
 </p>
 where the factor <i>1.2</i> also assumes a 20% oversize
-and the assumed peak hydraulic efficiency <i>&eta;<sub>hyd,p</sub>=0.7</i>.
+and the assumed peak hydraulic efficiency <i>&eta;<sub>hyd,p</sub>=0.7</i>
+unless a hydraulic peak value is available in the record.
 </li>
 </ul>
 The model then computes the efficiency the same way as in the option of