Fix annotations in Tests

dietmarw · dietmarw · commit 8bf42cfb07cd · 2024-11-14T19:07:37.000+01:00
diff --git a/OpenIPSL/Tests/Controls/PSSE/COMP/IEEEVC.mo b/OpenIPSL/Tests/Controls/PSSE/COMP/IEEEVC.mo
@@ -69,9 +69,5 @@ experiment(
       StopTime=10,
       Interval=0.0001,
       Tolerance=1e-06,
-      __Dymola_fixedstepsize=0.0001,
-      __Dymola_Algorithm="Dassl"),
-    Diagram(coordinateSystem(extent={{-100,-100},{100,100}})),
-    Icon(coordinateSystem(extent={{-100,-100},{100,100}})),
-    conversion(noneFromVersion=""));
+      __Dymola_fixedstepsize=0.0001));
 end IEEEVC;
diff --git a/OpenIPSL/Tests/Controls/PSSE/ES/AC7B.mo b/OpenIPSL/Tests/Controls/PSSE/ES/AC7B.mo
@@ -76,15 +76,10 @@ equation
           {-46,-82},{-73,-82},{-73,-65.5}}, color={0,0,127}));
   connect(aC7B.EFD, gENROU.EFD) annotation (Line(points={{-89.5,-49},{-98,-49},
           {-98,-9.6},{-91,-9.6}}, color={0,0,127}));
-  annotation (Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},
-            {100,100}})),                                        Diagram(
-        coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,
-            100}})),
+  annotation (
     experiment(
       StopTime=10,
       Interval=0.0001,
       Tolerance=1e-06,
-      __Dymola_fixedstepsize=0.0001,
-      __Dymola_Algorithm="Dassl"),
-    conversion(noneFromVersion=""));
+      __Dymola_fixedstepsize=0.0001));
 end AC7B;
diff --git a/OpenIPSL/Tests/Controls/PSSE/ES/AC8B.mo b/OpenIPSL/Tests/Controls/PSSE/ES/AC8B.mo
@@ -84,9 +84,5 @@ equation
 experiment(
       StopTime=10,
       Interval=0.0001,
-      Tolerance=1e-06,
-      __Dymola_Algorithm="Dassl"),
-    Diagram(coordinateSystem(extent={{-100,-80},{100,100}})),
-    Icon(coordinateSystem(extent={{-100,-100},{100,100}})),
-    conversion(noneFromVersion=""));
+      Tolerance=1e-06));
 end AC8B;
diff --git a/OpenIPSL/Tests/Controls/PSSE/ES/DC4B.mo b/OpenIPSL/Tests/Controls/PSSE/ES/DC4B.mo
@@ -66,13 +66,8 @@ equation
           {-52,-60},{-46,-60},{-46,-4.8},{-56.5,-4.8}}, color={0,0,127}));
   connect(gENROU.EFD0, dC4B.EFD0) annotation (Line(points={{-56.5,-8},{-42,-8},
           {-42,-56.2},{-58.7,-56.2}}, color={0,0,127}));
-  annotation (Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},
-            {100,100}})),                                        Diagram(
-        coordinateSystem(preserveAspectRatio=false, extent={{-100,-80},{100,100}})),
-    experiment(
+  annotation (    experiment(
       StopTime=10,
       Interval=0.0001,
-      Tolerance=1e-05,
-      __Dymola_Algorithm="Dassl"),
-    conversion(noneFromVersion=""));
+      Tolerance=1e-05));
 end DC4B;
diff --git a/OpenIPSL/Tests/Controls/PSSE/ES/ESURRY.mo b/OpenIPSL/Tests/Controls/PSSE/ES/ESURRY.mo
@@ -71,6 +71,5 @@ equation
 experiment(
       StopTime=10,
       Interval=0.001,
-      Tolerance=1e-06,
-      __Dymola_Algorithm="Dassl"));
+      Tolerance=1e-06));
 end ESURRY;
diff --git a/OpenIPSL/Tests/Controls/PSSE/ES/EXBAS.mo b/OpenIPSL/Tests/Controls/PSSE/ES/EXBAS.mo
@@ -74,10 +74,7 @@ equation
           -9},{-46,-52},{-58,-52},{-58,-49}}, color={0,0,127}));
   connect(eXBAS.VOTHSG, const.y) annotation (Line(points={{-77,-34},{-88,-34},{
           -88,-58},{-66,-58},{-66,-63}}, color={0,0,127}));
-  annotation (Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,
-            -100},{100,100}})),                                  Diagram(
-        coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,
-            100}})),
+  annotation (
     experiment(
       StopTime=10,
       Interval=0.001,
diff --git a/OpenIPSL/Tests/Controls/PSSE/TG/IEEEG2.mo b/OpenIPSL/Tests/Controls/PSSE/TG/IEEEG2.mo
@@ -37,12 +37,9 @@ equation
           8},{-52,36.4},{-64.2,36.4}}, color={0,0,127}));
   connect(iEEEG2.PMECH, gENSAL.PMECH) annotation (Line(points={{-85.1,43},{-98,
           43},{-98,9.6},{-91,9.6}}, color={0,0,127}));
-  annotation (Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},
-            {100,100}})),                                        Diagram(
-        coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,100}})),
+  annotation (
     experiment(
       StopTime=10,
       Interval=0.0001,
-      Tolerance=1e-06,
-      __Dymola_Algorithm="Dassl"));
+      Tolerance=1e-06));
 end IEEEG2;
diff --git a/OpenIPSL/Tests/Controls/PSSE/TG/WEHGOV.mo b/OpenIPSL/Tests/Controls/PSSE/TG/WEHGOV.mo
@@ -50,12 +50,8 @@ equation
   connect(gENSAL.PMECH0, wEHGOV.PMECH0) annotation (Line(points={{-50.2,8.5},{
           -46,8.5},{-46,8},{-42,8},{-42,47},{-60.8,47}},
                                          color={0,0,127}));
-  annotation (Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,
-            -100},{100,100}})),                                  Diagram(
-        coordinateSystem(preserveAspectRatio=false, extent={{-100,-80},{100,100}})),
-    experiment(
+  annotation (experiment(
       StopTime=10,
       Interval=0.001,
-      Tolerance=1e-06,
-      __Dymola_Algorithm="Dassl"));
+      Tolerance=1e-06));
 end WEHGOV;
diff --git a/OpenIPSL/Tests/Controls/PSSE/TG/WPIDHY.mo b/OpenIPSL/Tests/Controls/PSSE/TG/WPIDHY.mo
@@ -60,9 +60,7 @@ equation
 experiment(
       StopTime=10,
       Interval=0.001,
-      Tolerance=1e-06,
-      __Dymola_Algorithm="Dassl"),
-                        Documentation(info="<html>
+      Tolerance=1e-06), Documentation(info="<html>
 <p>
 Simulate for 10 seconds.
 </p>
diff --git a/OpenIPSL/Tests/Controls/PSSE/TG/WSIEG1.mo b/OpenIPSL/Tests/Controls/PSSE/TG/WSIEG1.mo
@@ -43,9 +43,7 @@ equation
           {-40,12.3},{-40,54.8},{-56.8,54.8}}, color={0,0,127}));
   connect(gENROU.PMECH0, wSIEG1.PMECH0) annotation (Line(points={{-48.2,8.5},{
           -44,8.5},{-44,37.9},{-56.8,37.9}}, color={0,0,127}));
-  annotation (Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,
-            -100},{100,100}})),                                  Diagram(
-        coordinateSystem(preserveAspectRatio=false, extent={{-100,-80},{100,100}})),
+  annotation (
     experiment(
       StopTime=10,
       Interval=0.0001,
diff --git a/OpenIPSL/Tests/Controls/PSSE/UEL/MNLEX2.mo b/OpenIPSL/Tests/Controls/PSSE/UEL/MNLEX2.mo
@@ -79,15 +79,11 @@ equation
           0,127}));
   connect(eXAC1_1.VOEL, const.y) annotation (Line(points={{-63,-53.3},{-63,
           -62},{-26.6,-62}}, color={0,0,127}));
-  annotation (Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,
-            -100},{100,100}})),                                  Diagram(
-        coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,
-            100}})),
+  annotation (
     experiment(
       StopTime=10,
       Interval=0.001,
       Tolerance=1e-06,
       __Dymola_fixedstepsize=0.001,
-      __Dymola_Algorithm="Rkfix2"),
-    conversion(noneFromVersion=""));
+      __Dymola_Algorithm="Rkfix2"));
 end MNLEX2;
diff --git a/OpenIPSL/Tests/Machines/PSSE/GENTPJ.mo b/OpenIPSL/Tests/Machines/PSSE/GENTPJ.mo
@@ -1,7 +1,7 @@
 within OpenIPSL.Tests.Machines.PSSE;
 model GENTPJ
   "SMIB system to test functionality of WECC Type J generator: round rotor with saturation on both axes"
-  extends OpenIPSL.Tests.BaseClasses.SMIB (gENCLS(P_0=10017030, Q_0=8005052), GEN1(angle_0=0.070619983433093), SysData(
+  extends OpenIPSL.Tests.BaseClasses.SMIB( gENCLS(P_0=10017030, Q_0=8005052), GEN1(angle_0=0.070619983433093), SysData(
         fn=60), FAULT(v_0=0.995985, angle_0=-0.0050086621115692));
   Electrical.Machines.PSSE.GENTPJ gENTPJ(
     Tpd0=6.7,
@@ -55,17 +55,5 @@ equation
           {-100,-30},{-42,-30},{-42,-10},{-46,-10}}, color={0,0,127}));
   connect(gENTPJ.p,GEN1. p)
     annotation (Line(points={{-48,0},{-30,0}},         color={0,0,255}));
-  annotation (
-    Icon(coordinateSystem(preserveAspectRatio=false), graphics={
-        Ellipse(lineColor = {75,138,73},
-                fillColor={255,255,255},
-                fillPattern = FillPattern.Solid,
-                extent={{-100,-100},{100,100}}),
-        Polygon(lineColor = {0,0,255},
-                fillColor = {75,138,73},
-                pattern = LinePattern.None,
-                fillPattern = FillPattern.Solid,
-                points={{-36,60},{64,0},{-36,-60},{-36,60}})}),
-    Diagram(coordinateSystem(preserveAspectRatio=false)),
-    experiment(StopTime=10, __Dymola_Algorithm="Dassl"));
+  annotation (experiment(StopTime=10));
 end GENTPJ;
