diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Architectures/SensorComparison/Implementation/BasicPlant.mo" "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Architectures/SensorComparison/Implementation/BasicPlant.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Architectures/SensorComparison/Implementation/BasicPlant.mo"	2022-03-10 09:57:42.504144698 +0000
+++ "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Architectures/SensorComparison/Implementation/BasicPlant.mo"	2022-03-10 09:57:54.960146275 +0000
@@ -1,11 +1,11 @@
 within ModelicaByExample.Architectures.SensorComparison.Implementation;
 model BasicPlant "Implementation of the basic plant model"
-  parameter Modelica.SIunits.Inertia J_a=0.1 "Moment of inertia";
-  parameter Modelica.SIunits.Inertia J_b=0.3 "Moment of inertia";
-  parameter Modelica.SIunits.RotationalSpringConstant c=100 "Spring constant";
-  parameter Modelica.SIunits.RotationalDampingConstant d_shaft=3
+  parameter Modelica.Units.SI.Inertia J_a=0.1 "Moment of inertia";
+  parameter Modelica.Units.SI.Inertia J_b=0.3 "Moment of inertia";
+  parameter Modelica.Units.SI.RotationalSpringConstant c=100 "Spring constant";
+  parameter Modelica.Units.SI.RotationalDampingConstant d_shaft=3
     "Shaft damping constant";
-  parameter Modelica.SIunits.RotationalDampingConstant d_load=4
+  parameter Modelica.Units.SI.RotationalDampingConstant d_load=4
     "Load damping constant";
 
   Modelica.Mechanics.Rotational.Interfaces.Support housing
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Architectures/SensorComparison/Implementation/LimitedActuator.mo" "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Architectures/SensorComparison/Implementation/LimitedActuator.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Architectures/SensorComparison/Implementation/LimitedActuator.mo"	2022-03-10 09:57:42.504144698 +0000
+++ "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Architectures/SensorComparison/Implementation/LimitedActuator.mo"	2022-03-10 09:57:54.892146266 +0000
@@ -1,7 +1,7 @@
 within ModelicaByExample.Architectures.SensorComparison.Implementation;
 model LimitedActuator "An actuator with lag and saturation"
   extends Interfaces.Actuator;
-  parameter Modelica.SIunits.Time delayTime
+  parameter Modelica.Units.SI.Time delayTime
     "Delay time of output with respect to input signal";
   parameter Real uMax "Upper limits of input signals";
 protected
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Architectures/SensorComparison/Implementation/PID_Controller.mo" "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Architectures/SensorComparison/Implementation/PID_Controller.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Architectures/SensorComparison/Implementation/PID_Controller.mo"	2022-03-10 09:57:42.504144698 +0000
+++ "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Architectures/SensorComparison/Implementation/PID_Controller.mo"	2022-03-10 09:57:54.876146265 +0000
@@ -2,8 +2,8 @@
 model PID_Controller "Controller subsystem implemented using a PID controller"
   extends Interfaces.Controller;
   parameter Real k "Gain of controller";
-  parameter Modelica.SIunits.Time Ti "Time constant of Integrator block";
-  parameter Modelica.SIunits.Time Td "Time constant of Derivative block";
+  parameter Modelica.Units.SI.Time Ti "Time constant of Integrator block";
+  parameter Modelica.Units.SI.Time Td "Time constant of Derivative block";
   parameter Real yMax "Upper limit of output";
 protected
   Modelica.Blocks.Continuous.LimPID PID(k=k, Ti=Ti, Td=Td, yMax=yMax)
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Architectures/SensorComparison/Implementation/SampleHoldSensor.mo" "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Architectures/SensorComparison/Implementation/SampleHoldSensor.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Architectures/SensorComparison/Implementation/SampleHoldSensor.mo"	2022-03-10 09:57:42.504144698 +0000
+++ "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Architectures/SensorComparison/Implementation/SampleHoldSensor.mo"	2022-03-10 09:57:54.836146259 +0000
@@ -1,6 +1,6 @@
 within ModelicaByExample.Architectures.SensorComparison.Implementation;
 model SampleHoldSensor "Implementation of a sample hold sensor"
-  parameter Modelica.SIunits.Time sample_time(min=Modelica.Constants.eps);
+  parameter Modelica.Units.SI.Time sample_time(min=Modelica.Constants.eps);
   Modelica.Mechanics.Rotational.Interfaces.Flange_a shaft
     "Flange of shaft from which sensor information shall be measured"
     annotation (Placement(transformation(extent={{-110,-10},{-90,10}})));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Architectures/ThermalControl/Bogus/BusPIControl.mo" "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Architectures/ThermalControl/Bogus/BusPIControl.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Architectures/ThermalControl/Bogus/BusPIControl.mo"	2022-03-10 09:57:42.504144698 +0000
+++ "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Architectures/ThermalControl/Bogus/BusPIControl.mo"	2022-03-10 09:57:54.664146237 +0000
@@ -4,7 +4,7 @@
     ModelicaByExample.Architectures.ThermalControl.Bogus.ControlSystem_WithBus;
   parameter Real setpoint "Desired temperature";
   parameter Real k=1 "Gain";
-  parameter Modelica.SIunits.Time T "Time Constant (T>0 required)";
+  parameter Modelica.Units.SI.Time T "Time Constant (T>0 required)";
 protected
   Modelica.Blocks.Sources.Trapezoid const(
     amplitude=5,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Architectures/ThermalControl/Implementations/ConventionalPIControl.mo" "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Architectures/ThermalControl/Implementations/ConventionalPIControl.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Architectures/ThermalControl/Implementations/ConventionalPIControl.mo"	2022-03-10 09:57:42.508144697 +0000
+++ "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Architectures/ThermalControl/Implementations/ConventionalPIControl.mo"	2022-03-10 09:57:54.452146212 +0000
@@ -3,7 +3,7 @@
   extends Interfaces.ControlSystem;
   parameter Real setpoint "Desired temperature";
   parameter Real k=1 "Gain";
-  parameter Modelica.SIunits.Time T "Time Constant (T>0 required)";
+  parameter Modelica.Units.SI.Time T "Time Constant (T>0 required)";
 protected
   Modelica.Blocks.Sources.Trapezoid setpoint_signal(
     amplitude=5, final offset=setpoint,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Architectures/ThermalControl/Implementations/ExpandablePIControl.mo" "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Architectures/ThermalControl/Implementations/ExpandablePIControl.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Architectures/ThermalControl/Implementations/ExpandablePIControl.mo"	2022-03-10 09:57:42.508144697 +0000
+++ "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Architectures/ThermalControl/Implementations/ExpandablePIControl.mo"	2022-03-10 09:57:54.428146208 +0000
@@ -3,7 +3,7 @@
   extends Interfaces.ControlSystem_WithExpandableBus;
   parameter Real setpoint "Desired temperature";
   parameter Real k=1 "Gain";
-  parameter Modelica.SIunits.Time T "Time Constant (T>0 required)";
+  parameter Modelica.Units.SI.Time T "Time Constant (T>0 required)";
 protected
   Modelica.Blocks.Sources.Trapezoid setpoint_signal(
     amplitude=5, final offset=setpoint, rising=1,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Architectures/ThermalControl/Implementations/ThreeZonePlantModel.mo" "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Architectures/ThermalControl/Implementations/ThreeZonePlantModel.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Architectures/ThermalControl/Implementations/ThreeZonePlantModel.mo"	2022-03-10 09:57:42.508144697 +0000
+++ "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Architectures/ThermalControl/Implementations/ThreeZonePlantModel.mo"	2022-03-10 09:57:54.384146202 +0000
@@ -1,9 +1,9 @@
 within ModelicaByExample.Architectures.ThermalControl.Implementations;
 model ThreeZonePlantModel "A plant model with three zones"
   extends Interfaces.PlantModel;
-  parameter Modelica.SIunits.HeatCapacity C "Zone capacitance";
-  parameter Modelica.SIunits.ThermalConductance G "Conductance between rooms";
-  parameter Modelica.SIunits.Temperature T_ambient "Fixed temperature at port";
+  parameter Modelica.Units.SI.HeatCapacity C "Zone capacitance";
+  parameter Modelica.Units.SI.ThermalConductance G "Conductance between rooms";
+  parameter Modelica.Units.SI.Temperature T_ambient "Fixed temperature at port";
   parameter Real h "Convenction coefficient";
 protected
   Modelica.Thermal.HeatTransfer.Components.HeatCapacitor zone1(C=C)
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/BlockDiagrams/Examples/ControlledCooling.mo" "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/BlockDiagrams/Examples/ControlledCooling.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/BlockDiagrams/Examples/ControlledCooling.mo"	2022-03-10 09:57:42.508144697 +0000
+++ "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/BlockDiagrams/Examples/ControlledCooling.mo"	2022-03-10 09:57:53.592146101 +0000
@@ -1,13 +1,13 @@
 within ModelicaByExample.Components.BlockDiagrams.Examples;
 model ControlledCooling "Adding a setpoint and control strategy"
-  import Modelica.SIunits.Conversions.from_degC;
+  import Modelica.Units.Conversions.from_degC;
   parameter Real h = 0.7 "Convection coefficient";
   parameter Real m = 0.1 "Thermal maass";
   parameter Real c_p = 1.2 "Specific heat";
   parameter Real T_inf = from_degC(27.5) "Ambient temperature";
   parameter Real T_bar = from_degC(30.0) "Desired temperature";
   parameter Real k = 2.0 "Controller gain";
-  Components.Integrator T(y0=Modelica.SIunits.Conversions.from_degC(20))
+  Components.Integrator T(y0=Modelica.Units.Conversions.from_degC(20))
     annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
   Components.Constant ambient(k=T_inf)
     annotation (Placement(transformation(extent={{-10,-40},{10,-20}})));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/BlockDiagrams/Examples/MultiDomainControl.mo" "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/BlockDiagrams/Examples/MultiDomainControl.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/BlockDiagrams/Examples/MultiDomainControl.mo"	2022-03-10 09:57:42.508144697 +0000
+++ "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/BlockDiagrams/Examples/MultiDomainControl.mo"	2022-03-10 09:57:53.568146100 +0000
@@ -2,7 +2,7 @@
 model MultiDomainControl
   "Mixing thermal components with blocks for sensing, actuation and control"
 
-  import Modelica.SIunits.Conversions.from_degC;
+  import Modelica.Units.Conversions.from_degC;
 
   parameter Real h = 0.7 "Convection coefficient";
   parameter Real A = 1.0 "Area";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/BlockDiagrams/Examples/NewtonCooling.mo" "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/BlockDiagrams/Examples/NewtonCooling.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/BlockDiagrams/Examples/NewtonCooling.mo"	2022-03-10 09:57:42.508144697 +0000
+++ "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/BlockDiagrams/Examples/NewtonCooling.mo"	2022-03-10 09:57:53.556146098 +0000
@@ -1,6 +1,6 @@
 within ModelicaByExample.Components.BlockDiagrams.Examples;
 model NewtonCooling "Newton cooling system modeled with blocks"
-  import Modelica.SIunits.Conversions.from_degC;
+  import Modelica.Units.Conversions.from_degC;
   parameter Real h = 0.7 "Convection coefficient";
   parameter Real A = 1.0 "Area";
   parameter Real m = 0.1 "Thermal mass";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/ChemicalReactions/ABX/Components/Solution.mo" "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/ChemicalReactions/ABX/Components/Solution.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/ChemicalReactions/ABX/Components/Solution.mo"	2022-03-10 09:57:42.512144698 +0000
+++ "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/ChemicalReactions/ABX/Components/Solution.mo"	2022-03-10 09:57:53.348146072 +0000
@@ -2,7 +2,7 @@
 model Solution "A mixture of species A, B and X"
   Interfaces.Mixture mixture
     annotation (Placement(transformation(extent={{90,-10},{110,10}})));
-  Modelica.SIunits.Concentration C[Species]=mixture.C
+  Modelica.Units.SI.Concentration C[Species]=mixture.C
     annotation(Dialog(group="Initialization",showStartAttribute=true));
 equation
   der(mixture.C) = mixture.R;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/ChemicalReactions/ABX/Interfaces/Mixture.mo" "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/ChemicalReactions/ABX/Interfaces/Mixture.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/ChemicalReactions/ABX/Interfaces/Mixture.mo"	2022-03-10 09:57:42.512144698 +0000
+++ "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/ChemicalReactions/ABX/Interfaces/Mixture.mo"	2022-03-10 09:57:53.316146068 +0000
@@ -1,5 +1,5 @@
 within ModelicaByExample.Components.ChemicalReactions.ABX.Interfaces;
 connector Mixture
-  Modelica.SIunits.Concentration C[Species];
+  Modelica.Units.SI.Concentration C[Species];
   flow ConcentrationRate R[Species];
 end Mixture;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/ChemicalReactions/ABX/Interfaces/Reaction.mo" "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/ChemicalReactions/ABX/Interfaces/Reaction.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/ChemicalReactions/ABX/Interfaces/Reaction.mo"	2022-03-10 09:57:42.512144698 +0000
+++ "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/ChemicalReactions/ABX/Interfaces/Reaction.mo"	2022-03-10 09:57:53.304146065 +0000
@@ -6,7 +6,7 @@
 protected
   ConcentrationRate consumed[Species];
   ConcentrationRate produced[Species];
-  Modelica.SIunits.Concentration C[Species] = mixture.C;
+  Modelica.Units.SI.Concentration C[Species] = mixture.C;
 equation
   consumed = -produced;
   mixture.R = consumed;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Electrical/DryApproach/Capacitor.mo" "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Electrical/DryApproach/Capacitor.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Electrical/DryApproach/Capacitor.mo"	2022-03-10 09:57:42.512144698 +0000
+++ "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Electrical/DryApproach/Capacitor.mo"	2022-03-10 09:57:53.232146056 +0000
@@ -1,6 +1,6 @@
 within ModelicaByExample.Components.Electrical.DryApproach;
 model Capacitor "A DRY capacitor model"
-  parameter Modelica.SIunits.Capacitance C;
+  parameter Modelica.Units.SI.Capacitance C;
   extends TwoPin;
 equation
   C*der(v) = i;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Electrical/DryApproach/Inductor.mo" "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Electrical/DryApproach/Inductor.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Electrical/DryApproach/Inductor.mo"	2022-03-10 09:57:42.512144698 +0000
+++ "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Electrical/DryApproach/Inductor.mo"	2022-03-10 09:57:53.204146053 +0000
@@ -1,6 +1,6 @@
 within ModelicaByExample.Components.Electrical.DryApproach;
 model Inductor "A DRY inductor model"
-  parameter Modelica.SIunits.Inductance L;
+  parameter Modelica.Units.SI.Inductance L;
   extends TwoPin;
 equation
   L*der(i) = v;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Electrical/DryApproach/Resistor.mo" "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Electrical/DryApproach/Resistor.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Electrical/DryApproach/Resistor.mo"	2022-03-10 09:57:42.512144698 +0000
+++ "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Electrical/DryApproach/Resistor.mo"	2022-03-10 09:57:53.192146051 +0000
@@ -1,6 +1,6 @@
 within ModelicaByExample.Components.Electrical.DryApproach;
 model Resistor "A DRY resistor model"
-  parameter Modelica.SIunits.Resistance R;
+  parameter Modelica.Units.SI.Resistance R;
   extends TwoPin;
 equation
   v = i*R "Ohm's law";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Electrical/DryApproach/StepVoltage.mo" "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Electrical/DryApproach/StepVoltage.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Electrical/DryApproach/StepVoltage.mo"	2022-03-10 09:57:42.512144698 +0000
+++ "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Electrical/DryApproach/StepVoltage.mo"	2022-03-10 09:57:53.184146050 +0000
@@ -1,8 +1,8 @@
 within ModelicaByExample.Components.Electrical.DryApproach;
 model StepVoltage "A DRY step voltage source"
-  parameter Modelica.SIunits.Voltage V0;
-  parameter Modelica.SIunits.Voltage Vf;
-  parameter Modelica.SIunits.Time stepTime;
+  parameter Modelica.Units.SI.Voltage V0;
+  parameter Modelica.Units.SI.Voltage Vf;
+  parameter Modelica.Units.SI.Time stepTime;
   extends TwoPin;
 equation
   v = if time>=stepTime then Vf else V0;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Electrical/DryApproach/TwoPin.mo" "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Electrical/DryApproach/TwoPin.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Electrical/DryApproach/TwoPin.mo"	2022-03-10 09:57:42.512144698 +0000
+++ "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Electrical/DryApproach/TwoPin.mo"	2022-03-10 09:57:53.168146048 +0000
@@ -5,8 +5,8 @@
   Modelica.Electrical.Analog.Interfaces.NegativePin n
     annotation (Placement(transformation(extent={{90,-10},{110,10}})));
 
-  Modelica.SIunits.Voltage v = p.v-n.v;
-  Modelica.SIunits.Current i = p.i;
+  Modelica.Units.SI.Voltage v = p.v-n.v;
+  Modelica.Units.SI.Current i = p.i;
 equation
   p.i + n.i = 0 "Conservation of charge";
   annotation (Icon(graphics={
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Electrical/VerboseApproach/Capacitor.mo" "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Electrical/VerboseApproach/Capacitor.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Electrical/VerboseApproach/Capacitor.mo"	2022-03-10 09:57:42.512144698 +0000
+++ "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Electrical/VerboseApproach/Capacitor.mo"	2022-03-10 09:57:53.132146044 +0000
@@ -1,12 +1,12 @@
 within ModelicaByExample.Components.Electrical.VerboseApproach;
 model Capacitor "A capacitor model"
-  parameter Modelica.SIunits.Capacitance C;
+  parameter Modelica.Units.SI.Capacitance C;
   Modelica.Electrical.Analog.Interfaces.PositivePin p
     annotation (Placement(transformation(extent={{-110,-10},{-90,10}})));
   Modelica.Electrical.Analog.Interfaces.NegativePin n
     annotation (Placement(transformation(extent={{90,-10},{110,10}})));
 protected
-  Modelica.SIunits.Voltage v = p.v-n.v;
+  Modelica.Units.SI.Voltage v = p.v-n.v;
 equation
   p.i + n.i = 0 "Conservation of charge";
   C*der(v) = p.i;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Electrical/VerboseApproach/Inductor.mo" "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Electrical/VerboseApproach/Inductor.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Electrical/VerboseApproach/Inductor.mo"	2022-03-10 09:57:42.512144698 +0000
+++ "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Electrical/VerboseApproach/Inductor.mo"	2022-03-10 09:57:53.104146040 +0000
@@ -1,12 +1,12 @@
 within ModelicaByExample.Components.Electrical.VerboseApproach;
 model Inductor "An inductor model"
-  parameter Modelica.SIunits.Inductance L;
+  parameter Modelica.Units.SI.Inductance L;
   Modelica.Electrical.Analog.Interfaces.PositivePin p
     annotation (Placement(transformation(extent={{-110,-10},{-90,10}})));
   Modelica.Electrical.Analog.Interfaces.NegativePin n
     annotation (Placement(transformation(extent={{90,-10},{110,10}})));
 protected
-  Modelica.SIunits.Voltage v = p.v-n.v;
+  Modelica.Units.SI.Voltage v = p.v-n.v;
 equation
   p.i + n.i = 0 "Conservation of charge";
   L*der(p.i) = p.v;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Electrical/VerboseApproach/Resistor.mo" "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Electrical/VerboseApproach/Resistor.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Electrical/VerboseApproach/Resistor.mo"	2022-03-10 09:57:42.512144698 +0000
+++ "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Electrical/VerboseApproach/Resistor.mo"	2022-03-10 09:57:53.088146039 +0000
@@ -1,12 +1,12 @@
 within ModelicaByExample.Components.Electrical.VerboseApproach;
 model Resistor "A resistor model"
-  parameter Modelica.SIunits.Resistance R;
+  parameter Modelica.Units.SI.Resistance R;
   Modelica.Electrical.Analog.Interfaces.PositivePin p
     annotation (Placement(transformation(extent={{-110,-10},{-90,10}})));
   Modelica.Electrical.Analog.Interfaces.NegativePin n
     annotation (Placement(transformation(extent={{90,-10},{110,10}})));
 protected
-  Modelica.SIunits.Voltage v = p.v-n.v;
+  Modelica.Units.SI.Voltage v = p.v-n.v;
 equation
   p.i + n.i = 0 "Conservation of charge";
   v = p.i*R "Ohm's law";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/HeatTransfer/AmbientCondition.mo" "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/HeatTransfer/AmbientCondition.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/HeatTransfer/AmbientCondition.mo"	2022-03-10 09:57:42.512144698 +0000
+++ "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/HeatTransfer/AmbientCondition.mo"	2022-03-10 09:57:53.060146034 +0000
@@ -1,7 +1,7 @@
 within ModelicaByExample.Components.HeatTransfer;
 model AmbientCondition
   "Model of an \"infinite reservoir\" at some ambient temperature"
-  parameter Modelica.SIunits.Temperature T_amb "Ambient temperature";
+  parameter Modelica.Units.SI.Temperature T_amb "Ambient temperature";
   Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a node annotation (
       Placement(transformation(extent={{-10,-10},{10,10}}), iconTransformation(
           extent={{-10,-10},{10,10}})));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/HeatTransfer/Convection.mo" "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/HeatTransfer/Convection.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/HeatTransfer/Convection.mo"	2022-03-10 09:57:42.512144698 +0000
+++ "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/HeatTransfer/Convection.mo"	2022-03-10 09:57:53.032146032 +0000
@@ -1,7 +1,7 @@
 within ModelicaByExample.Components.HeatTransfer;
 model Convection "Modeling convection between port_a and port_b"
-  parameter Modelica.SIunits.CoefficientOfHeatTransfer h;
-  parameter Modelica.SIunits.Area A;
+  parameter Modelica.Units.SI.CoefficientOfHeatTransfer h;
+  parameter Modelica.Units.SI.Area A;
   Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a port_a
     annotation (Placement(transformation(extent={{-110,-10},{-90,10}})));
   Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_b port_b
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/HeatTransfer/ConvectionToAmbient.mo" "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/HeatTransfer/ConvectionToAmbient.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/HeatTransfer/ConvectionToAmbient.mo"	2022-03-10 09:57:42.512144698 +0000
+++ "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/HeatTransfer/ConvectionToAmbient.mo"	2022-03-10 09:57:53.012146029 +0000
@@ -1,8 +1,8 @@
 within ModelicaByExample.Components.HeatTransfer;
 model ConvectionToAmbient "An overly specialized model of convection"
-  parameter Modelica.SIunits.CoefficientOfHeatTransfer h;
-  parameter Modelica.SIunits.Area A;
-  parameter Modelica.SIunits.Temperature T_amb "Ambient temperature";
+  parameter Modelica.Units.SI.CoefficientOfHeatTransfer h;
+  parameter Modelica.Units.SI.Area A;
+  parameter Modelica.Units.SI.Temperature T_amb "Ambient temperature";
   Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a port_a
     annotation (Placement(transformation(extent={{-110,-10},{-90,10}})));
 equation
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/HeatTransfer/ThermalCapacitance.mo" "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/HeatTransfer/ThermalCapacitance.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/HeatTransfer/ThermalCapacitance.mo"	2022-03-10 09:57:42.512144698 +0000
+++ "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/HeatTransfer/ThermalCapacitance.mo"	2022-03-10 09:57:52.920146017 +0000
@@ -1,7 +1,7 @@
 within ModelicaByExample.Components.HeatTransfer;
 model ThermalCapacitance "A model of thermal capacitance"
-  parameter Modelica.SIunits.HeatCapacity C "Thermal capacitance";
-  parameter Modelica.SIunits.Temperature T0 "Initial temperature";
+  parameter Modelica.Units.SI.HeatCapacity C "Thermal capacitance";
+  parameter Modelica.Units.SI.Temperature T0 "Initial temperature";
   Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a node
     annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
 initial equation
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/LotkaVolterra/Components/RegionalPopulation.mo" "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/LotkaVolterra/Components/RegionalPopulation.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/LotkaVolterra/Components/RegionalPopulation.mo"	2022-03-10 09:57:42.512144698 +0000
+++ "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/LotkaVolterra/Components/RegionalPopulation.mo"	2022-03-10 09:57:52.872146010 +0000
@@ -19,7 +19,6 @@
     population = initial_population;
   elseif init==InitializationOptions.SteadyState then
     der(population) = 0;
-  else
   end if;
 equation
   der(population) = species.rate;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Rotational/Components/Backlash.mo" "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Rotational/Components/Backlash.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Rotational/Components/Backlash.mo"	2022-03-10 09:57:42.516144698 +0000
+++ "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Rotational/Components/Backlash.mo"	2022-03-10 09:57:52.712145990 +0000
@@ -1,7 +1,7 @@
 within ModelicaByExample.Components.Rotational.Components;
 model Backlash "A rotational backlash model"
-  parameter Modelica.SIunits.RotationalSpringConstant c "Torsional stiffness";
-  parameter Modelica.SIunits.Angle b(final min=0) "Total lash";
+  parameter Modelica.Units.SI.RotationalSpringConstant c "Torsional stiffness";
+  parameter Modelica.Units.SI.Angle b(final min=0) "Total lash";
   extends ModelicaByExample.Components.Rotational.Interfaces.Compliant;
 equation
   if phi_rel>b/2 then
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Rotational/Components/ConfigurableGear.mo" "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Rotational/Components/ConfigurableGear.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Rotational/Components/ConfigurableGear.mo"	2022-03-10 09:57:42.516144698 +0000
+++ "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Rotational/Components/ConfigurableGear.mo"	2022-03-10 09:57:52.700145989 +0000
@@ -8,7 +8,7 @@
   tau = -flange_a.tau-flange_b.tau) if not grounded "Connection for housing"
     annotation (Placement(transformation(extent={{-10,-110},{10,-90}})));
 protected
-  Modelica.SIunits.Angle housing_phi;
+  Modelica.Units.SI.Angle housing_phi;
 equation
   if grounded then
     housing_phi = 0;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Rotational/Components/Damper.mo" "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Rotational/Components/Damper.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Rotational/Components/Damper.mo"	2022-03-10 09:57:42.516144698 +0000
+++ "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Rotational/Components/Damper.mo"	2022-03-10 09:57:52.684145988 +0000
@@ -1,6 +1,6 @@
 within ModelicaByExample.Components.Rotational.Components;
 model Damper "A rotational damper"
-  parameter Modelica.SIunits.RotationalDampingConstant d;
+  parameter Modelica.Units.SI.RotationalDampingConstant d;
   extends ModelicaByExample.Components.Rotational.Interfaces.Compliant;
 equation
   tau = d*der(phi_rel) "Damping relationship";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Rotational/Components/Inertia.mo" "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Rotational/Components/Inertia.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Rotational/Components/Inertia.mo"	2022-03-10 09:57:42.516144698 +0000
+++ "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Rotational/Components/Inertia.mo"	2022-03-10 09:57:52.656145983 +0000
@@ -1,10 +1,10 @@
 within ModelicaByExample.Components.Rotational.Components;
 model Inertia "A rotational inertia model"
-  parameter Modelica.SIunits.Inertia J;
+  parameter Modelica.Units.SI.Inertia J;
   extends ModelicaByExample.Components.Rotational.Interfaces.TwoFlange;
-  Modelica.SIunits.AngularVelocity w "Angular Velocity"
+  Modelica.Units.SI.AngularVelocity w "Angular Velocity"
     annotation(Dialog(group="Initialization", showStartAttribute=true));
-  Modelica.SIunits.Angle phi "Angle"
+  Modelica.Units.SI.Angle phi "Angle"
     annotation(Dialog(group="Initialization", showStartAttribute=true));
 equation
   phi = flange_a.phi;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Rotational/Components/Inertia2.mo" "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Rotational/Components/Inertia2.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Rotational/Components/Inertia2.mo"	2022-03-10 09:57:42.516144698 +0000
+++ "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Rotational/Components/Inertia2.mo"	2022-03-10 09:57:52.632145980 +0000
@@ -1,11 +1,11 @@
 within ModelicaByExample.Components.Rotational.Components;
 model Inertia2 "A rotational inertia model with optional initial conditions"
-  parameter Modelica.SIunits.Inertia J;
-  parameter Modelica.SIunits.Angle phi0 "Initial angle";
-  parameter Modelica.SIunits.AngularVelocity w0 "Initial velocity";
+  parameter Modelica.Units.SI.Inertia J;
+  parameter Modelica.Units.SI.Angle phi0 "Initial angle";
+  parameter Modelica.Units.SI.AngularVelocity w0 "Initial velocity";
   extends ModelicaByExample.Components.Rotational.Interfaces.TwoFlange;
 protected
-  Modelica.SIunits.AngularVelocity w;
+  Modelica.Units.SI.AngularVelocity w;
 initial equation
   flange_a.phi = phi0;
   w = w0;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Rotational/Components/Spring.mo" "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Rotational/Components/Spring.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Rotational/Components/Spring.mo"	2022-03-10 09:57:42.516144698 +0000
+++ "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Rotational/Components/Spring.mo"	2022-03-10 09:57:52.624145979 +0000
@@ -1,6 +1,6 @@
 within ModelicaByExample.Components.Rotational.Components;
 model Spring "A rotational spring component"
-  parameter Modelica.SIunits.RotationalSpringConstant c;
+  parameter Modelica.Units.SI.RotationalSpringConstant c;
   extends ModelicaByExample.Components.Rotational.Interfaces.Compliant;
 equation
   tau = c*phi_rel "Hooke's Law";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Rotational/Interfaces/Compliant.mo" "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Rotational/Interfaces/Compliant.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Rotational/Interfaces/Compliant.mo"	2022-03-10 09:57:42.516144698 +0000
+++ "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Rotational/Interfaces/Compliant.mo"	2022-03-10 09:57:52.464145959 +0000
@@ -2,7 +2,7 @@
 partial model Compliant "A compliant rotational component"
   extends ModelicaByExample.Components.Rotational.Interfaces.TwoFlange;
 protected
-  Modelica.SIunits.Torque tau;
+  Modelica.Units.SI.Torque tau;
 equation
   tau = flange_a.tau;
   flange_a.tau + flange_b.tau = 0
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Rotational/Interfaces/TwoFlange.mo" "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Rotational/Interfaces/TwoFlange.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Rotational/Interfaces/TwoFlange.mo"	2022-03-10 09:57:42.516144698 +0000
+++ "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Rotational/Interfaces/TwoFlange.mo"	2022-03-10 09:57:52.456145959 +0000
@@ -7,7 +7,7 @@
   Modelica.Mechanics.Rotational.Interfaces.Flange_b flange_b
     annotation (Placement(transformation(extent={{90,-10},{110,10}})));
 protected
-  Modelica.SIunits.Angle phi_rel;
+  Modelica.Units.SI.Angle phi_rel;
 equation
   phi_rel = flange_a.phi-flange_b.phi;
 end TwoFlange;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Rotational/VerboseApproach/Damper.mo" "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Rotational/VerboseApproach/Damper.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Rotational/VerboseApproach/Damper.mo"	2022-03-10 09:57:42.516144698 +0000
+++ "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Rotational/VerboseApproach/Damper.mo"	2022-03-10 09:57:52.432145956 +0000
@@ -1,13 +1,13 @@
 within ModelicaByExample.Components.Rotational.VerboseApproach;
 model Damper "Rotational damper without inheritance"
-  parameter Modelica.SIunits.RotationalDampingConstant d;
+  parameter Modelica.Units.SI.RotationalDampingConstant d;
   Modelica.Mechanics.Rotational.Interfaces.Flange_a flange_a
     annotation (Placement(transformation(extent={{-110,-10},{-90,10}})));
   Modelica.Mechanics.Rotational.Interfaces.Flange_b flange_b
     annotation (Placement(transformation(extent={{90,-10},{110,10}})));
 protected
-  Modelica.SIunits.Angle phi_rel;
-  Modelica.SIunits.Torque tau;
+  Modelica.Units.SI.Angle phi_rel;
+  Modelica.Units.SI.Torque tau;
 equation
   // Variables
   phi_rel = flange_a.phi-flange_b.phi;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Rotational/VerboseApproach/Inertia.mo" "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Rotational/VerboseApproach/Inertia.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Rotational/VerboseApproach/Inertia.mo"	2022-03-10 09:57:42.516144698 +0000
+++ "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Rotational/VerboseApproach/Inertia.mo"	2022-03-10 09:57:52.420145953 +0000
@@ -1,14 +1,14 @@
 within ModelicaByExample.Components.Rotational.VerboseApproach;
 model Inertia "Rotational inertia without inheritance"
-  parameter Modelica.SIunits.Inertia J;
+  parameter Modelica.Units.SI.Inertia J;
   Modelica.Mechanics.Rotational.Interfaces.Flange_a flange_a
     annotation (Placement(transformation(extent={{-110,-10},{-90,10}})));
   Modelica.Mechanics.Rotational.Interfaces.Flange_b flange_b
     annotation (Placement(transformation(extent={{90,-10},{110,10}})));
 protected
-  Modelica.SIunits.Angle phi_rel;
-  Modelica.SIunits.Torque tau;
-  Modelica.SIunits.AngularVelocity w;
+  Modelica.Units.SI.Angle phi_rel;
+  Modelica.Units.SI.Torque tau;
+  Modelica.Units.SI.AngularVelocity w;
 equation
   // Variables
   phi_rel = flange_a.phi-flange_b.phi;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Rotational/VerboseApproach/Spring.mo" "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Rotational/VerboseApproach/Spring.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Rotational/VerboseApproach/Spring.mo"	2022-03-10 09:57:42.516144698 +0000
+++ "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/Rotational/VerboseApproach/Spring.mo"	2022-03-10 09:57:52.404145951 +0000
@@ -1,13 +1,13 @@
 within ModelicaByExample.Components.Rotational.VerboseApproach;
 model Spring "Rotational spring without inheritance"
-  parameter Modelica.SIunits.RotationalSpringConstant c;
+  parameter Modelica.Units.SI.RotationalSpringConstant c;
   Modelica.Mechanics.Rotational.Interfaces.Flange_a flange_a
     annotation (Placement(transformation(extent={{-110,-10},{-90,10}})));
   Modelica.Mechanics.Rotational.Interfaces.Flange_b flange_b
     annotation (Placement(transformation(extent={{90,-10},{110,10}})));
 protected
-  Modelica.SIunits.Angle phi_rel;
-  Modelica.SIunits.Torque tau;
+  Modelica.Units.SI.Angle phi_rel;
+  Modelica.Units.SI.Torque tau;
 equation
   // Variables
   phi_rel = flange_a.phi-flange_b.phi;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/SpeedMeasurement/Components/IntervalMeasure.mo" "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/SpeedMeasurement/Components/IntervalMeasure.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/SpeedMeasurement/Components/IntervalMeasure.mo"	2022-03-10 09:57:42.516144698 +0000
+++ "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/SpeedMeasurement/Components/IntervalMeasure.mo"	2022-03-10 09:57:52.364145946 +0000
@@ -6,7 +6,7 @@
   Real next_phi, prev_phi;
   Real last_time;
 protected
-  parameter Modelica.SIunits.Angle tooth_angle=2*Modelica.Constants.pi/teeth;
+  parameter Modelica.Units.SI.Angle tooth_angle=2*Modelica.Constants.pi/teeth;
 initial equation
   next_phi = flange.phi+tooth_angle;
   prev_phi = flange.phi-tooth_angle;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/SpeedMeasurement/Components/PulseCounter.mo" "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/SpeedMeasurement/Components/PulseCounter.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/SpeedMeasurement/Components/PulseCounter.mo"	2022-03-10 09:57:42.516144698 +0000
+++ "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/SpeedMeasurement/Components/PulseCounter.mo"	2022-03-10 09:57:52.360145945 +0000
@@ -1,12 +1,12 @@
 within ModelicaByExample.Components.SpeedMeasurement.Components;
 model PulseCounter "Compute speed using pulse counting"
   extends Interfaces.SpeedSensor;
-  parameter Modelica.SIunits.Time sample_time;
+  parameter Modelica.Units.SI.Time sample_time;
   parameter Integer teeth;
-  Modelica.SIunits.Angle next_phi, prev_phi;
+  Modelica.Units.SI.Angle next_phi, prev_phi;
   Integer count;
 protected
-  parameter Modelica.SIunits.Angle tooth_angle=2*Modelica.Constants.pi/teeth;
+  parameter Modelica.Units.SI.Angle tooth_angle=2*Modelica.Constants.pi/teeth;
 initial equation
   next_phi = flange.phi+tooth_angle;
   prev_phi = flange.phi-tooth_angle;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/SpeedMeasurement/Components/SampleHold.mo" "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/SpeedMeasurement/Components/SampleHold.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/SpeedMeasurement/Components/SampleHold.mo"	2022-03-10 09:57:42.516144698 +0000
+++ "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Components/SpeedMeasurement/Components/SampleHold.mo"	2022-03-10 09:57:52.348145945 +0000
@@ -1,7 +1,7 @@
 within ModelicaByExample.Components.SpeedMeasurement.Components;
 model SampleHold "A sample-hold ideal speed sensor"
   extends Interfaces.SpeedSensor;
-  parameter Modelica.SIunits.Time sample_time;
+  parameter Modelica.Units.SI.Time sample_time;
 initial equation
   w = der(flange.phi);
 equation
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Connectors/FluidConnectors.mo" "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Connectors/FluidConnectors.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Connectors/FluidConnectors.mo"	2022-03-10 09:57:42.516144698 +0000
+++ "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Connectors/FluidConnectors.mo"	2022-03-10 09:57:52.232145929 +0000
@@ -1,19 +1,19 @@
 within ModelicaByExample.Connectors;
 package FluidConnectors "Examples of fluid connectors"
   connector Incompressible
-    Modelica.SIunits.Pressure p;
-    flow Modelica.SIunits.VolumeFlowRate q;
+    Modelica.Units.SI.Pressure p;
+    flow Modelica.Units.SI.VolumeFlowRate q;
   end Incompressible;
 
   connector GenericFluid
-    Modelica.SIunits.Pressure p;
-    flow Modelica.SIunits.MassFlowRate m_flow;
+    Modelica.Units.SI.Pressure p;
+    flow Modelica.Units.SI.MassFlowRate m_flow;
   end GenericFluid;
 
   connector ThermoFluid
-    Modelica.SIunits.Pressure p;
-    flow Modelica.SIunits.MassFlowRate m_flow;
-    Modelica.SIunits.Temperature T;
-    flow Modelica.SIunits.HeatFlowRate q;
+    Modelica.Units.SI.Pressure p;
+    flow Modelica.Units.SI.MassFlowRate m_flow;
+    Modelica.Units.SI.Temperature T;
+    flow Modelica.Units.SI.HeatFlowRate q;
   end ThermoFluid;
 end FluidConnectors;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Connectors/Graphics.mo" "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Connectors/Graphics.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Connectors/Graphics.mo"	2022-03-10 09:57:42.516144698 +0000
+++ "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Connectors/Graphics.mo"	2022-03-10 09:57:52.224145929 +0000
@@ -1,8 +1,8 @@
 within ModelicaByExample.Connectors;
 package Graphics
   connector PositivePin
-     Modelica.SIunits.Voltage v;
-     flow Modelica.SIunits.Current i;
+     Modelica.Units.SI.Voltage v;
+     flow Modelica.Units.SI.Current i;
     annotation (
       Icon(graphics={
           Ellipse(
@@ -38,8 +38,8 @@
   end PositivePin;
 
   connector NegativePin
-     Modelica.SIunits.Voltage v;
-     flow Modelica.SIunits.Current i;
+     Modelica.Units.SI.Voltage v;
+     flow Modelica.Units.SI.Current i;
     annotation (
       Icon(graphics={
           Ellipse(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Connectors/SimpleDomains.mo" "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Connectors/SimpleDomains.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Connectors/SimpleDomains.mo"	2022-03-10 09:57:42.516144698 +0000
+++ "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Connectors/SimpleDomains.mo"	2022-03-10 09:57:52.200145925 +0000
@@ -1,22 +1,22 @@
 within ModelicaByExample.Connectors;
 package SimpleDomains "Examples of connectors for simple domains"
   connector Electrical
-     Modelica.SIunits.Voltage v;
-     flow Modelica.SIunits.Current i;
+     Modelica.Units.SI.Voltage v;
+     flow Modelica.Units.SI.Current i;
   end Electrical;
 
   connector Thermal
-     Modelica.SIunits.Temperature T;
-     flow Modelica.SIunits.HeatFlowRate q;
+     Modelica.Units.SI.Temperature T;
+     flow Modelica.Units.SI.HeatFlowRate q;
   end Thermal;
 
   connector Translational
-     Modelica.SIunits.Position x;
-     flow Modelica.SIunits.Force f;
+     Modelica.Units.SI.Position x;
+     flow Modelica.Units.SI.Force f;
   end Translational;
 
   connector Rotational
-     Modelica.SIunits.Angle phi;
-     flow Modelica.SIunits.Torque tau;
+     Modelica.Units.SI.Angle phi;
+     flow Modelica.Units.SI.Torque tau;
   end Rotational;
 end SimpleDomains;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/PackageExamples/NewtonCooling.mo" "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/PackageExamples/NewtonCooling.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/PackageExamples/NewtonCooling.mo"	2022-03-10 09:57:42.520144699 +0000
+++ "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/PackageExamples/NewtonCooling.mo"	2022-03-10 09:57:51.472145834 +0000
@@ -1,11 +1,11 @@
 within ModelicaByExample.PackageExamples;
 model NewtonCooling
   "Cooling example importing physical types from the Modelica Standard Library"
-  import Modelica.SIunits.Temperature;
-  import Modelica.SIunits.Mass;
-  import Modelica.SIunits.Area;
-  import ConvectionCoefficient = Modelica.SIunits.CoefficientOfHeatTransfer;
-  import SpecificHeat = Modelica.SIunits.SpecificHeatCapacity;
+  import Modelica.Units.SI.Temperature;
+  import Modelica.Units.SI.Mass;
+  import Modelica.Units.SI.Area;
+  import ConvectionCoefficient = Modelica.Units.SI.CoefficientOfHeatTransfer;
+  import SpecificHeat = Modelica.Units.SI.SpecificHeatCapacity;
 
   // Parameters
   parameter Temperature T_inf=300.0 "Ambient temperature";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/PackageExamples/RLC.mo" "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/PackageExamples/RLC.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/PackageExamples/RLC.mo"	2022-03-10 09:57:42.520144699 +0000
+++ "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/PackageExamples/RLC.mo"	2022-03-10 09:57:51.464145833 +0000
@@ -1,13 +1,13 @@
 within ModelicaByExample.PackageExamples;
 model RLC "An RLC circuit referencing types from the Modelica Standard Library"
-  parameter Modelica.SIunits.Voltage Vb=24 "Battery voltage";
-  parameter Modelica.SIunits.Inductance L = 1;
-  parameter Modelica.SIunits.Resistance R = 100;
-  parameter Modelica.SIunits.Capacitance C = 1e-3;
-  Modelica.SIunits.Voltage V(fixed=true, start=0);
-  Modelica.SIunits.Current i_L(fixed=true, start=0);
-  Modelica.SIunits.Current i_R;
-  Modelica.SIunits.Current i_C;
+  parameter Modelica.Units.SI.Voltage Vb=24 "Battery voltage";
+  parameter Modelica.Units.SI.Inductance L = 1;
+  parameter Modelica.Units.SI.Resistance R = 100;
+  parameter Modelica.Units.SI.Capacitance C = 1e-3;
+  Modelica.Units.SI.Voltage V(fixed=true, start=0);
+  Modelica.Units.SI.Current i_L(fixed=true, start=0);
+  Modelica.Units.SI.Current i_R;
+  Modelica.Units.SI.Current i_C;
 equation
   i_R = V/R;
   i_C = C*der(V);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/PackageExamples/SecondOrderSystem.mo" "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/PackageExamples/SecondOrderSystem.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/PackageExamples/SecondOrderSystem.mo"	2022-03-10 09:57:42.520144699 +0000
+++ "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/PackageExamples/SecondOrderSystem.mo"	2022-03-10 09:57:51.452145832 +0000
@@ -1,7 +1,7 @@
 within ModelicaByExample.PackageExamples;
 model SecondOrderSystem
   "A second order rotational system importing types from Modelica Standard Library"
-  import Modelica.SIunits.*;
+  import Modelica.Units.SI.*;
   parameter Angle phi1_init = 0;
   parameter Angle phi2_init = 1;
   parameter AngularVelocity omega1_init = 0;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Subsystems/GearSubsystemModel/Components/GearWithBacklash.mo" "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Subsystems/GearSubsystemModel/Components/GearWithBacklash.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Subsystems/GearSubsystemModel/Components/GearWithBacklash.mo"	2022-03-10 09:57:42.520144699 +0000
+++ "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Subsystems/GearSubsystemModel/Components/GearWithBacklash.mo"	2022-03-10 09:57:51.412145825 +0000
@@ -4,15 +4,15 @@
   import Modelica.Mechanics.Rotational.Components.*;
 
   parameter Boolean useSupport(start=true);
-  parameter Modelica.SIunits.Inertia J_a
+  parameter Modelica.Units.SI.Inertia J_a
     "Moment of inertia for element connected to flange 'a'";
-  parameter Modelica.SIunits.Inertia J_b
+  parameter Modelica.Units.SI.Inertia J_b
     "Moment of inertia for element connected to flange 'b'";
-  parameter Modelica.SIunits.RotationalSpringConstant c
+  parameter Modelica.Units.SI.RotationalSpringConstant c
     "Backlash spring constant (c > 0 required)";
-  parameter Modelica.SIunits.RotationalDampingConstant d
+  parameter Modelica.Units.SI.RotationalDampingConstant d
     "Backlash damping constant";
-  parameter Modelica.SIunits.Angle b=0
+  parameter Modelica.Units.SI.Angle b=0
     "Total backlash as measured from flange_a side";
   parameter Real ratio
     "Transmission ratio (flange_a.phi/flange_b.phi, once backlash is cleared)";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Subsystems/HeatTransfer/Components/Rod.mo" "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Subsystems/HeatTransfer/Components/Rod.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Subsystems/HeatTransfer/Components/Rod.mo"	2022-03-10 09:57:42.520144699 +0000
+++ "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Subsystems/HeatTransfer/Components/Rod.mo"	2022-03-10 09:57:51.324145814 +0000
@@ -3,18 +3,18 @@
   import HTC=Modelica.Thermal.HeatTransfer.Components;
 
   parameter Integer n(start=2,min=2) "Number of rod segments";
-  parameter Modelica.SIunits.Temperature T0 "Initial rod temperature";
+  parameter Modelica.Units.SI.Temperature T0 "Initial rod temperature";
   Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a port_a
     "Thermal connector to ambient"
     annotation (Placement(transformation(extent={{-110,-10},{-90,10}})));
   Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_b port_b
     "Thermal connector for rod end 'b'"
     annotation (Placement(transformation(extent={{90,-10},{110,10}})));
-  parameter Modelica.SIunits.HeatCapacity C
+  parameter Modelica.Units.SI.HeatCapacity C
     "Total heat capacity of element (= cp*m)";
-  parameter Modelica.SIunits.ThermalConductance G_wall
+  parameter Modelica.Units.SI.ThermalConductance G_wall
     "Thermal conductivity of wall";
-  parameter Modelica.SIunits.ThermalConductance G_rod
+  parameter Modelica.Units.SI.ThermalConductance G_rod
     "Thermal conductivity of rod";
   Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a ambient
     "Thermal connector to ambient"
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Subsystems/Pendula/Pendulum.mo" "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Subsystems/Pendula/Pendulum.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Subsystems/Pendula/Pendulum.mo"	2022-03-10 09:57:42.528144699 +0000
+++ "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Subsystems/Pendula/Pendulum.mo"	2022-03-10 09:57:51.116145788 +0000
@@ -3,11 +3,11 @@
   import Modelica.Mechanics.MultiBody.Parts;
   import Modelica.Mechanics.MultiBody.Joints;
 
-  parameter Modelica.SIunits.Position x;
-  parameter Modelica.SIunits.Mass m "Mass of mass point";
-  parameter Modelica.SIunits.Angle phi "Initial angle";
-  parameter Modelica.SIunits.Length L "String length";
-  parameter Modelica.SIunits.Diameter d=0.01;
+  parameter Modelica.Units.SI.Position x;
+  parameter Modelica.Units.SI.Mass m "Mass of mass point";
+  parameter Modelica.Units.SI.Angle phi "Initial angle";
+  parameter Modelica.Units.SI.Length L "String length";
+  parameter Modelica.Units.SI.Diameter d=0.01;
 
   Parts.Fixed ground(r={0,0,x}, animation=false)
     annotation (Placement(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Subsystems/Pendula/System.mo" "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Subsystems/Pendula/System.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Subsystems/Pendula/System.mo"	2022-03-10 09:57:42.528144699 +0000
+++ "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Subsystems/Pendula/System.mo"	2022-03-10 09:57:51.104145787 +0000
@@ -4,11 +4,11 @@
   import Modelica.Constants.pi;
 
   parameter Integer n=15 "Number of pendula";
-  parameter Modelica.SIunits.Position x[n] = linspace(0,(n-1)*0.05,n);
-  parameter Modelica.SIunits.Time T = 54;
-  parameter Modelica.SIunits.Time X = 30;
-  parameter Modelica.SIunits.Length lengths[n] = { g_n*(T/(2*pi*(X+(n-i))))^2 for i in 1:n};
-  parameter Modelica.SIunits.Angle phi0 = 0.5;
+  parameter Modelica.Units.SI.Position x[n] = linspace(0,(n-1)*0.05,n);
+  parameter Modelica.Units.SI.Time T = 54;
+  parameter Modelica.Units.SI.Time X = 30;
+  parameter Modelica.Units.SI.Length lengths[n] = { g_n*(T/(2*pi*(X+(n-i))))^2 for i in 1:n};
+  parameter Modelica.Units.SI.Angle phi0 = 0.5;
 
   Pendulum pendulum[n](x=x, each m=1, each phi=phi0, L=lengths)
     annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Subsystems/PowerSupply/Components/BasicPowerSupply.mo" "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Subsystems/PowerSupply/Components/BasicPowerSupply.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Subsystems/PowerSupply/Components/BasicPowerSupply.mo"	2022-03-10 09:57:42.528144699 +0000
+++ "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Subsystems/PowerSupply/Components/BasicPowerSupply.mo"	2022-03-10 09:57:51.064145781 +0000
@@ -1,13 +1,13 @@
 within ModelicaByExample.Subsystems.PowerSupply.Components;
 model BasicPowerSupply "Power supply with transformer and rectifier"
   import Modelica.Electrical.Analog;
-  parameter Modelica.SIunits.Capacitance C=1e-2
+  parameter Modelica.Units.SI.Capacitance C=1e-2
     "Filter capacitance"
     annotation(Dialog(group="General"));
-  parameter Modelica.SIunits.Conductance Goff=1e-5
+  parameter Modelica.Units.SI.Conductance Goff=1e-5
     "Backward state-off conductance (opened diode conductance)"
     annotation(Dialog(group="General"));
-  parameter Modelica.SIunits.Resistance Ron=1e-5
+  parameter Modelica.Units.SI.Resistance Ron=1e-5
     "Forward state-on differential resistance (closed diode resistance)"
     annotation(Dialog(group="General"));
   parameter Real n=10
@@ -16,7 +16,7 @@
   parameter Boolean considerMagnetization=false
     "Choice of considering magnetization"
     annotation(Dialog(group="Transformer"));
-  parameter Modelica.SIunits.Inductance Lm1=1e-2
+  parameter Modelica.Units.SI.Inductance Lm1=1e-2
     "Magnetization inductance w.r.t. primary side"
     annotation(Dialog(group="Transformer", enable=considerMagnetization));
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Subsystems/PowerSupply/Examples/FlatCircuit.mo" "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Subsystems/PowerSupply/Examples/FlatCircuit.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Subsystems/PowerSupply/Examples/FlatCircuit.mo"	2022-03-10 09:57:42.532144700 +0000
+++ "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Subsystems/PowerSupply/Examples/FlatCircuit.mo"	2022-03-10 09:57:51.020145776 +0000
@@ -1,7 +1,7 @@
 within ModelicaByExample.Subsystems.PowerSupply.Examples;
 model FlatCircuit "A model with power source, AC-DC conversion and load in one diagram"
   import Modelica.Electrical.Analog;
-  Analog.Sources.SineVoltage wall_voltage(V=120, freqHz=60)
+  Analog.Sources.SineVoltage wall_voltage(V=120, f =60)
     annotation (Placement(transformation(
         extent={{-10,-10},{10,10}},
         rotation=270, origin={-90,0})));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Subsystems/PowerSupply/Examples/SubsystemCircuit.mo" "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Subsystems/PowerSupply/Examples/SubsystemCircuit.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Subsystems/PowerSupply/Examples/SubsystemCircuit.mo"	2022-03-10 09:57:42.532144700 +0000
+++ "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/Subsystems/PowerSupply/Examples/SubsystemCircuit.mo"	2022-03-10 09:57:50.996145772 +0000
@@ -2,7 +2,7 @@
 model SubsystemCircuit "Example using BasicPowerSupply subsystem"
   Components.BasicPowerSupply power_supply
     annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
-  Modelica.Electrical.Analog.Sources.SineVoltage wall_voltage(V=120, freqHz=60)
+  Modelica.Electrical.Analog.Sources.SineVoltage wall_voltage(V=120, f =60)
     annotation (Placement(transformation(
         extent={{-10,-10},{10,10}},
         rotation=270,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/openmodelica.metadata.json" "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/openmodelica.metadata.json"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/openmodelica.metadata.json"	2022-03-10 09:57:42.532144700 +0000
+++ "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/openmodelica.metadata.json"	2022-03-10 09:57:55.176146302 +0000
@@ -1 +1 @@
-{"path":"ModelicaByExample", "sha":"6044b756548cfb60fd011983b2ab7587fa252089", "support":"fullSupport", "uses":{"Modelica":"3.2.2"}, "version":"0.6.0", "zipfile":"https://github.com/mtiller/ModelicaBook/archive/6044b756548cfb60fd011983b2ab7587fa252089.zip"}
+{"path": "ModelicaByExample", "sha": "6044b756548cfb60fd011983b2ab7587fa252089", "support": "fullSupport", "uses": {"Modelica": "4.0.0"}, "version": "0.6.0", "zipfile": "https://github.com/mtiller/ModelicaBook/archive/6044b756548cfb60fd011983b2ab7587fa252089.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/ModelicaByExample 0.6.0/package.mo" "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/package.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/package.mo"	2022-03-10 09:57:42.532144700 +0000
+++ "converted-libraries/.openmodelica/libraries/ModelicaByExample 0.6.0/package.mo"	2022-03-10 09:57:55.172146303 +0000
@@ -1,4 +1,4 @@
 within ;
 package ModelicaByExample
-annotation (version="0.5.0", uses(Modelica(version="3.2.2")));
+annotation (version="0.5.0", uses(Modelica(version= "4.0.0")));
 end ModelicaByExample;
