Changeset 485

Show
Ignore:
Timestamp:
02/02/07 16:38:13 (22 months ago)
Author:
HansOlsson
Message:

Removed incorrect smooth in LimIntegrator. Verified with Martin

Location:
Modelica/branches/maintenance/2.2.1/Modelica
Files:
2 modified

Legend:

Unmodified
Added
Removed

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

    r463 r485  
    286286             "  y = " + String(y) + ", outMin = " + String(outMin) + ", outMax = " + String(outMax)); 
    287287    else 
    288        der(y) = smooth(0,if y < outMin and u < 0 or y > outMax and u > 0 then 0 else k*u); 
     288       der(y) = if y < outMin and u < 0 or y > outMax and u > 0 then 0 else k*u; 
    289289    end if; 
    290290  end LimIntegrator; 

  • Modelica/branches/maintenance/2.2.1/Modelica/package.mo

    r479 r485  
    7878The changes are: 
    7979<ul> 
     80<li>Removed smooth from <a href=\"Modelica://Modelica.Blocks.Continuous.LimIntegrator\">LimIntegrator</a>, since 
     81the expression is non-smooth for changes in y. 
     82</li> 
    8083<li>Several models in the <a href=\"Modelica://Modelica.Electrical.Digital\">Digital</a> 
    8184library have been rewritten for better performance, without modifying the behaviour.