Merge pull request #372 from lbl-srg/issue371_massDynamics

Merged from Annex60, branch issue170_massDynamics
lbl-srg · Mar 6, 2015 · 45fc232 · 45fc232
2 parents e1811ef + 62b8ef2
commit 45fc232
Showing 1 changed file with 16 additions and 2 deletions.
diff --git a/Buildings/Fluid/Interfaces/ConservationEquation.mo b/Buildings/Fluid/Interfaces/ConservationEquation.mo
@@ -166,7 +166,11 @@ initial equation
 
 equation
   // Total quantities
-  m = fluidVolume*medium.d;
+  if massDynamics == Modelica.Fluid.Types.Dynamics.SteadyState then
+    m = fluidVolume*rho_nominal;
+  else
+    m = fluidVolume*medium.d;
+  end if;
   mXi = m*medium.Xi;
   if computeCSen then
     U = m*medium.u + CSen*(medium.T-Medium.reference_T);
@@ -271,14 +275,24 @@ Buildings.Fluid.MixingVolumes.MixingVolume</a>.
 </html>", revisions="<html>
 <ul>
 <li>
+February 16, 2015, by Filip Jorissen:<br/>
+Fixed SteadyState massDynamics implementation for compressible media. 
+Mass <code>m</code> is now constant.
+</li>
+<li>
 February 5, 2015, by Michael Wetter:<br/>
 Changed <code>initalize_p</code> from a <code>parameter</code> to a
 <code>constant</code>. This is only required in finite volume models
 of heat exchangers (to avoid consistent but redundant initial conditions)
 and hence it should be set as a <code>constant</code>.
 </li>
 <li>
-October 21, 2014, by Filip Jorissen:<br/>
+February 3, 2015, by Michael Wetter:<br/>
+Removed <code>stateSelect.prefer</code> for temperature.
+This is for
+<a href=\"https://github.com/iea-annex60/modelica-annex60/issues/160\">#160</a>.
+</li>
+<li>October 21, 2014, by Filip Jorissen:<br/>
 Added parameter <code>mFactor</code> to increase the thermal capacity.
 </li>
 <li>