From 9fff2ee14a7bb6b18aaf4eb2c13d51ce908bf2b2 Mon Sep 17 00:00:00 2001
From: hcasperfu <hcasperfu@lbl.gov>
Date: Tue, 14 May 2024 09:08:08 -0700
Subject: [PATCH] merged from Buildings

---
 .../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</a>.
 </html>", revisions="<html>
 <ul>
 <li>
+April 9, 2024, by Hongxiang Fu:<br/>
+Specified <code>nominalValuesDefineDefaultPressureCurve=true</code>
+in the mover component to suppress a warning.
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3819\">#3819</a>.
+</li>
+<li>
 January 22, 2016, by Michael Wetter:<br/>
 Corrected type declaration of pressure difference.
 This is
diff --git a/IBPSA/Fluid/FMI/ExportContainers/Examples/FMUs/HVACZones.mo b/IBPSA/Fluid/FMI/ExportContainers/Examples/FMUs/HVACZones.mo
index 2ea53f03bd..45c3a37ee0 100644
--- a/IBPSA/Fluid/FMI/ExportContainers/Examples/FMUs/HVACZones.mo
+++ b/IBPSA/Fluid/FMI/ExportContainers/Examples/FMUs/HVACZones.mo
@@ -64,6 +64,7 @@ block HVACZones
     annotation (Placement(transformation(extent={{100,-100},{120,-80}})));
   Movers.FlowControlled_m_flow fan(
     redeclare package Medium = MediumA,
+    nominalValuesDefineDefaultPressureCurve=true,
     m_flow_nominal=mA_flow_nominal,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
     allowFlowReversal=allowFlowReversal) "Supply air fan"
@@ -162,6 +163,7 @@ block HVACZones
     redeclare package Medium = MediumA,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
     allowFlowReversal=allowFlowReversal,
+    nominalValuesDefineDefaultPressureCurve=true,
     m_flow_nominal=mA_flow_nominal/10,
     inputType=IBPSA.Fluid.Types.InputType.Constant)
     "Supply air fan that extracts a constant amount of outside air"
@@ -329,6 +331,13 @@ ports which are exposed at the FMU interface.
 </html>", revisions="<html>
 <ul>
 <li>
+April 9, 2024, by Hongxiang Fu:<br/>
+Specified <code>nominalValuesDefineDefaultPressureCurve=true</code>
+in the mover component to suppress a warning.
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3819\">#3819</a>.
+</li>
+<li>
 September 21, 2021 by David Blum:<br/>
 Correct supply and return water parameterization.<br/>
 Use explicit calculation of sensible and latent load to determine design load
diff --git a/IBPSA/Fluid/Geothermal/Borefields/Examples/RectangularBorefield.mo b/IBPSA/Fluid/Geothermal/Borefields/Examples/RectangularBorefield.mo
index 0f9b7dc7e6..12726097c6 100644
--- a/IBPSA/Fluid/Geothermal/Borefields/Examples/RectangularBorefield.mo
+++ b/IBPSA/Fluid/Geothermal/Borefields/Examples/RectangularBorefield.mo
@@ -73,6 +73,7 @@ model RectangularBorefield "Example model of a rectangular borefield"
   IBPSA.Fluid.Movers.FlowControlled_m_flow pum(
     redeclare package Medium = Medium,
     addPowerToMedium=false,
+    nominalValuesDefineDefaultPressureCurve=true,
     use_inputFilter=false,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
     inputType=IBPSA.Fluid.Types.InputType.Constant,
@@ -120,6 +121,13 @@ where <code>dBorHol</code> is the distance between the boreholes,
 </html>", revisions="<html>
 <ul>
 <li>
+April 9, 2024, by Hongxiang Fu:<br/>
+Specified <code>nominalValuesDefineDefaultPressureCurve=true</code>
+in the mover component to suppress a warning.
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3819\">#3819</a>.
+</li>
+<li>
 September 10, 2018, by Michael Wetter:<br/>
 First implementation.
 </li>
diff --git a/IBPSA/Fluid/Movers/Data/Generic.mo b/IBPSA/Fluid/Movers/Data/Generic.mo
index f1c70c74e5..e49bd6f4e3 100644
--- a/IBPSA/Fluid/Movers/Data/Generic.mo
+++ b/IBPSA/Fluid/Movers/Data/Generic.mo
@@ -29,12 +29,14 @@ record Generic "Generic data record for movers"
 
   // Efficiency computation choices
   parameter IBPSA.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod etaHydMet=
-    IBPSA.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod.EulerNumber
+    if havePressureCurve
+    then IBPSA.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod.EulerNumber
+    else IBPSA.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod.NotProvided
     "Efficiency computation method for the hydraulic efficiency etaHyd"
     annotation (Dialog(group="Power computation"));
   parameter IBPSA.Fluid.Movers.BaseClasses.Types.MotorEfficiencyMethod etaMotMet=
-    if powerOrEfficiencyIsHydraulic
-      then IBPSA.Fluid.Movers.BaseClasses.Types.MotorEfficiencyMethod.GenericCurve
+    if powerOrEfficiencyIsHydraulic and havePressureCurve
+    then IBPSA.Fluid.Movers.BaseClasses.Types.MotorEfficiencyMethod.GenericCurve
     else IBPSA.Fluid.Movers.BaseClasses.Types.MotorEfficiencyMethod.NotProvided
     "Efficiency computation method for the motor efficiency etaMot"
     annotation (Dialog(group="Power computation"));
@@ -159,6 +161,12 @@ record Generic "Generic data record for movers"
   Documentation(revisions="<html>
 <ul>
 <li>
+April 8, 2024, by Hongxiang Fu:<br/>
+Default efficiency methods now depend on whether a pressure curve is available.
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3819\">#3819</a>.
+</li>
+<li>
 March 29, 2023, by Hongxiang Fu:<br/>
 Deleted angular speed parameters with the unit rpm.
 This is for
diff --git a/IBPSA/Fluid/Movers/Examples/MoverParameter.mo b/IBPSA/Fluid/Movers/Examples/MoverParameter.mo
index 3de6f67d01..21f9ff1783 100644
--- a/IBPSA/Fluid/Movers/Examples/MoverParameter.mo
+++ b/IBPSA/Fluid/Movers/Examples/MoverParameter.mo
@@ -9,6 +9,7 @@ model MoverParameter
 
   IBPSA.Fluid.Movers.FlowControlled_m_flow pump_m_flow(
     redeclare package Medium = Medium,
+    nominalValuesDefineDefaultPressureCurve=true,
     m_flow_nominal=m_flow_nominal,
     use_inputFilter=false,
     massFlowRates={0,0.5,1}*m_flow_nominal,
@@ -88,6 +89,13 @@ set point for a mover model.
 </html>", revisions="<html>
 <ul>
 <li>
+April 8, 2024, by Hongxiang Fu:<br/>
+Specified <code>nominalValuesDefineDefaultPressureCurve=true</code>
+in the mover component to suppress a warning.
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3819\">#3819</a>.
+</li>
+<li>
 March 21, 2023, by Hongxiang Fu:<br/>
 Deleted the mover with <code>Nrpm</code> signal.
 This is for
diff --git a/IBPSA/Fluid/Movers/Validation/FlowControlled_dp.mo b/IBPSA/Fluid/Movers/Validation/FlowControlled_dp.mo
index b5e9918f75..8a91f35c56 100644
--- a/IBPSA/Fluid/Movers/Validation/FlowControlled_dp.mo
+++ b/IBPSA/Fluid/Movers/Validation/FlowControlled_dp.mo
@@ -4,11 +4,13 @@ model FlowControlled_dp "Fan with zero mass flow rate and head as input"
  extends IBPSA.Fluid.Movers.Validation.BaseClasses.FlowMachine_ZeroFlow(
     gain(k=dp_nominal),
     redeclare IBPSA.Fluid.Movers.FlowControlled_dp floMacSta(
+      nominalValuesDefineDefaultPressureCurve=true,
       redeclare package Medium = Medium,
       m_flow_nominal=m_flow_nominal,
       use_inputFilter=false,
       energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState),
     redeclare IBPSA.Fluid.Movers.FlowControlled_dp floMacDyn(
+      nominalValuesDefineDefaultPressureCurve=true,
       redeclare package Medium = Medium,
       m_flow_nominal=m_flow_nominal,
       use_inputFilter=false,
@@ -38,6 +40,13 @@ This ensures that the actual speed is equal to the input signal.
 </html>", revisions="<html>
 <ul>
 <li>
+April 8, 2024, by Hongxiang Fu:<br/>
+Specified <code>nominalValuesDefineDefaultPressureCurve=true</code>
+in the mover component to suppress a warning.
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3819\">#3819</a>.
+</li>
+<li>
 November 5, 2015, by Michael Wetter:<br/>
 Changed parameters of fan since the power is no longer a parameter.
 This is for
diff --git a/IBPSA/Fluid/Movers/Validation/FlowControlled_dpSystem.mo b/IBPSA/Fluid/Movers/Validation/FlowControlled_dpSystem.mo
index b44ccc78f2..90561b2271 100644
--- a/IBPSA/Fluid/Movers/Validation/FlowControlled_dpSystem.mo
+++ b/IBPSA/Fluid/Movers/Validation/FlowControlled_dpSystem.mo
@@ -23,6 +23,7 @@ model FlowControlled_dpSystem
     redeclare package Medium = Medium,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
     allowFlowReversal=false,
+    nominalValuesDefineDefaultPressureCurve=true,
     m_flow_nominal=1,
     use_inputFilter=false) "Regular dp controlled fan"
     annotation (Placement(transformation(extent={{-80,50},{-60,70}})));
@@ -30,6 +31,7 @@ model FlowControlled_dpSystem
     redeclare package Medium = Medium,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
     allowFlowReversal=false,
+    nominalValuesDefineDefaultPressureCurve=true,
     m_flow_nominal=1,
     use_inputFilter=false,
     prescribeSystemPressure=true)
@@ -228,6 +230,13 @@ The mass flow rates and actual pressure heads of the two configurations are comp
 </html>", revisions="<html>
 <ul>
 <li>
+April 9, 2024, by Hongxiang Fu:<br/>
+Specified <code>nominalValuesDefineDefaultPressureCurve=true</code>
+in the mover component to suppress a warning.
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3819\">#3819</a>.
+</li>
+<li>
 May 4 2017, by Filip Jorissen:<br/>
 First implementation.
 This is for
diff --git a/IBPSA/Fluid/Movers/Validation/FlowControlled_m_flow.mo b/IBPSA/Fluid/Movers/Validation/FlowControlled_m_flow.mo
index 22986b8df8..8358088f9b 100644
--- a/IBPSA/Fluid/Movers/Validation/FlowControlled_m_flow.mo
+++ b/IBPSA/Fluid/Movers/Validation/FlowControlled_m_flow.mo
@@ -5,11 +5,13 @@ model FlowControlled_m_flow
  extends IBPSA.Fluid.Movers.Validation.BaseClasses.FlowMachine_ZeroFlow(
     gain(k=m_flow_nominal),
     redeclare IBPSA.Fluid.Movers.FlowControlled_m_flow floMacSta(
+      nominalValuesDefineDefaultPressureCurve=true,
       redeclare package Medium = Medium,
       m_flow_nominal=m_flow_nominal,
       use_inputFilter=false,
       energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState),
     redeclare IBPSA.Fluid.Movers.FlowControlled_m_flow floMacDyn(
+      nominalValuesDefineDefaultPressureCurve=true,
       redeclare package Medium = Medium,
       m_flow_nominal=m_flow_nominal,
       use_inputFilter=false,
@@ -39,6 +41,13 @@ This ensures that the actual speed is equal to the input signal.
 </html>", revisions="<html>
 <ul>
 <li>
+April 8, 2024, by Hongxiang Fu:<br/>
+Specified <code>nominalValuesDefineDefaultPressureCurve=true</code>
+in the mover component to suppress a warning.
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3819\">#3819</a>.
+</li>
+<li>
 February 14, 2012, by Michael Wetter:<br/>
 Added filter for start-up and shut-down transient.
 </li>
diff --git a/IBPSA/Fluid/Movers/Validation/PumpCurveDerivatives.mo b/IBPSA/Fluid/Movers/Validation/PumpCurveDerivatives.mo
index 84e8a6f0f6..36b4d1fc34 100644
--- a/IBPSA/Fluid/Movers/Validation/PumpCurveDerivatives.mo
+++ b/IBPSA/Fluid/Movers/Validation/PumpCurveDerivatives.mo
@@ -41,6 +41,7 @@ model PumpCurveDerivatives
 
   IBPSA.Fluid.Movers.FlowControlled_m_flow forcedPump1(
     redeclare package Medium = Medium,
+    nominalValuesDefineDefaultPressureCurve=true,
     m_flow_nominal=3,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
     use_inputFilter=false) "Pump for forcing a certain mass flow rate"
@@ -154,6 +155,13 @@ monotoneously increasing or decreasing relations between <code>dp</code>,
 revisions="<html>
 <ul>
 <li>
+April 8, 2024, by Hongxiang Fu:<br/>
+Specified <code>nominalValuesDefineDefaultPressureCurve=true</code>
+in the mover component to suppress a warning.
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3819\">#3819</a>.
+</li>
+<li>
 March 21, 2023, by Hongxiang Fu:<br/>
 Replaced the pump with <code>Nrpm</code> signal with one with <code>y</code>
 signal.
diff --git a/IBPSA/Fluid/Movers/Validation/Pump_y_stratos.mo b/IBPSA/Fluid/Movers/Validation/Pump_y_stratos.mo
index 662aea46a8..e00516de18 100644
--- a/IBPSA/Fluid/Movers/Validation/Pump_y_stratos.mo
+++ b/IBPSA/Fluid/Movers/Validation/Pump_y_stratos.mo
@@ -54,28 +54,38 @@ model Pump_y_stratos "Model validation using a Wilo Stratos 80/1-12 pump"
     per=per) "Wilo Stratos pump"
     annotation (Placement(transformation(extent={{-60,-130},{-40,-110}})));
 
-  IBPSA.Fluid.Movers.FlowControlled_m_flow forcedPump1(redeclare package
-      Medium = Medium, m_flow_nominal=3,
+  IBPSA.Fluid.Movers.FlowControlled_m_flow forcedPump1(
+    redeclare package Medium = Medium,
+    nominalValuesDefineDefaultPressureCurve=true,
+    m_flow_nominal=3,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState)
     "Pump for forcing a certain mass flow rate"
     annotation (Placement(transformation(extent={{38,60},{58,80}})));
-  IBPSA.Fluid.Movers.FlowControlled_m_flow forcedPump2(redeclare package
-      Medium = Medium, m_flow_nominal=3,
+  IBPSA.Fluid.Movers.FlowControlled_m_flow forcedPump2(
+    redeclare package Medium = Medium,
+    nominalValuesDefineDefaultPressureCurve=true,
+    m_flow_nominal=3,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState)
     "Pump for forcing a certain mass flow rate"
     annotation (Placement(transformation(extent={{38,10},{58,30}})));
-  IBPSA.Fluid.Movers.FlowControlled_m_flow forcedPump3(redeclare package
-      Medium = Medium, m_flow_nominal=3,
+  IBPSA.Fluid.Movers.FlowControlled_m_flow forcedPump3(
+    redeclare package Medium = Medium,
+    nominalValuesDefineDefaultPressureCurve=true,
+    m_flow_nominal=3,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState)
     "Pump for forcing a certain mass flow rate"
     annotation (Placement(transformation(extent={{38,-36},{58,-16}})));
-  IBPSA.Fluid.Movers.FlowControlled_m_flow forcedPump4(redeclare package
-      Medium = Medium, m_flow_nominal=3,
+  IBPSA.Fluid.Movers.FlowControlled_m_flow forcedPump4(
+    redeclare package Medium = Medium,
+    nominalValuesDefineDefaultPressureCurve=true,
+    m_flow_nominal=3,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState)
     "Pump for forcing a certain mass flow rate"
     annotation (Placement(transformation(extent={{38,-80},{58,-60}})));
-  IBPSA.Fluid.Movers.FlowControlled_m_flow forcedPump5(redeclare package
-      Medium = Medium, m_flow_nominal=3,
+  IBPSA.Fluid.Movers.FlowControlled_m_flow forcedPump5(
+    redeclare package Medium = Medium,
+    nominalValuesDefineDefaultPressureCurve=true,
+    m_flow_nominal=3,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState)
     "Pump for forcing a certain mass flow rate"
     annotation (Placement(transformation(extent={{38,-130},{58,-110}})));
@@ -262,6 +272,13 @@ Wilo Stratos 80/1-12 data sheet</a>.
 revisions="<html>
 <ul>
 <li>
+April 8, 2024, by Hongxiang Fu:<br/>
+Specified <code>nominalValuesDefineDefaultPressureCurve=true</code>
+in the mover component to suppress a warning.
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3819\">#3819</a>.
+</li>
+<li>
 March 21, 2023, by Hongxiang Fu:<br/>
 Replaced the pumps with <code>Nrpm</code> signal with ones with <code>y</code>
 signal.
