Changeset 796 for branches/maintenance/2.2.2

Timestamp:

11/14/07 16:16:10 (9 months ago)

Author:

AHaumer

Message:

replaced SIunits.CelsiusTemperature by nonSIunits.Temperature_degC;
resolved a small issue in SimpleFriction.

Files:

• branches/maintenance/2.2.2/Modelica/Thermal/FluidHeatFlow.mo (modified) (9 diffs)

branches/maintenance/2.2.2/Modelica/Thermal/FluidHeatFlow.mo

@@ -238 +238 @@
         "Cooling medium" 
         annotation(choicesAllMatching=true);
-      parameter Modelica.SIunits.CelsiusTemperature TAmb=20 
+      parameter Modelica.SIunits.Conversions.NonSIunits.Temperature_degC TAmb=20 
         "Ambient temperature";
       output Modelica.SIunits.TemperatureDifference dTSource=
@@ -363 +363 @@
         "Cooling medium" 
         annotation(choicesAllMatching=true);
-      parameter Modelica.SIunits.CelsiusTemperature TAmb=20 
+      parameter Modelica.SIunits.Conversions.NonSIunits.Temperature_degC TAmb=20 
         "Ambient temperature";
       output Modelica.SIunits.TemperatureDifference dTSource1=
@@ -523 +523 @@
         "Inner medium" 
         annotation(choicesAllMatching=true);
-      parameter Modelica.SIunits.CelsiusTemperature TAmb=20 
+      parameter Modelica.SIunits.Conversions.NonSIunits.Temperature_degC TAmb=20 
         "Ambient temperature";
       output Modelica.SIunits.TemperatureDifference dTSource=
@@ -657 +657 @@
         "Cooling medium" 
         annotation(choicesAllMatching=true);
-      parameter Modelica.SIunits.CelsiusTemperature TAmb=20 
+      parameter Modelica.SIunits.Conversions.NonSIunits.Temperature_degC TAmb=20 
         "Ambient temperature";
       output Modelica.SIunits.TemperatureDifference dTSource=
@@ -756 +756 @@
         "Cooling medium" 
         annotation(choicesAllMatching=true);
-      parameter Modelica.SIunits.CelsiusTemperature TAmb=20 
+      parameter Modelica.SIunits.Conversions.NonSIunits.Temperature_degC TAmb=20 
         "Ambient temperature";
       output Modelica.SIunits.TemperatureDifference dTSource=
@@ -836 +836 @@
         "Cooling medium" 
         annotation(choicesAllMatching=true);
-      parameter Modelica.SIunits.CelsiusTemperature TAmb=20 
+      parameter Modelica.SIunits.Conversions.NonSIunits.Temperature_degC TAmb=20 
         "Ambient temperature";
       output Modelica.SIunits.TemperatureDifference dTSource1=
@@ -955 +955 @@
         "Cooling medium" 
         annotation(choicesAllMatching=true);
-      parameter Modelica.SIunits.CelsiusTemperature TAmb=20 
+      parameter Modelica.SIunits.Conversions.NonSIunits.Temperature_degC TAmb=20 
         "Ambient temperature";
-      parameter Modelica.SIunits.CelsiusTemperature TMass=40 
+      parameter Modelica.SIunits.Conversions.NonSIunits.Temperature_degC TMass=40 
         "Inital temperature of mass";
       output Modelica.SIunits.TemperatureDifference dTMass=
@@ -1021 +1021 @@
         "Cooling medium" 
         annotation(choicesAllMatching=true);
-      parameter Modelica.SIunits.CelsiusTemperature TAmb=20 
+      parameter Modelica.SIunits.Conversions.NonSIunits.Temperature_degC TAmb=20 
         "Ambient temperature";
-      parameter Modelica.SIunits.CelsiusTemperature TMass1=40 
+      parameter Modelica.SIunits.Conversions.NonSIunits.Temperature_degC TMass1
+        =                                                                       40 
         "Inital temperature of mass1";
-      parameter Modelica.SIunits.CelsiusTemperature TMass2=60 
+      parameter Modelica.SIunits.Conversions.NonSIunits.Temperature_degC TMass2
+        =                                                                       60 
         "Inital temperature of mass2";
       output Modelica.SIunits.TemperatureDifference dTMass1=
@@ -1677 +1679 @@
         Modelica.SIunits.Power Q_friction;
       protected 
+        parameter Modelica.SIunits.Pressure dpNomMin=dpLaminar/V_flowLaminar*V_flowNominal;
         parameter Real k(final unit="Pa.s2/m6", fixed=false);
       initial algorithm 
         assert(V_flowNominal>V_flowLaminar,
           "SimpleFriction: V_flowNominal has to be > V_flowLaminar!");
-        assert(dpNominal>=dpLaminar/V_flowLaminar*V_flowNominal,
+        assert(dpNominal>=dpNomMin,
           "SimpleFriction: dpNominal has to be > dpLaminar/V_flowLaminar*V_flowNominal!");
-        k:=(dpNominal - dpLaminar/V_flowLaminar*V_flowNominal)/(V_flowNominal - V_flowLaminar)^2;
+        k:=(dpNominal - dpNomMin)/(V_flowNominal - V_flowLaminar)^2;
       equation 
         if     VolumeFlow > +V_flowLaminar then