diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower OMCtest/Blocks/Smoothing.mo" "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Blocks/Smoothing.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower OMCtest/Blocks/Smoothing.mo" 2022-03-10 09:57:38.352144170 +0000 +++ "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Blocks/Smoothing.mo" 2022-03-10 09:59:19.432156973 +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 OMCtest/Blocks/TimeTable.mo" "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Blocks/TimeTable.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower OMCtest/Blocks/TimeTable.mo" 2022-03-10 09:57:38.352144170 +0000 +++ "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Blocks/TimeTable.mo" 2022-03-10 09:59:19.424156971 +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 OMCtest/Boundaries/GasSinkP.mo" "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Boundaries/GasSinkP.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower OMCtest/Boundaries/GasSinkP.mo" 2022-03-10 09:57:38.352144170 +0000 +++ "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Boundaries/GasSinkP.mo" 2022-03-10 09:59:19.408156970 +0000 @@ -4,7 +4,7 @@ Modelica.Media.Interfaces.PartialMedium "Medium model" annotation ( choicesAllMatching=true); - parameter Modelica.SIunits.Pressure p_start=101325 "Pressure"; + parameter Modelica.Units.SI.Pressure p_start=101325 "Pressure"; parameter Medium.Temperature T_start=300 "Temperature for reverse flow"; parameter Medium.MassFraction Xi_start[Medium.nX]=Medium.reference_X "Gas composition for reverse flow"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower OMCtest/Components/FlueGasZones/FlueGasZoneSingleTube.mo" "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Components/FlueGasZones/FlueGasZoneSingleTube.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower OMCtest/Components/FlueGasZones/FlueGasZoneSingleTube.mo" 2022-03-10 09:57:38.352144170 +0000 +++ "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Components/FlueGasZones/FlueGasZoneSingleTube.mo" 2022-03-10 09:59:19.340156960 +0000 @@ -1,7 +1,7 @@ within SiemensPower.Components.FlueGasZones; model FlueGasZoneSingleTube "Flue gas zone including a single water/steam tube as basis component for higher level flue gas zones" - import SI = Modelica.SIunits; + import Modelica.Units.SI; constant Real pi=Modelica.Constants.pi; @@ -35,7 +35,7 @@ parameter Boolean delayInnerHeatTransfer=false "With delay of qmf" annotation(Dialog(tab="Heat transfer", group="Inner heat transfer")); parameter SI.Time timeDelayOfInnerHeatTransfer=0.1 "artificial delay time for qmf" annotation(Dialog(tab="Heat transfer", group="Inner heat transfer",enable=delayInnerHeatTransfer)); - 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 H2OMedium.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 OMCtest/Components/HeatExchanger/ParallelFlowEvaporator.mo" "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Components/HeatExchanger/ParallelFlowEvaporator.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower OMCtest/Components/HeatExchanger/ParallelFlowEvaporator.mo" 2022-03-10 09:57:38.352144170 +0000 +++ "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Components/HeatExchanger/ParallelFlowEvaporator.mo" 2022-03-10 09:59:19.300156956 +0000 @@ -1,7 +1,7 @@ within SiemensPower.Components.HeatExchanger; model ParallelFlowEvaporator "Evaporator with parallel rows according to Cottam design" - import SI = Modelica.SIunits; + import Modelica.Units.SI; replaceable package GasMedium = SiemensPower.Media.ExhaustGas constrainedby Modelica.Media.Interfaces.PartialMedium "Flue gas medium" annotation ( choicesAllMatching=true, Dialog(group="Media")); @@ -75,7 +75,7 @@ "Hydraulic resistance at splitter outlets" annotation(Dialog(group="Pressure loss")); -parameter Modelica.SIunits.MassFlowRate m_flowGas_start=228.68 +parameter Modelica.Units.SI.MassFlowRate m_flowGas_start=228.68 "Flue gas mass flow rate" annotation (Dialog(tab="Initialization", group="Flue gas flow")); parameter GasMedium.Temperature TGasIn_start=390 "Inlet gas temperature" @@ -83,7 +83,7 @@ parameter GasMedium.Temperature TGasOut_start = TGasIn_start "Outlet gas temperature" annotation (Dialog(tab="Initialization", group="Flue gas flow")); -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 GasMedium.AbsolutePressure pIn_start=pOut_start+2e5 diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower OMCtest/Components/Junctions/SplitterMixer.mo" "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Components/Junctions/SplitterMixer.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower OMCtest/Components/Junctions/SplitterMixer.mo" 2022-03-10 09:57:38.352144170 +0000 +++ "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Components/Junctions/SplitterMixer.mo" 2022-03-10 09:59:19.236156948 +0000 @@ -1,7 +1,7 @@ within SiemensPower.Components.Junctions; model SplitterMixer "Splitter/mixer with N ports" - import SI = Modelica.SIunits; + import Modelica.Units.SI; replaceable package Medium = Modelica.Media.Water.WaterIF97_ph constrainedby Modelica.Media.Interfaces.PartialMedium "Medium in the component" annotation ( choicesAllMatching = true); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower OMCtest/Components/Pipes/Tube.mo" "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Components/Pipes/Tube.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower OMCtest/Components/Pipes/Tube.mo" 2022-03-10 09:57:38.352144170 +0000 +++ "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Components/Pipes/Tube.mo" 2022-03-10 09:59:19.196156942 +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(final useEnergyStorage = true, redeclare SI.HeatFlux qHeating = qMetalFluidDelayed); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower OMCtest/Components/Pipes/TubeOwnMedia.mo" "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Components/Pipes/TubeOwnMedia.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower OMCtest/Components/Pipes/TubeOwnMedia.mo" 2022-03-10 09:57:38.352144170 +0000 +++ "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Components/Pipes/TubeOwnMedia.mo" 2022-03-10 09:59:19.172156939 +0000 @@ -1,7 +1,7 @@ within SiemensPower.Components.Pipes; model TubeOwnMedia "SimpleMedia-Tube (incl wall) with detailed energy , integrated momentum and mass balance" - import SI = Modelica.SIunits; + import Modelica.Units.SI; extends SiemensPower.Utilities.BaseClasses.PartialTwoPortTransport; constant Real g=Modelica.Constants.g_n; constant Real pi=Modelica.Constants.pi; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower OMCtest/Components/Pipes/TubeWithoutWall.mo" "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Components/Pipes/TubeWithoutWall.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower OMCtest/Components/Pipes/TubeWithoutWall.mo" 2022-03-10 09:57:38.352144170 +0000 +++ "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Components/Pipes/TubeWithoutWall.mo" 2022-03-10 09:59:19.124156934 +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 OMCtest/Components/SolidComponents/Fins.mo" "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Components/SolidComponents/Fins.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower OMCtest/Components/SolidComponents/Fins.mo" 2022-03-10 09:57:38.352144170 +0000 +++ "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Components/SolidComponents/Fins.mo" 2022-03-10 09:59:19.112156932 +0000 @@ -1,6 +1,6 @@ within SiemensPower.Components.SolidComponents; model Fins "Outer fins of heated pipes" - import SI = Modelica.SIunits; + import Modelica.Units.SI; constant Real pi=Modelica.Constants.pi; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower OMCtest/Components/SolidComponents/Wall.mo" "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Components/SolidComponents/Wall.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower OMCtest/Components/SolidComponents/Wall.mo" 2022-03-10 09:57:38.352144170 +0000 +++ "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Components/SolidComponents/Wall.mo" 2022-03-10 09:59:19.096156929 +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 OMCtest/Components/SolidComponents/WallWithTension.mo" "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Components/SolidComponents/WallWithTension.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower OMCtest/Components/SolidComponents/WallWithTension.mo" 2022-03-10 09:57:38.352144170 +0000 +++ "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Components/SolidComponents/WallWithTension.mo" 2022-03-10 09:59:19.084156928 +0000 @@ -1,6 +1,6 @@ within SiemensPower.Components.SolidComponents; model WallWithTension "Wall aggregate measuring tension" - import SI = Modelica.SIunits; + import Modelica.Units.SI; extends SiemensPower.Components.SolidComponents.Wall; parameter SiemensPower.Utilities.Structures.StressCoefficients stress diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower OMCtest/Components/SolidComponents/Walllayer.mo" "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Components/SolidComponents/Walllayer.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower OMCtest/Components/SolidComponents/Walllayer.mo" 2022-03-10 09:57:38.352144170 +0000 +++ "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Components/SolidComponents/Walllayer.mo" 2022-03-10 09:59:19.076156927 +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 OMCtest/Components/Valves/Valve.mo" "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Components/Valves/Valve.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower OMCtest/Components/Valves/Valve.mo" 2022-03-10 09:57:38.352144170 +0000 +++ "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Components/Valves/Valve.mo" 2022-03-10 09:59:19.016156920 +0000 @@ -7,7 +7,7 @@ hOut_start = hIn_start, final allowFlowReversal= not hasNoReverseFlow); - import SI = Modelica.SIunits; + import Modelica.Units.SI; import FCT = SiemensPower.Utilities.Functions; constant Real pi = Modelica.Constants.pi; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower OMCtest/Interfaces/portHeat.mo" "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Interfaces/portHeat.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower OMCtest/Interfaces/portHeat.mo" 2022-03-10 09:57:38.352144170 +0000 +++ "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Interfaces/portHeat.mo" 2022-03-10 09:59:18.968156913 +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 OMCtest/Media/IntH2O/T_rhoh.mo" "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Media/IntH2O/T_rhoh.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower OMCtest/Media/IntH2O/T_rhoh.mo" 2022-03-10 09:57:38.352144170 +0000 +++ "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Media/IntH2O/T_rhoh.mo" 2022-03-10 09:59:18.928156909 +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 OMCtest/Media/IntH2O/rho_ph_dpdh.mo" "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Media/IntH2O/rho_ph_dpdh.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower OMCtest/Media/IntH2O/rho_ph_dpdh.mo" 2022-03-10 09:57:38.352144170 +0000 +++ "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Media/IntH2O/rho_ph_dpdh.mo" 2022-03-10 09:59:18.924156908 +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 OMCtest/Media/TTSE/Utilities/T_ph.mo" "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Media/TTSE/Utilities/T_ph.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower OMCtest/Media/TTSE/Utilities/T_ph.mo" 2022-03-10 09:57:38.352144170 +0000 +++ "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Media/TTSE/Utilities/T_ph.mo" 2022-03-10 09:59:18.908156907 +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 OMCtest/Media/TTSE/Utilities/T_ph_dh.mo" "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Media/TTSE/Utilities/T_ph_dh.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower OMCtest/Media/TTSE/Utilities/T_ph_dh.mo" 2022-03-10 09:57:38.352144170 +0000 +++ "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Media/TTSE/Utilities/T_ph_dh.mo" 2022-03-10 09:59:18.900156904 +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 OMCtest/Media/TTSE/Utilities/T_ph_dp.mo" "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Media/TTSE/Utilities/T_ph_dp.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower OMCtest/Media/TTSE/Utilities/T_ph_dp.mo" 2022-03-10 09:57:38.352144170 +0000 +++ "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Media/TTSE/Utilities/T_ph_dp.mo" 2022-03-10 09:59:18.892156904 +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 OMCtest/Media/TTSE/Utilities/der_T_ph.mo" "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Media/TTSE/Utilities/der_T_ph.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower OMCtest/Media/TTSE/Utilities/der_T_ph.mo" 2022-03-10 09:57:38.352144170 +0000 +++ "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Media/TTSE/Utilities/der_T_ph.mo" 2022-03-10 09:59:18.888156903 +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 OMCtest/Media/TTSE/Utilities/der_drhodh.mo" "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Media/TTSE/Utilities/der_drhodh.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower OMCtest/Media/TTSE/Utilities/der_drhodh.mo" 2022-03-10 09:57:38.352144170 +0000 +++ "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Media/TTSE/Utilities/der_drhodh.mo" 2022-03-10 09:59:18.884156903 +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; 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 OMCtest/Media/TTSE/Utilities/der_drhodp.mo" "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Media/TTSE/Utilities/der_drhodp.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower OMCtest/Media/TTSE/Utilities/der_drhodp.mo" 2022-03-10 09:57:38.352144170 +0000 +++ "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Media/TTSE/Utilities/der_drhodp.mo" 2022-03-10 09:59:18.876156903 +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 OMCtest/Media/TTSE/Utilities/der_rho_ph.mo" "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Media/TTSE/Utilities/der_rho_ph.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower OMCtest/Media/TTSE/Utilities/der_rho_ph.mo" 2022-03-10 09:57:38.352144170 +0000 +++ "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Media/TTSE/Utilities/der_rho_ph.mo" 2022-03-10 09:59:18.868156900 +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 OMCtest/Media/TTSE/Utilities/rho_ph.mo" "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Media/TTSE/Utilities/rho_ph.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower OMCtest/Media/TTSE/Utilities/rho_ph.mo" 2022-03-10 09:57:38.352144170 +0000 +++ "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Media/TTSE/Utilities/rho_ph.mo" 2022-03-10 09:59:18.864156901 +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 OMCtest/Media/TTSE/Utilities/rho_ph_d2h.mo" "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Media/TTSE/Utilities/rho_ph_d2h.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower OMCtest/Media/TTSE/Utilities/rho_ph_d2h.mo" 2022-03-10 09:57:38.352144170 +0000 +++ "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Media/TTSE/Utilities/rho_ph_d2h.mo" 2022-03-10 09:59:18.856156899 +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 OMCtest/Media/TTSE/Utilities/rho_ph_d2p.mo" "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Media/TTSE/Utilities/rho_ph_d2p.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower OMCtest/Media/TTSE/Utilities/rho_ph_d2p.mo" 2022-03-10 09:57:38.352144170 +0000 +++ "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Media/TTSE/Utilities/rho_ph_d2p.mo" 2022-03-10 09:59:18.852156899 +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 OMCtest/Media/TTSE/Utilities/rho_ph_d2ph.mo" "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Media/TTSE/Utilities/rho_ph_d2ph.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower OMCtest/Media/TTSE/Utilities/rho_ph_d2ph.mo" 2022-03-10 09:57:38.352144170 +0000 +++ "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Media/TTSE/Utilities/rho_ph_d2ph.mo" 2022-03-10 09:59:18.844156899 +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 OMCtest/Media/TTSE/Utilities/rho_ph_dh.mo" "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Media/TTSE/Utilities/rho_ph_dh.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower OMCtest/Media/TTSE/Utilities/rho_ph_dh.mo" 2022-03-10 09:57:38.352144170 +0000 +++ "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Media/TTSE/Utilities/rho_ph_dh.mo" 2022-03-10 09:59:18.836156896 +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 OMCtest/Media/TTSE/Utilities/rho_ph_dp.mo" "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Media/TTSE/Utilities/rho_ph_dp.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower OMCtest/Media/TTSE/Utilities/rho_ph_dp.mo" 2022-03-10 09:57:38.352144170 +0000 +++ "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Media/TTSE/Utilities/rho_ph_dp.mo" 2022-03-10 09:59:18.832156897 +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 OMCtest/Utilities/BaseClasses/BaseTube.mo" "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Utilities/BaseClasses/BaseTube.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower OMCtest/Utilities/BaseClasses/BaseTube.mo" 2022-03-10 09:57:38.352144170 +0000 +++ "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Utilities/BaseClasses/BaseTube.mo" 2022-03-10 09:59:18.808156894 +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 OMCtest/Utilities/BaseClasses/PartialTwoPortIsenthalpicTransport.mo" "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Utilities/BaseClasses/PartialTwoPortIsenthalpicTransport.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower OMCtest/Utilities/BaseClasses/PartialTwoPortIsenthalpicTransport.mo" 2022-03-10 09:57:38.352144170 +0000 +++ "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Utilities/BaseClasses/PartialTwoPortIsenthalpicTransport.mo" 2022-03-10 09:59:18.784156890 +0000 @@ -1,7 +1,7 @@ within SiemensPower.Utilities.BaseClasses; partial model PartialTwoPortIsenthalpicTransport "Partial element transporting fluid between two ports without storing mass or enthalpy" - import SI = Modelica.SIunits; + import Modelica.Units.SI; import CO = Modelica.Constants; extends SiemensPower.Utilities.BaseClasses.PartialTwoPortTransport( hOut_start=hIn_start, final useEnergyStorage=false); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower OMCtest/Utilities/BaseClasses/PartialTwoPortTransport.mo" "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Utilities/BaseClasses/PartialTwoPortTransport.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower OMCtest/Utilities/BaseClasses/PartialTwoPortTransport.mo" 2022-03-10 09:57:38.352144170 +0000 +++ "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Utilities/BaseClasses/PartialTwoPortTransport.mo" 2022-03-10 09:59:18.776156890 +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"; @@ -15,7 +15,7 @@ "Try to select preferred medium states" annotation(Dialog(tab="Advanced")); // 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 OMCtest/Utilities/Functions/CharacteristicNumbers/NusseltNumber.mo" "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Utilities/Functions/CharacteristicNumbers/NusseltNumber.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower OMCtest/Utilities/Functions/CharacteristicNumbers/NusseltNumber.mo" 2022-03-10 09:57:38.352144170 +0000 +++ "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Utilities/Functions/CharacteristicNumbers/NusseltNumber.mo" 2022-03-10 09:59:18.732156884 +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 OMCtest/Utilities/Functions/CharacteristicNumbers/NusseltNumber_der.mo" "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Utilities/Functions/CharacteristicNumbers/NusseltNumber_der.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower OMCtest/Utilities/Functions/CharacteristicNumbers/NusseltNumber_der.mo" 2022-03-10 09:57:38.352144170 +0000 +++ "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Utilities/Functions/CharacteristicNumbers/NusseltNumber_der.mo" 2022-03-10 09:59:18.728156883 +0000 @@ -1,10 +1,10 @@ within SiemensPower.Utilities.Functions.CharacteristicNumbers; function NusseltNumber_der "time derivative of NusseltNumber" - 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"; + input Modelica.Units.SI.Length length "Characteristic length"; + input Modelica.Units.SI.ThermalConductivity lambda "Thermal conductivity"; input Real alpha_der "time derivative of heat transfer coefficient"; input Real length_der; input Real lambda_der "time derivative of the Thermal conductivity"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower OMCtest/Utilities/Functions/CharacteristicNumbers/ReynoldsNumber.mo" "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Utilities/Functions/CharacteristicNumbers/ReynoldsNumber.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower OMCtest/Utilities/Functions/CharacteristicNumbers/ReynoldsNumber.mo" 2022-03-10 09:57:38.352144170 +0000 +++ "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Utilities/Functions/CharacteristicNumbers/ReynoldsNumber.mo" 2022-03-10 09:59:18.720156882 +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 OMCtest/Utilities/Functions/CharacteristicNumbers/ReynoldsNumber_der.mo" "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Utilities/Functions/CharacteristicNumbers/ReynoldsNumber_der.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower OMCtest/Utilities/Functions/CharacteristicNumbers/ReynoldsNumber_der.mo" 2022-03-10 09:57:38.352144170 +0000 +++ "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Utilities/Functions/CharacteristicNumbers/ReynoldsNumber_der.mo" 2022-03-10 09:59:18.712156882 +0000 @@ -1,11 +1,11 @@ within SiemensPower.Utilities.Functions.CharacteristicNumbers; function ReynoldsNumber_der "time derivative of ReynoldsNumber" - input Modelica.SIunits.MassFlowRate m_flow "Mass flow rate"; - input Modelica.SIunits.Length length + input Modelica.Units.SI.MassFlowRate m_flow "Mass flow rate"; + input Modelica.Units.SI.Length length "Characteristic length (hyd. diam. in pipes)"; - input Modelica.SIunits.Area A "Cross sectional area"; - input Modelica.SIunits.DynamicViscosity eta "Dynamic viscosity"; + input Modelica.Units.SI.Area A "Cross sectional area"; + input Modelica.Units.SI.DynamicViscosity eta "Dynamic viscosity"; input Real m_flow_der "time derivative of mass flow rate"; input Real length_der; input Real A_der; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower OMCtest/Utilities/Functions/lambdaFin.mo" "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Utilities/Functions/lambdaFin.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower OMCtest/Utilities/Functions/lambdaFin.mo" 2022-03-10 09:57:38.352144170 +0000 +++ "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Utilities/Functions/lambdaFin.mo" 2022-03-10 09:59:18.708156880 +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 OMCtest/Utilities/Functions/lambdaFin_der.mo" "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Utilities/Functions/lambdaFin_der.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower OMCtest/Utilities/Functions/lambdaFin_der.mo" 2022-03-10 09:57:38.352144170 +0000 +++ "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Utilities/Functions/lambdaFin_der.mo" 2022-03-10 09:59:18.696156879 +0000 @@ -1,12 +1,12 @@ within SiemensPower.Utilities.Functions; function lambdaFin_der "dLambda(T)/dT for several fin materials" - input Modelica.SIunits.Temperature T "Fin temperature"; + input Modelica.Units.SI.Temperature T "Fin temperature"; input String material "Fin material"; input Real T_der "time derivative of fin temperature"; output Real der_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 OMCtest/Utilities/HeatTransfer/HeatTransferBaseClass.mo" "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Utilities/HeatTransfer/HeatTransferBaseClass.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower OMCtest/Utilities/HeatTransfer/HeatTransferBaseClass.mo" 2022-03-10 09:57:38.352144170 +0000 +++ "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Utilities/HeatTransfer/HeatTransferBaseClass.mo" 2022-03-10 09:59:18.664156875 +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 OMCtest/Utilities/HeatTransfer/InnerHeatTransfer/PartialHeatTransfer.mo" "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Utilities/HeatTransfer/InnerHeatTransfer/PartialHeatTransfer.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower OMCtest/Utilities/HeatTransfer/InnerHeatTransfer/PartialHeatTransfer.mo" 2022-03-10 09:57:38.352144170 +0000 +++ "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Utilities/HeatTransfer/InnerHeatTransfer/PartialHeatTransfer.mo" 2022-03-10 09:59:18.640156872 +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; Real xdo; Boolean isSinglePhase; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower OMCtest/Utilities/HeatTransfer/InnerHeatTransfer/SinglePhase.mo" "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Utilities/HeatTransfer/InnerHeatTransfer/SinglePhase.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower OMCtest/Utilities/HeatTransfer/InnerHeatTransfer/SinglePhase.mo" 2022-03-10 09:57:38.352144170 +0000 +++ "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Utilities/HeatTransfer/InnerHeatTransfer/SinglePhase.mo" 2022-03-10 09:59:18.628156870 +0000 @@ -8,7 +8,7 @@ // parameter Modelica.SIunits.CoefficientOfHeatTransfer alpha0=0.2e3 // "Offset for heat transfer coefficient"; - final parameter Modelica.SIunits.Area A = Modelica.Constants.pi*0.25* + final parameter Modelica.Units.SI.Area A = Modelica.Constants.pi*0.25* diameterInner * diameterInner; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower OMCtest/Utilities/PressureLoss/PartialFriction.mo" "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Utilities/PressureLoss/PartialFriction.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower OMCtest/Utilities/PressureLoss/PartialFriction.mo" 2022-03-10 09:57:38.352144170 +0000 +++ "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Utilities/PressureLoss/PartialFriction.mo" 2022-03-10 09:59:18.620156869 +0000 @@ -4,21 +4,21 @@ 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"; + input Modelica.Units.SI.MassFlowRate m_flow "mass flow rate"; - Modelica.SIunits.Pressure dp; + Modelica.Units.SI.Pressure dp; Boolean isSinglePhase; annotation (Documentation(info=" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower OMCtest/Utilities/PressureLoss/RoughnessFlow.mo" "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Utilities/PressureLoss/RoughnessFlow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower OMCtest/Utilities/PressureLoss/RoughnessFlow.mo" 2022-03-10 09:57:38.352144170 +0000 +++ "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Utilities/PressureLoss/RoughnessFlow.mo" 2022-03-10 09:59:18.608156868 +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 OMCtest/Utilities/Structures/FgzGeo.mo" "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Utilities/Structures/FgzGeo.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower OMCtest/Utilities/Structures/FgzGeo.mo" 2022-03-10 09:57:38.352144170 +0000 +++ "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Utilities/Structures/FgzGeo.mo" 2022-03-10 09:59:18.596156866 +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 OMCtest/Utilities/Structures/Fins.mo" "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Utilities/Structures/Fins.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower OMCtest/Utilities/Structures/Fins.mo" 2022-03-10 09:57:38.352144170 +0000 +++ "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Utilities/Structures/Fins.mo" 2022-03-10 09:59:18.588156865 +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 OMCtest/Utilities/Structures/PipeGeo.mo" "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Utilities/Structures/PipeGeo.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower OMCtest/Utilities/Structures/PipeGeo.mo" 2022-03-10 09:57:38.352144170 +0000 +++ "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Utilities/Structures/PipeGeo.mo" 2022-03-10 09:59:18.584156864 +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 OMCtest/Utilities/Structures/PropertiesMetal.mo" "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Utilities/Structures/PropertiesMetal.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower OMCtest/Utilities/Structures/PropertiesMetal.mo" 2022-03-10 09:57:38.352144170 +0000 +++ "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Utilities/Structures/PropertiesMetal.mo" 2022-03-10 09:59:18.576156864 +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 OMCtest/Utilities/Structures/StressCoefficients.mo" "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Utilities/Structures/StressCoefficients.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower OMCtest/Utilities/Structures/StressCoefficients.mo" 2022-03-10 09:57:38.352144170 +0000 +++ "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/Utilities/Structures/StressCoefficients.mo" 2022-03-10 09:59:18.568156863 +0000 @@ -1,7 +1,7 @@ within SiemensPower.Utilities.Structures; record StressCoefficients "Parameters for stress thermal and mechanical stress computation" - import SI = Modelica.SIunits; + import Modelica.Units.SI; parameter Real eta=0.3 "Poisson's ratio"; parameter Real alpha_t=2 "stress concentration factor"; parameter Real alpha_m=2 "tangential stress concentration factor"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower OMCtest/openmodelica.metadata.json" "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/openmodelica.metadata.json" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower OMCtest/openmodelica.metadata.json" 2022-03-10 09:57:38.352144170 +0000 +++ "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/openmodelica.metadata.json" 2022-03-10 09:59:19.444156973 +0000 @@ -1 +1 @@ -{"path":"SiemensPower OMCtest", "support":"noSupport", "uses":{"Modelica":"3.1.0"}, "version":"OMCtest", "zipfile":"https://build.openmodelica.org/libraries/SiemensPower/SiemensPower-OMCtest.20150519.zip"} +{"path": "SiemensPower OMCtest", "support": "noSupport", "uses": {"Modelica": "4.0.0"}, "version": "OMCtest", "zipfile": "https://build.openmodelica.org/libraries/SiemensPower/SiemensPower-OMCtest.20150519.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 OMCtest/package.mo" "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/package.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SiemensPower OMCtest/package.mo" 2022-03-10 09:57:38.352144170 +0000 +++ "converted-libraries/.openmodelica/libraries/SiemensPower OMCtest/package.mo" 2022-03-10 09:59:19.444156973 +0000 @@ -1,4 +1,4 @@ within ; package SiemensPower -annotation (version="OMCtest", uses(Modelica(version="3.1"))); +annotation (version="OMCtest", uses(Modelica(version= "4.0.0"))); end SiemensPower;