diff --git a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Initialize.mo b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Initialize.mo
index 8e978c76db..c5fc877658 100644
--- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Initialize.mo
+++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Initialize.mo
@@ -169,7 +169,10 @@ equation
connect(terminalBox.starpoint, starMachine.plug_p) annotation (Line(points={{-20,-38},{-40,-38},{-40,-52}}, color={0,0,255}));
connect(starMachine.pin_n, ground.p) annotation (Line(points={{-40,-72},{-40,-80},{-70,-80}}, color={0,0,255}));
connect(starMachineQS.pin_n, groundQS.pin) annotation (Line(points={{-40,28},{-40,20},{-70,20}}, color={85,170,255}));
- annotation (experiment(StopTime=1.5, Interval=0.00001, Tolerance=1e-06), Documentation(
+ annotation (experiment(
+ StopTime=1.5,
+ Interval=0.0001,
+ Tolerance=1e-06), Documentation(
info="
Test example: Steady-State Initialization of an induction machine with squirrel cage
The induction machine with squirrel cage is initialized in steady-state at no-load;
diff --git a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_withLosses.mo b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_withLosses.mo
index 2832e9520d..d6aa8c4e04 100644
--- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_withLosses.mo
+++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_withLosses.mo
@@ -153,7 +153,7 @@ equation
annotation (
experiment(
StopTime=10,
- Interval=0.0001,
+ Interval=0.01,
Tolerance=1e-06),
Documentation(info="
diff --git a/Modelica/Resources/Reference/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Conveyor/comparisonSignals.txt b/Modelica/Resources/Reference/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Conveyor/comparisonSignals.txt
index af4fc9be58..cfab01e7f9 100644
--- a/Modelica/Resources/Reference/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Conveyor/comparisonSignals.txt
+++ b/Modelica/Resources/Reference/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Conveyor/comparisonSignals.txt
@@ -1,12 +1,3 @@
time
-imc.rotorCage.electroMagneticConverter.singlePhaseElectroMagneticConverter[1].Phi.re
-imc.rotorCage.electroMagneticConverter.singlePhaseElectroMagneticConverter[2].Phi.im
-imc.stator.electroMagneticConverter.singlePhaseElectroMagneticConverter[1].Phi.re
-imc.stator.electroMagneticConverter.singlePhaseElectroMagneticConverter[2].Phi.im
-// imc.stator.zeroInductor.i0
-imcQS.rotorCage.port_p.reference.gamma
-mass.s
mass.v
-massQS.s
massQS.v
-vfController.x
diff --git a/Modelica/Resources/Reference/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Initialize/comparisonSignals.txt b/Modelica/Resources/Reference/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Initialize/comparisonSignals.txt
index abcee2ec69..29434db071 100644
--- a/Modelica/Resources/Reference/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Initialize/comparisonSignals.txt
+++ b/Modelica/Resources/Reference/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Initialize/comparisonSignals.txt
@@ -1,17 +1,3 @@
time
-imc.airGap.V_mrr.im
-imc.airGap.V_mrr.re
-imc.airGap.V_msr.im
-imc.airGap.V_msr.re
-imc.rotorCage.electroMagneticConverter.singlePhaseElectroMagneticConverter[1].Phi.re
-imc.rotorCage.electroMagneticConverter.singlePhaseElectroMagneticConverter[2].Phi.im
-imc.stator.electroMagneticConverter.singlePhaseElectroMagneticConverter[1].Phi.re
-imc.stator.electroMagneticConverter.singlePhaseElectroMagneticConverter[2].Phi.im
-imc.stator.port_p.V_m.im
-imc.stator.port_p.V_m.re
-// imc.stator.zeroInductor.i0
-imcQS.rotorCage.port_p.reference.gamma
-loadInertia.phi
loadInertia.w
-loadInertiaQS.phi
loadInertiaQS.w
diff --git a/Modelica/Resources/Reference/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Transformer/comparisonSignals.txt b/Modelica/Resources/Reference/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Transformer/comparisonSignals.txt
index 02aeeeefc6..29434db071 100644
--- a/Modelica/Resources/Reference/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Transformer/comparisonSignals.txt
+++ b/Modelica/Resources/Reference/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Transformer/comparisonSignals.txt
@@ -1,13 +1,3 @@
time
-imc.rotorCage.electroMagneticConverter.singlePhaseElectroMagneticConverter[1].Phi.re
-imc.rotorCage.electroMagneticConverter.singlePhaseElectroMagneticConverter[2].Phi.im
-imc.stator.electroMagneticConverter.singlePhaseElectroMagneticConverter[1].Phi.re
-imc.stator.electroMagneticConverter.singlePhaseElectroMagneticConverter[2].Phi.im
-// imc.stator.zeroInductor.i0
-imcQS.rotorCage.port_p.reference.gamma
-loadInertia.phi
loadInertia.w
-loadInertiaQS.phi
loadInertiaQS.w
-transformer.l2sigma.inductor[1].i
-transformer.l2sigma.inductor[3].i
diff --git a/Modelica/Resources/Reference/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_YD/comparisonSignals.txt b/Modelica/Resources/Reference/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_YD/comparisonSignals.txt
index b3bf54d566..29434db071 100644
--- a/Modelica/Resources/Reference/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_YD/comparisonSignals.txt
+++ b/Modelica/Resources/Reference/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_YD/comparisonSignals.txt
@@ -1,11 +1,3 @@
time
-imc.rotorCage.electroMagneticConverter.singlePhaseElectroMagneticConverter[1].Phi.re
-imc.rotorCage.electroMagneticConverter.singlePhaseElectroMagneticConverter[2].Phi.im
-imc.stator.electroMagneticConverter.singlePhaseElectroMagneticConverter[1].Phi.re
-imc.stator.electroMagneticConverter.singlePhaseElectroMagneticConverter[2].Phi.im
-// imc.stator.zeroInductor.i0
-imcQS.rotorCage.port_p.reference.gamma
-loadInertia.phi
loadInertia.w
-loadInertiaQS.phi
loadInertiaQS.w
diff --git a/Modelica/Resources/Reference/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMEE_Generator/comparisonSignals.txt b/Modelica/Resources/Reference/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMEE_Generator/comparisonSignals.txt
index 864b0ba25d..1713a2764c 100644
--- a/Modelica/Resources/Reference/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMEE_Generator/comparisonSignals.txt
+++ b/Modelica/Resources/Reference/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMEE_Generator/comparisonSignals.txt
@@ -1,10 +1,3 @@
time
-constantSpeed.phi
-constantSpeedQS.phi
-smee.excitation.electroMagneticConverter.Phi.re
-smee.stator.electroMagneticConverter.singlePhaseElectroMagneticConverter[1].Phi.re
-smee.stator.electroMagneticConverter.singlePhaseElectroMagneticConverter[2].Phi.im
-smee.stator.stray.port_p.Phi.im
-smee.stator.stray.port_p.Phi.re
-// smee.stator.zeroInductor.i0
-smeeQS.short.port_p.reference.gamma
+Ptr
+Pqs
diff --git a/Modelica/Resources/Reference/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMPM_CurrentSource/comparisonSignals.txt b/Modelica/Resources/Reference/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMPM_CurrentSource/comparisonSignals.txt
index 52f5422dba..c0545c6cad 100644
--- a/Modelica/Resources/Reference/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMPM_CurrentSource/comparisonSignals.txt
+++ b/Modelica/Resources/Reference/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMPM_CurrentSource/comparisonSignals.txt
@@ -1,17 +1,3 @@
time
-inertiaLoad.phi
inertiaLoad.w
-inertiaLoadQS.phi
inertiaLoadQS.w
-terminalBoxQS.plugSupply.pin[1].v.re
-terminalBoxQS.plugSupply.pin[1].v.im
-terminalBoxQS.plugSupply.pin[1].i.re
-terminalBoxQS.plugSupply.pin[1].i.im
-terminalBoxQS.plugSupply.pin[2].v.re
-terminalBoxQS.plugSupply.pin[2].v.im
-terminalBoxQS.plugSupply.pin[2].i.re
-terminalBoxQS.plugSupply.pin[2].i.im
-terminalBoxQS.plugSupply.pin[3].v.re
-terminalBoxQS.plugSupply.pin[3].v.im
-terminalBoxQS.plugSupply.pin[3].i.re
-terminalBoxQS.plugSupply.pin[3].i.im
diff --git a/ModelicaTest/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Conveyor.mo b/ModelicaTest/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Conveyor.mo
new file mode 100644
index 0000000000..e173d0c2ee
--- /dev/null
+++ b/ModelicaTest/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Conveyor.mo
@@ -0,0 +1,16 @@
+within ModelicaTest.Magnetic.QuasiStatic.FundamentalWave.Examples.BasicMachines.InductionMachines;
+model IMC_Conveyor "Induction machine with squirrel cage and inverter driving a conveyor"
+ extends Modelica.Magnetic.QuasiStatic.FundamentalWave.Examples.BasicMachines.InductionMachines.IMC_Conveyor;
+ annotation (experiment(StopTime=5.00, Interval=0.0001, Tolerance=1e-06),
+ TestCase(shouldPass = true,
+ __ModelicaAssociation(Comparison(TimeWindows={TimeSlot(4.00, 5.00)}))),
+ Diagram(graphics={
+ Text(
+ extent={{20,60},{100,52}},
+ textStyle={TextStyle.Bold},
+ textString="%m phase quasi-static"),
+ Text(
+ extent={{20,-40},{100,-48}},
+ textStyle={TextStyle.Bold},
+ textString="%m phase transient")}));
+end IMC_Conveyor;
diff --git a/ModelicaTest/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Initialize.mo b/ModelicaTest/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Initialize.mo
new file mode 100644
index 0000000000..f52137c32f
--- /dev/null
+++ b/ModelicaTest/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Initialize.mo
@@ -0,0 +1,19 @@
+within ModelicaTest.Magnetic.QuasiStatic.FundamentalWave.Examples.BasicMachines.InductionMachines;
+model IMC_Initialize "Steady-state initialization of induction machine with squirrel cage"
+ extends Modelica.Magnetic.QuasiStatic.FundamentalWave.Examples.BasicMachines.InductionMachines.IMC_Initialize;
+ annotation (experiment(
+ StopTime=0.60,
+ Interval=0.0001,
+ Tolerance=1e-06),
+ TestCase(shouldPass = true,
+ __ModelicaAssociation(Comparison(TimeWindows={TimeSlot(0.45, 0.60)}))),
+ Diagram(graphics={
+ Text(
+ extent={{20,8},{100,0}},
+ textStyle={TextStyle.Bold},
+ textString="%m phase quasi-static"),
+ Text(
+ extent={{20,-92},{100,-100}},
+ textStyle={TextStyle.Bold},
+ textString="%m phase transient")}));
+end IMC_Initialize;
diff --git a/ModelicaTest/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Transformer.mo b/ModelicaTest/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Transformer.mo
new file mode 100644
index 0000000000..782c433c2b
--- /dev/null
+++ b/ModelicaTest/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Transformer.mo
@@ -0,0 +1,16 @@
+within ModelicaTest.Magnetic.QuasiStatic.FundamentalWave.Examples.BasicMachines.InductionMachines;
+model IMC_Transformer "Induction machine with squirrel cage starting with transformer"
+ extends Modelica.Magnetic.QuasiStatic.FundamentalWave.Examples.BasicMachines.InductionMachines.IMC_Transformer;
+ annotation (experiment(StopTime=2.1, Interval=0.0001, Tolerance=1e-06),
+ TestCase(shouldPass = true,
+ __ModelicaAssociation(Comparison(TimeWindows={TimeSlot(2.00, 2.10)}))),
+ Diagram(graphics={
+ Text(
+ extent={{80,8},{160,0}},
+ textStyle={TextStyle.Bold},
+ textString="%m phase quasi-static"),
+ Text(
+ extent={{80,-92},{160,-100}},
+ textStyle={TextStyle.Bold},
+ textString="%m phase transient")}));
+end IMC_Transformer;
diff --git a/ModelicaTest/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_YD.mo b/ModelicaTest/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_YD.mo
new file mode 100644
index 0000000000..f021d8c028
--- /dev/null
+++ b/ModelicaTest/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_YD.mo
@@ -0,0 +1,15 @@
+within ModelicaTest.Magnetic.QuasiStatic.FundamentalWave.Examples.BasicMachines.InductionMachines;
+model IMC_YD "Induction machine with squirrel cage starting Y-D"
+ extends Modelica.Magnetic.QuasiStatic.FundamentalWave.Examples.BasicMachines.InductionMachines.IMC_YD;
+ annotation (experiment(StopTime=2.1,Interval=0.0001,Tolerance=1e-06),
+ TestCase(shouldPass = true,
+ __ModelicaAssociation(Comparison(TimeWindows={TimeSlot(2.00, 2.10)}))),
+ Diagram(graphics={
+ Text(
+ extent={{-60,20},{20,12}},
+ textStyle={TextStyle.Bold},
+ textString="%m phase quasi-static"), Text(
+ extent={{-60,-80},{20,-88}},
+ textStyle={TextStyle.Bold},
+ textString="%m phase transient")}));
+end IMC_YD;
diff --git a/ModelicaTest/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/package.mo b/ModelicaTest/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/package.mo
new file mode 100644
index 0000000000..1a6878bee7
--- /dev/null
+++ b/ModelicaTest/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/package.mo
@@ -0,0 +1,4 @@
+within ModelicaTest.Magnetic.QuasiStatic.FundamentalWave.Examples.BasicMachines;
+package InductionMachines "Modelica.Icons.ExamplesPackage"
+ extends Modelica.Icons.ExamplesPackage;
+end InductionMachines;
diff --git a/ModelicaTest/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/package.order b/ModelicaTest/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/package.order
new file mode 100644
index 0000000000..c3cc382482
--- /dev/null
+++ b/ModelicaTest/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/package.order
@@ -0,0 +1,4 @@
+IMC_YD
+IMC_Transformer
+IMC_Conveyor
+IMC_Initialize
diff --git a/ModelicaTest/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMEE_Generator.mo b/ModelicaTest/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMEE_Generator.mo
new file mode 100644
index 0000000000..bbde063524
--- /dev/null
+++ b/ModelicaTest/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMEE_Generator.mo
@@ -0,0 +1,22 @@
+within ModelicaTest.Magnetic.QuasiStatic.FundamentalWave.Examples.BasicMachines.SynchronousMachines;
+model SMEE_Generator "Electrical excited synchronous machine operating as generator"
+ extends Modelica.Magnetic.QuasiStatic.FundamentalWave.Examples.BasicMachines.SynchronousMachines.SMEE_Generator;
+ annotation (
+ experiment(
+ StopTime=15.1,
+ Interval=1E-4,
+ Tolerance=1e-06),
+ TestCase(shouldPass = true,
+ __ModelicaAssociation(Comparison(TimeWindows={TimeSlot(14.9, 15.1)}))),
+ Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,
+ -100},{100,100}}),
+ graphics={ Text(
+ extent={{20,8},{100,0}},
+ textStyle={TextStyle.Bold},
+ textString="%m phase quasi-static",
+ textColor={0,0,0}), Text(
+ extent={{20,-92},{100,-100}},
+ textStyle={TextStyle.Bold},
+ textString="%m phase transient",
+ textColor={0,0,0})}));
+end SMEE_Generator;
diff --git a/ModelicaTest/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMPM_CurrentSource.mo b/ModelicaTest/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMPM_CurrentSource.mo
new file mode 100644
index 0000000000..d4e644b6d0
--- /dev/null
+++ b/ModelicaTest/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMPM_CurrentSource.mo
@@ -0,0 +1,17 @@
+within ModelicaTest.Magnetic.QuasiStatic.FundamentalWave.Examples.BasicMachines.SynchronousMachines;
+model SMPM_CurrentSource "Test example: PermanentMagnetSynchronousMachine fed by current source"
+ extends Modelica.Magnetic.QuasiStatic.FundamentalWave.Examples.BasicMachines.SynchronousMachines.SMPM_CurrentSource;
+ annotation (
+ experiment(StopTime=0.20, Interval=1E-4, Tolerance=1E-6),
+ TestCase(shouldPass = true,
+ __ModelicaAssociation(Comparison(TimeWindows={TimeSlot(0.00, 0.20)}))),
+ Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,
+ -100},{100,100}}), graphics={
+ Text(
+ extent={{30,48},{110,40}},
+ textStyle={TextStyle.Bold},
+ textString="%m phase quasi-static"), Text(
+ extent={{30,-52},{110,-60}},
+ textStyle={TextStyle.Bold},
+ textString="%m phase transient")}));
+end SMPM_CurrentSource;
diff --git a/ModelicaTest/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/package.mo b/ModelicaTest/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/package.mo
new file mode 100644
index 0000000000..3a0a9bbfe3
--- /dev/null
+++ b/ModelicaTest/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/package.mo
@@ -0,0 +1,4 @@
+within ModelicaTest.Magnetic.QuasiStatic.FundamentalWave.Examples.BasicMachines;
+package SynchronousMachines
+ extends Modelica.Icons.ExamplesPackage;
+end SynchronousMachines;
diff --git a/ModelicaTest/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/package.order b/ModelicaTest/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/package.order
new file mode 100644
index 0000000000..34bf0a6c1a
--- /dev/null
+++ b/ModelicaTest/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/package.order
@@ -0,0 +1,2 @@
+SMPM_CurrentSource
+SMEE_Generator
diff --git a/ModelicaTest/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/package.mo b/ModelicaTest/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/package.mo
new file mode 100644
index 0000000000..5b9de0a3a4
--- /dev/null
+++ b/ModelicaTest/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/package.mo
@@ -0,0 +1,4 @@
+within ModelicaTest.Magnetic.QuasiStatic.FundamentalWave.Examples;
+package BasicMachines
+ extends Modelica.Icons.ExamplesPackage;
+end BasicMachines;
diff --git a/ModelicaTest/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/package.order b/ModelicaTest/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/package.order
new file mode 100644
index 0000000000..d6e4f818da
--- /dev/null
+++ b/ModelicaTest/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/package.order
@@ -0,0 +1,2 @@
+InductionMachines
+SynchronousMachines
diff --git a/ModelicaTest/Magnetic/QuasiStatic/FundamentalWave/Examples/package.mo b/ModelicaTest/Magnetic/QuasiStatic/FundamentalWave/Examples/package.mo
new file mode 100644
index 0000000000..62973c49bf
--- /dev/null
+++ b/ModelicaTest/Magnetic/QuasiStatic/FundamentalWave/Examples/package.mo
@@ -0,0 +1,4 @@
+within ModelicaTest.Magnetic.QuasiStatic.FundamentalWave;
+package Examples
+ extends Modelica.Icons.ExamplesPackage;
+end Examples;
diff --git a/ModelicaTest/Magnetic/QuasiStatic/FundamentalWave/Examples/package.order b/ModelicaTest/Magnetic/QuasiStatic/FundamentalWave/Examples/package.order
new file mode 100644
index 0000000000..e727ddd7e8
--- /dev/null
+++ b/ModelicaTest/Magnetic/QuasiStatic/FundamentalWave/Examples/package.order
@@ -0,0 +1 @@
+BasicMachines
diff --git a/ModelicaTest/Magnetic/QuasiStatic/FundamentalWave/package.mo b/ModelicaTest/Magnetic/QuasiStatic/FundamentalWave/package.mo
new file mode 100644
index 0000000000..c8d36005af
--- /dev/null
+++ b/ModelicaTest/Magnetic/QuasiStatic/FundamentalWave/package.mo
@@ -0,0 +1,4 @@
+within ModelicaTest.Magnetic.QuasiStatic;
+package FundamentalWave
+ extends Modelica.Icons.ExamplesPackage;
+end FundamentalWave;
diff --git a/ModelicaTest/Magnetic/QuasiStatic/FundamentalWave/package.order b/ModelicaTest/Magnetic/QuasiStatic/FundamentalWave/package.order
new file mode 100644
index 0000000000..ad6b7fb4b6
--- /dev/null
+++ b/ModelicaTest/Magnetic/QuasiStatic/FundamentalWave/package.order
@@ -0,0 +1 @@
+Examples
diff --git a/ModelicaTest/Magnetic/QuasiStatic/package.order b/ModelicaTest/Magnetic/QuasiStatic/package.order
index 2a1bd553ba..a0f9826444 100644
--- a/ModelicaTest/Magnetic/QuasiStatic/package.order
+++ b/ModelicaTest/Magnetic/QuasiStatic/package.order
@@ -1 +1,2 @@
FluxTubes
+FundamentalWave
diff --git a/ModelicaTest/Resources/Reference/ModelicaTest/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Conveyor/comparisonSignals.txt b/ModelicaTest/Resources/Reference/ModelicaTest/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Conveyor/comparisonSignals.txt
new file mode 100644
index 0000000000..af4fc9be58
--- /dev/null
+++ b/ModelicaTest/Resources/Reference/ModelicaTest/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Conveyor/comparisonSignals.txt
@@ -0,0 +1,12 @@
+time
+imc.rotorCage.electroMagneticConverter.singlePhaseElectroMagneticConverter[1].Phi.re
+imc.rotorCage.electroMagneticConverter.singlePhaseElectroMagneticConverter[2].Phi.im
+imc.stator.electroMagneticConverter.singlePhaseElectroMagneticConverter[1].Phi.re
+imc.stator.electroMagneticConverter.singlePhaseElectroMagneticConverter[2].Phi.im
+// imc.stator.zeroInductor.i0
+imcQS.rotorCage.port_p.reference.gamma
+mass.s
+mass.v
+massQS.s
+massQS.v
+vfController.x
diff --git a/ModelicaTest/Resources/Reference/ModelicaTest/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Initialize/comparisonSignals.txt b/ModelicaTest/Resources/Reference/ModelicaTest/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Initialize/comparisonSignals.txt
new file mode 100644
index 0000000000..abcee2ec69
--- /dev/null
+++ b/ModelicaTest/Resources/Reference/ModelicaTest/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Initialize/comparisonSignals.txt
@@ -0,0 +1,17 @@
+time
+imc.airGap.V_mrr.im
+imc.airGap.V_mrr.re
+imc.airGap.V_msr.im
+imc.airGap.V_msr.re
+imc.rotorCage.electroMagneticConverter.singlePhaseElectroMagneticConverter[1].Phi.re
+imc.rotorCage.electroMagneticConverter.singlePhaseElectroMagneticConverter[2].Phi.im
+imc.stator.electroMagneticConverter.singlePhaseElectroMagneticConverter[1].Phi.re
+imc.stator.electroMagneticConverter.singlePhaseElectroMagneticConverter[2].Phi.im
+imc.stator.port_p.V_m.im
+imc.stator.port_p.V_m.re
+// imc.stator.zeroInductor.i0
+imcQS.rotorCage.port_p.reference.gamma
+loadInertia.phi
+loadInertia.w
+loadInertiaQS.phi
+loadInertiaQS.w
diff --git a/ModelicaTest/Resources/Reference/ModelicaTest/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Transformer/comparisonSignals.txt b/ModelicaTest/Resources/Reference/ModelicaTest/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Transformer/comparisonSignals.txt
new file mode 100644
index 0000000000..02aeeeefc6
--- /dev/null
+++ b/ModelicaTest/Resources/Reference/ModelicaTest/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Transformer/comparisonSignals.txt
@@ -0,0 +1,13 @@
+time
+imc.rotorCage.electroMagneticConverter.singlePhaseElectroMagneticConverter[1].Phi.re
+imc.rotorCage.electroMagneticConverter.singlePhaseElectroMagneticConverter[2].Phi.im
+imc.stator.electroMagneticConverter.singlePhaseElectroMagneticConverter[1].Phi.re
+imc.stator.electroMagneticConverter.singlePhaseElectroMagneticConverter[2].Phi.im
+// imc.stator.zeroInductor.i0
+imcQS.rotorCage.port_p.reference.gamma
+loadInertia.phi
+loadInertia.w
+loadInertiaQS.phi
+loadInertiaQS.w
+transformer.l2sigma.inductor[1].i
+transformer.l2sigma.inductor[3].i
diff --git a/ModelicaTest/Resources/Reference/ModelicaTest/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_YD/comparisonSignals.txt b/ModelicaTest/Resources/Reference/ModelicaTest/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_YD/comparisonSignals.txt
new file mode 100644
index 0000000000..b3bf54d566
--- /dev/null
+++ b/ModelicaTest/Resources/Reference/ModelicaTest/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_YD/comparisonSignals.txt
@@ -0,0 +1,11 @@
+time
+imc.rotorCage.electroMagneticConverter.singlePhaseElectroMagneticConverter[1].Phi.re
+imc.rotorCage.electroMagneticConverter.singlePhaseElectroMagneticConverter[2].Phi.im
+imc.stator.electroMagneticConverter.singlePhaseElectroMagneticConverter[1].Phi.re
+imc.stator.electroMagneticConverter.singlePhaseElectroMagneticConverter[2].Phi.im
+// imc.stator.zeroInductor.i0
+imcQS.rotorCage.port_p.reference.gamma
+loadInertia.phi
+loadInertia.w
+loadInertiaQS.phi
+loadInertiaQS.w
diff --git a/ModelicaTest/Resources/Reference/ModelicaTest/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMEE_Generator/comparisonSignals.txt b/ModelicaTest/Resources/Reference/ModelicaTest/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMEE_Generator/comparisonSignals.txt
new file mode 100644
index 0000000000..ec9c9f2aca
--- /dev/null
+++ b/ModelicaTest/Resources/Reference/ModelicaTest/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMEE_Generator/comparisonSignals.txt
@@ -0,0 +1,12 @@
+time
+constantSpeed.phi
+constantSpeedQS.phi
+smee.excitation.electroMagneticConverter.Phi.re
+smee.stator.electroMagneticConverter.singlePhaseElectroMagneticConverter[1].Phi.re
+smee.stator.electroMagneticConverter.singlePhaseElectroMagneticConverter[2].Phi.im
+smee.stator.stray.port_p.Phi.im
+smee.stator.stray.port_p.Phi.re
+// smee.stator.zeroInductor.i0
+smeeQS.short.port_p.reference.gamma
+theta
+thetaQS
diff --git a/ModelicaTest/Resources/Reference/ModelicaTest/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMPM_CurrentSource/comparisonSignals.txt b/ModelicaTest/Resources/Reference/ModelicaTest/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMPM_CurrentSource/comparisonSignals.txt
new file mode 100644
index 0000000000..52f5422dba
--- /dev/null
+++ b/ModelicaTest/Resources/Reference/ModelicaTest/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMPM_CurrentSource/comparisonSignals.txt
@@ -0,0 +1,17 @@
+time
+inertiaLoad.phi
+inertiaLoad.w
+inertiaLoadQS.phi
+inertiaLoadQS.w
+terminalBoxQS.plugSupply.pin[1].v.re
+terminalBoxQS.plugSupply.pin[1].v.im
+terminalBoxQS.plugSupply.pin[1].i.re
+terminalBoxQS.plugSupply.pin[1].i.im
+terminalBoxQS.plugSupply.pin[2].v.re
+terminalBoxQS.plugSupply.pin[2].v.im
+terminalBoxQS.plugSupply.pin[2].i.re
+terminalBoxQS.plugSupply.pin[2].i.im
+terminalBoxQS.plugSupply.pin[3].v.re
+terminalBoxQS.plugSupply.pin[3].v.im
+terminalBoxQS.plugSupply.pin[3].i.re
+terminalBoxQS.plugSupply.pin[3].i.im
diff --git a/ModelicaTest/package.order b/ModelicaTest/package.order
index d16b87c585..9f2afcba10 100644
--- a/ModelicaTest/package.order
+++ b/ModelicaTest/package.order
@@ -3,6 +3,7 @@ Blocks
Tables
Electrical
Fluid
+Magnetic
Media
Math
MultiBody
@@ -10,4 +11,3 @@ Rotational
Translational
Utilities
ComplexMath
-Magnetic