Remove Pi (modelica#3024)

beutlich · Jul 15, 2019 · 7a6a457 · 7a6a457
1 parent 4d42c91
commit 7a6a457
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/Modelica/Electrical/Analog/Basic.mo b/Modelica/Electrical/Analog/Basic.mo
@@ -1188,9 +1188,6 @@ the user has to allocate the parameter vector <em>L[6] </em>, since <em>Nv=(N*(N
     // number of intervals: 2500, stop time: 0.003
     parameter SI.Time Ts=0.0000012 "Sampling time";
 
-    // constant expressions
-    constant Real Pi=3.141592654 "Obsolete constant pi; will be removed in future release";
-
     // power supply
     final parameter SI.Voltage vcp_abs=abs(vcp)
       "Positive correction value for limiting by p_supply";

diff --git a/Modelica/Resources/Scripts/Conversion/ConvertModelica_from_3.2.3_to_4.0.0.mos b/Modelica/Resources/Scripts/Conversion/ConvertModelica_from_3.2.3_to_4.0.0.mos
@@ -119,6 +119,8 @@ convertClass("Modelica.Icons.MotorIcon",
               "Modelica.Electrical.Machines.Icons.Drive")
 convertClass("Modelica.Mechanics.MultiBody.Icons.MotorIcon",
               "Modelica.Electrical.Machines.Icons.Drive")
+convertClass("Modelica.Electrical.Analog.Basic.OpAmpDetailed.Pi",
+              "Modelica.Constants.pi")
 convertClass("Modelica.Icons.Info",
               "Modelica.Icons.Information")
 convertClass("Modelica.Mechanics.MultiBody.Sensors.TansformAbsoluteVector",

diff --git a/ModelicaTestConversion4.mo b/ModelicaTestConversion4.mo
@@ -314,6 +314,16 @@ Conversion test for <a href=\"https://github.com/modelica/ModelicaStandardLibrar
 </p>
 </html>"));
       end Issue2899;
+
+      model Issue3024 "Conversion test for #3024"
+        extends Modelica.Icons.Example;
+        import pi = Modelica.Electrical.Analog.Basic.OpAmpDetailed.Pi;
+        annotation(experiment(StopTime=1), Documentation(info="<html>
+<p>
+Conversion test for <a href=\"https://github.com/modelica/ModelicaStandardLibrary/issues/3024\">#3024</a>.
+</p>
+</html>"));
+      end Issue3024;
     end Analog;
 
     package Digital