Changeset 1020

Timestamp:

01/29/2008 10:01:44 PM (12 months ago)

Author:

otter

Message:

- Changed StateGraph.Examples.ControlledTanks examples so that all models/connectors used are balanced

(did not fulfill the restrictions of Modelica 3 previously).

- Updated release notes

Location:

Modelica/trunk/Modelica

Files:

• StateGraph.mo (modified) (8 diffs)
• package.mo (modified) (6 diffs)

Modelica/trunk/Modelica/StateGraph.mo

@@ -1535 +1535 @@
     end MakeProduct;
 
-    connector inflow
+    connector inflow1
         "Inflow connector (this is a copy from Isolde Dressler's master thesis project)"
 
-        import Units = Modelica.SIunits;
-
-      Units.VolumeFlowRate Fi "inflow";
+      import Units = Modelica.SIunits;
+
+      input Units.VolumeFlowRate Fi "inflow";
       annotation (Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,
                   -100},{100,100}}), graphics={Polygon(
@@ -1548 +1548 @@
                 fillColor={255,255,255},
                 fillPattern=FillPattern.Solid)}));
-    end inflow;
-
-    connector outflow
+    end inflow1;
+
+    connector inflow2
+        "Inflow connector (this is a copy from Isolde Dressler's master thesis project)"
+
+      import Units = Modelica.SIunits;
+
+      output Units.VolumeFlowRate Fi "inflow";
+      annotation (Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,
+                  -100},{100,100}}), graphics={Polygon(
+                points={{-100,-100},{0,100},{100,-100},{-100,-100}},
+                lineColor={0,0,0},
+                lineThickness=2,
+                fillColor={255,255,255},
+                fillPattern=FillPattern.Solid)}));
+    end inflow2;
+
+    connector outflow1
         "Outflow connector (this is a copy from Isolde Dressler's master thesis project)"
 
-        import Units = Modelica.SIunits;
-
-      Units.VolumeFlowRate Fo "outflow";
-      Boolean open "valve open";
+      import Units = Modelica.SIunits;
+
+      output Units.VolumeFlowRate Fo "outflow";
+      input Boolean open "valve open";
       annotation (Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,
                   -100},{100,100}}), graphics={Polygon(
@@ -1564 +1579 @@
                 fillColor={255,255,255},
                 fillPattern=FillPattern.Solid)}));
-    end outflow;
+    end outflow1;
+
+    connector outflow2
+        "Outflow connector (this is a copy from Isolde Dressler's master thesis project)"
+
+      import Units = Modelica.SIunits;
+
+      input Units.VolumeFlowRate Fo "outflow";
+      output Boolean open "valve open";
+      annotation (Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,
+                  -100},{100,100}}), graphics={Polygon(
+                points={{-100,100},{0,-100},{100,100},{-100,100}},
+                lineColor={0,0,0},
+                lineThickness=2,
+                fillColor={255,255,255},
+                fillPattern=FillPattern.Solid)}));
+    end outflow2;
 
     model valve
@@ -1595 +1626 @@
               extent={{-20,-20},{20,20}},
               rotation=90)));
-      inflow inflow1 annotation (Placement(transformation(
+      Modelica.StateGraph.Examples.Utilities.inflow2 inflow1 
+                     annotation (Placement(transformation(
               origin={50,0},
               extent={{-50,-50},{50,50}},
               rotation=90)));
-      outflow outflow1 annotation (Placement(transformation(
+      Modelica.StateGraph.Examples.Utilities.outflow2 outflow1 
+                       annotation (Placement(transformation(
               origin={-50,0},
               extent={{-50,-50},{50,50}},
@@ -1615 +1648 @@
                 rotation=0)));
 
-      inflow inflow1 annotation (Placement(transformation(extent={{-55,60},{-45,
+      Modelica.StateGraph.Examples.Utilities.inflow1 inflow1 
+                     annotation (Placement(transformation(extent={{-55,60},{-45,
                   70}}, rotation=0)));
-      outflow outflow1 annotation (Placement(transformation(extent={{55,-50},{
+      Modelica.StateGraph.Examples.Utilities.outflow1 outflow1 
+                       annotation (Placement(transformation(extent={{55,-50},{
                   65,-40}}, rotation=0)));
       annotation (
@@ -1666 +1701 @@
         "Simple source model (this is a copy from Isolde Dressler's master thesis project)"
 
-      outflow outflow1 annotation (Placement(transformation(extent={{-10,-60},{
+      Modelica.StateGraph.Examples.Utilities.outflow1 outflow1 
+                       annotation (Placement(transformation(extent={{-10,-60},{
                   10,-40}}, rotation=0)));
       parameter Real maxflow=1 "maximal flow out of source";
@@ -1680 +1716 @@
                 fillPattern=FillPattern.Solid,
                 textString="%name",
-                lineColor={0,0,255})}));
+                lineColor={0,0,255})}), Diagram(coordinateSystem(
+                preserveAspectRatio=false, extent={{-100,-100},{100,100}}),
+              graphics));
     equation
       if outflow1.open then
@@ -3220 +3258 @@
           graphics={Rectangle(
               extent={{-100,-100},{100,100}},
-              fillColor=DynamicSelect({192,192,192}, if on > 0.5 then {0,255,0} else 
-                        {192,192,192}),
-              fillPattern=DynamicSelect(FillPattern.Solid, if on > 0.5 then 
+              fillColor=DynamicSelect({192,192,192}, if on > 0.5 then {0,255,0}
+                   else {192,192,192}),
+              fillPattern=DynamicSelect(FillPattern.Solid, if on > 0.5 then
                   FillPattern.Solid else FillPattern.Solid),
               lineColor={128,128,128},

Modelica/trunk/Modelica/package.mo

@@ -1 @@
-within ; 
+within ;
 package Modelica "Modelica Standard Library (Version 3.0)"
 extends Icons.Library;
@@ -754 +754 @@
 Version 3.0 is <b>not</b> backward compatible to previous versions.
 A conversion script is provided to transform models and libraries
-of previous versions to the new version.
+of previous versions to the new version. Therefore, conversion 
+should be automatic.
 </p>
 
@@ -1203 +1204 @@
                         whether it is used as absolute or as a relative number)</td> </tr>
 
+  <tr><td colspan=\"2\"><b>StateGraph.Examples.</b></td></tr>
+  <tr><td valign=\"top\"> ControlledTanks </td>
+      <td valign=\"top\"> The connectors of the ControlledTanks did not fulfill the new
+                        restrictions of Modelica 3. This has been fixed.</td> </tr>
+  <tr><td valign=\"top\"> Utilities </td>
+      <td valign=\"top\"> Replacing inflow, outflow by connectors inflow1, inflow2, 
+                        outflow1, outflow2 with appropriate input/output prefixes in 
+                        order to fufill the restrictions of Modelica 3 to arrive
+                        at balanced models. No conversion is provided, since
+                        too difficult and since the non-backward compatible change is in
+                        an example. </td> </tr>
+
   <tr><td colspan=\"2\"><b>Thermal.FluidHeatFlow.Sensors.</b></td></tr>
   <tr><td valign=\"top\"> <br>
@@ -1212 +1225 @@
   <tr><td colspan=\"2\"><b>Thermal.FluidHeatFlow.Sources.</b></td></tr>
   <tr><td valign=\"top\"> Ambient<br>PrescribedAmbient</td>
-      <td valign=\"top\"> available as one combined component Ambient<br>
+      <td valign=\"top\"> ava" + "ilable as one combined component Ambient<br>
                         Boolean parameters usePressureInput and useTemperatureInput decide 
                         whether pressure and/or temperature are constant or prescribed</td> </tr>
@@ -1222 +1235 @@
       <td valign=\"top\"> available as one combined component PressureIncrease<br>
                         Boolean parameter usePressureIncreaseInput decides 
-                        whether pressure increase i" + "s constant or prescribed</td> </tr>
+                        whether pressure increase is constant or prescribed</td> </tr>
 
   <tr><td colspan=\"2\"><b>Thermal.FluidHeatFlow.Examples.</b></td></tr>
@@ -1432 +1445 @@
       <td valign=\"top\"> Unit of variable \"press\" corrected (from Pa to bar)</td> 
   </tr>
+
+  <tr><td colspan=\"2\"><b>StateGraph.Examples.</b></td></tr>
+  <tr><td valign=\"top\">SimpleFriction</td>
+      <td valign=\"top\"> The internal parameter k is defined and calculated with the appropriate unit.</td> </tr>
+
 
   <tr><td colspan=\"2\"><b>Thermal.FluidHeatFlow.Interfaces.Partials.</b></td></tr>