Revert 65355ba..206d9b9

This rolls back to commit 65355ba.
lbl-srg · Oct 5, 2014 · df52e53 · df52e53
1 parent 206d9b9
commit df52e53
Show file tree

Hide file tree

Showing 46 changed files with 240 additions and 829 deletions.
diff --git a/Buildings/Fluid/Actuators/Dampers/MixingBox.mo b/Buildings/Fluid/Actuators/Dampers/MixingBox.mo
@@ -161,35 +161,27 @@ model MixingBox "Outside air mixing box with interlocked air dampers"
     "Flow coefficient for y=1, k1 = pressure drop divided by dynamic pressure"
     annotation (Dialog(tab="Damper coefficients"));
 
-  Modelica.Fluid.Interfaces.FluidPort_a port_Out(
-    redeclare package Medium = Medium,
-    m_flow(start=0, min=if allowFlowReversal then -Constants.inf else 0),
-    p(nominal=Medium.p_default),
-    Xi_outflow(nominal=Medium.X_default[1:Medium.nXi]))
+  Modelica.Fluid.Interfaces.FluidPort_a port_Out(redeclare package Medium =
+        Medium, m_flow(start=0, min=if allowFlowReversal then -Constants.inf else
+                0))
     "Fluid connector a (positive design flow direction is from port_a to port_b)"
     annotation (Placement(transformation(extent={{-110,50},{-90,70}},
           rotation=0)));
-  Modelica.Fluid.Interfaces.FluidPort_b port_Exh(
-    redeclare package Medium = Medium,
-    m_flow(start=0, max=if allowFlowReversal then +Constants.inf else 0),
-    p(nominal=Medium.p_default),
-    Xi_outflow(nominal=Medium.X_default[1:Medium.nXi]))
+  Modelica.Fluid.Interfaces.FluidPort_b port_Exh(redeclare package Medium =
+        Medium, m_flow(start=0, max=if allowFlowReversal then +Constants.inf else
+                0))
     "Fluid connector b (positive design flow direction is from port_a to port_b)"
     annotation (Placement(transformation(extent={{-90,-70},{-110,-50}},
           rotation=0)));
-  Modelica.Fluid.Interfaces.FluidPort_a port_Ret(
-    redeclare package Medium = Medium,
-    m_flow(start=0, min=if allowFlowReversal then -Constants.inf else 0),
-    p(nominal=Medium.p_default),
-    Xi_outflow(nominal=Medium.X_default[1:Medium.nXi]))
+  Modelica.Fluid.Interfaces.FluidPort_a port_Ret(redeclare package Medium =
+        Medium, m_flow(start=0, min=if allowFlowReversal then -Constants.inf else
+                0))
     "Fluid connector a (positive design flow direction is from port_a to port_b)"
     annotation (Placement(transformation(extent={{110,-70},{90,-50}}, rotation=
             0)));
-  Modelica.Fluid.Interfaces.FluidPort_b port_Sup(
-    redeclare package Medium = Medium,
-    m_flow(start=0, max=if allowFlowReversal then +Constants.inf else 0),
-    p(nominal=Medium.p_default),
-    Xi_outflow(nominal=Medium.X_default[1:Medium.nXi]))
+  Modelica.Fluid.Interfaces.FluidPort_b port_Sup(redeclare package Medium =
+        Medium, m_flow(start=0, max=if allowFlowReversal then +Constants.inf else
+                0))
     "Fluid connector b (positive design flow direction is from port_a to port_b)"
     annotation (Placement(transformation(extent={{110,50},{90,70}}, rotation=0)));
   Modelica.Blocks.Sources.Constant uni(k=1) "Unity signal"
@@ -331,12 +323,6 @@ defaultComponentName="eco",
 Documentation(revisions="<html>
 <ul>
 <li>
-October 1, 2014, by Michael Wetter:<br/>
-Set consistent nominal values to avoid the warning
-alias set with different nominal values
-in OpenModelica.
-</li>
-<li>
 December 14, 2012 by Michael Wetter:<br/>
 Renamed protected parameters for consistency with the naming conventions.
 </li>

diff --git a/Buildings/Fluid/BaseClasses/PartialResistance.mo b/Buildings/Fluid/BaseClasses/PartialResistance.mo
@@ -2,8 +2,8 @@ within Buildings.Fluid.BaseClasses;
 partial model PartialResistance "Partial model for a hydraulic resistance"
     extends Buildings.Fluid.Interfaces.PartialTwoPortInterface(
      show_T=false,
-     m_flow(nominal=m_flow_nominal_pos),
-     dp(nominal=dp_nominal_pos),
+     m_flow(start=0, nominal=m_flow_nominal_pos),
+     dp(start=0, nominal=dp_nominal_pos),
      final m_flow_small = 1E-4*abs(m_flow_nominal));
 
   parameter Boolean from_dp = false
@@ -21,9 +21,9 @@ partial model PartialResistance "Partial model for a hydraulic resistance"
   parameter Modelica.SIunits.MassFlowRate m_flow_turbulent(min=0)
     "Turbulent flow if |m_flow| >= m_flow_turbulent";
 
-  parameter Medium.ThermodynamicState sta_default=
-     Medium.setState_pTX(p=Medium.p_default, T=Medium.T_default, X=Medium.X_default);
 protected
+  parameter Medium.ThermodynamicState sta_default=
+     Medium.setState_pTX(T=Medium.T_default, p=Medium.p_default, X=Medium.X_default);
   parameter Modelica.SIunits.DynamicViscosity eta_default=Medium.dynamicViscosity(sta_default)
     "Dynamic viscosity, used to compute transition to turbulent flow regime";
 protected

diff --git a/Buildings/Fluid/HeatExchangers/BaseClasses/CoilHeader.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/CoilHeader.mo
@@ -18,18 +18,14 @@ model CoilHeader "Header for a heat exchanger register"
 
   Modelica.Fluid.Interfaces.FluidPort_a port_a[nPipPar](
         redeclare each final package Medium = Medium,
-        each m_flow(start=mStart_flow_a/nPipPar, min=if allowFlowReversal then -Modelica.Constants.inf else 0),
-        each Xi_outflow(nominal=Medium.X_default[1:Medium.nXi]),
-        each p(nominal=Medium.p_default))
+        each m_flow(start=mStart_flow_a/nPipPar, min=if allowFlowReversal then -Modelica.Constants.inf else 0))
     "Fluid connector a for medium (positive design flow direction is from port_a to port_b)"
     annotation (Placement(transformation(extent={{-110,-10},{-90,10}}, rotation=
            0)));
 
   Modelica.Fluid.Interfaces.FluidPort_b port_b[nPipPar](
         redeclare each final package Medium = Medium,
-        each m_flow(start=-mStart_flow_a/nPipPar, max=if allowFlowReversal then +Modelica.Constants.inf else 0),
-        each Xi_outflow(nominal=Medium.X_default[1:Medium.nXi]),
-        each p(nominal=Medium.p_default))
+        each m_flow(start=-mStart_flow_a/nPipPar, max=if allowFlowReversal then +Modelica.Constants.inf else 0))
     "Fluid connector b for medium (positive design flow direction is from port_a to port_b)"
     annotation (Placement(transformation(extent={{110,-10},{90,10}}, rotation=0)));
 
@@ -54,12 +50,6 @@ different flow reroutings in the coil header.
 revisions="<html>
 <ul>
 <li>
-October 3, 2014, by Michael Wetter:<br/>
-Set consistent nominal values to avoid the warning
-alias set with different nominal values
-in OpenModelica.
-</li>
-<li>
 August 22, 2008, by Michael Wetter:<br/>
 Added start value for port mass flow rate.
 </li>

diff --git a/Buildings/Fluid/HeatExchangers/BaseClasses/CoilRegister.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/CoilRegister.mo
@@ -59,32 +59,24 @@ model CoilRegister "Register for a heat exchanger"
 
   Modelica.Fluid.Interfaces.FluidPort_a[nPipPar] port_a1(
         redeclare each package Medium = Medium1,
-        each m_flow(start=0, min=if allowFlowReversal1 then -Constants.inf else 0),
-        each Xi_outflow(nominal=Medium1.X_default[1:Medium1.nXi]),
-        each p(nominal=Medium1.p_default))
+        each m_flow(start=0, min=if allowFlowReversal1 then -Constants.inf else 0))
     "Fluid connector a for medium 1 (positive design flow direction is from port_a1 to port_b1)"
     annotation (Placement(transformation(extent={{-110,50},{-90,70}}, rotation=
             0)));
   Modelica.Fluid.Interfaces.FluidPort_b[nPipPar] port_b1(
         redeclare each package Medium = Medium1,
-        each m_flow(start=0, max=if allowFlowReversal1 then +Constants.inf else 0),
-        each Xi_outflow(nominal=Medium1.X_default[1:Medium1.nXi]),
-        each p(nominal=Medium1.p_default))
+        each m_flow(start=0, max=if allowFlowReversal1 then +Constants.inf else 0))
     "Fluid connector b for medium 1 (positive design flow direction is from port_a to port_b)"
     annotation (Placement(transformation(extent={{110,50},{90,70}}, rotation=0)));
   Modelica.Fluid.Interfaces.FluidPort_a[nPipPar,nPipSeg] port_a2(
         redeclare each package Medium = Medium2,
-        each m_flow(start=0, min=if allowFlowReversal2 then -Constants.inf else 0),
-        each Xi_outflow(nominal=Medium2.X_default[1:Medium2.nXi]),
-        each p(nominal=Medium2.p_default))
+        each m_flow(start=0, min=if allowFlowReversal2 then -Constants.inf else 0))
     "Fluid connector a for medium 2 (positive design flow direction is from port_a2 to port_b2)"
     annotation (Placement(transformation(extent={{90,-70},{110,-50}}, rotation=
             0)));
   Modelica.Fluid.Interfaces.FluidPort_b[nPipPar,nPipSeg] port_b2(
         redeclare each package Medium = Medium2,
-        each m_flow(start=0, max=if allowFlowReversal2 then +Constants.inf else 0),
-        each Xi_outflow(nominal=Medium2.X_default[1:Medium2.nXi]),
-        each p(nominal=Medium2.p_default))
+        each m_flow(start=0, max=if allowFlowReversal2 then +Constants.inf else 0))
     "Fluid connector b for medium 2 (positive design flow direction is from port_a to port_b)"
     annotation (Placement(transformation(extent={{-90,-72},{-110,-52}},
           rotation=0)));
@@ -195,12 +187,6 @@ between the fluid volumes and the solid in each heat exchanger element.
 revisions="<html>
 <ul>
 <li>
-October 3, 2014, by Michael Wetter:<br/>
-Set consistent nominal values to avoid the warning
-alias set with different nominal values
-in OpenModelica.
-</li>
-<li>
 August 10, 2014, by Michael Wetter:<br/>
 Reformulated the multiple iterators in the <code>sum</code> function
 as this language construct is not supported in OpenModelica.

diff --git a/Buildings/Fluid/HeatExchangers/BaseClasses/PartialDuctManifold.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/PartialDuctManifold.mo
@@ -8,9 +8,7 @@ partial model PartialDuctManifold
   Modelica.Fluid.Interfaces.FluidPort_b[nPipPar,nPipSeg] port_b(
         redeclare each package Medium = Medium,
         each m_flow(start=-mStart_flow_a/nPipSeg/nPipPar,
-             max=if allowFlowReversal then +Modelica.Constants.inf else 0),
-        each Xi_outflow(nominal=Medium.X_default[1:Medium.nXi]),
-        each p(nominal=Medium.p_default))
+             max=if allowFlowReversal then +Modelica.Constants.inf else 0))
     "Fluid connector b for medium (positive design flow direction is from port_a to port_b)"
     annotation (Placement(transformation(extent={{110,-10},{90,10}}, rotation=0)));
 annotation(Diagram(graphics),
@@ -27,12 +25,6 @@ between the ports with and without flow friction.
 revisions="<html>
 <ul>
 <li>
-October 3, 2014, by Michael Wetter:<br/>
-Set consistent nominal values to avoid the warning
-alias set with different nominal values
-in OpenModelica.
-</li>
-<li>
 August 22, 2008, by Michael Wetter:<br/>
 Added start value for port mass flow rate.
 </li>

diff --git a/Buildings/Fluid/HeatExchangers/BaseClasses/PartialDuctPipeManifold.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/PartialDuctPipeManifold.mo
@@ -21,9 +21,7 @@ partial model PartialDuctPipeManifold
 
   Modelica.Fluid.Interfaces.FluidPort_a port_a(
         redeclare package Medium = Medium,
-        m_flow(start=mStart_flow_a, min=if allowFlowReversal then -Modelica.Constants.inf else 0),
-        Xi_outflow(nominal=Medium.X_default[1:Medium.nXi]),
-        p(nominal=Medium.p_default))
+        m_flow(start=mStart_flow_a, min=if allowFlowReversal then -Modelica.Constants.inf else 0))
     "Fluid connector a for medium (positive design flow direction is from port_a to port_b)"
     annotation (Placement(transformation(extent={{-110,-10},{-90,10}}, rotation=
            0)));
@@ -72,12 +70,6 @@ for air-side and water-side heat exchanger manifolds.
 revisions="<html>
 <ul>
 <li>
-October 3, 2014, by Michael Wetter:<br/>
-Set consistent nominal values to avoid the warning
-alias set with different nominal values
-in OpenModelica.
-</li>
-<li>
 August 22, 2008, by Michael Wetter:<br/>
 Added start value for port mass flow rate.
 </li>

diff --git a/Buildings/Fluid/HeatExchangers/BaseClasses/PartialPipeManifold.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/PartialPipeManifold.mo
@@ -3,12 +3,9 @@ partial model PartialPipeManifold "Partial pipe manifold for a heat exchanger"
   extends PartialDuctPipeManifold;
   Modelica.Fluid.Interfaces.FluidPort_b[nPipPar] port_b(
         redeclare each package Medium = Medium,
-        each m_flow(start=-mStart_flow_a/nPipPar, max=if allowFlowReversal then +Modelica.Constants.inf else 0),
-        each Xi_outflow(nominal=Medium.X_default[1:Medium.nXi]),
-        each p(nominal=Medium.p_default))
+        each m_flow(start=-mStart_flow_a/nPipPar, max=if allowFlowReversal then +Modelica.Constants.inf else 0))
     "Fluid connector b for medium (positive design flow direction is from port_a to port_b)"
     annotation (Placement(transformation(extent={{110,-10},{90,10}}, rotation=0)));
-
 annotation(Diagram(graphics),
                     Documentation(info="<html>
 <p>
@@ -23,12 +20,6 @@ between the ports with and without flow friction.
 revisions="<html>
 <ul>
 <li>
-October 3, 2014, by Michael Wetter:<br/>
-Set consistent nominal values to avoid the warning
-alias set with different nominal values
-in OpenModelica.
-</li>
-<li>
 August 22, 2008, by Michael Wetter:<br/>
 Added start value for port mass flow rate.
 </li>

diff --git a/Buildings/Fluid/HeatExchangers/BaseClasses/PipeManifoldNoResistance.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/PipeManifoldNoResistance.mo
@@ -4,11 +4,7 @@ model PipeManifoldNoResistance "Manifold for heat exchanger register"
  parameter Boolean connectAllPressures=true;
   Modelica.Fluid.Fittings.MultiPort mulPor(
       redeclare package Medium = Medium,
-      final nPorts_b=nPipPar,
-      port_a(Xi_outflow(nominal=Medium.X_default[1:Medium.nXi]),
-             p(nominal=Medium.p_default)),
-      ports_b(each Xi_outflow(nominal=Medium.X_default[1:Medium.nXi]),
-             each p(nominal=Medium.p_default)))
+      final nPorts_b=nPipPar)
     annotation (Placement(transformation(extent={{0,-10},{8,10}})));
 equation
   connect(port_a, mulPor.port_a) annotation (Line(
@@ -36,12 +32,6 @@ is added to the other side of the heat exchanger registers.
 revisions="<html>
 <ul>
 <li>
-October 3, 2014, by Michael Wetter:<br/>
-Set consistent nominal values to avoid the warning
-alias set with different nominal values
-in OpenModelica.
-</li>
-<li>
 April 14, 2008, by Michael Wetter:<br/>
 First implementation.
 </li>

diff --git a/Buildings/Fluid/Interfaces/ConservationEquation.mo b/Buildings/Fluid/Interfaces/ConservationEquation.mo
@@ -9,20 +9,25 @@ model ConservationEquation "Lumped volume with mass and energy balance"
   parameter Boolean initialize_p = not Medium.singleState
     "= true to set up initial equations for pressure";
   Modelica.Fluid.Vessels.BaseClasses.VesselFluidPorts_b ports[nPorts](
-      redeclare each package Medium = Medium,
-      each p(nominal=Medium.p_default),
-      each Xi_outflow(nominal=Medium.X_default[1:Medium.nXi]))
-    "Fluid inlets and outlets"
+      redeclare each package Medium = Medium) "Fluid inlets and outlets"
     annotation (Placement(transformation(extent={{-40,-10},{40,10}},
       origin={0,-100})));
 
+  // Set nominal attributes where literal values can be used.
   Medium.BaseProperties medium(
     preferredMediumStates= not (energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState),
-    p(stateSelect=if not (massDynamics == Modelica.Fluid.Types.Dynamics.SteadyState)
+    p(start=p_start,
+      nominal=Medium.p_default,
+      stateSelect=if not (massDynamics == Modelica.Fluid.Types.Dynamics.SteadyState)
                      then StateSelect.prefer else StateSelect.default),
-    T(stateSelect=if (not (energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState))
+    h(start=hStart),
+    T(start=T_start,
+      nominal=Medium.T_default,
+      stateSelect=if (not (energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState))
                      then StateSelect.prefer else StateSelect.default),
-    Xi(each stateSelect=if (not (substanceDynamics == Modelica.Fluid.Types.Dynamics.SteadyState))
+    Xi(start=X_start[1:Medium.nXi],
+       nominal=Medium.X_default[1:Medium.nXi],
+       each stateSelect=if (not (substanceDynamics == Modelica.Fluid.Types.Dynamics.SteadyState))
                      then StateSelect.prefer else StateSelect.default),
     d(start=rho_nominal)) "Medium properties";
 
@@ -251,19 +256,6 @@ Buildings.Fluid.MixingVolumes.MixingVolume</a>.
 </html>", revisions="<html>
 <ul>
 <li>
-October 2, 2014, by Michael Wetter:<br/>
-Removed start attributes in <code>medium</code>.
-The start values for the states are assigned in the <code>initial equation</code>
-section. If the start values are also assigned in the declaration of <code>medium</code>,
-then they differ from the medium implementation and OpenModelica will issue a warning.
-</li>
-<li>
-September 29, 2014, by Michael Wetter:<br/>
-Set consistent nominal values to avoid the warning
-alias set with different nominal values
-in OpenModelica.
-</li>
-<li>
 July 3, 2014, by Michael Wetter:<br/>
 Added parameter <code>initialize_p</code>. This is required
 to enable the coil models to initialize the pressure in the first

diff --git a/Buildings/Fluid/Interfaces/Examples/ReverseFlowHumidifier.mo b/Buildings/Fluid/Interfaces/Examples/ReverseFlowHumidifier.mo
@@ -32,7 +32,7 @@ package Medium = Buildings.Media.PerfectGases.MoistAir;
     annotation (Placement(transformation(extent={{-50,20},{-30,40}})));
   Modelica.Blocks.Sources.Constant u2(k=0.01) "Control input"
     annotation (Placement(transformation(extent={{-92,54},{-80,66}})));
-  Buildings.Fluid.Sources.MassFlowSource_T source1(
+  Modelica.Fluid.Sources.MassFlowSource_T source1(
     redeclare package Medium = Medium,
     use_m_flow_in=false,
     use_T_in=false,
@@ -87,7 +87,7 @@ package Medium = Buildings.Media.PerfectGases.MoistAir;
     annotation (Placement(transformation(extent={{-10,-16},{10,4}})));
   inner Modelica.Fluid.System system
     annotation (Placement(transformation(extent={{38,-100},{58,-80}})));
-  Buildings.Fluid.Sources.MassFlowSource_T source2(
+  Modelica.Fluid.Sources.MassFlowSource_T source2(
     redeclare package Medium = Medium,
     use_m_flow_in=false,
     use_T_in=false,
@@ -192,13 +192,6 @@ If the results differ, then an assert is triggered.
 </html>", revisions="<html>
 <ul>
 <li>
-October 1, 2014, by Michael Wetter:<br/>
-Changed flow source from <code>Modelica.Fluid</code> to
-<code>Buildings.Fluid</code> to avoid the warning
-alias set with different nominal values
-in OpenModelica.
-</li>
-<li>
 October 9, 2013, by Michael Wetter:<br/>
 Replaced
 <code>Modelica.Fluid.Sources.FixedBoundary</code>