diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Branches/PwLine.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Branches/PwLine.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Branches/PwLine.mo"	2022-03-10 09:57:38.452144184 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Branches/PwLine.mo"	2022-03-10 09:58:02.924147284 +0000
@@ -9,20 +9,20 @@
             -10},{-80,10}}), iconTransformation(extent={{-100,-10},{-80,10}})));
   OpenIPSL.Interfaces.PwPin n annotation (Placement(transformation(extent={{80,
             -10},{100,10}}), iconTransformation(extent={{80,-10},{100,10}})));
-  parameter Modelica.SIunits.PerUnit R "Resistance (pu)"
+  parameter Modelica.Units.SI.PerUnit R "Resistance (pu)"
     annotation (Dialog(group="Line parameters"));
-  parameter Modelica.SIunits.PerUnit X "Reactance (pu)"
+  parameter Modelica.Units.SI.PerUnit X "Reactance (pu)"
     annotation (Dialog(group="Line parameters"));
-  parameter Modelica.SIunits.PerUnit G "Shunt half conductance (pu)"
+  parameter Modelica.Units.SI.PerUnit G "Shunt half conductance (pu)"
     annotation (Dialog(group="Line parameters"));
-  parameter Modelica.SIunits.PerUnit B "Shunt half susceptance (pu)"
+  parameter Modelica.Units.SI.PerUnit B "Shunt half susceptance (pu)"
     annotation (Dialog(group="Line parameters"));
   parameter OpenIPSL.Types.ApparentPowerMega S_b=SysData.S_b
     "System base power (MVA)"
     annotation (Dialog(group="Line parameters", enable=false));
-  parameter Modelica.SIunits.Time t1=Modelica.Constants.inf
+  parameter Modelica.Units.SI.Time t1=Modelica.Constants.inf
     annotation (Dialog(group="Perturbation parameters"));
-  parameter Modelica.SIunits.Time t2=Modelica.Constants.inf
+  parameter Modelica.Units.SI.Time t2=Modelica.Constants.inf
     annotation (Dialog(group="Perturbation parameters"));
   parameter Integer opening=1 annotation (Dialog(group=
           "Perturbation parameters"), choices(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Buses/Bus.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Buses/Bus.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Buses/Bus.mo"	2022-03-10 09:57:38.452144184 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Buses/Bus.mo"	2022-03-10 09:58:02.672147252 +0000
@@ -1,4 +1,4 @@
-within OpenIPSL.Electrical.Buses;
+within OpenIPSL.Electrical.Buses;
 model Bus "Bus model (2014/03/10)"
   extends OpenIPSL.Electrical.Essentials.pfComponent;
   OpenIPSL.Interfaces.PwPin p(vr(start=V_0*cos(angle_0*Modelica.Constants.pi/
@@ -14,7 +14,7 @@
         extent={{-10,-10},{10,10}},
         rotation=0)));
   Real V(start=V_0) "Bus voltage magnitude (pu)";
-  Modelica.SIunits.Conversions.NonSIunits.Angle_deg angle(start=angle_0)
+  Modelica.Units.NonSI.Angle_deg angle(start=angle_0)
     "Bus voltage angle";
   parameter Boolean displayPF=true "Display voltage values:" annotation (Dialog(
       group="Visualisation",
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Controls/PSAT/AVR/AVRTypeII.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Controls/PSAT/AVR/AVRTypeII.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Controls/PSAT/AVR/AVRTypeII.mo"	2022-03-10 09:57:38.456144183 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Controls/PSAT/AVR/AVRTypeII.mo"	2022-03-10 09:58:02.528147234 +0000
@@ -13,25 +13,25 @@
     "Reference generator terminal voltage (pu)" annotation (Placement(
         transformation(extent={{-140,40},{-100,80}}), iconTransformation(extent
           ={{-140,40},{-100,80}})));
-  parameter Modelica.SIunits.PerUnit vrmin=-5 "Minimum regulator voltage (pu)";
-  parameter Modelica.SIunits.PerUnit vrmax=5 "Maximum regulator voltage (pu)";
+  parameter Modelica.Units.SI.PerUnit vrmin=-5 "Minimum regulator voltage (pu)";
+  parameter Modelica.Units.SI.PerUnit vrmax=5 "Maximum regulator voltage (pu)";
   parameter Real Ka=100 "Amplifier gain (pu/pu)";
-  parameter Modelica.SIunits.Time Ta=0.5 "Amplifier time constant (s)";
+  parameter Modelica.Units.SI.Time Ta=0.5 "Amplifier time constant (s)";
   parameter Real Kf=0.15 "Stabilizer gain (pu/pu)";
-  parameter Modelica.SIunits.Time Tf=0.1 "Stabilizer time constant (s)";
+  parameter Modelica.Units.SI.Time Tf=0.1 "Stabilizer time constant (s)";
   parameter Real Ke=0 "Field circuit integral deviation (pu/pu)";
-  parameter Modelica.SIunits.Time Te=0.2 "Field circuit time constant (s)";
-  parameter Modelica.SIunits.Time Tr=0.001 "Measurement time constant (s)";
+  parameter Modelica.Units.SI.Time Te=0.2 "Field circuit time constant (s)";
+  parameter Modelica.Units.SI.Time Tr=0.001 "Measurement time constant (s)";
   parameter Real Ae=0.0006 "1st ceiling coefficient";
   parameter Real Be=0.9 "2nd ceiling coefficient";
-  parameter Modelica.SIunits.PerUnit v0=1 "Initial measured voltage";
+  parameter Modelica.Units.SI.PerUnit v0=1 "Initial measured voltage";
 protected
-  parameter Modelica.SIunits.PerUnit vfstate=vr10 - (Ae*Modelica.Math.exp(Be*
+  parameter Modelica.Units.SI.PerUnit vfstate=vr10 - (Ae*Modelica.Math.exp(Be*
       abs(vf00))*vf00);
-  parameter Modelica.SIunits.PerUnit vf00(fixed=false) "Initialization of vf";
-  parameter Modelica.SIunits.PerUnit vr10=Ke*vf00 + Ae*Modelica.Math.exp(Be*abs(
+  parameter Modelica.Units.SI.PerUnit vf00(fixed=false) "Initialization of vf";
+  parameter Modelica.Units.SI.PerUnit vr10=Ke*vf00 + Ae*Modelica.Math.exp(Be*abs(
       vf00))*vf00 "Initialization";
-  parameter Modelica.SIunits.PerUnit vr20=-vf00*Kf/Tf "Initialization";
+  parameter Modelica.Units.SI.PerUnit vr20=-vf00*Kf/Tf "Initialization";
 public
   Modelica.Blocks.Interfaces.RealOutput vref0 "Voltage reference at t=0 (pu)"
     annotation (Placement(transformation(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Controls/PSAT/OEL/OEL.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Controls/PSAT/OEL/OEL.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Controls/PSAT/OEL/OEL.mo"	2022-03-10 09:57:38.456144183 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Controls/PSAT/OEL/OEL.mo"	2022-03-10 09:58:02.468147226 +0000
@@ -15,14 +15,14 @@
   Modelica.Blocks.Interfaces.RealOutput v_ref annotation (Placement(
         transformation(extent={{94,-10},{114,10}}), iconTransformation(extent={
             {92,-12},{116,12}})));
-  parameter Modelica.SIunits.Time T0=10 "Integrator time constant (s)";
-  parameter Modelica.SIunits.PerUnit xd
+  parameter Modelica.Units.SI.Time T0=10 "Integrator time constant (s)";
+  parameter Modelica.Units.SI.PerUnit xd
     "d-axis estimated generator reactance (pu, machine base)";
-  parameter Modelica.SIunits.PerUnit xq
+  parameter Modelica.Units.SI.PerUnit xq
     "q-axis estimated generator reactance (pu, machine base)";
-  parameter Modelica.SIunits.PerUnit if_lim
+  parameter Modelica.Units.SI.PerUnit if_lim
     "Maximum field current (pu, system base)";
-  parameter Modelica.SIunits.PerUnit vOEL_max
+  parameter Modelica.Units.SI.PerUnit vOEL_max
     "Maximum output signal (pu, machine base)";
   parameter OpenIPSL.Types.ApparentPowerMega Sn=SysData.S_b
     "Power rating (MVA)" annotation (Dialog(group="Machine parameters"));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Controls/PSSE/ES/ESST4B.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Controls/PSSE/ES/ESST4B.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Controls/PSSE/ES/ESST4B.mo"	2022-03-10 09:57:38.456144183 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Controls/PSSE/ES/ESST4B.mo"	2022-03-10 09:58:01.844147147 +0000
@@ -3,7 +3,7 @@
   source-controlled rectifier exciter "
   extends OpenIPSL.Electrical.Controls.PSSE.ES.BaseClasses.BaseExciter;
   import Modelica.ComplexMath.j;
-  import Modelica.ComplexMath.'abs';
+  import Modelica.ComplexMath.abs;
   parameter Real T_R=0.3;
   parameter Real K_PR=2.97;
   parameter Real K_IR=2.97;
@@ -119,7 +119,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 - Bus.ir + j*(Gen_terminal.ii - Bus.ii);
   connect(add.y, limiter.u) annotation (Line(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Controls/PSSE/TG/GGOV1/GGOV1.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Controls/PSSE/TG/GGOV1/GGOV1.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Controls/PSSE/TG/GGOV1/GGOV1.mo"	2022-03-10 09:57:38.456144183 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Controls/PSSE/TG/GGOV1/GGOV1.mo"	2022-03-10 09:58:01.228147070 +0000
@@ -73,7 +73,7 @@
     annotation (Placement(transformation(extent={{-60,-88},{-38,-66}})));
   Modelica.Blocks.Math.Add LoadlimiterPI
     annotation (Placement(transformation(extent={{-168,56},{-152,72}})));
-  Modelica.Blocks.Nonlinear.DeadZone deadZone(uMax=db, deadZoneAtInit=false)
+  Modelica.Blocks.Nonlinear.DeadZone deadZone(uMax = db)
     annotation (Placement(transformation(extent={{-168,-84},{-148,-64}})));
   Modelica.Blocks.Nonlinear.Limiter limiterSerror(uMax=maxerr, uMin=minerr)
     annotation (Placement(transformation(extent={{-138,-84},{-118,-64}})));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Essentials/pfComponent.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Essentials/pfComponent.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Essentials/pfComponent.mo"	2022-03-10 09:57:38.456144183 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Essentials/pfComponent.mo"	2022-03-10 09:58:00.652146996 +0000
@@ -5,9 +5,9 @@
     "Must add this line in all models";
   parameter OpenIPSL.Types.VoltageKilo V_b=400 "Base voltage of the bus"
     annotation (Dialog(group="Power flow data"));
-  parameter Modelica.SIunits.PerUnit V_0=1 "Voltage magnitude (pu)"
+  parameter Modelica.Units.SI.PerUnit V_0=1 "Voltage magnitude (pu)"
     annotation (Dialog(group="Power flow data"));
-  parameter Modelica.SIunits.Conversions.NonSIunits.Angle_deg angle_0=0
+  parameter Modelica.Units.NonSI.Angle_deg angle_0=0
     "Voltage angle" annotation (Dialog(group="Power flow data"));
   parameter OpenIPSL.Types.ActivePowerMega P_0=1 "Active power"
     annotation (Dialog(group="Power flow data"));
@@ -16,7 +16,7 @@
   parameter OpenIPSL.Types.ApparentPowerMega S_b=SysData.S_b
     "System base power"
     annotation (Dialog(group="Power flow data", enable=false));
-  parameter Modelica.SIunits.Frequency fn=SysData.fn "System Frequeny"
+  parameter Modelica.Units.SI.Frequency fn=SysData.fn "System Frequeny"
     annotation (Dialog(group="Power flow data", enable=false));
   annotation (Documentation);
 end pfComponent;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Loads/NoiseInjections/SineNoiseInjection.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Loads/NoiseInjections/SineNoiseInjection.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Loads/NoiseInjections/SineNoiseInjection.mo"	2022-03-10 09:57:38.456144183 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Loads/NoiseInjections/SineNoiseInjection.mo"	2022-03-10 09:58:00.508146979 +0000
@@ -2,15 +2,14 @@
 model SineNoiseInjection
   extends BaseClass;
   parameter Real amplitude=1 "Amplitude of sine wave";
-  parameter Modelica.SIunits.Frequency freqHz(start=1) "Frequency of sine wave";
-  parameter Modelica.SIunits.Angle phase=0 "Phase of sine wave";
+  parameter Modelica.Units.SI.Frequency freqHz(start=1) "Frequency of sine wave";
+  parameter Modelica.Units.SI.Angle phase=0 "Phase of sine wave";
   parameter Real offset=0 "Offset of output signal";
-  parameter Modelica.SIunits.Time startTime=0
+  parameter Modelica.Units.SI.Time startTime=0
     "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 1.5.0/Electrical/Loads/PSAT/BaseClasses/baseLoad.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Loads/PSAT/BaseClasses/baseLoad.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Loads/PSAT/BaseClasses/baseLoad.mo"	2022-03-10 09:57:38.456144183 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Loads/PSAT/BaseClasses/baseLoad.mo"	2022-03-10 09:58:00.440146970 +0000
@@ -3,16 +3,16 @@
   import Modelica.Constants.pi;
   extends OpenIPSL.Electrical.Essentials.pfComponent;
   parameter OpenIPSL.Types.ApparentPowerMega Sn=S_b "Power rating (MVA)";
-  Modelica.SIunits.PerUnit V(start=V_0) "Voltage magnitude (pu)";
-  Modelica.SIunits.Angle Angle_V(start=Modelica.SIunits.Conversions.from_deg(
+  Modelica.Units.SI.PerUnit V(start=V_0) "Voltage magnitude (pu)";
+  Modelica.Units.SI.Angle Angle_V(start=Modelica.Units.Conversions.from_deg(
         angle_0)) "voltage angle (rad)";
-  Modelica.SIunits.PerUnit P(start=P_0/S_b) "Active power (pu)";
-  Modelica.SIunits.PerUnit Q(start=Q_0/S_b) "Reactive power (pu)";
+  Modelica.Units.SI.PerUnit P(start=P_0/S_b) "Active power (pu)";
+  Modelica.Units.SI.PerUnit Q(start=Q_0/S_b) "Reactive power (pu)";
   Interfaces.PwPin p(vr(start=V_0*cos(angle_0rad)),vi(start=V_0*sin(angle_0rad)))
     annotation (Placement(transformation(extent={{-10,90},{10,110}})));
 protected
-  parameter Modelica.SIunits.Angle angle_0rad=
-      Modelica.SIunits.Conversions.from_deg(angle_0);
+  parameter Modelica.Units.SI.Angle angle_0rad=
+      Modelica.Units.Conversions.from_deg(angle_0);
   parameter Real CoB=Sn/S_b "Change of base between Machine and System";
 equation
   P = p.vr*p.ir + p.vi*p.ii;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Loads/PSAT/LOADPQ.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Loads/PSAT/LOADPQ.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Loads/PSAT/LOADPQ.mo"	2022-03-10 09:57:38.456144183 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Loads/PSAT/LOADPQ.mo"	2022-03-10 09:58:00.372146961 +0000
@@ -1,9 +1,9 @@
 within OpenIPSL.Electrical.Loads.PSAT;
 model LOADPQ "Constant PQ Load"
   extends BaseClasses.baseLoad;
-  parameter Modelica.SIunits.PerUnit Vmax=1.2 "maximum voltage"
+  parameter Modelica.Units.SI.PerUnit Vmax=1.2 "maximum voltage"
     annotation (Evaluate=true, Dialog(tab="To Be Implemented"));
-  parameter Modelica.SIunits.PerUnit Vmin=0.8 "minimum voltage"
+  parameter Modelica.Units.SI.PerUnit Vmin=0.8 "minimum voltage"
     annotation (Evaluate=true, Dialog(tab="To Be Implemented"));
   parameter Boolean forcePQ=true
     "force constant PQ-load, false may cause simulation problems" annotation (
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Loads/PSAT/LOADPQ_variation.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Loads/PSAT/LOADPQ_variation.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Loads/PSAT/LOADPQ_variation.mo"	2022-03-10 09:57:38.456144183 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Loads/PSAT/LOADPQ_variation.mo"	2022-03-10 09:58:00.356146960 +0000
@@ -2,10 +2,10 @@
 model LOADPQ_variation
   "Equations come from the mathematical separation in between reals and imaginary of S=P+jQ=UI*"
   extends BaseClasses.baseLoad;
-  parameter Modelica.SIunits.Time t_start_1=1
+  parameter Modelica.Units.SI.Time t_start_1=1
     "Start time of first load variation (s)"
     annotation (Dialog(group="Variation 1"));
-  parameter Modelica.SIunits.Time t_end_1=2
+  parameter Modelica.Units.SI.Time t_end_1=2
     "End time of first load variation (s)"
     annotation (Dialog(group="Variation 1"));
   parameter OpenIPSL.Types.ActivePowerMega dP1=0
@@ -13,10 +13,10 @@
   parameter OpenIPSL.Types.ReactivePowerMega dQ1=0
     "First reactive load variation (Mvar)"
     annotation (Dialog(group="Variation 1"));
-  parameter Modelica.SIunits.Time t_start_2=2
+  parameter Modelica.Units.SI.Time t_start_2=2
     "Start time of second Load variation (s)"
     annotation (Dialog(group="Variation 2"));
-  parameter Modelica.SIunits.Time t_end_2=3
+  parameter Modelica.Units.SI.Time t_end_2=3
     "End time of second load variation (s)"
     annotation (Dialog(group="Variation 2"));
   parameter OpenIPSL.Types.ActivePowerMega dP2=0
@@ -25,9 +25,9 @@
   parameter OpenIPSL.Types.ReactivePowerMega dQ2=0
     "Second reactive load variation (Mvar)"
     annotation (Dialog(group="Variation 2"));
-  parameter Modelica.SIunits.PerUnit Vmax=1.2 "maximum voltage (pu)"
+  parameter Modelica.Units.SI.PerUnit Vmax=1.2 "maximum voltage (pu)"
     annotation (Evaluate=true, Dialog(tab="To Be Implemented"));
-  parameter Modelica.SIunits.PerUnit Vmin=0.8 "minimum voltage (pu)"
+  parameter Modelica.Units.SI.PerUnit Vmin=0.8 "minimum voltage (pu)"
     annotation (Evaluate=true, Dialog(tab="To Be Implemented"));
   parameter Boolean forcePQ=true
     "force ''constant'' PQ-load, false may cause simulation problems"
@@ -36,9 +36,9 @@
     choices(checkBox=true),
     Dialog(tab="To Be Implemented"));
 protected
-  Modelica.SIunits.PerUnit Pd(start=P_0/S_b) "active
+  Modelica.Units.SI.PerUnit Pd(start=P_0/S_b) "active
   power demand";
-  Modelica.SIunits.PerUnit Qd(start=Q_0/S_b) "reactive power demand";
+  Modelica.Units.SI.PerUnit Qd(start=Q_0/S_b) "reactive power demand";
 equation
   // forcePQ=false needs better implementation
   if forcePQ or initial() then
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Loads/PSSE/BaseClasses/baseLoad.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Loads/PSSE/BaseClasses/baseLoad.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Loads/PSSE/BaseClasses/baseLoad.mo"	2022-03-10 09:57:38.456144183 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Loads/PSSE/BaseClasses/baseLoad.mo"	2022-03-10 09:58:00.220146942 +0000
@@ -21,12 +21,12 @@
     ir(start=ir0),
     ii(start=ii0))
     annotation (Placement(transformation(extent={{-10,90},{10,110}})));
-  Modelica.SIunits.Angle angle(start=anglev_rad) "Bus voltage angle";
+  Modelica.Units.SI.Angle angle(start=anglev_rad) "Bus voltage angle";
   Real v(start=V_0) "Bus voltage magnitude (pu)";
   Real P "Active power consumption (pu)";
   Real Q "Reactive power consumption (pu)";
 protected
-  parameter Modelica.SIunits.Angle anglev_rad=angle_0*pi/180;
+  parameter Modelica.Units.SI.Angle anglev_rad=angle_0*pi/180;
   parameter Real p0=(S_i.re*V_0 + S_y.re*V_0^2 + S_p.re)/S_b "pu";
   parameter Real q0=(S_i.im*V_0 + S_y.im*V_0^2 + S_p.im)/S_b "pu";
   parameter Real vr0=V_0*cos(anglev_rad) "Initialitation";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Loads/PSSE/Load_ExtInput.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Loads/PSSE/Load_ExtInput.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Loads/PSSE/Load_ExtInput.mo"	2022-03-10 09:57:38.456144183 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Loads/PSSE/Load_ExtInput.mo"	2022-03-10 09:58:00.192146939 +0000
@@ -2,8 +2,8 @@
 model Load_ExtInput "PSS/E Load with variation"
   extends OpenIPSL.Electrical.Loads.PSSE.BaseClasses.baseLoad;
   parameter Real d_P "Active Load Variation (pu)";
-  parameter Modelica.SIunits.Time t1 "Time of Load Variation";
-  parameter Modelica.SIunits.Time d_t "Time duration of load variation";
+  parameter Modelica.Units.SI.Time t1 "Time of Load Variation";
+  parameter Modelica.Units.SI.Time d_t "Time duration of load variation";
 protected
   parameter Real PF=if q0 == 0 then 1 else p0/q0;
   parameter Real d_Q=(p0 + d_P)/PF - q0;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Loads/PSSE/Load_switch.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Loads/PSSE/Load_switch.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Loads/PSSE/Load_switch.mo"	2022-03-10 09:57:38.456144183 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Loads/PSSE/Load_switch.mo"	2022-03-10 09:58:00.180146937 +0000
@@ -1,8 +1,8 @@
 within OpenIPSL.Electrical.Loads.PSSE;
 model Load_switch "PSS/E Load"
   extends OpenIPSL.Electrical.Loads.PSSE.BaseClasses.baseLoad;
-  parameter Modelica.SIunits.Time t1 "Time of switching on";
-  parameter Modelica.SIunits.Time t2 "Time of switching off";
+  parameter Modelica.Units.SI.Time t1 "Time of switching on";
+  parameter Modelica.Units.SI.Time t2 "Time of switching off";
 equation
   if time >= t1 and time < t2 then
     kI*S_I.re*v + S_Y.re*v^2 + kP*S_P.re = p.vr*p.ir + p.vi*p.ii;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Loads/PSSE/Load_variation.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Loads/PSSE/Load_variation.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Loads/PSSE/Load_variation.mo"	2022-03-10 09:57:38.456144183 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Loads/PSSE/Load_variation.mo"	2022-03-10 09:58:00.168146936 +0000
@@ -2,8 +2,8 @@
 model Load_variation "PSS/E Load with variation"
   extends BaseClasses.baseLoad;
   parameter Real d_P "Active Load Variation (pu)";
-  parameter Modelica.SIunits.Time t1 "Time of Load Variation";
-  parameter Modelica.SIunits.Time d_t "Time duration of load variation";
+  parameter Modelica.Units.SI.Time t1 "Time of Load Variation";
+  parameter Modelica.Units.SI.Time d_t "Time duration of load variation";
 protected
   parameter Real PF=if q0 == 0 then 1 else p0/q0;
   parameter Real d_Q=(p0 + d_P)/PF - q0;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Machines/PSAT/BaseClasses/baseMachine.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Machines/PSAT/BaseClasses/baseMachine.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Machines/PSAT/BaseClasses/baseMachine.mo"	2022-03-10 09:57:38.456144183 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Machines/PSAT/BaseClasses/baseMachine.mo"	2022-03-10 09:58:00.136146932 +0000
@@ -2,7 +2,7 @@
 partial model baseMachine
   extends OpenIPSL.Electrical.Essentials.pfComponent;
   import Modelica.Constants.pi;
-  import SI = Modelica.SIunits;
+  import Modelica.Units.SI;
   import CM = Modelica.ComplexMath;
   import Complex;
   parameter OpenIPSL.Types.ApparentPowerMega Sn "Power rating (MVA)"
@@ -77,7 +77,7 @@
         origin={-120,-50},
         extent={{-20,-20},{20,20}},
         rotation=0)));
-  SI.Angle anglev(start=SI.Conversions.from_deg(angle_0))
+  SI.Angle anglev(start=Modelica.Units.Conversions.from_deg(angle_0))
     " Bus voltage angle (rad)";
   Real vd(start=vd0) "d-axis voltage (pu)";
   Real vq(start=vq0) "q-axis voltage (pu)";
@@ -99,7 +99,7 @@
     "Initial active power generation in pu (system base)";
   parameter SI.PerUnit q0=Q_0/S_b
     "Initial reactive power generation in pu (system base)";
-  parameter Complex Vt0=CM.fromPolar(V_0, SI.Conversions.from_deg(angle_0))
+  parameter Complex Vt0=CM.fromPolar(V_0, Modelica.Units.Conversions.from_deg(angle_0))
     "Init. val., conjugate";
   parameter Complex S0(re=p0, im=-q0) "Init. val., conjugate";
   parameter Complex I0=S0/(CM.conj(Vt0)) "Init. val., conjugate";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Machines/PSSE/BaseClasses/baseMachine.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Machines/PSSE/BaseClasses/baseMachine.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Machines/PSSE/BaseClasses/baseMachine.mo"	2022-03-10 09:57:38.456144183 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Machines/PSSE/BaseClasses/baseMachine.mo"	2022-03-10 09:57:59.892146900 +0000
@@ -5,7 +5,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 1.5.0/Electrical/Machines/PSSE/GENROE.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Machines/PSSE/GENROE.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Machines/PSSE/GENROE.mo"	2022-03-10 09:57:38.456144183 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Machines/PSSE/GENROE.mo"	2022-03-10 09:57:59.848146894 +0000
@@ -5,7 +5,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;
@@ -56,7 +56,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 Real abs_PSIpp0='abs'(PSIpp0)
+  parameter Real 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 1.5.0/Electrical/Machines/PSSE/GENROU.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Machines/PSSE/GENROU.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Machines/PSSE/GENROU.mo"	2022-03-10 09:57:38.456144183 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Machines/PSSE/GENROU.mo"	2022-03-10 09:57:59.820146892 +0000
@@ -5,7 +5,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;
@@ -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 Real abs_PSIpp0='abs'(PSIpp0)
+  parameter Real 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 1.5.0/Electrical/Machines/PSSE/GENSAE.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Machines/PSSE/GENSAE.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Machines/PSSE/GENSAE.mo"	2022-03-10 09:57:38.456144183 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Machines/PSSE/GENSAE.mo"	2022-03-10 09:57:59.784146886 +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 1.5.0/Electrical/Machines/PSSE/GENSAL.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Machines/PSSE/GENSAL.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Machines/PSSE/GENSAL.mo"	2022-03-10 09:57:38.456144183 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Machines/PSSE/GENSAL.mo"	2022-03-10 09:57:59.768146884 +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 1.5.0/Electrical/SystemBase.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/SystemBase.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/SystemBase.mo"	2022-03-10 09:57:38.460144184 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/SystemBase.mo"	2022-03-10 09:57:59.336146830 +0000
@@ -1,7 +1,7 @@
 within OpenIPSL.Electrical;
 record SystemBase "System Base Definition"
   parameter OpenIPSL.Types.ApparentPowerMega S_b=100 "System base";
-  parameter Modelica.SIunits.Frequency fn=50 "System Frequency";
+  parameter Modelica.Units.SI.Frequency fn=50 "System Frequency";
   annotation (
     Icon(coordinateSystem(
         preserveAspectRatio=false,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Wind/GE/Type_3/Electrical_Control/lim_exc_s1.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Wind/GE/Type_3/Electrical_Control/lim_exc_s1.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Wind/GE/Type_3/Electrical_Control/lim_exc_s1.mo"	2022-03-10 09:57:38.460144184 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Wind/GE/Type_3/Electrical_Control/lim_exc_s1.mo"	2022-03-10 09:57:59.264146821 +0000
@@ -1,6 +1,6 @@
 within OpenIPSL.Electrical.Wind.GE.Type_3.Electrical_Control;
 model lim_exc_s1
-  extends Modelica.Blocks.Interfaces.BlockIcon;
+  extends Modelica.Blocks.Icons.Block;
   parameter Real xiqmin=1;
   parameter Real xiqmax=1;
   parameter Real typpe=1;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Wind/GE/Type_3/Turbine/Cp_function.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Wind/GE/Type_3/Turbine/Cp_function.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Wind/GE/Type_3/Turbine/Cp_function.mo"	2022-03-10 09:57:38.460144184 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Wind/GE/Type_3/Turbine/Cp_function.mo"	2022-03-10 09:57:59.096146799 +0000
@@ -1,6 +1,6 @@
 within OpenIPSL.Electrical.Wind.GE.Type_3.Turbine;
 model Cp_function
-  extends Modelica.Blocks.Interfaces.BlockIcon;
+  extends Modelica.Blocks.Icons.Block;
   Modelica.Blocks.Interfaces.RealInput Lambda "Lambda" annotation (Placement(
       transformation(
         extent={{-140.0,40.0},{-100.0,80.0}},
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Wind/GE/Type_3/Turbine/Multi_Powers.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Wind/GE/Type_3/Turbine/Multi_Powers.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Wind/GE/Type_3/Turbine/Multi_Powers.mo"	2022-03-10 09:57:38.460144184 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Wind/GE/Type_3/Turbine/Multi_Powers.mo"	2022-03-10 09:57:59.068146797 +0000
@@ -1,6 +1,6 @@
 within OpenIPSL.Electrical.Wind.GE.Type_3.Turbine;
 block Multi_Powers "Multiplexer block for four input connectors"
-  extends Modelica.Blocks.Interfaces.BlockIcon;
+  extends Modelica.Blocks.Icons.Block;
   Modelica.Blocks.Interfaces.RealInput u1 "Input" annotation (Placement(
         transformation(extent={{-140,70},{-100,110}}, rotation=0)));
   Modelica.Blocks.Interfaces.RealOutput y[5] "Multiple powers of the input"
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Wind/PSSE/WT3G/WT3E1.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Wind/PSSE/WT3G/WT3E1.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Wind/PSSE/WT3G/WT3E1.mo"	2022-03-10 09:57:38.460144184 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Electrical/Wind/PSSE/WT3G/WT3E1.mo"	2022-03-10 09:57:58.596146737 +0000
@@ -1,4 +1,4 @@
-within OpenIPSL.Electrical.Wind.PSSE.WT3G;
+within OpenIPSL.Electrical.Wind.PSSE.WT3G;
 model WT3E1
   parameter Integer VARFLG
     "0 constant Q; 1 Reactive control; -1 Constant PF control" annotation (
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Examples/Branches/PSAT/PhaseShiftingTransformer_Test.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Examples/Branches/PSAT/PhaseShiftingTransformer_Test.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Examples/Branches/PSAT/PhaseShiftingTransformer_Test.mo"	2022-03-10 09:57:38.460144184 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Examples/Branches/PSAT/PhaseShiftingTransformer_Test.mo"	2022-03-10 09:57:58.244146691 +0000
@@ -33,7 +33,7 @@
     dP1=0.02,
     dP2=-0.02)
     annotation (Placement(transformation(extent={{110,-10},{130,10}})));
-  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(visible=true, transformation(
         origin={-135.783,37.4652},
         extent={{-4.4802,-4.4802},{4.4802,4.4802}},
@@ -45,7 +45,7 @@
         rotation=0)));
   Modelica.Blocks.Sources.Sine sine2(
     amplitude=0.001,
-    freqHz=0.2,
+f    =0.2,
     startTime=5) annotation (Placement(visible=true, transformation(
         origin={-135.382,20.4802},
         extent={{-4.4802,-4.4802},{4.4802,4.4802}},
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Examples/Branches/PSAT/ThreeWindingTransformer_Test.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Examples/Branches/PSAT/ThreeWindingTransformer_Test.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Examples/Branches/PSAT/ThreeWindingTransformer_Test.mo"	2022-03-10 09:57:38.460144184 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Examples/Branches/PSAT/ThreeWindingTransformer_Test.mo"	2022-03-10 09:57:58.196146686 +0000
@@ -17,7 +17,7 @@
         origin={40,20},
         extent={{-10.0,-10.0},{10.0,10.0}},
         rotation=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(visible=true, transformation(
         origin={-107.783,15.4652},
         extent={{-4.4802,-4.4802},{4.4802,4.4802}},
@@ -29,7 +29,7 @@
         rotation=0)));
   Modelica.Blocks.Sources.Sine sine2(
     amplitude=0.001,
-    freqHz=0.2,
+f    =0.2,
     startTime=5) annotation (Placement(visible=true, transformation(
         origin={-107.3823,-5.5198},
         extent={{-4.4802,-4.4802},{4.4802,4.4802}},
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Examples/Branches/PSAT/ULTC_Test.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Examples/Branches/PSAT/ULTC_Test.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Examples/Branches/PSAT/ULTC_Test.mo"	2022-03-10 09:57:38.460144184 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Examples/Branches/PSAT/ULTC_Test.mo"	2022-03-10 09:57:58.156146680 +0000
@@ -17,7 +17,7 @@
         origin={30,10},
         extent={{-10.0,-10.0},{10.0,10.0}},
         rotation=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(visible=true, transformation(
         origin={-132.783,10.4652},
         extent={{-4.4802,-4.4802},{4.4802,4.4802}},
@@ -29,7 +29,7 @@
         rotation=0)));
   Modelica.Blocks.Sources.Sine sine2(
     amplitude=0.001,
-    freqHz=0.2,
+f    =0.2,
     startTime=5) annotation (Placement(visible=true, transformation(
         origin={-132.382,-10.5198},
         extent={{-4.4802,-4.4802},{4.4802,4.4802}},
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Examples/Controls/PSAT/TG/TGTypeIII_test.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Examples/Controls/PSAT/TG/TGTypeIII_test.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Examples/Controls/PSAT/TG/TGTypeIII_test.mo"	2022-03-10 09:57:38.460144184 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Examples/Controls/PSAT/TG/TGTypeIII_test.mo"	2022-03-10 09:57:57.956146656 +0000
@@ -40,13 +40,13 @@
     amplitude=0.001,
     offset=1,
     startTime=5,
-    freqHz=0.1)
+f    =0.1)
     annotation (Placement(transformation(extent={{-86,-36},{-72,-22}})));
   Modelica.Blocks.Sources.Sine sine1(
     amplitude=-0.001,
     startTime=10,
     offset=0,
-    freqHz=0.1)
+f    =0.1)
     annotation (Placement(transformation(extent={{-86,-60},{-72,-46}})));
   Modelica.Blocks.Math.Add add
     annotation (Placement(transformation(extent={{-56,-46},{-42,-32}})));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Examples/Controls/PSAT/TG/TGTypeVI_test.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Examples/Controls/PSAT/TG/TGTypeVI_test.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Examples/Controls/PSAT/TG/TGTypeVI_test.mo"	2022-03-10 09:57:38.460144184 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Examples/Controls/PSAT/TG/TGTypeVI_test.mo"	2022-03-10 09:57:57.884146646 +0000
@@ -85,7 +85,7 @@
         extent={{-10.0,-10.0},{10.0,10.0}},
         rotation=0)));
   Modelica.Blocks.Sources.Sine sine3(
-    freqHz=0.2,
+    f =0.2,
     startTime=10,
     amplitude=-0.001,
     offset=0) annotation (Placement(visible=true, transformation(
@@ -98,7 +98,7 @@
         extent={{-6.3229,-6.3229},{6.3229,6.3229}},
         rotation=0)));
   Modelica.Blocks.Sources.Sine sine4(
-    freqHz=0.2,
+    f =0.2,
     startTime=5,
     amplitude=0.001,
     offset=1) annotation (Placement(visible=true, transformation(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Examples/Controls/PSAT/TG/TGTypeV_test.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Examples/Controls/PSAT/TG/TGTypeV_test.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Examples/Controls/PSAT/TG/TGTypeV_test.mo"	2022-03-10 09:57:38.460144184 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Examples/Controls/PSAT/TG/TGTypeV_test.mo"	2022-03-10 09:57:57.828146638 +0000
@@ -82,7 +82,7 @@
     annotation (Placement(transformation(extent={{-78,-22},{-56,-6}})));
   Modelica.Blocks.Sources.Sine sine(
     amplitude=0.001,
-    freqHz=0.2,
+f    =0.2,
     offset=1,
     startTime=5) annotation (Placement(transformation(
         extent={{-6,6},{6,-6}},
@@ -90,7 +90,7 @@
         origin={46,-40})));
   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 1.5.0/Examples/Loads/PSAT/Loadtestexponentialrecovery.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Examples/Loads/PSAT/Loadtestexponentialrecovery.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Examples/Loads/PSAT/Loadtestexponentialrecovery.mo"	2022-03-10 09:57:38.460144184 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Examples/Loads/PSAT/Loadtestexponentialrecovery.mo"	2022-03-10 09:57:57.220146561 +0000
@@ -53,7 +53,7 @@
         origin={-107.7833,25.985},
         extent={{-5.0,-5.0},{5.0,5.0}},
         rotation=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(visible=true, transformation(
         origin={-107.7833,10.4652},
         extent={{-4.4802,-4.4802},{4.4802,4.4802}},
@@ -65,14 +65,14 @@
         rotation=0)));
   Modelica.Blocks.Sources.Sine sine2(
     amplitude=0.001,
-    freqHz=0.2,
+f    =0.2,
     startTime=5) annotation (Placement(visible=true, transformation(
         origin={-107.3823,-5.5198},
         extent={{-4.4802,-4.4802},{4.4802,4.4802}},
         rotation=0)));
   Modelica.Blocks.Sources.Sine sine3(
     amplitude=0.001,
-    freqHz=0.2,
+f    =0.2,
     startTime=10) annotation (Placement(visible=true, transformation(
         origin={-107.3823,-76.5048},
         extent={{-4.4802,-4.4802},{4.4802,4.4802}},
@@ -84,7 +84,7 @@
         rotation=0)));
   Modelica.Blocks.Sources.Sine sine4(
     amplitude=0.001,
-    freqHz=0.2,
+f    =0.2,
     startTime=5) annotation (Placement(visible=true, transformation(
         origin={-107.7833,-60.5198},
         extent={{-4.4802,-4.4802},{4.4802,4.4802}},
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Examples/Loads/PSAT/Loadtestfreq.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Examples/Loads/PSAT/Loadtestfreq.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Examples/Loads/PSAT/Loadtestfreq.mo"	2022-03-10 09:57:38.460144184 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Examples/Loads/PSAT/Loadtestfreq.mo"	2022-03-10 09:57:57.128146549 +0000
@@ -53,7 +53,7 @@
         origin={-107.7833,25.985},
         extent={{-5.0,-5.0},{5.0,5.0}},
         rotation=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(visible=true, transformation(
         origin={-107.7833,10.4652},
         extent={{-4.4802,-4.4802},{4.4802,4.4802}},
@@ -65,14 +65,14 @@
         rotation=0)));
   Modelica.Blocks.Sources.Sine sine2(
     amplitude=0.001,
-    freqHz=0.2,
+f    =0.2,
     startTime=5) annotation (Placement(visible=true, transformation(
         origin={-107.3823,-5.5198},
         extent={{-4.4802,-4.4802},{4.4802,4.4802}},
         rotation=0)));
   Modelica.Blocks.Sources.Sine sine3(
     amplitude=0.001,
-    freqHz=0.2,
+f    =0.2,
     startTime=10) annotation (Placement(visible=true, transformation(
         origin={-107.3823,-76.5048},
         extent={{-4.4802,-4.4802},{4.4802,4.4802}},
@@ -84,7 +84,7 @@
         rotation=0)));
   Modelica.Blocks.Sources.Sine sine4(
     amplitude=0.001,
-    freqHz=0.2,
+f    =0.2,
     startTime=5) annotation (Placement(visible=true, transformation(
         origin={-107.7833,-60.5198},
         extent={{-4.4802,-4.4802},{4.4802,4.4802}},
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Examples/Loads/PSAT/Loadtestmixed.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Examples/Loads/PSAT/Loadtestmixed.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Examples/Loads/PSAT/Loadtestmixed.mo"	2022-03-10 09:57:38.460144184 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Examples/Loads/PSAT/Loadtestmixed.mo"	2022-03-10 09:57:57.056146541 +0000
@@ -53,7 +53,7 @@
         origin={-107.7833,25.985},
         extent={{-5.0,-5.0},{5.0,5.0}},
         rotation=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(visible=true, transformation(
         origin={-107.7833,10.4652},
         extent={{-4.4802,-4.4802},{4.4802,4.4802}},
@@ -65,14 +65,14 @@
         rotation=0)));
   Modelica.Blocks.Sources.Sine sine2(
     amplitude=0.001,
-    freqHz=0.2,
+f    =0.2,
     startTime=5) annotation (Placement(visible=true, transformation(
         origin={-107.3823,-5.5198},
         extent={{-4.4802,-4.4802},{4.4802,4.4802}},
         rotation=0)));
   Modelica.Blocks.Sources.Sine sine3(
     amplitude=0.001,
-    freqHz=0.2,
+f    =0.2,
     startTime=10) annotation (Placement(visible=true, transformation(
         origin={-107.3823,-76.5048},
         extent={{-4.4802,-4.4802},{4.4802,4.4802}},
@@ -84,7 +84,7 @@
         rotation=0)));
   Modelica.Blocks.Sources.Sine sine4(
     amplitude=0.001,
-    freqHz=0.2,
+f    =0.2,
     startTime=5) annotation (Placement(visible=true, transformation(
         origin={-107.7833,-60.5198},
         extent={{-4.4802,-4.4802},{4.4802,4.4802}},
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Examples/Loads/PSAT/Loadtestpq.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Examples/Loads/PSAT/Loadtestpq.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Examples/Loads/PSAT/Loadtestpq.mo"	2022-03-10 09:57:38.460144184 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Examples/Loads/PSAT/Loadtestpq.mo"	2022-03-10 09:57:56.992146533 +0000
@@ -53,7 +53,7 @@
         origin={-107.7833,25.985},
         extent={{-5.0,-5.0},{5.0,5.0}},
         rotation=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(visible=true, transformation(
         origin={-107.7833,10.4652},
         extent={{-4.4802,-4.4802},{4.4802,4.4802}},
@@ -65,14 +65,14 @@
         rotation=0)));
   Modelica.Blocks.Sources.Sine sine2(
     amplitude=0.001,
-    freqHz=0.2,
+f    =0.2,
     startTime=5) annotation (Placement(visible=true, transformation(
         origin={-107.3823,-5.5198},
         extent={{-4.4802,-4.4802},{4.4802,4.4802}},
         rotation=0)));
   Modelica.Blocks.Sources.Sine sine3(
     amplitude=0.001,
-    freqHz=0.2,
+f    =0.2,
     startTime=10) annotation (Placement(visible=true, transformation(
         origin={-107.3823,-76.5048},
         extent={{-4.4802,-4.4802},{4.4802,4.4802}},
@@ -84,7 +84,7 @@
         rotation=0)));
   Modelica.Blocks.Sources.Sine sine4(
     amplitude=0.001,
-    freqHz=0.2,
+f    =0.2,
     startTime=5) annotation (Placement(visible=true, transformation(
         origin={-107.7833,-60.5198},
         extent={{-4.4802,-4.4802},{4.4802,4.4802}},
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Examples/Loads/PSAT/Loadtestvoltagedependantload.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Examples/Loads/PSAT/Loadtestvoltagedependantload.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Examples/Loads/PSAT/Loadtestvoltagedependantload.mo"	2022-03-10 09:57:38.460144184 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Examples/Loads/PSAT/Loadtestvoltagedependantload.mo"	2022-03-10 09:57:56.928146525 +0000
@@ -53,7 +53,7 @@
         origin={-107.7833,25.985},
         extent={{-5.0,-5.0},{5.0,5.0}},
         rotation=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(visible=true, transformation(
         origin={-107.7833,10.4652},
         extent={{-4.4802,-4.4802},{4.4802,4.4802}},
@@ -65,14 +65,14 @@
         rotation=0)));
   Modelica.Blocks.Sources.Sine sine2(
     amplitude=0.001,
-    freqHz=0.2,
+f    =0.2,
     startTime=5) annotation (Placement(visible=true, transformation(
         origin={-107.3823,-5.5198},
         extent={{-4.4802,-4.4802},{4.4802,4.4802}},
         rotation=0)));
   Modelica.Blocks.Sources.Sine sine3(
     amplitude=0.001,
-    freqHz=0.2,
+f    =0.2,
     startTime=10) annotation (Placement(visible=true, transformation(
         origin={-107.3823,-76.5048},
         extent={{-4.4802,-4.4802},{4.4802,4.4802}},
@@ -84,7 +84,7 @@
         rotation=0)));
   Modelica.Blocks.Sources.Sine sine4(
     amplitude=0.001,
-    freqHz=0.2,
+f    =0.2,
     startTime=5) annotation (Placement(visible=true, transformation(
         origin={-107.7833,-60.5198},
         extent={{-4.4802,-4.4802},{4.4802,4.4802}},
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Examples/Loads/PSAT/Loadtestzip.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Examples/Loads/PSAT/Loadtestzip.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Examples/Loads/PSAT/Loadtestzip.mo"	2022-03-10 09:57:38.460144184 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Examples/Loads/PSAT/Loadtestzip.mo"	2022-03-10 09:57:56.832146513 +0000
@@ -53,7 +53,7 @@
         origin={-107.7833,25.985},
         extent={{-5.0,-5.0},{5.0,5.0}},
         rotation=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(visible=true, transformation(
         origin={-107.7833,10.4652},
         extent={{-4.4802,-4.4802},{4.4802,4.4802}},
@@ -65,14 +65,14 @@
         rotation=0)));
   Modelica.Blocks.Sources.Sine sine2(
     amplitude=0.001,
-    freqHz=0.2,
+f    =0.2,
     startTime=5) annotation (Placement(visible=true, transformation(
         origin={-107.3823,-5.5198},
         extent={{-4.4802,-4.4802},{4.4802,4.4802}},
         rotation=0)));
   Modelica.Blocks.Sources.Sine sine3(
     amplitude=0.001,
-    freqHz=0.2,
+f    =0.2,
     startTime=10) annotation (Placement(visible=true, transformation(
         origin={-107.3823,-76.5048},
         extent={{-4.4802,-4.4802},{4.4802,4.4802}},
@@ -84,7 +84,7 @@
         rotation=0)));
   Modelica.Blocks.Sources.Sine sine4(
     amplitude=0.001,
-    freqHz=0.2,
+f    =0.2,
     startTime=5) annotation (Placement(visible=true, transformation(
         origin={-107.7833,-60.5198},
         extent={{-4.4802,-4.4802},{4.4802,4.4802}},
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Examples/Loads/PSAT/Loadtestzipjimma.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Examples/Loads/PSAT/Loadtestzipjimma.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Examples/Loads/PSAT/Loadtestzipjimma.mo"	2022-03-10 09:57:38.460144184 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Examples/Loads/PSAT/Loadtestzipjimma.mo"	2022-03-10 09:57:56.780146505 +0000
@@ -53,7 +53,7 @@
         origin={-107.7833,25.985},
         extent={{-5.0,-5.0},{5.0,5.0}},
         rotation=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(visible=true, transformation(
         origin={-107.7833,10.4652},
         extent={{-4.4802,-4.4802},{4.4802,4.4802}},
@@ -65,14 +65,14 @@
         rotation=0)));
   Modelica.Blocks.Sources.Sine sine2(
     amplitude=0.001,
-    freqHz=0.2,
+f    =0.2,
     startTime=5) annotation (Placement(visible=true, transformation(
         origin={-107.3823,-5.5198},
         extent={{-4.4802,-4.4802},{4.4802,4.4802}},
         rotation=0)));
   Modelica.Blocks.Sources.Sine sine3(
     amplitude=0.001,
-    freqHz=0.2,
+f    =0.2,
     startTime=10) annotation (Placement(visible=true, transformation(
         origin={-107.3823,-76.5048},
         extent={{-4.4802,-4.4802},{4.4802,4.4802}},
@@ -84,7 +84,7 @@
         rotation=0)));
   Modelica.Blocks.Sources.Sine sine4(
     amplitude=0.001,
-    freqHz=0.2,
+f    =0.2,
     startTime=5) annotation (Placement(visible=true, transformation(
         origin={-107.7833,-60.5198},
         extent={{-4.4802,-4.4802},{4.4802,4.4802}},
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Examples/Machines/PSAT/Order2test2_perturbation.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Examples/Machines/PSAT/Order2test2_perturbation.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Examples/Machines/PSAT/Order2test2_perturbation.mo"	2022-03-10 09:57:38.460144184 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Examples/Machines/PSAT/Order2test2_perturbation.mo"	2022-03-10 09:57:56.624146487 +0000
@@ -22,7 +22,7 @@
         origin={-95,35},
         extent={{-5,-5},{5,5}},
         rotation=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(visible=true, transformation(
         origin={-95,20},
         extent={{-5,-5},{5,5}},
@@ -34,14 +34,14 @@
         rotation=0)));
   Modelica.Blocks.Sources.Sine sine2(
     amplitude=0.001,
-    freqHz=0.2,
+f    =0.2,
     startTime=5) annotation (Placement(visible=true, transformation(
         origin={-95,5},
         extent={{-5,-5},{5,5}},
         rotation=0)));
   Modelica.Blocks.Sources.Sine sine3(
     amplitude=0.001,
-    freqHz=0.2,
+f    =0.2,
     startTime=10) annotation (Placement(visible=true, transformation(
         origin={-95,-75},
         extent={{-5,-5},{5,5}},
@@ -53,7 +53,7 @@
         rotation=0)));
   Modelica.Blocks.Sources.Sine sine4(
     amplitude=0.001,
-    freqHz=0.2,
+f    =0.2,
     startTime=5) annotation (Placement(visible=true, transformation(
         origin={-95,-55},
         extent={{-5,-5},{5,5}},
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Examples/Machines/PSAT/Order3test2_perturbation.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Examples/Machines/PSAT/Order3test2_perturbation.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Examples/Machines/PSAT/Order3test2_perturbation.mo"	2022-03-10 09:57:38.460144184 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Examples/Machines/PSAT/Order3test2_perturbation.mo"	2022-03-10 09:57:56.548146477 +0000
@@ -40,7 +40,7 @@
         origin={-95,35},
         extent={{-5,-5},{5,5}},
         rotation=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(visible=true, transformation(
         origin={-95,20},
         extent={{-5,-5},{5,5}},
@@ -52,14 +52,14 @@
         rotation=0)));
   Modelica.Blocks.Sources.Sine sine2(
     amplitude=0.001,
-    freqHz=0.2,
+f    =0.2,
     startTime=5) annotation (Placement(visible=true, transformation(
         origin={-95,5},
         extent={{-5,-5},{5,5}},
         rotation=0)));
   Modelica.Blocks.Sources.Sine sine3(
     amplitude=0.001,
-    freqHz=0.2,
+f    =0.2,
     startTime=10) annotation (Placement(visible=true, transformation(
         origin={-95,-75},
         extent={{-5,-5},{5,5}},
@@ -71,7 +71,7 @@
         rotation=0)));
   Modelica.Blocks.Sources.Sine sine4(
     amplitude=0.001,
-    freqHz=0.2,
+f    =0.2,
     startTime=5) annotation (Placement(visible=true, transformation(
         origin={-95,-55},
         extent={{-5,-5},{5,5}},
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Examples/Machines/PSAT/Order4test2_perturbation.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Examples/Machines/PSAT/Order4test2_perturbation.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Examples/Machines/PSAT/Order4test2_perturbation.mo"	2022-03-10 09:57:38.460144184 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/Examples/Machines/PSAT/Order4test2_perturbation.mo"	2022-03-10 09:57:56.432146461 +0000
@@ -35,7 +35,7 @@
         origin={-95,35},
         extent={{-5,-5},{5,5}},
         rotation=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(visible=true, transformation(
         origin={-95,20},
         extent={{-5,-5},{5,5}},
@@ -47,14 +47,14 @@
         rotation=0)));
   Modelica.Blocks.Sources.Sine sine2(
     amplitude=0.001,
-    freqHz=0.2,
+f    =0.2,
     startTime=5) annotation (Placement(visible=true, transformation(
         origin={-95,5},
         extent={{-5,-5},{5,5}},
         rotation=0)));
   Modelica.Blocks.Sources.Sine sine3(
     amplitude=0.001,
-    freqHz=0.2,
+f    =0.2,
     startTime=10) annotation (Placement(visible=true, transformation(
         origin={-95,-75},
         extent={{-5,-5},{5,5}},
@@ -66,7 +66,7 @@
         rotation=0)));
   Modelica.Blocks.Sources.Sine sine4(
     amplitude=0.001,
-    freqHz=0.2,
+f    =0.2,
     startTime=5) annotation (Placement(visible=true, transformation(
         origin={-95,-55},
         extent={{-5,-5},{5,5}},
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/NonElectrical/Continuous/DerivativeLag.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/NonElectrical/Continuous/DerivativeLag.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/NonElectrical/Continuous/DerivativeLag.mo"	2022-03-10 09:57:38.464144185 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/NonElectrical/Continuous/DerivativeLag.mo"	2022-03-10 09:57:56.024146411 +0000
@@ -2,7 +2,7 @@
 block DerivativeLag "Derivative lag transfer function blcok"
   extends Modelica.Blocks.Interfaces.SISO;
   parameter Real K "Gain";
-  parameter Modelica.SIunits.Time T "Time constan (s)";
+  parameter Modelica.Units.SI.Time T "Time constan (s)";
   parameter Real y_start "Output start value"
     annotation (Dialog(group="Initialization"));
   parameter Real x_start=0 "Start value of state variable"
@@ -17,9 +17,9 @@
     a={T_dummy,1})
     annotation (Placement(transformation(extent={{-8,-10},{12,10}})));
 protected
-  parameter Modelica.SIunits.Time T_dummy=if abs(T) < Modelica.Constants.eps
+  parameter Modelica.Units.SI.Time T_dummy=if abs(T) < Modelica.Constants.eps
        then 1000 else T "Lead time constant";
-  parameter Modelica.SIunits.Time K_dummy=if abs(K) < Modelica.Constants.eps
+  parameter Modelica.Units.SI.Time K_dummy=if abs(K) < Modelica.Constants.eps
        then 1 else K "Lead time constant";
 equation
   if abs(par1.y) < Modelica.Constants.eps then
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/NonElectrical/Continuous/LeadLag.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/NonElectrical/Continuous/LeadLag.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/NonElectrical/Continuous/LeadLag.mo"	2022-03-10 09:57:38.464144185 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/NonElectrical/Continuous/LeadLag.mo"	2022-03-10 09:57:55.996146406 +0000
@@ -2,8 +2,8 @@
 block LeadLag "Lead-Lag filter"
   extends Modelica.Blocks.Interfaces.SISO;
   parameter Real K "Gain";
-  parameter Modelica.SIunits.Time T1 "Lead time constant";
-  parameter Modelica.SIunits.Time T2 "Lag time constant";
+  parameter Modelica.Units.SI.Time T1 "Lead time constant";
+  parameter Modelica.Units.SI.Time T2 "Lag time constant";
   parameter Real y_start "Output start value"
     annotation (Dialog(group="Initialization"));
   parameter Real x_start=0 "Start value of state variable"
@@ -20,7 +20,7 @@
     x_start={x_start})
     annotation (Placement(transformation(extent={{-8,-10},{12,10}})));
 protected
-  parameter Modelica.SIunits.Time T2_dummy=if abs(T1 - T2) < Modelica.Constants.eps
+  parameter Modelica.Units.SI.Time T2_dummy=if abs(T1 - T2) < Modelica.Constants.eps
        then 1000 else T2 "Lead time constant";
 equation
   if abs(par1.y - par2.y) < Modelica.Constants.eps then
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/NonElectrical/Continuous/LeadLagLim.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/NonElectrical/Continuous/LeadLagLim.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/NonElectrical/Continuous/LeadLagLim.mo"	2022-03-10 09:57:38.464144185 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/NonElectrical/Continuous/LeadLagLim.mo"	2022-03-10 09:57:55.988146405 +0000
@@ -2,8 +2,8 @@
 block LeadLagLim "Lead-Lag filter with a non-windup limiter"
   extends Modelica.Blocks.Interfaces.SISO;
   parameter Real K "Gain";
-  parameter Modelica.SIunits.Time T1 "Lead time constant";
-  parameter Modelica.SIunits.Time T2 "Lag time constant";
+  parameter Modelica.Units.SI.Time T1 "Lead time constant";
+  parameter Modelica.Units.SI.Time T2 "Lag time constant";
   parameter Real outMax "Maximum output value";
   parameter Real outMin "Minimum output value";
   parameter Real y_start "Output start value"
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/NonElectrical/Continuous/SimpleLag.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/NonElectrical/Continuous/SimpleLag.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/NonElectrical/Continuous/SimpleLag.mo"	2022-03-10 09:57:38.464144185 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/NonElectrical/Continuous/SimpleLag.mo"	2022-03-10 09:57:55.936146400 +0000
@@ -5,7 +5,7 @@
     annotation (Placement(transformation(extent={{-58,32},{-38,52}})));
   Real state(start=y_start);
   parameter Real K "Gain";
-  parameter Modelica.SIunits.Time T "Lag time constant";
+  parameter Modelica.Units.SI.Time T "Lag time constant";
   parameter Real y_start "Output start value";
 protected
   parameter Real T_mod=if T < Modelica.Constants.eps then 1000 else T;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/NonElectrical/Continuous/SimpleLagLim.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/NonElectrical/Continuous/SimpleLagLim.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/NonElectrical/Continuous/SimpleLagLim.mo"	2022-03-10 09:57:38.464144185 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/NonElectrical/Continuous/SimpleLagLim.mo"	2022-03-10 09:57:55.924146398 +0000
@@ -6,7 +6,7 @@
     annotation (Placement(transformation(extent={{-58,32},{-38,52}})));
   Real state;
   parameter Real K "Gain";
-  parameter Modelica.SIunits.Time T "Lag time constant";
+  parameter Modelica.Units.SI.Time T "Lag time constant";
   parameter Real y_start "Output start value";
   parameter Real outMax "Maximum output value";
   parameter Real outMin "Minimum output value";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/NonElectrical/Continuous/SimpleLagLimVar.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/NonElectrical/Continuous/SimpleLagLimVar.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/NonElectrical/Continuous/SimpleLagLimVar.mo"	2022-03-10 09:57:38.464144185 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/NonElectrical/Continuous/SimpleLagLimVar.mo"	2022-03-10 09:57:55.916146396 +0000
@@ -15,7 +15,7 @@
   Modelica.Blocks.Sources.RealExpression const(y=T)
     annotation (Placement(transformation(extent={{-58,32},{-38,52}})));
   parameter Real K "Gain";
-  parameter Modelica.SIunits.Time T "Lag time constant";
+  parameter Modelica.Units.SI.Time T "Lag time constant";
   parameter Real y_start "Output start value";
   parameter Real T_mod=if T < Modelica.Constants.eps then 1000 else T;
   Real state;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/NonElectrical/Continuous/SimpleLagRateLimBlock.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/NonElectrical/Continuous/SimpleLagRateLimBlock.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/NonElectrical/Continuous/SimpleLagRateLimBlock.mo"	2022-03-10 09:57:38.464144185 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/NonElectrical/Continuous/SimpleLagRateLimBlock.mo"	2022-03-10 09:57:55.904146396 +0000
@@ -3,7 +3,7 @@
   "First order lag transfer function block with a non windup limiter, rate limits and blocking input"
   extends Modelica.Blocks.Interfaces.SISO(y(start=y_start));
   parameter Real K "Gain" annotation (Evaluate=false);
-  parameter Modelica.SIunits.Time T "Lag time constant"
+  parameter Modelica.Units.SI.Time T "Lag time constant"
     annotation (Evaluate=false);
   parameter Real y_start "Output start value"
     annotation (Dialog(group="Initialization"));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/NonElectrical/Continuous/SimpleLagRateLimVar.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/NonElectrical/Continuous/SimpleLagRateLimVar.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/NonElectrical/Continuous/SimpleLagRateLimVar.mo"	2022-03-10 09:57:38.464144185 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/NonElectrical/Continuous/SimpleLagRateLimVar.mo"	2022-03-10 09:57:55.884146392 +0000
@@ -2,7 +2,7 @@
 block SimpleLagRateLimVar
   "First order lag transfer function block with a non windup limiter, rate limits, variable output limits and blocking input"
   extends Modelica.Blocks.Interfaces.SISO;
-  parameter Modelica.SIunits.Time T "Lag time constant"
+  parameter Modelica.Units.SI.Time T "Lag time constant"
     annotation (Evaluate=false);
   parameter Real y_start "Output start value"
     annotation (Dialog(group="Initialization"));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/NonElectrical/Continuous/SimpleLead.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/NonElectrical/Continuous/SimpleLead.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/NonElectrical/Continuous/SimpleLead.mo"	2022-03-10 09:57:38.464144185 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/NonElectrical/Continuous/SimpleLead.mo"	2022-03-10 09:57:55.868146390 +0000
@@ -2,7 +2,7 @@
 block SimpleLead "First order lead transfer function block"
   extends Modelica.Blocks.Interfaces.SISO;
   parameter Real K "Gain" annotation (Evaluate=false);
-  parameter Modelica.SIunits.Time T "Lead time constant"
+  parameter Modelica.Units.SI.Time T "Lead time constant"
     annotation (Evaluate=false);
   parameter Real y_start "Output start value"
     annotation (Dialog(group="Initialization"));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/openmodelica.metadata.json" "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/openmodelica.metadata.json"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/openmodelica.metadata.json"	2022-03-10 09:57:38.464144185 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/openmodelica.metadata.json"	2022-03-10 09:58:03.508147359 +0000
@@ -1 +1 @@
-{"path":"OpenIPSL", "sha":"4b97ac8de5992289ad6327e3bd6dca4cdb985393", "support":"fullSupport", "uses":{"Complex":"3.2.2", "Modelica":"3.2.2"}, "version":"1.5.0", "zipfile":"https://github.com/OpenIPSL/OpenIPSL/archive/4b97ac8de5992289ad6327e3bd6dca4cdb985393.zip"}
+{"path": "OpenIPSL", "sha": "4b97ac8de5992289ad6327e3bd6dca4cdb985393", "support": "fullSupport", "uses": {"Complex": "4.0.0", "Modelica": "4.0.0"}, "version": "1.5.0", "zipfile": "https://github.com/OpenIPSL/OpenIPSL/archive/4b97ac8de5992289ad6327e3bd6dca4cdb985393.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 1.5.0/package.mo" "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/package.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenIPSL 1.5.0/package.mo"	2022-03-10 09:57:38.464144185 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenIPSL 1.5.0/package.mo"	2022-03-10 09:58:03.508147359 +0000
@@ -1,10 +1,19 @@
 package OpenIPSL "Open-Instance Power System Library"
-annotation (
-  uses(Modelica(version="3.2.2"), Complex(version="3.2.2")),
-  version="1.5.0",
-  conversion(noneFromVersion={"0.8","0.8.1","1.0.0"}),
-  Documentation,
-  Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,100}}),
-      graphics={Bitmap(extent={{-100,-100},{100,100}}, fileName=
-            "modelica://OpenIPSL/Resources/Images/OpenIPSL_Logo.png")}));
-end OpenIPSL;
+
+
+
+
+
+
+
+
+
+
+
+  annotation(
+    uses(Modelica(version = "4.0.0")),
+    version = "1.5.0",
+    conversion(noneFromVersion = {"0.8", "0.8.1", "1.0.0"}),
+    Documentation,
+    Icon(coordinateSystem(preserveAspectRatio = false, extent = {{-100, -100}, {100, 100}}), graphics = {Bitmap(extent = {{-100, -100}, {100, 100}}, fileName = "modelica://OpenIPSL/Resources/Images/OpenIPSL_Logo.png")}));
+end OpenIPSL;
\ No newline at end of file