diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Buses/Bus.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Buses/Bus.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Buses/Bus.mo"	2022-03-10 09:57:37.396144050 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Buses/Bus.mo"	2022-03-10 09:58:14.572148760 +0000
@@ -17,7 +17,7 @@
         extent={{-10,-10},{10,10}})));
   Types.PerUnit v(start=v_0) "Bus voltage magnitude";
   Types.Angle angle(start=angle_0) "Bus voltage angle";
-  SI.Conversions.NonSIunits.Angle_deg angleDisplay = SI.Conversions.to_deg(angle)
+  Modelica.Units.NonSI.Angle_deg angleDisplay = Modelica.Units.Conversions.to_deg(angle)
     "Angle in degrees for display purposes";
 equation
   v = sqrt(p.vr^2 + p.vi^2);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Controls/PSSE/ES/ESST4B.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Controls/PSSE/ES/ESST4B.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Controls/PSSE/ES/ESST4B.mo"	2022-03-10 09:57:37.396144050 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Controls/PSSE/ES/ESST4B.mo"	2022-03-10 09:58:13.612148638 +0000
@@ -3,7 +3,7 @@
   extends Icons.VerifiedModel;
   extends OpenIPSL.Electrical.Controls.PSSE.ES.BaseClasses.BaseExciter;
   import Modelica.ComplexMath.j;
-  import Modelica.ComplexMath.'abs';
+  import Modelica.ComplexMath.abs;
   parameter Types.Time T_R=0.3 "Regulator input filter time constant";
   parameter Types.PerUnit K_PR=2.97 "Voltage regulator proportional gain";
   parameter Types.TimeAging K_IR=2.97 "Voltage regulator integral gain";
@@ -111,7 +111,7 @@
   VR0 = Efd0*K_G;
   V_REF = ECOMP;
 equation
-  VE = 'abs'(K_P_comp*V_T + j*(K_I + K_P_comp*X_L)*I_T);
+  VE = abs(K_P_comp*V_T + j*(K_I + K_P_comp*X_L)*I_T);
   V_T = Gen_terminal.vr + j*Gen_terminal.vi;
   I_T = Gen_terminal.ir + j*Gen_terminal.ii;
   connect(add.y, limiter.u) annotation (Line(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Controls/PSSE/TG/BaseClasses/GGOV1/LoadLimiterDU.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Controls/PSSE/TG/BaseClasses/GGOV1/LoadLimiterDU.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Controls/PSSE/TG/BaseClasses/GGOV1/LoadLimiterDU.mo"	2022-03-10 09:57:37.396144050 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Controls/PSSE/TG/BaseClasses/GGOV1/LoadLimiterDU.mo"	2022-03-10 09:58:12.808148536 +0000
@@ -33,7 +33,7 @@
     Placement(transformation(extent = {{-20, -20}, {20, 20}}, rotation = 90, origin = {0, -120}), iconTransformation(extent = {{-20, -20}, {20, 20}}, rotation = 90, origin = {0, -120})));
   Modelica.Blocks.Sources.Constant const(k = Wfnl) annotation (
     Placement(transformation(extent = {{-60, 60}, {-40, 80}})));
-  Modelica.Blocks.Nonlinear.Limiter limiter(limitsAtInit = true, uMax = Vmax, uMin = Vmin) annotation (
+  Modelica.Blocks.Nonlinear.Limiter limiter( uMax = Vmax, uMin = Vmin) annotation (
     Placement(transformation(origin = {-10, -34}, extent = {{-10, -10}, {10, 10}})));
 protected
   parameter Types.PerUnit Pmech0(fixed = false);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Controls/PSSE/TG/BaseClasses/GGOV1/PIDGovernor.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Controls/PSSE/TG/BaseClasses/GGOV1/PIDGovernor.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Controls/PSSE/TG/BaseClasses/GGOV1/PIDGovernor.mo"	2022-03-10 09:57:37.396144050 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Controls/PSSE/TG/BaseClasses/GGOV1/PIDGovernor.mo"	2022-03-10 09:58:12.760148530 +0000
@@ -29,7 +29,7 @@
     y_start=0,
     initType=Modelica.Blocks.Types.Init.InitialOutput) annotation (Placement(transformation(extent = {{20, 20}, {40, 40}})));
   Modelica.Blocks.Math.Add3 GovernorPID annotation (Placement(transformation(origin = {84, 1.77636e-15}, extent = {{-10, -10}, {10, 10}})));
-  Modelica.Blocks.Nonlinear.DeadZone deadZone(uMax=db, deadZoneAtInit=false) annotation (Placement(transformation(extent = {{10, 60}, {30, 80}})));
+  Modelica.Blocks.Nonlinear.DeadZone deadZone(uMax = db) annotation (Placement(transformation(extent = {{10, 60}, {30, 80}})));
   Modelica.Blocks.Nonlinear.Limiter limiterSerror(uMax=maxerr, uMin=minerr) annotation (Placement(transformation(extent = {{40, 60}, {60, 80}})));
   Modelica.Blocks.Math.Add3 add3_2(k1=-1, k3=-1) annotation (Placement(transformation(extent = {{-20, 60}, {0, 80}})));
   Modelica.Blocks.Math.Gain r(k=R) "Permanent droop" annotation (Placement(transformation(origin = {-30, 10}, extent = {{-10, -10}, {10, 10}}, rotation = 90)));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Controls/PSSE/TG/BaseClasses/GGOV1/PIDGovernorDU.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Controls/PSSE/TG/BaseClasses/GGOV1/PIDGovernorDU.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Controls/PSSE/TG/BaseClasses/GGOV1/PIDGovernorDU.mo"	2022-03-10 09:57:37.396144050 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Controls/PSSE/TG/BaseClasses/GGOV1/PIDGovernorDU.mo"	2022-03-10 09:58:12.688148521 +0000
@@ -29,7 +29,7 @@
     y_start=0,
     initType=Modelica.Blocks.Types.Init.InitialOutput) annotation (Placement(transformation(extent = {{20, 20}, {40, 40}})));
   Modelica.Blocks.Math.Add3 GovernorPID annotation (Placement(transformation(origin = {84, 1.77636e-15}, extent = {{-10, -10}, {10, 10}})));
-  Modelica.Blocks.Nonlinear.DeadZone deadZone(uMax=db, deadZoneAtInit=false) annotation (Placement(transformation(extent = {{10, 60}, {30, 80}})));
+  Modelica.Blocks.Nonlinear.DeadZone deadZone(uMax = db) annotation (Placement(transformation(extent = {{10, 60}, {30, 80}})));
   Modelica.Blocks.Nonlinear.Limiter limiterSerror(uMax=maxerr, uMin=minerr) annotation (Placement(transformation(extent = {{40, 60}, {60, 80}})));
   Modelica.Blocks.Math.Add3 add3_2(k1=-1, k3=-1) annotation (Placement(transformation(origin = {-10, 70}, extent = {{-10, -10}, {10, 10}})));
   Modelica.Blocks.Math.Gain r(k=R) "Permanent droop" annotation (Placement(transformation(origin = {-30, 10}, extent = {{-10, -10}, {10, 10}}, rotation = 90)));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Controls/PSSE/TG/BaseClasses/GGOV1/Turbine.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Controls/PSSE/TG/BaseClasses/GGOV1/Turbine.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Controls/PSSE/TG/BaseClasses/GGOV1/Turbine.mo"	2022-03-10 09:57:37.396144050 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Controls/PSSE/TG/BaseClasses/GGOV1/Turbine.mo"	2022-03-10 09:58:12.620148512 +0000
@@ -68,7 +68,7 @@
     Placement(transformation(extent = {{-120, 10}, {-100, 30}})));
   Modelica.Blocks.Sources.Constant const1(k = 1) annotation (
     Placement(transformation(extent = {{-160, 0}, {-140, 20}})));
-  Modelica.Blocks.Nonlinear.Limiter limiter(limitsAtInit = true, uMax = Vmax, uMin = Vmin) annotation (
+  Modelica.Blocks.Nonlinear.Limiter limiter( uMax = Vmax, uMin = Vmin) annotation (
     Placement(transformation(extent = {{-48, -50}, {-28, -30}})));
 protected
   parameter Types.PerUnit Pmech0(fixed = false);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Loads/NoiseInjections/SineNoiseInjection.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Loads/NoiseInjections/SineNoiseInjection.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Loads/NoiseInjections/SineNoiseInjection.mo"	2022-03-10 09:57:37.396144050 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Loads/NoiseInjections/SineNoiseInjection.mo"	2022-03-10 09:58:11.900148421 +0000
@@ -9,8 +9,7 @@
     "Output = offset for time < startTime";
 
   Modelica.Blocks.Sources.Sine sine(
-    amplitude=amplitude,
-    freqHz=freqHz,
+    amplitude=amplitude, f = f,
     phase=phase,
     offset=offset,
     startTime=startTime)
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Loads/PSAT/ThermostaticallyControlled.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Loads/PSAT/ThermostaticallyControlled.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Loads/PSAT/ThermostaticallyControlled.mo"	2022-03-10 09:57:37.396144050 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Loads/PSAT/ThermostaticallyControlled.mo"	2022-03-10 09:58:11.784148407 +0000
@@ -6,8 +6,8 @@
   parameter Real Ki=25 "Gain of the integral controller [pu/pu]";
   parameter Types.Time Ti=10 "Time constant of integral controller";
   parameter Types.Time T1=1200 "Time constant of the thermal load";
-  parameter SI.Temp_C T_ref=70 "Reference temperature";
-  parameter SI.Temp_C T0=10 "Initial temperature";
+  parameter Modelica.Units.NonSI.Temperature_degC T_ref=70 "Reference temperature";
+  parameter Modelica.Units.NonSI.Temperature_degC T0=10 "Initial temperature";
   parameter Types.PerUnit G0 = P_0/100*v_0^2 "Initial conductance";
   parameter Types.PerUnit Gmax = Kl*G0 "Maximum conductance";
   parameter Types.PerUnit Gmin = 0 "Minimum conductance";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Machines/PSSE/BaseClasses/baseMachine.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Machines/PSSE/BaseClasses/baseMachine.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Machines/PSSE/BaseClasses/baseMachine.mo"	2022-03-10 09:57:37.400144050 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Machines/PSSE/BaseClasses/baseMachine.mo"	2022-03-10 09:58:11.424148362 +0000
@@ -4,7 +4,7 @@
   import Modelica.ComplexMath.arg;
   import Modelica.ComplexMath.real;
   import Modelica.ComplexMath.imag;
-  import Modelica.ComplexMath.'abs';
+  import Modelica.ComplexMath.abs;
   import Modelica.ComplexMath.conj;
   import Modelica.Blocks.Interfaces.*;
   extends OpenIPSL.Electrical.Essentials.pfComponent(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Machines/PSSE/GENROE.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Machines/PSSE/GENROE.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Machines/PSSE/GENROE.mo"	2022-03-10 09:57:37.400144050 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Machines/PSSE/GENROE.mo"	2022-03-10 09:58:11.340148351 +0000
@@ -6,7 +6,7 @@
   import Modelica.ComplexMath.arg;
   import Modelica.ComplexMath.real;
   import Modelica.ComplexMath.imag;
-  import Modelica.ComplexMath.'abs';
+  import Modelica.ComplexMath.abs;
   import Modelica.ComplexMath.conj;
   import Modelica.ComplexMath.fromPolar;
   import OpenIPSL.NonElectrical.Functions.SE_exp;
@@ -54,7 +54,7 @@
   parameter Real ang_PSIpp0=arg(PSIpp0) "flux angle";
   parameter Real ang_It=arg(It) "current angle";
   parameter Real ang_PSIpp0andIt=ang_PSIpp0 - ang_It "angle difference";
-  parameter Types.PerUnit abs_PSIpp0='abs'(PSIpp0)
+  parameter Types.PerUnit abs_PSIpp0=abs(PSIpp0)
     "magnitude of sub-transient flux linkage";
   parameter Real dsat=SE_exp(
       abs_PSIpp0,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Machines/PSSE/GENROU.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Machines/PSSE/GENROU.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Machines/PSSE/GENROU.mo"	2022-03-10 09:57:37.400144050 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Machines/PSSE/GENROU.mo"	2022-03-10 09:58:11.308148346 +0000
@@ -6,7 +6,7 @@
   import Modelica.ComplexMath.arg;
   import Modelica.ComplexMath.real;
   import Modelica.ComplexMath.imag;
-  import Modelica.ComplexMath.'abs';
+  import Modelica.ComplexMath.abs;
   import Modelica.ComplexMath.conj;
   import Modelica.ComplexMath.fromPolar;
   import Modelica.ComplexMath.j;
@@ -52,7 +52,7 @@
   parameter Types.Angle ang_PSIpp0=arg(PSIpp0) "flux angle";
   parameter Types.Angle ang_It=arg(It) "current angle";
   parameter Types.Angle ang_PSIpp0andIt=ang_PSIpp0 - ang_It "angle difference";
-  parameter Types.PerUnit abs_PSIpp0='abs'(PSIpp0)
+  parameter Types.PerUnit abs_PSIpp0=abs(PSIpp0)
     "magnitude of sub-transient flux linkage";
   parameter Real dsat=SE(
       abs_PSIpp0,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Machines/PSSE/GENSAE.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Machines/PSSE/GENSAE.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Machines/PSSE/GENSAE.mo"	2022-03-10 09:57:37.400144050 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Machines/PSSE/GENSAE.mo"	2022-03-10 09:58:11.284148344 +0000
@@ -7,7 +7,7 @@
   import Modelica.ComplexMath.arg;
   import Modelica.ComplexMath.real;
   import Modelica.ComplexMath.imag;
-  import Modelica.ComplexMath.'abs';
+  import Modelica.ComplexMath.abs;
   import Modelica.ComplexMath.conj;
   import Modelica.ComplexMath.fromPolar;
   import Modelica.ComplexMath.j;
@@ -37,7 +37,7 @@
   parameter Real ang_PSIpp0=arg(PSIpp0) "flux angle";
   parameter Real ang_It=arg(It) "current angle";
   parameter Real ang_PSIpp0andIt=ang_PSIpp0 - ang_It "angle difference";
-  parameter Types.PerUnit abs_PSIpp0='abs'(PSIpp0)
+  parameter Types.PerUnit abs_PSIpp0=abs(PSIpp0)
     "magnitude of sub-transient flux linkage";
   parameter Complex VT=v_0*cos(angle_0) + j*v_0*sin(angle_0)
     "Complex terminal voltage";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Machines/PSSE/GENSAL.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Machines/PSSE/GENSAL.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Machines/PSSE/GENSAL.mo"	2022-03-10 09:57:37.400144050 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Machines/PSSE/GENSAL.mo"	2022-03-10 09:58:11.260148341 +0000
@@ -7,7 +7,7 @@
   import Modelica.ComplexMath.arg;
   import Modelica.ComplexMath.real;
   import Modelica.ComplexMath.imag;
-  import Modelica.ComplexMath.'abs';
+  import Modelica.ComplexMath.abs;
   import Modelica.ComplexMath.conj;
   import Modelica.ComplexMath.fromPolar;
   import Modelica.ComplexMath.j;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Solar/PowerFactory/DIgSILENT/Auxiliary/ActivePowerController.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Solar/PowerFactory/DIgSILENT/Auxiliary/ActivePowerController.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Solar/PowerFactory/DIgSILENT/Auxiliary/ActivePowerController.mo"	2022-03-10 09:57:37.400144050 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Solar/PowerFactory/DIgSILENT/Auxiliary/ActivePowerController.mo"	2022-03-10 09:58:11.108148322 +0000
@@ -23,11 +23,11 @@
     Placement(visible = true, transformation(origin = {10, 70}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
   Modelica.Blocks.Math.Feedback feedback annotation (
     Placement(visible = true, transformation(origin = {-30, 70}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  Modelica.Blocks.Nonlinear.Limiter limiter(limitsAtInit = true, uMax = yo_max, uMin = yo_min)  annotation (
+  Modelica.Blocks.Nonlinear.Limiter limiter( uMax = yo_max, uMin = yo_min)  annotation (
     Placement(visible = true, transformation(origin = {100, 70}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
   Modelica.Blocks.Math.Product product annotation (
     Placement(visible = true, transformation(origin = {60, 70}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  Modelica.Blocks.Nonlinear.Limiter limiter1(limitsAtInit = true, uMax = yo_max, uMin = yo_min) annotation (
+  Modelica.Blocks.Nonlinear.Limiter limiter1( uMax = yo_max, uMin = yo_min) annotation (
     Placement(visible = true, transformation(origin = {44, -6}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
   //protected
   Modelica.Blocks.Interfaces.RealOutput yo1 annotation (
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Solar/PowerFactory/DIgSILENT/Auxiliary/ReactivePowerSupport.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Solar/PowerFactory/DIgSILENT/Auxiliary/ReactivePowerSupport.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Solar/PowerFactory/DIgSILENT/Auxiliary/ReactivePowerSupport.mo"	2022-03-10 09:57:37.400144050 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Solar/PowerFactory/DIgSILENT/Auxiliary/ReactivePowerSupport.mo"	2022-03-10 09:58:11.068148316 +0000
@@ -14,7 +14,7 @@
     Placement(visible = true, transformation(origin = {98, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
   Modelica.Blocks.Sources.BooleanConstant FRTCharac(k=i_EEG) annotation (
     Placement(visible = true, transformation(origin = {60, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  Modelica.Blocks.Nonlinear.Limiter limiter(limitsAtInit = true, uMax = iq_max, uMin = iq_min)  annotation (
+  Modelica.Blocks.Nonlinear.Limiter limiter( uMax = iq_max, uMin = iq_min)  annotation (
     Placement(visible = true, transformation(origin = {182, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
   OpenIPSL.Electrical.Solar.PowerFactory.General.Picdro picdro(Tdrop = if i_EEG then 0 else 0.5, Tpick = 0)  annotation (
     Placement(visible = true, transformation(origin = {-30, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
@@ -22,7 +22,7 @@
     Placement(visible = true, transformation(origin = {-70, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
   Modelica.Blocks.Math.Abs abs annotation (
     Placement(visible = true, transformation(origin = {-110, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  Modelica.Blocks.Nonlinear.DeadZone deadZone(deadZoneAtInit = true, uMax = Deadband, uMin = -Deadband)  annotation (
+  Modelica.Blocks.Nonlinear.DeadZone deadZone( uMax = Deadband, uMin = -Deadband)  annotation (
     Placement(visible = true, transformation(origin = {-158, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
   Modelica.Blocks.Sources.Constant initial_current(k = i0)  annotation (
     Placement(visible = true, transformation(origin = {110, -50}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Solar/PowerFactory/DIgSILENT/Auxiliary/SLDWindV.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Solar/PowerFactory/DIgSILENT/Auxiliary/SLDWindV.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Solar/PowerFactory/DIgSILENT/Auxiliary/SLDWindV.mo"	2022-03-10 09:57:37.400144050 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Solar/PowerFactory/DIgSILENT/Auxiliary/SLDWindV.mo"	2022-03-10 09:58:11.032148312 +0000
@@ -18,7 +18,7 @@
     Placement(visible = true, transformation(origin = {110, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0), iconTransformation(origin = {110, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
   Modelica.Blocks.Math.Division division annotation (
     Placement(visible = true, transformation(origin = {-2, -30}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  Modelica.Blocks.Nonlinear.Limiter limiter(limitsAtInit = true, uMax = Modelica.Constants.inf, uMin = Deadband)  annotation (
+  Modelica.Blocks.Nonlinear.Limiter limiter( uMax = Modelica.Constants.inf, uMin = Deadband)  annotation (
     Placement(visible = true, transformation(origin = {-30, -30}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
 equation
   connect(product.y, gain.u) annotation (
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Solar/PowerFactory/DIgSILENT/Controller.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Solar/PowerFactory/DIgSILENT/Controller.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Solar/PowerFactory/DIgSILENT/Controller.mo"	2022-03-10 09:57:37.400144050 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Solar/PowerFactory/DIgSILENT/Controller.mo"	2022-03-10 09:58:11.012148310 +0000
@@ -35,7 +35,7 @@
     Placement(visible = true, transformation(origin = {-150, -70}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
   Modelica.Blocks.Sources.Constant reference_voltage(k = uac0) annotation (
     Placement(visible = true, transformation(origin = {-150, -110}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  Modelica.Blocks.Nonlinear.Limiter limiter(limitsAtInit = true, uMax = Modelica.Constants.inf, uMin = U_min) annotation (
+  Modelica.Blocks.Nonlinear.Limiter limiter( uMax = Modelica.Constants.inf, uMin = U_min) annotation (
     Placement(visible = true, transformation(origin = {-110, 90}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
   Modelica.Blocks.Math.Feedback feedback1 annotation (
     Placement(visible = true, transformation(origin = {-70, 30}, extent = {{-10, 10}, {10, -10}}, rotation = 0)));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Solar/PowerFactory/DIgSILENT/CurrentLimiter.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Solar/PowerFactory/DIgSILENT/CurrentLimiter.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Solar/PowerFactory/DIgSILENT/CurrentLimiter.mo"	2022-03-10 09:57:37.400144050 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Solar/PowerFactory/DIgSILENT/CurrentLimiter.mo"	2022-03-10 09:58:10.960148302 +0000
@@ -14,9 +14,9 @@
     Placement(visible = true, transformation(origin = {210, 50}, extent = {{-10, -10}, {10, 10}}, rotation = 0), iconTransformation(origin = {110, 60}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
   Modelica.Blocks.Interfaces.RealOutput iqout annotation (
     Placement(visible = true, transformation(origin = {210, -50}, extent = {{-10, -10}, {10, 10}}, rotation = 0), iconTransformation(origin = {110, -60}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  Modelica.Blocks.Nonlinear.Limiter dlim_normal_op(limitsAtInit = true, uMax = maxAbsCur, uMin = -maxAbsCur) annotation (
+  Modelica.Blocks.Nonlinear.Limiter dlim_normal_op( uMax = maxAbsCur, uMin = -maxAbsCur) annotation (
     Placement(visible = true, transformation(origin = {90, 70}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  Modelica.Blocks.Nonlinear.Limiter qlim_frt_op(limitsAtInit = true, uMax = maxAbsCur, uMin = -maxAbsCur) annotation (
+  Modelica.Blocks.Nonlinear.Limiter qlim_frt_op( uMax = maxAbsCur, uMin = -maxAbsCur) annotation (
     Placement(visible = true, transformation(origin = {90, -70}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
   Modelica.Blocks.Nonlinear.VariableLimiter qlim_normal_op annotation (
     Placement(visible = true, transformation(origin = {90, -120}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
@@ -40,11 +40,11 @@
     Placement(visible = true, transformation(origin = {-64, -170}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
   Modelica.Blocks.Sources.Constant const1(k = maxAbsCur) annotation (
     Placement(visible = true, transformation(origin = {-110, -170}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  Modelica.Blocks.Nonlinear.Limiter limiter(limitsAtInit = true, uMax = maxAbsCur, uMin = 0) annotation (
+  Modelica.Blocks.Nonlinear.Limiter limiter( uMax = maxAbsCur, uMin = 0) annotation (
     Placement(visible = true, transformation(origin = {-20, -170}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
   OpenIPSL.Electrical.Solar.PowerFactory.General.Picdro picdro(Tdrop = if i_EEG then 0 else 0.5, Tpick = 0) annotation (
     Placement(visible = true, transformation(origin = {-10, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  Modelica.Blocks.Nonlinear.DeadZone deadZone(deadZoneAtInit = true, uMax = Deadband, uMin = -Deadband) annotation (
+  Modelica.Blocks.Nonlinear.DeadZone deadZone( uMax = Deadband, uMin = -Deadband) annotation (
     Placement(visible = true, transformation(origin = {-130, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
   Modelica.Blocks.Logical.GreaterEqualThreshold greaterEqualThreshold(threshold = Deadband) annotation (
     Placement(visible = true, transformation(origin = {-50, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Solar/PowerFactory/DIgSILENT/PVModule.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Solar/PowerFactory/DIgSILENT/PVModule.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Solar/PowerFactory/DIgSILENT/PVModule.mo"	2022-03-10 09:57:37.400144050 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Electrical/Solar/PowerFactory/DIgSILENT/PVModule.mo"	2022-03-10 09:58:10.856148289 +0000
@@ -41,8 +41,8 @@
   der(local_E) = 0;
 end if;
 equation
-  tempCorrU = 1 + au * (SI.Conversions.to_degC(local_theta) - 25);
-  tempCorrI = 1 + ai * (SI.Conversions.to_degC(local_theta) - 25);
+  tempCorrU = 1 + au * (Modelica.Units.Conversions.to_degC(local_theta) - 25);
+  tempCorrI = 1 + ai * (Modelica.Units.Conversions.to_degC(local_theta) - 25);
 // Open-circuit voltage
   lnEquot = if local_E > 1.0 then log(max(local_E, 1.0)) / log(E_STC) else 0;
 // ln(E)/ln(1000W/m2), if E > 1W/m2
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Examples/BaseClasses/LoadTestBase.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Examples/BaseClasses/LoadTestBase.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Examples/BaseClasses/LoadTestBase.mo"	2022-03-10 09:57:37.404144051 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Examples/BaseClasses/LoadTestBase.mo"	2022-03-10 09:58:08.188147952 +0000
@@ -34,26 +34,26 @@
   Modelica.Blocks.Sources.Step Vstep2(height=-0.0005, startTime=2.1) annotation (Placement(transformation(
         origin={-84,50},
         extent={{-4,-4},{4,4}})));
-  Modelica.Blocks.Sources.Sine Vsine1(amplitude=0.001, freqHz=0.2) annotation (Placement(transformation(
+  Modelica.Blocks.Sources.Sine Vsine1(amplitude=0.001, f =0.2) annotation (Placement(transformation(
         origin={-84,32},
         extent={{-4,-4},{4,4}})));
   Modelica.Blocks.Sources.Sine Vsine2(
     amplitude=0.001,
-    freqHz=0.2,
+f    =0.2,
     startTime=5,
     phase=3.1415926535898) annotation (Placement(transformation(
         origin={-83.9311,16},
         extent={{-3.9311,-4},{3.9311,4}})));
   Modelica.Blocks.Sources.Sine Psine2(
     amplitude=0.001,
-    freqHz=0.2,
+f    =0.2,
     startTime=10,
     phase=3.1415926535898) annotation (Placement(transformation(
         origin={-84,-64},
         extent={{-4,-4},{4,4}})));
   Modelica.Blocks.Sources.Sine Psine1(
     amplitude=0.001,
-    freqHz=0.2,
+f    =0.2,
     startTime=5) annotation (Placement(transformation(
         origin={-84,-50},
         extent={{-4,-4},{4,4}})));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Examples/Branches/PSAT/ThreeWindingTransformer_Test.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Examples/Branches/PSAT/ThreeWindingTransformer_Test.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Examples/Branches/PSAT/ThreeWindingTransformer_Test.mo"	2022-03-10 09:57:37.404144051 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Examples/Branches/PSAT/ThreeWindingTransformer_Test.mo"	2022-03-10 09:58:07.992147926 +0000
@@ -15,7 +15,7 @@
     X=0.1) annotation (Placement(transformation(
         origin={-2,10},
         extent={{-10.0,-10.0},{10.0,10.0}})));
-  Modelica.Blocks.Sources.Sine sine1(amplitude=0.001, freqHz=0.2) annotation (
+  Modelica.Blocks.Sources.Sine sine1(amplitude=0.001, f =0.2) annotation (
       Placement(transformation(
         origin={-91.783,9.4652},
         extent={{-4.4802,-4.4802},{4.4802,4.4802}})));
@@ -24,7 +24,7 @@
         extent={{-4,-4},{4,4}})));
   Modelica.Blocks.Sources.Sine sine2(
     amplitude=0.001,
-    freqHz=0.2,
+f    =0.2,
     startTime=5) annotation (Placement(transformation(
         origin={-91.382,-5.5198},
         extent={{-4.4802,-4.4802},{4.4802,4.4802}})));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Examples/Branches/PSAT/ULTC_Test.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Examples/Branches/PSAT/ULTC_Test.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Examples/Branches/PSAT/ULTC_Test.mo"	2022-03-10 09:57:37.404144051 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Examples/Branches/PSAT/ULTC_Test.mo"	2022-03-10 09:58:07.956147923 +0000
@@ -15,7 +15,7 @@
     X=0.1) annotation (Placement(transformation(
         origin={20,10},
         extent={{-10.0,-10.0},{10.0,10.0}})));
-  Modelica.Blocks.Sources.Sine sine1(amplitude=0.001, freqHz=0.2) annotation (
+  Modelica.Blocks.Sources.Sine sine1(amplitude=0.001, f =0.2) annotation (
       Placement(transformation(
         origin={-92,10},
         extent={{-4.4802,-4.4802},{4.4802,4.4802}})));
@@ -24,7 +24,7 @@
         extent={{-6.3229,-6.3229},{6.3229,6.3229}})));
   Modelica.Blocks.Sources.Sine sine2(
     amplitude=0.001,
-    freqHz=0.2,
+f    =0.2,
     startTime=5) annotation (Placement(transformation(
         origin={-92,-10},
         extent={{-4.4802,-4.4802},{4.4802,4.4802}})));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Examples/Controls/PSAT/TG/TGTypeVI_test.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Examples/Controls/PSAT/TG/TGTypeVI_test.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Examples/Controls/PSAT/TG/TGTypeVI_test.mo"	2022-03-10 09:57:37.404144051 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Examples/Controls/PSAT/TG/TGTypeVI_test.mo"	2022-03-10 09:58:07.688147887 +0000
@@ -19,7 +19,7 @@
     dref=0,
     po=0.16074) annotation (Placement(transformation(extent={{-68,-24},{-40,4}})));
   Modelica.Blocks.Sources.Sine sine2(
-    freqHz=0.2,
+    f =0.2,
     startTime=10,
     amplitude=-0.001,
     offset=0) annotation (Placement(transformation(
@@ -29,7 +29,7 @@
         origin={-60,-50},
         extent={{9.99996,-9.99996},{-10,10}})));
   Modelica.Blocks.Sources.Sine sine1(
-    freqHz=0.2,
+    f =0.2,
     startTime=5,
     amplitude=0.001,
     offset=1) annotation (Placement(transformation(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Examples/Controls/PSAT/TG/TGTypeV_test.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Examples/Controls/PSAT/TG/TGTypeV_test.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Examples/Controls/PSAT/TG/TGTypeV_test.mo"	2022-03-10 09:57:37.404144051 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Examples/Controls/PSAT/TG/TGTypeV_test.mo"	2022-03-10 09:58:07.672147886 +0000
@@ -16,7 +16,7 @@
     Pref=0.160552) annotation (Placement(transformation(extent={{-68,-24},{-40,4}})));
   Modelica.Blocks.Sources.Sine sine2(
     amplitude=0.001,
-    freqHz=0.2,
+f    =0.2,
     offset=1,
     startTime=5) annotation (Placement(transformation(
         extent={{-6,6},{6,-6}},
@@ -24,7 +24,7 @@
         origin={-26,-60})));
   Modelica.Blocks.Sources.Sine sine1(
     amplitude=-0.001,
-    freqHz=0.2,
+f    =0.2,
     startTime=10,
     offset=0) annotation (Placement(transformation(
         extent={{6,-6},{-6,6}},
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Examples/Machines/PSAT/Order2test2_perturbation.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Examples/Machines/PSAT/Order2test2_perturbation.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Examples/Machines/PSAT/Order2test2_perturbation.mo"	2022-03-10 09:57:37.404144051 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Examples/Machines/PSAT/Order2test2_perturbation.mo"	2022-03-10 09:58:06.840147780 +0000
@@ -16,7 +16,7 @@
      Placement(transformation(
         origin={-95,35},
         extent={{-5,-5},{5,5}})));
-  Modelica.Blocks.Sources.Sine sine1(amplitude=0.001, freqHz=0.2) annotation (
+  Modelica.Blocks.Sources.Sine sine1(amplitude=0.001, f =0.2) annotation (
       Placement(transformation(
         origin={-95,20},
         extent={{-5,-5},{5,5}})));
@@ -25,13 +25,13 @@
         extent={{-5,-5},{5,5}})));
   Modelica.Blocks.Sources.Sine sine2(
     amplitude=0.001,
-    freqHz=0.2,
+f    =0.2,
     startTime=5) annotation (Placement(transformation(
         origin={-95,5},
         extent={{-5,-5},{5,5}})));
   Modelica.Blocks.Sources.Sine sine3(
     amplitude=0.001,
-    freqHz=0.2,
+f    =0.2,
     startTime=10) annotation (Placement(transformation(
         origin={-95,-75},
         extent={{-5,-5},{5,5}})));
@@ -40,7 +40,7 @@
         extent={{-4.99999,-4.99999},{4.99999,4.99999}})));
   Modelica.Blocks.Sources.Sine sine4(
     amplitude=0.001,
-    freqHz=0.2,
+f    =0.2,
     startTime=5) annotation (Placement(transformation(
         origin={-95,-55},
         extent={{-5,-5},{5,5}})));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Examples/Machines/PSAT/Order3test2_perturbation.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Examples/Machines/PSAT/Order3test2_perturbation.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Examples/Machines/PSAT/Order3test2_perturbation.mo"	2022-03-10 09:57:37.404144051 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Examples/Machines/PSAT/Order3test2_perturbation.mo"	2022-03-10 09:58:06.760147770 +0000
@@ -33,7 +33,7 @@
      Placement(transformation(
         origin={-95,35},
         extent={{-5,-5},{5,5}})));
-  Modelica.Blocks.Sources.Sine sine1(amplitude=0.001, freqHz=0.2) annotation (
+  Modelica.Blocks.Sources.Sine sine1(amplitude=0.001, f =0.2) annotation (
       Placement(transformation(
         origin={-95,20},
         extent={{-5,-5},{5,5}})));
@@ -42,13 +42,13 @@
         extent={{-5,-5},{5,5}})));
   Modelica.Blocks.Sources.Sine sine2(
     amplitude=0.001,
-    freqHz=0.2,
+f    =0.2,
     startTime=5) annotation (Placement(transformation(
         origin={-95,5},
         extent={{-5,-5},{5,5}})));
   Modelica.Blocks.Sources.Sine sine3(
     amplitude=0.001,
-    freqHz=0.2,
+f    =0.2,
     startTime=10) annotation (Placement(transformation(
         origin={-95,-75},
         extent={{-5,-5},{5,5}})));
@@ -57,7 +57,7 @@
         extent={{-4.99999,-4.99999},{4.99999,4.99999}})));
   Modelica.Blocks.Sources.Sine sine4(
     amplitude=0.001,
-    freqHz=0.2,
+f    =0.2,
     startTime=5) annotation (Placement(transformation(
         origin={-95,-55},
         extent={{-5,-5},{5,5}})));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Examples/Machines/PSAT/Order4test2_perturbation.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Examples/Machines/PSAT/Order4test2_perturbation.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Examples/Machines/PSAT/Order4test2_perturbation.mo"	2022-03-10 09:57:37.404144051 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/Examples/Machines/PSAT/Order4test2_perturbation.mo"	2022-03-10 09:58:06.696147762 +0000
@@ -28,7 +28,7 @@
      Placement(transformation(
         origin={-95,35},
         extent={{-5,-5},{5,5}})));
-  Modelica.Blocks.Sources.Sine sine1(amplitude=0.001, freqHz=0.2) annotation (
+  Modelica.Blocks.Sources.Sine sine1(amplitude=0.001, f =0.2) annotation (
       Placement(transformation(
         origin={-95,20},
         extent={{-5,-5},{5,5}})));
@@ -37,13 +37,13 @@
         extent={{-5,-5},{5,5}})));
   Modelica.Blocks.Sources.Sine sine2(
     amplitude=0.001,
-    freqHz=0.2,
+f    =0.2,
     startTime=5) annotation (Placement(transformation(
         origin={-95,5},
         extent={{-5,-5},{5,5}})));
   Modelica.Blocks.Sources.Sine sine3(
     amplitude=0.001,
-    freqHz=0.2,
+f    =0.2,
     startTime=10) annotation (Placement(transformation(
         origin={-95,-75},
         extent={{-5,-5},{5,5}})));
@@ -52,7 +52,7 @@
         extent={{-4.99999,-4.99999},{4.99999,4.99999}})));
   Modelica.Blocks.Sources.Sine sine4(
     amplitude=0.001,
-    freqHz=0.2,
+f    =0.2,
     startTime=5) annotation (Placement(transformation(
         origin={-95,-55},
         extent={{-5,-5},{5,5}})));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/openmodelica.metadata.json" "converted-libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/openmodelica.metadata.json"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/openmodelica.metadata.json"	2022-03-10 09:57:37.408144050 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/openmodelica.metadata.json"	2022-03-10 09:58:15.088148826 +0000
@@ -1 +1 @@
-{"convertFromVersion":["0.8.0", "0.8.1", "1.0.0", "1.5.0"], "path":"OpenIPSL", "sha":"a867ba3971d6eeb3696c9d09ead8bd2241fa0a56", "support":"noSupport", "uses":{"Complex":"3.2.3", "Modelica":"3.2.3"}, "version":"2.0.0-master", "zipfile":"https://github.com/OpenIPSL/OpenIPSL/archive/a867ba3971d6eeb3696c9d09ead8bd2241fa0a56.zip"}
+{"convertFromVersion": ["0.8.0", "0.8.1", "1.0.0", "1.5.0"], "path": "OpenIPSL", "sha": "a867ba3971d6eeb3696c9d09ead8bd2241fa0a56", "support": "noSupport", "uses": {"Complex": "4.0.0", "Modelica": "4.0.0"}, "version": "2.0.0-master", "zipfile": "https://github.com/OpenIPSL/OpenIPSL/archive/a867ba3971d6eeb3696c9d09ead8bd2241fa0a56.zip", "extraInfo": "Conversion script /home/hudson/saved_omc/libraries/.openmodelica/libraries/Modelica 4.0.0+maint.om//Resources/Scripts/Conversion/ConvertModelica_from_3.2.3_to_4.0.0.mos was applied"}
\ No newline at end of file
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/package.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/package.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/package.mo"	2022-03-10 09:57:37.408144050 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 2.0.0-master/package.mo"	2022-03-10 09:58:15.084148825 +0000
@@ -1,17 +1,31 @@
 package OpenIPSL "Open-Instance Power System Library"
-  import SI = Modelica.SIunits;
+  import Modelica.Units.SI;
   import C = Modelica.Constants;
 
-annotation (preferredView="info",
-  Protection(access = Access.packageDuplicate),
-  uses(Complex(version="3.2.3"), Modelica(version="3.2.3")),
-  version="2.0.0-beta.1",
-  versionDate="2020-12-16",
-  conversion(
-     from(version={"0.8","0.8.1","1.0.0","1.5.0"}, script="modelica://OpenIPSL/Resources/Scripts/ConvertOpenIPSL_from_1.5.0_to_2.0.0.mos")),
-  Icon(graphics={Bitmap(extent={{-100,-100},{100,100}}, fileName=
-            "modelica://OpenIPSL/Resources/Images/OpenIPSL_Logo.png")}),
-  Documentation(info="<html>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  annotation(
+    preferredView = "info",
+    Protection(access = Access.packageDuplicate),
+    uses(Modelica(version = "4.0.0")),
+    version = "2.0.0-beta.1",
+    versionDate = "2020-12-16",
+    conversion(from(version = {"0.8", "0.8.1", "1.0.0", "1.5.0"}, script = "modelica://OpenIPSL/Resources/Scripts/ConvertOpenIPSL_from_1.5.0_to_2.0.0.mos")),
+    Icon(graphics = {Bitmap(extent = {{-100, -100}, {100, 100}}, fileName = "modelica://OpenIPSL/Resources/Images/OpenIPSL_Logo.png")}),
+    Documentation(info = "<html>
 <p>
 The <strong><code>OpenIPSL</code></strong> or Open-Instance Power System Library is a
 <a href=\"https://www.modelica.org\">Modelica</a> library, fork of of the
@@ -52,4 +66,4 @@
 for additional information.
 </p>
 </html>"));
-end OpenIPSL;
+end OpenIPSL;
\ No newline at end of file