Skip to content

Use new single slash form of Modelica URIs #4240

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
henrikt-ma wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use new single slash form of Modelica URIs #4240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion Complex.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ Documentation(info="<html>
<p>Complex number defined as a record containing real and imaginary part, utilizing operator overloading.</p>
<p>
<strong>Licensed by the Modelica Association under the 3-Clause BSD License</strong><br>
Copyright &copy; 2010-2020, Modelica Association and <a href=\"modelica://Modelica.UsersGuide.Contact\">contributors</a>
Copyright &copy; 2010-2020, Modelica Association and <a href=\"modelica:/Modelica.UsersGuide.Contact\">contributors</a>
</p>

<p>
Expand Down
32 changes: 16 additions & 16 deletions Modelica/Blocks/Continuous.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ y = - u
<p>
It might be difficult to initialize the integrator in steady state.
This is discussed in the description of package
<a href=\"modelica://Modelica.Blocks.Continuous#info\">Continuous</a>.
<a href=\"modelica:/Modelica.Blocks.Continuous#info\">Continuous</a>.
</p>

<p>
Expand Down Expand Up @@ -206,7 +206,7 @@ the integral away from the bounds.
<p>
It might be difficult to initialize the integrator in steady state.
This is discussed in the description of package
<a href=\"modelica://Modelica.Blocks.Continuous#info\">Continuous</a>.
<a href=\"modelica:/Modelica.Blocks.Continuous#info\">Continuous</a>.
</p>

<p>
Expand Down Expand Up @@ -570,7 +570,7 @@ Example:
It might be difficult to initialize the PI component in steady state
due to the integrator part.
This is discussed in the description of package
<a href=\"modelica://Modelica.Blocks.Continuous#info\">Continuous</a>.
<a href=\"modelica:/Modelica.Blocks.Continuous#info\">Continuous</a>.
</p>

</html>"), Icon(coordinateSystem(
Expand Down Expand Up @@ -698,7 +698,7 @@ block LimPID.
The PID block can be initialized in different
ways controlled by parameter <strong>initType</strong>. The possible
values of initType are defined in
<a href=\"modelica://Modelica.Blocks.Types.Init\">Modelica.Blocks.Types.Init</a>.
<a href=\"modelica:/Modelica.Blocks.Types.Init\">Modelica.Blocks.Types.Init</a>.
</p>

<p>
Expand Down Expand Up @@ -969,7 +969,7 @@ Via parameter <strong>controllerType</strong> either <strong>P</strong>, <strong
or <strong>PID</strong> can be selected. If, e.g., PI is selected, all components belonging to the
D-part are removed from the block (via conditional declarations).
The example model
<a href=\"modelica://Modelica.Blocks.Examples.PID_Controller\">Modelica.Blocks.Examples.PID_Controller</a>
<a href=\"modelica:/Modelica.Blocks.Examples.PID_Controller\">Modelica.Blocks.Examples.PID_Controller</a>
demonstrates the usage of this controller.
Several practical aspects of PID controller design are incorporated
according to chapter 3 of the book:
Expand Down Expand Up @@ -1042,7 +1042,7 @@ together) and using the following strategy:
This block can be initialized in different
ways controlled by parameter <strong>initType</strong>. The possible
values of initType are defined in
<a href=\"modelica://Modelica.Blocks.Types.Init\">Modelica.Blocks.Types.Init</a>.
<a href=\"modelica:/Modelica.Blocks.Types.Init\">Modelica.Blocks.Types.Init</a>.
</p>

<p>
Expand Down Expand Up @@ -1482,7 +1482,7 @@ different orders are shown in the next figure:
</p>

<div>
<img src=\"modelica://Modelica/Resources/Images/Blocks/Continuous/Butterworth.png\"
<img src=\"modelica:/Modelica/Resources/Images/Blocks/Continuous/Butterworth.png\"
alt=\"Butterworth.png\">
</div>

Expand Down Expand Up @@ -1607,12 +1607,12 @@ y = ------------- * u
</pre></blockquote>

<div>
<img src=\"modelica://Modelica/Resources/Images/Blocks/Continuous/CriticalDampingNormalized.png\"
<img src=\"modelica:/Modelica/Resources/Images/Blocks/Continuous/CriticalDampingNormalized.png\"
alt=\"CriticalDampingNormalized.png\">
</div>

<div>
<img src=\"modelica://Modelica/Resources/Images/Blocks/Continuous/CriticalDampingNonNormalized.png\"
<img src=\"modelica:/Modelica/Resources/Images/Blocks/Continuous/CriticalDampingNonNormalized.png\"
alt=\"CriticalDampingNonNormalized.png\">
</div>

Expand Down Expand Up @@ -1852,7 +1852,7 @@ are shown in the next figure:
</p>

<blockquote>
<img src=\"modelica://Modelica/Resources/Images/Blocks/Continuous/LowPassOrder4Filters.png\"
<img src=\"modelica:/Modelica/Resources/Images/Blocks/Continuous/LowPassOrder4Filters.png\"
alt=\"LowPassOrder4Filters.png\">
</blockquote>

Expand All @@ -1862,7 +1862,7 @@ starting from a steady state initial filter with initial input = 0.2:
</p>

<blockquote>
<img src=\"modelica://Modelica/Resources/Images/Blocks/Continuous/LowPassOrder4FiltersStepResponse.png\"
<img src=\"modelica:/Modelica/Resources/Images/Blocks/Continuous/LowPassOrder4FiltersStepResponse.png\"
alt=\"LowPassOrder4FiltersStepResponse.png\">
</blockquote>

Expand All @@ -1883,7 +1883,7 @@ are shown in the next figure:
</p>

<blockquote>
<img src=\"modelica://Modelica/Resources/Images/Blocks/Continuous/HighPassOrder4Filters.png\"
<img src=\"modelica:/Modelica/Resources/Images/Blocks/Continuous/HighPassOrder4Filters.png\"
alt=\"HighPassOrder4Filters.png\">
</blockquote>

Expand All @@ -1892,7 +1892,7 @@ The corresponding step responses of these high pass filters are
shown in the next figure:
</p>
<blockquote>
<img src=\"modelica://Modelica/Resources/Images/Blocks/Continuous/HighPassOrder4FiltersStepResponse.png\"
<img src=\"modelica:/Modelica/Resources/Images/Blocks/Continuous/HighPassOrder4FiltersStepResponse.png\"
alt=\"HighPassOrder4FiltersStepResponse.png\">
</blockquote>

Expand All @@ -1913,12 +1913,12 @@ CriticalDamping filters of order 1,2,3:
</p>

<blockquote>
<img src=\"modelica://Modelica/Resources/Images/Blocks/Continuous/CriticalDampingNormalized.png\"
<img src=\"modelica:/Modelica/Resources/Images/Blocks/Continuous/CriticalDampingNormalized.png\"
alt=\"CriticalDampingNormalized.png\">
</blockquote>

<blockquote>
<img src=\"modelica://Modelica/Resources/Images/Blocks/Continuous/CriticalDampingNonNormalized.png\"
<img src=\"modelica:/Modelica/Resources/Images/Blocks/Continuous/CriticalDampingNonNormalized.png\"
alt=\"CriticalDampingNonNormalized.png\">
</blockquote>

Expand Down Expand Up @@ -4459,7 +4459,7 @@ described by differential equations.
All blocks of this package can be initialized in different
ways controlled by parameter <strong>initType</strong>. The possible
values of initType are defined in
<a href=\"modelica://Modelica.Blocks.Types.Init\">Modelica.Blocks.Types.Init</a>:
<a href=\"modelica:/Modelica.Blocks.Types.Init\">Modelica.Blocks.Types.Init</a>:
</p>

<table border=\"1\" cellspacing=\"0\" cellpadding=\"2\">
Expand Down
12 changes: 6 additions & 6 deletions Modelica/Blocks/Interaction.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,13 @@ name of the variable value that is displayed is also shown below the icon):
</p>

<div>
<img src=\"modelica://Modelica/Resources/Images/Blocks/Interaction/Show/RealValue.png\"
<img src=\"modelica:/Modelica/Resources/Images/Blocks/Interaction/Show/RealValue.png\"
alt=\"RealValue.png\">
</div>

<p>
The usage is demonstrated, e.g., in example
<a href=\"modelica://Modelica.Blocks.Examples.RealNetwork1\">Modelica.Blocks.Examples.RealNetwork1</a>.
<a href=\"modelica:/Modelica.Blocks.Examples.RealNetwork1\">Modelica.Blocks.Examples.RealNetwork1</a>.
</p>
</html>"));
end RealValue;
Expand Down Expand Up @@ -126,13 +126,13 @@ name of the variable value that is displayed is also shown below the icon):
</p>

<div>
<img src=\"modelica://Modelica/Resources/Images/Blocks/Interaction/Show/IntegerValue.png\"
<img src=\"modelica:/Modelica/Resources/Images/Blocks/Interaction/Show/IntegerValue.png\"
alt=\"IntegerValue.png\">
</div>

<p>
The usage is demonstrated, e.g., in example
<a href=\"modelica://Modelica.Blocks.Examples.IntegerNetwork1\">Modelica.Blocks.Examples.IntegerNetwork1</a>.
<a href=\"modelica:/Modelica.Blocks.Examples.IntegerNetwork1\">Modelica.Blocks.Examples.IntegerNetwork1</a>.
</p>
</html>"));
end IntegerValue;
Expand Down Expand Up @@ -189,13 +189,13 @@ name of the variable value that is displayed is also shown below the icon):
</p>

<div>
<img src=\"modelica://Modelica/Resources/Images/Blocks/Interaction/Show/BooleanValue.png\"
<img src=\"modelica:/Modelica/Resources/Images/Blocks/Interaction/Show/BooleanValue.png\"
alt=\"BooleanValue.png\">
</div>

<p>
The usage is demonstrated, e.g., in example
<a href=\"modelica://Modelica.Blocks.Examples.BooleanNetwork1\">Modelica.Blocks.Examples.BooleanNetwork1</a>.
<a href=\"modelica:/Modelica.Blocks.Examples.BooleanNetwork1\">Modelica.Blocks.Examples.BooleanNetwork1</a>.
</p>
</html>"));
end BooleanValue;
Expand Down
20 changes: 10 additions & 10 deletions Modelica/Blocks/Interfaces.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ Connector with one output signal of type Integer.
Documentation(info="<html>
<p>
Real input connector that is used for a vector of connectors,
for example <a href=\"modelica://Modelica.Blocks.Interfaces.PartialRealMISO\">PartialRealMISO</a>,
for example <a href=\"modelica:/Modelica.Blocks.Interfaces.PartialRealMISO\">PartialRealMISO</a>,
and has therefore a different icon as RealInput connector.
</p>
</html>"));
Expand Down Expand Up @@ -229,7 +229,7 @@ and has therefore a different icon as RealInput connector.

<p>
Integer input connector that is used for a vector of connectors,
for example <a href=\"modelica://Modelica.Blocks.Interfaces.PartialIntegerMISO\">PartialIntegerMISO</a>,
for example <a href=\"modelica:/Modelica.Blocks.Interfaces.PartialIntegerMISO\">PartialIntegerMISO</a>,
and has therefore a different icon as IntegerInput connector.
</p>
</html>"));
Expand Down Expand Up @@ -259,7 +259,7 @@ and has therefore a different icon as IntegerInput connector.
Documentation(info="<html>
<p>
Boolean input connector that is used for a vector of connectors,
for example <a href=\"modelica://Modelica.Blocks.Interfaces.PartialBooleanMISO\">PartialBooleanMISO</a>,
for example <a href=\"modelica:/Modelica.Blocks.Interfaces.PartialBooleanMISO\">PartialBooleanMISO</a>,
and has therefore a different icon as BooleanInput connector.
</p>
</html>"));
Expand Down Expand Up @@ -289,7 +289,7 @@ and has therefore a different icon as BooleanInput connector.
Documentation(info="<html>
<p>
Real output connector that is used for a vector of connectors,
for example <a href=\"modelica://Modelica.Blocks.Routing.DeMultiplex\">DeMultiplex</a>,
for example <a href=\"modelica:/Modelica.Blocks.Routing.DeMultiplex\">DeMultiplex</a>,
and has therefore a different icon as RealOutput connector.
</p>
</html>"));
Expand Down Expand Up @@ -581,7 +581,7 @@ Modelica 3.3 introduced synchronous operators that avoid the need to manually pr
<p>
Block has one input and one output signal
which are sampled due to the defined <strong>samplePeriod</strong> parameter.
See the base-class <a href=\"modelica://Modelica.Blocks.Interfaces.DiscreteBlock\">DiscreteBlock</a> for more information.
See the base-class <a href=\"modelica:/Modelica.Blocks.Interfaces.DiscreteBlock\">DiscreteBlock</a> for more information.
</p>
</html>"));
end DiscreteSISO;
Expand All @@ -602,7 +602,7 @@ See the base-class <a href=\"modelica://Modelica.Blocks.Interfaces.DiscreteBlock
<p>
Block has a input and a output signal vector
which are sampled due to the defined <strong>samplePeriod</strong> parameter.
See the base-class <a href=\"modelica://Modelica.Blocks.Interfaces.DiscreteBlock\">DiscreteBlock</a> for more information.
See the base-class <a href=\"modelica:/Modelica.Blocks.Interfaces.DiscreteBlock\">DiscreteBlock</a> for more information.
</p>
</html>"));
end DiscreteMIMO;
Expand All @@ -622,7 +622,7 @@ See the base-class <a href=\"modelica://Modelica.Blocks.Interfaces.DiscreteBlock
Block has a input and a output signal vector
where the signal sizes of the input and output vector are identical.
These signals are sampled due to the defined <strong>samplePeriod</strong> parameter.
See the base-class <a href=\"modelica://Modelica.Blocks.Interfaces.DiscreteBlock\">DiscreteBlock</a> for more information.
See the base-class <a href=\"modelica:/Modelica.Blocks.Interfaces.DiscreteBlock\">DiscreteBlock</a> for more information.
</p>
</html>"));

Expand Down Expand Up @@ -662,7 +662,7 @@ Real output signal
that are sampled due to the defined <strong>samplePeriod</strong> parameter.
The block is designed
to be used as base class for a corresponding controller.
See the base-class <a href=\"modelica://Modelica.Blocks.Interfaces.DiscreteBlock\">DiscreteBlock</a> for more information.
See the base-class <a href=\"modelica:/Modelica.Blocks.Interfaces.DiscreteBlock\">DiscreteBlock</a> for more information.
</p>
</html>"));
end SVdiscrete;
Expand Down Expand Up @@ -707,7 +707,7 @@ Real output signal vector. The vector signals
are sampled due to the defined <strong>samplePeriod</strong> parameter.
The block is designed
to be used as base class for a corresponding controller.
See the base-class <a href=\"modelica://Modelica.Blocks.Interfaces.DiscreteBlock\">DiscreteBlock</a> for more information.
See the base-class <a href=\"modelica:/Modelica.Blocks.Interfaces.DiscreteBlock\">DiscreteBlock</a> for more information.
</p>
</html>"));
end MVdiscrete;
Expand Down Expand Up @@ -1399,7 +1399,7 @@ of noise blocks.

<table border=\"0\">
<tr><td>
<img src=\"modelica://Modelica/Resources/Images/Logos/dlr_logo.png\" alt=\"DLR logo\">
<img src=\"modelica:/Modelica/Resources/Images/Logos/dlr_logo.png\" alt=\"DLR logo\">
</td><td valign=\"bottom\">
Initial version implemented by
A. Kl&ouml;ckner, F. v.d. Linden, D. Zimmer, M. Otter.<br>
Expand Down
12 changes: 6 additions & 6 deletions Modelica/Blocks/Logical.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@ this block is usually identically to <strong>false</strong>, because the output
may only be <strong>true</strong> at an event instant, but not during
continuous integration. In order to check that this component is
actually working as expected, one should connect its output to, e.g.,
component <em><a href=\"modelica://Modelica.Blocks.Discrete.TriggeredSampler\">Modelica.Blocks.Discrete.TriggeredSampler</a></em>.
component <em><a href=\"modelica:/Modelica.Blocks.Discrete.TriggeredSampler\">Modelica.Blocks.Discrete.TriggeredSampler</a></em>.
</p>
</html>"), Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},
{100,100}}), graphics={
Expand Down Expand Up @@ -609,7 +609,7 @@ output signal <strong>y</strong>:
</p>

<div>
<img src=\"modelica://Modelica/Resources/Images/Blocks/Logical/Hysteresis.png\"
<img src=\"modelica:/Modelica/Resources/Images/Blocks/Logical/Hysteresis.png\"
alt=\"Hysteresis.png\">
</div>

Expand Down Expand Up @@ -733,7 +733,7 @@ input signal <strong>u</strong>.
</p>

<div>
<img src=\"modelica://Modelica/Resources/Images/Blocks/Logical/TriggeredTrapezoid.png\"
<img src=\"modelica:/Modelica/Resources/Images/Blocks/Logical/TriggeredTrapezoid.png\"
alt=\"TriggeredTrapezoid.png\">
</div>

Expand Down Expand Up @@ -795,7 +795,7 @@ When the input becomes <strong>false</strong>, the timer stops and the output is
</p>

<div>
<img src=\"modelica://Modelica/Resources/Images/Blocks/Logical/Timer.png\"
<img src=\"modelica:/Modelica/Resources/Images/Blocks/Logical/Timer.png\"
alt=\"Timer.png\">
</div>

Expand Down Expand Up @@ -952,7 +952,7 @@ either abort with an error (if <strong>assertionLevel</strong> is set to
<strong>assertionLevel</strong> is set to <strong>warning</strong>).
The <strong>message</strong> will be reported in either case.
For further information, refer to the documentation of
<a href=\"modelica://ModelicaReference.Operators.'assert()'\">ModelicaReference.Operators.'assert()'</a>
<a href=\"modelica:/ModelicaReference.Operators.'assert()'\">ModelicaReference.Operators.'assert()'</a>
&ndash; an operator which this block is based on.
</p>
<p>
Expand Down Expand Up @@ -1016,7 +1016,7 @@ network built with package Logical is shown in the next figure:
</p>

<div>
<img src=\"modelica://Modelica/Resources/Images/Blocks/Logical/LogicalNetwork1.png\"
<img src=\"modelica:/Modelica/Resources/Images/Blocks/Logical/LogicalNetwork1.png\"
alt=\"LogicalNetwork1.png\">
</div>

Expand Down
Loading