Changeset 13660


Ignore:
Timestamp:
Oct 3, 2019 3:20:33 PM (2 months ago)
Author:
aramle
Message:

#5853 Updated MSL to MSL 3.2.3 from https://github.com/modelica/ModelicaStandardLibrary/tree/v3.2.3+build.3 and applied some of out patches.

Location:
branches/dev-MSL323-MVD/ThirdParty/MSL
Files:
1683 added
2 edited

Legend:

Unmodified
Added
Removed
  • branches/dev-MSL323-MVD/ThirdParty/MSL/Complex.mo

    r9251 r13660  
    11within ;
    22operator record Complex "Complex number with overloaded operators"
    3 //record Complex "Complex number with overloaded operators"
     3
    44  replaceable Real re "Real part of complex number" annotation(Dialog);
    55  replaceable Real im "Imaginary part of complex number" annotation(Dialog);
     
    1414
    1515      annotation(Inline=true, Documentation(info="<html>
    16 <p>This function returns a Complex number defined by real part <i>re</i> and optional imaginary part <i>im</i> (default=0).</p>
     16<p>This function returns a Complex number defined by real part <em>re</em> and optional imaginary part <em>im</em> (default=0).</p>
    1717</html>"));
    1818    end fromReal;
     
    2626            radius=25.0), Rectangle(
    2727            lineColor={128,128,128},
    28             fillPattern=FillPattern.None,
    2928            extent={{-100,-100},{100,100}},
    3029            radius=25.0)}));
     
    7675          Rectangle(
    7776            lineColor={128,128,128},
    78             fillPattern=FillPattern.None,
    79             extent={{-100,-100},{100,100}},
    80             radius=25.0),
    81           Line(
    82             points={{-50,0},{50,0}},
    83             color={0,0,0},
    84             smooth=Smooth.None)}));
     77            extent={{-100,-100},{100,100}},
     78            radius=25.0),
     79          Line(
     80            points={{-50,0},{50,0}})}));
    8581  end '-';
    8682
     
    134130          Rectangle(
    135131            lineColor={128,128,128},
    136             fillPattern=FillPattern.None,
    137             extent={{-100,-100},{100,100}},
    138             radius=25.0),
    139           Line(
    140             points={{-42,36},{39,-34}},
    141             color={0,0,0},
    142             smooth=Smooth.None),
    143           Line(
    144             points={{-42,-35},{39,37}},
    145             color={0,0,0},
    146             smooth=Smooth.None),
    147           Line(
    148             points={{-55,1},{52,1}},
    149             color={0,0,0},
    150             smooth=Smooth.None),
    151           Line(
    152             points={{-1.5,55},{-2,-53}},
    153             color={0,0,0},
    154             smooth=Smooth.None)}));
     132            extent={{-100,-100},{100,100}},
     133            radius=25.0),
     134          Line(
     135            points={{-42,36},{39,-34}}),
     136          Line(
     137            points={{-42,-35},{39,37}}),
     138          Line(
     139            points={{-55,1},{52,1}}),
     140          Line(
     141            points={{-1.5,55},{-2,-53}})}));
    155142  end '*';
    156143
     
    249236
    250237
    251 annotation (Protection(access=Access.hide),
    252 version="3.2.2",
    253 versionBuild=0,
    254 versionDate="2016-01-15",
    255 dateModified = "2016-01-15 08:44:41Z",
    256 revisionId="$Id:: Complex.mo 8952 2016-01-15 07:59:59Z #$",
     238annotation (
     239version="3.2.3",
     240versionBuild=3,
     241versionDate="2019-01-23",
     242dateModified="2019-09-21 12:00:00Z",
     243revisionId="8642c8de8b 2019-09-21 20:54:00 +0200",
    257244conversion(
     245 noneFromVersion="3.2.2",
    258246 noneFromVersion="3.2.1",
    259247 noneFromVersion="1.0",
     
    261249Documentation(info="<html>
    262250<p>Complex number defined as a record containing real and imaginary part, utilizing operator overloading.</p>
    263 </html>"),
     251<p>
     252<strong>Licensed by the Modelica Association under the 3-Clause BSD License</strong><br>
     253Copyright &copy; 2010-2019, Modelica Association and <a href=\"modelica://Modelica.UsersGuide.Contact\">contributors</a>
     254</p>
     255
     256<p>
     257<em>This Modelica package is <u>free</u> software and the use is completely at <u>your own risk</u>; it can be redistributed and/or modified under the terms of the 3-Clause BSD license. For license conditions (including the disclaimer of warranty) visit <a href=\"https://modelica.org/licenses/modelica-3-clause-bsd\">https://modelica.org/licenses/modelica-3-clause-bsd</a>.</em>
     258</p></html>"),
    264259    Icon(graphics={Rectangle(
    265260          lineColor={160,160,164},
  • branches/dev-MSL323-MVD/ThirdParty/MSL/ModelicaTestOverdetermined.mo

    r9251 r13660  
    6464        connect(source.ports[1], pipe.port_a)         annotation (Line(
    6565            points={{-60,0},{-55,0},{-55,0},{-50,
    66                 0},{-50,0},{-40,0}},
    67             color={0,127,255}));
     66                0},{-50,0},{-40,0}}, color={0,127,255}));
    6867        connect(pipe.port_b, valve.port_a)               annotation (Line(
    6968            points={{-20,0},{-15,0},{-15,0},{-10,
    70                 0},{-10,0},{0,0}},
    71             color={0,127,255}));
     69                0},{-10,0},{0,0}}, color={0,127,255}));
    7270        connect(valve.port_b, sink.ports[1])                          annotation (Line(
    7371            points={{20,0},{25,0},{25,0},{30,
    74                 0},{30,0},{40,0}},
    75             color={0,127,255}));
     72                0},{30,0},{40,0}}, color={0,127,255}));
    7673        connect(ramp.y, valve.opening)               annotation (Line(
    77             points={{25,40},{10,40},{10,8}},
    78             color={0,0,127}));
     74            points={{25,40},{10,40},{10,8}}, color={0,0,127}));
    7975
    8076        annotation (Documentation(info="<html>
     
    152148        connect(source.ports[1], pipe.port_a)         annotation (Line(
    153149            points={{-60,0},{-55,0},{-55,0},{-50,
    154                 0},{-50,0},{-40,0}},
    155             color={0,127,255}));
     150                0},{-50,0},{-40,0}}, color={0,127,255}));
    156151        connect(pipe.port_b, valve.port_a)               annotation (Line(
    157152            points={{-20,0},{-15,0},{-15,0},{-10,
    158                 0},{-10,0},{0,0}},
    159             color={0,127,255}));
     153                0},{-10,0},{0,0}}, color={0,127,255}));
    160154        connect(valve.port_b, sink.ports[1])                          annotation (Line(
    161155            points={{20,0},{25,0},{25,0},{30,
    162                 0},{30,0},{40,0}},
    163             color={0,127,255}));
     156                0},{30,0},{40,0}}, color={0,127,255}));
    164157        connect(ramp.y, valve.opening)               annotation (Line(
    165             points={{25,40},{10,40},{10,8}},
    166             color={0,0,127}));
     158            points={{25,40},{10,40},{10,8}}, color={0,0,127}));
    167159        annotation (Documentation(info="<html>
    168160The initial values are overdetermined as the first pipe segment is directly connected to a source with fixed pressure.
     
    248240      equation
    249241        connect(source.ports[1], pipe1.port_a) annotation (Line(
    250             points={{-70,0},{-50,0}},
    251             color={0,127,255}));
     242            points={{-70,0},{-50,0}}, color={0,127,255}));
    252243        connect(valve.port_b,sink. ports[1])                          annotation (Line(
    253             points={{46,0},{66,0}},
    254             color={0,127,255}));
     244            points={{46,0},{66,0}}, color={0,127,255}));
    255245        connect(ramp.y,valve. opening)               annotation (Line(
    256             points={{51,40},{36,40},{36,8}},
    257             color={0,0,127}));
     246            points={{51,40},{36,40},{36,8}}, color={0,0,127}));
    258247        connect(pipe1.port_b, pipe2.port_a) annotation (Line(
    259             points={{-30,0},{-14,0}},
    260             color={0,127,255}));
     248            points={{-30,0},{-14,0}}, color={0,127,255}));
    261249        connect(pipe2.port_b, valve.port_a) annotation (Line(
    262             points={{6,0},{26,0}},
    263             color={0,127,255}));
     250            points={{6,0},{26,0}}, color={0,127,255}));
    264251      end DynamicPipesSeriesSteadyStateInitial;
    265252
     
    389376        equation
    390377          connect(source.ports[1], V1.ports[1]) annotation (Line(
    391               points={{-60,-10},{-40,-10},{-40,0}},
    392               color={0,127,255}));
     378              points={{-60,-10},{-40,-10},{-40,0}}, color={0,127,255}));
    393379          connect(V1.ports[2], V2.ports[1]) annotation (Line(
    394               points={{-36,0},{-36,-10},{-4,-10},{-4,0}},
    395               color={0,127,255}));
     380              points={{-36,0},{-36,-10},{-4,-10},{-4,0}}, color={0,127,255}));
    396381          connect(V2.ports[2], valveLinear.port_a) annotation (Line(
    397               points={{0,0},{0,-10},{20,-10}},
    398               color={0,127,255}));
     382              points={{0,0},{0,-10},{20,-10}}, color={0,127,255}));
    399383          connect(valveLinear.port_b, sink.ports[1]) annotation (Line(
    400               points={{40,-10},{60,-10}},
    401               color={0,127,255}));
     384              points={{40,-10},{60,-10}}, color={0,127,255}));
    402385          connect(one.y, valveLinear.opening) annotation (Line(
    403               points={{23,34},{30,34},{30,-2}},
    404               color={0,0,127}));
     386              points={{23,34},{30,34},{30,-2}}, color={0,0,127}));
    405387        end TwoVolumes;
    406388
     
    538520        equation
    539521          connect(fixed.flange, spring.flange_a) annotation (Line(
    540               points={{-60,0},{-42,0}},
    541               color={0,127,0}));
     522              points={{-60,0},{-42,0}}, color={0,127,0}));
    542523          connect(spring.flange_b, mass1.flange_a) annotation (Line(
    543               points={{-22,0},{-12,0}},
    544               color={0,127,0}));
     524              points={{-22,0},{-12,0}}, color={0,127,0}));
    545525          connect(mass1.flange_b, mass2.flange_a) annotation (Line(
    546               points={{8,0},{26,0}},
    547               color={0,127,0}));
     526              points={{8,0},{26,0}}, color={0,127,0}));
    548527        end TwoMasses;
    549528
     
    630609          fillPattern=FillPattern.Solid)}),
    631610       preferredView="info",
    632        version="3.2.2",
    633        versionBuild=0,
    634        versionDate="2016-03-11",
    635        dateModified = "2016-03-11 08:44:41Z",
    636        revisionId="$Id:: ModelicaTestOverdetermined.mo 9203 20#$",
    637        uses(Modelica(version="3.2.2")),
     611       versionBuild=3,
     612       version="3.2.3",
     613       versionDate="2019-01-23",
     614       dateModified="2019-09-21 12:00:00Z",
     615       revisionId="$Id::                                       $",
     616       uses(Modelica(version="3.2.3")),
    638617    Documentation(info="<html>
    639618<p>
    640619This library provides models and functions to test components of
    641 <b>package Modelica</b> (the Modelica Standard Library).
     620<strong>package Modelica</strong> (the Modelica Standard Library).
    642621All test models in this package define more equations during initialization,
    643622as necessary. These test models are especially provided for tool vendors
     
    650629
    651630<p>
    652 Copyright &copy; 1998-2016, Modelica Association.
     631Copyright &copy; 1998-2019, Modelica Association and contributors
    653632</p>
     633
    654634<p>
    655 <i>This Modelica package is <u>free</u> software and the use is completely at <u>your own risk</u>; it can be redistributed and/or modified under the terms of the Modelica License 2. For license conditions (including the disclaimer of warranty) see <a href=\"modelica://Modelica.UsersGuide.ModelicaLicense2\">Modelica.UsersGuide.ModelicaLicense2</a> or visit <a href=\"https://www.modelica.org/licenses/ModelicaLicense2\"> https://www.modelica.org/licenses/ModelicaLicense2</a>.</i>
     635<em>This Modelica package is <u>free</u> software and the use is completely at <u>your own risk</u>; it can be redistributed and/or modified under the terms of the 3-Clause BSD license. For license conditions (including the disclaimer of warranty) visit <a href=\"https://modelica.org/licenses/modelica-3-clause-bsd\">https://modelica.org/licenses/modelica-3-clause-bsd</a>.</em>
    656636</p>
    657637</html>"));
Note: See TracChangeset for help on using the changeset viewer.