Reverting changes in hierarchy that are a breaking change

lvanfretti · lvanfretti · commit 1089057811cd · 2024-09-26T16:14:44.000-04:00
diff --git a/OpenIPSL/Electrical/Sources/CurrentSourceReImInput.mo b/OpenIPSL/Electrical/Sources/CurrentSourceReImInput.mo
@@ -1,4 +1,4 @@
-within OpenIPSL.Electrical.Sources.SourcesWithRealInputs;
+within OpenIPSL.Electrical.Sources;
 model CurrentSourceReImInput
   "Ideal current source with user defined real and imaginary parts of the current phasor"
   extends OpenIPSL.Electrical.Essentials.pfComponent(enableS_b = true);
diff --git a/OpenIPSL/Electrical/Sources/SourcesWithRealInputs/package.mo b/OpenIPSL/Electrical/Sources/SourcesWithRealInputs/package.mo
diff --git a/OpenIPSL/Electrical/Sources/SourcesWithRealInputs/package.order b/OpenIPSL/Electrical/Sources/SourcesWithRealInputs/package.order
diff --git a/OpenIPSL/Electrical/Sources/VoltageSourceReImInput.mo b/OpenIPSL/Electrical/Sources/VoltageSourceReImInput.mo
@@ -1,4 +1,4 @@
-within OpenIPSL.Electrical.Sources.SourcesWithRealInputs;
+within OpenIPSL.Electrical.Sources;
 model VoltageSourceReImInput
   "Ideal voltage source with user defined real and imaginary parts of the voltage phasor"
   extends OpenIPSL.Electrical.Essentials.pfComponent(enableS_b=true);
diff --git a/OpenIPSL/Electrical/Sources/package.order b/OpenIPSL/Electrical/Sources/package.order
@@ -1,2 +1,3 @@
+VoltageSourceReImInput
+CurrentSourceReImInput
 SourceBehindImpedance
-SourcesWithRealInputs
diff --git a/OpenIPSL/Tests/BaseClasses/SMIBAddOn.mo b/OpenIPSL/Tests/BaseClasses/SMIBAddOn.mo
@@ -32,8 +32,7 @@ partial model SMIBAddOn
     annotation (Placement(transformation(extent={{18,-10},{38,10}})));
   OpenIPSL.Electrical.Buses.Bus GEN2
     annotation (Placement(transformation(extent={{60,-10},{80,10}})));
-  Electrical.Sources.SourcesWithRealInputs.VoltageSourceReImInput
-    voltageSourceReImInput
+  Electrical.Sources.VoltageSourceReImInput voltageSourceReImInput
     annotation (Placement(transformation(extent={{96,-10},{76,10}})));
   Modelica.Blocks.Sources.RealExpression imagPart annotation (Placement(transformation(extent={{80,-30},{100,-10}})));
   Modelica.Blocks.Sources.RealExpression realPart(y=if time <= 50000 then 1 else 0.99) annotation (Placement(transformation(extent={{80,10},{100,30}})));

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-within OpenIPSL.Electrical.Sources.SourcesWithRealInputs;`
	`1`	`+within OpenIPSL.Electrical.Sources;`
`2`	`2`	`model CurrentSourceReImInput`
`3`	`3`	`"Ideal current source with user defined real and imaginary parts of the current phasor"`
`4`	`4`	`extends OpenIPSL.Electrical.Essentials.pfComponent(enableS_b = true);`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
	`1`	`+VoltageSourceReImInput`
	`2`	`+CurrentSourceReImInput`
`1`	`3`	`SourceBehindImpedance`
`2`		`-SourcesWithRealInputs`