diff --git a/Modelica/Electrical/Machines/BasicMachines/Components/PartialAirGapDC.mo b/Modelica/Electrical/Machines/BasicMachines/Components/PartialAirGapDC.mo index 6bffbfa858..80b761583f 100644 --- a/Modelica/Electrical/Machines/BasicMachines/Components/PartialAirGapDC.mo +++ b/Modelica/Electrical/Machines/BasicMachines/Components/PartialAirGapDC.mo @@ -66,9 +66,10 @@ equation textString="A"),Rectangle( visible=quasiStatic, extent={{-10,90},{10,-80}}, - lineColor={170,213,255}, + lineColor={0,0,0}, fillPattern=FillPattern.VerticalCylinder, - fillColor={170,213,255})}), Documentation(info=" + fillColor={170,213,255}, + pattern=LinePattern.None)}),Documentation(info=" Linear model of the airgap (without saturation effects) of a DC machine, using only equations.
Induced excitation voltage is calculated from der(flux), where flux is defined by excitation inductance times excitation current. If quasiStatic == false, the electrical transients are neglected, i.e., the induced excitation voltage is zero.
diff --git a/Modelica/Electrical/Machines/BasicMachines/Transformers/package.mo b/Modelica/Electrical/Machines/BasicMachines/Transformers/package.mo index eec11d56b2..b0f447394e 100644 --- a/Modelica/Electrical/Machines/BasicMachines/Transformers/package.mo +++ b/Modelica/Electrical/Machines/BasicMachines/Transformers/package.mo @@ -102,38 +102,44 @@ even though the source's and/or load's starpoint are grounded; you may use a rea -60,-50},{-80,-70}}), Rectangle( origin={10,10}, - lineColor={128,0,255}, + lineColor={0,0,0}, fillColor={128,0,255}, fillPattern=FillPattern.VerticalCylinder, - extent={{-88,-46},{-52,26}}), + extent={{-88,-46},{-52,26}}, + pattern=LinePattern.None), Rectangle( origin={10,10}, - lineColor={0,128,255}, + lineColor={0,0,0}, fillColor={0,128,255}, fillPattern=FillPattern.VerticalCylinder, - extent={{-94,-38},{-46,18}}), + extent={{-94,-38},{-46,18}}, + pattern=LinePattern.None), Rectangle( origin={10,10}, - lineColor={128,0,255}, + lineColor={0,0,0}, fillColor={128,0,255}, fillPattern=FillPattern.VerticalCylinder, - extent={{-28,-46},{8,26}}), + extent={{-28,-46},{8,26}}, + pattern=LinePattern.None), Rectangle( origin={10,10}, - lineColor={0,128,255}, + lineColor={0,0,0}, fillColor={0,128,255}, fillPattern=FillPattern.VerticalCylinder, - extent={{-34,-38},{14,18}}), + extent={{-34,-38},{14,18}}, + pattern=LinePattern.None), Rectangle( origin={10,10}, - lineColor={128,0,255}, + lineColor={0,0,0}, fillColor={128,0,255}, fillPattern=FillPattern.VerticalCylinder, - extent={{32,-46},{68,26}}), + extent={{32,-46},{68,26}}, + pattern=LinePattern.None), Rectangle( origin={10,10}, - lineColor={0,128,255}, + lineColor={0,0,0}, fillColor={0,128,255}, fillPattern=FillPattern.VerticalCylinder, - extent={{26,-38},{74,18}})})); + extent={{26,-38},{74,18}}, + pattern=LinePattern.None)})); end Transformers; diff --git a/Modelica/Electrical/Machines/Icons/QuasiStaticTransformer.mo b/Modelica/Electrical/Machines/Icons/QuasiStaticTransformer.mo index 6c1c3d0779..950b82511e 100644 --- a/Modelica/Electrical/Machines/Icons/QuasiStaticTransformer.mo +++ b/Modelica/Electrical/Machines/Icons/QuasiStaticTransformer.mo @@ -3,46 +3,63 @@ partial model QuasiStaticTransformer annotation (Icon(graphics={Polygon( points={{-70,60},{-50,40},{-50,-40},{-70,-60},{-70,60}}, fillColor={135,135,135}, - fillPattern=FillPattern.VerticalCylinder),Polygon( + fillPattern=FillPattern.VerticalCylinder), + Polygon( points={{70,60},{50,40},{50,-40},{70,-60},{70,60}}, fillColor={135,135,135}, - fillPattern=FillPattern.VerticalCylinder),Polygon( + fillPattern=FillPattern.VerticalCylinder), + Polygon( points={{0,50},{-10,40},{-10,-40},{0,-50},{10,-40},{10,40},{0, 50}}, fillPattern=FillPattern.VerticalCylinder, - fillColor={135,135,135}),Polygon( + fillColor={135,135,135}), + Polygon( points={{-70,60},{70,60},{50,40},{10,40},{0,50},{-10,40},{-50, 40},{-70,60}}, fillPattern=FillPattern.VerticalCylinder, - fillColor={135,135,135}),Polygon( + fillColor={135,135,135}), + Polygon( points={{-70,-60},{70,-60},{50,-40},{10,-40},{0,-50},{-10,-40}, {-50,-40},{-70,-60}}, fillPattern=FillPattern.VerticalCylinder, - fillColor={135,135,135}),Rectangle( + fillColor={135,135,135}), + Rectangle( extent={{-78,36},{-42,-36}}, - lineColor={213,170,255}, + lineColor={0,0,0}, fillPattern=FillPattern.VerticalCylinder, - fillColor={213,170,255}),Rectangle( + fillColor={213,170,255}, + pattern=LinePattern.None), + Rectangle( extent={{-84,28},{-36,-28}}, - lineColor={170,213,255}, + lineColor={0,0,0}, fillPattern=FillPattern.VerticalCylinder, - fillColor={170,213,255}),Rectangle( + fillColor={170,213,255}, + pattern=LinePattern.None), + Rectangle( extent={{-18,36},{18,-36}}, - lineColor={213,170,255}, + lineColor={0,0,0}, fillPattern=FillPattern.VerticalCylinder, - fillColor={213,170,255}),Rectangle( + fillColor={213,170,255}, + pattern=LinePattern.None), + Rectangle( extent={{-24,28},{24,-28}}, - lineColor={170,213,255}, + lineColor={0,0,0}, fillPattern=FillPattern.VerticalCylinder, - fillColor={170,213,255}),Rectangle( + fillColor={170,213,255}, + pattern=LinePattern.None), + Rectangle( extent={{42,36},{78,-36}}, - lineColor={213,170,255}, + lineColor={0,0,0}, fillPattern=FillPattern.VerticalCylinder, - fillColor={213,170,255}),Rectangle( + fillColor={213,170,255}, + pattern=LinePattern.None), + Rectangle( extent={{36,28},{84,-28}}, - lineColor={170,213,255}, + lineColor={0,0,0}, fillPattern=FillPattern.VerticalCylinder, - fillColor={170,213,255})}), Documentation(info=" + fillColor={170,213,255}, + pattern=LinePattern.None)}), + Documentation(info="

This icon is designed for a quasi-static transformer model.

diff --git a/Modelica/Electrical/Machines/Icons/TransientTransformer.mo b/Modelica/Electrical/Machines/Icons/TransientTransformer.mo index 2052f4bcbe..a968b14cd3 100644 --- a/Modelica/Electrical/Machines/Icons/TransientTransformer.mo +++ b/Modelica/Electrical/Machines/Icons/TransientTransformer.mo @@ -3,46 +3,63 @@ model TransientTransformer annotation (Icon(graphics={Polygon( points={{-70,60},{-50,40},{-50,-40},{-70,-60},{-70,60}}, fillColor={135,135,135}, - fillPattern=FillPattern.VerticalCylinder),Polygon( + fillPattern=FillPattern.VerticalCylinder), + Polygon( points={{70,60},{50,40},{50,-40},{70,-60},{70,60}}, fillColor={135,135,135}, - fillPattern=FillPattern.VerticalCylinder),Polygon( + fillPattern=FillPattern.VerticalCylinder), + Polygon( points={{0,50},{-10,40},{-10,-40},{0,-50},{10,-40},{10,40},{0, 50}}, fillPattern=FillPattern.VerticalCylinder, - fillColor={135,135,135}),Polygon( + fillColor={135,135,135}), + Polygon( points={{-70,60},{70,60},{50,40},{10,40},{0,50},{-10,40},{-50, 40},{-70,60}}, fillPattern=FillPattern.VerticalCylinder, - fillColor={135,135,135}),Polygon( + fillColor={135,135,135}), + Polygon( points={{-70,-60},{70,-60},{50,-40},{10,-40},{0,-50},{-10,-40}, {-50,-40},{-70,-60}}, fillPattern=FillPattern.VerticalCylinder, - fillColor={135,135,135}),Rectangle( + fillColor={135,135,135}), + Rectangle( extent={{-78,36},{-42,-36}}, - lineColor={128,0,255}, + lineColor={0,0,0}, fillPattern=FillPattern.VerticalCylinder, - fillColor={128,0,255}),Rectangle( + fillColor={128,0,255}, + pattern=LinePattern.None), + Rectangle( extent={{-84,28},{-36,-28}}, - lineColor={0,128,255}, + lineColor={0,0,0}, fillPattern=FillPattern.VerticalCylinder, - fillColor={0,128,255}),Rectangle( + fillColor={0,128,255}, + pattern=LinePattern.None), + Rectangle( extent={{-18,36},{18,-36}}, - lineColor={128,0,255}, + lineColor={0,0,0}, fillPattern=FillPattern.VerticalCylinder, - fillColor={128,0,255}),Rectangle( + fillColor={128,0,255}, + pattern=LinePattern.None), + Rectangle( extent={{-24,28},{24,-28}}, - lineColor={0,128,255}, + lineColor={0,0,0}, fillPattern=FillPattern.VerticalCylinder, - fillColor={0,128,255}),Rectangle( + fillColor={0,128,255}, + pattern=LinePattern.None), + Rectangle( extent={{42,36},{78,-36}}, - lineColor={128,0,255}, + lineColor={0,0,0}, fillPattern=FillPattern.VerticalCylinder, - fillColor={128,0,255}),Rectangle( + fillColor={128,0,255}, + pattern=LinePattern.None), + Rectangle( extent={{36,28},{84,-28}}, - lineColor={0,128,255}, + lineColor={0,0,0}, fillPattern=FillPattern.VerticalCylinder, - fillColor={0,128,255})}), Documentation(info=" + fillColor={0,128,255}, + pattern=LinePattern.None)}), + Documentation(info="

This icon is designed for a transient transformer model.

diff --git a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dd/package.mo b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dd/package.mo index 6282d33fef..d044b6006d 100644 --- a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dd/package.mo +++ b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dd/package.mo @@ -1,6 +1,7 @@ within Modelica.Electrical.QuasiStatic.Machines.BasicMachines.Transformers; package Dd "Transformers: primary D / secondary d" extends Modelica.Icons.VariantsPackage; + annotation (Documentation(info=" This package contains transformers primary D connected / secondary d connected in all possible vector groups. ", diff --git a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dy/package.mo b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dy/package.mo index e50b5d7aca..3424276666 100644 --- a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dy/package.mo +++ b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dy/package.mo @@ -1,6 +1,7 @@ within Modelica.Electrical.QuasiStatic.Machines.BasicMachines.Transformers; package Dy "Transformers: primary D / secondary y" extends Modelica.Icons.VariantsPackage; + annotation (Documentation(info=" This package contains transformers primary D connected / secondary y connected in all possible vector groups. ", diff --git a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dz/package.mo b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dz/package.mo index c809e36356..424bf418ca 100644 --- a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dz/package.mo +++ b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dz/package.mo @@ -1,6 +1,7 @@ within Modelica.Electrical.QuasiStatic.Machines.BasicMachines.Transformers; package Dz "Transformers: primary D / secondary zig-zag" extends Modelica.Icons.VariantsPackage; + annotation (Documentation(info=" This package contains transformers primary D connected / secondary d connected in all possible vector groups. ", diff --git a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yd/package.mo b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yd/package.mo index 9e0ade9125..eedf1f6137 100644 --- a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yd/package.mo +++ b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yd/package.mo @@ -1,6 +1,7 @@ within Modelica.Electrical.QuasiStatic.Machines.BasicMachines.Transformers; package Yd "Transformers: primary Y / secondary d" extends Modelica.Icons.VariantsPackage; + annotation (Documentation(info=" This package contains transformers primary Y connected / secondary d connected in all possible vector groups. ", diff --git a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yy/package.mo b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yy/package.mo index b6483a492c..d5b7d842ef 100644 --- a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yy/package.mo +++ b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yy/package.mo @@ -1,6 +1,7 @@ within Modelica.Electrical.QuasiStatic.Machines.BasicMachines.Transformers; package Yy "Transformers: primary Y / secondary y" extends Modelica.Icons.VariantsPackage; + annotation (Documentation(info=" This package contains transformers primary Y connected / secondary y connected in all possible vector groups. ", diff --git a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yz/package.mo b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yz/package.mo index e36d7fbfb3..ce88fc0d2a 100644 --- a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yz/package.mo +++ b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yz/package.mo @@ -1,6 +1,7 @@ within Modelica.Electrical.QuasiStatic.Machines.BasicMachines.Transformers; package Yz "Transformers: primary Y / secondary zig-zag" extends Modelica.Icons.VariantsPackage; + annotation (Documentation(info=" This package contains transformers primary Y connected / secondary zig-zag connected in all possible vector groups. ", diff --git a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/package.mo b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/package.mo index 1e52751fd5..b304ff1bb0 100644 --- a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/package.mo +++ b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/package.mo @@ -1,6 +1,7 @@ within Modelica.Electrical.QuasiStatic.Machines.BasicMachines; package Transformers "Library for technical 3phase transformers" extends Modelica.Icons.Package; + annotation (Documentation(info=" This package contains components to model technical three-phase transformers: