diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Controls/FirstOrderWithNonWindupLimiter.mo" "converted-libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Controls/FirstOrderWithNonWindupLimiter.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Controls/FirstOrderWithNonWindupLimiter.mo" 2022-03-10 09:57:37.540144067 +0000 +++ "converted-libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Controls/FirstOrderWithNonWindupLimiter.mo" 2022-03-10 09:58:00.604146991 +0000 @@ -14,7 +14,7 @@ Evaluate = true, choices(checkBox = true), Dialog(tab = "Advanced")); - Modelica.Blocks.Nonlinear.Limiter lim(limitsAtInit = true, strict = strict, uMax = yMax, uMin = yMin) annotation( + Modelica.Blocks.Nonlinear.Limiter lim( strict = strict, uMax = yMax, uMin = yMin) annotation( Placement(visible = true, transformation(origin = {52, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); Modelica.Blocks.Math.Feedback feedback annotation( Placement(visible = true, transformation(origin = {-56, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Controls/IntegratorWithNonWindupLimiter.mo" "converted-libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Controls/IntegratorWithNonWindupLimiter.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Controls/IntegratorWithNonWindupLimiter.mo" 2022-03-10 09:57:37.540144067 +0000 +++ "converted-libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Controls/IntegratorWithNonWindupLimiter.mo" 2022-03-10 09:58:00.556146984 +0000 @@ -13,7 +13,7 @@ Evaluate = true, choices(checkBox = true), Dialog(tab = "Advanced")); - Modelica.Blocks.Nonlinear.Limiter lim(limitsAtInit = true, strict = strict, uMax = yMax, uMin = yMin) annotation( + Modelica.Blocks.Nonlinear.Limiter lim( strict = strict, uMax = yMax, uMin = yMin) annotation( Placement(visible = true, transformation(origin = {32, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); Modelica.Blocks.Continuous.Integrator I(initType = initType, k = k, y_start = yStart) annotation( Placement(visible = true, transformation(origin = {-24, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Controls/LeadLagWithNonWindupLimiter.mo" "converted-libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Controls/LeadLagWithNonWindupLimiter.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Controls/LeadLagWithNonWindupLimiter.mo" 2022-03-10 09:57:37.540144067 +0000 +++ "converted-libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Controls/LeadLagWithNonWindupLimiter.mo" 2022-03-10 09:58:00.516146980 +0000 @@ -17,7 +17,7 @@ Dialog(tab = "Advanced")); Modelica.Blocks.Math.Gain gain_dir(k = k * T1 / T2) annotation( Placement(visible = true, transformation(origin = {-4, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); - Modelica.Blocks.Nonlinear.Limiter limiter_y(limitsAtInit = true, strict = strict, uMax = yMax, uMin = yMin) annotation( + Modelica.Blocks.Nonlinear.Limiter limiter_y( strict = strict, uMax = yMax, uMin = yMin) annotation( Placement(visible = true, transformation(origin = {32, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); Modelica.Blocks.Math.Feedback feedback_y annotation( Placement(visible = true, transformation(origin = {46, -52}, extent = {{10, -10}, {-10, 10}}, rotation = 0))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Controls/PIWithNonWindupLimiter.mo" "converted-libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Controls/PIWithNonWindupLimiter.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Controls/PIWithNonWindupLimiter.mo" 2022-03-10 09:57:37.540144067 +0000 +++ "converted-libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Controls/PIWithNonWindupLimiter.mo" 2022-03-10 09:58:00.456146971 +0000 @@ -15,7 +15,7 @@ Evaluate = true, choices(checkBox = true), Dialog(tab = "Advanced")); - Modelica.Blocks.Nonlinear.Limiter lim(limitsAtInit = true, strict = strict, uMax = yMax, uMin = yMin) annotation( + Modelica.Blocks.Nonlinear.Limiter lim( strict = strict, uMax = yMax, uMin = yMin) annotation( Placement(visible = true, transformation(origin = {0, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); Modelica.Blocks.Math.Feedback feedback annotation( Placement(visible = true, transformation(origin = {-40, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Controls/Test/TestFreeOffset.mo" "converted-libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Controls/Test/TestFreeOffset.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Controls/Test/TestFreeOffset.mo" 2022-03-10 09:57:37.540144067 +0000 +++ "converted-libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Controls/Test/TestFreeOffset.mo" 2022-03-10 09:58:00.292146950 +0000 @@ -6,7 +6,7 @@ Placement(visible = true, transformation(origin = {0, 30}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); FreeOffset freeOffset2(use_u = true) annotation( Placement(visible = true, transformation(origin = {0, -20}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); - Modelica.Blocks.Sources.Sine sine(freqHz = 1) annotation( + Modelica.Blocks.Sources.Sine sine(f = 1) annotation( Placement(visible = true, transformation(origin = {-44, -20}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); initial equation freeOffset1.y = 1; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Electrical/BaseClasses/OnePortAC.mo" "converted-libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Electrical/BaseClasses/OnePortAC.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Electrical/BaseClasses/OnePortAC.mo" 2022-03-10 09:57:37.540144067 +0000 +++ "converted-libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Electrical/BaseClasses/OnePortAC.mo" 2022-03-10 09:58:00.140146931 +0000 @@ -40,7 +40,7 @@ // Further two initial equations will be needed (e.g. in the controller) // to enforce P,V at the port or achieve actuator saturation if that is not possible CM.real(terminal.v*CM.conj(terminal.i)) = port.PStart; - CM.'abs'(terminal.v) = port.VStart; + CM.abs(terminal.v) = port.VStart; port.Q = port.QStart; port.v.re*port.vStart.im = port.v.im*port.vStart.re; elseif initial() and localInit == LocalInitializationOption.PQ then diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Electrical/BaseClasses/PortAC.mo" "converted-libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Electrical/BaseClasses/PortAC.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Electrical/BaseClasses/PortAC.mo" 2022-03-10 09:57:37.540144067 +0000 +++ "converted-libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Electrical/BaseClasses/PortAC.mo" 2022-03-10 09:58:00.096146926 +0000 @@ -43,8 +43,8 @@ Types.ActivePower P(nominal = SBase, start = PStart) = S.re "Active power flowing into the port"; Types.ReactivePower Q(nominal = SBase, start = QStart) = S.im "Reactive power flowing into the port"; - Types.Voltage U(nominal = UBase, start = UStart) = CM.'abs'(u) "Port voltage absolute value (phase-to-phase)"; - Types.Current I(nominal = IBase, start = IStart) = CM.'abs'(i) "Port current (positive entering)"; + Types.Voltage U(nominal = UBase, start = UStart) = CM.abs(u) "Port voltage absolute value (phase-to-phase)"; + Types.Current I(nominal = IBase, start = IStart) = CM.abs(i) "Port current (positive entering)"; Types.PerUnit PPu(start = PStart/SBase) = if portVariablesPu then S.re/SBase else 0 "Active power flowing into the port in p.u. (base SBase)" annotation( HideResult = portVariablesPu); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Electrical/Controls/ExcitationSystems/IEEE_AC4A.mo" "converted-libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Electrical/Controls/ExcitationSystems/IEEE_AC4A.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Electrical/Controls/ExcitationSystems/IEEE_AC4A.mo" 2022-03-10 09:57:37.544144068 +0000 +++ "converted-libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Electrical/Controls/ExcitationSystems/IEEE_AC4A.mo" 2022-03-10 09:57:59.648146869 +0000 @@ -26,7 +26,7 @@ Placement(visible = true, transformation(origin = {110, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0), iconTransformation(origin = {110, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); Modelica.Blocks.Math.Add3 addIng(k1 = +1, k2 = -1, k3 = +1) annotation( Placement(visible = true, transformation(origin = {-80, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); - Modelica.Blocks.Nonlinear.Limiter inputLimiter(limitsAtInit = true, uMax = ViMax, uMin = ViMin) annotation( + Modelica.Blocks.Nonlinear.Limiter inputLimiter( uMax = ViMax, uMin = ViMin) annotation( Placement(visible = true, transformation(origin = {-40, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); PowerGrids.Controls.LeadLag leadLag(T1 = Tc, T2 = Tb, initType = Modelica.Blocks.Types.Init.SteadyState, k = 1, yStart = 1 / Ka) annotation( Placement(visible = true, transformation(origin = {0, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Electrical/Controls/ExcitationSystems/IEEE_ST4B.mo" "converted-libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Electrical/Controls/ExcitationSystems/IEEE_ST4B.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Electrical/Controls/ExcitationSystems/IEEE_ST4B.mo" 2022-03-10 09:57:37.544144068 +0000 +++ "converted-libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Electrical/Controls/ExcitationSystems/IEEE_ST4B.mo" 2022-03-10 09:57:59.604146863 +0000 @@ -53,7 +53,7 @@ Placement(visible = true, transformation(origin = {-30, -56}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); Modelica.Blocks.Math.Product prod2 annotation( Placement(visible = true, transformation(origin = {10, -56}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); - Modelica.Blocks.Nonlinear.Limiter limiterVbmax(limitsAtInit = true, uMax = vbmax, uMin = -Modelica.Constants.inf) annotation( + Modelica.Blocks.Nonlinear.Limiter limiterVbmax( uMax = vbmax, uMin = -Modelica.Constants.inf) annotation( Placement(visible = true, transformation(origin = {50, -56}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); equation connect(limiterVbmax.y, prod1.u2) annotation( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Electrical/Controls/PowerSystemStabilizers/IEEE_PSS2A.mo" "converted-libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Electrical/Controls/PowerSystemStabilizers/IEEE_PSS2A.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Electrical/Controls/PowerSystemStabilizers/IEEE_PSS2A.mo" 2022-03-10 09:57:37.544144068 +0000 +++ "converted-libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Electrical/Controls/PowerSystemStabilizers/IEEE_PSS2A.mo" 2022-03-10 09:57:59.468146846 +0000 @@ -45,7 +45,7 @@ Placement(visible = true, transformation(origin = {80, 40}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); PowerGrids.Controls.LeadLag leadLag2(T1 = T3, T2 = T4, initType = Modelica.Blocks.Types.Init.SteadyState, k = 1, yStart = 0) annotation( Placement(visible = true, transformation(origin = {110, 40}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); - Modelica.Blocks.Nonlinear.Limiter limiterVst(limitsAtInit = true, uMax = VstMax, uMin = VstMin) annotation( + Modelica.Blocks.Nonlinear.Limiter limiterVst( uMax = VstMax, uMin = VstMin) annotation( Placement(visible = true, transformation(origin = {142, 40}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); PowerGrids.Controls.FirstOrder firstOrderVsi2(T = T7, initType = Modelica.Blocks.Types.Init.SteadyState, k = Ks2, y_start = 0) annotation( Placement(visible = true, transformation(origin = {-70, -40}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Electrical/Controls/PowerSystemStabilizers/IEEE_PSS2B.mo" "converted-libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Electrical/Controls/PowerSystemStabilizers/IEEE_PSS2B.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Electrical/Controls/PowerSystemStabilizers/IEEE_PSS2B.mo" 2022-03-10 09:57:37.544144068 +0000 +++ "converted-libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Electrical/Controls/PowerSystemStabilizers/IEEE_PSS2B.mo" 2022-03-10 09:57:59.436146843 +0000 @@ -31,9 +31,9 @@ Placement(visible = true, transformation(origin = {-200, -40}, extent = {{-20, -20}, {20, 20}}, rotation = 0), iconTransformation(origin = {-102, -60}, extent = {{-20, -20}, {20, 20}}, rotation = 0))); Modelica.Blocks.Interfaces.RealOutput VstPu annotation( Placement(visible = true, transformation(origin = {200, 40}, extent = {{-10, -10}, {10, 10}}, rotation = 0), iconTransformation(origin = {110, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); - Modelica.Blocks.Nonlinear.Limiter limiterVsi1(limitsAtInit = true, uMax = Vsi1Max, uMin = Vsi1Min) annotation( + Modelica.Blocks.Nonlinear.Limiter limiterVsi1( uMax = Vsi1Max, uMin = Vsi1Min) annotation( Placement(visible = true, transformation(origin = {-160, 40}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); - Modelica.Blocks.Nonlinear.Limiter limiterVsi2(limitsAtInit = true, uMax = Vsi2Max, uMin = Vsi2Min) annotation( + Modelica.Blocks.Nonlinear.Limiter limiterVsi2( uMax = Vsi2Max, uMin = Vsi2Min) annotation( Placement(visible = true, transformation(origin = {-160, -40}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); PowerGrids.Controls.DerivativeLag firstWashoutVsi1( T1 = Tw1,Td = Tw1, initType = Modelica.Blocks.Types.Init.SteadyState, yStart = 0) annotation( Placement(visible = true, transformation(origin = {-130, 40}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); @@ -57,7 +57,7 @@ Placement(visible = true, transformation(origin = {110, 40}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); PowerGrids.Controls.LeadLag leadLag3(T1 = T10, T2 = T11, initType = Modelica.Blocks.Types.Init.SteadyState, k = 1, yStart = 0) annotation( Placement(visible = true, transformation(origin = {140, 40}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); - Modelica.Blocks.Nonlinear.Limiter limiterVst(limitsAtInit = true, uMax = VstMax, uMin = VstMin) annotation( + Modelica.Blocks.Nonlinear.Limiter limiterVst( uMax = VstMax, uMin = VstMin) annotation( Placement(visible = true, transformation(origin = {170, 40}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); PowerGrids.Controls.FirstOrder firstOrderVsi2(T = T7, initType = Modelica.Blocks.Types.Init.SteadyState, k = Ks2, y_start = 0) annotation( Placement(visible = true, transformation(origin = {-70, -40}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Electrical/Controls/TurbineGovernors/BaseClasses/GovHydro4Base.mo" "converted-libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Electrical/Controls/TurbineGovernors/BaseClasses/GovHydro4Base.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Electrical/Controls/TurbineGovernors/BaseClasses/GovHydro4Base.mo" 2022-03-10 09:57:37.544144068 +0000 +++ "converted-libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Electrical/Controls/TurbineGovernors/BaseClasses/GovHydro4Base.mo" 2022-03-10 09:57:59.368146834 +0000 @@ -1,43 +1,43 @@ within PowerGrids.Electrical.Controls.TurbineGovernors.BaseClasses; partial model GovHydro4Base "Base class for Governors of hydraulic turbines" - parameter Modelica.SIunits.PerUnit db1 = 0 "Intentional dead-band width" annotation( + parameter Modelica.Units.SI.PerUnit db1 = 0 "Intentional dead-band width" annotation( Dialog(group = "Control and Actuators")); - parameter Modelica.SIunits.PerUnit db2 = 0 "Unintentional dead-band width" annotation( + parameter Modelica.Units.SI.PerUnit db2 = 0 "Unintentional dead-band width" annotation( Dialog(group = "Control and Actuators")); - parameter Modelica.SIunits.Time Tp = 0.1 "Pilot servo time constant" annotation( + parameter Modelica.Units.SI.Time Tp = 0.1 "Pilot servo time constant" annotation( Dialog(group = "Control and Actuators")); - parameter Modelica.SIunits.Time Tg = 0.5 "Gate servo time constant" annotation( + parameter Modelica.Units.SI.Time Tg = 0.5 "Gate servo time constant" annotation( Dialog(group = "Control and Actuators")); - parameter Modelica.SIunits.Time Tr = 5 "Dashpot time constant" annotation( + parameter Modelica.Units.SI.Time Tr = 5 "Dashpot time constant" annotation( Dialog(group = "Control and Actuators")); - parameter Modelica.SIunits.PerUnit uo = 0.2 "Max gate opening velocity" annotation( + parameter Modelica.Units.SI.PerUnit uo = 0.2 "Max gate opening velocity" annotation( Dialog(group = "Control and Actuators")); - parameter Modelica.SIunits.PerUnit uc = -0.2 "Max gate closing velocity" annotation( + parameter Modelica.Units.SI.PerUnit uc = -0.2 "Max gate closing velocity" annotation( Dialog(group = "Control and Actuators")); - parameter Modelica.SIunits.PerUnit gMax = 1 "Maximum gate opening" annotation( + parameter Modelica.Units.SI.PerUnit gMax = 1 "Maximum gate opening" annotation( Dialog(group = "Control and Actuators")); - parameter Modelica.SIunits.PerUnit gMin = 0 "Minimum gate opening" annotation( + parameter Modelica.Units.SI.PerUnit gMin = 0 "Minimum gate opening" annotation( Dialog(group = "Control and Actuators")); - parameter Modelica.SIunits.PerUnit rPerm = 0.05 "Permanent droop" annotation( + parameter Modelica.Units.SI.PerUnit rPerm = 0.05 "Permanent droop" annotation( Dialog(group = "Control and Actuators")); - parameter Modelica.SIunits.PerUnit rTemp = 0.3 "Temporary droop" annotation( + parameter Modelica.Units.SI.PerUnit rTemp = 0.3 "Temporary droop" annotation( Dialog(group = "Control and Actuators")); parameter Real GvPgvTable[:, :] = [0, 0; 1, 1] "Points to define the curve Pgv = f(Gv)" annotation( Dialog(group = "Turbine")); parameter Modelica.Blocks.Types.Smoothness GvPgvSmoothness = Modelica.Blocks.Types.Smoothness.LinearSegments "Smoothness of curve Pgv = f(Gv)" annotation( Dialog(group = "Turbine")); - parameter Modelica.SIunits.PerUnit at = 1.2 "Turbine gain" annotation( + parameter Modelica.Units.SI.PerUnit at = 1.2 "Turbine gain" annotation( Dialog(group = "Turbine")); - parameter Modelica.SIunits.PerUnit qnl = 0.08 "No-load flow at nominal head" annotation( + parameter Modelica.Units.SI.PerUnit qnl = 0.08 "No-load flow at nominal head" annotation( Dialog(group = "Turbine")); - parameter Modelica.SIunits.Time Tw = 1 "Water inertia time constant" annotation( + parameter Modelica.Units.SI.Time Tw = 1 "Water inertia time constant" annotation( Dialog(group = "Turbine")); - parameter Modelica.SIunits.PerUnit hDam = 1 "Head available at dam" annotation( + parameter Modelica.Units.SI.PerUnit hDam = 1 "Head available at dam" annotation( Dialog(group = "Turbine")); - parameter Modelica.SIunits.PerUnit dTurb = 0.5 "Turbine damping factor" annotation( + parameter Modelica.Units.SI.PerUnit dTurb = 0.5 "Turbine damping factor" annotation( Dialog(group = "Turbine")); - parameter Modelica.SIunits.PerUnit qStart "Turbine flow Start value" annotation( + parameter Modelica.Units.SI.PerUnit qStart "Turbine flow Start value" annotation( Dialog(group = "Initialization")); Modelica.Blocks.Interfaces.RealInput deltaOmegaPu annotation( Placement(visible = true, transformation(origin = {-200, 50}, extent = {{-20, -20}, {20, 20}}, rotation = 0), iconTransformation(origin = {-100, -20}, extent = {{-20, -20}, {20, 20}}, rotation = 0))); @@ -51,7 +51,7 @@ Placement(visible = true, transformation(origin = {-116, 50}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); PowerGrids.Controls.FirstOrder lagTp(T = Tp, initType = Modelica.Blocks.Types.Init.SteadyState, y_start = 1) annotation( Placement(visible = true, transformation(origin = {-76, 50}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); - Modelica.Blocks.Nonlinear.Limiter limU(limitsAtInit = true, uMax = uo, uMin = uc) annotation( + Modelica.Blocks.Nonlinear.Limiter limU( uMax = uo, uMin = uc) annotation( Placement(visible = true, transformation(origin = {0, 50}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); PowerGrids.Controls.IntegratorWithNonWindupLimiter limIntG(initType = Modelica.Blocks.Types.Init.SteadyState, yMax = gMax, yMin = gMin, yStart = 1) annotation( Placement(visible = true, transformation(origin = {40, 50}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Electrical/Controls/TurbineGovernors/GoverProportional.mo" "converted-libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Electrical/Controls/TurbineGovernors/GoverProportional.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Electrical/Controls/TurbineGovernors/GoverProportional.mo" 2022-03-10 09:57:37.544144068 +0000 +++ "converted-libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Electrical/Controls/TurbineGovernors/GoverProportional.mo" 2022-03-10 09:57:59.260146820 +0000 @@ -29,7 +29,7 @@ Placement(visible = true, transformation(origin = {-90, -70}, extent = {{-10, -10}, {10, 10}}, rotation = 90))); Modelica.Blocks.Math.Gain gain(k = KGover) annotation( Placement(visible = true, transformation(origin = {-50, -30}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); - Modelica.Blocks.Nonlinear.Limiter limiter(limitsAtInit = true, uMax = PMaxPu, uMin = PMinPu) annotation( + Modelica.Blocks.Nonlinear.Limiter limiter( uMax = PMaxPu, uMin = PMinPu) annotation( Placement(visible = true, transformation(origin = {50, 50}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); Modelica.Blocks.Interfaces.RealInput PPu "Generator Active Power p.u." annotation( Placement(visible = true, transformation(origin = {74, 118}, extent = {{-20, -20}, {20, 20}}, rotation = 0), iconTransformation(origin = {60, -100}, extent = {{-20, -20}, {20, 20}}, rotation = 90))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Electrical/Machines/SynchronousMachine4WindingsInternalParameters.mo" "converted-libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Electrical/Machines/SynchronousMachine4WindingsInternalParameters.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Electrical/Machines/SynchronousMachine4WindingsInternalParameters.mo" 2022-03-10 09:57:37.544144068 +0000 +++ "converted-libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Electrical/Machines/SynchronousMachine4WindingsInternalParameters.mo" 2022-03-10 09:57:59.084146798 +0000 @@ -26,7 +26,7 @@ parameter Types.PerUnit LQ2Pu "Leakage of quadrature axis 2nd damper in p.u."; parameter Types.PerUnit rQ2Pu "Resistance of quadrature axis 2nd damper in p.u."; parameter Types.PerUnit DPu = 0 "Damping coefficient of the swing equation in p.u."; - parameter Modelica.SIunits.Time H "Kinetic constant = kinetic energy / rated power"; + parameter Modelica.Units.SI.Time H "Kinetic constant = kinetic energy / rated power"; parameter Types.Choices.ExcitationPuType excitationPuType = PowerGrids.Types.Choices.ExcitationPuType.nominalStatorVoltageNoLoad "Choice of excitation base voltage"; parameter Boolean neglectTransformerTerms = true "Neglect the transformer terms in the Park equations"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Electrical/Test/Info.mo" "converted-libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Electrical/Test/Info.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Electrical/Test/Info.mo" 2022-03-10 09:57:37.544144068 +0000 +++ "converted-libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Electrical/Test/Info.mo" 2022-03-10 09:57:58.908146775 +0000 @@ -1,7 +1,7 @@ within PowerGrids.Electrical.Test; package Info - extends Modelica.Icons.Info; + extends Modelica.Icons.Information; annotation( preferredView = "info", Documentation(info = "

This package contains models meant to test individual components of the PowerGrids.Electrical library, using systems that are as simple as possible and whose analytical solution, or qualitative behaviour, is known a priori.

")); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Electrical/Test/TestEquivalentGrid.mo" "converted-libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Electrical/Test/TestEquivalentGrid.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Electrical/Test/TestEquivalentGrid.mo" 2022-03-10 09:57:37.544144068 +0000 +++ "converted-libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Electrical/Test/TestEquivalentGrid.mo" 2022-03-10 09:57:58.648146742 +0000 @@ -15,7 +15,7 @@ Placement(visible = true, transformation(origin = {-20, -40}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); Loads.LoadPQVoltageDependence load(PRefConst = 1e+07, QRefConst = 2e+07, SNom = 5e+08, UNom = 380000, portVariablesPhases = true) annotation( Placement(visible = true, transformation(origin = {-20, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); - Modelica.Blocks.Sources.RealExpression shortCircuitCapacity(y = ComplexMath.'abs'(equivalentLine.portB.S) * equivalentGrid.c) annotation( + Modelica.Blocks.Sources.RealExpression shortCircuitCapacity(y = ComplexMath.abs(equivalentLine.portB.S) * equivalentGrid.c) annotation( Placement(visible = true, transformation(origin = {10, -81}, extent = {{-18, -15}, {18, 15}}, rotation = 0))); equation connect(load.terminal, equivalentGrid.terminal) annotation( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Electrical/VoltageTransducers/TerminalVoltageTransducerIEEE.mo" "converted-libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Electrical/VoltageTransducers/TerminalVoltageTransducerIEEE.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Electrical/VoltageTransducers/TerminalVoltageTransducerIEEE.mo" 2022-03-10 09:57:37.544144068 +0000 +++ "converted-libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Electrical/VoltageTransducers/TerminalVoltageTransducerIEEE.mo" 2022-03-10 09:57:58.352146705 +0000 @@ -1,8 +1,8 @@ within PowerGrids.Electrical.VoltageTransducers; model TerminalVoltageTransducerIEEE "Terminal voltage transducer IEEE" - parameter Modelica.SIunits.Time Tr = 0 "Transducer time constant"; - parameter Modelica.SIunits.PerUnit Rc = 0 "Load compensation resistance"; - parameter Modelica.SIunits.PerUnit Xc = 0 "Load compensation reactance"; + parameter Modelica.Units.SI.Time Tr = 0 "Transducer time constant"; + parameter Modelica.Units.SI.PerUnit Rc = 0 "Load compensation resistance"; + parameter Modelica.Units.SI.PerUnit Xc = 0 "Load compensation reactance"; parameter Modelica.Blocks.Types.Init initType=Modelica.Blocks.Types.Init.NoInit "Type of initialization (1: no init, 2: steady state, 3/4: initial output)" annotation(Evaluate=true, Dialog(group="Initialization")); parameter Real yStart=0 "Initial or guess value of output (= state)" annotation ( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Examples/Tutorial/GridOperation/Static/StaticGridDifferentGeneratorParam.mo" "converted-libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Examples/Tutorial/GridOperation/Static/StaticGridDifferentGeneratorParam.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Examples/Tutorial/GridOperation/Static/StaticGridDifferentGeneratorParam.mo" 2022-03-10 09:57:37.544144068 +0000 +++ "converted-libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Examples/Tutorial/GridOperation/Static/StaticGridDifferentGeneratorParam.mo" 2022-03-10 09:57:57.472146594 +0000 @@ -4,7 +4,7 @@ inner PowerGrids.Electrical.System systemPowerGrids annotation ( Placement(visible = true, transformation(origin={95.5, 64}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); -// First Grid +// First Grid PowerGrids.Electrical.Machines.SynchronousMachine4Windings GEN_1(H = 4, PStart = -4.75e+08, QStart = -1.56e+08,SNom = 5e+08, Tpd0 = 5.143, Tppd0 = 0.042, Tppq0 = 0.083, Tpq0 = 2.16, UNom = 21000, UPhaseStart = 0.161156, UStart = 21e3 * 0.9917, portVariablesPhases = true, raPu = 0, xdPu = 2, xlPu = 0.15, xpdPu = 0.35, xppdPu = 0.25, xppqPu = 0.3, xpqPu = 0.5, xqPu = 1.8) annotation ( Placement(visible = true, transformation(origin={-69.5, 50}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); PowerGrids.Electrical.Buses.Bus NTLV_1(SNom = 5e+08, UNom = 21000, portVariablesPhases = true, portVariablesPu = true) annotation ( @@ -21,7 +21,7 @@ Placement(visible = true, transformation(origin={-103.5, 54}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); Modelica.Blocks.Sources.RealExpression ufPuIn_1(y = GEN_1.ufPuInStart) annotation ( Placement(visible = true, transformation(origin={-103.5, 35}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); - // Second Grid - Transformer nominal voltage changed + // Second Grid - Transformer nominal voltage changed PowerGrids.Electrical.Machines.SynchronousMachine4Windings GEN_2(H = 4, PStart = -4.75e+08, QStart = -1.56e+08,SNom = 5e+08, Tpd0 = 5.143, Tppd0 = 0.042, Tppq0 = 0.083, Tpq0 = 2.16, UNom = 21000, UPhaseStart = 0.161156, UStart = 21e3 * 0.9917, excitationPuType = PowerGrids.Types.Choices.ExcitationPuType.Kundur, portVariablesPhases = true, raPu = 0, xdPu = 2, xlPu = 0.15, xpdPu = 0.35, xppdPu = 0.25, xppqPu = 0.3, xpqPu = 0.5, xqPu = 1.8) annotation ( Placement(visible = true, transformation(origin={-69.5, -6}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); PowerGrids.Electrical.Buses.Bus NTLV_2(SNom = 5e+08, UNom = 21000, portVariablesPhases = true, portVariablesPu = true) annotation ( @@ -39,7 +39,7 @@ Modelica.Blocks.Sources.RealExpression ufPuIn_2(y = GEN_2.ufPuInStart) annotation ( Placement(visible = true, transformation(origin={-103.5, -21}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); -// Third Grid - Generator Nominal Voltage changed +// Third Grid - Generator Nominal Voltage changed PowerGrids.Electrical.Machines.SynchronousMachine4WindingsInternalParameters GEN_3(H = 4, LDPu = 0.2, LQ1Pu = 0.444231, LQ2Pu = 0.2625, LdPu = 0.15, LfPu = 0.224242, LqPu = 0.15, MdPu = 1.85, MqPu = 1.65, PStart = -4.75e+08, QStart = -1.56e+08,SNom = 5e+08, UNom = 21000, UPhaseStart = 0.161156, UStart = 21e3 * 0.9917, mrcPu = 0, portVariablesPhases = true, rDPu = 0.0303152, rQ1Pu = 0.00308618, rQ2Pu = 0.0234897, raPu = 0, rfPu = 0.00128379) annotation ( Placement(visible = true, transformation(origin={-69.5, -62}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); PowerGrids.Electrical.Buses.Bus NTLV_3(SNom = 5e+08, UNom = 21000, portVariablesPhases = true, portVariablesPu = true) annotation ( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Examples/Tutorial/GridOperation/Static/StaticGridDifferentNominals.mo" "converted-libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Examples/Tutorial/GridOperation/Static/StaticGridDifferentNominals.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Examples/Tutorial/GridOperation/Static/StaticGridDifferentNominals.mo" 2022-03-10 09:57:37.544144068 +0000 +++ "converted-libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/Examples/Tutorial/GridOperation/Static/StaticGridDifferentNominals.mo" 2022-03-10 09:57:57.356146580 +0000 @@ -4,7 +4,7 @@ inner PowerGrids.Electrical.System systemPowerGrids annotation ( Placement(visible = true, transformation(origin = {70, 70}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); -// First System +// First System PowerGrids.Electrical.Machines.SynchronousMachine4Windings GEN_1(H = 4, PStart = -4.75e+08, QStart = -1.56e+08,SNom = 5e+08, Tpd0 = 5.143, Tppd0 = 0.042, Tppq0 = 0.083, Tpq0 = 2.16, UNom = 21000, UPhaseStart = 0.161156, UStart = 21e3 * 0.9917, portVariablesPhases = true, raPu = 0, xdPu = 2, xlPu = 0.15, xpdPu = 0.35, xppdPu = 0.25, xppqPu = 0.3, xpqPu = 0.5, xqPu = 1.8) annotation ( Placement(visible = true, transformation(origin = {-76, 64}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); PowerGrids.Electrical.Buses.Bus NTLV_1(SNom = 5e+08, UNom = 21000, portVariablesPhases = true, portVariablesPu = true) annotation ( @@ -21,7 +21,7 @@ Placement(visible = true, transformation(origin = {-108, 68}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); Modelica.Blocks.Sources.RealExpression ufPuIn_1(y = GEN_1.ufPuInStart) annotation ( Placement(visible = true, transformation(origin = {-108, 48}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); - // Second System - Transformer nominal voltage changed + // Second System - Transformer nominal voltage changed PowerGrids.Electrical.Machines.SynchronousMachine4Windings GEN_2(H = 4, PStart = -4.75e+08, QStart = -1.56e+08,SNom = 5e+08, Tpd0 = 5.143, Tppd0 = 0.042, Tppq0 = 0.083, Tpq0 = 2.16, UNom = 21000, UPhaseStart = 0.161156, UStart = 21e3 * 0.9917, portVariablesPhases = true, raPu = 0, xdPu = 2, xlPu = 0.15, xpdPu = 0.35, xppdPu = 0.25, xppqPu = 0.3, xpqPu = 0.5, xqPu = 1.8) annotation ( Placement(visible = true, transformation(origin = {-76, 18}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); PowerGrids.Electrical.Buses.Bus NTLV_2(SNom = 5e+08, UNom = 21000, portVariablesPhases = true, portVariablesPu = true) annotation ( @@ -39,7 +39,7 @@ Modelica.Blocks.Sources.RealExpression ufPuIn_2(y = GEN_2.ufPuInStart) annotation ( Placement(visible = true, transformation(origin = {-108, 4}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); -// Third System - Generator Nominal Voltage changed +// Third System - Generator Nominal Voltage changed PowerGrids.Electrical.Machines.SynchronousMachine4Windings GEN_3(H = 4, PStart = -4.75e+08, QStart = -1.56e+08,SNom = 5e+08, Tpd0 = 5.143, Tppd0 = 0.042, Tppq0 = 0.083, Tpq0 = 2.16, UNom = 10000, UPhaseStart = 0.161156, UStart = 21e3 * 0.9917, portVariablesPhases = true, raPu = 0, xdPu = 2, xlPu = 0.15, xpdPu = 0.35, xppdPu = 0.25, xppqPu = 0.3, xpqPu = 0.5, xqPu = 1.8) annotation ( Placement(visible = true, transformation(origin = {-76, -38}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); PowerGrids.Electrical.Buses.Bus NTLV_3(SNom = 5e+08, UNom = 21000, portVariablesPhases = true, portVariablesPu = true) annotation ( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/openmodelica.metadata.json" "converted-libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/openmodelica.metadata.json" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/openmodelica.metadata.json" 2022-03-10 09:57:37.548144069 +0000 +++ "converted-libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/openmodelica.metadata.json" 2022-03-10 09:58:00.700147002 +0000 @@ -1 +1 @@ -{"path":"PowerGrids", "provides":["1.0.0", "1.0.1"], "sha":"a3752e0a5b767d4cd57146826b1662bc3b7c8f38", "support":"noSupport", "uses":{"Modelica":"3.2.3"}, "version":"1.0.2-master", "zipfile":"https://github.com/PowerGrids/PowerGrids/archive/a3752e0a5b767d4cd57146826b1662bc3b7c8f38.zip"} +{"path": "PowerGrids", "provides": ["1.0.0", "1.0.1"], "sha": "a3752e0a5b767d4cd57146826b1662bc3b7c8f38", "support": "noSupport", "uses": {"Modelica": "4.0.0"}, "version": "1.0.2-master", "zipfile": "https://github.com/PowerGrids/PowerGrids/archive/a3752e0a5b767d4cd57146826b1662bc3b7c8f38.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/PowerGrids 1.0.2-master/package.mo" "converted-libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/package.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/package.mo" 2022-03-10 09:57:37.548144069 +0000 +++ "converted-libraries/.openmodelica/libraries/PowerGrids 1.0.2-master/package.mo" 2022-03-10 09:58:00.700147002 +0000 @@ -1,14 +1,28 @@ within ; package PowerGrids extends Modelica.Icons.Package; - import SI = Modelica.SIunits; + import Modelica.Units.SI; import CM = Modelica.ComplexMath; + + + + + + + + + + + + + + annotation( version = "1.0.2", conversion(noneFromVersion = "1.0.0", noneFromVersion = "1.0.1"), - uses(Modelica(version="3.2.3")), + uses(Modelica(version= "4.0.0")), Documentation(info = "

Copyright © 2018-2020, RTE.

PowerGrids is licensed under the terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with this file, you can obtain one here.

-------------------------------------------------------------------------------------------------------------

The PowerGrids library is a library for the modelling of power generation and transmission systems for electro-mechanical phenomena (\"phasor\" approximation).

The main goal of the library is to demonstrate how it is possible to exploit the power of the Modelica language to develop fully declarative electro-mechanical models of power generation and transmission systems that are self-documented, easy to understand, and easy to modify and improve. For physical component models, the code is as close as possible to the model description as found in textbooks and basic theory manuals, entirely leaving to the Modelica tool the task of solving the equations. For control systems, block diagrams are used, as they are immediately recognized by domain experts.