diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AES main/ControlBlocks/AnalogueControllers/PI_awfb_basic.mo" "converted-libraries/.openmodelica/libraries/AES main/ControlBlocks/AnalogueControllers/PI_awfb_basic.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AES main/ControlBlocks/AnalogueControllers/PI_awfb_basic.mo"	2022-03-10 09:57:38.048144133 +0000
+++ "converted-libraries/.openmodelica/libraries/AES main/ControlBlocks/AnalogueControllers/PI_awfb_basic.mo"	2022-03-10 09:57:53.968146149 +0000
@@ -18,7 +18,7 @@
     Placement(visible = true, transformation(origin = {-120, 12}, extent = {{-20, -20}, {20, 20}}, rotation = 0)));
   Modelica.Blocks.Continuous.FirstOrder FO(T = Ti, initType = Modelica.Blocks.Types.Init.InitialOutput, k = 1) annotation(
     Placement(visible = true, transformation(origin = {40, -60}, extent = {{20, -20}, {-20, 20}}, rotation = 0)));
-  Modelica.Blocks.Nonlinear.Limiter sat(limitsAtInit = true, uMax = CSmax, uMin = CSmin) annotation(
+  Modelica.Blocks.Nonlinear.Limiter sat( uMax = CSmax, uMin = CSmin) annotation(
     Placement(visible = true, transformation(origin = {80, 0}, extent = {{-20, -20}, {20, 20}}, rotation = 0)));
   Modelica.Blocks.Math.Add add1 annotation(
     Placement(visible = true, transformation(origin = {-6.21725e-15, -2.88658e-15}, extent = {{-20, -20}, {20, 20}}, rotation = 0)));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AES main/ControlBlocks/AnalogueControllers/PI_awfb_bias.mo" "converted-libraries/.openmodelica/libraries/AES main/ControlBlocks/AnalogueControllers/PI_awfb_bias.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AES main/ControlBlocks/AnalogueControllers/PI_awfb_bias.mo"	2022-03-10 09:57:38.048144133 +0000
+++ "converted-libraries/.openmodelica/libraries/AES main/ControlBlocks/AnalogueControllers/PI_awfb_bias.mo"	2022-03-10 09:57:53.948146147 +0000
@@ -18,7 +18,7 @@
     Placement(visible = true, transformation(origin = {-120, 0}, extent = {{-20, -20}, {20, 20}}, rotation = 0)));
   Modelica.Blocks.Continuous.FirstOrder FO(T = Ti, initType = Modelica.Blocks.Types.Init.InitialOutput, k = 1) annotation(
     Placement(visible = true, transformation(origin = {58, -60}, extent = {{20, -20}, {-20, 20}}, rotation = 0)));
-  Modelica.Blocks.Nonlinear.Limiter sat(limitsAtInit = true, uMax = CSmax, uMin = CSmin) annotation(
+  Modelica.Blocks.Nonlinear.Limiter sat( uMax = CSmax, uMin = CSmin) annotation(
     Placement(visible = true, transformation(origin = {98, 0}, extent = {{-20, -20}, {20, 20}}, rotation = 0)));
   Modelica.Blocks.Interfaces.RealInput Bias annotation(
     Placement(visible = true, transformation(origin = {-180, 60}, extent = {{-20, -20}, {20, 20}}, rotation = 0), iconTransformation(origin = {0, 120}, extent = {{-20, -20}, {20, 20}}, rotation = -90)));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AES main/Coursework/ElecSys_PwrFreq_control/PA_islanded_generator_loadDroop.mo" "converted-libraries/.openmodelica/libraries/AES main/Coursework/ElecSys_PwrFreq_control/PA_islanded_generator_loadDroop.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AES main/Coursework/ElecSys_PwrFreq_control/PA_islanded_generator_loadDroop.mo"	2022-03-10 09:57:38.048144133 +0000
+++ "converted-libraries/.openmodelica/libraries/AES main/Coursework/ElecSys_PwrFreq_control/PA_islanded_generator_loadDroop.mo"	2022-03-10 09:57:53.704146116 +0000
@@ -11,7 +11,7 @@
     Placement(visible = true, transformation(origin = {-110, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
   AES.ProcessComponents.Electric.Loads_PAport.Load_linear_droop L annotation(
     Placement(visible = true, transformation(origin = {8, 30}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  Modelica.Blocks.Continuous.LimPID Cps(Ti = 80, controllerType = .Modelica.Blocks.Types.SimpleController.PI, k = 0.7,limitsAtInit = true, yMax = 1, yMin = 0)  annotation(
+  Modelica.Blocks.Continuous.LimPID Cps(Ti = 80, controllerType = .Modelica.Blocks.Types.SimpleController.PI, k = 0.7, yMax = 1, yMin = 0)  annotation(
     Placement(visible = true, transformation(origin = {-68, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
   AES.ProcessComponents.Electric.Generators_PAport.Generator_order0_prescribed_P G(Tox = 0.8)  annotation(
     Placement(visible = true, transformation(origin = {8, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AES main/Coursework/ElecSys_generator_models/BoilerFollows.mo" "converted-libraries/.openmodelica/libraries/AES main/Coursework/ElecSys_generator_models/BoilerFollows.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AES main/Coursework/ElecSys_generator_models/BoilerFollows.mo"	2022-03-10 09:57:38.048144133 +0000
+++ "converted-libraries/.openmodelica/libraries/AES main/Coursework/ElecSys_generator_models/BoilerFollows.mo"	2022-03-10 09:57:53.668146112 +0000
@@ -12,9 +12,9 @@
     Placement(visible = true, transformation(origin = {10, -10}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
   Modelica.Blocks.Math.Add ia annotation(
     Placement(visible = true, transformation(origin = {110, -4}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  Modelica.Blocks.Continuous.LimPID PIp(Ti = 1, controllerType = .Modelica.Blocks.Types.SimpleController.PI, k = 0.4, limitsAtInit = true, yMax = 1, yMin = 0)  annotation(
+  Modelica.Blocks.Continuous.LimPID PIp(Ti = 1, controllerType = .Modelica.Blocks.Types.SimpleController.PI, k = 0.4, yMax = 1, yMin = 0)  annotation(
     Placement(visible = true, transformation(origin = {-90, 30}, extent = {{-10, 10}, {10, -10}}, rotation = 0)));
-  Modelica.Blocks.Continuous.LimPID PIe(Ti = 100, controllerType = .Modelica.Blocks.Types.SimpleController.PI, k = 2, limitsAtInit = true, yMax = 1, yMin = 0)  annotation(
+  Modelica.Blocks.Continuous.LimPID PIe(Ti = 100, controllerType = .Modelica.Blocks.Types.SimpleController.PI, k = 2, yMax = 1, yMin = 0)  annotation(
     Placement(visible = true, transformation(origin = {-90, -10}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
   Modelica.Blocks.Sources.RealExpression spp(y = if time < 1000 then 0.75 else 0.8)  annotation(
     Placement(visible = true, transformation(origin = {-130, 30}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AES main/Coursework/ElecSys_generator_models/SlidingPressure.mo" "converted-libraries/.openmodelica/libraries/AES main/Coursework/ElecSys_generator_models/SlidingPressure.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AES main/Coursework/ElecSys_generator_models/SlidingPressure.mo"	2022-03-10 09:57:38.048144133 +0000
+++ "converted-libraries/.openmodelica/libraries/AES main/Coursework/ElecSys_generator_models/SlidingPressure.mo"	2022-03-10 09:57:53.636146107 +0000
@@ -12,7 +12,7 @@
     Placement(visible = true, transformation(origin = {10, -10}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
   Modelica.Blocks.Math.Add ia annotation(
     Placement(visible = true, transformation(origin = {90, -4}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  Modelica.Blocks.Continuous.LimPID PIp(Ti = 100, controllerType = .Modelica.Blocks.Types.SimpleController.PI, k = 1, limitsAtInit = true, yMax = 1, yMin = 0)  annotation(
+  Modelica.Blocks.Continuous.LimPID PIp(Ti = 100, controllerType = .Modelica.Blocks.Types.SimpleController.PI, k = 1, yMax = 1, yMin = 0)  annotation(
     Placement(visible = true, transformation(origin = {-90, 30}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
   Modelica.Blocks.Sources.RealExpression spp(y = if time < 1000 then 0.75 else 0.8)  annotation(
     Placement(visible = true, transformation(origin = {-130, 30}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AES main/Coursework/ElecSys_generator_models/TurbineFollows.mo" "converted-libraries/.openmodelica/libraries/AES main/Coursework/ElecSys_generator_models/TurbineFollows.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AES main/Coursework/ElecSys_generator_models/TurbineFollows.mo"	2022-03-10 09:57:38.048144133 +0000
+++ "converted-libraries/.openmodelica/libraries/AES main/Coursework/ElecSys_generator_models/TurbineFollows.mo"	2022-03-10 09:57:53.616146105 +0000
@@ -12,9 +12,9 @@
     Placement(visible = true, transformation(origin = {10, -10}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
   Modelica.Blocks.Math.Add ia annotation(
     Placement(visible = true, transformation(origin = {108, -4}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  Modelica.Blocks.Continuous.LimPID PIp(Ti = 30, controllerType = .Modelica.Blocks.Types.SimpleController.PI, k = 1.5, limitsAtInit = true, yMax = 1, yMin = 0)  annotation(
+  Modelica.Blocks.Continuous.LimPID PIp(Ti = 30, controllerType = .Modelica.Blocks.Types.SimpleController.PI, k = 1.5, yMax = 1, yMin = 0)  annotation(
     Placement(visible = true, transformation(origin = {-90, 30}, extent = {{-10, 10}, {10, -10}}, rotation = 0)));
-  Modelica.Blocks.Continuous.LimPID PIe(Ti = 10, controllerType = .Modelica.Blocks.Types.SimpleController.PI, k = -10, limitsAtInit = true, yMax = 1, yMin = 0)  annotation(
+  Modelica.Blocks.Continuous.LimPID PIe(Ti = 10, controllerType = .Modelica.Blocks.Types.SimpleController.PI, k = -10, yMax = 1, yMin = 0)  annotation(
     Placement(visible = true, transformation(origin = {-90, -10}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
   Modelica.Blocks.Sources.RealExpression spp(y = if time < 1000 then 0.75 else 0.8)  annotation(
     Placement(visible = true, transformation(origin = {-130, 30}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AES main/Coursework/Tuning_brushup/MSL_electrical_thermal_OpenLoop.mo" "converted-libraries/.openmodelica/libraries/AES main/Coursework/Tuning_brushup/MSL_electrical_thermal_OpenLoop.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AES main/Coursework/Tuning_brushup/MSL_electrical_thermal_OpenLoop.mo"	2022-03-10 09:57:38.048144133 +0000
+++ "converted-libraries/.openmodelica/libraries/AES main/Coursework/Tuning_brushup/MSL_electrical_thermal_OpenLoop.mo"	2022-03-10 09:57:52.524145966 +0000
@@ -14,7 +14,7 @@
     Placement(visible = true, transformation(origin = {-150, -40}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
   Modelica.Electrical.Analog.Sources.SignalVoltage Vh annotation(
     Placement(visible = true, transformation(origin = {-70, 30}, extent = {{-10, 10}, {10, -10}}, rotation = -90)));
-  Modelica.Electrical.Analog.Basic.HeatingResistor heater(R_ref = 10, useHeatPort = true) annotation(
+  Modelica.Electrical.Analog.Basic.Resistor heater(R = 10, useHeatPort = true) annotation(
     Placement(visible = true, transformation(origin = {-40, 30}, extent = {{10, -10}, {-10, 10}}, rotation = 90)));
   Modelica.Electrical.Analog.Basic.Ground gnd annotation(
     Placement(visible = true, transformation(origin = {-70, 2}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AES main/Coursework/Tuning_brushup/MSL_electrical_thermal_control.mo" "converted-libraries/.openmodelica/libraries/AES main/Coursework/Tuning_brushup/MSL_electrical_thermal_control.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AES main/Coursework/Tuning_brushup/MSL_electrical_thermal_control.mo"	2022-03-10 09:57:38.048144133 +0000
+++ "converted-libraries/.openmodelica/libraries/AES main/Coursework/Tuning_brushup/MSL_electrical_thermal_control.mo"	2022-03-10 09:57:52.492145962 +0000
@@ -10,7 +10,7 @@
     Placement(visible = true, transformation(origin = {-40, -40}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
   Modelica.Thermal.HeatTransfer.Sensors.TemperatureSensor sT annotation(
     Placement(visible = true, transformation(origin = {-40, -10}, extent = {{10, -10}, {-10, 10}}, rotation = 0)));
-  Modelica.Blocks.Continuous.LimPID PID(Ti = 500 * 0.25, controllerType = Modelica.Blocks.Types.SimpleController.PI, k = 240, limitsAtInit = true, yMax = 100, yMin = 0) annotation(
+  Modelica.Blocks.Continuous.LimPID PID(Ti = 500 * 0.25, controllerType = Modelica.Blocks.Types.SimpleController.PI, k = 240, yMax = 100, yMin = 0) annotation(
     Placement(visible = true, transformation(origin = {-110, 30}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
   Modelica.Blocks.Sources.RealExpression Tsp(y = 273.15 + 20) annotation(
     Placement(visible = true, transformation(origin = {-150, 30}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
@@ -18,7 +18,7 @@
     Placement(visible = true, transformation(origin = {-150, -40}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
   Modelica.Electrical.Analog.Sources.SignalVoltage Vh annotation(
     Placement(visible = true, transformation(origin = {-70, 30}, extent = {{-10, 10}, {10, -10}}, rotation = -90)));
-  Modelica.Electrical.Analog.Basic.HeatingResistor heater(R_ref = 10, useHeatPort = true) annotation(
+  Modelica.Electrical.Analog.Basic.Resistor heater(R = 10, useHeatPort = true) annotation(
     Placement(visible = true, transformation(origin = {-40, 30}, extent = {{10, -10}, {-10, 10}}, rotation = 90)));
   Modelica.Electrical.Analog.Basic.Ground gnd annotation(
     Placement(visible = true, transformation(origin = {-70, 2}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AES main/Media/Substances/MoistAir.mo" "converted-libraries/.openmodelica/libraries/AES main/Media/Substances/MoistAir.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AES main/Media/Substances/MoistAir.mo"	2022-03-10 09:57:38.048144133 +0000
+++ "converted-libraries/.openmodelica/libraries/AES main/Media/Substances/MoistAir.mo"	2022-03-10 09:57:51.252145805 +0000
@@ -22,7 +22,7 @@
   SI.SpecificHeatCapacity cp "moist air specific heat capacity [J/kg da K]";
   SI.SpecificHeatCapacity R "equivalent gas constant of moist air";
 protected
-  SI.Conversions.NonSIunits.Temperature_degC Tc;
+  Modelica.Units.NonSI.Temperature_degC Tc;
 equation
   Tc  = T-273.15;
   x   = X / (1 + X);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AES main/openmodelica.metadata.json" "converted-libraries/.openmodelica/libraries/AES main/openmodelica.metadata.json"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AES main/openmodelica.metadata.json"	2022-03-10 09:57:38.052144132 +0000
+++ "converted-libraries/.openmodelica/libraries/AES main/openmodelica.metadata.json"	2022-03-10 09:57:54.068146162 +0000
@@ -1 +1 @@
-{"path":"Modelica/AES", "sha":"4bbbb734a63b0722cfdeccf0a8643d3ef7e0b2f0", "support":"noSupport", "uses":{"Modelica":"3.2.3"}, "version":"main", "zipfile":"https://github.com/looms-polimi/Automation_of_Energy_Systems/archive/4bbbb734a63b0722cfdeccf0a8643d3ef7e0b2f0.zip"}
+{"path": "Modelica/AES", "sha": "4bbbb734a63b0722cfdeccf0a8643d3ef7e0b2f0", "support": "noSupport", "uses": {"Modelica": "4.0.0"}, "version": "main", "zipfile": "https://github.com/looms-polimi/Automation_of_Energy_Systems/archive/4bbbb734a63b0722cfdeccf0a8643d3ef7e0b2f0.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/AES main/package.mo" "converted-libraries/.openmodelica/libraries/AES main/package.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AES main/package.mo"	2022-03-10 09:57:38.052144132 +0000
+++ "converted-libraries/.openmodelica/libraries/AES main/package.mo"	2022-03-10 09:57:54.068146162 +0000
@@ -1,7 +1,23 @@
 package AES
-  import SI=Modelica.SIunits;
+  import Modelica.Units.SI;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
   annotation(
-    Icon(coordinateSystem(preserveAspectRatio = false, initialScale = 0.1), graphics = {Rectangle( lineColor = {200, 200, 200}, fillColor = {248, 248, 248}, fillPattern = FillPattern.HorizontalCylinder, extent = {{-100, -100}, {100, 100}}, radius = 25), Rectangle(lineColor = {128, 128, 128}, extent = {{-100, -100}, {100, 100}}, radius = 25), Text(origin = {-3, 18}, extent = {{-77, 62}, {83, -98}}, textString = "AES")}),
+    Icon(coordinateSystem(preserveAspectRatio = false, initialScale = 0.1), graphics = {Rectangle(lineColor = {200, 200, 200}, fillColor = {248, 248, 248}, fillPattern = FillPattern.HorizontalCylinder, extent = {{-100, -100}, {100, 100}}, radius = 25), Rectangle(lineColor = {128, 128, 128}, extent = {{-100, -100}, {100, 100}}, radius = 25), Text(origin = {-3, 18}, extent = {{-77, 62}, {83, -98}}, textString = "AES")}),
     Diagram(coordinateSystem(extent = {{-200, -100}, {200, 100}})),
-    uses(Modelica(version = "3.2.3")));
-end AES;
+    uses(Modelica(version = "4.0.0")));
+end AES;
\ No newline at end of file