Merge pull request #174 from iea-annex60/issue170_massDynamics

Issue170 mass dynamics This closes #174
ibpsa · Mar 6, 2015 · c11b1e2 · c11b1e2
2 parents 9c945a7 + 6022af4
commit c11b1e2
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/Annex60/Fluid/Interfaces/ConservationEquation.mo b/Annex60/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,6 +275,11 @@ Annex60.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