Changeset 485 for branches/maintenance/2.2.1

Timestamp:

02/02/07 16:38:13 (19 months ago)

Author:

HansOlsson

Message:

Removed incorrect smooth in LimIntegrator. Verified with Martin

Location:

branches/maintenance/2.2.1/Modelica

Files:

• Blocks/Continuous.mo (modified) (1 diff)
• package.mo (modified) (1 diff)

branches/maintenance/2.2.1/Modelica/Blocks/Continuous.mo

@@ -286 +286 @@
              "  y = " + String(y) + ", outMin = " + String(outMin) + ", outMax = " + String(outMax));
     else
-       der(y) = smooth(0,if y < outMin and u < 0 or y > outMax and u > 0 then 0 else k*u);
+       der(y) = if y < outMin and u < 0 or y > outMax and u > 0 then 0 else k*u;
     end if;
   end LimIntegrator;

branches/maintenance/2.2.1/Modelica/package.mo

@@ -78 +78 @@
 The changes are:
 <ul>
+<li>Removed smooth from <a href=\"Modelica://Modelica.Blocks.Continuous.LimIntegrator\">LimIntegrator</a>, since
+the expression is non-smooth for changes in y.
+</li>
 <li>Several models in the <a href=\"Modelica://Modelica.Electrical.Digital\">Digital</a>
 library have been rewritten for better performance, without modifying the behaviour.