diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/Electrical/Branches/PwLinewithOpeningReceiving.mo" "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/Electrical/Branches/PwLinewithOpeningReceiving.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/Electrical/Branches/PwLinewithOpeningReceiving.mo"	2022-03-10 09:57:38.208144152 +0000
+++ "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/Electrical/Branches/PwLinewithOpeningReceiving.mo"	2022-03-10 09:58:32.568151039 +0000
@@ -17,9 +17,9 @@
   parameter Complex Y1(re = R /(X*X + R*R) , im  = -X / (X*X + R*R));
   parameter Complex Z1(re = R , im = X);
   parameter Complex y(re = G , im = B);
-  parameter Complex z = if  ComplexMath.'abs' (y) == 0 then Complex(Modelica.Constants.inf) else 1/y ;
+  parameter Complex z = if  ComplexMath.abs (y) == 0 then Complex(Modelica.Constants.inf) else 1/y ;
   parameter Complex Z_total = Z1 + z; 
-  parameter Complex Y_total = if  ComplexMath.'abs' (Z_total) >= Modelica.Constants.inf then Complex(0) else 1/Z_total;  
+  parameter Complex Y_total = if  ComplexMath.abs (Z_total) >= Modelica.Constants.inf then Complex(0) else 1/Z_total;  
   Boolean event(start = false); 
 equation
  event = time > startTime and time < endTime ;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/Electrical/Branches/PwLinewithOpeningSending.mo" "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/Electrical/Branches/PwLinewithOpeningSending.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/Electrical/Branches/PwLinewithOpeningSending.mo"	2022-03-10 09:57:38.208144152 +0000
+++ "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/Electrical/Branches/PwLinewithOpeningSending.mo"	2022-03-10 09:58:32.560151038 +0000
@@ -16,9 +16,9 @@
   parameter Complex Y1(re = R /(X*X + R*R) , im  = -X / (X*X + R*R));
   parameter Complex Z1(re = R , im = X);
   parameter Complex y(re = G , im = B);
-  parameter Complex z = if  ComplexMath.'abs' (y) == 0 then Complex(Modelica.Constants.inf) else 1/y ;
+  parameter Complex z = if  ComplexMath.abs (y) == 0 then Complex(Modelica.Constants.inf) else 1/y ;
   parameter Complex Z_total = Z1 + z; 
-  parameter Complex Y_total = if  ComplexMath.'abs' (Z_total) >= Modelica.Constants.inf then Complex(0) else 1/Z_total; 
+  parameter Complex Y_total = if  ComplexMath.abs (Z_total) >= Modelica.Constants.inf then Complex(0) else 1/Z_total; 
   Boolean event(start = false);
   
 equation
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/Electrical/Buses/Bus.mo" "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/Electrical/Buses/Bus.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/Electrical/Buses/Bus.mo"	2022-03-10 09:57:38.208144152 +0000
+++ "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/Electrical/Buses/Bus.mo"	2022-03-10 09:58:32.424151022 +0000
@@ -18,7 +18,7 @@
  
 equation
   v = Complex (p.vr, p.vi);
-  V = ComplexMath.'abs' (v);
+  V = ComplexMath.abs (v);
   angle = ComplexMath.arg (v) * 180 / Modelica.Constants.pi;
   p.ir = 0;
   p.ii = 0;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/Electrical/Controls/PSSE/ES/ESST4B.mo" "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/Electrical/Controls/PSSE/ES/ESST4B.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/Electrical/Controls/PSSE/ES/ESST4B.mo"	2022-03-10 09:57:38.212144153 +0000
+++ "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/Electrical/Controls/PSSE/ES/ESST4B.mo"	2022-03-10 09:58:31.304150879 +0000
@@ -4,7 +4,7 @@
   source-controlled rectifier exciter "
   extends iPSL.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;
@@ -98,7 +98,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/iPSL 1.1.1/Electrical/Controls/PSSE/TG/GGOV1/GGOV1.mo" "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/Electrical/Controls/PSSE/TG/GGOV1/GGOV1.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/Electrical/Controls/PSSE/TG/GGOV1/GGOV1.mo"	2022-03-10 09:57:38.212144153 +0000
+++ "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/Electrical/Controls/PSSE/TG/GGOV1/GGOV1.mo"	2022-03-10 09:58:30.724150807 +0000
@@ -65,7 +65,7 @@
     initType=Modelica.Blocks.Types.Init.InitialOutput) annotation (Placement(transformation(extent={{-80,-40},{-60,-20}})));
   Modelica.Blocks.Math.Add3 GovernorPID 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) annotation (Placement(transformation(extent={{-168,-84},{-148,-64}})));
+  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}})));
   Modelica.Blocks.Math.Add3 add3_2(k1=-1, k3=-1) annotation (Placement(transformation(extent={{-198,-80},{-186,-68}})));
   Modelica.Blocks.Math.Gain Acceleration(k=Ka*DELT) annotation (Placement(transformation(extent={{-116,0},{-92,24}})));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/Electrical/Loads/Eurostag/PwLoadVoltageDependence.mo" "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/Electrical/Loads/Eurostag/PwLoadVoltageDependence.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/Electrical/Loads/Eurostag/PwLoadVoltageDependence.mo"	2022-03-10 09:57:38.212144153 +0000
+++ "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/Electrical/Loads/Eurostag/PwLoadVoltageDependence.mo"	2022-03-10 09:58:29.848150695 +0000
@@ -22,7 +22,7 @@
 equation
    P_1.y = P_0;
    Q_1.y = Q_0;
-   a =  ComplexMath.'abs' (V) / vo;
+   a =  ComplexMath.abs (V) / vo;
    S.re = ((P_0 + P_1.deltaY)/ S_b) * (a^alpha);
    S.im = ((Q_0 + Q_1.deltaY)/ S_b) * (a^beta);
    S =  V*Modelica.ComplexMath.conj(I); 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/Electrical/Machines/PSSE/BaseClasses/baseMachine.mo" "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/Electrical/Machines/PSSE/BaseClasses/baseMachine.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/Electrical/Machines/PSSE/BaseClasses/baseMachine.mo"	2022-03-10 09:57:38.212144153 +0000
+++ "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/Electrical/Machines/PSSE/BaseClasses/baseMachine.mo"	2022-03-10 09:58:29.096150599 +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.Blocks.Interfaces.*;
   extends iPSL.Electrical.Essentials.pfComponent;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/Electrical/Machines/PSSE/GENROE.mo" "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/Electrical/Machines/PSSE/GENROE.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/Electrical/Machines/PSSE/GENROE.mo"	2022-03-10 09:57:38.212144153 +0000
+++ "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/Electrical/Machines/PSSE/GENROE.mo"	2022-03-10 09:58:29.008150588 +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 iPSL.NonElectrical.Functions.SE_exp;
@@ -39,7 +39,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) "magnitude of sub-transient flux linkage";
+  parameter Real abs_PSIpp0 = abs(PSIpp0) "magnitude of sub-transient flux linkage";
   parameter Real dsat = SE_exp(abs_PSIpp0, S10, S12, 1, 1.2) "To include saturation of during initialization";
   parameter Real a = abs_PSIpp0 + abs_PSIpp0 * dsat * (Xq - Xl) / (Xd - Xl);
   parameter Real b = (It.re ^ 2 + It.im ^ 2) ^ 0.5 * (Xpp - Xq);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/Electrical/Machines/PSSE/GENROU.mo" "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/Electrical/Machines/PSSE/GENROU.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/Electrical/Machines/PSSE/GENROU.mo"	2022-03-10 09:57:38.212144153 +0000
+++ "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/Electrical/Machines/PSSE/GENROU.mo"	2022-03-10 09:58:28.976150584 +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;
@@ -39,7 +39,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) "magnitude of sub-transient flux linkage";
+  parameter Real abs_PSIpp0 = abs(PSIpp0) "magnitude of sub-transient flux linkage";
   parameter Real dsat = SE(abs_PSIpp0, S10, S12, 1, 1.2) "To include saturation of during initialization";
   parameter Real a = abs_PSIpp0 + abs_PSIpp0 * dsat * (Xq - Xl) / (Xd - Xl);
   parameter Real b = (It.re ^ 2 + It.im ^ 2) ^ 0.5 * (Xpp - Xq);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/Electrical/Machines/PSSE/GENSAE.mo" "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/Electrical/Machines/PSSE/GENSAE.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/Electrical/Machines/PSSE/GENSAE.mo"	2022-03-10 09:57:38.212144153 +0000
+++ "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/Electrical/Machines/PSSE/GENSAE.mo"	2022-03-10 09:58:28.944150580 +0000
@@ -8,7 +8,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/iPSL 1.1.1/Electrical/Machines/PSSE/GENSAL.mo" "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/Electrical/Machines/PSSE/GENSAL.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/Electrical/Machines/PSSE/GENSAL.mo"	2022-03-10 09:57:38.212144153 +0000
+++ "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/Electrical/Machines/PSSE/GENSAL.mo"	2022-03-10 09:58:28.908150575 +0000
@@ -8,7 +8,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/iPSL 1.1.1/Electrical/Wind/DTU/CurrentLimiter.mo" "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/Electrical/Wind/DTU/CurrentLimiter.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/Electrical/Wind/DTU/CurrentLimiter.mo"	2022-03-10 09:57:38.216144153 +0000
+++ "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/Electrical/Wind/DTU/CurrentLimiter.mo"	2022-03-10 09:58:28.288150497 +0000
@@ -32,7 +32,7 @@
   Modelica.Blocks.Math.Min min2 annotation (Placement(transformation(extent={{24,-42},{34,-32}})));
   Modelica.Blocks.Logical.Switch switch3 annotation (Placement(transformation(extent={{60,-38},{72,-26}})));
   Modelica.Blocks.Math.Product product4 annotation (Placement(transformation(extent={{-44,-48},{-34,-38}})));
-  Modelica.Blocks.Tables.CombiTable1D iP_VDL(table=[0.1, 0; 0.15, 1; 0.9, 1; 0.925, 1; 1.075, 1; 1.1, 1]) "Lookup table for voltage dependency of active current limits"
+  Modelica.Blocks.Tables.CombiTable1Dv iP_VDL(table=[0.1, 0; 0.15, 1; 0.9, 1; 0.925, 1; 1.075, 1; 1.1, 1]) "Lookup table for voltage dependency of active current limits"
     annotation (Placement(transformation(extent={{-26,-18},{-14,-6}})));
   Modelica.Blocks.Sources.Constant MQpri(k=M_Qpri) "Prioritisation of q control during LVRT (0: active power priority - 1: reactive power priority)"
     annotation (Placement(transformation(extent={{4,0},{14,10}})));
@@ -41,7 +41,7 @@
     K=1,
     T=T_Ufilt,
     y_start=ini_Uwttfilt) annotation (Placement(transformation(extent={{-66,-6},{-54,6}})));
-  Modelica.Blocks.Tables.CombiTable1D iQ_VDL(table=[0.1, 0; 0.15, 1; 0.9, 1; 0.925, 0.33; 1.075, 0.33; 1.1, 1]) "Lookup table for voltage dependency of reactive current limits"
+  Modelica.Blocks.Tables.CombiTable1Dv iQ_VDL(table=[0.1, 0; 0.15, 1; 0.9, 1; 0.925, 0.33; 1.075, 0.33; 1.1, 1]) "Lookup table for voltage dependency of reactive current limits"
     annotation (Placement(transformation(extent={{-22,24},{-10,36}})));
   Modelica.Blocks.Math.Min min3 annotation (Placement(transformation(extent={{-62,32},{-52,42}})));
   Modelica.Blocks.Math.Min min4 annotation (Placement(transformation(extent={{-56,-26},{-50,-20}})));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/Electrical/Wind/DTU/LVRT.mo" "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/Electrical/Wind/DTU/LVRT.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/Electrical/Wind/DTU/LVRT.mo"	2022-03-10 09:57:38.220144154 +0000
+++ "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/Electrical/Wind/DTU/LVRT.mo"	2022-03-10 09:58:27.628150414 +0000
@@ -4,8 +4,8 @@
   Modelica.Blocks.Interfaces.RealOutput F_LVRT annotation (Placement(transformation(extent={{39,14},{49,26}}), iconTransformation(extent={{39,14},{49,26}})));
   Modelica.Blocks.Interfaces.RealOutput Fpost annotation (Placement(transformation(extent={{39,-26},{49,-14}}), iconTransformation(extent={{39,-26},{49,-14}})));
   parameter Real Uqdip "Voltage threshold value for LVRT detection in Q control";
-  parameter Modelica.SIunits.Time Tpost=0 "Length of time period where post fault reactive power is injected";
-  discrete Modelica.SIunits.Time LVRTstop "Time instant when post fault period started";
+  parameter Modelica.Units.SI.Time Tpost=0 "Length of time period where post fault reactive power is injected";
+  discrete Modelica.Units.SI.Time LVRTstop "Time instant when post fault period started";
 initial equation
   F_LVRT = if Uwtt < Uqdip then 1 else 0;
   Fpost = 0;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/Electrical/Wind/GE/Type_3/Electrical_Control/lim_exc_s1.mo" "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/Electrical/Wind/GE/Type_3/Electrical_Control/lim_exc_s1.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/Electrical/Wind/GE/Type_3/Electrical_Control/lim_exc_s1.mo"	2022-03-10 09:57:38.220144154 +0000
+++ "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/Electrical/Wind/GE/Type_3/Electrical_Control/lim_exc_s1.mo"	2022-03-10 09:58:27.328150375 +0000
@@ -1,6 +1,6 @@
 within iPSL.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/iPSL 1.1.1/Electrical/Wind/GE/Type_3/Turbine/Cp_function.mo" "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/Electrical/Wind/GE/Type_3/Turbine/Cp_function.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/Electrical/Wind/GE/Type_3/Turbine/Cp_function.mo"	2022-03-10 09:57:38.220144154 +0000
+++ "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/Electrical/Wind/GE/Type_3/Turbine/Cp_function.mo"	2022-03-10 09:58:27.212150362 +0000
@@ -1,6 +1,6 @@
 within iPSL.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/iPSL 1.1.1/Electrical/Wind/GE/Type_3/Turbine/Multi_Powers.mo" "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/Electrical/Wind/GE/Type_3/Turbine/Multi_Powers.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/Electrical/Wind/GE/Type_3/Turbine/Multi_Powers.mo"	2022-03-10 09:57:38.220144154 +0000
+++ "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/Electrical/Wind/GE/Type_3/Turbine/Multi_Powers.mo"	2022-03-10 09:58:27.192150359 +0000
@@ -1,6 +1,6 @@
 within iPSL.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" annotation (Placement(transformation(extent={{100,-10},{120,10}}, rotation=0)));
 protected
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/Electrical/Wind/PSSE/WT1G/WT1G1_oneMass_nosaturation.mo" "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/Electrical/Wind/PSSE/WT1G/WT1G1_oneMass_nosaturation.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/Electrical/Wind/PSSE/WT1G/WT1G1_oneMass_nosaturation.mo"	2022-03-10 09:57:38.220144154 +0000
+++ "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/Electrical/Wind/PSSE/WT1G/WT1G1_oneMass_nosaturation.mo"	2022-03-10 09:58:26.788150308 +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 iPSL.NonElectrical.Functions.SE;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/Electrical/Wind/PSSE/WT4G/WT4E1.mo" "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/Electrical/Wind/PSSE/WT4G/WT4E1.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/Electrical/Wind/PSSE/WT4G/WT4E1.mo"	2022-03-10 09:57:38.220144154 +0000
+++ "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/Electrical/Wind/PSSE/WT4G/WT4E1.mo"	2022-03-10 09:58:26.576150280 +0000
@@ -230,7 +230,7 @@
               textString="PF Controller")}));
   end pf_Controller;
 equation
-  connect(P, PF_Controller.u) annotation (Line(points={{-200,0},{-170,0},{-140,0},{-140,48},{-120.8,48}}, color={0,150,00}));
+  connect(P, PF_Controller.u) annotation (Line(points={{-200,0},{-170,0},{-140,0},{-140,48},{-120.8,48}}, color={0,150,0}));
   connect(activePowerController.PELEC, PF_Controller.u) annotation (Line(points={{40,-80},{-140,-80},{-140,48},{-120.8,48}}, color={0,150,0}));
 protected
   model windControlEmulator
@@ -294,7 +294,7 @@
               textString="WindCONTROL Emulator")}));
   end windControlEmulator;
 equation
-  connect(windControlEmulator1.V_REG, Vcl.u2) annotation (Line(points={{-120.4,160},{-160,160},{-160,-160},{118,-160},{118,52}}, color={255,0,00}));
+  connect(windControlEmulator1.V_REG, Vcl.u2) annotation (Line(points={{-120.4,160},{-160,160},{-160,-160},{118,-160},{118,52}}, color={255,0,0}));
   connect(ControlPF.y, switch_QREF.u2) annotation (Line(points={{-89,90},{-66,90},{-66,40},{-52,40}}, color={255,0,255}));
   connect(PF_Controller.Q_REF_PF, switch_QREF.u1) annotation (Line(points={{-78,48},{-72,48},{-52,48}}, color={0,0,127}));
   connect(Qcmd0.y, switch_QREF.u3) annotation (Line(points={{-89,0},{-66,0},{-66,0},{-66,32},{-52,32}}, color={0,0,127}));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/Examples/Branches/PSAT/PhaseShiftingTransformer_Test.mo" "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/Examples/Branches/PSAT/PhaseShiftingTransformer_Test.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/Examples/Branches/PSAT/PhaseShiftingTransformer_Test.mo"	2022-03-10 09:57:38.220144154 +0000
+++ "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/Examples/Branches/PSAT/PhaseShiftingTransformer_Test.mo"	2022-03-10 09:58:26.328150249 +0000
@@ -14,11 +14,11 @@
     Placement(transformation(extent = {{54, -22}, {74, -2}})));
   iPSL.Electrical.Loads.PSAT.LOADPQ_variation lOADPQ1(P_0 = 0.02, Q_0 = 0.01, dP1 = 0.02, dP2 = -0.02, dQ1 = 0.01, dQ2 = -0.01,  t_end_1 = 7, t_end_2 = 9, t_start_1 = 5, t_start_2 = 8) 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}}, rotation = 0)));
   Modelica.Blocks.Math.Add add2(k2 = -1) annotation(
     Placement(visible = true, transformation(origin = {-113.106, 30.6621}, extent = {{-6.3229, -6.3229}, {6.3229, 6.3229}}, rotation = 0)));
-  Modelica.Blocks.Sources.Sine sine2(amplitude = 0.001, freqHz = 0.2, startTime = 5) annotation(
+  Modelica.Blocks.Sources.Sine sine2(amplitude = 0.001, f = 0.2, startTime = 5) annotation(
     Placement(visible = true, transformation(origin = {-135.382, 20.4802}, extent = {{-4.4802, -4.4802}, {4.4802, 4.4802}}, rotation = 0)));
   iPSL.Electrical.Machines.PSAT.Order2b Gen1(D = 5, Sn = 100, Vn = 13800, V_b = 13800, V_0 = 1, P_0 = 0.050249405357958, Q_0 = 0.010496891745129, angle_0 = 0, ra = 0.001, xd1 = 0.302, M = 10) annotation(
     Placement(transformation(extent = {{-101, -11}, {-81, 9}})));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/Examples/Branches/PSAT/ThreeWindingTransformer_Test.mo" "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/Examples/Branches/PSAT/ThreeWindingTransformer_Test.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/Examples/Branches/PSAT/ThreeWindingTransformer_Test.mo"	2022-03-10 09:57:38.220144154 +0000
+++ "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/Examples/Branches/PSAT/ThreeWindingTransformer_Test.mo"	2022-03-10 09:58:26.272150242 +0000
@@ -6,11 +6,11 @@
     Placement(visible = true, transformation(origin = {40, 0}, extent = {{-10.0, -10.0}, {10.0, 10.0}}, rotation = 0)));
   iPSL.Electrical.Branches.PwLine pwLine4(B = 0.001 / 2, G = 0, R = 0.01, X = 0.1) annotation(
     Placement(visible = true, transformation(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}}, rotation = 0)));
   Modelica.Blocks.Math.Add add2(k2 = -1) annotation(
     Placement(visible = true, transformation(origin = {-79.1062, 14.6621}, extent = {{-6.3229, -6.3229}, {6.3229, 6.3229}}, rotation = 0)));
-  Modelica.Blocks.Sources.Sine sine2(amplitude = 0.001, freqHz = 0.2, startTime = 5) annotation(
+  Modelica.Blocks.Sources.Sine sine2(amplitude = 0.001, 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)));
   iPSL.Electrical.Machines.PSAT.Order2b Gen1(Sn = 370, D = 5, P_0 = 0.080124489663871, Q_0 = 0.059251697676828, V_b = 400, V_0 = 1, angle_0 = 0, Vn = 400, ra = 0.001, xd1 = 0.302, M = 10) annotation(
     Placement(transformation(extent = {{-20, 0}, {0, 20}})));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/Examples/Branches/PSAT/ULTC_Test.mo" "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/Examples/Branches/PSAT/ULTC_Test.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/Examples/Branches/PSAT/ULTC_Test.mo"	2022-03-10 09:57:38.220144154 +0000
+++ "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/Examples/Branches/PSAT/ULTC_Test.mo"	2022-03-10 09:58:26.252150239 +0000
@@ -6,11 +6,11 @@
     Placement(visible = true, transformation(origin = {30, -10}, extent = {{-10.0, -10.0}, {10.0, 10.0}}, rotation = 0)));
   iPSL.Electrical.Branches.PwLine pwLine4(B = 0.001 / 2, G = 0, R = 0.01, X = 0.1) annotation(
     Placement(visible = true, transformation(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}}, rotation = 0)));
   Modelica.Blocks.Math.Add add2(k2 = -1) annotation(
     Placement(visible = true, transformation(origin = {-109.106, -0.3379}, extent = {{-6.3229, -6.3229}, {6.3229, 6.3229}}, rotation = 0)));
-  Modelica.Blocks.Sources.Sine sine2(amplitude = 0.001, freqHz = 0.2, startTime = 5) annotation(
+  Modelica.Blocks.Sources.Sine sine2(amplitude = 0.001, f = 0.2, startTime = 5) annotation(
     Placement(visible = true, transformation(origin = {-132.382, -10.5198}, extent = {{-4.4802, -4.4802}, {4.4802, 4.4802}}, rotation = 0)));
   iPSL.Electrical.Machines.PSAT.Order2 order2_Inputs_Outputs(Sn = 370, P_0 = 0.081032877181982, Q_0 = 0.058523044412627, D = 5, V_b = 400, V_0 = 1, angle_0 = 0, Vn = 400, ra = 0.001, xd1 = 0.302, M = 10) annotation(
     Placement(transformation(extent = {{-40, -10}, {-20, 10}})));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/Examples/Controls/PSAT/TG/TGTypeVI_test.mo" "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/Examples/Controls/PSAT/TG/TGTypeVI_test.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/Examples/Controls/PSAT/TG/TGTypeVI_test.mo"	2022-03-10 09:57:38.220144154 +0000
+++ "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/Examples/Controls/PSAT/TG/TGTypeVI_test.mo"	2022-03-10 09:58:26.032150211 +0000
@@ -84,7 +84,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(
@@ -96,7 +96,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/iPSL 1.1.1/Examples/Controls/PSAT/TG/TGTypeV_test.mo" "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/Examples/Controls/PSAT/TG/TGTypeV_test.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/Examples/Controls/PSAT/TG/TGTypeV_test.mo"	2022-03-10 09:57:38.220144154 +0000
+++ "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/Examples/Controls/PSAT/TG/TGTypeV_test.mo"	2022-03-10 09:58:25.988150206 +0000
@@ -81,7 +81,7 @@
     Pref=0.160552) 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}},
@@ -89,7 +89,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/iPSL 1.1.1/Examples/Loads/PSAT/Loadtestexponentialrecovery.mo" "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/Examples/Loads/PSAT/Loadtestexponentialrecovery.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/Examples/Loads/PSAT/Loadtestexponentialrecovery.mo"	2022-03-10 09:57:38.220144154 +0000
+++ "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/Examples/Loads/PSAT/Loadtestexponentialrecovery.mo"	2022-03-10 09:58:25.464150139 +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)
+  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}},
@@ -64,14 +64,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}},
@@ -82,7 +82,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/iPSL 1.1.1/Examples/Loads/PSAT/Loadtestfreq.mo" "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/Examples/Loads/PSAT/Loadtestfreq.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/Examples/Loads/PSAT/Loadtestfreq.mo"	2022-03-10 09:57:38.220144154 +0000
+++ "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/Examples/Loads/PSAT/Loadtestfreq.mo"	2022-03-10 09:58:25.432150135 +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)
+  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}},
@@ -64,14 +64,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}},
@@ -82,7 +82,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/iPSL 1.1.1/Examples/Loads/PSAT/Loadtestmixed.mo" "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/Examples/Loads/PSAT/Loadtestmixed.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/Examples/Loads/PSAT/Loadtestmixed.mo"	2022-03-10 09:57:38.220144154 +0000
+++ "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/Examples/Loads/PSAT/Loadtestmixed.mo"	2022-03-10 09:58:25.392150131 +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)
+  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}},
@@ -64,14 +64,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}},
@@ -82,7 +82,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/iPSL 1.1.1/Examples/Loads/PSAT/Loadtestpq.mo" "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/Examples/Loads/PSAT/Loadtestpq.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/Examples/Loads/PSAT/Loadtestpq.mo"	2022-03-10 09:57:38.220144154 +0000
+++ "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/Examples/Loads/PSAT/Loadtestpq.mo"	2022-03-10 09:58:25.356150126 +0000
@@ -51,7 +51,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)
+  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}},
@@ -62,14 +62,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}},
@@ -80,7 +80,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/iPSL 1.1.1/Examples/Loads/PSAT/Loadtestvoltagedependantload.mo" "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/Examples/Loads/PSAT/Loadtestvoltagedependantload.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/Examples/Loads/PSAT/Loadtestvoltagedependantload.mo"	2022-03-10 09:57:38.220144154 +0000
+++ "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/Examples/Loads/PSAT/Loadtestvoltagedependantload.mo"	2022-03-10 09:58:25.288150117 +0000
@@ -51,7 +51,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)
+  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}},
@@ -62,14 +62,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}},
@@ -80,7 +80,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/iPSL 1.1.1/Examples/Loads/PSAT/Loadtestzip.mo" "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/Examples/Loads/PSAT/Loadtestzip.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/Examples/Loads/PSAT/Loadtestzip.mo"	2022-03-10 09:57:38.224144155 +0000
+++ "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/Examples/Loads/PSAT/Loadtestzip.mo"	2022-03-10 09:58:25.256150113 +0000
@@ -51,7 +51,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)
+  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}},
@@ -62,14 +62,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}},
@@ -80,7 +80,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/iPSL 1.1.1/Examples/Loads/PSAT/Loadtestzipjimma.mo" "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/Examples/Loads/PSAT/Loadtestzipjimma.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/Examples/Loads/PSAT/Loadtestzipjimma.mo"	2022-03-10 09:57:38.224144155 +0000
+++ "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/Examples/Loads/PSAT/Loadtestzipjimma.mo"	2022-03-10 09:58:25.208150108 +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)
+  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}},
@@ -64,14 +64,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}},
@@ -82,7 +82,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/iPSL 1.1.1/Examples/Machines/PSAT/Order2test2_perturbation.mo" "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/Examples/Machines/PSAT/Order2test2_perturbation.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/Examples/Machines/PSAT/Order2test2_perturbation.mo"	2022-03-10 09:57:38.224144155 +0000
+++ "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/Examples/Machines/PSAT/Order2test2_perturbation.mo"	2022-03-10 09:58:25.096150093 +0000
@@ -19,7 +19,7 @@
         origin={-95,35},
         extent={{-5,-5},{5,5}},
         rotation=0)));
-  Modelica.Blocks.Sources.Sine sine1(amplitude=0.001, freqHz=0.2) annotation (Placement(visible=true, transformation(
+  Modelica.Blocks.Sources.Sine sine1(amplitude=0.001, f =0.2) annotation (Placement(visible=true, transformation(
         origin={-95,20},
         extent={{-5,-5},{5,5}},
         rotation=0)));
@@ -29,14 +29,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}},
@@ -47,7 +47,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/iPSL 1.1.1/Examples/Machines/PSAT/Order3test2_perturbation.mo" "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/Examples/Machines/PSAT/Order3test2_perturbation.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/Examples/Machines/PSAT/Order3test2_perturbation.mo"	2022-03-10 09:57:38.224144155 +0000
+++ "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/Examples/Machines/PSAT/Order3test2_perturbation.mo"	2022-03-10 09:58:25.028150084 +0000
@@ -37,7 +37,7 @@
         origin={-95,35},
         extent={{-5,-5},{5,5}},
         rotation=0)));
-  Modelica.Blocks.Sources.Sine sine1(amplitude=0.001, freqHz=0.2) annotation (Placement(visible=true, transformation(
+  Modelica.Blocks.Sources.Sine sine1(amplitude=0.001, f =0.2) annotation (Placement(visible=true, transformation(
         origin={-95,20},
         extent={{-5,-5},{5,5}},
         rotation=0)));
@@ -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}},
@@ -65,7 +65,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/iPSL 1.1.1/Examples/Machines/PSAT/Order4test2_perturbation.mo" "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/Examples/Machines/PSAT/Order4test2_perturbation.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/Examples/Machines/PSAT/Order4test2_perturbation.mo"	2022-03-10 09:57:38.224144155 +0000
+++ "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/Examples/Machines/PSAT/Order4test2_perturbation.mo"	2022-03-10 09:58:24.948150075 +0000
@@ -31,7 +31,7 @@
         origin={-95,35},
         extent={{-5,-5},{5,5}},
         rotation=0)));
-  Modelica.Blocks.Sources.Sine sine1(amplitude=0.001, freqHz=0.2) annotation (Placement(visible=true, transformation(
+  Modelica.Blocks.Sources.Sine sine1(amplitude=0.001, f =0.2) annotation (Placement(visible=true, transformation(
         origin={-95,20},
         extent={{-5,-5},{5,5}},
         rotation=0)));
@@ -41,14 +41,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}},
@@ -59,7 +59,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/iPSL 1.1.1/NonElectrical/Continuous/DerivativeLag.mo" "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/NonElectrical/Continuous/DerivativeLag.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/NonElectrical/Continuous/DerivativeLag.mo"	2022-03-10 09:57:38.224144155 +0000
+++ "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/NonElectrical/Continuous/DerivativeLag.mo"	2022-03-10 09:58:24.524150020 +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" annotation (Dialog(group="Initialization"));
   Modelica.Blocks.Sources.RealExpression par1(y=T) annotation (Placement(transformation(extent={{-80,54},{-60,74}})));
@@ -13,8 +13,8 @@
     y_start=y_start,
     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 then 1000 else T "Lead time constant";
-  parameter Modelica.SIunits.Time K_dummy=if abs(K) < Modelica.Constants.eps then 1 else K "Lead time constant";
+  parameter Modelica.Units.SI.Time T_dummy=if abs(T) < Modelica.Constants.eps then 1000 else T "Lead time constant";
+  parameter Modelica.Units.SI.Time K_dummy=if abs(K) < Modelica.Constants.eps then 1 else K "Lead time constant";
 equation
     y = TF.y;
   connect(TF.u, u) annotation (Line(points={{-10,0},{-120,0}}, color={0,0,127}));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/NonElectrical/Continuous/LeadLag.mo" "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/NonElectrical/Continuous/LeadLag.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/NonElectrical/Continuous/LeadLag.mo"	2022-03-10 09:57:38.224144155 +0000
+++ "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/NonElectrical/Continuous/LeadLag.mo"	2022-03-10 09:58:24.500150018 +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" annotation (Dialog(group="Initialization"));
   Modelica.Blocks.Sources.RealExpression par1(y=T1) annotation (Placement(transformation(extent={{-80,54},{-60,74}})));
@@ -15,7 +15,7 @@
     initType=Modelica.Blocks.Types.Init.InitialOutput,
     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 then 1000 else T2 "Lead time constant";
+  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
     y = K*u;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/NonElectrical/Continuous/LeadLagLim.mo" "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/NonElectrical/Continuous/LeadLagLim.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/NonElectrical/Continuous/LeadLagLim.mo"	2022-03-10 09:57:38.224144155 +0000
+++ "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/NonElectrical/Continuous/LeadLagLim.mo"	2022-03-10 09:58:24.492150016 +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" annotation (Dialog(group="Initialization"));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/NonElectrical/Continuous/SimpleLag.mo" "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/NonElectrical/Continuous/SimpleLag.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/NonElectrical/Continuous/SimpleLag.mo"	2022-03-10 09:57:38.224144155 +0000
+++ "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/NonElectrical/Continuous/SimpleLag.mo"	2022-03-10 09:58:24.460150012 +0000
@@ -4,7 +4,7 @@
   import Modelica.Blocks.Types.Init;
   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";
   parameter Modelica.Blocks.Types.Init initType=Modelica.Blocks.Types.Init.InitialOutput;
 protected
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/NonElectrical/Continuous/SimpleLagLim.mo" "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/NonElectrical/Continuous/SimpleLagLim.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/NonElectrical/Continuous/SimpleLagLim.mo"	2022-03-10 09:57:38.224144155 +0000
+++ "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/NonElectrical/Continuous/SimpleLagLim.mo"	2022-03-10 09:58:24.452150011 +0000
@@ -2,7 +2,7 @@
 block SimpleLagLim "First order lag transfer function block with a non windup limiter"
   extends Modelica.Blocks.Interfaces.SISO(y(start=y_start));
   parameter Real K "Gain";
-  parameter Modelica.SIunits.Time T = 1 "Lag time constant";
+  parameter Modelica.Units.SI.Time T = 1 "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/iPSL 1.1.1/NonElectrical/Continuous/SimpleLagLimVar.mo" "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/NonElectrical/Continuous/SimpleLagLimVar.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/NonElectrical/Continuous/SimpleLagLimVar.mo"	2022-03-10 09:57:38.224144155 +0000
+++ "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/NonElectrical/Continuous/SimpleLagLimVar.mo"	2022-03-10 09:58:24.420150007 +0000
@@ -13,7 +13,7 @@
         origin={-80,-140})));
   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;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/NonElectrical/Continuous/SimpleLagRateLimBlock.mo" "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/NonElectrical/Continuous/SimpleLagRateLimBlock.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/NonElectrical/Continuous/SimpleLagRateLimBlock.mo"	2022-03-10 09:57:38.224144155 +0000
+++ "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/NonElectrical/Continuous/SimpleLagRateLimBlock.mo"	2022-03-10 09:58:24.408150006 +0000
@@ -2,7 +2,7 @@
 block SimpleLagRateLimBlock "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" annotation (Evaluate=false);
+  parameter Modelica.Units.SI.Time T "Lag time constant" annotation (Evaluate=false);
   parameter Real y_start "Output start value" annotation (Dialog(group="Initialization"));
   parameter Real outMax "Maximum output value" annotation (Evaluate=false);
   parameter Real outMin "Minimum output value" annotation (Evaluate=false);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/NonElectrical/Continuous/SimpleLagRateLimVar.mo" "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/NonElectrical/Continuous/SimpleLagRateLimVar.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/NonElectrical/Continuous/SimpleLagRateLimVar.mo"	2022-03-10 09:57:38.224144155 +0000
+++ "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/NonElectrical/Continuous/SimpleLagRateLimVar.mo"	2022-03-10 09:58:24.392150005 +0000
@@ -1,7 +1,7 @@
 within iPSL.NonElectrical.Continuous;
 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" annotation (Evaluate=false);
+  parameter Modelica.Units.SI.Time T "Lag time constant" annotation (Evaluate=false);
   parameter Real y_start "Output start value" annotation (Dialog(group="Initialization"));
   parameter Real rmin "Minimum rate limit";
   parameter Real rmax "Maximum rate limit";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/NonElectrical/Continuous/SimpleLead.mo" "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/NonElectrical/Continuous/SimpleLead.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/NonElectrical/Continuous/SimpleLead.mo"	2022-03-10 09:57:38.224144155 +0000
+++ "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/NonElectrical/Continuous/SimpleLead.mo"	2022-03-10 09:58:24.380150003 +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" annotation (Evaluate=false);
+  parameter Modelica.Units.SI.Time T "Lead time constant" annotation (Evaluate=false);
   parameter Real y_start "Output start value" annotation (Dialog(group="Initialization"));
 equation
   assert(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/NonElectrical/Eurostag/Nonlinear/ImMonostable.mo" "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/NonElectrical/Eurostag/Nonlinear/ImMonostable.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/NonElectrical/Eurostag/Nonlinear/ImMonostable.mo"	2022-03-10 09:57:38.224144155 +0000
+++ "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/NonElectrical/Eurostag/Nonlinear/ImMonostable.mo"	2022-03-10 09:58:24.132149970 +0000
@@ -3,7 +3,7 @@
 
   extends Modelica.Blocks.Interfaces.SISO;
   parameter Real S "Start";
-  parameter Modelica.SIunits.Time T "Pulse period";
+  parameter Modelica.Units.SI.Time T "Pulse period";
   discrete Real tau(start = -T, fixed = true);
   Boolean mode(start = false);
   Boolean cond1;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/NonElectrical/Eurostag/Nonlinear/ImSchmidtTrigger.mo" "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/NonElectrical/Eurostag/Nonlinear/ImSchmidtTrigger.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/NonElectrical/Eurostag/Nonlinear/ImSchmidtTrigger.mo"	2022-03-10 09:57:38.224144155 +0000
+++ "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/NonElectrical/Eurostag/Nonlinear/ImSchmidtTrigger.mo"	2022-03-10 09:58:24.108149969 +0000
@@ -1,4 +1,4 @@
-within iPSL.NonElectrical.Eurostag.Nonlinear;
+within iPSL.NonElectrical.Eurostag.Nonlinear;
 block ImSchmidtTrigger "Switching with hysteresis. 2014/03/10"
 
   extends Modelica.Blocks.Interfaces.SISO;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/openmodelica.metadata.json" "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/openmodelica.metadata.json"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/openmodelica.metadata.json"	2022-03-10 09:57:38.224144155 +0000
+++ "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/openmodelica.metadata.json"	2022-03-10 09:58:33.348151138 +0000
@@ -1 +1 @@
-{"path":"iPSL", "provides":["0.8.0"], "sha":"e0e3ea079a0398a3b0b094baaa3736350faa525b", "support":"fullSupport", "uses":{"Complex":"3.2.1", "Modelica":"3.2.1"}, "version":"1.1.1", "zipfile":"https://github.com/itesla/ipsl/archive/e0e3ea079a0398a3b0b094baaa3736350faa525b.zip"}
+{"path": "iPSL", "provides": ["0.8.0"], "sha": "e0e3ea079a0398a3b0b094baaa3736350faa525b", "support": "fullSupport", "uses": {"Complex": "4.0.0", "Modelica": "4.0.0"}, "version": "1.1.1", "zipfile": "https://github.com/itesla/ipsl/archive/e0e3ea079a0398a3b0b094baaa3736350faa525b.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/iPSL 1.1.1/package.mo" "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/package.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/iPSL 1.1.1/package.mo"	2022-03-10 09:57:38.224144155 +0000
+++ "converted-libraries/.openmodelica/libraries/iPSL 1.1.1/package.mo"	2022-03-10 09:58:33.332151136 +0000
@@ -5,7 +5,7 @@
 
 
 annotation (
-  uses(Modelica(version="3.2.1"), Complex(version="3.2.1")),
+  uses(Modelica(version = "4.0.0")),
   version="1.1.0",
   conversion(noneFromVersion="0.8"),
   Documentation(revisions="<html>