From 38b4798432328a56fd6c6d1e316a7842badb394a Mon Sep 17 00:00:00 2001
From: Filip Jorissen <filip.jorissen@kuleuven.be>
Date: Wed, 14 Aug 2019 19:16:01 +0200
Subject: [PATCH 01/17] removed checkBoundary for #1

---
 .../Sources/BaseClasses/PartialSource_Xi_C.mo     | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/IbpsaMpc/Fluid/Sources/BaseClasses/PartialSource_Xi_C.mo b/IbpsaMpc/Fluid/Sources/BaseClasses/PartialSource_Xi_C.mo
index 289d7c7..1a73d81 100644
--- a/IbpsaMpc/Fluid/Sources/BaseClasses/PartialSource_Xi_C.mo
+++ b/IbpsaMpc/Fluid/Sources/BaseClasses/PartialSource_Xi_C.mo
@@ -39,16 +39,7 @@ initial equation
   assert(not use_X_in or not use_Xi_in,
     "Cannot use both X and Xi inputs, choose either use_X_in or use_Xi_in.");
 
-  if not use_X_in and not use_Xi_in then
-    Modelica.Fluid.Utilities.checkBoundary(Medium.mediumName, Medium.substanceNames,
-      Medium.singleState, true, X_in_internal, "Boundary_pT");
-  end if;
-
 equation
-  if use_X_in or use_Xi_in then
-    Modelica.Fluid.Utilities.checkBoundary(Medium.mediumName, Medium.substanceNames,
-      Medium.singleState, true, X_in_internal, "Boundary_pT");
-  end if;
   connect(X_in[1:Medium.nXi], Xi_in_internal);
   connect(X_in,X_in_internal);
   connect(Xi_in, Xi_in_internal);
@@ -107,6 +98,12 @@ Otherwise the parameter value is used.
 </html>", revisions="<html>
 <ul>
 <li>
+Augustus 14, 2019, by Filip Jorissen:<br/>
+Removed <code>checkBoundary</code> for JModelica compatibility.
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa-mpc/issues/1\">#1</a>.
+</li>
+<li>
 February 13, 2018, by Michael Wetter:<br/>
 Corrected error in quantity assignment for <code>Xi_in</code>.
 This is for

From fb30ee53d2458c7a6e5d641911cfcc8014ba456b Mon Sep 17 00:00:00 2001
From: Filip Jorissen <filip.jorissen@kuleuven.be>
Date: Tue, 10 Sep 2019 10:26:32 +0200
Subject: [PATCH 02/17] added merge script

---
 IbpsaMpc/Resources/Scripts/merge.py | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 IbpsaMpc/Resources/Scripts/merge.py

diff --git a/IbpsaMpc/Resources/Scripts/merge.py b/IbpsaMpc/Resources/Scripts/merge.py
new file mode 100644
index 0000000..ac4d9b2
--- /dev/null
+++ b/IbpsaMpc/Resources/Scripts/merge.py
@@ -0,0 +1,26 @@
+import buildingspy.development.merger as m
+import os
+modelicapath = os.environ["MODELICAPATH"]
+ibpsa_dir = os.path.join(modelicapath, "IBPSA")
+dest_dir = os.path.join(modelicapath, "IbpsaMpc")
+mer = m.IBPSA(ibpsa_dir, dest_dir) # doctest: +SKIP
+
+files={
+"IBPSA.Fluid.Sources.Boundary_pT": {},
+"IBPSA.Fluid.Sources.Boundary_ph": {},
+"IBPSA.Fluid.Sources.MassFlowSource_T": {},
+"IBPSA.Fluid.Sources.MassFlowSource_h": {},
+"IBPSA.Fluid.Sources.PropertySource_T": {},
+"IBPSA.Fluid.Sources.PropertySource_h": {},
+"IBPSA.Fluid.Sources.BaseClasses.PartialPropertySource": {},
+"IBPSA.Fluid.Sources.BaseClasses.PartialSource": {},
+"IBPSA.Fluid.Sources.BaseClasses.PartialSource_Xi_C": {},
+"IBPSA.Fluid.Interfaces.PartialTwoPort": {},
+"IBPSA.Media.Air": {},
+# "": {},
+# "": {},
+
+		}
+
+
+mer.mergeIbpsaMpc(files)

From 728d2de7aca719a79bd1f4eb7a84c9544acbf159 Mon Sep 17 00:00:00 2001
From: Filip Jorissen <filip.jorissen@kuleuven.be>
Date: Tue, 10 Sep 2019 10:26:44 +0200
Subject: [PATCH 03/17] merged sources

---
 IbpsaMpc/.copiedFiles.txt                     |   18 +
 IbpsaMpc/Fluid/Interfaces/PartialTwoPort.mo   |  110 ++
 IbpsaMpc/Fluid/Interfaces/package.mo          |  227 ++++
 IbpsaMpc/Fluid/Interfaces/package.order       |    2 +
 .../BaseClasses/PartialPropertySource.mo      |  132 ++
 .../Sources/BaseClasses/PartialSource.mo      |    7 +-
 .../Sources/BaseClasses/PartialSource_Xi_C.mo |   16 +-
 .../Fluid/Sources/BaseClasses/package.order   |    1 +
 IbpsaMpc/Fluid/Sources/Boundary_ph.mo         |  192 +++
 IbpsaMpc/Fluid/Sources/MassFlowSource_T.mo    |  179 +++
 IbpsaMpc/Fluid/Sources/MassFlowSource_h.mo    |  175 +++
 IbpsaMpc/Fluid/Sources/PropertySource_T.mo    |   82 ++
 IbpsaMpc/Fluid/Sources/PropertySource_h.mo    |   69 +
 IbpsaMpc/Fluid/Sources/package.mo             |    8 +
 IbpsaMpc/Fluid/Sources/package.order          |    7 +-
 IbpsaMpc/Fluid/package.mo                     |  415 ++++++
 IbpsaMpc/Fluid/package.order                  |    2 +
 IbpsaMpc/Media/Air.mo                         | 1148 +++++++++++++++++
 IbpsaMpc/Media/package.mo                     |   51 +
 IbpsaMpc/Media/package.order                  |    1 +
 IbpsaMpc/package.order                        |    1 +
 21 files changed, 2833 insertions(+), 10 deletions(-)
 create mode 100644 IbpsaMpc/.copiedFiles.txt
 create mode 100644 IbpsaMpc/Fluid/Interfaces/PartialTwoPort.mo
 create mode 100644 IbpsaMpc/Fluid/Interfaces/package.mo
 create mode 100644 IbpsaMpc/Fluid/Interfaces/package.order
 create mode 100644 IbpsaMpc/Fluid/Sources/BaseClasses/PartialPropertySource.mo
 create mode 100644 IbpsaMpc/Fluid/Sources/Boundary_ph.mo
 create mode 100644 IbpsaMpc/Fluid/Sources/MassFlowSource_T.mo
 create mode 100644 IbpsaMpc/Fluid/Sources/MassFlowSource_h.mo
 create mode 100644 IbpsaMpc/Fluid/Sources/PropertySource_T.mo
 create mode 100644 IbpsaMpc/Fluid/Sources/PropertySource_h.mo
 create mode 100644 IbpsaMpc/Media/Air.mo
 create mode 100644 IbpsaMpc/Media/package.mo
 create mode 100644 IbpsaMpc/Media/package.order

diff --git a/IbpsaMpc/.copiedFiles.txt b/IbpsaMpc/.copiedFiles.txt
new file mode 100644
index 0000000..d5f515d
--- /dev/null
+++ b/IbpsaMpc/.copiedFiles.txt
@@ -0,0 +1,18 @@
+# Do not edit this file unless you know what you are doing.
+# This file is used by the IBPSA merge script and generated by BuildingsPy.
+IbpsaMpc/Fluid/Interfaces/PartialTwoPort.mo
+IbpsaMpc/Fluid/Interfaces/package.mo
+IbpsaMpc/Fluid/Sources/BaseClasses/PartialPropertySource.mo
+IbpsaMpc/Fluid/Sources/BaseClasses/PartialSource.mo
+IbpsaMpc/Fluid/Sources/BaseClasses/PartialSource_Xi_C.mo
+IbpsaMpc/Fluid/Sources/BaseClasses/package.mo
+IbpsaMpc/Fluid/Sources/Boundary_pT.mo
+IbpsaMpc/Fluid/Sources/Boundary_ph.mo
+IbpsaMpc/Fluid/Sources/MassFlowSource_T.mo
+IbpsaMpc/Fluid/Sources/MassFlowSource_h.mo
+IbpsaMpc/Fluid/Sources/PropertySource_T.mo
+IbpsaMpc/Fluid/Sources/PropertySource_h.mo
+IbpsaMpc/Fluid/Sources/package.mo
+IbpsaMpc/Fluid/package.mo
+IbpsaMpc/Media/Air.mo
+IbpsaMpc/Media/package.mo
diff --git a/IbpsaMpc/Fluid/Interfaces/PartialTwoPort.mo b/IbpsaMpc/Fluid/Interfaces/PartialTwoPort.mo
new file mode 100644
index 0000000..22af89a
--- /dev/null
+++ b/IbpsaMpc/Fluid/Interfaces/PartialTwoPort.mo
@@ -0,0 +1,110 @@
+within IbpsaMpc.Fluid.Interfaces;
+partial model PartialTwoPort "Partial component with two ports"
+  replaceable package Medium =
+    Modelica.Media.Interfaces.PartialMedium "Medium in the component"
+      annotation (choices(
+        choice(redeclare package Medium = IbpsaMpc.Media.Air "Moist air"),
+        choice(redeclare package Medium = IbpsaMpc.Media.Water "Water"),
+        choice(redeclare package Medium =
+            IbpsaMpc.Media.Antifreeze.PropyleneGlycolWater (
+              property_T=293.15,
+              X_a=0.40)
+              "Propylene glycol water, 40% mass fraction")));
+
+  parameter Boolean allowFlowReversal = true
+    "= false to simplify equations, assuming, but not enforcing, no flow reversal"
+    annotation(Dialog(tab="Assumptions"), Evaluate=true);
+
+  Modelica.Fluid.Interfaces.FluidPort_a port_a(
+    redeclare final package Medium = Medium,
+     m_flow(min=if allowFlowReversal then -Modelica.Constants.inf else 0),
+     h_outflow(start = Medium.h_default, nominal = Medium.h_default))
+    "Fluid connector a (positive design flow direction is from port_a to port_b)"
+    annotation (Placement(transformation(extent={{-110,-10},{-90,10}})));
+  Modelica.Fluid.Interfaces.FluidPort_b port_b(
+    redeclare final package Medium = Medium,
+    m_flow(max=if allowFlowReversal then +Modelica.Constants.inf else 0),
+     h_outflow(start = Medium.h_default, nominal = Medium.h_default))
+    "Fluid connector b (positive design flow direction is from port_a to port_b)"
+    annotation (Placement(transformation(extent={{110,-10},{90,10}})));
+
+  annotation (
+    Documentation(info="<html>
+<p>
+This partial model defines an interface for components with two ports.
+The treatment of the design flow direction and of flow reversal are predefined based on the parameter <code>allowFlowReversal</code>.
+The component may transport fluid and may have internal storage for a given fluid <code>Medium</code>.
+</p>
+<h4>Implementation</h4>
+<p>
+This model is similar to
+<a href=\"modelica://Modelica.Fluid.Interfaces.PartialTwoPort\">
+Modelica.Fluid.Interfaces.PartialTwoPort</a>
+but it does not use the <code>outer system</code> declaration.
+This declaration is omitted as in building energy simulation,
+many models use multiple media, an in practice,
+users have not used this global definition to assign parameters.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+January 18, 2019, by Jianjun Hu:<br/>
+Limited the media choice.
+See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1050\">#1050</a>.
+</li>
+<li>
+July 8, 2018, by Filip Jorissen:<br/>
+Added nominal value of <code>h_outflow</code> in <code>FluidPorts</code>.
+See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/977\">#977</a>.
+</li>
+<li>
+November 19, 2015, by Michael Wetter:<br/>
+Removed parameters
+<code>port_a_exposesState</code> and
+<code>port_b_exposesState</code>
+for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/351\">#351</a>
+and
+<code>showDesignFlowDirection</code>
+for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/349\">#349</a>.
+</li>
+<li>
+November 13, 2015, by Michael Wetter:<br/>
+Assinged <code>start</code> attribute for leaving
+enthalpy at <code>port_a</code> and <code>port_b</code>.
+This was done to make the model similar to
+<a href=\"modelica://IbpsaMpc.Fluid.Interfaces.PartialFourPort\">
+IbpsaMpc.Fluid.Interfaces.PartialFourPort</a>.
+</li>
+<li>
+November 12, 2015, by Michael Wetter:<br/>
+Removed import statement.
+</li>
+<li>
+October 21, 2014, by Michael Wetter:<br/>
+Revised implementation.
+Declared medium in ports to be <code>final</code>.
+</li>
+<li>
+October 20, 2014, by Filip Jorisson:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+    Icon(coordinateSystem(
+          preserveAspectRatio=true,
+          extent={{-100,-100},{100,100}}), graphics={
+        Polygon(
+          points={{20,-70},{60,-85},{20,-100},{20,-70}},
+          lineColor={0,128,255},
+          fillColor={0,128,255},
+          fillPattern=FillPattern.Solid,
+          visible=not allowFlowReversal),
+        Line(
+          points={{55,-85},{-60,-85}},
+          color={0,128,255},
+          visible=not allowFlowReversal),
+        Text(
+          extent={{-149,-114},{151,-154}},
+          lineColor={0,0,255},
+          textString="%name")}));
+end PartialTwoPort;
diff --git a/IbpsaMpc/Fluid/Interfaces/package.mo b/IbpsaMpc/Fluid/Interfaces/package.mo
new file mode 100644
index 0000000..529d58a
--- /dev/null
+++ b/IbpsaMpc/Fluid/Interfaces/package.mo
@@ -0,0 +1,227 @@
+within IbpsaMpc.Fluid;
+package Interfaces "Package with interfaces for fluid models"
+  extends Modelica.Icons.InterfacesPackage;
+
+
+package UsersGuide "User's Guide"
+  extends Modelica.Icons.Information;
+  annotation (preferredView="info",
+  Documentation(info="<html>
+<p>
+The package <code>IbpsaMpc.Fluid.Interface</code> consists of basic
+classes that can be used by developers to create new component models.
+</p>
+<p>
+The classes whose name contains <code>TwoPort</code> or
+<code>FourPort</code> can be used for components with
+two or four fluid ports, respectively. If a class name contains
+<code>Static</code>, then it can only be used for a steady-state model.
+Otherwise, it may be used for a steady-state or a dynamic model.
+</p>
+<p>
+The most basic classes are the records
+<a href=\"modelica://IbpsaMpc.Fluid.Interfaces.TwoPortFlowResistanceParameters\">
+IbpsaMpc.Fluid.Interfaces.TwoPortFlowResistanceParameters</a>,
+<a href=\"modelica://IbpsaMpc.Fluid.Interfaces.FourPortFlowResistanceParameters\">
+IbpsaMpc.Fluid.Interfaces.FourPortFlowResistanceParameters</a> and
+<a href=\"modelica://IbpsaMpc.Fluid.Interfaces.LumpedVolumeDeclarations\">
+IbpsaMpc.Fluid.Interfaces.LumpedVolumeDeclarations</a>.
+These define parameters that are needed by many fluid flow components.
+</p>
+
+<p>
+Next, we describe the basic classes. For a more detailed description,
+see the <i>info</i> section of the class.
+</p>
+<table summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr>
+<!-- ============================================== -->
+  <td><a href=\"modelica://IbpsaMpc.Fluid.Interfaces.ConservationEquation\">
+      IbpsaMpc.Fluid.Interfaces.ConservationEquation</a>
+  </td>
+  <td><p>
+      This is a basic model for an ideally mixed fluid volume.
+      It implements conservation equations for mass and energy.
+      The conservation equations can be dynamic or steady-state.
+      The model can have an arbitrary number of fluid ports.
+      Models that instanciate this model need to define the input
+      <code>fluidVolume</code>, which is the actual volume occupied by the fluid.
+      For most components, this can be set to a parameter. However, for components such as
+      expansion vessels, the fluid volume can change in time.
+      </p>
+
+      The model has the following input connectors:<br/>
+<ul>
+<li>
+<code>Q_flow</code>, which is the sensible plus latent heat flow rate added to the medium, and
+</li>
+<li>
+<code>mXi_flow</code>, which is the species mass flow rate added to the medium.
+</li>
+</ul>
+
+  <p>
+  Models that instanciate this model can used these connectors to interface with the conservation equations.
+  </p>
+  </td>
+</tr>
+<!-- ============================================== -->
+<tr>
+  <td><a href=\"modelica://IbpsaMpc.Fluid.Interfaces.StaticTwoPortConservationEquation\">
+      IbpsaMpc.Fluid.Interfaces.StaticTwoPortConservationEquation</a>
+  </td>
+  <td><p>
+      This is a basic model for steady-state conservation equations
+      for mass and energy of a component with two fluid ports.
+      </p>
+
+      The model has the following input connectors:<br/>
+<ul>
+<li>
+<code>Q_flow</code>, which is the sensible plus latent heat flow rate added to the medium, and
+</li>
+<li>
+<code>mXi_flow</code>, which is the species mass flow rate added to the medium.
+</li>
+</ul>
+
+  <p>
+  Models that instanciate this model can used these connectors to interface with the conservation equations.
+  </p>
+ <p>
+  Compared to
+  <a href=\"modelica://IbpsaMpc.Fluid.Interfaces.ConservationEquation\">
+      IbpsaMpc.Fluid.Interfaces.ConservationEquation</a>
+  this model provides a more efficient implementation of the steady-state conservation equations for
+  models with two fluid ports.
+  </p>
+  </td>
+</tr>
+<!-- ============================================== -->
+<tr>
+  <td>
+     <a href=\"modelica://IbpsaMpc.Fluid.Interfaces.PartialFourPort\">
+                          IbpsaMpc.Fluid.Interfaces.PartialFourPort</a>
+  </td>
+  <td>
+     This model defines an interface for components with four ports.
+     Only parameters and fluid definitions are provided, but no
+     equations.
+     The model is identical to
+     <a href=\"modelica://Modelica.Fluid.Interfaces.PartialTwoPort\">
+     Modelica.Fluid.Interfaces.PartialTwoPort</a>, except that it has
+     four ports.
+  </td>
+</tr>
+<!-- ============================================== -->
+<tr>
+  <td>
+    <a href=\"modelica://IbpsaMpc.Fluid.Interfaces.PrescribedOutlet\">
+                         IbpsaMpc.Fluid.Interfaces.PrescribedOutlet</a>
+  </td>
+  <td>
+    This model calculates a prescribed heat flow (e.g. for an ideal heater or cooler),
+    depending on a set temperature <code>TSet</code>.
+  </td>
+</tr>
+<!-- ============================================== -->
+<tr>
+  <td>
+     <a href=\"modelica://IbpsaMpc.Fluid.Interfaces.PartialTwoPortInterface\">
+                          IbpsaMpc.Fluid.Interfaces.PartialTwoPortInterface</a>
+  </td>
+  <td>
+     This model defines the interface for component models that transport
+     fluid, and that can exchange heat and mass.
+     It also defines the port pressure difference as
+     <i>&Delta;p = p<sub>a</sub>-p<sub>b</sub></i>. However, no equation is
+     implemented to compute <i>&Delta;p(&sdot;)</i> as a function of the
+     mass flow rate. The model also implements equations to obtain the
+     thermodynamic state at the ports.
+  </td>
+</tr>
+<!-- ============================================== -->
+<tr>
+  <td>
+     <a href=\"modelica://IbpsaMpc.Fluid.Interfaces.PartialFourPortInterface\">
+                          IbpsaMpc.Fluid.Interfaces.PartialFourPortInterface</a>
+  </td>
+  <td>
+     This model is identical to
+     <a href=\"modelica://IbpsaMpc.Fluid.Interfaces.PartialTwoPortInterface\">
+                          IbpsaMpc.Fluid.Interfaces.PartialTwoPortInterface</a>
+     but it can be used for components with four fluid ports.
+  </td>
+</tr>
+<!-- ============================================== -->
+<tr>
+  <td>
+     <a href=\"modelica://IbpsaMpc.Fluid.Interfaces.StaticTwoPortHeatMassExchanger\">
+                          IbpsaMpc.Fluid.Interfaces.StaticTwoPortHeatMassExchanger</a>
+  </td>
+  <td>
+     This model implements the pressure drop as a function of the mass flow rate.
+     It also implements the steady-state energy and mass conservation
+     equations. However, it does not implement an equation that computes
+     <code>Q_flow</code>, the
+     sensible and latent heat transfer to the medium flow, nor
+     does it implement an equation for <code>mXi_flow</code>,
+     the species mass flow rate added to or removed from the medium.
+     Models that extend this model need to provide equations
+     for <code>Q_flow</code> and <code>mXi_flow</code>.
+  </td>
+</tr>
+<!-- ============================================== -->
+<tr>
+  <td>
+     <a href=\"modelica://IbpsaMpc.Fluid.Interfaces.StaticFourPortHeatMassExchanger\">
+                          IbpsaMpc.Fluid.Interfaces.StaticFourPortHeatMassExchanger</a>
+  </td>
+  <td>
+     This model is identical to
+     <a href=\"modelica://IbpsaMpc.Fluid.Interfaces.StaticTwoPortHeatMassExchanger\">
+                          IbpsaMpc.Fluid.Interfaces.StaticTwoPortHeatMassExchanger</a>
+     except that it has four ports.
+  </td>
+</tr>
+<!-- ============================================== -->
+<tr>
+  <td>
+     <a href=\"modelica://IbpsaMpc.Fluid.Interfaces.TwoPortHeatMassExchanger\">
+                          IbpsaMpc.Fluid.Interfaces.TwoPortHeatMassExchanger</a>
+  </td>
+  <td>
+     This model implements the pressure drop as a function of the mass flow rate.
+     It also implements the energy and mass conservation equations, which may be
+     configured as steady-state or dynamic balances based on a parameter.
+  </td>
+</tr>
+<!-- ============================================== -->
+<tr>
+  <td>
+     <a href=\"modelica://IbpsaMpc.Fluid.Interfaces.FourPortHeatMassExchanger\">
+                          IbpsaMpc.Fluid.Interfaces.FourPortHeatMassExchanger</a>
+  </td>
+  <td>
+     This model is identical to
+     <a href=\"modelica://IbpsaMpc.Fluid.Interfaces.TwoPortHeatMassExchanger\">
+                          IbpsaMpc.Fluid.Interfaces.TwoPortHeatMassExchanger</a>
+     except that it has four ports.
+  </td>
+</tr>
+</table>
+
+</html>"));
+
+end UsersGuide;
+
+
+annotation (preferredView="info", Documentation(info="<html>
+<p>
+This package contains basic classes that are used to build
+component models that change the state of the
+fluid. The classes are not directly usable, but can
+be extended when building a new model.
+</p>
+</html>"));
+end Interfaces;
diff --git a/IbpsaMpc/Fluid/Interfaces/package.order b/IbpsaMpc/Fluid/Interfaces/package.order
new file mode 100644
index 0000000..231f1d2
--- /dev/null
+++ b/IbpsaMpc/Fluid/Interfaces/package.order
@@ -0,0 +1,2 @@
+UsersGuide
+PartialTwoPort
diff --git a/IbpsaMpc/Fluid/Sources/BaseClasses/PartialPropertySource.mo b/IbpsaMpc/Fluid/Sources/BaseClasses/PartialPropertySource.mo
new file mode 100644
index 0000000..11b85ce
--- /dev/null
+++ b/IbpsaMpc/Fluid/Sources/BaseClasses/PartialPropertySource.mo
@@ -0,0 +1,132 @@
+within IbpsaMpc.Fluid.Sources.BaseClasses;
+partial model PartialPropertySource
+  "Partial model for overriding fluid properties that flow through the component"
+  extends IbpsaMpc.Fluid.Interfaces.PartialTwoPort;
+
+  parameter Boolean use_Xi_in= false
+    "Set to true to get the composition from the input connector"
+    annotation(Evaluate=true, Dialog(group="Inputs"));
+  parameter Boolean use_C_in= false
+    "Set to true to get the trace substances from the input connector"
+    annotation(Evaluate=true, Dialog(group="Inputs"));
+
+  Modelica.Blocks.Interfaces.RealInput Xi_in[Medium.nXi] if use_Xi_in
+    "Prescribed values for composition" annotation (Placement(transformation(
+        extent={{-20,-20},{20,20}},
+        rotation=270,
+        origin={0,120})));
+  Modelica.Blocks.Interfaces.RealInput C_in[Medium.nC](
+    final quantity=Medium.extraPropertiesNames) if use_C_in
+    "Prescribed values for trace substances" annotation (Placement(
+        transformation(
+        extent={{-20,-20},{20,20}},
+        rotation=270,
+        origin={40,120})));
+protected
+  Modelica.Blocks.Interfaces.RealOutput h_internal_a
+    "Internal outlet value of port_a.h_outflow";
+  Modelica.Blocks.Interfaces.RealOutput h_internal_b
+    "Internal outlet value of port_b.h_outflow";
+  Modelica.Blocks.Interfaces.RealOutput h_in_a = inStream(port_a.h_outflow)
+    "Connector for inStream value of port_a.h_outflow";
+  Modelica.Blocks.Interfaces.RealOutput h_in_b = inStream(port_b.h_outflow)
+    "Connector for inStream value of port_b.h_outflow";
+
+  Modelica.Blocks.Interfaces.RealOutput[Medium.nXi] Xi_internal_a
+    "Internal outlet value of port_a.Xi_outflow";
+  Modelica.Blocks.Interfaces.RealOutput[Medium.nXi] Xi_internal_b
+    "Internal outlet value of port_b.Xi_outflow";
+  Modelica.Blocks.Interfaces.RealOutput[Medium.nXi] Xi_in_a = inStream(port_a.Xi_outflow)
+    "Connector for inStream value of port_a.Xi_outflow";
+  Modelica.Blocks.Interfaces.RealOutput[Medium.nXi] Xi_in_b = inStream(port_b.Xi_outflow)
+    "Connector for inStream value of port_b.Xi_outflow";
+
+  Modelica.Blocks.Interfaces.RealInput[Medium.nC] C_internal_a
+    "Internal outlet value of port_a.C_outflow";
+  Modelica.Blocks.Interfaces.RealInput[Medium.nC] C_internal_b
+    "Internal outlet value of port_b.C_outflow";
+  Modelica.Blocks.Interfaces.RealOutput[Medium.nC] C_in_a = inStream(port_a.C_outflow)
+    "Connector for inStream value of port_a.C_outflow";
+  Modelica.Blocks.Interfaces.RealOutput[Medium.nC] C_in_b = inStream(port_b.C_outflow)
+    "Connector for inStream value of port_b.C_outflow";
+equation
+  connect(Xi_internal_a, Xi_in);
+  connect(Xi_internal_b, Xi_in);
+  if not (use_Xi_in) then
+    connect(Xi_internal_a,Xi_in_b);
+    connect(Xi_internal_b,Xi_in_a);
+  end if;
+
+  connect(C_internal_a, C_in);
+  connect(C_internal_b, C_in);
+  if not (use_C_in) then
+    connect(C_internal_a,C_in_b);
+    connect(C_internal_b,C_in_a);
+  end if;
+
+  port_a.h_outflow = if allowFlowReversal then h_internal_a else Medium.h_default;
+  port_b.h_outflow = h_internal_b;
+  port_a.Xi_outflow = if allowFlowReversal then Xi_internal_a else Medium.X_default[1:Medium.nXi];
+  port_b.Xi_outflow = Xi_internal_b;
+  port_a.C_outflow = if allowFlowReversal then C_internal_a else zeros(Medium.nC);
+  port_b.C_outflow = C_internal_b;
+
+  port_a.p = port_b.p;
+  port_a.m_flow + port_b.m_flow = 0;
+
+  annotation (defaultComponentName="proSou",
+        Icon(coordinateSystem(preserveAspectRatio=true,  extent={{-100,
+            -100},{100,100}}), graphics={
+        Text(
+          visible=use_Xi_in,
+          extent={{-48,98},{54,58}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          textString="Xi"),
+        Text(
+          visible=use_C_in,
+          extent={{-10,98},{92,58}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          textString="C"),
+        Rectangle(
+          extent={{-100,60},{100,-60}},
+          lineColor={0,0,0},
+          fillPattern=FillPattern.HorizontalCylinder,
+          fillColor={192,192,192}),
+        Rectangle(
+          extent={{-100,50},{100,-48}},
+          lineColor={0,0,0},
+          fillPattern=FillPattern.HorizontalCylinder,
+          fillColor={0,127,255})}),
+    Documentation(info="<html>
+<p>
+Model that changes the properties, 
+but not the mass flow rate,
+of the fluid that passes through it.
+</p>
+<h4>Typical use and important parameters</h4>
+<p>
+If <code>allowFlowReversal=true</code>, then the properties are changed for both flow directions,
+i.e., from <code>port_a</code> to <code>port_b</code> and
+from <code>port_b</code> to <code>port_a</code>.
+</p>
+<h4>Dynamics</h4>
+<p>
+This model has no dynamics.
+</p>
+</html>",
+revisions="<html>
+<ul>
+<li>
+April 30, 2018, by Filip Jorissen:<br/>
+First implementation.
+See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/881\">#881</a>.
+</li>
+</ul>
+</html>"),
+    Diagram(coordinateSystem(preserveAspectRatio=true,  extent={{-100,-100},{
+            100,100}})));
+end PartialPropertySource;
diff --git a/IbpsaMpc/Fluid/Sources/BaseClasses/PartialSource.mo b/IbpsaMpc/Fluid/Sources/BaseClasses/PartialSource.mo
index d8c1f69..abbfb14 100644
--- a/IbpsaMpc/Fluid/Sources/BaseClasses/PartialSource.mo
+++ b/IbpsaMpc/Fluid/Sources/BaseClasses/PartialSource.mo
@@ -5,10 +5,10 @@ partial model PartialSource
   replaceable package Medium =
     Modelica.Media.Interfaces.PartialMedium "Medium in the component"
       annotation (choices(
-        choice(redeclare package Medium = IBPSA.Media.Air "Moist air"),
-        choice(redeclare package Medium = IBPSA.Media.Water "Water"),
+        choice(redeclare package Medium = IbpsaMpc.Media.Air "Moist air"),
+        choice(redeclare package Medium = IbpsaMpc.Media.Water "Water"),
         choice(redeclare package Medium =
-            IBPSA.Media.Antifreeze.PropyleneGlycolWater (
+            IbpsaMpc.Media.Antifreeze.PropyleneGlycolWater (
               property_T=293.15,
               X_a=0.40)
               "Propylene glycol water, 40% mass fraction")));
@@ -42,6 +42,7 @@ protected
     final quantity=Medium.extraPropertiesNames)
     "Needed to connect to conditional connector";
 
+
 initial equation
   // Only one connection allowed to a port to avoid unwanted ideal mixing
   for i in 1:nPorts loop
diff --git a/IbpsaMpc/Fluid/Sources/BaseClasses/PartialSource_Xi_C.mo b/IbpsaMpc/Fluid/Sources/BaseClasses/PartialSource_Xi_C.mo
index 1a73d81..770ea0a 100644
--- a/IbpsaMpc/Fluid/Sources/BaseClasses/PartialSource_Xi_C.mo
+++ b/IbpsaMpc/Fluid/Sources/BaseClasses/PartialSource_Xi_C.mo
@@ -39,7 +39,16 @@ initial equation
   assert(not use_X_in or not use_Xi_in,
     "Cannot use both X and Xi inputs, choose either use_X_in or use_Xi_in.");
 
+  if not use_X_in and not use_Xi_in then
+    Modelica.Fluid.Utilities.checkBoundary(Medium.mediumName, Medium.substanceNames,
+      Medium.singleState, true, X_in_internal, "Boundary_pT");
+  end if;
+
 equation
+  if use_X_in or use_Xi_in then
+    Modelica.Fluid.Utilities.checkBoundary(Medium.mediumName, Medium.substanceNames,
+      Medium.singleState, true, X_in_internal, "Boundary_pT");
+  end if;
   connect(X_in[1:Medium.nXi], Xi_in_internal);
   connect(X_in,X_in_internal);
   connect(Xi_in, Xi_in_internal);
@@ -62,6 +71,7 @@ equation
     ports[i].C_outflow = C_in_internal;
   end for;
 
+
   annotation (
     Icon(coordinateSystem(
         preserveAspectRatio=true,
@@ -98,12 +108,6 @@ Otherwise the parameter value is used.
 </html>", revisions="<html>
 <ul>
 <li>
-Augustus 14, 2019, by Filip Jorissen:<br/>
-Removed <code>checkBoundary</code> for JModelica compatibility.
-This is for
-<a href=\"https://github.com/ibpsa/modelica-ibpsa-mpc/issues/1\">#1</a>.
-</li>
-<li>
 February 13, 2018, by Michael Wetter:<br/>
 Corrected error in quantity assignment for <code>Xi_in</code>.
 This is for
diff --git a/IbpsaMpc/Fluid/Sources/BaseClasses/package.order b/IbpsaMpc/Fluid/Sources/BaseClasses/package.order
index c4bc9d4..a2ce575 100644
--- a/IbpsaMpc/Fluid/Sources/BaseClasses/package.order
+++ b/IbpsaMpc/Fluid/Sources/BaseClasses/package.order
@@ -1,2 +1,3 @@
+PartialPropertySource
 PartialSource
 PartialSource_Xi_C
diff --git a/IbpsaMpc/Fluid/Sources/Boundary_ph.mo b/IbpsaMpc/Fluid/Sources/Boundary_ph.mo
new file mode 100644
index 0000000..00c8e8a
--- /dev/null
+++ b/IbpsaMpc/Fluid/Sources/Boundary_ph.mo
@@ -0,0 +1,192 @@
+within IbpsaMpc.Fluid.Sources;
+model Boundary_ph
+  "Boundary with prescribed pressure, specific enthalpy, composition and trace substances"
+  extends IbpsaMpc.Fluid.Sources.BaseClasses.PartialSource_Xi_C;
+
+  parameter Boolean use_p_in = false
+    "Get the pressure from the input connector"
+    annotation(Evaluate=true, HideResult=true, Dialog(group="Conditional inputs"));
+  parameter Medium.AbsolutePressure p = Medium.p_default
+    "Fixed value of pressure"
+    annotation (Dialog(enable = not use_p_in, group="Fixed inputs"));
+
+  parameter Boolean use_h_in= false
+    "Get the specific enthalpy from the input connector"
+    annotation(Evaluate=true, HideResult=true, Dialog(group="Conditional inputs"));
+  parameter Medium.SpecificEnthalpy h = Medium.h_default
+    "Fixed value of specific enthalpy"
+    annotation (Dialog(enable = not use_h_in, group="Fixed inputs"));
+
+  Modelica.Blocks.Interfaces.RealInput p_in(final unit="Pa") if use_p_in
+    "Prescribed boundary pressure"
+    annotation (Placement(transformation(extent={{-140,60},{-100,100}})));
+
+  Modelica.Blocks.Interfaces.RealInput h_in(final unit="J/kg") if use_h_in
+    "Prescribed boundary specific enthalpy"
+    annotation (Placement(transformation(extent={{-140,20},{-100,60}})));
+  // Boolean constants to avoid a potential string comparison in an equation section
+protected
+  constant Boolean checkWaterPressure = Medium.mediumName == "SimpleLiquidWater"
+    "Evaluates to true if the pressure should be checked";
+  constant Boolean checkAirPressure = Medium.mediumName == "Air"
+    "Evaluates to true if the pressure should be checked";
+
+  Modelica.Blocks.Interfaces.RealInput h_in_internal(final unit="J/kg")
+    "Needed to connect to conditional connector";
+initial equation
+  if not use_p_in then
+    if checkWaterPressure then
+      assert(p_in_internal>1e4, "In "+getInstanceName() +
+        ": The parameter value p="+String(p_in_internal)+" is low for water. This is likely an error.");
+    end if;
+    if checkAirPressure then
+      assert(p_in_internal>5e4 and p_in_internal < 1.5e5, "In "+getInstanceName() +
+        ": The parameter value p="+String(p_in_internal)+" is not within a realistic range for air. This is likely an error.");
+    end if;
+  end if;
+equation
+  if use_p_in then
+    if checkWaterPressure then
+      assert(p_in_internal>1e4, "In "+getInstanceName() +
+        ": The value of p_in="+String(p_in_internal)+" is low for water. This is likely an error.");
+    end if;
+    if checkAirPressure then
+      assert(p_in_internal>5e4 and p_in_internal < 1.5e5, "In "+getInstanceName() +
+        ": The value of p_in="+String(p_in_internal)+" is not within a realistic range for air. This is likely an error.");
+    end if;
+  end if;
+
+  // Pressure
+  connect(p_in, p_in_internal);
+  if not use_p_in then
+    p_in_internal = p;
+  end if;
+  for i in 1:nPorts loop
+    ports[i].p = p_in_internal;
+  end for;
+  // Enthalpy
+  connect(h_in, h_in_internal);
+  if not use_h_in then
+    h_in_internal = h;
+  end if;
+  for i in 1:nPorts loop
+     ports[i].h_outflow  = h_in_internal;
+  end for;
+  connect(medium.h, h_in_internal);
+
+
+  annotation (defaultComponentName="bou",
+    Documentation(info="<html>
+<p>
+Defines prescribed values for boundary conditions:
+</p>
+<ul>
+<li> Prescribed boundary pressure.</li>
+<li> Prescribed boundary specific enthalpy.</li>
+<li> Boundary composition (only for multi-substance or trace-substance flow).</li>
+</ul>
+<h4>Typical use and important parameters</h4>
+<p>
+If <code>use_p_in</code> is false (default option),
+the <code>p</code> parameter is used as boundary pressure,
+and the <code>p_in</code> input connector is disabled;
+if <code>use_p_in</code> is true, then the <code>p</code>
+parameter is ignored, and the value provided by the
+input connector is used instead.
+</p>
+<p>
+The same applies to the specific enthalpy <i>h</i>, composition <i>X<sub>i</sub></i> or <i>X</i> and trace substances <i>C</i>.
+</p>
+<h4>Options</h4>
+<p>
+Instead of using <code>Xi_in</code> (the <i>independent</i> composition fractions),
+the advanced tab provides an option for setting all
+composition fractions using <code>X_in</code>.
+<code>use_X_in</code> and <code>use_Xi_in</code> cannot be used
+at the same time.
+</p>
+<p>
+Parameter <code>verifyInputs</code> can be set to <code>true</code>
+to enable a check that verifies the validity of the used specific enthalpy
+and pressures.
+This removes the corresponding overhead from the model, which is
+a substantial part of the overhead of this model.
+See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/882\">#882</a>
+for more information.
+</p>
+<p>
+Note, that boundary specific enthalpy,
+mass fractions and trace substances have only an effect if the mass flow
+is from the boundary into the port. If mass is flowing from
+the port into the boundary, the boundary definitions,
+with exception of boundary pressure, do not have an effect.
+</p>
+</html>",
+revisions="<html>
+<ul>
+<li>
+Juni 7, 2019, by Michael Wetter:<br/>
+Added constant boolean expressions to avoid a potential string comparison in an equation section.<br/>
+See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1148\">#1148</a>.
+</li>
+<li>
+Juni 4, 2019, by Filip Jorissen:<br/>
+Added check for the value of <code>p</code> and <code>p_in</code>.<br/>
+See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1148\">#1148</a>.
+</li>
+<li>
+January 25, 2019, by Michael Wetter:<br/>
+Refactored use of base classes.<br/>
+See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1072\">#1072</a>.
+</li>
+<li>
+February 2nd, 2018 by Filip Jorissen<br/>
+Made <code>medium</code> conditional and refactored inputs.
+See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/882\">#882</a>.
+</li>
+<li>
+April 18, 2017, by Filip Jorissen:<br/>
+Changed <code>checkBoundary</code> implementation
+such that it is run as an initial equation
+when it depends on parameters only.
+See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/728\">#728</a>.
+</li>
+<li>
+January 26, 2016, by Michael Wetter:<br/>
+Added <code>unit</code> and <code>quantity</code> attributes.
+</li>
+<li>
+May 29, 2014, by Michael Wetter:<br/>
+Removed undesirable annotation <code>Evaluate=true</code>.
+</li>
+<li>
+September 29, 2009, by Michael Wetter:<br/>
+First implementation.
+Implementation is based on <code>Modelica.Fluid</code>.
+</li>
+</ul>
+</html>"),
+    Icon(graphics={
+        Text(
+          visible=use_h_in,
+          extent={{-162,34},{-60,-6}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          textString="h"),
+        Text(
+          visible=use_p_in,
+          extent={{-152,134},{-68,94}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          textString="p"),
+    Ellipse(
+          extent={{-100,100},{100,-100}},
+          lineColor={0,0,0},
+          fillPattern=FillPattern.Sphere,
+          fillColor={0,127,255}), Text(
+          extent={{-150,110},{150,150}},
+          textString="%name",
+          lineColor={0,0,255})}));
+end Boundary_ph;
diff --git a/IbpsaMpc/Fluid/Sources/MassFlowSource_T.mo b/IbpsaMpc/Fluid/Sources/MassFlowSource_T.mo
new file mode 100644
index 0000000..b0f1673
--- /dev/null
+++ b/IbpsaMpc/Fluid/Sources/MassFlowSource_T.mo
@@ -0,0 +1,179 @@
+within IbpsaMpc.Fluid.Sources;
+model MassFlowSource_T
+  "Ideal flow source that produces a prescribed mass flow with prescribed temperature, composition and trace substances"
+  extends IbpsaMpc.Fluid.Sources.BaseClasses.PartialSource_Xi_C;
+
+  parameter Boolean use_m_flow_in = false
+    "Get the mass flow rate from the input connector"
+    annotation(Evaluate=true, HideResult=true, Dialog(group="Conditional inputs"));
+  parameter Modelica.SIunits.MassFlowRate m_flow = 0
+    "Fixed mass flow rate going out of the fluid port"
+    annotation (Dialog(enable = not use_m_flow_in,group="Fixed inputs"));
+  parameter Boolean use_T_in= false
+    "Get the temperature from the input connector"
+    annotation(Evaluate=true, HideResult=true,Dialog(group="Conditional inputs"));
+  parameter Medium.Temperature T = Medium.T_default
+    "Fixed value of temperature"
+    annotation (Dialog(enable = not use_T_in,group="Fixed inputs"));
+
+  Modelica.Blocks.Interfaces.RealInput m_flow_in(final unit="kg/s") if use_m_flow_in
+    "Prescribed mass flow rate"
+    annotation (Placement(transformation(extent={{-140,60},{-100,100}}),iconTransformation(extent={{-140,60},
+            {-100,100}})));
+
+  Modelica.Blocks.Interfaces.RealInput T_in(final unit="K",
+                                            displayUnit="degC") if use_T_in
+    "Prescribed boundary temperature"
+    annotation (Placement(transformation(extent={{-140,20},{-100,60}})));
+
+protected
+  Modelica.Blocks.Interfaces.RealInput m_flow_in_internal(final unit="kg/s")
+    "Needed to connect to conditional connector";
+  Modelica.Blocks.Interfaces.RealInput T_in_internal(final unit="K",
+                                                     displayUnit="degC")
+    "Needed to connect to conditional connector";
+  Modelica.Blocks.Interfaces.RealInput h_internal=
+    Medium.specificEnthalpy(Medium.setState_pTX(p_in_internal, T_in_internal, X_in_internal))
+    "Internal connector for enthalpy";
+
+equation
+  // Mass flow rate
+  connect(m_flow_in, m_flow_in_internal);
+  if not use_m_flow_in then
+    m_flow_in_internal = m_flow;
+  end if;
+  for i in 1:nPorts loop
+    ports[i].p = p_in_internal;
+  end for;
+  sum(ports.m_flow) = -m_flow_in_internal;
+  // Enthalpy
+  connect(T_in, T_in_internal);
+  if not use_T_in then
+    T_in_internal = T;
+  end if;
+  for i in 1:nPorts loop
+     ports[i].h_outflow  = h_internal;
+  end for;
+  connect(medium.h, h_internal);
+
+  annotation (defaultComponentName="boundary",
+    Documentation(info="<html>
+<p>
+Models an ideal flow source, with prescribed values of flow rate, temperature, composition and trace substances:
+</p>
+<ul>
+<li> Prescribed mass flow rate.</li>
+<li> Prescribed temperature.</li>
+<li> Boundary composition (only for multi-substance or trace-substance flow).</li>
+</ul>
+<p>
+If <code>use_m_flow_in</code> is false (default option),
+the <code>m_flow</code> parameter
+is used as boundary pressure, and the <code>m_flow_in</code>
+input connector is disabled; if <code>use_m_flow_in</code>
+is true, then the <code>m_flow</code> parameter is ignored,
+and the value provided by the input connector is used instead.
+</p>
+<p>
+The same applies to the temperature <i>T</i>, composition <i>X<sub>i</sub></i> or <i>X</i> and trace substances <i>C</i>.
+</p>
+<h4>Options</h4>
+<p>
+Instead of using <code>Xi_in</code> (the <i>independent</i> composition fractions),
+the advanced tab provides an option for setting all
+composition fractions using <code>X_in</code>.
+<code>use_X_in</code> and <code>use_Xi_in</code> cannot be used
+at the same time.
+</p>
+<p>
+Parameter <code>verifyInputs</code> can be set to <code>true</code>
+to enable a check that verifies the validity of the used temperature
+and pressures.
+This removes the corresponding overhead from the model, which is
+a substantial part of the overhead of this model.
+See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/882\">#882</a>
+for more information.
+</p>
+<p>
+Note, that boundary temperature,
+mass fractions and trace substances have only an effect if the mass flow
+is from the boundary into the port. If mass is flowing from
+the port into the boundary, the boundary definitions,
+with exception of boundary flow rate, do not have an effect.
+</p>
+</html>",
+revisions="<html>
+<ul>
+<li>
+January 25, 2019, by Michael Wetter:<br/>
+Refactored use of base classes.<br/>
+See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1072\">#1072</a>.
+</li>
+<li>
+February 2nd, 2018 by Filip Jorissen<br/>
+Made <code>medium</code> conditional and refactored inputs.
+See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/882\">#882</a>.
+</li>
+<li>
+April 18, 2017, by Filip Jorissen:<br/>
+Changed <code>checkBoundary</code> implementation
+such that it is run as an initial equation
+when it depends on parameters only.
+See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/728\">#728</a>.
+</li>
+<li>
+January 26, 2016, by Michael Wetter:<br/>
+Added <code>unit</code> and <code>quantity</code> attributes.
+</li>
+<li>
+September 29, 2009, by Michael Wetter:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+    Icon(graphics={
+        Text(
+          visible=use_m_flow_in,
+          extent={{-185,132},{-45,100}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          textString="m_flow"),
+        Text(
+          visible=use_T_in,
+          extent={{-162,34},{-60,-6}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          textString="T"),
+        Rectangle(
+          extent={{35,45},{100,-45}},
+          lineColor={0,0,0},
+          fillPattern=FillPattern.HorizontalCylinder,
+          fillColor={0,127,255}),
+        Ellipse(
+          extent={{-100,80},{60,-80}},
+          lineColor={0,0,255},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Polygon(
+          points={{-60,70},{60,0},{-60,-68},{-60,70}},
+          lineColor={0,0,255},
+          fillColor={0,0,255},
+          fillPattern=FillPattern.Solid),
+        Text(
+          extent={{-54,32},{16,-30}},
+          lineColor={255,0,0},
+          fillColor={255,0,0},
+          fillPattern=FillPattern.Solid,
+          textString="m"),
+        Ellipse(
+          extent={{-26,30},{-18,22}},
+          lineColor={255,0,0},
+          fillColor={255,0,0},
+          fillPattern=FillPattern.Solid),
+                                  Text(
+          extent={{-161,110},{139,150}},
+          textString="%name",
+          lineColor={0,0,255})}));
+end MassFlowSource_T;
diff --git a/IbpsaMpc/Fluid/Sources/MassFlowSource_h.mo b/IbpsaMpc/Fluid/Sources/MassFlowSource_h.mo
new file mode 100644
index 0000000..72a633b
--- /dev/null
+++ b/IbpsaMpc/Fluid/Sources/MassFlowSource_h.mo
@@ -0,0 +1,175 @@
+within IbpsaMpc.Fluid.Sources;
+model MassFlowSource_h
+  "Ideal flow source that produces a prescribed mass flow with prescribed specific enthalpy, composition and trace substances"
+  extends IbpsaMpc.Fluid.Sources.BaseClasses.PartialSource_Xi_C;
+
+  parameter Boolean use_m_flow_in = false
+    "Get the mass flow rate from the input connector"
+    annotation(Evaluate=true, HideResult=true, Dialog(group="Conditional inputs"));
+  parameter Modelica.SIunits.MassFlowRate m_flow = 0
+    "Fixed mass flow rate going out of the fluid port"
+    annotation (Dialog(enable = not use_m_flow_in,group="Fixed inputs"));
+
+  parameter Boolean use_h_in= false
+    "Get the specific enthalpy from the input connector"
+    annotation(Evaluate=true, HideResult=true, Dialog(group="Conditional inputs"));
+  parameter Medium.SpecificEnthalpy h = Medium.h_default
+    "Fixed value of specific enthalpy"
+    annotation (Dialog(enable = not use_h_in, group="Fixed inputs"));
+
+  Modelica.Blocks.Interfaces.RealInput m_flow_in(final unit="kg/s") if use_m_flow_in
+    "Prescribed mass flow rate"
+    annotation (Placement(transformation(extent={{-140,60},{-100,100}}),iconTransformation(extent={{-140,60},
+            {-100,100}})));
+
+  Modelica.Blocks.Interfaces.RealInput h_in(final unit="J/kg") if use_h_in
+    "Prescribed boundary specific enthalpy"
+    annotation (Placement(transformation(extent={{-140,20},{-100,60}})));
+
+protected
+  Modelica.Blocks.Interfaces.RealInput m_flow_in_internal(final unit="kg/s")
+    "Needed to connect to conditional connector";
+  Modelica.Blocks.Interfaces.RealInput h_in_internal(final unit="J/kg")
+    "Needed to connect to conditional connector";
+
+equation
+  // Mass flow rate
+  connect(m_flow_in, m_flow_in_internal);
+  if not use_m_flow_in then
+    m_flow_in_internal = m_flow;
+  end if;
+  for i in 1:nPorts loop
+    ports[i].p = p_in_internal;
+  end for;
+  sum(ports.m_flow) = -m_flow_in_internal;
+  // Enthalpy
+  connect(h_in, h_in_internal);
+  if not use_h_in then
+    h_in_internal = h;
+  end if;
+  for i in 1:nPorts loop
+     ports[i].h_outflow  = h_in_internal;
+  end for;
+  connect(medium.h, h_in_internal);
+
+  annotation (defaultComponentName="boundary",
+    Documentation(info="<html>
+<p>
+Models an ideal flow source, with prescribed values of flow rate, specific enthalpy, composition and trace substances:
+</p>
+<ul>
+<li> Prescribed mass flow rate.</li>
+<li> Prescribed specific enthalpy.</li>
+<li> Boundary composition (only for multi-substance or trace-substance flow).</li>
+</ul>
+<p>
+If <code>use_m_flow_in</code> is false (default option),
+the <code>m_flow</code> parameter
+is used as boundary pressure, and the <code>m_flow_in</code>
+input connector is disabled; if <code>use_m_flow_in</code>
+is true, then the <code>m_flow</code> parameter is ignored,
+and the value provided by the input connector is used instead.
+</p>
+<p>
+The same applies to the specific enthalpy <i>h</i>, composition <i>X<sub>i</sub></i> or <i>X</i> and trace substances <i>C</i>.
+</p>
+<h4>Options</h4>
+<p>
+Instead of using <code>Xi_in</code> (the <i>independent</i> composition fractions),
+the advanced tab provides an option for setting all
+composition fractions using <code>X_in</code>.
+<code>use_X_in</code> and <code>use_Xi_in</code> cannot be used
+at the same time.
+</p>
+<p>
+Parameter <code>verifyInputs</code> can be set to <code>true</code>
+to enable a check that verifies the validity of the used specific enthalpy
+and pressures.
+This removes the corresponding overhead from the model, which is
+a substantial part of the overhead of this model.
+See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/882\">#882</a>
+for more information.
+</p>
+<p>
+Note, that boundary specific enthalpy,
+mass fractions and trace substances have only an effect if the mass flow
+is from the boundary into the port. If mass is flowing from
+the port into the boundary, the boundary definitions,
+with exception of boundary flow rate, do not have an effect.
+</p>
+</html>",
+revisions="<html>
+<ul>
+<li>
+February 2nd, 2018 by Filip Jorissen<br/>
+Made <code>medium</code> conditional and refactored inputs.
+See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/882\">#882</a>.
+</li>
+<li>
+April 18, 2017, by Filip Jorissen:<br/>
+Changed <code>checkBoundary</code> implementation
+such that it is run as an initial equation
+when it depends on parameters only.
+See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/728\">#728</a>.
+</li>
+<li>
+January 26, 2016, by Michael Wetter:<br/>
+Added <code>unit</code> and <code>quantity</code> attributes.
+</li>
+<li>
+May 29, 2014, by Michael Wetter:<br/>
+Removed undesirable annotation <code>Evaluate=true</code>.
+</li>
+<li>
+September 29, 2009, by Michael Wetter:<br/>
+First implementation.
+Implemenation is based on <code>Modelica.Fluid</code>.
+</li>
+</ul>
+</html>"),
+    Icon(graphics={
+        Text(
+          visible=use_m_flow_in,
+          extent={{-185,132},{-45,100}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          textString="m_flow"),
+        Text(
+          visible=use_h_in,
+          extent={{-162,34},{-60,-6}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          textString="h"),
+        Rectangle(
+          extent={{35,45},{100,-45}},
+          lineColor={0,0,0},
+          fillPattern=FillPattern.HorizontalCylinder,
+          fillColor={0,127,255}),
+        Ellipse(
+          extent={{-100,80},{60,-80}},
+          lineColor={0,0,255},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Polygon(
+          points={{-60,70},{60,0},{-60,-68},{-60,70}},
+          lineColor={0,0,255},
+          fillColor={0,0,255},
+          fillPattern=FillPattern.Solid),
+        Text(
+          extent={{-54,32},{16,-30}},
+          lineColor={255,0,0},
+          fillColor={255,0,0},
+          fillPattern=FillPattern.Solid,
+          textString="m"),
+        Ellipse(
+          extent={{-26,30},{-18,22}},
+          lineColor={255,0,0},
+          fillColor={255,0,0},
+          fillPattern=FillPattern.Solid),
+                                  Text(
+          extent={{-161,110},{139,150}},
+          textString="%name",
+          lineColor={0,0,255})}));
+end MassFlowSource_h;
diff --git a/IbpsaMpc/Fluid/Sources/PropertySource_T.mo b/IbpsaMpc/Fluid/Sources/PropertySource_T.mo
new file mode 100644
index 0000000..45fd7fd
--- /dev/null
+++ b/IbpsaMpc/Fluid/Sources/PropertySource_T.mo
@@ -0,0 +1,82 @@
+within IbpsaMpc.Fluid.Sources;
+model PropertySource_T
+  "Model for overriding fluid properties that flow through the component, using temperature input"
+  // The parameter declaration is before 'extends',
+  // since this affects the parameter order in the parameters window.
+  parameter Boolean use_T_in= false
+    "Set to true to get the leaving fluid temperature from the input connector"
+    annotation(Evaluate=true, Dialog(group="Inputs"));
+  extends IbpsaMpc.Fluid.Sources.BaseClasses.PartialPropertySource;
+  Modelica.Blocks.Interfaces.RealInput T_in if use_T_in
+    "Prescribed value for leaving fluid temperature" annotation (Placement(
+        transformation(
+        extent={{-20,-20},{20,20}},
+        rotation=270,
+        origin={-40,120})));
+protected
+  Modelica.Blocks.Interfaces.RealOutput T_in_internal(unit="K")
+    "Internal connector for leaving fluid temperature";
+  Modelica.Blocks.Interfaces.RealOutput h_T_a=
+    Medium.specificEnthalpy(
+      Medium.setState_pTX(port_a.p, T_in_internal, port_a.Xi_outflow)) if use_T_in
+      "Conditional connector for enthalpy leaving port a";
+  Modelica.Blocks.Interfaces.RealOutput h_T_b=
+    Medium.specificEnthalpy(
+      Medium.setState_pTX(port_b.p, T_in_internal, port_b.Xi_outflow)) if use_T_in
+      "Conditional connector for enthalpy leaving port b";
+
+equation
+  connect(h_internal_a, h_T_a);
+  connect(h_internal_b, h_T_b);
+  if use_T_in then
+    connect(T_in_internal, T_in);
+  else
+    T_in_internal = 293.15;
+    connect(h_internal_a, h_in_b);
+    connect(h_internal_b, h_in_a);
+  end if;
+annotation (defaultComponentName="proSou",
+        Icon(coordinateSystem(preserveAspectRatio=true,  extent={{-100,
+            -100},{100,100}}), graphics={
+        Text(
+          visible=use_T_in,
+          extent={{-90,98},{12,58}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          textString="T")}),
+    Documentation(info="<html>
+<p>
+Model that changes the properties,
+but not the mass flow rate,
+of the fluid that passes through it.
+</p>
+<p>
+If <code>allowFlowReversal=true</code>, then the properties are changed for both flow directions,
+i.e., from <code>port_a</code> to <code>port_b</code> and
+from <code>port_b</code> to <code>port_a</code>.
+</p>
+<h4>Typical use and important parameters</h4>
+<p>
+The fluid properties <code>h</code>, <code>Xi</code> and <code>C</code>
+are only modified when the corresponding boolean parameter
+<code>use_T_in</code>, <code>use_Xi_in</code> or <code>use_C_in</code>
+is set to <code>true</code>.
+</p>
+<h4>Dynamics</h4>
+<p>
+This model has no dynamics.
+</p>
+</html>",
+revisions="<html>
+<ul>
+<li>
+April 30, 2018, by Filip Jorissen:<br/>
+First implementation.
+See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/881\">#881</a>.
+</li>
+</ul>
+</html>"),
+    Diagram(coordinateSystem(preserveAspectRatio=true,  extent={{-100,-100},{
+            100,100}})));
+end PropertySource_T;
diff --git a/IbpsaMpc/Fluid/Sources/PropertySource_h.mo b/IbpsaMpc/Fluid/Sources/PropertySource_h.mo
new file mode 100644
index 0000000..144c24a
--- /dev/null
+++ b/IbpsaMpc/Fluid/Sources/PropertySource_h.mo
@@ -0,0 +1,69 @@
+within IbpsaMpc.Fluid.Sources;
+model PropertySource_h
+  "Model for overriding fluid properties that flow through the component, using specific enthalpy input"
+  // The parameter declaration is before 'extends',
+  // since this affects the parameter order in the parameters window.
+  parameter Boolean use_h_in= false
+    "Set to true to get the specific enthalpy from the input connector"
+    annotation(Evaluate=true, Dialog(group="Inputs"));
+
+  extends IbpsaMpc.Fluid.Sources.BaseClasses.PartialPropertySource;
+
+  Modelica.Blocks.Interfaces.RealInput h_in if use_h_in
+    "Prescribed value for leaving specific enthalpy" annotation (Placement(
+        transformation(
+        extent={{-20,-20},{20,20}},
+        rotation=270,
+        origin={-40,120})));
+equation
+  connect(h_internal_a, h_in);
+  connect(h_internal_b, h_in);
+  if not (use_h_in) then
+    connect(h_internal_a,h_in_b);
+    connect(h_internal_b,h_in_a);
+  end if;
+annotation (defaultComponentName="proSou",
+        Icon(coordinateSystem(preserveAspectRatio=true,  extent={{-100,
+            -100},{100,100}}), graphics={
+        Text(
+          visible=use_h_in,
+          extent={{-90,98},{12,58}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          textString="h")}),
+    Documentation(info="<html>
+<p>
+Model that changes the properties,
+but not the mass flow rate,
+of the fluid that passes through it.
+</p>
+<p>
+If <code>allowFlowReversal=true</code>, then the properties are changed for both flow directions,
+i.e., from <code>port_a</code> to <code>port_b</code> and
+from <code>port_b</code> to <code>port_a</code>.
+</p>
+<h4>Typical use and important parameters</h4>
+<p>
+The fluid properties <code>h</code>, <code>Xi</code> and <code>C</code>
+are only modified when the corresponding boolean parameter
+<code>use_h_in</code>, <code>use_Xi_in</code> or <code>use_C_in</code>
+is set to <code>true</code>.
+</p>
+<h4>Dynamics</h4>
+<p>
+This model has no dynamics.
+</p>
+</html>",
+revisions="<html>
+<ul>
+<li>
+April 30, 2018, by Filip Jorissen:<br/>
+First implementation.
+See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/881\">#881</a>.
+</li>
+</ul>
+</html>"),
+    Diagram(coordinateSystem(preserveAspectRatio=true,  extent={{-100,-100},{
+            100,100}})));
+end PropertySource_h;
diff --git a/IbpsaMpc/Fluid/Sources/package.mo b/IbpsaMpc/Fluid/Sources/package.mo
index 45abe79..73b08e8 100644
--- a/IbpsaMpc/Fluid/Sources/package.mo
+++ b/IbpsaMpc/Fluid/Sources/package.mo
@@ -1,4 +1,12 @@
 within IbpsaMpc.Fluid;
 package Sources "Package with boundary condition models"
+  extends Modelica.Icons.SourcesPackage;
 
+annotation (preferredView="info",
+Documentation(info="<html>
+<p>
+Package <b>Sources</b> contains generic sources for fluid connectors
+to define fixed or prescribed ambient conditions.
+</p>
+</html>"));
 end Sources;
diff --git a/IbpsaMpc/Fluid/Sources/package.order b/IbpsaMpc/Fluid/Sources/package.order
index 7463895..72f07fd 100644
--- a/IbpsaMpc/Fluid/Sources/package.order
+++ b/IbpsaMpc/Fluid/Sources/package.order
@@ -1,2 +1,7 @@
-BaseClasses
 Boundary_pT
+Boundary_ph
+MassFlowSource_T
+MassFlowSource_h
+PropertySource_T
+PropertySource_h
+BaseClasses
diff --git a/IbpsaMpc/Fluid/package.mo b/IbpsaMpc/Fluid/package.mo
index 3a41479..363d4ba 100644
--- a/IbpsaMpc/Fluid/package.mo
+++ b/IbpsaMpc/Fluid/package.mo
@@ -1,4 +1,419 @@
 within IbpsaMpc;
 package Fluid "Package with models for fluid flow systems"
+  extends Modelica.Icons.Package;
 
+
+package UsersGuide "User's Guide"
+  extends Modelica.Icons.Information;
+  annotation (preferredView="info",
+  Documentation(info="<html>
+<p>
+The package <code>IbpsaMpc.Fluid</code> consists of models
+for pressure driven mass flow rate and for heat and moisture
+exchange in fluid flow networks.
+</p>
+<p>
+The models have the same interface as models of the package
+<a href=\"modelica://Modelica.Fluid\">Modelica.Fluid</a>,
+but have in general a simpler set of parameters that may be better
+suited if the models are used in early design of building systems.
+For example, in addition to the detailed pipe model from
+<a href=\"modelica://Modelica.Fluid\">Modelica.Fluid</a>,
+this package also contains models for which a user has to specify
+the mass flow and pressure drop at a nominal flow rate,
+which is typically more readily available prior to the detailed
+HVAC system design.
+</p>
+
+<h4>Port variables</h4>
+<p>
+Component models of this package have fluid ports, which
+are a subclass of
+<a href=\"modelica://Modelica.Fluid.Interfaces.FluidPort\">
+Modelica.Fluid.Interfaces.FluidPort</a>.
+Fluid ports declare the variables listed in the table below.
+</p>
+
+<table summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr>
+<th>Variable</th>
+<th>Description</th>
+</tr>
+<tr>
+  <td><code>m_flow</code></td>
+  <td>Mass flow rate <i>m&#775;</i>.<br/>
+      The convention is that <code>m_flow &ge; 0</code>
+      if at this port, mass flows into the component.</td>
+</tr>
+<tr>
+  <td><code>p</code></td>
+  <td>Absolute total pressure <i>p</i>.<br/>
+      The absolute total pressure is the sum of
+      the static pressure and the dynamic pressure.
+      As the total pressure is used in the connector, components
+      do not need to specify the area of the port or the velocity at the port.
+      This convention is consistent with the Modelica Standard Library.
+      Note that component models typically simplify the pressure balance
+      by not taking into account the static pressure that is caused by
+      the height of the medium column, i.e., the term
+      <i>&Delta;p = &Delta;h &rho; g,</i>
+      where
+      <i>&Delta;h</i> is the height of the medium column,
+      <i>&rho;</i> is the mass density and
+      <i>g = 9.81</i> m/s<sup>2</sup> is the gravity acceleration,
+      is ignored.</td>
+</tr>
+<tr>
+  <td><code>h_outflow</code></td>
+  <td>Specific enthalpy <i>h</i> of the outflowing fluid, i.e.,
+      assuming <i>m&#775; &lt; 0.</i><br/>
+      The specific enthalpy in the fluid port always carries the value
+      of the enthalpy that the medium would have if it was leaving
+      the component.
+      Users who need to access the actual enthalpy for the given flow
+      direction can do so using the sensor
+      <a href=\"modelica://IbpsaMpc.Fluid.Sensors.SpecificEnthalpyTwoPort\">
+      IbpsaMpc.Fluid.Sensors.SpecificEnthalpyTwoPort</a>.</td>
+</tr>
+<tr>
+  <td><code>Xi_outflow[Medium.nXi]</code></td>
+  <td>Independent mixture mass fractions
+      <i>m<sub>i</sub>/m</i> close to the connection point, i.e.,
+      assuming <i>m&#775; &lt; 0.</i><br/>
+      The independent mixture mass fraction in the fluid port always carries the value
+      that the medium would have if it was leaving
+      the component.
+      Users who need to access the actual value for the given flow
+      direction can do so using the sensor
+      <a href=\"modelica://IbpsaMpc.Fluid.Sensors.MassFractionTwoPort\">
+      IbpsaMpc.Fluid.Sensors.MassFractionTwoPort</a>.
+      Note that this variable is only present for fluids that are a mixture
+      of different substances such as moist air. For water,
+      this variable is automatically removed when a model is translated.</td>
+</tr>
+<tr>
+  <td><code>C_outflow[Medium.nC]</code></td>
+  <td>Trace substances <i>c<sub>i</sub>/m</i> close to the connection point, i.e.,
+      assuming <i>m&#775; &lt; 0.</i><br/>
+      The trace substances in the fluid port always carries the value
+      that the medium would have if it was leaving
+      the component.
+      Users who need to access the actual value for the given flow
+      direction can do so using the sensor
+      <a href=\"modelica://IbpsaMpc.Fluid.Sensors.TraceSubstancesTwoPort\">
+      IbpsaMpc.Fluid.Sensors.TraceSubstancesTwoPort</a>.
+      Note that this variable is only present for fluids that declare
+      a trace substance such as CO<sub>2</sub>.
+      See for example
+      <a href=\"modelica://IbpsaMpc.Fluid.Sensors.Examples.TraceSubstances\">
+      IbpsaMpc.Fluid.Sensors.Examples.TraceSubstances</a>.</td>
+</tr>
+</table>
+
+<h4>Computation of flow resistance</h4>
+<p>
+Most component models compute pressure drop as a function of flow rate.
+If their pressure drop at the nominal conditions is set to zero,
+for example by setting the parameter value <code>dp_nominal=0</code>, then the
+equation for the pressure drop is removed from the model.
+This allows, for example,
+to model a heating and a cooling coil in series, and lump their pressure drops
+into a single element, thereby reducing the dimension of the nonlinear system
+of equations.
+</p>
+
+<p>
+The flow resistance is computed as</p>
+<p align=\"center\" style=\"font-style:italic;\">
+  k = m&#775; &frasl; &radic;<span style=\"text-decoration:overline;\">&nbsp;&Delta;p &nbsp;</span>
+</p>
+<p>
+where <i>m&#775;</i> is the mass flow rate and <i>&Delta;p</i> is the pressure drop.
+For <i>|m&#775;| &lt; &delta;<sub>m&#775;</sub> m&#775;<sub>0</sub></i>,
+where <i>&delta;<sub>m&#775;</sub></i> is equal to the parameter <code>deltaM</code> and
+<i>m&#775;<sub>0</sub></i> is the mass flow rate at the nominal operating point, as
+set by the parameter <code>m_flow_nominal</code>, the
+equation is linearized.
+The pressure drop is computed as a function of mass flow rate instead of
+volume flow rate as this often leads to fewer equations. Otherwise,
+the pressure drop would depend on the density and hence on temperature.
+</p>
+
+<p>
+The flow coefficient <i>k</i> is typically computed based
+on nominal values for the mass flow rate and the pressure drop, i.e.,
+<i>k = m&#775;<sub>0</sub> &frasl; &radic;&nbsp;&Delta;p<sub>0</sub> &nbsp;
+</i>.
+This functional form has been used as in building HVAC systems, a more exact
+computation of the pressure drop would require detailed knowledge of the duct or pipe
+dimensions and the flow bends and junctions. This information is often not available during
+early design. However, if a more detailed pressure drop calculation is required, then models from
+<a href=\"modelica://Modelica.Fluid\">
+Modelica.Fluid</a> can be used in conjunction with models from the <code>Buildings</code> library.
+</p>
+
+<p>
+In actuators such as valves and air dampers, <i>k</i> is a function of the control signal.
+</p>
+
+<h4>Computation of mass and energy balance</h4>
+<p>
+Most models have parameters
+<code>massDynamics</code> and <code>energyDynamics</code>
+that allow using a dynamic or a
+steady-state equation for the mass and energy balance.
+The table below shows the different settings and how they affect the
+mass and energy balance equations.
+For the mass balance, the following configurations can be selected:
+</p>
+
+<table summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr>
+<th>Parameter</th>
+<th>Initialization problem<br/>
+    If density depends on pressure</th>
+<th>Initialization problem<br/>
+    If density is independent of pressure</th>
+<th>Equation used during time integration</th>
+</tr>
+<tr>
+  <td>DynamicsFreeInitial</td>
+  <td>Unspecified</td>
+  <td>Unspecified</td>
+  <td><i>dm(t)/dt = &sum; m&#775;(t)</i></td>
+</tr>
+<tr>
+  <td>FixedInitial</td>
+  <td><i>p(0)=p<sub>0</sub></i></td>
+  <td>Unspecified</td>
+  <td><i>dm(t)/dt = &sum; m&#775;(t)</i></td>
+</tr>
+<tr>
+  <td>SteadyStateInitial</td>
+  <td><i>dp(0)/dt=0</i></td>
+  <td>Unspecified</td>
+  <td><i>dm(t)/dt = &sum; m&#775;(t)</i></td>
+</tr>
+<tr>
+  <td>SteadyState</td>
+  <td>Unspecified</td>
+  <td>Unspecified</td>
+  <td><i>0 = &sum; m&#775;(t)</i></td>
+</tr>
+</table>
+
+<p>
+where <i>m(t)</i> is the mass of the control volume,
+<i>m&#775;(t)</i> is the mass flow rate,
+<i>p</i> is the pressure and
+<i>p<sub>0</sub></i> is the initial pressure, which is a parameter.
+<i>Unspecified</i> means that no equation is declared for
+<i>p(0)</i>. In this situation, there can be two cases:
+</p>
+<ol>
+<li>
+If a system model sets the pressure, such as if the volume is connected
+to a model that sets the pressure, e.g.,
+<a href=\"modelica://IbpsaMpc.Fluid.Sources.Boundary_pT\">
+IbpsaMpc.Fluid.Sources.Boundary_pT</a>,
+then due to the connection between the models, the
+pressure of the volume is the same as the pressure of the
+model for the boundary condition.
+</li>
+<li>
+If a system model does not set the pressure, then the pressure starts
+at the value set by
+<code>p(start=Medium.p_default)</code>,
+where <code>Medium</code> is the medium model.
+</li>
+</ol>
+
+<p>
+Similarly, for the energy balance, the following configurations can be selected:
+</p>
+<table summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr>
+<th>Parameter</th>
+<th>Initialization problem</th>
+<th>Equation used during time integration</th>
+</tr>
+<tr>
+  <td>DynamicsFreeInitial</td>
+  <td>Unspecified</td>
+  <td><i>dU(t)/dt = &sum; m&#775;(t) &nbsp; h(t) + Q&#775;(t)</i></td>
+</tr>
+<tr>
+  <td>FixedInitial</td>
+  <td><i>T(0)=T<sub>0</sub></i></td>
+  <td><i>dU(t)/dt = &sum; m&#775;(t) &nbsp; h(t) + Q&#775;(t)</i></td>
+</tr>
+<tr>
+  <td>SteadyStateInitial</td>
+  <td><i>dT(0)/dt=0</i></td>
+  <td><i>dU(t)/dt = &sum; m&#775;(t) &nbsp; h(t) + Q&#775;(t)</i></td>
+</tr>
+<tr>
+  <td>SteadyState</td>
+  <td>Unspecified</td>
+  <td><i>0 = &sum; m&#775;(t) &nbsp; h(t) + Q&#775;(t)</i></td>
+</tr>
+</table>
+
+<p>
+where <i>U(t)</i> is the internal energy of the control volume,
+<i>h(t)</i> is the enthalpy carried by the medium and
+<i>Q&#775;(t)</i> is the heat flow rate that is added to the medium through the heat port.
+<i>Unspecified</i> means that no equation is declared for
+<i>T(0)</i>. In this situation, there can be two cases:
+</p>
+<ol>
+<li>
+If a system model sets the temperature, such as if the heat port of the
+volume is connected to a fixed temperature,
+then <i>T(0)</i> of the volume would be equal to the temperature connected
+to this port.
+</li>
+<li>
+If a system model does not set the temperature, then the temperature starts
+at the value <code>T(start=Medium.T_default)</code>,
+where <code>Medium</code> is the medium model
+</li>
+</ol>
+
+<p>
+In most models, the size of volume is configured using the parameter <code>tau</code>.
+This parameter is equal to the time constant that the volume has if the mass flow rate is
+at its nominal value, as set by the parameter <code>m_flow_nominal</code>.
+Using the time constant, as opposed to the actual fluid volume, allows in many cases an
+easier parametrization, since the volume is automatically enlarged if the nominal mass
+flow rate is increased. This allows an easy adjustment of the component size.
+The actual size of the control volume is then set as
+</p>
+<p align=\"center\" style=\"font-style:italic;\">
+  V = m&#775;<sub>0</sub> &tau;/&rho;<sub>0</sub>
+</p>
+<p>
+where
+<i>m&#775;<sub>0</sub></i> is the nominal mass flow rate,
+<i>&tau;</i> is the time constant, and
+<i>&rho;<sub>0</sub></i> is the mass density at the nominal condition.
+</p>
+
+<h4>Nominal values</h4>
+<p>
+Most components have a parameters for the nominal operating conditions.
+These parameters have names that end in <code>_nominal</code> and
+they should be set to the values that the component typically
+have if they are run at full load or design conditions. Depending on the model, these
+parameters are used differently, and the respective model documentation or code
+should be consulted for details. However, the table below shows typical use of
+parameters in various model to help the user understand how they are used.
+</p>
+<table summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr>
+<th>Parameter</th>
+<th>Model</th>
+<th>Functionality</th>
+</tr>
+<tr>
+  <td>m_flow_nominal<br/>
+      dp_nominal</td>
+  <td>Flow resistance models</td>
+  <td>These parameter may be used
+      to define a point on the flow rate versus pressure drop curve. For other
+      mass flow rates, the pressure drop is typically adjusted using similarity laws.
+      See
+      <a href=\"modelica://IbpsaMpc.Fluid.FixedResistances.PressureDrop\">
+      IbpsaMpc.Fluid.FixedResistances.PressureDrop</a>.
+  </td>
+</tr>
+<tr>
+  <td>m_flow_nominal<br/>
+      m_flow_small</td>
+  <td>Sensors<br/>
+      Volumes<br/>
+      Heat exchangers<br/>
+      Chillers
+  </td>
+  <td>Some of these models set <code>m_flow_small=1E-4*abs(m_flow_nominal)</code> as the
+      default value. Then, <code>m_flow_small</code> is used to regularize, or replace,
+      equations when the mass flow rate is smaller than <code>m_flow_small</code>
+      in magnitude. This is needed to improve the numerical properties of the model. The error in the
+      results is for typical applications negligible, because at flow rates below
+      <i>0.01%</i> from the design flow rate, most model assumptions are not applicable
+      anyways, and the HVAC system is not operated in this region. However, because Modelica
+      simulates in the continuous-time domain, such small flow rates can occur, and therefore
+      models are implemented in such a way that they are numerically well-behaved for
+      zero or near-zero flow rates.
+  </td>
+</tr>
+<tr>
+  <td>tau<br/>
+      m_flow_nominal</td>
+  <td>Sensors<br/>
+      Volumes<br/>
+      Heat exchangers<br/>
+      Chillers
+  </td>
+  <td>
+     Because Modelica simulates in the continuous-time domain, dynamic models are
+     in general numerically more efficient than steady-state models. However,
+     dynamic models require product data that are generally not published by
+     manufacturers. Examples include the volume of fluid that is contained in a
+     device, and the weight of heat exchangers. In addition, other effects such
+     as transport delays in pipes and heat exchangers of a chiller are generally
+     unknown and require detailed geometry that is typically not available
+     during the design stage.
+     <br/>
+      To circumvent this problem, many models take as a parameter the time constant
+      <code>tau</code> and lump all its thermal mass into a fluid volume.
+      The time constant <code>tau</code> can be understood as the time constant that one would
+      observe if the input to the component has a step change, and the mass flow rate
+      of the component is equal to <code>m_flow_nominal</code>.
+      Using these two values and the fluid density <code>rho</code>,
+      components adjust their fluid volume
+      <code>V=m_flow_nominal tau/rho</code> because having such a volume
+      gives the specified time response.
+      For most components, engineering experience can be used to estimate a reasonable
+      value for <code>tau</code>, and where generally applicable values can be used,
+      components already set a default value for <code>tau</code>.
+  </td>
+</tr>
+</table>
+
+<h4>Implementation</h4>
+<p>
+The models are implemented using base classes from
+<a href=\"modelica://IbpsaMpc.Fluid.Interfaces\">
+IbpsaMpc.Fluid.Interfaces</a>
+and from
+<a href=\"modelica://Modelica.Fluid.Interfaces\">
+Modelica.Fluid.Interfaces</a>.
+This allows models to be fully compatible with
+<a href=\"modelica://Modelica.Fluid\">
+Modelica.Fluid</a>, and it allows the implementation of
+component models that reuse base classes for heat transfer, mass transfer and
+flow resistance.
+</p>
+
+</html>"));
+
+end UsersGuide;
+
+
+annotation (
+preferredView="info", Documentation(info="<html>
+This package contains components for fluid flow systems such as
+pumps, valves and sensors. For other fluid flow models, see
+<a href=\"modelica://Modelica.Fluid\">Modelica.Fluid</a>.
+</html>"),
+Icon(graphics={
+        Polygon(points={{-70,26},{68,-44},{68,26},{2,-10},{-70,-42},{-70,26}},
+            lineColor={0,0,0}),
+        Line(points={{2,42},{2,-10}}),
+        Rectangle(
+          extent={{-18,50},{22,42}},
+          lineColor={0,0,0},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid)}));
 end Fluid;
diff --git a/IbpsaMpc/Fluid/package.order b/IbpsaMpc/Fluid/package.order
index ce1a5ab..719a335 100644
--- a/IbpsaMpc/Fluid/package.order
+++ b/IbpsaMpc/Fluid/package.order
@@ -1 +1,3 @@
+UsersGuide
 Sources
+Interfaces
diff --git a/IbpsaMpc/Media/Air.mo b/IbpsaMpc/Media/Air.mo
new file mode 100644
index 0000000..ceffc19
--- /dev/null
+++ b/IbpsaMpc/Media/Air.mo
@@ -0,0 +1,1148 @@
+within IbpsaMpc.Media;
+package Air
+  "Package with moist air model that decouples pressure and temperature"
+  extends Modelica.Media.Interfaces.PartialCondensingGases(
+     mediumName="Air",
+     final substanceNames={"water", "air"},
+     final reducedX=true,
+     final singleState = false,
+     reference_X={0.01,0.99},
+     final fluidConstants = {Modelica.Media.IdealGases.Common.FluidData.H2O,
+                             Modelica.Media.IdealGases.Common.FluidData.N2},
+     reference_T=273.15,
+     reference_p=101325,
+     AbsolutePressure(start=p_default),
+     Temperature(start=T_default));
+  extends Modelica.Icons.Package;
+
+  constant Integer Water=1
+    "Index of water (in substanceNames, massFractions X, etc.)";
+  constant Integer Air=2
+    "Index of air (in substanceNames, massFractions X, etc.)";
+
+  constant AbsolutePressure pStp = reference_p
+    "Pressure for which fluid density is defined";
+  constant Density dStp = 1.2 "Fluid density at pressure pStp";
+
+  // Redeclare ThermodynamicState to avoid the warning
+  // "Base class ThermodynamicState is replaceable"
+  // during model check
+  redeclare record extends ThermodynamicState
+    "ThermodynamicState record for moist air"
+  end ThermodynamicState;
+  // There must not be any stateSelect=StateSelect.prefer for
+  // the pressure.
+  // Otherwise, translateModel("Buildings.Fluid.FMI.ExportContainers.Examples.FMUs.ResistanceVolume")
+  // will fail as Dymola does an index reduction and outputs
+  //   Differentiated the equation
+  //   vol.dynBal.medium.p+res.dp-inlet.p = 0.0;
+  //   giving
+  //   der(vol.dynBal.medium.p)+der(res.dp) = der(inlet.p);
+  //
+  //   The model requires derivatives of some inputs as listed below:
+  //   1 inlet.m_flow
+  //   1 inlet.p
+  // Therefore, the statement
+  //   p(stateSelect=if preferredMediumStates then StateSelect.prefer else StateSelect.default)
+  // has been removed.
+  redeclare replaceable model extends BaseProperties(
+    Xi(each stateSelect=if preferredMediumStates then StateSelect.prefer else StateSelect.default),
+    T(stateSelect=if preferredMediumStates then StateSelect.prefer else StateSelect.default),
+    final standardOrderComponents=true) "Base properties"
+
+  protected
+    constant Modelica.SIunits.MolarMass[2] MMX = {steam.MM,dryair.MM}
+      "Molar masses of components";
+
+    MassFraction X_steam "Mass fraction of steam water";
+    MassFraction X_air "Mass fraction of air";
+    Modelica.SIunits.TemperatureDifference dT(start=T_default-reference_T)
+      "Temperature difference used to compute enthalpy";
+  equation
+    assert(T >= 200.0, "
+In "   + getInstanceName() + ": Temperature T exceeded its minimum allowed value of -73.15 degC (200 Kelvin)
+as required from medium model \"" + mediumName + "\".");
+    assert(T <= 423.15, "
+In "   + getInstanceName() + ": Temperature T exceeded its maximum allowed value of 150 degC (423.15 Kelvin)
+as required from medium model \"" + mediumName + "\".");
+
+    MM = 1/(Xi[Water]/MMX[Water]+(1.0-Xi[Water])/MMX[Air]);
+
+    X_steam  = Xi[Water]; // There is no liquid in this medium model
+    X_air    = 1-Xi[Water];
+
+    dT = T - reference_T;
+    h = dT*dryair.cp * X_air +
+       (dT * steam.cp + h_fg) * X_steam;
+    R = dryair.R*X_air + steam.R*X_steam;
+
+    // Equation for ideal gas, from h=u+p*v and R*T=p*v, from which follows that  u = h-R*T.
+    // u = h-R*T;
+    // However, in this medium, the gas law is d/dStp=p/pStp, from which follows using h=u+pv that
+    // u= h-p*v = h-p/d = h-pStp/dStp
+    u = h-pStp/dStp;
+
+    // In this medium model, the density depends only
+    // on temperature, but not on pressure.
+    //  d = p/(R*T);
+    d/dStp = p/pStp;
+
+    state.p = p;
+    state.T = T;
+    state.X = X;
+  end BaseProperties;
+
+redeclare function density "Gas density"
+  extends Modelica.Icons.Function;
+  input ThermodynamicState state;
+  output Density d "Density";
+algorithm
+  d :=state.p*dStp/pStp;
+  annotation(smoothOrder=5,
+  Inline=true,
+  Documentation(info="<html>
+Density is computed from pressure, temperature and composition in the thermodynamic state record applying the ideal gas law.
+</html>"));
+end density;
+
+redeclare function extends dynamicViscosity
+    "Return the dynamic viscosity of dry air"
+algorithm
+  eta := 4.89493640395e-08 * state.T + 3.88335940547e-06;
+  annotation (
+  smoothOrder=99,
+  Inline=true,
+Documentation(info="<html>
+<p>
+This function returns the dynamic viscosity.
+</p>
+<h4>Implementation</h4>
+<p>
+The function is based on the 5th order polynomial
+of
+<a href=\"modelica://Modelica.Media.Air.MoistAir.dynamicViscosity\">
+Modelica.Media.Air.MoistAir.dynamicViscosity</a>.
+However, for the typical range of temperatures encountered
+in building applications, a linear function sufficies.
+This implementation is therefore the above 5th order polynomial,
+linearized around <i>20</i>&deg;C.
+The relative error of this linearization is
+<i>0.4</i>% at <i>-20</i>&deg;C,
+and less then
+<i>0.2</i>% between  <i>-5</i>&deg;C and  <i>+50</i>&deg;C.
+</p>
+</html>",
+revisions="<html>
+<ul>
+<li>
+December 19, 2013, by Michael Wetter:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end dynamicViscosity;
+
+redeclare function enthalpyOfCondensingGas
+    "Enthalpy of steam per unit mass of steam"
+  extends Modelica.Icons.Function;
+
+  input Temperature T "temperature";
+  output SpecificEnthalpy h "steam enthalpy";
+algorithm
+  h := (T-reference_T) * steam.cp + h_fg;
+  annotation(smoothOrder=5,
+  Inline=true,
+  derivative=der_enthalpyOfCondensingGas);
+end enthalpyOfCondensingGas;
+
+redeclare replaceable function extends enthalpyOfGas
+    "Enthalpy of gas mixture per unit mass of gas mixture"
+algorithm
+  h := enthalpyOfCondensingGas(T)*X[Water]
+       + enthalpyOfDryAir(T)*(1.0-X[Water]);
+annotation (
+  Inline=true);
+end enthalpyOfGas;
+
+redeclare replaceable function extends enthalpyOfLiquid
+    "Enthalpy of liquid (per unit mass of liquid) which is linear in the temperature"
+algorithm
+  h := (T - reference_T)*cpWatLiq;
+  annotation (
+    smoothOrder=5,
+    Inline=true,
+    derivative=der_enthalpyOfLiquid);
+end enthalpyOfLiquid;
+
+redeclare function enthalpyOfNonCondensingGas
+    "Enthalpy of non-condensing gas per unit mass of steam"
+  extends Modelica.Icons.Function;
+
+  input Temperature T "temperature";
+  output SpecificEnthalpy h "enthalpy";
+algorithm
+  h := enthalpyOfDryAir(T);
+  annotation (
+  smoothOrder=5,
+  Inline=true,
+  derivative=der_enthalpyOfNonCondensingGas);
+end enthalpyOfNonCondensingGas;
+
+redeclare function extends enthalpyOfVaporization
+    "Enthalpy of vaporization of water"
+algorithm
+  r0 := h_fg;
+  annotation (
+    Inline=true);
+end enthalpyOfVaporization;
+
+redeclare function extends gasConstant
+    "Return ideal gas constant as a function from thermodynamic state, only valid for phi<1"
+
+algorithm
+    R := dryair.R*(1 - state.X[Water]) + steam.R*state.X[Water];
+  annotation (
+    smoothOrder=2,
+    Inline=true,
+    Documentation(info="<html>
+The ideal gas constant for moist air is computed from <a href=\"modelica://Modelica.Media.Air.MoistAir.ThermodynamicState\">thermodynamic state</a> assuming that all water is in the gas phase.
+</html>"));
+end gasConstant;
+
+redeclare function extends pressure
+    "Returns pressure of ideal gas as a function of the thermodynamic state record"
+
+algorithm
+  p := state.p;
+  annotation (
+  smoothOrder=2,
+  Inline=true,
+  Documentation(info="<html>
+Pressure is returned from the thermodynamic state record input as a simple assignment.
+</html>"));
+end pressure;
+
+redeclare function extends isobaricExpansionCoefficient
+    "Isobaric expansion coefficient beta"
+algorithm
+  beta := 0;
+  annotation (
+    smoothOrder=5,
+    Inline=true,
+Documentation(info="<html>
+<p>
+This function returns the isobaric expansion coefficient at constant pressure,
+which is zero for this medium.
+The isobaric expansion coefficient at constant pressure is
+</p>
+<p align=\"center\" style=\"font-style:italic;\">
+&beta;<sub>p</sub> = - 1 &frasl; v &nbsp; (&part; v &frasl; &part; T)<sub>p</sub> = 0,
+</p>
+<p>
+where
+<i>v</i> is the specific volume,
+<i>T</i> is the temperature and
+<i>p</i> is the pressure.
+</p>
+</html>",
+revisions="<html>
+<ul>
+<li>
+December 18, 2013, by Michael Wetter:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end isobaricExpansionCoefficient;
+
+redeclare function extends isothermalCompressibility
+    "Isothermal compressibility factor"
+algorithm
+  kappa := -1/state.p;
+  annotation (
+    smoothOrder=5,
+    Inline=true,
+    Documentation(info="<html>
+<p>
+This function returns the isothermal compressibility coefficient.
+The isothermal compressibility is
+</p>
+<p align=\"center\" style=\"font-style:italic;\">
+&kappa;<sub>T</sub> = -1 &frasl; v &nbsp; (&part; v &frasl; &part; p)<sub>T</sub>
+  = -1 &frasl; p,
+</p>
+<p>
+where
+<i>v</i> is the specific volume,
+<i>T</i> is the temperature and
+<i>p</i> is the pressure.
+</p>
+</html>",
+revisions="<html>
+<ul>
+<li>
+December 18, 2013, by Michael Wetter:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end isothermalCompressibility;
+
+redeclare function extends saturationPressure
+    "Saturation curve valid for 223.16 <= T <= 373.16 (and slightly outside with less accuracy)"
+
+algorithm
+  psat := IbpsaMpc.Utilities.Psychrometrics.Functions.saturationPressure(Tsat);
+  annotation (
+  smoothOrder=5,
+  Inline=true);
+end saturationPressure;
+
+redeclare function extends specificEntropy
+    "Return the specific entropy, only valid for phi<1"
+
+  protected
+    Modelica.SIunits.MoleFraction[2] Y "Molar fraction";
+algorithm
+    Y := massToMoleFractions(
+         state.X, {steam.MM,dryair.MM});
+    s := specificHeatCapacityCp(state) * Modelica.Math.log(state.T/reference_T)
+         - Modelica.Constants.R *
+         sum(state.X[i]/MMX[i]*
+             Modelica.Math.log(max(Y[i], Modelica.Constants.eps)*state.p/reference_p) for i in 1:2);
+  annotation (
+  Inline=true,
+    Documentation(info="<html>
+<p>
+This function computes the specific entropy.
+</p>
+<p>
+The specific entropy of the mixture is obtained from
+</p>
+<p align=\"center\" style=\"font-style:italic;\">
+s = s<sub>s</sub> + s<sub>m</sub>,
+</p>
+<p>
+where
+<i>s<sub>s</sub></i> is the entropy change due to the state change
+(relative to the reference temperature) and
+<i>s<sub>m</sub></i> is the entropy change due to mixing
+of the dry air and water vapor.
+</p>
+<p>
+The entropy change due to change in state is obtained from
+</p>
+<p align=\"center\" style=\"font-style:italic;\">
+s<sub>s</sub> = c<sub>v</sub> ln(T/T<sub>0</sub>) + R ln(v/v<sub>0</sub>) <br/>
+= c<sub>v</sub> ln(T/T<sub>0</sub>) + R ln(&rho;<sub>0</sub>/&rho;)
+</p>
+<p>If we assume <i>&rho; = p<sub>0</sub>/(R T)</i>,
+and because <i>c<sub>p</sub> = c<sub>v</sub> + R</i>,
+we can write
+</p>
+<p align=\"center\" style=\"font-style:italic;\">
+s<sub>s</sub> = c<sub>v</sub> ln(T/T<sub>0</sub>) + R ln(T/T<sub>0</sub>) <br/>
+=c<sub>p</sub> ln(T/T<sub>0</sub>).
+</p>
+<p>
+Next, the entropy of mixing is obtained from a reversible isothermal
+expansion process. Hence,
+</p>
+<p align=\"center\" style=\"font-style:italic;\">
+  s<sub>m</sub> = -R &sum;<sub>i</sub>( X<sub>i</sub> &frasl; M<sub>i</sub>
+  ln(Y<sub>i</sub> p/p<sub>0</sub>)),
+</p>
+<p>
+where <i>R</i> is the gas constant,
+<i>X</i> is the mass fraction,
+<i>M</i> is the molar mass, and
+<i>Y</i> is the mole fraction.
+</p>
+<p>
+To obtain the state for a given pressure, entropy and mass fraction, use
+<a href=\"modelica://IbpsaMpc.Media.Air.setState_psX\">
+IbpsaMpc.Media.Air.setState_psX</a>.
+</p>
+<h4>Limitations</h4>
+<p>
+This function is only valid for a relative humidity below 100%.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+November 27, 2013, by Michael Wetter:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end specificEntropy;
+
+redeclare function extends density_derp_T
+    "Return the partial derivative of density with respect to pressure at constant temperature"
+algorithm
+  ddpT := dStp/pStp;
+  annotation (
+  Inline=true,
+Documentation(info="<html>
+<p>
+This function returns the partial derivative of density
+with respect to pressure at constant temperature.
+</p>
+</html>",
+revisions="<html>
+<ul>
+<li>
+December 18, 2013, by Michael Wetter:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end density_derp_T;
+
+redeclare function extends density_derT_p
+    "Return the partial derivative of density with respect to temperature at constant pressure"
+algorithm
+  ddTp := 0;
+
+  annotation (
+  smoothOrder=99,
+  Inline=true,
+  Documentation(info=
+"<html>
+<p>
+This function computes the derivative of density with respect to temperature
+at constant pressure.
+</p>
+</html>", revisions=
+"<html>
+<ul>
+<li>
+December 18, 2013, by Michael Wetter:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end density_derT_p;
+
+redeclare function extends density_derX
+    "Return the partial derivative of density with respect to mass fractions at constant pressure and temperature"
+algorithm
+  dddX := fill(0, nX);
+annotation (
+  smoothOrder=99,
+  Inline=true,
+  Documentation(info="<html>
+<p>
+This function returns the partial derivative of density
+with respect to mass fraction.
+This value is zero because in this medium, density is proportional
+to pressure, but independent of the species concentration.
+</p>
+</html>",
+revisions="<html>
+<ul>
+<li>
+December 18, 2013, by Michael Wetter:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end density_derX;
+
+redeclare replaceable function extends specificHeatCapacityCp
+    "Specific heat capacity of gas mixture at constant pressure"
+algorithm
+  cp := dryair.cp*(1-state.X[Water]) +steam.cp*state.X[Water];
+    annotation (
+  smoothOrder=99,
+  Inline=true,
+  derivative=der_specificHeatCapacityCp);
+end specificHeatCapacityCp;
+
+redeclare replaceable function extends specificHeatCapacityCv
+    "Specific heat capacity of gas mixture at constant volume"
+algorithm
+  cv:= dryair.cv*(1-state.X[Water]) +steam.cv*state.X[Water];
+  annotation (
+    smoothOrder=99,
+    Inline=true,
+    derivative=der_specificHeatCapacityCv);
+end specificHeatCapacityCv;
+
+redeclare function setState_dTX
+    "Return thermodynamic state as function of density d, temperature T and composition X"
+  extends Modelica.Icons.Function;
+  input Density d "Density";
+  input Temperature T "Temperature";
+  input MassFraction X[:]=reference_X "Mass fractions";
+  output ThermodynamicState state "Thermodynamic state";
+
+algorithm
+    // Note that d/dStp = p/pStp, hence p = d*pStp/dStp
+    state := if size(X, 1) == nX then
+               ThermodynamicState(p=d*pStp/dStp, T=T, X=X)
+             else
+               ThermodynamicState(p=d*pStp/dStp,
+                                  T=T,
+                                  X=cat(1, X, {1 - sum(X)}));
+    annotation (
+    smoothOrder=2,
+    Inline=true,
+    Documentation(info="<html>
+<p>
+The <a href=\"modelica://Modelica.Media.Interfaces.PartialMixtureMedium.ThermodynamicState\">thermodynamic state record</a>
+    is computed from density <code>d</code>, temperature <code>T</code> and composition <code>X</code>.
+</p>
+</html>"));
+end setState_dTX;
+
+redeclare function extends setState_phX
+    "Return thermodynamic state as function of pressure p, specific enthalpy h and composition X"
+algorithm
+  state := if size(X, 1) == nX then
+    ThermodynamicState(p=p, T=temperature_phX(p, h, X), X=X)
+ else
+    ThermodynamicState(p=p, T=temperature_phX(p, h, X), X=cat(1, X, {1 - sum(X)}));
+  annotation (
+  smoothOrder=2,
+  Inline=true,
+  Documentation(info="<html>
+The <a href=\"modelica://Modelica.Media.Interfaces.PartialMixtureMedium.ThermodynamicState\">
+thermodynamic state record</a> is computed from pressure p, specific enthalpy h and composition X.
+</html>"));
+end setState_phX;
+
+redeclare function extends setState_pTX
+    "Return thermodynamic state as function of p, T and composition X or Xi"
+algorithm
+    state := if size(X, 1) == nX then
+                ThermodynamicState(p=p, T=T, X=X)
+             else
+                ThermodynamicState(p=p, T=T, X=cat(1, X, {1 - sum(X)}));
+    annotation (
+  smoothOrder=2,
+  Inline=true,
+  Documentation(info="<html>
+The <a href=\"modelica://Modelica.Media.Interfaces.PartialMixtureMedium.ThermodynamicState\">
+thermodynamic state record</a> is computed from pressure p, temperature T and composition X.
+</html>"));
+end setState_pTX;
+
+redeclare function extends setState_psX
+    "Return the thermodynamic state as function of p, s and composition X or Xi"
+  protected
+    Modelica.SIunits.MassFraction[2] X_int "Mass fraction";
+    Modelica.SIunits.MoleFraction[2] Y "Molar fraction";
+    Modelica.SIunits.Temperature T "Temperature";
+algorithm
+    if size(X, 1) == nX then
+      X_int:=X;
+    else
+      X_int :=cat(
+        1,
+        X,
+        {1 - sum(X)});
+    end if;
+   Y := massToMoleFractions(
+         X_int, {steam.MM,dryair.MM});
+    // The next line is obtained from symbolic solving the
+    // specificEntropy function for T.
+    // In this formulation, we can set T to any value when calling
+    // specificHeatCapacityCp as cp does not depend on T.
+    T := 273.15 * Modelica.Math.exp((s + Modelica.Constants.R *
+           sum(X_int[i]/MMX[i]*
+             Modelica.Math.log(max(Y[i], Modelica.Constants.eps)) for i in 1:2))
+             / specificHeatCapacityCp(setState_pTX(p=p,
+                                                   T=273.15,
+                                                   X=X_int)));
+
+    state := ThermodynamicState(p=p,
+                                T=T,
+                                X=X_int);
+
+annotation (
+Inline=true,
+Documentation(info="<html>
+<p>
+This function returns the thermodynamic state based on pressure,
+specific entropy and mass fraction.
+</p>
+<p>
+The state is computed by symbolically solving
+<a href=\"modelica://IbpsaMpc.Media.Air.specificEntropy\">
+IbpsaMpc.Media.Air.specificEntropy</a>
+for temperature.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+November 27, 2013, by Michael Wetter:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end setState_psX;
+
+redeclare replaceable function extends specificEnthalpy
+    "Compute specific enthalpy from pressure, temperature and mass fraction"
+algorithm
+  h := (state.T - reference_T)*dryair.cp * (1 - state.X[Water]) +
+       ((state.T-reference_T) * steam.cp + h_fg) * state.X[Water];
+  annotation (
+   smoothOrder=5,
+   Inline=true);
+end specificEnthalpy;
+
+redeclare replaceable function specificEnthalpy_pTX "Specific enthalpy"
+  extends Modelica.Icons.Function;
+  input Modelica.SIunits.Pressure p "Pressure";
+  input Modelica.SIunits.Temperature T "Temperature";
+  input Modelica.SIunits.MassFraction X[:] "Mass fractions of moist air";
+  output Modelica.SIunits.SpecificEnthalpy h "Specific enthalpy at p, T, X";
+
+algorithm
+  h := specificEnthalpy(setState_pTX(p, T, X));
+  annotation(smoothOrder=5,
+             Inline=true,
+             inverse(T=temperature_phX(p, h, X)),
+             Documentation(info="<html>
+Specific enthalpy as a function of temperature and species concentration.
+The pressure is input for compatibility with the medium models, but the specific enthalpy
+is independent of the pressure.
+</html>",
+revisions="<html>
+<ul>
+<li>
+April 30, 2015, by Filip Jorissen and Michael Wetter:<br/>
+Added <code>Inline=true</code> for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/227\">
+issue 227</a>.
+</li>
+</ul>
+</html>"));
+end specificEnthalpy_pTX;
+
+redeclare replaceable function extends specificGibbsEnergy
+    "Specific Gibbs energy"
+algorithm
+  g := specificEnthalpy(state) - state.T*specificEntropy(state);
+  annotation (
+    Inline=true);
+end specificGibbsEnergy;
+
+redeclare replaceable function extends specificHelmholtzEnergy
+    "Specific Helmholtz energy"
+algorithm
+  f := specificEnthalpy(state) - gasConstant(state)*state.T - state.T*specificEntropy(state);
+  annotation (
+    Inline=true);
+end specificHelmholtzEnergy;
+
+redeclare function extends isentropicEnthalpy "Return the isentropic enthalpy"
+algorithm
+  h_is := specificEnthalpy(setState_psX(
+            p=p_downstream,
+            s=specificEntropy(refState),
+            X=refState.X));
+annotation (
+  Inline=true,
+  Documentation(info="<html>
+<p>
+This function computes the specific enthalpy for
+an isentropic state change from the temperature
+that corresponds to the state <code>refState</code>
+to <code>reference_T</code>.
+</p>
+</html>",
+revisions="<html>
+<ul>
+<li>
+December 18, 2013, by Michael Wetter:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end isentropicEnthalpy;
+
+redeclare function extends specificInternalEnergy "Specific internal energy"
+  extends Modelica.Icons.Function;
+algorithm
+  u := specificEnthalpy(state) - pStp/dStp;
+  annotation (
+    Inline=true);
+end specificInternalEnergy;
+
+redeclare function extends temperature
+    "Return temperature of ideal gas as a function of the thermodynamic state record"
+algorithm
+  T := state.T;
+  annotation (
+  smoothOrder=2,
+  Inline=true,
+  Documentation(info="<html>
+Temperature is returned from the thermodynamic state record input as a simple assignment.
+</html>"));
+end temperature;
+
+redeclare function extends molarMass "Return the molar mass"
+algorithm
+    MM := 1/(state.X[Water]/MMX[Water]+(1.0-state.X[Water])/MMX[Air]);
+    annotation (
+Inline=true,
+smoothOrder=99,
+Documentation(info="<html>
+<p>
+This function returns the molar mass.
+</p>
+</html>",
+revisions="<html>
+<ul>
+<li>
+December 18, 2013, by Michael Wetter:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end molarMass;
+
+redeclare replaceable function temperature_phX
+    "Compute temperature from specific enthalpy and mass fraction"
+    extends Modelica.Icons.Function;
+  input AbsolutePressure p "Pressure";
+  input SpecificEnthalpy h "specific enthalpy";
+  input MassFraction[:] X "mass fractions of composition";
+  output Temperature T "temperature";
+algorithm
+  T := reference_T + (h - h_fg * X[Water])
+       /((1 - X[Water])*dryair.cp + X[Water] * steam.cp);
+  annotation(smoothOrder=5,
+             Inline=true,
+             inverse(h=specificEnthalpy_pTX(p, T, X)),
+             Documentation(info="<html>
+Temperature as a function of specific enthalpy and species concentration.
+The pressure is input for compatibility with the medium models, but the temperature
+is independent of the pressure.
+</html>",
+revisions="<html>
+<ul>
+<li>
+April 30, 2015, by Filip Jorissen and Michael Wetter:<br/>
+Added <code>Inline=true</code> for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/227\">
+issue 227</a>.
+</li>
+</ul>
+</html>"));
+end temperature_phX;
+
+redeclare function extends thermalConductivity
+    "Thermal conductivity of dry air as a polynomial in the temperature"
+algorithm
+  lambda := Modelica.Media.Incompressible.TableBased.Polynomials_Temp.evaluate(
+      {(-4.8737307422969E-008), 7.67803133753502E-005, 0.0241814385504202},
+   Modelica.SIunits.Conversions.to_degC(state.T));
+annotation(LateInline=true);
+end thermalConductivity;
+//////////////////////////////////////////////////////////////////////
+// Protected classes.
+// These classes are only of use within this medium model.
+// Models generally have no need to access them.
+// Therefore, they are made protected. This also allows to redeclare the
+// medium model with another medium model that does not provide an
+// implementation of these classes.
+protected
+  record GasProperties
+    "Coefficient data record for properties of perfect gases"
+    extends Modelica.Icons.Record;
+
+    Modelica.SIunits.MolarMass MM "Molar mass";
+    Modelica.SIunits.SpecificHeatCapacity R "Gas constant";
+    Modelica.SIunits.SpecificHeatCapacity cp
+      "Specific heat capacity at constant pressure";
+    Modelica.SIunits.SpecificHeatCapacity cv = cp-R
+      "Specific heat capacity at constant volume";
+    annotation (
+      preferredView="info",
+      defaultComponentName="gas",
+      Documentation(info="<html>
+<p>
+This data record contains the coefficients for perfect gases.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+September 12, 2014, by Michael Wetter:<br/>
+Corrected the wrong location of the <code>preferredView</code>
+and the <code>revisions</code> annotation.
+</li>
+<li>
+November 21, 2013, by Michael Wetter:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+  end GasProperties;
+  // In the assignments below, we compute cv as OpenModelica
+  // cannot evaluate cv=cp-R as defined in GasProperties.
+  constant GasProperties dryair(
+    R =    Modelica.Media.IdealGases.Common.SingleGasesData.Air.R,
+    MM =   Modelica.Media.IdealGases.Common.SingleGasesData.Air.MM,
+    cp =   IbpsaMpc.Utilities.Psychrometrics.Constants.cpAir,
+    cv =   IbpsaMpc.Utilities.Psychrometrics.Constants.cpAir
+             -Modelica.Media.IdealGases.Common.SingleGasesData.Air.R)
+    "Dry air properties";
+  constant GasProperties steam(
+    R =    Modelica.Media.IdealGases.Common.SingleGasesData.H2O.R,
+    MM =   Modelica.Media.IdealGases.Common.SingleGasesData.H2O.MM,
+    cp =   IbpsaMpc.Utilities.Psychrometrics.Constants.cpSte,
+    cv =   IbpsaMpc.Utilities.Psychrometrics.Constants.cpSte
+             -Modelica.Media.IdealGases.Common.SingleGasesData.H2O.R)
+    "Steam properties";
+
+  constant Real k_mair =  steam.MM/dryair.MM "Ratio of molar weights";
+
+  constant Modelica.SIunits.MolarMass[2] MMX={steam.MM,dryair.MM}
+    "Molar masses of components";
+
+  constant Modelica.SIunits.SpecificEnergy h_fg=
+    IbpsaMpc.Utilities.Psychrometrics.Constants.h_fg
+    "Latent heat of evaporation of water";
+  constant Modelica.SIunits.SpecificHeatCapacity cpWatLiq=
+    IbpsaMpc.Utilities.Psychrometrics.Constants.cpWatLiq
+    "Specific heat capacity of liquid water";
+
+replaceable function der_enthalpyOfLiquid
+    "Temperature derivative of enthalpy of liquid per unit mass of liquid"
+  extends Modelica.Icons.Function;
+  input Temperature T "Temperature";
+  input Real der_T "Temperature derivative";
+  output Real der_h "Derivative of liquid enthalpy";
+algorithm
+  der_h := cpWatLiq*der_T;
+  annotation (
+    Inline=true);
+end der_enthalpyOfLiquid;
+
+function der_enthalpyOfCondensingGas
+    "Derivative of enthalpy of steam per unit mass of steam"
+  extends Modelica.Icons.Function;
+  input Temperature T "Temperature";
+  input Real der_T "Temperature derivative";
+  output Real der_h "Derivative of steam enthalpy";
+algorithm
+  der_h := steam.cp*der_T;
+  annotation (
+    Inline=true);
+end der_enthalpyOfCondensingGas;
+
+replaceable function enthalpyOfDryAir
+    "Enthalpy of dry air per unit mass of dry air"
+  extends Modelica.Icons.Function;
+
+  input Temperature T "Temperature";
+  output SpecificEnthalpy h "Dry air enthalpy";
+algorithm
+  h := (T - reference_T)*dryair.cp;
+  annotation (
+    smoothOrder=5,
+    Inline=true,
+    derivative=der_enthalpyOfDryAir);
+end enthalpyOfDryAir;
+
+replaceable function der_enthalpyOfDryAir
+    "Derivative of enthalpy of dry air per unit mass of dry air"
+  extends Modelica.Icons.Function;
+  input Temperature T "Temperature";
+  input Real der_T "Temperature derivative";
+  output Real der_h "Derivative of dry air enthalpy";
+algorithm
+  der_h := dryair.cp*der_T;
+  annotation (
+    Inline=true);
+end der_enthalpyOfDryAir;
+
+replaceable function der_enthalpyOfNonCondensingGas
+    "Derivative of enthalpy of non-condensing gas per unit mass of steam"
+  extends Modelica.Icons.Function;
+  input Temperature T "Temperature";
+  input Real der_T "Temperature derivative";
+  output Real der_h "Derivative of steam enthalpy";
+algorithm
+  der_h := der_enthalpyOfDryAir(T, der_T);
+  annotation (
+    Inline=true);
+end der_enthalpyOfNonCondensingGas;
+
+replaceable function der_specificHeatCapacityCp
+    "Derivative of specific heat capacity of gas mixture at constant pressure"
+  extends Modelica.Icons.Function;
+    input ThermodynamicState state "Thermodynamic state";
+    input ThermodynamicState der_state "Derivative of thermodynamic state";
+    output Real der_cp(unit="J/(kg.K.s)")
+      "Derivative of specific heat capacity";
+algorithm
+  der_cp := (steam.cp-dryair.cp)*der_state.X[Water];
+  annotation (
+    Inline=true);
+end der_specificHeatCapacityCp;
+
+replaceable function der_specificHeatCapacityCv
+    "Derivative of specific heat capacity of gas mixture at constant volume"
+  extends Modelica.Icons.Function;
+    input ThermodynamicState state "Thermodynamic state";
+    input ThermodynamicState der_state "Derivative of thermodynamic state";
+    output Real der_cv(unit="J/(kg.K.s)")
+      "Derivative of specific heat capacity";
+algorithm
+  der_cv := (steam.cv-dryair.cv)*der_state.X[Water];
+  annotation (
+    Inline=true);
+end der_specificHeatCapacityCv;
+  annotation(preferredView="info", Documentation(info="<html>
+<p>
+This medium package models moist air using a gas law in which pressure and temperature
+are independent, which often leads to significantly faster and more robust computations.
+The specific heat capacities at constant pressure and at constant volume are constant.
+The air is assumed to be not saturated.
+</p>
+<p>
+This medium uses the gas law
+</p>
+<p align=\"center\" style=\"font-style:italic;\">
+&rho;/&rho;<sub>stp</sub> = p/p<sub>stp</sub>,
+</p>
+<p>
+where
+<i>p<sub>std</sub></i> and <i>&rho;<sub>stp</sub></i> are constant reference
+temperature and density, rathern than the ideal gas law
+</p>
+<p align=\"center\" style=\"font-style:italic;\">
+&rho; = p &frasl;(R T),
+</p>
+<p>
+where <i>R</i> is the gas constant and <i>T</i> is the temperature.
+</p>
+<p>
+This formulation often leads to smaller systems of nonlinear equations
+because equations for pressure and temperature are decoupled.
+Therefore, if air inside a control volume such as room air is heated, it
+does not increase its specific volume. Consequently, merely heating or cooling
+a control volume does not affect the air flow calculations in a duct network
+that may be connected to that volume.
+Note that multizone air exchange simulation in which buoyancy drives the
+air flow is still possible as the models in
+<a href=\"modelica://IbpsaMpc.Airflow.Multizone\">
+IbpsaMpc.Airflow.Multizone</a> compute the mass density using the function
+<a href=\"modelica://IbpsaMpc.Utilities.Psychrometrics.Functions.density_pTX\">
+IbpsaMpc.Utilities.Psychrometrics.Functions.density_pTX</a> in which density
+is a function of temperature.
+</p>
+<p>
+Note that models in this package implement the equation for the internal energy as
+</p>
+<p align=\"center\" style=\"font-style:italic;\">
+  u = h - p<sub>stp</sub> &frasl; &rho;<sub>stp</sub>,
+</p>
+<p>
+where
+<i>u</i> is the internal energy per unit mass,
+<i>h</i> is the enthalpy per unit mass,
+<i>p<sub>stp</sub></i> is the static pressure and
+<i>&rho;<sub>stp</sub></i> is the mass density at standard pressure and temperature.
+The reason for this implementation is that in general,
+</p>
+<p align=\"center\" style=\"font-style:italic;\">
+  h = u + p v,
+</p>
+<p>
+from which follows that
+</p>
+<p align=\"center\" style=\"font-style:italic;\">
+  u = h - p v = h - p &frasl; &rho; = h - p<sub>stp</sub> &frasl; &rho;<sub>std</sub>,
+</p>
+<p>
+because <i>p &frasl; &rho; = p<sub>stp</sub> &frasl; &rho;<sub>stp</sub></i> in this medium model.
+</p>
+<p>
+The enthalpy is computed using the convention that <i>h=0</i>
+if <i>T=0</i> &deg;C and no water vapor is present.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+January 11, 2019 by Michael Wetter:<br/>
+Reforulated assignment of <code>X_int</code> in <code>setState_psX</code>.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1079\">#1079</a>.
+</li>
+<li>
+October 26, 2018, by Filip Jorissen and Michael Wetter:<br/>
+Now printing different messages if temperature is above or below its limit,
+and adding instance name as JModelica does not print the full instance name in the assertion.
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1045\">#1045</a>.
+</li>
+<li>
+November 4, 2016, by Michael Wetter:<br/>
+Set default value for <code>dT.start</code> in base properties.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/575\">#575</a>.
+</li>
+<li>
+June 6, 2015, by Michael Wetter:<br/>
+Set <code>AbsolutePressure(start=p_default)</code> to avoid
+a translation error if
+<a href=\"modelica://IbpsaMpc.Fluid.Sources.Examples.TraceSubstancesFlowSource\">
+IbpsaMpc.Fluid.Sources.Examples.TraceSubstancesFlowSource</a>
+is translated in pedantic mode in Dymola 2016.
+The reason is that pressures use <code>Medium.p_default</code> as start values,
+but
+<a href=\"modelica://Modelica.Media.Interfaces.Types\">
+Modelica.Media.Interfaces.Types</a>
+sets a default value of <i>1E-5</i>.
+A similar change has been done for pressure.
+This fixes
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/266\">#266</a>.
+</li>
+<li>
+June 5, 2015, by Michael Wetter:<br/>
+Added <code>stateSelect</code> attribute in <code>BaseProperties.T</code>
+to allow correct use of <code>preferredMediumState</code> as
+described in
+<a href=\"modelica://Modelica.Media.Interfaces.PartialMedium\">
+Modelica.Media.Interfaces.PartialMedium</a>.
+Note that the default is <code>preferredMediumState=false</code>
+and hence the same states are used as were used before.
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/260\">#260</a>.
+</li>
+<li>
+May 11, 2015, by Michael Wetter:<br/>
+Removed
+<code>p(stateSelect=if preferredMediumStates then StateSelect.prefer else StateSelect.default)</code>
+in declaration of <code>BaseProperties</code>.
+Otherwise, when models that contain a fluid volume
+are exported as an FMU, their pressure would be
+differentiated with respect to time. This would require
+the time derivative of the inlet pressure, which is not available,
+causing the translation to stop with an error.
+</li>
+<li>
+May 1, 2015, by Michael Wetter:<br/>
+Added <code>Inline=true</code> for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/227\">
+issue 227</a>.
+</li>
+<li>
+March 20, 2015, by Michael Wetter:<br/>
+Added missing term <code>state.p/reference_p</code> in function
+<code>specificEntropy</code>.
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/193\">#193</a>.
+</li>
+<li>
+February 3, 2015, by Michael Wetter:<br/>
+Removed <code>stateSelect.prefer</code> for temperature.
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/160\">#160</a>.
+</li>
+<li>
+July 24, 2014, by Michael Wetter:<br/>
+Changed implementation to use
+<a href=\"modelica://IbpsaMpc.Utilities.Psychrometrics.Constants\">
+IbpsaMpc.Utilities.Psychrometrics.Constants</a>.
+This was done to use consistent values throughout the library.
+</li>
+<li>
+November 16, 2013, by Michael Wetter:<br/>
+Revised and simplified the implementation.
+</li>
+<li>
+November 14, 2013, by Michael Wetter:<br/>
+Removed function
+<code>HeatCapacityOfWater</code>
+which is neither needed nor implemented in the
+Modelica Standard Library.
+</li>
+<li>
+November 13, 2013, by Michael Wetter:<br/>
+Removed non-used computations in <code>specificEnthalpy_pTX</code> and
+in <code>temperature_phX</code>.
+</li>
+<li>
+March 29, 2013, by Michael Wetter:<br/>
+Added <code>final standardOrderComponents=true</code> in the
+<code>BaseProperties</code> declaration. This avoids an error
+when models are checked in Dymola 2014 in the pedenatic mode.
+</li>
+<li>
+April 12, 2012, by Michael Wetter:<br/>
+Added keyword <code>each</code> to <code>Xi(stateSelect=...)</code>.
+</li>
+<li>
+April 4, 2012, by Michael Wetter:<br/>
+Added redeclaration of <code>ThermodynamicState</code> to avoid a warning
+during model check and translation.
+</li>
+<li>
+August 3, 2011, by Michael Wetter:<br/>
+Fixed bug in <code>u=h-R*T</code>, which is only valid for ideal gases.
+For this medium, the function is <code>u=h-pStd/dStp</code>.
+</li>
+<li>
+January 27, 2010, by Michael Wetter:<br/>
+Fixed bug in <code>else</code> branch of function <code>setState_phX</code>
+that lead to a run-time error when the constructor of this function was called.
+</li>
+<li>
+January 22, 2010, by Michael Wetter:<br/>
+Added implementation of function
+<a href=\"modelica://IbpsaMpc.Media.GasesPTDecoupled.MoistAirUnsaturated.enthalpyOfNonCondensingGas\">
+enthalpyOfNonCondensingGas</a> and its derivative.
+</li>
+<li>
+January 13, 2010, by Michael Wetter:<br/>
+Fixed implementation of derivative functions.
+</li>
+<li>
+August 28, 2008, by Michael Wetter:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+    Icon(graphics={
+        Ellipse(
+          extent={{-78,78},{-34,34}},
+          lineColor={0,0,0},
+          fillPattern=FillPattern.Sphere,
+          fillColor={120,120,120}),
+        Ellipse(
+          extent={{-18,86},{26,42}},
+          lineColor={0,0,0},
+          fillPattern=FillPattern.Sphere,
+          fillColor={120,120,120}),
+        Ellipse(
+          extent={{48,58},{92,14}},
+          lineColor={0,0,0},
+          fillPattern=FillPattern.Sphere,
+          fillColor={120,120,120}),
+        Ellipse(
+          extent={{-22,32},{22,-12}},
+          lineColor={0,0,0},
+          fillPattern=FillPattern.Sphere,
+          fillColor={120,120,120}),
+        Ellipse(
+          extent={{36,-32},{80,-76}},
+          lineColor={0,0,0},
+          fillPattern=FillPattern.Sphere,
+          fillColor={120,120,120}),
+        Ellipse(
+          extent={{-36,-30},{8,-74}},
+          lineColor={0,0,0},
+          fillPattern=FillPattern.Sphere,
+          fillColor={120,120,120}),
+        Ellipse(
+          extent={{-90,-6},{-46,-50}},
+          lineColor={0,0,0},
+          fillPattern=FillPattern.Sphere,
+          fillColor={120,120,120})}));
+end Air;
diff --git a/IbpsaMpc/Media/package.mo b/IbpsaMpc/Media/package.mo
new file mode 100644
index 0000000..0210440
--- /dev/null
+++ b/IbpsaMpc/Media/package.mo
@@ -0,0 +1,51 @@
+within IbpsaMpc;
+package Media "Package with medium models"
+  extends Modelica.Icons.Package;
+
+  annotation (preferredView="info", Documentation(info="<html>
+<p>
+This package contains media models for water and moist air.
+The media models in this package are
+compatible with
+<a href=\"modelica://Modelica.Media\">
+Modelica.Media</a>
+but the implementation is in general simpler, which often
+leads to more efficient simulation.
+Due to the simplifications, the media model of this package
+are generally accurate for a smaller temperature range than the
+models in <a href=\"modelica://Modelica.Media\">
+Modelica.Media</a>, but the smaller temperature range may often be
+sufficient for building HVAC applications.
+</p>
+</html>"),
+Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,100}}),
+        graphics={
+        Line(
+          points = {{-76,-80},{-62,-30},{-32,40},{4,66},{48,66},{73,45},{62,-8},{48,-50},{38,-80}},
+          color={64,64,64},
+          smooth=Smooth.Bezier),
+        Line(
+          points={{-40,20},{68,20}},
+          color={175,175,175}),
+        Line(
+          points={{-40,20},{-44,88},{-44,88}},
+          color={175,175,175}),
+        Line(
+          points={{68,20},{86,-58}},
+          color={175,175,175}),
+        Line(
+          points={{-60,-28},{56,-28}},
+          color={175,175,175}),
+        Line(
+          points={{-60,-28},{-74,84},{-74,84}},
+          color={175,175,175}),
+        Line(
+          points={{56,-28},{70,-80}},
+          color={175,175,175}),
+        Line(
+          points={{-76,-80},{38,-80}},
+          color={175,175,175}),
+        Line(
+          points={{-76,-80},{-94,-16},{-94,-16}},
+          color={175,175,175})}));
+end Media;
diff --git a/IbpsaMpc/Media/package.order b/IbpsaMpc/Media/package.order
new file mode 100644
index 0000000..d760141
--- /dev/null
+++ b/IbpsaMpc/Media/package.order
@@ -0,0 +1 @@
+Air
diff --git a/IbpsaMpc/package.order b/IbpsaMpc/package.order
index 8f9fefd..2bc2c51 100644
--- a/IbpsaMpc/package.order
+++ b/IbpsaMpc/package.order
@@ -1 +1,2 @@
 Fluid
+Media

From a35bc5cb817ff2fe556cced56c3eeb59dbc96f36 Mon Sep 17 00:00:00 2001
From: Filip Jorissen <filip.jorissen@kuleuven.be>
Date: Tue, 12 Nov 2019 16:49:06 +0100
Subject: [PATCH 04/17] added Utilities.Psychrometrics.Constants

---
 IbpsaMpc/.copiedFiles.txt                     |  3 +
 .../Sources/BaseClasses/PartialSource_Xi_C.mo | 40 ++++++++++---
 IbpsaMpc/Resources/Scripts/merge.py           |  1 +
 .../Utilities/Psychrometrics/Constants.mo     | 56 +++++++++++++++++++
 IbpsaMpc/Utilities/Psychrometrics/package.mo  | 15 +++++
 .../Utilities/Psychrometrics/package.order    |  1 +
 IbpsaMpc/Utilities/package.mo                 | 26 +++++++++
 IbpsaMpc/Utilities/package.order              |  1 +
 IbpsaMpc/package.order                        |  1 +
 9 files changed, 135 insertions(+), 9 deletions(-)
 create mode 100644 IbpsaMpc/Utilities/Psychrometrics/Constants.mo
 create mode 100644 IbpsaMpc/Utilities/Psychrometrics/package.mo
 create mode 100644 IbpsaMpc/Utilities/Psychrometrics/package.order
 create mode 100644 IbpsaMpc/Utilities/package.mo
 create mode 100644 IbpsaMpc/Utilities/package.order

diff --git a/IbpsaMpc/.copiedFiles.txt b/IbpsaMpc/.copiedFiles.txt
index d5f515d..a1de3bf 100644
--- a/IbpsaMpc/.copiedFiles.txt
+++ b/IbpsaMpc/.copiedFiles.txt
@@ -16,3 +16,6 @@ IbpsaMpc/Fluid/Sources/package.mo
 IbpsaMpc/Fluid/package.mo
 IbpsaMpc/Media/Air.mo
 IbpsaMpc/Media/package.mo
+IbpsaMpc/Utilities/Psychrometrics/Constants.mo
+IbpsaMpc/Utilities/Psychrometrics/package.mo
+IbpsaMpc/Utilities/package.mo
diff --git a/IbpsaMpc/Fluid/Sources/BaseClasses/PartialSource_Xi_C.mo b/IbpsaMpc/Fluid/Sources/BaseClasses/PartialSource_Xi_C.mo
index 770ea0a..29ac07c 100644
--- a/IbpsaMpc/Fluid/Sources/BaseClasses/PartialSource_Xi_C.mo
+++ b/IbpsaMpc/Fluid/Sources/BaseClasses/PartialSource_Xi_C.mo
@@ -49,19 +49,31 @@ equation
     Modelica.Fluid.Utilities.checkBoundary(Medium.mediumName, Medium.substanceNames,
       Medium.singleState, true, X_in_internal, "Boundary_pT");
   end if;
-  connect(X_in[1:Medium.nXi], Xi_in_internal);
-  connect(X_in,X_in_internal);
+
+  // Assign Xi_in_internal and X_in_internal
+  // Note that at most one of X_in or Xi_in is present
+  connect(X_in, X_in_internal);
   connect(Xi_in, Xi_in_internal);
-  connect(C_in, C_in_internal);
 
-  connect(medium.Xi, Xi_in_internal);
-  if not use_X_in and not use_Xi_in then
-    Xi_in_internal = X[1:Medium.nXi];
-  end if;
-  if not use_X_in then
+  if use_Xi_in then
+    // Must assign all components of X_in_internal, using Xi_in
+    X_in_internal[1:Medium.nXi] = Xi_in_internal[1:Medium.nXi];
+    // If reducedX = true, medium contains the equation sum(X) = 1.0
+    // Media with only one substance (e.g., water) have reducedX=true
+    // FlueGas and SimpleNaturalGas has reducedX = false
+    if Medium.reducedX then
+      X_in_internal[Medium.nX] = 1-sum(Xi_in_internal);
+    end if;
+  elseif use_X_in then
     X_in_internal[1:Medium.nXi] = Xi_in_internal[1:Medium.nXi];
-    X_in_internal[Medium.nX] = 1-sum(X_in_internal[1:Medium.nXi]);
+  else
+    // No connector is used. Use parameter X.
+    X_in_internal = X;
+    Xi_in_internal = X[1:Medium.nXi];
   end if;
+
+  connect(C_in, C_in_internal);
+
   if not use_C_in then
     C_in_internal = C;
   end if;
@@ -108,6 +120,16 @@ Otherwise the parameter value is used.
 </html>", revisions="<html>
 <ul>
 <li>
+September 19, 2019, by Michael Wetter:<br/>
+Refactored handling of mass fractions which was needed to handle media such as
+<a href=\"modelica://Modelica.Media.IdealGases.MixtureGases.FlueGasSixComponents\">
+Modelica.Media.IdealGases.MixtureGases.FlueGasSixComponents</a> and
+<a href=\"modelica://Modelica.Media.IdealGases.MixtureGases.SimpleNaturalGas\">
+Modelica.Media.IdealGases.MixtureGases.SimpleNaturalGas</a>.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1205\">IbpsaMpc, #1205</a>.
+</li>
+<li>
 February 13, 2018, by Michael Wetter:<br/>
 Corrected error in quantity assignment for <code>Xi_in</code>.
 This is for
diff --git a/IbpsaMpc/Resources/Scripts/merge.py b/IbpsaMpc/Resources/Scripts/merge.py
index ac4d9b2..0218b6f 100644
--- a/IbpsaMpc/Resources/Scripts/merge.py
+++ b/IbpsaMpc/Resources/Scripts/merge.py
@@ -17,6 +17,7 @@
 "IBPSA.Fluid.Sources.BaseClasses.PartialSource_Xi_C": {},
 "IBPSA.Fluid.Interfaces.PartialTwoPort": {},
 "IBPSA.Media.Air": {},
+"IBPSA.Utilities.Psychrometrics.Constants" : {},
 # "": {},
 # "": {},
 
diff --git a/IbpsaMpc/Utilities/Psychrometrics/Constants.mo b/IbpsaMpc/Utilities/Psychrometrics/Constants.mo
new file mode 100644
index 0000000..9dd3b65
--- /dev/null
+++ b/IbpsaMpc/Utilities/Psychrometrics/Constants.mo
@@ -0,0 +1,56 @@
+within IbpsaMpc.Utilities.Psychrometrics;
+package Constants "Library of constants for psychometric functions"
+  extends Modelica.Icons.Package;
+  constant Modelica.SIunits.Temperature T_ref = 273.15
+    "Reference temperature for psychrometric calculations";
+  constant Modelica.SIunits.SpecificHeatCapacity cpAir=1006
+    "Specific heat capacity of air";
+  constant Modelica.SIunits.SpecificHeatCapacity cpSte=1860
+    "Specific heat capacity of water vapor";
+  constant Modelica.SIunits.SpecificHeatCapacity cpWatLiq = 4184
+    "Specific heat capacity of liquid water";
+  constant Modelica.SIunits.SpecificEnthalpy h_fg = 2501014.5
+    "Enthalpy of evaporation of water at the reference temperature";
+  constant Real k_mair = 0.6219647130774989 "Ratio of molar weights";
+
+  annotation (
+    Documentation(info="<html>
+<p>
+This package provides constants for functions used
+in the calculation of thermodynamic properties of moist air.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+May 24, 2016, by Filip Jorissen:<br/>
+Added reference temperature.
+</li>
+<li>
+July 24, 2014, by Michael Wetter:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+    Icon(coordinateSystem(extent={{-100.0,-100.0},{100.0,100.0}}), graphics={
+      Polygon(
+        origin={-9.2597,25.6673},
+        fillColor={102,102,102},
+        pattern=LinePattern.None,
+        fillPattern=FillPattern.Solid,
+        points={{48.017,11.336},{48.017,11.336},{10.766,11.336},{-25.684,10.95},{-34.944,-15.111},{-34.944,-15.111},{-32.298,-15.244},{-32.298,-15.244},{-22.112,0.168},{11.292,0.234},{48.267,-0.097},{48.267,-0.097}},
+        smooth=Smooth.Bezier),
+      Polygon(
+        origin={-19.9923,-8.3993},
+        fillColor={102,102,102},
+        pattern=LinePattern.None,
+        fillPattern=FillPattern.Solid,
+        points={{3.239,37.343},{3.305,37.343},{-0.399,2.683},{-16.936,-20.071},{-7.808,-28.604},{6.811,-22.519},{9.986,37.145},{9.986,37.145}},
+        smooth=Smooth.Bezier),
+      Polygon(
+        origin={23.753,-11.5422},
+        fillColor={102,102,102},
+        pattern=LinePattern.None,
+        fillPattern=FillPattern.Solid,
+        points={{-10.873,41.478},{-10.873,41.478},{-14.048,-4.162},{-9.352,-24.8},{7.912,-24.469},{16.247,0.27},{16.247,0.27},{13.336,0.071},{13.336,0.071},{7.515,-9.983},{-3.134,-7.271},{-2.671,41.214},{-2.671,41.214}},
+        smooth=Smooth.Bezier)}));
+end Constants;
diff --git a/IbpsaMpc/Utilities/Psychrometrics/package.mo b/IbpsaMpc/Utilities/Psychrometrics/package.mo
new file mode 100644
index 0000000..e46d60b
--- /dev/null
+++ b/IbpsaMpc/Utilities/Psychrometrics/package.mo
@@ -0,0 +1,15 @@
+within IbpsaMpc.Utilities;
+package Psychrometrics "Library with psychrometric functions"
+  extends Modelica.Icons.VariantsPackage;
+
+annotation (preferredView="info", Documentation(info="<html>
+<p>
+This package contains blocks and functions for psychrometric calculations.
+</p>
+<p>
+The nomenclature used in this package is described at
+<a href=\"modelica://IbpsaMpc.UsersGuide.Conventions\">
+IbpsaMpc.UsersGuide.Conventions</a>.
+</p>
+</html>"));
+end Psychrometrics;
diff --git a/IbpsaMpc/Utilities/Psychrometrics/package.order b/IbpsaMpc/Utilities/Psychrometrics/package.order
new file mode 100644
index 0000000..9ca2f54
--- /dev/null
+++ b/IbpsaMpc/Utilities/Psychrometrics/package.order
@@ -0,0 +1 @@
+Constants
diff --git a/IbpsaMpc/Utilities/package.mo b/IbpsaMpc/Utilities/package.mo
new file mode 100644
index 0000000..0a48599
--- /dev/null
+++ b/IbpsaMpc/Utilities/package.mo
@@ -0,0 +1,26 @@
+within IbpsaMpc;
+package Utilities "Package with utility functions such as for I/O"
+  extends Modelica.Icons.Package;
+
+
+annotation (
+preferredView="info", Documentation(info="<html>
+<p>
+This package contains utility models such as for thermal comfort calculation, input/output, co-simulation, psychrometric calculations and various functions that are used throughout the library.
+</p>
+</html>"),
+Icon(coordinateSystem(extent={{-100.0,-100.0},{100.0,100.0}}), graphics={
+    Polygon(
+      origin={1.3835,-4.1418},
+      rotation=45.0,
+      fillColor={64,64,64},
+      pattern=LinePattern.None,
+      fillPattern=FillPattern.Solid,
+      points={{-15.0,93.333},{-15.0,68.333},{0.0,58.333},{15.0,68.333},{15.0,93.333},{20.0,93.333},{25.0,83.333},{25.0,58.333},{10.0,43.333},{10.0,-41.667},{25.0,-56.667},{25.0,-76.667},{10.0,-91.667},{0.0,-91.667},{0.0,-81.667},{5.0,-81.667},{15.0,-71.667},{15.0,-61.667},{5.0,-51.667},{-5.0,-51.667},{-15.0,-61.667},{-15.0,-71.667},{-5.0,-81.667},{0.0,-81.667},{0.0,-91.667},{-10.0,-91.667},{-25.0,-76.667},{-25.0,-56.667},{-10.0,-41.667},{-10.0,43.333},{-25.0,58.333},{-25.0,83.333},{-20.0,93.333}}),
+    Polygon(
+      origin={10.1018,5.218},
+      rotation=-45.0,
+      fillColor={255,255,255},
+      fillPattern=FillPattern.Solid,
+      points={{-15.0,87.273},{15.0,87.273},{20.0,82.273},{20.0,27.273},{10.0,17.273},{10.0,7.273},{20.0,2.273},{20.0,-2.727},{5.0,-2.727},{5.0,-77.727},{10.0,-87.727},{5.0,-112.727},{-5.0,-112.727},{-10.0,-87.727},{-5.0,-77.727},{-5.0,-2.727},{-20.0,-2.727},{-20.0,2.273},{-10.0,7.273},{-10.0,17.273},{-20.0,27.273},{-20.0,82.273}})}));
+end Utilities;
diff --git a/IbpsaMpc/Utilities/package.order b/IbpsaMpc/Utilities/package.order
new file mode 100644
index 0000000..03df414
--- /dev/null
+++ b/IbpsaMpc/Utilities/package.order
@@ -0,0 +1 @@
+Psychrometrics
diff --git a/IbpsaMpc/package.order b/IbpsaMpc/package.order
index 2bc2c51..9693d24 100644
--- a/IbpsaMpc/package.order
+++ b/IbpsaMpc/package.order
@@ -1,2 +1,3 @@
 Fluid
 Media
+Utilities

From 8a30ec8bf4f30ffa30025d2ed309a8ce87ef5192 Mon Sep 17 00:00:00 2001
From: Filip Jorissen <filip.jorissen@kuleuven.be>
Date: Wed, 20 Nov 2019 15:29:57 +0100
Subject: [PATCH 05/17] added initial merge sha to .copiedFiles

---
 IbpsaMpc/.copiedFiles.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/IbpsaMpc/.copiedFiles.txt b/IbpsaMpc/.copiedFiles.txt
index a1de3bf..c396d12 100644
--- a/IbpsaMpc/.copiedFiles.txt
+++ b/IbpsaMpc/.copiedFiles.txt
@@ -19,3 +19,4 @@ IbpsaMpc/Media/package.mo
 IbpsaMpc/Utilities/Psychrometrics/Constants.mo
 IbpsaMpc/Utilities/Psychrometrics/package.mo
 IbpsaMpc/Utilities/package.mo
+# Sha of last merge:a35bc5cb817ff2fe556cced56c3eeb59dbc96f36

From f3f1a02bc08e6c4fb60c864072776282ea006a93 Mon Sep 17 00:00:00 2001
From: Filip Jorissen <filip.jorissen@kuleuven.be>
Date: Wed, 20 Nov 2019 15:30:13 +0100
Subject: [PATCH 06/17] removed checkBoundary for JModelica compatibility

---
 .../Fluid/Sources/BaseClasses/PartialSource_Xi_C.mo    | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/IbpsaMpc/Fluid/Sources/BaseClasses/PartialSource_Xi_C.mo b/IbpsaMpc/Fluid/Sources/BaseClasses/PartialSource_Xi_C.mo
index 29ac07c..bb08ed7 100644
--- a/IbpsaMpc/Fluid/Sources/BaseClasses/PartialSource_Xi_C.mo
+++ b/IbpsaMpc/Fluid/Sources/BaseClasses/PartialSource_Xi_C.mo
@@ -39,17 +39,7 @@ initial equation
   assert(not use_X_in or not use_Xi_in,
     "Cannot use both X and Xi inputs, choose either use_X_in or use_Xi_in.");
 
-  if not use_X_in and not use_Xi_in then
-    Modelica.Fluid.Utilities.checkBoundary(Medium.mediumName, Medium.substanceNames,
-      Medium.singleState, true, X_in_internal, "Boundary_pT");
-  end if;
-
 equation
-  if use_X_in or use_Xi_in then
-    Modelica.Fluid.Utilities.checkBoundary(Medium.mediumName, Medium.substanceNames,
-      Medium.singleState, true, X_in_internal, "Boundary_pT");
-  end if;
-
   // Assign Xi_in_internal and X_in_internal
   // Note that at most one of X_in or Xi_in is present
   connect(X_in, X_in_internal);

From b53a9c6deff4dd764fee1eba4c8f1a3b20fe0d75 Mon Sep 17 00:00:00 2001
From: Parallels <parallels@localhost.localdomain>
Date: Wed, 20 Nov 2019 16:52:45 +0100
Subject: [PATCH 07/17] revised merge script and Merged the library IBPSA

---
 IbpsaMpc/.copiedFiles.txt           | 1 +
 IbpsaMpc/Resources/Scripts/merge.py | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/IbpsaMpc/.copiedFiles.txt b/IbpsaMpc/.copiedFiles.txt
index c396d12..531dbae 100644
--- a/IbpsaMpc/.copiedFiles.txt
+++ b/IbpsaMpc/.copiedFiles.txt
@@ -20,3 +20,4 @@ IbpsaMpc/Utilities/Psychrometrics/Constants.mo
 IbpsaMpc/Utilities/Psychrometrics/package.mo
 IbpsaMpc/Utilities/package.mo
 # Sha of last merge:a35bc5cb817ff2fe556cced56c3eeb59dbc96f36
+# Sha of last merge:242855f7503d277886a361a179b1bfa40ae6e286
\ No newline at end of file
diff --git a/IbpsaMpc/Resources/Scripts/merge.py b/IbpsaMpc/Resources/Scripts/merge.py
index 0218b6f..3c27f18 100644
--- a/IbpsaMpc/Resources/Scripts/merge.py
+++ b/IbpsaMpc/Resources/Scripts/merge.py
@@ -23,5 +23,7 @@
 
 		}
 
-
-mer.mergeIbpsaMpc(files)
+if os.path.exists("merge.patch"):
+    mer.finalizeMergeIbpsaMpc()
+else:
+    mer.mergeIbpsaMpc(files)

From 720ae687b09f6bff98a419f13438e387dcf79810 Mon Sep 17 00:00:00 2001
From: Filip Jorissen <filip.jorissen@kuleuven.be>
Date: Wed, 20 Nov 2019 17:24:03 +0100
Subject: [PATCH 08/17] updated .copiedFiles

---
 IbpsaMpc/.copiedFiles.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/IbpsaMpc/.copiedFiles.txt b/IbpsaMpc/.copiedFiles.txt
index 531dbae..619d283 100644
--- a/IbpsaMpc/.copiedFiles.txt
+++ b/IbpsaMpc/.copiedFiles.txt
@@ -19,5 +19,4 @@ IbpsaMpc/Media/package.mo
 IbpsaMpc/Utilities/Psychrometrics/Constants.mo
 IbpsaMpc/Utilities/Psychrometrics/package.mo
 IbpsaMpc/Utilities/package.mo
-# Sha of last merge:a35bc5cb817ff2fe556cced56c3eeb59dbc96f36
-# Sha of last merge:242855f7503d277886a361a179b1bfa40ae6e286
\ No newline at end of file
+# Sha of last merge: b53a9c6deff4dd764fee1eba4c8f1a3b20fe0d75

From 0818ad804090f433e2e608d836d0c038c6b5a408 Mon Sep 17 00:00:00 2001
From: Filip Jorissen <filip.jorissen@kuleuven.be>
Date: Wed, 20 Nov 2019 18:01:54 +0100
Subject: [PATCH 09/17] fix to merge script

---
 IbpsaMpc/Resources/Scripts/merge.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/IbpsaMpc/Resources/Scripts/merge.py b/IbpsaMpc/Resources/Scripts/merge.py
index 3c27f18..eca7d81 100644
--- a/IbpsaMpc/Resources/Scripts/merge.py
+++ b/IbpsaMpc/Resources/Scripts/merge.py
@@ -26,4 +26,5 @@
 if os.path.exists("merge.patch"):
     mer.finalizeMergeIbpsaMpc()
 else:
+    print("merge.patch detected, the merge continues. If this is unintentional, remove merge.patch and checkout .copiedFiles .")
     mer.mergeIbpsaMpc(files)

From acb53eb96d065c6780762590b39d4b3e35a067d1 Mon Sep 17 00:00:00 2001
From: Filip Jorissen <filip.jorissen@kuleuven.be>
Date: Wed, 20 Nov 2019 18:03:59 +0100
Subject: [PATCH 10/17] fixed sha in .copiedFIles

---
 IbpsaMpc/.copiedFiles.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IbpsaMpc/.copiedFiles.txt b/IbpsaMpc/.copiedFiles.txt
index 619d283..2547dc2 100644
--- a/IbpsaMpc/.copiedFiles.txt
+++ b/IbpsaMpc/.copiedFiles.txt
@@ -19,4 +19,4 @@ IbpsaMpc/Media/package.mo
 IbpsaMpc/Utilities/Psychrometrics/Constants.mo
 IbpsaMpc/Utilities/Psychrometrics/package.mo
 IbpsaMpc/Utilities/package.mo
-# Sha of last merge: b53a9c6deff4dd764fee1eba4c8f1a3b20fe0d75
+# Sha of last merge: f3f1a02bc08e6c4fb60c864072776282ea006a93

From 7a5c1393438099dd0f84268137babea6dbbefc26 Mon Sep 17 00:00:00 2001
From: Parallels <parallels@localhost.localdomain>
Date: Wed, 20 Nov 2019 18:04:27 +0100
Subject: [PATCH 11/17] Merged files from the library IBPSA

---
 IbpsaMpc/.copiedFiles.txt                              |  1 -
 .../Fluid/Sources/BaseClasses/PartialSource_Xi_C.mo    | 10 ++++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/IbpsaMpc/.copiedFiles.txt b/IbpsaMpc/.copiedFiles.txt
index 2547dc2..a1de3bf 100644
--- a/IbpsaMpc/.copiedFiles.txt
+++ b/IbpsaMpc/.copiedFiles.txt
@@ -19,4 +19,3 @@ IbpsaMpc/Media/package.mo
 IbpsaMpc/Utilities/Psychrometrics/Constants.mo
 IbpsaMpc/Utilities/Psychrometrics/package.mo
 IbpsaMpc/Utilities/package.mo
-# Sha of last merge: f3f1a02bc08e6c4fb60c864072776282ea006a93
diff --git a/IbpsaMpc/Fluid/Sources/BaseClasses/PartialSource_Xi_C.mo b/IbpsaMpc/Fluid/Sources/BaseClasses/PartialSource_Xi_C.mo
index bb08ed7..29ac07c 100644
--- a/IbpsaMpc/Fluid/Sources/BaseClasses/PartialSource_Xi_C.mo
+++ b/IbpsaMpc/Fluid/Sources/BaseClasses/PartialSource_Xi_C.mo
@@ -39,7 +39,17 @@ initial equation
   assert(not use_X_in or not use_Xi_in,
     "Cannot use both X and Xi inputs, choose either use_X_in or use_Xi_in.");
 
+  if not use_X_in and not use_Xi_in then
+    Modelica.Fluid.Utilities.checkBoundary(Medium.mediumName, Medium.substanceNames,
+      Medium.singleState, true, X_in_internal, "Boundary_pT");
+  end if;
+
 equation
+  if use_X_in or use_Xi_in then
+    Modelica.Fluid.Utilities.checkBoundary(Medium.mediumName, Medium.substanceNames,
+      Medium.singleState, true, X_in_internal, "Boundary_pT");
+  end if;
+
   // Assign Xi_in_internal and X_in_internal
   // Note that at most one of X_in or Xi_in is present
   connect(X_in, X_in_internal);

From 2e11f6c920e6241baf521efbbdbe1547a98b1f7e Mon Sep 17 00:00:00 2001
From: Filip Jorissen <filip.jorissen@kuleuven.be>
Date: Wed, 20 Nov 2019 18:11:42 +0100
Subject: [PATCH 12/17] updated sha

---
 IbpsaMpc/.copiedFiles.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/IbpsaMpc/.copiedFiles.txt b/IbpsaMpc/.copiedFiles.txt
index a1de3bf..2547dc2 100644
--- a/IbpsaMpc/.copiedFiles.txt
+++ b/IbpsaMpc/.copiedFiles.txt
@@ -19,3 +19,4 @@ IbpsaMpc/Media/package.mo
 IbpsaMpc/Utilities/Psychrometrics/Constants.mo
 IbpsaMpc/Utilities/Psychrometrics/package.mo
 IbpsaMpc/Utilities/package.mo
+# Sha of last merge: f3f1a02bc08e6c4fb60c864072776282ea006a93

From 32af8552b26921c550807597ce7a45644a093f6b Mon Sep 17 00:00:00 2001
From: Filip Jorissen <filip.jorissen@kuleuven.be>
Date: Wed, 20 Nov 2019 18:16:04 +0100
Subject: [PATCH 13/17] revised merge script

---
 IbpsaMpc/Resources/Scripts/merge.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/IbpsaMpc/Resources/Scripts/merge.py b/IbpsaMpc/Resources/Scripts/merge.py
index eca7d81..bc384df 100644
--- a/IbpsaMpc/Resources/Scripts/merge.py
+++ b/IbpsaMpc/Resources/Scripts/merge.py
@@ -23,8 +23,4 @@
 
 		}
 
-if os.path.exists("merge.patch"):
-    mer.finalizeMergeIbpsaMpc()
-else:
-    print("merge.patch detected, the merge continues. If this is unintentional, remove merge.patch and checkout .copiedFiles .")
-    mer.mergeIbpsaMpc(files)
+mer.mergeIbpsaMpc(files)

From 213978978e4f23430647eefc1021aa9afd20d925 Mon Sep 17 00:00:00 2001
From: Parallels <parallels@localhost.localdomain>
Date: Wed, 20 Nov 2019 20:06:08 +0100
Subject: [PATCH 14/17] removed checkboundary

---
 .../Fluid/Sources/BaseClasses/PartialSource_Xi_C.mo    | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/IbpsaMpc/Fluid/Sources/BaseClasses/PartialSource_Xi_C.mo b/IbpsaMpc/Fluid/Sources/BaseClasses/PartialSource_Xi_C.mo
index 29ac07c..bb08ed7 100644
--- a/IbpsaMpc/Fluid/Sources/BaseClasses/PartialSource_Xi_C.mo
+++ b/IbpsaMpc/Fluid/Sources/BaseClasses/PartialSource_Xi_C.mo
@@ -39,17 +39,7 @@ initial equation
   assert(not use_X_in or not use_Xi_in,
     "Cannot use both X and Xi inputs, choose either use_X_in or use_Xi_in.");
 
-  if not use_X_in and not use_Xi_in then
-    Modelica.Fluid.Utilities.checkBoundary(Medium.mediumName, Medium.substanceNames,
-      Medium.singleState, true, X_in_internal, "Boundary_pT");
-  end if;
-
 equation
-  if use_X_in or use_Xi_in then
-    Modelica.Fluid.Utilities.checkBoundary(Medium.mediumName, Medium.substanceNames,
-      Medium.singleState, true, X_in_internal, "Boundary_pT");
-  end if;
-
   // Assign Xi_in_internal and X_in_internal
   // Note that at most one of X_in or Xi_in is present
   connect(X_in, X_in_internal);

From aae44f1297488bdd6eaeac3591a88d20966c7eb9 Mon Sep 17 00:00:00 2001
From: Parallels <parallels@localhost.localdomain>
Date: Wed, 20 Nov 2019 20:08:57 +0100
Subject: [PATCH 15/17] updated sha

---
 IbpsaMpc/.copiedFiles.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IbpsaMpc/.copiedFiles.txt b/IbpsaMpc/.copiedFiles.txt
index 2547dc2..7d2c2bc 100644
--- a/IbpsaMpc/.copiedFiles.txt
+++ b/IbpsaMpc/.copiedFiles.txt
@@ -19,4 +19,4 @@ IbpsaMpc/Media/package.mo
 IbpsaMpc/Utilities/Psychrometrics/Constants.mo
 IbpsaMpc/Utilities/Psychrometrics/package.mo
 IbpsaMpc/Utilities/package.mo
-# Sha of last merge: f3f1a02bc08e6c4fb60c864072776282ea006a93
+# Sha of last merge: f30e2d4cab0cb33478519c1dee45840bb11c5afb

From 1b3b2a6e23d7de10cb62634a2dea57069cc74ab9 Mon Sep 17 00:00:00 2001
From: Parallels <parallels@localhost.localdomain>
Date: Wed, 20 Nov 2019 20:10:04 +0100
Subject: [PATCH 16/17] Merged files from the library IBPSA

---
 IbpsaMpc/.copiedFiles.txt                              |  1 -
 .../Fluid/Sources/BaseClasses/PartialSource_Xi_C.mo    | 10 ++++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/IbpsaMpc/.copiedFiles.txt b/IbpsaMpc/.copiedFiles.txt
index 7d2c2bc..a1de3bf 100644
--- a/IbpsaMpc/.copiedFiles.txt
+++ b/IbpsaMpc/.copiedFiles.txt
@@ -19,4 +19,3 @@ IbpsaMpc/Media/package.mo
 IbpsaMpc/Utilities/Psychrometrics/Constants.mo
 IbpsaMpc/Utilities/Psychrometrics/package.mo
 IbpsaMpc/Utilities/package.mo
-# Sha of last merge: f30e2d4cab0cb33478519c1dee45840bb11c5afb
diff --git a/IbpsaMpc/Fluid/Sources/BaseClasses/PartialSource_Xi_C.mo b/IbpsaMpc/Fluid/Sources/BaseClasses/PartialSource_Xi_C.mo
index bb08ed7..29ac07c 100644
--- a/IbpsaMpc/Fluid/Sources/BaseClasses/PartialSource_Xi_C.mo
+++ b/IbpsaMpc/Fluid/Sources/BaseClasses/PartialSource_Xi_C.mo
@@ -39,7 +39,17 @@ initial equation
   assert(not use_X_in or not use_Xi_in,
     "Cannot use both X and Xi inputs, choose either use_X_in or use_Xi_in.");
 
+  if not use_X_in and not use_Xi_in then
+    Modelica.Fluid.Utilities.checkBoundary(Medium.mediumName, Medium.substanceNames,
+      Medium.singleState, true, X_in_internal, "Boundary_pT");
+  end if;
+
 equation
+  if use_X_in or use_Xi_in then
+    Modelica.Fluid.Utilities.checkBoundary(Medium.mediumName, Medium.substanceNames,
+      Medium.singleState, true, X_in_internal, "Boundary_pT");
+  end if;
+
   // Assign Xi_in_internal and X_in_internal
   // Note that at most one of X_in or Xi_in is present
   connect(X_in, X_in_internal);

From 2b16c95bd8a96f419fcc1cde7778d854198f79d7 Mon Sep 17 00:00:00 2001
From: Parallels <parallels@localhost.localdomain>
Date: Wed, 20 Nov 2019 20:11:23 +0100
Subject: [PATCH 17/17] applied patch

---
 IbpsaMpc/.copiedFiles.txt                              |  1 +
 .../Fluid/Sources/BaseClasses/PartialSource_Xi_C.mo    | 10 ----------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/IbpsaMpc/.copiedFiles.txt b/IbpsaMpc/.copiedFiles.txt
index a1de3bf..524033f 100644
--- a/IbpsaMpc/.copiedFiles.txt
+++ b/IbpsaMpc/.copiedFiles.txt
@@ -19,3 +19,4 @@ IbpsaMpc/Media/package.mo
 IbpsaMpc/Utilities/Psychrometrics/Constants.mo
 IbpsaMpc/Utilities/Psychrometrics/package.mo
 IbpsaMpc/Utilities/package.mo
+# Sha of last merge: 1b3b2a6e23d7de10cb62634a2dea57069cc74ab9
diff --git a/IbpsaMpc/Fluid/Sources/BaseClasses/PartialSource_Xi_C.mo b/IbpsaMpc/Fluid/Sources/BaseClasses/PartialSource_Xi_C.mo
index 29ac07c..bb08ed7 100644
--- a/IbpsaMpc/Fluid/Sources/BaseClasses/PartialSource_Xi_C.mo
+++ b/IbpsaMpc/Fluid/Sources/BaseClasses/PartialSource_Xi_C.mo
@@ -39,17 +39,7 @@ initial equation
   assert(not use_X_in or not use_Xi_in,
     "Cannot use both X and Xi inputs, choose either use_X_in or use_Xi_in.");
 
-  if not use_X_in and not use_Xi_in then
-    Modelica.Fluid.Utilities.checkBoundary(Medium.mediumName, Medium.substanceNames,
-      Medium.singleState, true, X_in_internal, "Boundary_pT");
-  end if;
-
 equation
-  if use_X_in or use_Xi_in then
-    Modelica.Fluid.Utilities.checkBoundary(Medium.mediumName, Medium.substanceNames,
-      Medium.singleState, true, X_in_internal, "Boundary_pT");
-  end if;
-
   // Assign Xi_in_internal and X_in_internal
   // Note that at most one of X_in or Xi_in is present
   connect(X_in, X_in_internal);

+ IbpsaMpc.Fluid.Interfaces.ConservationEquation +	+ This is a basic model for an ideally mixed fluid volume. + It implements conservation equations for mass and energy. + The conservation equations can be dynamic or steady-state. + The model can have an arbitrary number of fluid ports. + Models that instanciate this model need to define the input + `fluidVolume`, which is the actual volume occupied by the fluid. + For most components, this can be set to a parameter. However, for components such as + expansion vessels, the fluid volume can change in time. + + + The model has the following input connectors: + + +`Q_flow`, which is the sensible plus latent heat flow rate added to the medium, and + + +`mXi_flow`, which is the species mass flow rate added to the medium. + + + + + Models that instanciate this model can used these connectors to interface with the conservation equations. + +
+ IbpsaMpc.Fluid.Interfaces.StaticTwoPortConservationEquation +	+ This is a basic model for steady-state conservation equations + for mass and energy of a component with two fluid ports. + + + The model has the following input connectors: + + +`Q_flow`, which is the sensible plus latent heat flow rate added to the medium, and + + +`mXi_flow`, which is the species mass flow rate added to the medium. + + + + + Models that instanciate this model can used these connectors to interface with the conservation equations. + + + Compared to + + IbpsaMpc.Fluid.Interfaces.ConservationEquation + this model provides a more efficient implementation of the steady-state conservation equations for + models with two fluid ports. + +
+ + IbpsaMpc.Fluid.Interfaces.PartialFourPort +	+ This model defines an interface for components with four ports. + Only parameters and fluid definitions are provided, but no + equations. + The model is identical to + + Modelica.Fluid.Interfaces.PartialTwoPort, except that it has + four ports. +
+ + IbpsaMpc.Fluid.Interfaces.PrescribedOutlet +	+ This model calculates a prescribed heat flow (e.g. for an ideal heater or cooler), + depending on a set temperature `TSet`. +
+ + IbpsaMpc.Fluid.Interfaces.PartialTwoPortInterface +	+ This model defines the interface for component models that transport + fluid, and that can exchange heat and mass. + It also defines the port pressure difference as + Δp = p_a-p_b. However, no equation is + implemented to compute Δp(⋅) as a function of the + mass flow rate. The model also implements equations to obtain the + thermodynamic state at the ports. +
+ + IbpsaMpc.Fluid.Interfaces.PartialFourPortInterface +	+ This model is identical to + + IbpsaMpc.Fluid.Interfaces.PartialTwoPortInterface + but it can be used for components with four fluid ports. +
+ + IbpsaMpc.Fluid.Interfaces.StaticTwoPortHeatMassExchanger +	+ This model implements the pressure drop as a function of the mass flow rate. + It also implements the steady-state energy and mass conservation + equations. However, it does not implement an equation that computes + `Q_flow`, the + sensible and latent heat transfer to the medium flow, nor + does it implement an equation for `mXi_flow`, + the species mass flow rate added to or removed from the medium. + Models that extend this model need to provide equations + for `Q_flow` and `mXi_flow`. +
+ + IbpsaMpc.Fluid.Interfaces.StaticFourPortHeatMassExchanger +	+ This model is identical to + + IbpsaMpc.Fluid.Interfaces.StaticTwoPortHeatMassExchanger + except that it has four ports. +
+ + IbpsaMpc.Fluid.Interfaces.TwoPortHeatMassExchanger +	+ This model implements the pressure drop as a function of the mass flow rate. + It also implements the energy and mass conservation equations, which may be + configured as steady-state or dynamic balances based on a parameter. +
+ + IbpsaMpc.Fluid.Interfaces.FourPortHeatMassExchanger +	+ This model is identical to + + IbpsaMpc.Fluid.Interfaces.TwoPortHeatMassExchanger + except that it has four ports. +
Variable	Description
`m_flow`	Mass flow rate ṁ. + The convention is that `m_flow ≥ 0` + if at this port, mass flows into the component.
`p`	Absolute total pressure p. + The absolute total pressure is the sum of + the static pressure and the dynamic pressure. + As the total pressure is used in the connector, components + do not need to specify the area of the port or the velocity at the port. + This convention is consistent with the Modelica Standard Library. + Note that component models typically simplify the pressure balance + by not taking into account the static pressure that is caused by + the height of the medium column, i.e., the term + Δp = Δh ρ g, + where + Δh is the height of the medium column, + ρ is the mass density and + g = 9.81 m/s² is the gravity acceleration, + is ignored.
`h_outflow`	Specific enthalpy h of the outflowing fluid, i.e., + assuming ṁ < 0. + The specific enthalpy in the fluid port always carries the value + of the enthalpy that the medium would have if it was leaving + the component. + Users who need to access the actual enthalpy for the given flow + direction can do so using the sensor + + IbpsaMpc.Fluid.Sensors.SpecificEnthalpyTwoPort.
`Xi_outflow[Medium.nXi]`	Independent mixture mass fractions + m_i/m close to the connection point, i.e., + assuming ṁ < 0. + The independent mixture mass fraction in the fluid port always carries the value + that the medium would have if it was leaving + the component. + Users who need to access the actual value for the given flow + direction can do so using the sensor + + IbpsaMpc.Fluid.Sensors.MassFractionTwoPort. + Note that this variable is only present for fluids that are a mixture + of different substances such as moist air. For water, + this variable is automatically removed when a model is translated.
`C_outflow[Medium.nC]`	Trace substances c_i/m close to the connection point, i.e., + assuming ṁ < 0. + The trace substances in the fluid port always carries the value + that the medium would have if it was leaving + the component. + Users who need to access the actual value for the given flow + direction can do so using the sensor + + IbpsaMpc.Fluid.Sensors.TraceSubstancesTwoPort. + Note that this variable is only present for fluids that declare + a trace substance such as CO₂. + See for example + + IbpsaMpc.Fluid.Sensors.Examples.TraceSubstances.
Parameter	Initialization problem + If density depends on pressure	Initialization problem + If density is independent of pressure	Equation used during time integration
DynamicsFreeInitial	Unspecified	Unspecified	dm(t)/dt = ∑ ṁ(t)
FixedInitial	p(0)=p₀	Unspecified	dm(t)/dt = ∑ ṁ(t)
SteadyStateInitial	dp(0)/dt=0	Unspecified	dm(t)/dt = ∑ ṁ(t)
SteadyState	Unspecified	Unspecified	0 = ∑ ṁ(t)
Parameter	Initialization problem	Equation used during time integration
DynamicsFreeInitial	Unspecified	dU(t)/dt = ∑ ṁ(t) h(t) + Q̇(t)
FixedInitial	T(0)=T₀	dU(t)/dt = ∑ ṁ(t) h(t) + Q̇(t)
SteadyStateInitial	dT(0)/dt=0	dU(t)/dt = ∑ ṁ(t) h(t) + Q̇(t)
SteadyState	Unspecified	0 = ∑ ṁ(t) h(t) + Q̇(t)
Parameter	Model	Functionality
m_flow_nominal + dp_nominal	Flow resistance models	These parameter may be used + to define a point on the flow rate versus pressure drop curve. For other + mass flow rates, the pressure drop is typically adjusted using similarity laws. + See + + IbpsaMpc.Fluid.FixedResistances.PressureDrop. +
m_flow_nominal + m_flow_small	Sensors + Volumes + Heat exchangers + Chillers +	Some of these models set `m_flow_small=1E-4abs(m_flow_nominal)` as the + default value. Then, `m_flow_small` is used to regularize, or replace, + equations when the mass flow rate is smaller than `m_flow_small` + in magnitude. This is needed to improve the numerical properties of the model. The error in the + results is for typical applications negligible, because at flow rates below + 0.01%* from the design flow rate, most model assumptions are not applicable + anyways, and the HVAC system is not operated in this region. However, because Modelica + simulates in the continuous-time domain, such small flow rates can occur, and therefore + models are implemented in such a way that they are numerically well-behaved for + zero or near-zero flow rates. +
tau + m_flow_nominal	Sensors + Volumes + Heat exchangers + Chillers +	+ Because Modelica simulates in the continuous-time domain, dynamic models are + in general numerically more efficient than steady-state models. However, + dynamic models require product data that are generally not published by + manufacturers. Examples include the volume of fluid that is contained in a + device, and the weight of heat exchangers. In addition, other effects such + as transport delays in pipes and heat exchangers of a chiller are generally + unknown and require detailed geometry that is typically not available + during the design stage. + + To circumvent this problem, many models take as a parameter the time constant + `tau` and lump all its thermal mass into a fluid volume. + The time constant `tau` can be understood as the time constant that one would + observe if the input to the component has a step change, and the mass flow rate + of the component is equal to `m_flow_nominal`. + Using these two values and the fluid density `rho`, + components adjust their fluid volume + `V=m_flow_nominal tau/rho` because having such a volume + gives the specified time response. + For most components, engineering experience can be used to estimate a reasonable + value for `tau`, and where generally applicable values can be used, + components already set a default value for `tau`. +