Merged Annex60

lbl-srg · May 1, 2015 · 6b1a47e · 6b1a47e
1 parent c81aa34
commit 6b1a47e
Show file tree

Hide file tree

Showing 64 changed files with 710 additions and 456 deletions.
diff --git a/Buildings/.copiedFiles.txt b/Buildings/.copiedFiles.txt
@@ -484,7 +484,6 @@ Buildings/Media/Specialized/package.order
 Buildings/Media/Water.mo
 Buildings/Media/package.mo
 Buildings/Media/package.order
-Buildings/MixingVolumeMFactor.mat
 Buildings/MixingVolumeMassFlow.mat
 Buildings/Resources/Images/BoundaryConditions/SkyTemperature/BaseClasses/Cloud.jpg
 Buildings/Resources/Images/BoundaryConditions/SolarGeometry/BaseClasses/AltitudeAngle.png
@@ -753,7 +752,6 @@ Buildings/Resources/weatherdata/USA_CA_San.Francisco.Intl.AP.724940_TMY3.epw
 Buildings/Resources/weatherdata/USA_CA_San.Francisco.Intl.AP.724940_TMY3.mos
 Buildings/Resources/weatherdata/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw
 Buildings/Resources/weatherdata/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.mos
-Buildings/ThreeWayValves.mat
 Buildings/Types/Azimuth/package.mo
 Buildings/Types/Azimuth/package.order
 Buildings/Types/Tilt/package.mo
@@ -930,12 +928,6 @@ Buildings/Utilities/Time/package.mo
 Buildings/Utilities/Time/package.order
 Buildings/Utilities/package.mo
 Buildings/Utilities/package.order
-Buildings/dsfinal.txt
-Buildings/dsin.txt
-Buildings/dslog.txt
-Buildings/dsmodel.c
-Buildings/dymosim
 Buildings/legal.html
 Buildings/package.order
-Buildings/simulator.log
-Buildings/unitTests.log
+
diff --git a/Buildings/Fluid/MixingVolumes/MixingVolume.mo b/Buildings/Fluid/MixingVolumes/MixingVolume.mo
@@ -3,7 +3,7 @@ model MixingVolume
   "Mixing volume with inlet and outlet ports (flow reversal is allowed)"
   extends Buildings.Fluid.MixingVolumes.BaseClasses.PartialMixingVolume;
 protected
-  Modelica.Blocks.Sources.Constant masExc(k=0)
+  Modelica.Blocks.Sources.Constant masExc(final k=0)
     "Block to set mass exchange in volume"
     annotation (Placement(transformation(extent={{-80,50},{-60,70}})));
 equation
@@ -101,6 +101,13 @@ Buildings.Fluid.MassExchangers.HumidifierPrescribed</a>.
 </html>", revisions="<html>
 <ul>
 <li>
+May 1, 2015 by Michael Wetter<br/>
+Set <code>final</code> keyword for <code>masExc(final k=0)</code>.
+This addresses
+<a href=\"https://github.com/iea-annex60/modelica-annex60/issues/230\">
+issue 230</a>.
+</li>
+<li>
 February 11, 2014 by Michael Wetter:<br/>
 Redesigned implementation of latent and sensible heat flow rates
 as port of the correction of issue

diff --git a/Buildings/Fluid/Movers/FlowControlled_dp.mo b/Buildings/Fluid/Movers/FlowControlled_dp.mo
@@ -37,7 +37,7 @@ model FlowControlled_dp
 
 protected
   Modelica.Blocks.Math.Gain gain(final k=-1)
-    annotation (Placement(transformation(extent={{-20,60},{0,80}})));
+    annotation (Placement(transformation(extent={{0,20},{20,40}})));
   Modelica.Blocks.Continuous.Filter filter(
      order=2,
      f_cut=5/(2*Modelica.Constants.pi*riseTime),
@@ -60,14 +60,9 @@ equation
   assert(dp_in >= -1E-3,
     "dp_in cannot be negative. Obtained dp_in = " + String(dp_in));
 
-  connect(dp_in, gain.u) annotation (Line(
-      points={{1.11022e-15,120},{1.11022e-15,90},{-30,90},{-30,70},{-22,70}},
-      color={0,0,127},
-      smooth=Smooth.None));
-
   if filteredSpeed then
-    connect(gain.y, filter.u) annotation (Line(
-      points={{1,70},{10,70},{10,88},{18.6,88}},
+    connect(dp_in, filter.u) annotation (Line(
+      points={{0,120},{10,120},{10,88},{18.6,88}},
       color={0,0,127},
       smooth=Smooth.None));
     connect(filter.y, dp_actual) annotation (Line(
@@ -79,14 +74,18 @@ equation
       color={0,0,127},
       smooth=Smooth.None));
   else
-    connect(gain.y, dp_actual) annotation (Line(
-      points={{1,70},{56,70},{56,50},{110,50}},
+    connect(dp_in, dp_actual) annotation (Line(
+      points={{0,120},{18,120},{18,50},{110,50}},
       color={0,0,127},
       smooth=Smooth.None));
   end if;
 
-  connect(dp_actual, preSou.dp_in) annotation (Line(
-      points={{110,50},{60,50},{60,40},{36,40},{36,8}},
+  connect(gain.y, preSou.dp_in) annotation (Line(
+      points={{21,30},{36,30},{36,8}},
+      color={0,0,127},
+      smooth=Smooth.None));
+  connect(gain.u, dp_actual) annotation (Line(
+      points={{-2,30},{-10,30},{-10,50},{110,50}},
       color={0,0,127},
       smooth=Smooth.None));
   annotation (defaultComponentName="fan",
@@ -116,6 +115,12 @@ User's Guide</a> for more information.
       revisions="<html>
 <ul>
 <li>
+May 1, 2015, by Michael Wetter:<br/>
+Changed sign of <code>dp_actual</code>. This addresses
+<a href=\"https://github.com/iea-annex60/modelica-annex60/issues/226\">
+issue 226</a>.
+</li>
+<li>
 January 6, 2015, by Michael Wetter:<br/>
 Revised model for OpenModelica.
 </li>
@@ -152,5 +157,7 @@ Revised implementation to allow zero flow rate.
           smooth=Smooth.None),
         Text(extent={{64,68},{114,54}},
           lineColor={0,0,127},
-          textString="dp")}));
+          textString="dp")}),
+    Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,
+            100}}), graphics));
 end FlowControlled_dp;