Changeset 377

Timestamp:

02/27/2006 11:47:53 AM (3 years ago)

Author:

Martin

Message:

Added "smooth(0, ...)" to if-clauses in the blocks:
- Blocks.Continuous.LimIntegrator
- Blocks.Nonlinear.Limiter
- Blocks.Nonlinear.VariableLimiter
- Blocks.Nonlinear.DeadZone

Location:

Modelica/trunk/Blocks

Files:

• Continuous.mo (modified) (1 diff)
• Nonlinear.mo (modified) (4 diffs)

Modelica/trunk/Blocks/Continuous.mo

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

Modelica/trunk/Blocks/Nonlinear.mo

@@ -110 +110 @@
                  "  u = " + String(u) + ", uMin = " + String(uMin) + ", uMax = " + String(uMax));
         else
-           y = if u > uMax then uMax else if u < uMin then uMin else u;
+           y = smooth(0,if u > uMax then uMax else if u < uMin then uMin else u);
         end if;
       end Limiter;
@@ -194 +194 @@
              "  u = " + String(u) + ", uMin = " + String(uMin) + ", uMax = " + String(uMax));
     else
-       y = if u > uMax then uMax else if u < uMin then uMin else u;
+       y = smooth(0,if u > uMax then uMax else if u < uMin then uMin else u);
     end if;
   end VariableLimiter;
@@ -200 +200 @@
       block DeadZone "Provide a region of zero output" 
         parameter Real uMax=1 "Upper limits of dead zones";
-        parameter Real uMin(max=uMax) = -uMax "Lower limits of dead zones";
+        parameter Real uMin=-uMax "Lower limits of dead zones";
         parameter Boolean deadZoneAtInit = true 
       "= false, if dead zone is ignored during initializiation (i.e., y=u)";
@@ -264 +264 @@
               style(color=10))));
       equation 
+        assert(uMax >= uMin, "DeadZone: Limits must be consistent. However, uMax (=" + String(uMax) +
+                             ") < uMin (=" + String(uMin) + ")");
+    
         if initial() and not deadZoneAtInit then
            y = u;
         else
-           y = if u > uMax then u - uMax else if u < uMin then u - uMin else 0;
+           y = smooth(0,if u > uMax then u - uMax else if u < uMin then u - uMin else 0);
         end if;
       end DeadZone;