Changeset 655

Show
Ignore:
Timestamp:
10/08/2007 01:11:27 PM (15 months ago)
Author:
AHaumer
Message:

small changes to avoid unit conflicts

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • Modelica/trunk/Modelica/Thermal/FluidHeatFlow.mo

    r620 r655  
    11within Modelica.Thermal; 
     2 
    23package FluidHeatFlow  
    34  "Simple components for 1-dimensional incompressible thermo-fluid flow models"  
    45  extends Modelica.Icons.Library2; 
    56  annotation ( 
    6     version="1.6.5", versionDate="2007-08-26", 
     7    version="1.6.5", versionDate="2007-10-08", 
    78    preferedView="info",Documentation(info="<HTML> 
    89This package contains very simple-to-use components to model coolant flows as needed to simulate cooling e.g. of electric machines: 
    … …  
    13951396    protected  
    13961397      constant Real small = Modelica.Constants.small; 
     1398      constant Modelica.SIunits.VolumeFlowRate smallVolumeFlowRate = eps; 
    13971399      constant Real eps = Modelica.Constants.eps; 
    13981400      Real yLim = max(min(y,y1),0) "Limited valve opening"; 
    … …  
    14031405    initial algorithm  
    14041406      assert(y1>small, "Valve characteristic: y1 has to be > 0 !"); 
    1405       assert(Kv1>small, "Valve characteristic: Kv1 has to be > 0 !"); 
     1407      assert(Kv1>smallVolumeFlowRate, "Valve characteristic: Kv1 has to be > 0 !"); 
    14061408      assert(kv0>small, "Valve characteristic: kv0 has to be > 0 !"); 
    14071409      assert(kv0<1-eps, "Valve characteristic: kv0 has to be < 1 !");