Merged Annex60.Fluid.Movers for #369

lbl-srg · Mar 6, 2015 · 521b970 · 521b970
1 parent 250d7bb
commit 521b970
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 11 deletions.
diff --git a/Buildings/Fluid/Movers/BaseClasses/FlowControlled.mo b/Buildings/Fluid/Movers/BaseClasses/FlowControlled.mo
@@ -15,10 +15,7 @@ model FlowControlled
      final rho_default = Medium.density(sta_default));
 
   import cha = Buildings.Fluid.Movers.BaseClasses.Characteristics;
-//  parameter Modelica.SIunits.MassFlowRate m_flow_nominal
-//    "Nominal mass flow rate, used as flow rate if control_m_flow";
-//  parameter Modelica.SIunits.MassFlowRate m_flow_max = m_flow_nominal
-//    "Maximum mass flow rate (at zero head)";
+
   // what to control
   constant Boolean control_m_flow "= false to control head instead of m_flow"
     annotation(Evaluate=true);
@@ -51,7 +48,7 @@ equation
   etaHyd = cha.efficiency(per=per.hydraulicEfficiency, V_flow=VMachine_flow, d=hydDer, r_N=1, delta=1E-4);
   etaMot = cha.efficiency(per=per.motorEfficiency,     V_flow=VMachine_flow, d=motDer, r_N=1, delta=1E-4);
   dpMachine = -dp;
-  VMachine_flow = -port_b.m_flow/rho_in;
+  VMachine_flow = port_a.m_flow/rho_in;
   // To compute the electrical power, we set a lower bound for eta to avoid
   // a division by zero.
   P = WFlo / Buildings.Utilities.Math.Functions.smoothMax(x1=eta, x2=1E-5, deltaX=1E-6);

diff --git a/Buildings/Fluid/Movers/BaseClasses/FlowMachineInterface.mo b/Buildings/Fluid/Movers/BaseClasses/FlowMachineInterface.mo
@@ -118,7 +118,7 @@ protected
     "Volume flow rate vs. total pressure rise with correction for pump resistance added";
 
   parameter
-    Buildings.Fluid.Movers.BaseClasses.Characteristics.flowParametersInternal pCur2(
+    Buildings.Fluid.Movers.BaseClasses.Characteristics.flowParametersInternal         pCur2(
     final n = nOri + 1,
     V_flow = if (haveVMax and haveDPMax) or (nOri == 2) then
                 zeros(nOri + 1)
@@ -137,10 +137,8 @@ protected
              else
                zeros(nOri+1))
     "Volume flow rate vs. total pressure rise with correction for pump resistance added";
-                                  // fixme check whether these branches are correct
-                                  // fixme check whether these branches are correct
   parameter
-    Buildings.Fluid.Movers.BaseClasses.Characteristics.flowParametersInternal pCur3(
+    Buildings.Fluid.Movers.BaseClasses.Characteristics.flowParametersInternal         pCur3(
     final n = nOri + 2,
     V_flow = if (haveVMax and haveDPMax) or (nOri == 2) then
                zeros(nOri + 2)

diff --git a/Buildings/Fluid/Movers/BaseClasses/PowerInterface.mo b/Buildings/Fluid/Movers/BaseClasses/PowerInterface.mo
@@ -74,7 +74,6 @@ initial algorithm
 
 equation
   eta = etaHyd * etaMot;
-//  WFlo = eta * P;
   // Flow work
   WFlo = dpMachine*VMachine_flow;
   // Hydraulic power (transmitted by shaft), etaHyd = WFlo/WHyd

diff --git a/Buildings/Fluid/Movers/BaseClasses/package.order b/Buildings/Fluid/Movers/BaseClasses/package.order
@@ -1,7 +1,7 @@
-Characteristics
 FlowControlled
 FlowMachineInterface
 IdealSource
 PartialFlowMachine
 PowerInterface
 SpeedControlled
+Characteristics