diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Blocks/Smoothing.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Blocks/Smoothing.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Blocks/Smoothing.mo"	2022-03-10 09:57:38.336144168 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Blocks/Smoothing.mo"	2022-03-10 09:59:17.984156790 +0000
@@ -5,7 +5,7 @@
           extent={{-100,-10},{-80,10}}, rotation=0)));
   Modelica.Blocks.Interfaces.RealOutput y annotation (Placement(transformation(
           extent={{40,-10},{60,10}}, rotation=0)));
-  parameter Modelica.SIunits.Time timeDelay=0.01;
+  parameter Modelica.Units.SI.Time timeDelay=0.01;
 
 initial equation
   u=y;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Blocks/TimeTable.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Blocks/TimeTable.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Blocks/TimeTable.mo"	2022-03-10 09:57:38.336144168 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Blocks/TimeTable.mo"	2022-03-10 09:59:17.976156788 +0000
@@ -4,7 +4,7 @@
 extends Modelica.Blocks.Interfaces.SO;
     parameter Real table[:, 2]=[0, 0; 1, 1; 2, 4]
     "Table matrix (time = first column)";
-  parameter Modelica.SIunits.Time timeDelay=0.01 "Delay time";
+  parameter Modelica.Units.SI.Time timeDelay=0.01 "Delay time";
   Modelica.Blocks.Sources.TimeTable originalTable(table=table)
     annotation (Placement(transformation(extent={{-32,-10},{-12,10}}, rotation=
             0)));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Components/FlueGasZones/FlueGasZoneSingleTubeOwnMedia.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Components/FlueGasZones/FlueGasZoneSingleTubeOwnMedia.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Components/FlueGasZones/FlueGasZoneSingleTubeOwnMedia.mo"	2022-03-10 09:57:38.332144169 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Components/FlueGasZones/FlueGasZoneSingleTubeOwnMedia.mo"	2022-03-10 09:59:17.836156770 +0000
@@ -24,7 +24,7 @@
   parameter Real alphaFactor=1.0
     "Factor for state dependent alpha term (in case of verysimple=true)"                    annotation(Dialog(tab="Inner heat transfer", enable=verysimple));
 
-  parameter Modelica.SIunits.MassFlowRate m_flow_start=19.05
+  parameter Modelica.Units.SI.MassFlowRate m_flow_start=19.05
     "Total water/steam mass flow rate" annotation (Dialog(tab="Initialization", group="Water flow"));
   parameter SiemensPower.Units.AbsolutePressure pIn_start=pOut_start+2e5
     "start value for inlet pressure"                            annotation(Dialog(tab="Initialization", group="Water flow"));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Components/Pipes/Tube.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Components/Pipes/Tube.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Components/Pipes/Tube.mo"	2022-03-10 09:57:38.332144169 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Components/Pipes/Tube.mo"	2022-03-10 09:59:17.552156734 +0000
@@ -2,7 +2,7 @@
 model Tube
   "Tube (incl wall) with detailed energy, integrated momentum and mass balance"
 
-  import SI = Modelica.SIunits;
+  import Modelica.Units.SI;
 extends SiemensPower.Components.Pipes.TubeWithoutWall;
 
   // heat transfer parameters
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Components/Pipes/TubeOwnMedia.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Components/Pipes/TubeOwnMedia.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Components/Pipes/TubeOwnMedia.mo"	2022-03-10 09:57:38.332144169 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Components/Pipes/TubeOwnMedia.mo"	2022-03-10 09:59:17.540156732 +0000
@@ -32,7 +32,7 @@
   parameter Boolean considerDynamicPressure=false
     "With der(p)/d in enthalpy balance";
   parameter Boolean useDelayedPressure=false "Pressure delay";
-  parameter Modelica.SIunits.Time timeDelayOfPressure=0.1
+  parameter Modelica.Units.SI.Time timeDelayOfPressure=0.1
     "Artificial delay time for delay of pressure value" annotation(Dialog(enable=useDelayedPressure));
   parameter Real hydP=0.6 "Part of portIn for p";
   parameter Real hydM=0.4 "Part of portOut for m_flow";
@@ -43,7 +43,7 @@
     "Factor for state dependent alpha term (in case of verysimple=true)"                    annotation(Dialog(tab="Inner heat transfer", enable=verysimple));
 
   parameter Boolean delayInnerHeatTransfer=false "With delay of qMetalFluid" annotation(Dialog(tab="Inner heat transfer"));
-  parameter Modelica.SIunits.Time timeDelayOfInnerHeatTransfer=1
+  parameter Modelica.Units.SI.Time timeDelayOfInnerHeatTransfer=1
     "artificial delay time for qMetalFluid"             annotation(Dialog(tab="Inner heat transfer",enable=delayInnerHeatTransfer));
 
   // Init parameters
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Components/Pipes/TubeWithoutWall.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Components/Pipes/TubeWithoutWall.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Components/Pipes/TubeWithoutWall.mo"	2022-03-10 09:57:38.332144169 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Components/Pipes/TubeWithoutWall.mo"	2022-03-10 09:59:17.488156726 +0000
@@ -1,7 +1,7 @@
 within SiemensPower.Components.Pipes;
 model TubeWithoutWall
   "Tube with detailed energy, integrated momentum and mass balance"
-  import SI = Modelica.SIunits;
+  import Modelica.Units.SI;
   extends SiemensPower.Utilities.BaseClasses.BaseTube;
 
   replaceable model Friction =
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Components/SolidComponents/Wall.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Components/SolidComponents/Wall.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Components/SolidComponents/Wall.mo"	2022-03-10 09:57:38.332144169 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Components/SolidComponents/Wall.mo"	2022-03-10 09:59:17.456156722 +0000
@@ -1,6 +1,6 @@
 within SiemensPower.Components.SolidComponents;
 model Wall "Cylindrical metal tube with variable number of wall layers Nwall"
-  import SI = Modelica.SIunits;
+  import Modelica.Units.SI;
 
   parameter Integer numberOfNodes(min=1)=2 "Number of nodes";
   parameter Integer numberOfWallLayers(min=1)=3 "Number of wall layers"
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Components/SolidComponents/Walllayer.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Components/SolidComponents/Walllayer.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Components/SolidComponents/Walllayer.mo"	2022-03-10 09:57:38.332144169 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Components/SolidComponents/Walllayer.mo"	2022-03-10 09:59:17.444156720 +0000
@@ -1,6 +1,6 @@
 within SiemensPower.Components.SolidComponents;
 model Walllayer "Cylindrical metal tube (single layer)"
-  import SI = Modelica.SIunits;
+  import Modelica.Units.SI;
 
   constant Real pi=Modelica.Constants.pi;
   parameter Integer numberOfNodes(min=1)=2 "Number of nodes";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Fluid/MassFlowRate.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Fluid/MassFlowRate.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Fluid/MassFlowRate.mo"	2022-03-10 09:57:38.336144168 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Fluid/MassFlowRate.mo"	2022-03-10 09:59:17.428156719 +0000
@@ -1,7 +1,7 @@
 within SiemensPower.Fluid;
 model MassFlowRate "Ideal sensor for mass flow rate"
   extends SiemensPower.Fluid.PartialFlowSensor;
-  extends Modelica.Icons.RotationalSensor;
+  extends Modelica.Icons.RoundSensor;
   Modelica.Blocks.Interfaces.RealOutput m_flow(quantity="MassFlowRate",
                                                final unit="kg/s")
     "Mass flow rate from port_a to port_b" annotation (Placement(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Fluid/Pressure.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Fluid/Pressure.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Fluid/Pressure.mo"	2022-03-10 09:57:38.336144168 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Fluid/Pressure.mo"	2022-03-10 09:59:17.396156715 +0000
@@ -1,7 +1,7 @@
 within SiemensPower.Fluid;
 model Pressure "Ideal pressure sensor"
   extends SiemensPower.Fluid.PartialAbsoluteSensor;
-  extends Modelica.Icons.RotationalSensor;
+  extends Modelica.Icons.RoundSensor;
   Modelica.Blocks.Interfaces.RealOutput p(final quantity="Pressure",
                                           final unit="Pa",
                                           displayUnit="bar",
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Interfaces/FluidPort.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Interfaces/FluidPort.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Interfaces/FluidPort.mo"	2022-03-10 09:57:38.332144169 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Interfaces/FluidPort.mo"	2022-03-10 09:59:17.372156712 +0000
@@ -1,7 +1,7 @@
 within SiemensPower.Interfaces;
 connector FluidPort
   "Interface for quasi one-dimensional fluid flow in a piping network (incompressible or compressible, one or more phases, one or more substances)"
-  import SI = Modelica.SIunits;
+  import Modelica.Units.SI;
 
  // replaceable package Medium = Modelica.Media.Interfaces.PartialMedium
  //   "Medium model" annotation (choicesAllMatching=true);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Interfaces/portHeat.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Interfaces/portHeat.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Interfaces/portHeat.mo"	2022-03-10 09:57:38.332144169 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Interfaces/portHeat.mo"	2022-03-10 09:59:17.328156707 +0000
@@ -1,6 +1,6 @@
 within SiemensPower.Interfaces;
 model portHeat "Closing any heat port"
-  import SI = Modelica.SIunits;
+  import Modelica.Units.SI;
 
   parameter Integer numberOfNodes=2 "Number of nodes";
   Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a port[numberOfNodes]
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/IdealGasData.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/IdealGasData.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/IdealGasData.mo"	2022-03-10 09:57:38.336144168 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/IdealGasData.mo"	2022-03-10 09:59:17.272156699 +0000
@@ -1,6 +1,6 @@
 within SiemensPower.Media;
 package IdealGasData "Ideal gas data based on the NASA Glenn coefficients"
-  extends Modelica.Icons.Library;
+  extends Modelica.Icons.Package;
 
    constant Modelica.Media.IdealGases.Common.DataRecord FlueGasSingleComponent(
     name="Simple Flue Gas",
@@ -12,7 +12,7 @@
     blow={0,4.256},
     ahigh={0,0,3.29882, 0.00130972, -2.55024e-7, 0, 0},
     bhigh={0,4.256},
-    R=277.672);
+R_s    =277.672);
 
   constant Modelica.Media.IdealGases.Common.SingleGasNasa.FluidConstants
     FlueGasSingleComponentConstants(
@@ -44,7 +44,7 @@
     blow={0,4.61},
     ahigh={0,0,3.2236, 0.0011013, -2.01923e-7, 0, 0},
     bhigh={0,4.61},
-    R=292.505);
+R_s    =292.505);
 
   constant Modelica.Media.IdealGases.Common.SingleGasNasa.FluidConstants
     ExhaustGasSingleComponentConstants(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/IntH2O/T_rhoh.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/IntH2O/T_rhoh.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/IntH2O/T_rhoh.mo"	2022-03-10 09:57:38.336144168 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/IntH2O/T_rhoh.mo"	2022-03-10 09:59:17.252156697 +0000
@@ -1,6 +1,6 @@
 within SiemensPower.Media.IntH2O;
 function T_rhoh "T(rho,h)"
-  import SI = Modelica.SIunits;
+  import Modelica.Units.SI;
 
   input SI.Density rho "Density";
   input SI.SpecificEnthalpy h "Specific enthalpy";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/IntH2O/p_rhoh.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/IntH2O/p_rhoh.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/IntH2O/p_rhoh.mo"	2022-03-10 09:57:38.336144168 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/IntH2O/p_rhoh.mo"	2022-03-10 09:59:17.244156695 +0000
@@ -1,6 +1,6 @@
 within SiemensPower.Media.IntH2O;
 function p_rhoh "p(rho,h)"
-  import SI = Modelica.SIunits;
+  import Modelica.Units.SI;
  input SI.Density rho "Density";
   input SI.SpecificEnthalpy h "Specific enthalpy";
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/IntH2O/rho_ph_dpdh.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/IntH2O/rho_ph_dpdh.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/IntH2O/rho_ph_dpdh.mo"	2022-03-10 09:57:38.336144168 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/IntH2O/rho_ph_dpdh.mo"	2022-03-10 09:59:17.240156695 +0000
@@ -1,6 +1,6 @@
 within SiemensPower.Media.IntH2O;
 function rho_ph_dpdh "rho, drdp and drdh as function of p and h"
-  import SI = Modelica.SIunits;
+  import Modelica.Units.SI;
   input SI.Pressure p "Pressure";
   input SI.SpecificEnthalpy h "Specific enthalpy";
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/T_ph.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/T_ph.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/T_ph.mo"	2022-03-10 09:57:38.336144168 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/T_ph.mo"	2022-03-10 09:59:17.220156693 +0000
@@ -1,6 +1,6 @@
 within SiemensPower.Media.TTSE.Utilities;
 function T_ph "T(p,h)"
-  import SI = Modelica.SIunits;
+  import Modelica.Units.SI;
   input SI.Pressure p "Pressure";
   input SI.SpecificEnthalpy h "Specific enthalpy";
   input Integer phase=0 "2 for two-phase, 1 for one-phase, 0 if not known";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/T_ph_dh.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/T_ph_dh.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/T_ph_dh.mo"	2022-03-10 09:57:38.336144168 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/T_ph_dh.mo"	2022-03-10 09:59:17.216156692 +0000
@@ -1,6 +1,6 @@
 within SiemensPower.Media.TTSE.Utilities;
 function T_ph_dh "T(p,h)/dh"
-  import SI = Modelica.SIunits;
+  import Modelica.Units.SI;
     input SI.Pressure p "Pressure";
     input SI.SpecificEnthalpy h "Specific Enthalpy";
      input Integer phase=0 "2 for two-phase, 1 for one-phase, 0 if not known";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/T_ph_dp.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/T_ph_dp.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/T_ph_dp.mo"	2022-03-10 09:57:38.336144168 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/T_ph_dp.mo"	2022-03-10 09:59:17.204156690 +0000
@@ -1,6 +1,6 @@
 within SiemensPower.Media.TTSE.Utilities;
 function T_ph_dp "T(p,h)/dp"
-  import SI = Modelica.SIunits;
+  import Modelica.Units.SI;
     input SI.Pressure p "Pressure";
     input SI.SpecificEnthalpy h "Specific Enthalpy";
     input Integer phase=0 "2 for two-phase, 1 for one-phase, 0 if not known";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/T_rhoh.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/T_rhoh.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/T_rhoh.mo"	2022-03-10 09:57:38.336144168 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/T_rhoh.mo"	2022-03-10 09:59:17.196156689 +0000
@@ -1,6 +1,6 @@
 within SiemensPower.Media.TTSE.Utilities;
 function T_rhoh "T(rho,h)"
-  import SI = Modelica.SIunits;
+  import Modelica.Units.SI;
 
   input SI.Density rho "Density";
   input SI.SpecificEnthalpy h "Specific enthalpy";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/T_rhoh_dh.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/T_rhoh_dh.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/T_rhoh_dh.mo"	2022-03-10 09:57:38.336144168 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/T_rhoh_dh.mo"	2022-03-10 09:59:17.188156689 +0000
@@ -1,6 +1,6 @@
 within SiemensPower.Media.TTSE.Utilities;
 function T_rhoh_dh "dT(rho,h)/dh"
-  import SI = Modelica.SIunits;
+  import Modelica.Units.SI;
     input SI.Density rho "Density";
     input SI.SpecificEnthalpy h "Specific Enthalpy";
     output Real dT_dh "Partial derivative drho/dh";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/T_rhoh_drho.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/T_rhoh_drho.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/T_rhoh_drho.mo"	2022-03-10 09:57:38.336144168 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/T_rhoh_drho.mo"	2022-03-10 09:59:17.172156686 +0000
@@ -1,6 +1,6 @@
 within SiemensPower.Media.TTSE.Utilities;
 function T_rhoh_drho "dT(rho,h)/drho"
-  import SI = Modelica.SIunits;
+  import Modelica.Units.SI;
     input SI.Density rho "Density";
     input SI.SpecificEnthalpy h "Specific Enthalpy";
     output Real dT_drho "Partial derivative dT/drho";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/Tsat_p.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/Tsat_p.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/Tsat_p.mo"	2022-03-10 09:57:38.336144168 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/Tsat_p.mo"	2022-03-10 09:59:17.168156685 +0000
@@ -1,6 +1,6 @@
 within SiemensPower.Media.TTSE.Utilities;
 function Tsat_p "Tsat(p)"
-  import SI = Modelica.SIunits;
+  import Modelica.Units.SI;
   input SI.Pressure p "Pressure";
 
   output SI.Temperature Tsat "Temperature";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/Tsat_p_dp.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/Tsat_p_dp.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/Tsat_p_dp.mo"	2022-03-10 09:57:38.336144168 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/Tsat_p_dp.mo"	2022-03-10 09:59:17.164156686 +0000
@@ -1,6 +1,6 @@
 within SiemensPower.Media.TTSE.Utilities;
 function Tsat_p_dp "dTsat(p)/dp"
-  import SI = Modelica.SIunits;
+  import Modelica.Units.SI;
   input SI.Pressure p "Pressure";
 
   output Real dTsat_dp "Pressure derivative of saturation temperature";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/cp_pT.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/cp_pT.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/cp_pT.mo"	2022-03-10 09:57:38.336144168 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/cp_pT.mo"	2022-03-10 09:59:17.156156685 +0000
@@ -1,6 +1,6 @@
 within SiemensPower.Media.TTSE.Utilities;
 function cp_pT "cp(p,T)"
-  import SI = Modelica.SIunits;
+  import Modelica.Units.SI;
   input Integer phase "-1: water, 0: unknown, 1: sat water, 2: steam";
   input SI.Pressure p "Pressure";
   input SI.Temperature T "Temperature";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/cp_ph.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/cp_ph.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/cp_ph.mo"	2022-03-10 09:57:38.336144168 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/cp_ph.mo"	2022-03-10 09:59:17.148156683 +0000
@@ -1,6 +1,6 @@
 within SiemensPower.Media.TTSE.Utilities;
 function cp_ph "cp(p,h)"
-  import SI = Modelica.SIunits;
+  import Modelica.Units.SI;
  input SI.Pressure p "Pressure";
   input SI.SpecificEnthalpy h "Specific enthalpy";
   input Integer phase=0 "2 for two-phase, 1 for one-phase, 0 if not known";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/der_T_ph.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/der_T_ph.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/der_T_ph.mo"	2022-03-10 09:57:38.336144168 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/der_T_ph.mo"	2022-03-10 09:59:17.140156682 +0000
@@ -1,6 +1,6 @@
 within SiemensPower.Media.TTSE.Utilities;
 function der_T_ph "Time derivative of T(p,h)"
-  import SI = Modelica.SIunits;
+  import Modelica.Units.SI;
     input SI.AbsolutePressure p "Pressure";
     input SI.SpecificEnthalpy h "Specific Enthalpy";
     input Integer phase=0 "2 for two-phase, 1 for one-phase, 0 if not known";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/der_T_rhoh.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/der_T_rhoh.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/der_T_rhoh.mo"	2022-03-10 09:57:38.336144168 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/der_T_rhoh.mo"	2022-03-10 09:59:17.136156681 +0000
@@ -1,7 +1,7 @@
 within SiemensPower.Media.TTSE.Utilities;
 function der_T_rhoh "Time derivative of T(rho,h)"
 
-  import SI = Modelica.SIunits;
+  import Modelica.Units.SI;
 
  input SI.Density rho "Density";
  input SI.SpecificEnthalpy h "Specific enthalpy";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/der_Tsat_p.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/der_Tsat_p.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/der_Tsat_p.mo"	2022-03-10 09:57:38.336144168 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/der_Tsat_p.mo"	2022-03-10 09:59:17.128156680 +0000
@@ -1,6 +1,6 @@
 within SiemensPower.Media.TTSE.Utilities;
 function der_Tsat_p "Time derivative of Tsat(p)"
-  import SI = Modelica.SIunits;
+  import Modelica.Units.SI;
     input SI.Pressure p "Pressure";
     input Real der_p "Time derivative of p";
     output Real der_Tsat(  unit = "K/s") "Time derivative of temperature";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/der_drhodh.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/der_drhodh.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/der_drhodh.mo"	2022-03-10 09:57:38.336144168 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/der_drhodh.mo"	2022-03-10 09:59:17.120156680 +0000
@@ -1,6 +1,6 @@
 within SiemensPower.Media.TTSE.Utilities;
 function der_drhodh "Time derivative for drho_dh function"
-  import SI = Modelica.SIunits;
+  import Modelica.Units.SI;
   import SiemensPower;
 
    input SI.Pressure p "Pressure";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/der_drhodp.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/der_drhodp.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/der_drhodp.mo"	2022-03-10 09:57:38.336144168 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/der_drhodp.mo"	2022-03-10 09:59:17.116156679 +0000
@@ -1,6 +1,6 @@
 within SiemensPower.Media.TTSE.Utilities;
 function der_drhodp "Time derivative for drho_dp function"
-  import SI = Modelica.SIunits;
+  import Modelica.Units.SI;
     input SI.Pressure p "Pressure";
     input SI.SpecificEnthalpy h "Specific Enthalpy";
     input Integer phase=0 "2 for two-phase, 1 for one-phase, 0 if not known";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/der_h1s_p.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/der_h1s_p.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/der_h1s_p.mo"	2022-03-10 09:57:38.336144168 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/der_h1s_p.mo"	2022-03-10 09:59:17.112156679 +0000
@@ -1,6 +1,6 @@
 within SiemensPower.Media.TTSE.Utilities;
 function der_h1s_p "Time derivative of h1s(p)"
-  import SI = Modelica.SIunits;
+  import Modelica.Units.SI;
     input SI.Pressure p "Pressure";
      input Real der_p "Time derivative of p";
     output Real der_h1s "Time derivative of bulb enthalpy";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/der_h2s_p.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/der_h2s_p.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/der_h2s_p.mo"	2022-03-10 09:57:38.336144168 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/der_h2s_p.mo"	2022-03-10 09:59:17.100156678 +0000
@@ -1,6 +1,6 @@
 within SiemensPower.Media.TTSE.Utilities;
 function der_h2s_p "Time derivative of h2s(p)"
-  import SI = Modelica.SIunits;
+  import Modelica.Units.SI;
     input SI.Pressure p "Pressure";
     input Real der_p "Time derivative of p";
     output Real der_h2s "Time derivative of dew enthalpy";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/der_p_rhoh.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/der_p_rhoh.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/der_p_rhoh.mo"	2022-03-10 09:57:38.336144168 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/der_p_rhoh.mo"	2022-03-10 09:59:17.096156676 +0000
@@ -1,6 +1,6 @@
 within SiemensPower.Media.TTSE.Utilities;
 function der_p_rhoh "Time derivative of p(rho,h)"
-  import SI = Modelica.SIunits;
+  import Modelica.Units.SI;
 
  input SI.Density rho "Density";
  input SI.SpecificEnthalpy h "Specific enthalpy";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/der_rho1s_p.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/der_rho1s_p.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/der_rho1s_p.mo"	2022-03-10 09:57:38.336144168 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/der_rho1s_p.mo"	2022-03-10 09:59:17.092156676 +0000
@@ -1,6 +1,6 @@
 within SiemensPower.Media.TTSE.Utilities;
 function der_rho1s_p "Time derivative of rho1s(p)"
-  import SI = Modelica.SIunits;
+  import Modelica.Units.SI;
     input SI.Pressure p "Pressure";
     input Real der_p "Time derivative of p";
     output Real der_rho1s "Time derivative of bulb density";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/der_rho2s_p.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/der_rho2s_p.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/der_rho2s_p.mo"	2022-03-10 09:57:38.336144168 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/der_rho2s_p.mo"	2022-03-10 09:59:17.080156675 +0000
@@ -1,6 +1,6 @@
 within SiemensPower.Media.TTSE.Utilities;
 function der_rho2s_p "Time derivative of rho2s(p)"
-  import SI = Modelica.SIunits;
+  import Modelica.Units.SI;
     input SI.Pressure p "Pressure";
     input Real der_p "Time derivative of p";
     output Real der_rho2s "Time derivative of dew density";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/der_rho_ph.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/der_rho_ph.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/der_rho_ph.mo"	2022-03-10 09:57:38.336144168 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/der_rho_ph.mo"	2022-03-10 09:59:17.072156673 +0000
@@ -1,6 +1,6 @@
 within SiemensPower.Media.TTSE.Utilities;
 function der_rho_ph "Time derivative of rho(p,h)"
-  import SI = Modelica.SIunits;
+  import Modelica.Units.SI;
 
  input SI.Pressure p "Pressure";
  input SI.SpecificEnthalpy h "Specific enthalpy";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/eta_pT.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/eta_pT.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/eta_pT.mo"	2022-03-10 09:57:38.336144168 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/eta_pT.mo"	2022-03-10 09:59:17.056156672 +0000
@@ -1,6 +1,6 @@
 within SiemensPower.Media.TTSE.Utilities;
 function eta_pT "eta(p,T)"
-  import SI = Modelica.SIunits;
+  import Modelica.Units.SI;
   input Integer phase "-1: water, 0: unknown, 1: sat water, 2: steam";
   input SI.Pressure p "Pressure";
   input SI.Temperature T "Temperature";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/eta_ph.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/eta_ph.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/eta_ph.mo"	2022-03-10 09:57:38.336144168 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/eta_ph.mo"	2022-03-10 09:59:17.052156671 +0000
@@ -1,6 +1,6 @@
 within SiemensPower.Media.TTSE.Utilities;
 function eta_ph "eta(p,h)"
-  import SI = Modelica.SIunits;
+  import Modelica.Units.SI;
  input SI.Pressure p "Pressure";
   input SI.SpecificEnthalpy h "Specific enthalpy";
   input Integer phase=0 "2 for two-phase, 1 for one-phase, 0 if not known";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/h1s_p.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/h1s_p.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/h1s_p.mo"	2022-03-10 09:57:38.336144168 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/h1s_p.mo"	2022-03-10 09:59:17.048156670 +0000
@@ -1,6 +1,6 @@
 within SiemensPower.Media.TTSE.Utilities;
 function h1s_p "h1s(p)"
-  import SI = Modelica.SIunits;
+  import Modelica.Units.SI;
   input SI.Pressure p "Pressure";
 
   output SI.SpecificEnthalpy h1s "Bulb enthalpy";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/h1s_p_dp.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/h1s_p_dp.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/h1s_p_dp.mo"	2022-03-10 09:57:38.336144168 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/h1s_p_dp.mo"	2022-03-10 09:59:17.036156670 +0000
@@ -1,6 +1,6 @@
 within SiemensPower.Media.TTSE.Utilities;
 function h1s_p_dp "dh1s(p)/dp"
-  import SI = Modelica.SIunits;
+  import Modelica.Units.SI;
   input SI.Pressure p "Pressure";
 
   output Real dh1s_dp "Pressure derivative of bulb enthalpy";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/h2s_p.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/h2s_p.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/h2s_p.mo"	2022-03-10 09:57:38.336144168 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/h2s_p.mo"	2022-03-10 09:59:17.032156668 +0000
@@ -1,6 +1,6 @@
 within SiemensPower.Media.TTSE.Utilities;
 function h2s_p "h2s(p)"
-  import SI = Modelica.SIunits;
+  import Modelica.Units.SI;
   input SI.Pressure p "Pressure";
 
   output SI.SpecificEnthalpy h2s "Dew enthalpy";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/h2s_p_dp.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/h2s_p_dp.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/h2s_p_dp.mo"	2022-03-10 09:57:38.336144168 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/h2s_p_dp.mo"	2022-03-10 09:59:17.028156668 +0000
@@ -1,6 +1,6 @@
 within SiemensPower.Media.TTSE.Utilities;
 function h2s_p_dp "dh2s(p)/dp"
-  import SI = Modelica.SIunits;
+  import Modelica.Units.SI;
   input SI.Pressure p "Pressure";
 
   output Real dh2s_dp "Pressure derivative of dew enthalpy";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/lambda_pT.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/lambda_pT.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/lambda_pT.mo"	2022-03-10 09:57:38.336144168 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/lambda_pT.mo"	2022-03-10 09:59:17.020156667 +0000
@@ -1,6 +1,6 @@
 within SiemensPower.Media.TTSE.Utilities;
 function lambda_pT "lambda(p,T)"
-  import SI = Modelica.SIunits;
+  import Modelica.Units.SI;
   input Integer phase "-1: water, 0: unknown, 1: sat water, 2: steam";
   input SI.Pressure p "Pressure";
   input SI.Temperature T "Temperature";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/lambda_ph.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/lambda_ph.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/lambda_ph.mo"	2022-03-10 09:57:38.336144168 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/lambda_ph.mo"	2022-03-10 09:59:17.012156667 +0000
@@ -1,6 +1,6 @@
 within SiemensPower.Media.TTSE.Utilities;
 function lambda_ph "lambda(p,h)"
-  import SI = Modelica.SIunits;
+  import Modelica.Units.SI;
  input SI.Pressure p "Pressure";
   input SI.SpecificEnthalpy h "Specific enthalpy";
   input Integer phase=0 "2 for two-phase, 1 for one-phase, 0 if not known";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/p_rhoh.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/p_rhoh.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/p_rhoh.mo"	2022-03-10 09:57:38.336144168 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/p_rhoh.mo"	2022-03-10 09:59:17.004156666 +0000
@@ -1,6 +1,6 @@
 within SiemensPower.Media.TTSE.Utilities;
 function p_rhoh "p(rho,h)"
-  import SI = Modelica.SIunits;
+  import Modelica.Units.SI;
 
   input SI.Density rho "Density";
   input SI.SpecificEnthalpy h "Specific enthalpy";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/p_rhoh_dh.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/p_rhoh_dh.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/p_rhoh_dh.mo"	2022-03-10 09:57:38.336144168 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/p_rhoh_dh.mo"	2022-03-10 09:59:16.992156664 +0000
@@ -1,6 +1,6 @@
 within SiemensPower.Media.TTSE.Utilities;
 function p_rhoh_dh "drho(p,h)/dh"
-  import SI = Modelica.SIunits;
+  import Modelica.Units.SI;
     input SI.Density rho "Density";
     input SI.SpecificEnthalpy h "Specific Enthalpy";
     output Real dp_dh "Partial derivative drho/dh";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/p_rhoh_drho.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/p_rhoh_drho.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/p_rhoh_drho.mo"	2022-03-10 09:57:38.336144168 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/p_rhoh_drho.mo"	2022-03-10 09:59:16.984156662 +0000
@@ -1,6 +1,6 @@
 within SiemensPower.Media.TTSE.Utilities;
 function p_rhoh_drho "dp(rho,h)/drho"
-  import SI = Modelica.SIunits;
+  import Modelica.Units.SI;
     input SI.Density rho "Density";
     input SI.SpecificEnthalpy h "Specific Enthalpy";
     output Real dp_drho "Partial derivative dp/drho";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/pr_pT.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/pr_pT.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/pr_pT.mo"	2022-03-10 09:57:38.336144168 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/pr_pT.mo"	2022-03-10 09:59:16.968156661 +0000
@@ -1,6 +1,6 @@
 within SiemensPower.Media.TTSE.Utilities;
 function pr_pT "Pr(p,T)"
-  import SI = Modelica.SIunits;
+  import Modelica.Units.SI;
   input Integer phase "-1: water, 0: unknown, 1: sat water, 2: steam";
   input SI.Pressure p "Pressure";
   input SI.Temperature T "Temperature";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/rho1s_p.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/rho1s_p.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/rho1s_p.mo"	2022-03-10 09:57:38.336144168 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/rho1s_p.mo"	2022-03-10 09:59:16.960156660 +0000
@@ -1,6 +1,6 @@
 within SiemensPower.Media.TTSE.Utilities;
 function rho1s_p "rho1s(p)"
-  import SI = Modelica.SIunits;
+  import Modelica.Units.SI;
   input SI.Pressure p "Pressure";
 
   output SI.Density rho1s "Bulb density";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/rho1s_p_dp.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/rho1s_p_dp.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/rho1s_p_dp.mo"	2022-03-10 09:57:38.336144168 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/rho1s_p_dp.mo"	2022-03-10 09:59:16.956156659 +0000
@@ -1,6 +1,6 @@
 within SiemensPower.Media.TTSE.Utilities;
 function rho1s_p_dp "drho1s(p)/dp"
-  import SI = Modelica.SIunits;
+  import Modelica.Units.SI;
   input SI.Pressure p "Pressure";
 
   output Real drho1s_dp "Pressure derivative of bulb density";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/rho2s_p.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/rho2s_p.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/rho2s_p.mo"	2022-03-10 09:57:38.336144168 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/rho2s_p.mo"	2022-03-10 09:59:16.948156659 +0000
@@ -1,6 +1,6 @@
 within SiemensPower.Media.TTSE.Utilities;
 function rho2s_p "rho2s(p)"
-  import SI = Modelica.SIunits;
+  import Modelica.Units.SI;
   input SI.Pressure p "Pressure";
 
   output SI.Density rho2s "Dew density";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/rho2s_p_dp.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/rho2s_p_dp.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/rho2s_p_dp.mo"	2022-03-10 09:57:38.336144168 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/rho2s_p_dp.mo"	2022-03-10 09:59:16.940156656 +0000
@@ -1,6 +1,6 @@
 within SiemensPower.Media.TTSE.Utilities;
 function rho2s_p_dp "drho2s(p)/dp"
-  import SI = Modelica.SIunits;
+  import Modelica.Units.SI;
   input SI.Pressure p "Pressure";
 
   output Real drho2s_dp "Pressure Derivative of dew density";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/rho_ph.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/rho_ph.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/rho_ph.mo"	2022-03-10 09:57:38.336144168 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/rho_ph.mo"	2022-03-10 09:59:16.936156657 +0000
@@ -1,6 +1,6 @@
 within SiemensPower.Media.TTSE.Utilities;
 function rho_ph "rho(p,h)"
-  import SI = Modelica.SIunits;
+  import Modelica.Units.SI;
 
   input SI.Pressure p "Pressure";
   input SI.SpecificEnthalpy h "Specific enthalpy";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/rho_ph_d2h.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/rho_ph_d2h.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/rho_ph_d2h.mo"	2022-03-10 09:57:38.336144168 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/rho_ph_d2h.mo"	2022-03-10 09:59:16.928156656 +0000
@@ -1,7 +1,7 @@
 within SiemensPower.Media.TTSE.Utilities;
 function rho_ph_d2h "rho, d2rhodh2, d2rhodhdp as function of p and h"
 
-  import SI = Modelica.SIunits;
+  import Modelica.Units.SI;
   input SI.Pressure p "Pressure";
   input SI.SpecificEnthalpy h "Specific enthalpy";
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/rho_ph_d2p.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/rho_ph_d2p.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/rho_ph_d2p.mo"	2022-03-10 09:57:38.336144168 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/rho_ph_d2p.mo"	2022-03-10 09:59:16.924156655 +0000
@@ -1,7 +1,7 @@
 within SiemensPower.Media.TTSE.Utilities;
 function rho_ph_d2p "rho, d2rhodp2, d2rhodhdp as function of p and h"
 
-  import SI = Modelica.SIunits;
+  import Modelica.Units.SI;
   input SI.Pressure p "Pressure";
   input SI.SpecificEnthalpy h "Specific enthalpy";
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/rho_ph_d2ph.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/rho_ph_d2ph.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/rho_ph_d2ph.mo"	2022-03-10 09:57:38.336144168 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/rho_ph_d2ph.mo"	2022-03-10 09:59:16.916156655 +0000
@@ -1,7 +1,7 @@
 within SiemensPower.Media.TTSE.Utilities;
 function rho_ph_d2ph "rho, d2rhodp2, d2rhodhdp as function of p and h"
 
-  import SI = Modelica.SIunits;
+  import Modelica.Units.SI;
   input SI.Pressure p "Pressure";
   input SI.SpecificEnthalpy h "Specific enthalpy";
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/rho_ph_dh.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/rho_ph_dh.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/rho_ph_dh.mo"	2022-03-10 09:57:38.336144168 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/rho_ph_dh.mo"	2022-03-10 09:59:16.908156652 +0000
@@ -1,6 +1,6 @@
 within SiemensPower.Media.TTSE.Utilities;
 function rho_ph_dh "rho(p,h)/dh"
-  import SI = Modelica.SIunits;
+  import Modelica.Units.SI;
     input SI.Pressure p "Pressure";
     input SI.SpecificEnthalpy h "Specific Enthalpy";
     input Integer phase=0 "2 for two-phase, 1 for one-phase, 0 if not known";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/rho_ph_dp.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/rho_ph_dp.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/rho_ph_dp.mo"	2022-03-10 09:57:38.336144168 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Media/TTSE/Utilities/rho_ph_dp.mo"	2022-03-10 09:59:16.904156653 +0000
@@ -1,6 +1,6 @@
 within SiemensPower.Media.TTSE.Utilities;
 function rho_ph_dp "rho(p,h)/dp"
-  import SI = Modelica.SIunits;
+  import Modelica.Units.SI;
     input SI.Pressure p "Pressure";
     input SI.SpecificEnthalpy h "Specific Enthalpy";
     input Integer phase=0 "2 for two-phase, 1 for one-phase, 0 if not known";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/AbsolutePressure.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/AbsolutePressure.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/AbsolutePressure.mo"	2022-03-10 09:57:38.332144169 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/AbsolutePressure.mo"	2022-03-10 09:59:16.888156650 +0000
@@ -1,3 +1,3 @@
 within SiemensPower.Units;
 type AbsolutePressure =
-                 Modelica.SIunits.AbsolutePressure(start = 5.0e5,min = 0e5,max = 10.0e9, nominal = 5.0e5);
+                 Modelica.Units.SI.AbsolutePressure(start = 5.0e5,min = 0e5,max = 10.0e9, nominal = 5.0e5);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/Area.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/Area.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/Area.mo"	2022-03-10 09:57:38.332144169 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/Area.mo"	2022-03-10 09:59:16.880156649 +0000
@@ -1,2 +1,2 @@
 within SiemensPower.Units;
-type Area =              Modelica.SIunits.Area(start = 1,min = 0.0,max = 100000, nominal = 10);
+type Area =              Modelica.Units.SI.Area(start = 1,min = 0.0,max = 100000, nominal = 10);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/CoefficientOfHeatTransfer.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/CoefficientOfHeatTransfer.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/CoefficientOfHeatTransfer.mo"	2022-03-10 09:57:38.332144169 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/CoefficientOfHeatTransfer.mo"	2022-03-10 09:59:16.868156648 +0000
@@ -1,3 +1,3 @@
 within SiemensPower.Units;
 type CoefficientOfHeatTransfer =
-                         Modelica.SIunits.CoefficientOfHeatTransfer(start = 100,min = 1,max = 100000, nominal = 100);
+                         Modelica.Units.SI.CoefficientOfHeatTransfer(start = 100,min = 1,max = 100000, nominal = 100);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/Density.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/Density.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/Density.mo"	2022-03-10 09:57:38.332144169 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/Density.mo"	2022-03-10 09:59:16.864156647 +0000
@@ -1,2 +1,2 @@
 within SiemensPower.Units;
-type Density =   Modelica.SIunits.Density(start = 100,min = 0,max = 9000, nominal = 100);
+type Density =   Modelica.Units.SI.Density(start = 100,min = 0,max = 9000, nominal = 100);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/HeatCapacity.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/HeatCapacity.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/HeatCapacity.mo"	2022-03-10 09:57:38.332144169 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/HeatCapacity.mo"	2022-03-10 09:59:16.860156647 +0000
@@ -1,2 +1,2 @@
 within SiemensPower.Units;
-type HeatCapacity =      Modelica.SIunits.HeatCapacity(start = 1.0e8,min = -1.0e11, max = 1.0e11, nominal = 1.0e8);
+type HeatCapacity =      Modelica.Units.SI.HeatCapacity(start = 1.0e8,min = -1.0e11, max = 1.0e11, nominal = 1.0e8);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/HeatFlowRate.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/HeatFlowRate.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/HeatFlowRate.mo"	2022-03-10 09:57:38.332144169 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/HeatFlowRate.mo"	2022-03-10 09:59:16.852156645 +0000
@@ -1,2 +1,2 @@
 within SiemensPower.Units;
-type HeatFlowRate =      Modelica.SIunits.HeatFlowRate(start = 1.0e8,min = -1.0e11, max = 1.0e11, nominal = 1.0e8);
+type HeatFlowRate =      Modelica.Units.SI.HeatFlowRate(start = 1.0e8,min = -1.0e11, max = 1.0e11, nominal = 1.0e8);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/HeatFlux.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/HeatFlux.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/HeatFlux.mo"	2022-03-10 09:57:38.332144169 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/HeatFlux.mo"	2022-03-10 09:59:16.848156646 +0000
@@ -1,2 +1,2 @@
 within SiemensPower.Units;
-type HeatFlux =          Modelica.SIunits.HeatFlux(start = 1.0e8,min = -1.0e11, max = 1.0e11, nominal = 1.0e8);
+type HeatFlux =          Modelica.Units.SI.HeatFlux(start = 1.0e8,min = -1.0e11, max = 1.0e11, nominal = 1.0e8);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/Length.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/Length.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/Length.mo"	2022-03-10 09:57:38.332144169 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/Length.mo"	2022-03-10 09:59:16.844156644 +0000
@@ -1,2 +1,2 @@
 within SiemensPower.Units;
-type Length =            Modelica.SIunits.Length(start = 1,min = 0.0,max = 100000, nominal = 10);
+type Length =            Modelica.Units.SI.Length(start = 1,min = 0.0,max = 100000, nominal = 10);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/Mass.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/Mass.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/Mass.mo"	2022-03-10 09:57:38.332144169 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/Mass.mo"	2022-03-10 09:59:16.836156644 +0000
@@ -1,2 +1,2 @@
 within SiemensPower.Units;
-type Mass =      Modelica.SIunits.Mass(start = 100,min = 0,max = 100000, nominal = 100);
+type Mass =      Modelica.Units.SI.Mass(start = 100,min = 0,max = 100000, nominal = 100);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/MassFlowRate.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/MassFlowRate.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/MassFlowRate.mo"	2022-03-10 09:57:38.332144169 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/MassFlowRate.mo"	2022-03-10 09:59:16.832156643 +0000
@@ -1,3 +1,3 @@
 within SiemensPower.Units;
 type MassFlowRate =
-                 Modelica.SIunits.MassFlowRate(min = -1000,max = 1000, nominal = 100);
+                 Modelica.Units.SI.MassFlowRate(min = -1000,max = 1000, nominal = 100);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/Pressure.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/Pressure.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/Pressure.mo"	2022-03-10 09:57:38.332144169 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/Pressure.mo"	2022-03-10 09:59:16.828156643 +0000
@@ -1,2 +1,2 @@
 within SiemensPower.Units;
-type Pressure =  Modelica.SIunits.Pressure(start = 5.0e5,min = -100e6,max = 100.0e7, nominal = 5.0e5);
+type Pressure =  Modelica.Units.SI.Pressure(start = 5.0e5,min = -100e6,max = 100.0e7, nominal = 5.0e5);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/SpecificEnthalpy.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/SpecificEnthalpy.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/SpecificEnthalpy.mo"	2022-03-10 09:57:38.332144169 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/SpecificEnthalpy.mo"	2022-03-10 09:59:16.820156641 +0000
@@ -1,2 +1,2 @@
 within SiemensPower.Units;
-type SpecificEnthalpy =  Modelica.SIunits.SpecificEnthalpy(start = 0.8e6,min = 1e5,max = 3.6e7, nominal = 1.0e6);
+type SpecificEnthalpy =  Modelica.Units.SI.SpecificEnthalpy(start = 0.8e6,min = 1e5,max = 3.6e7, nominal = 1.0e6);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/SpecificHeatCapacity.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/SpecificHeatCapacity.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/SpecificHeatCapacity.mo"	2022-03-10 09:57:38.332144169 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/SpecificHeatCapacity.mo"	2022-03-10 09:59:16.816156642 +0000
@@ -1,3 +1,3 @@
 within SiemensPower.Units;
 type SpecificHeatCapacity =
-                 Modelica.SIunits.SpecificHeatCapacity(start = 1000, min = 1,max = 10000, nominal = 1000);
+                 Modelica.Units.SI.SpecificHeatCapacity(start = 1000, min = 1,max = 10000, nominal = 1000);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/SpecificVolume.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/SpecificVolume.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/SpecificVolume.mo"	2022-03-10 09:57:38.332144169 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/SpecificVolume.mo"	2022-03-10 09:59:16.812156640 +0000
@@ -1,2 +1,2 @@
 within SiemensPower.Units;
-type SpecificVolume = Modelica.SIunits.SpecificVolume(start = 1,min = 0,max = 10000, nominal = 1);
+type SpecificVolume = Modelica.Units.SI.SpecificVolume(start = 1,min = 0,max = 10000, nominal = 1);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/Temperature.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/Temperature.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/Temperature.mo"	2022-03-10 09:57:38.332144169 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/Temperature.mo"	2022-03-10 09:59:16.804156640 +0000
@@ -1,2 +1,2 @@
 within SiemensPower.Units;
-type Temperature=Modelica.SIunits.Temperature(start = 400, min = 273,max = 1500, nominal = 400);
+type Temperature=Modelica.Units.SI.Temperature(start = 400, min = 273,max = 1500, nominal = 400);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/TemperatureDifference.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/TemperatureDifference.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/TemperatureDifference.mo"	2022-03-10 09:57:38.332144169 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/TemperatureDifference.mo"	2022-03-10 09:59:16.800156639 +0000
@@ -1,3 +1,3 @@
 within SiemensPower.Units;
 type TemperatureDifference =
-                 Modelica.SIunits.TemperatureDifference(start = 400, min = 273,max = 1500, nominal = 400);
+                 Modelica.Units.SI.TemperatureDifference(start = 400, min = 273,max = 1500, nominal = 400);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/Volume.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/Volume.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/Volume.mo"	2022-03-10 09:57:38.332144169 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Units/Volume.mo"	2022-03-10 09:59:16.796156639 +0000
@@ -1,2 +1,2 @@
 within SiemensPower.Units;
-type Volume = Modelica.SIunits.Volume(start = 1,min = 0,max = 10000, nominal = 1);
+type Volume = Modelica.Units.SI.Volume(start = 1,min = 0,max = 10000, nominal = 1);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/BaseClasses/BaseTube.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/BaseClasses/BaseTube.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/BaseClasses/BaseTube.mo"	2022-03-10 09:57:38.336144168 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/BaseClasses/BaseTube.mo"	2022-03-10 09:59:16.780156636 +0000
@@ -1,6 +1,6 @@
 within SiemensPower.Utilities.BaseClasses;
 partial model BaseTube "Base class for spatial discretized tubes"
-  import SI = Modelica.SIunits;
+  import Modelica.Units.SI;
   extends SiemensPower.Utilities.BaseClasses.PartialTwoPortTransport(pIn_start=pOut_start, XOut_start=XIn_start);
   constant Real g=Modelica.Constants.g_n;
   constant Real pi=Modelica.Constants.pi;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/BaseClasses/PartialTwoPortTransport.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/BaseClasses/PartialTwoPortTransport.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/BaseClasses/PartialTwoPortTransport.mo"	2022-03-10 09:57:38.336144168 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/BaseClasses/PartialTwoPortTransport.mo"	2022-03-10 09:59:16.760156634 +0000
@@ -1,7 +1,7 @@
 within SiemensPower.Utilities.BaseClasses;
 partial model PartialTwoPortTransport
   "Base class for components with two fluid ports"
-  import SI = Modelica.SIunits;
+  import Modelica.Units.SI;
 
   Medium.SpecificEnthalpy hIn(start=hIn_start) "actual state at portIn";
   Medium.SpecificEnthalpy hOut(start=hOut_start) "actual state at portOut";
@@ -12,7 +12,7 @@
            annotation (choicesAllMatching = true);
 
 // Initializatin parameters
- parameter Modelica.SIunits.MassFlowRate m_flow_start=1
+ parameter Modelica.Units.SI.MassFlowRate m_flow_start=1
     "Guess value for mass flow rate"                                                 annotation(Dialog(tab="Initialization"));
 
   parameter Medium.AbsolutePressure pIn_start = Medium.reference_p
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/Functions/CharacteristicNumbers/NusseltNumber.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/Functions/CharacteristicNumbers/NusseltNumber.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/Functions/CharacteristicNumbers/NusseltNumber.mo"	2022-03-10 09:57:38.332144169 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/Functions/CharacteristicNumbers/NusseltNumber.mo"	2022-03-10 09:59:16.736156631 +0000
@@ -1,10 +1,10 @@
 within SiemensPower.Utilities.Functions.CharacteristicNumbers;
 function NusseltNumber "Nusselt number"
-  input Modelica.SIunits.CoefficientOfHeatTransfer alpha
+  input Modelica.Units.SI.CoefficientOfHeatTransfer alpha
     "Coefficient of heat transfer";
-  input Modelica.SIunits.Length length "Characteristic length";
-  input Modelica.SIunits.ThermalConductivity lambda "Thermal conductivity";
-  output Modelica.SIunits.NusseltNumber Nu "Nusselt number";
+  input Modelica.Units.SI.Length length "Characteristic length";
+  input Modelica.Units.SI.ThermalConductivity lambda "Thermal conductivity";
+  output Modelica.Units.SI.NusseltNumber Nu "Nusselt number";
 algorithm
   Nu := alpha*length/lambda;
   annotation (Documentation(info="Nusselt number Nu = alpha*length/lambda
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/Functions/CharacteristicNumbers/ReynoldsNumber.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/Functions/CharacteristicNumbers/ReynoldsNumber.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/Functions/CharacteristicNumbers/ReynoldsNumber.mo"	2022-03-10 09:57:38.332144169 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/Functions/CharacteristicNumbers/ReynoldsNumber.mo"	2022-03-10 09:59:16.728156630 +0000
@@ -1,12 +1,12 @@
 within SiemensPower.Utilities.Functions.CharacteristicNumbers;
 function ReynoldsNumber "Reynolds number of fluid flow"
-  input Modelica.SIunits.MassFlowRate m_flow "Mass flow rate";
-  input Modelica.SIunits.Length length
-    "Characteristic length (hyd. diam. in pipes)";
-  input Modelica.SIunits.Area A "Cross sectional area";
-  input Modelica.SIunits.DynamicViscosity eta "Dynamic viscosity";
-  output Modelica.SIunits.ReynoldsNumber Re "Reynolds number";
 
+  input Modelica.Units.SI.MassFlowRate m_flow "Mass flow rate";
+  input Modelica.Units.SI.Length length
+    "Characteristic length (hyd. diam. in pipes)";
+  input Modelica.Units.SI.Area A "Cross sectional area";
+  input Modelica.Units.SI.DynamicViscosity eta "Dynamic viscosity";
+  output Modelica.Units.SI.ReynoldsNumber Re "Reynolds number";
 algorithm
   Re := abs(m_flow)*length/A/eta;
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/Functions/Test/Test_htFDBR82.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/Functions/Test/Test_htFDBR82.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/Functions/Test/Test_htFDBR82.mo"	2022-03-10 09:57:38.332144169 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/Functions/Test/Test_htFDBR82.mo"	2022-03-10 09:59:16.716156628 +0000
@@ -1,7 +1,7 @@
 within SiemensPower.Utilities.Functions.Test;
 model Test_htFDBR82
   "Comparison of FlueGas and FlueGasSingleComponent as well as cp functions"
-  import SI = Modelica.SIunits;
+  import Modelica.Units.SI;
   extends Modelica.Icons.Example;
   package Gas =SiemensPower.Media.FlueGas "Flue gas with 6 components";
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/Functions/cp_FDBR82.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/Functions/cp_FDBR82.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/Functions/cp_FDBR82.mo"	2022-03-10 09:57:38.332144169 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/Functions/cp_FDBR82.mo"	2022-03-10 09:59:16.704156627 +0000
@@ -1,7 +1,7 @@
 within SiemensPower.Utilities.Functions;
 function cp_FDBR82
   "Specific heat capacity of a gas composition accortding to FDBR82 (6 component flue gas)"
-  import SI = Modelica.SIunits;
+  import Modelica.Units.SI;
   extends Modelica.Icons.Function;
 
 input SI.Temperature TGas "Gas temp";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/Functions/hT_FDBR82.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/Functions/hT_FDBR82.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/Functions/hT_FDBR82.mo"	2022-03-10 09:57:38.332144169 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/Functions/hT_FDBR82.mo"	2022-03-10 09:59:16.688156626 +0000
@@ -3,7 +3,7 @@
   "Specific enthalpy of a gas composition according to FDBR82 (6 component flue gas)"
   // calculating h(TGas,XGas) by integrating the function cp_FDBR82(TGas,XGas)
   // the values of TGas are considered in Grad Celsius!!
-  import SI = Modelica.SIunits;
+  import Modelica.Units.SI;
   extends Modelica.Icons.Function;
 
 input SiemensPower.Units.Temperature TGas "Gas temp";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/Functions/lambdaFin.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/Functions/lambdaFin.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/Functions/lambdaFin.mo"	2022-03-10 09:57:38.332144169 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/Functions/lambdaFin.mo"	2022-03-10 09:59:16.664156623 +0000
@@ -1,12 +1,12 @@
 within SiemensPower.Utilities.Functions;
 function lambdaFin "Lambda(T) for several fin materials"
-    input Modelica.SIunits.Temperature T "Fin temperature";
+    input Modelica.Units.SI.Temperature T "Fin temperature";
     input String material "Fin material";
-    output Modelica.SIunits.ThermalConductivity lambdafin
+    output Modelica.Units.SI.ThermalConductivity lambdafin
     "Thermal conductivity of fins";
 
 protected
-  Modelica.SIunits.Temperature TdegC;  // in degC
+  Modelica.Units.SI.Temperature TdegC;  // in degC
   Integer kennz;
   constant Real koeff[11,3] = {
   {60.476, -0.059313,  0.0},
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/HeatTransfer/HeatTransferBaseClass.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/HeatTransfer/HeatTransferBaseClass.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/HeatTransfer/HeatTransferBaseClass.mo"	2022-03-10 09:57:38.332144169 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/HeatTransfer/HeatTransferBaseClass.mo"	2022-03-10 09:59:16.624156616 +0000
@@ -1,7 +1,7 @@
 within SiemensPower.Utilities.HeatTransfer;
 partial model HeatTransferBaseClass
   "Base class for heat transfer correlation in terms of Nusselt number"
-  import SI = Modelica.SIunits;
+  import Modelica.Units.SI;
 
 //  replaceable package Medium =
 //      Modelica.Media.IdealGases.MixtureGases.FlueGasSixComponents
@@ -10,7 +10,7 @@
 
   parameter SI.Length lengthRe "Characteristic length for Reynolds number"                annotation(Dialog(tab="Advanced", enable=false));
   parameter SI.Length lengthNu "Characteristic length for Nusselt number"                annotation(Dialog(tab="Advanced", enable=false));
-  parameter Modelica.SIunits.Area ACrossFlow "Cross flow area" annotation(Dialog(tab="Advanced", enable=false));
+  parameter Modelica.Units.SI.Area ACrossFlow "Cross flow area" annotation(Dialog(tab="Advanced", enable=false));
   parameter SI.Area AHeatTransfer "Total heat transfer area" annotation(Dialog(tab="Advanced", enable=false));
 
   parameter SiemensPower.Utilities.Structures.FgzGeo geoFGZ
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/HeatTransfer/InnerHeatTransfer/PartialHeatTransfer.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/HeatTransfer/InnerHeatTransfer/PartialHeatTransfer.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/HeatTransfer/InnerHeatTransfer/PartialHeatTransfer.mo"	2022-03-10 09:57:38.332144169 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/HeatTransfer/InnerHeatTransfer/PartialHeatTransfer.mo"	2022-03-10 09:59:16.592156612 +0000
@@ -3,19 +3,19 @@
   "Base class for friction pressure loss correlations"
 
  parameter SiemensPower.Utilities.Structures.PipeGeo geoPipe annotation(Dialog(tab="Advanced",enable=false));
- final parameter Modelica.SIunits.Length diameterInner = geoPipe.d_out-2*geoPipe.s;
+ final parameter Modelica.Units.SI.Length diameterInner = geoPipe.d_out-2*geoPipe.s;
 
- input Modelica.SIunits.Pressure p;
- input Modelica.SIunits.SpecificEnthalpy h;
- input Modelica.SIunits.Density rho;
- input Modelica.SIunits.DynamicViscosity eta;
- input Modelica.SIunits.SpecificHeatCapacity cp;
- input Modelica.SIunits.ThermalConductivity lambda;
+ input Modelica.Units.SI.Pressure p;
+ input Modelica.Units.SI.SpecificEnthalpy h;
+ input Modelica.Units.SI.Density rho;
+ input Modelica.Units.SI.DynamicViscosity eta;
+ input Modelica.Units.SI.SpecificHeatCapacity cp;
+ input Modelica.Units.SI.ThermalConductivity lambda;
  input Real steamQuality;
- input Modelica.SIunits.MassFlowRate m_flow;
- input Modelica.SIunits.TemperatureDifference dT;
+ input Modelica.Units.SI.MassFlowRate m_flow;
+ input Modelica.Units.SI.TemperatureDifference dT;
 
- Modelica.SIunits.CoefficientOfHeatTransfer alpha;
+ Modelica.Units.SI.CoefficientOfHeatTransfer alpha;
 
 annotation (Documentation(info="<html>
   Any derived inner heat transfer correlation must define the relations for the following two quantities:
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/HeatTransfer/PartialHeatTransfer.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/HeatTransfer/PartialHeatTransfer.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/HeatTransfer/PartialHeatTransfer.mo"	2022-03-10 09:57:38.332144169 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/HeatTransfer/PartialHeatTransfer.mo"	2022-03-10 09:59:16.576156611 +0000
@@ -3,14 +3,14 @@
   "base class for any pipe heat transfer correlation"
   replaceable package Medium=Modelica.Media.Interfaces.PartialMedium annotation(Dialog(tab="No input", enable=false));
   parameter Integer numberOfNodes(min=1)=1 "Number of pipe segments" annotation(Dialog(tab="Advanced", enable=false));
-  Modelica.SIunits.HeatFlowRate[numberOfNodes] Q_flow "Heat flow rates";
-  parameter Modelica.SIunits.Area A_h "Total heat transfer area"
+  Modelica.Units.SI.HeatFlowRate[numberOfNodes] Q_flow "Heat flow rates";
+  parameter Modelica.Units.SI.Area A_h "Total heat transfer area"
                                                    annotation(Dialog(tab="No input", enable=false));
-  parameter Modelica.SIunits.Length d_h "Hydraulic diameter"
+  parameter Modelica.Units.SI.Length d_h "Hydraulic diameter"
                                                annotation(Dialog(tab="No input", enable=false));
-  parameter Modelica.SIunits.Area A_cross "Cross flow area"
+  parameter Modelica.Units.SI.Area A_cross "Cross flow area"
                                               annotation(Dialog(tab="No input", enable=false));
-  parameter Modelica.SIunits.Length L "Total pipe length"
+  parameter Modelica.Units.SI.Length L "Total pipe length"
                                             annotation(Dialog(tab="No input", enable=false));
   Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a[numberOfNodes]
     thermalPort "Thermal port"
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/PressureLoss/OverallFlow.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/PressureLoss/OverallFlow.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/PressureLoss/OverallFlow.mo"	2022-03-10 09:57:38.332144169 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/PressureLoss/OverallFlow.mo"	2022-03-10 09:59:16.556156609 +0000
@@ -4,8 +4,8 @@
   extends SiemensPower.Utilities.PressureLoss.PartialFriction;
   extends SiemensPower.Utilities.PressureLoss.PartialFrictionSinglePhase;
 
-   final parameter Modelica.SIunits.Length diameterInner = geoPipe.d_out-2*geoPipe.s;
-   final parameter Modelica.SIunits.Area A = Modelica.Constants.pi*0.25*diameterInner*diameterInner;
+   final parameter Modelica.Units.SI.Length diameterInner = geoPipe.d_out-2*geoPipe.s;
+   final parameter Modelica.Units.SI.Area A = Modelica.Constants.pi*0.25*diameterInner*diameterInner;
 
 //create and parametrize input records for additional pressure loss coefficient calculation
 // according to Modelica.Fluid.Dissipation rules
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/PressureLoss/PartialFriction.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/PressureLoss/PartialFriction.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/PressureLoss/PartialFriction.mo"	2022-03-10 09:57:38.332144169 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/PressureLoss/PartialFriction.mo"	2022-03-10 09:59:16.544156607 +0000
@@ -4,22 +4,22 @@
 
  parameter SiemensPower.Utilities.Structures.PipeGeo geoPipe
     "geometry parameters of the tube "                                                     annotation(Dialog(tab="Advanced",enable=false));
- parameter Modelica.SIunits.Length dz
+ parameter Modelica.Units.SI.Length dz
     "length of tube section for which friction pressure loss is wanted"                                  annotation(Dialog(tab="Advanced",enable=false));
  parameter Real lambda=0.02
     "constant friction factor (used for valve friction model only)";
 
-  input Modelica.SIunits.Pressure p "pressure";
-  input Modelica.SIunits.SpecificEnthalpy h "specific enthalpy";
-  input Modelica.SIunits.Density rho "mass density";
-  input Modelica.SIunits.DynamicViscosity eta "dynamic viscosoty";
+  input Modelica.Units.SI.Pressure p "pressure";
+  input Modelica.Units.SI.SpecificEnthalpy h "specific enthalpy";
+  input Modelica.Units.SI.Density rho "mass density";
+  input Modelica.Units.SI.DynamicViscosity eta "dynamic viscosoty";
   input Real steamQuality "Steam quality";
   input Real xdo
     "Critical steam quality, at which the boiling crisis (e.g. dryout) occurs";
-  input Modelica.SIunits.MassFlowRate m_flow "mass flow rate";
 
- Modelica.SIunits.Pressure dp;
+  input Modelica.Units.SI.MassFlowRate m_flow "mass flow rate";
 
+ Modelica.Units.SI.Pressure dp;
   annotation (Documentation(info="<html>
   Any derived friction pressure loss correlation must define a relation between m_flow and dp, e.g.
 dp/dz = ... * m_flow^2/(rho)
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/PressureLoss/RoughnessFlow.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/PressureLoss/RoughnessFlow.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/PressureLoss/RoughnessFlow.mo"	2022-03-10 09:57:38.332144169 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/PressureLoss/RoughnessFlow.mo"	2022-03-10 09:59:16.532156605 +0000
@@ -3,10 +3,10 @@
   extends SiemensPower.Utilities.PressureLoss.PartialFriction;
   extends SiemensPower.Utilities.PressureLoss.PartialFrictionSinglePhase;
 
-   parameter Modelica.SIunits.MassFlowRate m_flowLaminar=0.001
+   parameter Modelica.Units.SI.MassFlowRate m_flowLaminar=0.001
     "nominal mass flow for laminar limit";
-   final parameter Modelica.SIunits.Length diameterInner = geoPipe.d_out-2*geoPipe.s;
-   final parameter Modelica.SIunits.Area A = Modelica.Constants.pi*0.25*diameterInner*diameterInner;
+   final parameter Modelica.Units.SI.Length diameterInner = geoPipe.d_out-2*geoPipe.s;
+   final parameter Modelica.Units.SI.Area A = Modelica.Constants.pi*0.25*diameterInner*diameterInner;
    final parameter Real zeta = (1.14-2*Modelica.Math.log10(geoPipe.r/diameterInner))^(-2)+geoPipe.zeta_add*diameterInner/geoPipe.L;
 
 equation
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/Structures/FgzGeo.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/Structures/FgzGeo.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/Structures/FgzGeo.mo"	2022-03-10 09:57:38.332144169 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/Structures/FgzGeo.mo"	2022-03-10 09:59:16.520156603 +0000
@@ -1,6 +1,6 @@
 within SiemensPower.Utilities.Structures;
 record FgzGeo "Geometry parameters for a flue gas zone"
-  import SI = Modelica.SIunits;
+  import Modelica.Units.SI;
 
   parameter SI.Length pt=0.1 "Transverse pitch between tubes";
   parameter SI.Length pl=0.1 "Longitudal pitch between tubes";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/Structures/Fins.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/Structures/Fins.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/Structures/Fins.mo"	2022-03-10 09:57:38.332144169 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/Structures/Fins.mo"	2022-03-10 09:59:16.512156603 +0000
@@ -1,6 +1,6 @@
 within SiemensPower.Utilities.Structures;
 record Fins "Geometry parameters for fins"
-  import SI = Modelica.SIunits;
+  import Modelica.Units.SI;
 
   parameter Boolean finned=true "Is finned tube";
   parameter Boolean serrated=true "Is serrated (not solid fins)" annotation(Dialog(enable=finned));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/Structures/PipeGeo.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/Structures/PipeGeo.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/Structures/PipeGeo.mo"	2022-03-10 09:57:38.332144169 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/Structures/PipeGeo.mo"	2022-03-10 09:59:16.496156600 +0000
@@ -1,6 +1,6 @@
 within SiemensPower.Utilities.Structures;
 record PipeGeo "Geometry parameters for a tube"
-  import SI = Modelica.SIunits;
+  import Modelica.Units.SI;
 
   parameter Integer Nt=1 "Number of parallel tubes";
   parameter SI.Length L=1 "Length of tube";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/Structures/PropertiesMetal.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/Structures/PropertiesMetal.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/Structures/PropertiesMetal.mo"	2022-03-10 09:57:38.332144169 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/Utilities/Structures/PropertiesMetal.mo"	2022-03-10 09:59:16.488156599 +0000
@@ -1,6 +1,6 @@
 within SiemensPower.Utilities.Structures;
 record PropertiesMetal "Metal property parameters"
-  import SI = Modelica.SIunits;
+  import Modelica.Units.SI;
 
   parameter SI.SpecificHeatCapacity cp=540 "Specific heat capacity";
   parameter SI.ThermalConductivity lambda=44 "Thermal conductivity";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/openmodelica.metadata.json" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/openmodelica.metadata.json"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/openmodelica.metadata.json"	2022-03-10 09:57:38.336144168 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/openmodelica.metadata.json"	2022-03-10 09:59:18.000156791 +0000
@@ -1 +1 @@
-{"convertFromVersion":["1.8.0", "2.0.0", "2.1.0"], "path":"SiemensPower 2.2", "support":"experimental", "uses":{"Modelica":"3.2.1"}, "version":"2.2.0", "zipfile":"https://build.openmodelica.org/libraries/SiemensPower/SiemensPower-2.2.zip"}
+{"convertFromVersion": ["1.8.0", "2.0.0", "2.1.0"], "path": "SiemensPower 2.2", "support": "experimental", "uses": {"Modelica": "4.0.0"}, "version": "2.2.0", "zipfile": "https://build.openmodelica.org/libraries/SiemensPower/SiemensPower-2.2.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/SiemensPower 2.2.0/package.mo" "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/package.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower 2.2.0/package.mo"	2022-03-10 09:57:38.332144169 +0000
+++ "converted-libraries/.openmodelica/libraries/SiemensPower 2.2.0/package.mo"	2022-03-10 09:59:17.996156790 +0000
@@ -5,7 +5,7 @@
     annotation (
   version="2.2",
  preferedView="info",
- uses(Modelica(version="3.2.1")),
+ uses(Modelica(version= "4.0.0")),
  conversion(from(version="1.8", script="Scripts/ConvertSiemensPower_from_1.8_to_2.0.mos"), from(version="2.0", script="Scripts/ConvertSiemensPower_from_2.0_to_2.1.mos"),
  from(version="2.1", script="Scripts/ConvertSiemensPower_from_2.1_to_2.2.mos")),
      Documentation(info="<html>