diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia master/Examples/BaseProps_sweep.mo" "converted-libraries/.openmodelica/libraries/HelmholtzMedia master/Examples/BaseProps_sweep.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia master/Examples/BaseProps_sweep.mo" 2022-03-10 09:57:36.684143960 +0000 +++ "converted-libraries/.openmodelica/libraries/HelmholtzMedia master/Examples/BaseProps_sweep.mo" 2022-03-10 09:57:53.820146132 +0000 @@ -8,16 +8,17 @@ // replaceable package Medium = HelmholtzFluids.R134a(independentVariables=IndependentVariables.ph); Medium.BaseProperties medium; + Modelica.Blocks.Sources.ExpSine d_generator( amplitude=50, offset=300, damping=0.5, - freqHz=1.1, +f =1.1, startTime=2) annotation (Placement(transformation(extent={{-80,60},{-60,80}}))); Modelica.Blocks.Sources.Sine T_generator( offset=298.15, - freqHz=1.3, +f =1.3, startTime=0, amplitude=50) annotation (Placement(transformation(extent={{-80,20},{-60,40}}))); @@ -25,12 +26,12 @@ offset=2e6, startTime=0, phase=0, - freqHz=1.3, +f =1.3, amplitude=1.999e6) annotation (Placement(transformation(extent={{-80,-20},{-60,0}}))); Modelica.Blocks.Sources.ExpSine h_generator( damping=0.3, - freqHz=2, +f =2, amplitude=100e3, startTime=2, phase=1.5707963267949, @@ -41,11 +42,10 @@ damping=0.3, startTime=2, phase=0, - freqHz=1.1, +f =1.1, amplitude=2e3, offset=0) annotation (Placement(transformation(extent={{-80,-100},{-60,-80}}))); - equation // medium.d = d_generator.y; // medium.T = T_generator.y; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia master/Examples/ConvergenceTest/Ancillary_StartValues.mo" "converted-libraries/.openmodelica/libraries/HelmholtzMedia master/Examples/ConvergenceTest/Ancillary_StartValues.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia master/Examples/ConvergenceTest/Ancillary_StartValues.mo" 2022-03-10 09:57:36.684143960 +0000 +++ "converted-libraries/.openmodelica/libraries/HelmholtzMedia master/Examples/ConvergenceTest/Ancillary_StartValues.mo" 2022-03-10 09:57:53.764146124 +0000 @@ -29,7 +29,7 @@ startTime=0, amplitude=(Tmax - Tmin)/2, offset=(Tmax - Tmin)/2 + Tmin, - freqHz=1) +f =1) annotation (Placement(transformation(extent={{-80,-40},{-60,-20}}))); protected diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia master/Examples/ConvergenceTest/SinglePhase_Transport.mo" "converted-libraries/.openmodelica/libraries/HelmholtzMedia master/Examples/ConvergenceTest/SinglePhase_Transport.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia master/Examples/ConvergenceTest/SinglePhase_Transport.mo" 2022-03-10 09:57:36.684143960 +0000 +++ "converted-libraries/.openmodelica/libraries/HelmholtzMedia master/Examples/ConvergenceTest/SinglePhase_Transport.mo" 2022-03-10 09:57:53.748146121 +0000 @@ -19,7 +19,7 @@ amplitude=(pmax - pmin)/2, offset=(pmax - pmin)/2, startTime=0, - freqHz=100) +f =100) annotation (Placement(transformation(extent={{-80,-40},{-60,-20}}))); Modelica.Blocks.Sources.Ramp T_super( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia master/Examples/ConvergenceTest/SinglePhase_setState_b_Water.mo" "converted-libraries/.openmodelica/libraries/HelmholtzMedia master/Examples/ConvergenceTest/SinglePhase_setState_b_Water.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia master/Examples/ConvergenceTest/SinglePhase_setState_b_Water.mo" 2022-03-10 09:57:36.684143960 +0000 +++ "converted-libraries/.openmodelica/libraries/HelmholtzMedia master/Examples/ConvergenceTest/SinglePhase_setState_b_Water.mo" 2022-03-10 09:57:53.732146120 +0000 @@ -26,7 +26,7 @@ annotation (Placement(transformation(extent={{-80,20},{-60,40}}))); Modelica.Blocks.Sources.Sine T_sine( - freqHz=100, + f =100, startTime=0, amplitude=(Tmax - Tmin)/2, offset=(Tmax - Tmin)/2 + Tmin) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia master/Examples/ConvergenceTest/SinglePhase_setState_pramp_Tsine.mo" "converted-libraries/.openmodelica/libraries/HelmholtzMedia master/Examples/ConvergenceTest/SinglePhase_setState_pramp_Tsine.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia master/Examples/ConvergenceTest/SinglePhase_setState_pramp_Tsine.mo" 2022-03-10 09:57:36.684143960 +0000 +++ "converted-libraries/.openmodelica/libraries/HelmholtzMedia master/Examples/ConvergenceTest/SinglePhase_setState_pramp_Tsine.mo" 2022-03-10 09:57:53.720146119 +0000 @@ -26,7 +26,7 @@ annotation (Placement(transformation(extent={{-80,20},{-60,40}}))); Modelica.Blocks.Sources.Sine T_sine( - freqHz=100, + f =100, startTime=0, amplitude=(Tmax - Tmin)/2, offset=(Tmax - Tmin)/2 + Tmin) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia master/Examples/ConvergenceTest/SinglePhase_setState_psine_Tramp.mo" "converted-libraries/.openmodelica/libraries/HelmholtzMedia master/Examples/ConvergenceTest/SinglePhase_setState_psine_Tramp.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia master/Examples/ConvergenceTest/SinglePhase_setState_psine_Tramp.mo" 2022-03-10 09:57:36.684143960 +0000 +++ "converted-libraries/.openmodelica/libraries/HelmholtzMedia master/Examples/ConvergenceTest/SinglePhase_setState_psine_Tramp.mo" 2022-03-10 09:57:53.696146115 +0000 @@ -28,7 +28,7 @@ Modelica.Blocks.Sources.Sine p_sine( amplitude=(pmax - pmin)/2, offset=(pmax - pmin)/2, - freqHz=100, +f =100, startTime=0) annotation (Placement(transformation(extent={{-80,-40},{-60,-20}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia master/Examples/ConvergenceTest/setSat.mo" "converted-libraries/.openmodelica/libraries/HelmholtzMedia master/Examples/ConvergenceTest/setSat.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia master/Examples/ConvergenceTest/setSat.mo" 2022-03-10 09:57:36.684143960 +0000 +++ "converted-libraries/.openmodelica/libraries/HelmholtzMedia master/Examples/ConvergenceTest/setSat.mo" 2022-03-10 09:57:53.672146112 +0000 @@ -10,10 +10,10 @@ Medium.DerPressureByTemperature dpT2; Medium.DerTemperatureByPressure dTp2; - Modelica.SIunits.TemperatureDifference T_err_abs; - Modelica.SIunits.PressureDifference p_err_abs; - Modelica.SIunits.Density dl_err_abs(min=-1e3) "Liquid density difference"; - Modelica.SIunits.Density dv_err_abs(min=-1e3) "Vapour density difference"; + Modelica.Units.SI.TemperatureDifference T_err_abs; + Modelica.Units.SI.PressureDifference p_err_abs; + Modelica.Units.SI.Density dl_err_abs(min=-1e3) "Liquid density difference"; + Modelica.Units.SI.Density dv_err_abs(min=-1e3) "Vapour density difference"; Modelica.Blocks.Sources.Ramp T_ramp( duration=8, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia master/Examples/Parameter/State_dT_parameter.mo" "converted-libraries/.openmodelica/libraries/HelmholtzMedia master/Examples/Parameter/State_dT_parameter.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia master/Examples/Parameter/State_dT_parameter.mo" 2022-03-10 09:57:36.684143960 +0000 +++ "converted-libraries/.openmodelica/libraries/HelmholtzMedia master/Examples/Parameter/State_dT_parameter.mo" 2022-03-10 09:57:53.412146079 +0000 @@ -22,7 +22,7 @@ Medium.IsentropicExponent gamma; Medium.VelocityOfSound a; Medium.DerTemperatureByPressure mu; - Modelica.SIunits.IsothermalCompressibility kappa; + Modelica.Units.SI.IsothermalCompressibility kappa; Medium.IsobaricExpansionCoefficient beta; Medium.DerEnthalpyByPressure delta_T; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia master/Examples/Parameter/State_pT_parameter_Transport.mo" "converted-libraries/.openmodelica/libraries/HelmholtzMedia master/Examples/Parameter/State_pT_parameter_Transport.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia master/Examples/Parameter/State_pT_parameter_Transport.mo" 2022-03-10 09:57:36.684143960 +0000 +++ "converted-libraries/.openmodelica/libraries/HelmholtzMedia master/Examples/Parameter/State_pT_parameter_Transport.mo" 2022-03-10 09:57:53.388146076 +0000 @@ -23,7 +23,7 @@ Medium.DynamicViscosity eta; //Medium.PrandtlNumber Pr; // more derived properties - Modelica.SIunits.IsothermalCompressibility kappa; + Modelica.Units.SI.IsothermalCompressibility kappa; Medium.IsobaricExpansionCoefficient beta; Medium.DerEnthalpyByPressure delta_T; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia master/Examples/Validation/CheckDerivativesMedium.mo" "converted-libraries/.openmodelica/libraries/HelmholtzMedia master/Examples/Validation/CheckDerivativesMedium.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia master/Examples/Validation/CheckDerivativesMedium.mo" 2022-03-10 09:57:36.684143960 +0000 +++ "converted-libraries/.openmodelica/libraries/HelmholtzMedia master/Examples/Validation/CheckDerivativesMedium.mo" 2022-03-10 09:57:53.288146063 +0000 @@ -7,7 +7,7 @@ parameter Medium.Temperature T0, T1; final parameter Medium.SpecificEnthalpy h0 = Medium.specificEnthalpy_pT(p0,T0); final parameter Medium.SpecificEnthalpy h1 = Medium.specificEnthalpy_pT(p0,T1); - final parameter Modelica.SIunits.Time dt=1; + final parameter Modelica.Units.SI.Time dt=1; final parameter Real dpdt = (p1-p0)/dt; final parameter Real dhdt = (h1-h0)/dt; @@ -20,8 +20,8 @@ Medium.Density d_p_diff = d_p - d_p_int; Medium.Density d_h_diff = d_h - d_h_int; - Modelica.SIunits.PerUnit d_p_err = d_p_diff/d_p; - Modelica.SIunits.PerUnit d_h_err = d_h_diff/d_h; + Modelica.Units.SI.PerUnit d_p_err = d_p_diff/d_p; + Modelica.Units.SI.PerUnit d_h_err = d_h_diff/d_h; Real ddph, ddhp; equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia master/Examples/Validation/CheckPartialDerivativesMedium.mo" "converted-libraries/.openmodelica/libraries/HelmholtzMedia master/Examples/Validation/CheckPartialDerivativesMedium.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia master/Examples/Validation/CheckPartialDerivativesMedium.mo" 2022-03-10 09:57:36.684143960 +0000 +++ "converted-libraries/.openmodelica/libraries/HelmholtzMedia master/Examples/Validation/CheckPartialDerivativesMedium.mo" 2022-03-10 09:57:53.272146062 +0000 @@ -9,7 +9,7 @@ constant Medium.SpecificEnthalpy HMIN= 250e3; constant Medium.SpecificEnthalpy HMAX = 350e3; Modelica.Blocks.Sources.Sine h_sine( - freqHz=100, + f =100, startTime=0, amplitude=(HMAX - HMIN)/2, offset=(HMAX - HMIN)/2 + HMIN) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia master/Examples/Validation/Derivatives_Helmholtz_Multiplied.mo" "converted-libraries/.openmodelica/libraries/HelmholtzMedia master/Examples/Validation/Derivatives_Helmholtz_Multiplied.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia master/Examples/Validation/Derivatives_Helmholtz_Multiplied.mo" 2022-03-10 09:57:36.684143960 +0000 +++ "converted-libraries/.openmodelica/libraries/HelmholtzMedia master/Examples/Validation/Derivatives_Helmholtz_Multiplied.mo" 2022-03-10 09:57:53.232146056 +0000 @@ -1,4 +1,4 @@ -within HelmholtzMedia.Examples.Validation; +within HelmholtzMedia.Examples.Validation; model Derivatives_Helmholtz_Multiplied // validate derivatives of Helmholtz energy (single phase state) // values for comparison are given by RefProp diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia master/Examples/Validation/MaxwellLoop.mo" "converted-libraries/.openmodelica/libraries/HelmholtzMedia master/Examples/Validation/MaxwellLoop.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia master/Examples/Validation/MaxwellLoop.mo" 2022-03-10 09:57:36.684143960 +0000 +++ "converted-libraries/.openmodelica/libraries/HelmholtzMedia master/Examples/Validation/MaxwellLoop.mo" 2022-03-10 09:57:52.964146022 +0000 @@ -4,7 +4,7 @@ parameter Medium.Temperature T=0.9*Tcrit; Medium.Density d; - Modelica.SIunits.SpecificVolume v=1/d; + Modelica.Units.SI.SpecificVolume v=1/d; Medium.ThermodynamicState state=Medium.setState_dTX(d=d, T=T); Medium.EoS.HelmholtzDerivs f=Medium.EoS.setHelmholtzDerivsThird(d=d, T=T, phase=1); Medium.AbsolutePressure p=Medium.EoS.p(f); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia master/Examples/Validation/ReferenceState.mo" "converted-libraries/.openmodelica/libraries/HelmholtzMedia master/Examples/Validation/ReferenceState.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia master/Examples/Validation/ReferenceState.mo" 2022-03-10 09:57:36.684143960 +0000 +++ "converted-libraries/.openmodelica/libraries/HelmholtzMedia master/Examples/Validation/ReferenceState.mo" 2022-03-10 09:57:52.952146021 +0000 @@ -1,4 +1,4 @@ -within HelmholtzMedia.Examples.Validation; +within HelmholtzMedia.Examples.Validation; model ReferenceState replaceable package Medium = HelmholtzMedia.HelmholtzFluids.Carbondioxide_Short; @@ -10,7 +10,7 @@ Medium.SpecificEntropy s_ref; protected - Modelica.SIunits.Time startTime; + Modelica.Units.SI.Time startTime; Medium.SaturationProperties sat; final constant Medium.Temperature T_IIR = 273.15; // 0°C; final constant Medium.Temperature T_ASHRAE = 233.15; // -40°C; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia master/Examples/Validation/idealGasLimit.mo" "converted-libraries/.openmodelica/libraries/HelmholtzMedia master/Examples/Validation/idealGasLimit.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia master/Examples/Validation/idealGasLimit.mo" 2022-03-10 09:57:36.684143960 +0000 +++ "converted-libraries/.openmodelica/libraries/HelmholtzMedia master/Examples/Validation/idealGasLimit.mo" 2022-03-10 09:57:52.900146014 +0000 @@ -3,7 +3,7 @@ replaceable package Medium = HelmholtzFluids.Helium; parameter Medium.Temperature T=298.15; - Modelica.SIunits.SpecificVolume v; + Modelica.Units.SI.SpecificVolume v; Medium.Density d=1/v; Medium.ThermodynamicState state = Medium.setState_dT(d=d, T=T, phase=1); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia master/Interfaces/PartialHelmholtzMedium/Ancillary/bubbleDensity_T.mo" "converted-libraries/.openmodelica/libraries/HelmholtzMedia master/Interfaces/PartialHelmholtzMedium/Ancillary/bubbleDensity_T.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia master/Interfaces/PartialHelmholtzMedium/Ancillary/bubbleDensity_T.mo" 2022-03-10 09:57:36.684143960 +0000 +++ "converted-libraries/.openmodelica/libraries/HelmholtzMedia master/Interfaces/PartialHelmholtzMedium/Ancillary/bubbleDensity_T.mo" 2022-03-10 09:57:52.504145964 +0000 @@ -2,8 +2,8 @@ function bubbleDensity_T "ancillary function: calculate density of saturated liquid for a given T" - input Modelica.SIunits.Temperature T; - output Modelica.SIunits.Density dliq; + input Modelica.Units.SI.Temperature T; + output Modelica.Units.SI.Density dliq; protected DensityLiquidModel densityLiquidModel=ancillaryCoefficients.densityLiquidModel; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia master/Interfaces/PartialHelmholtzMedium/Ancillary/dewDensity_T.mo" "converted-libraries/.openmodelica/libraries/HelmholtzMedia master/Interfaces/PartialHelmholtzMedium/Ancillary/dewDensity_T.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia master/Interfaces/PartialHelmholtzMedium/Ancillary/dewDensity_T.mo" 2022-03-10 09:57:36.684143960 +0000 +++ "converted-libraries/.openmodelica/libraries/HelmholtzMedia master/Interfaces/PartialHelmholtzMedium/Ancillary/dewDensity_T.mo" 2022-03-10 09:57:52.472145960 +0000 @@ -2,8 +2,8 @@ function dewDensity_T "ancillary function: calculate density of saturated vapor for a given T" - input Modelica.SIunits.Temperature T; - output Modelica.SIunits.Density dvap; + input Modelica.Units.SI.Temperature T; + output Modelica.Units.SI.Density dvap; protected DensityVaporModel densityVaporModel=ancillaryCoefficients.densityVaporModel; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia master/Interfaces/PartialHelmholtzMedium/Ancillary/saturationPressure_T.mo" "converted-libraries/.openmodelica/libraries/HelmholtzMedia master/Interfaces/PartialHelmholtzMedium/Ancillary/saturationPressure_T.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia master/Interfaces/PartialHelmholtzMedium/Ancillary/saturationPressure_T.mo" 2022-03-10 09:57:36.688143959 +0000 +++ "converted-libraries/.openmodelica/libraries/HelmholtzMedia master/Interfaces/PartialHelmholtzMedium/Ancillary/saturationPressure_T.mo" 2022-03-10 09:57:52.424145955 +0000 @@ -1,8 +1,8 @@ within HelmholtzMedia.Interfaces.PartialHelmholtzMedium.Ancillary; function saturationPressure_T "ancillary function: calculate saturation pressure for a given Temperature" - input Modelica.SIunits.Temperature T; - output Modelica.SIunits.AbsolutePressure p; + input Modelica.Units.SI.Temperature T; + output Modelica.Units.SI.AbsolutePressure p; protected constant Temperature T_crit=fluidConstants[1].criticalTemperature; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia master/Interfaces/PartialHelmholtzMedium/Ancillary/saturationTemperature_d.mo" "converted-libraries/.openmodelica/libraries/HelmholtzMedia master/Interfaces/PartialHelmholtzMedium/Ancillary/saturationTemperature_d.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia master/Interfaces/PartialHelmholtzMedium/Ancillary/saturationTemperature_d.mo" 2022-03-10 09:57:36.688143959 +0000 +++ "converted-libraries/.openmodelica/libraries/HelmholtzMedia master/Interfaces/PartialHelmholtzMedium/Ancillary/saturationTemperature_d.mo" 2022-03-10 09:57:52.404145951 +0000 @@ -2,8 +2,8 @@ function saturationTemperature_d "ancillary iterative function: calculate saturation temperature for a given density by iterating the ancillary function" - input Modelica.SIunits.Density d; - output Modelica.SIunits.Temperature T; + input Modelica.Units.SI.Density d; + output Modelica.Units.SI.Temperature T; protected constant MolarMass MM = fluidConstants[1].molarMass; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia master/Interfaces/PartialHelmholtzMedium/Ancillary/saturationTemperature_h_liq.mo" "converted-libraries/.openmodelica/libraries/HelmholtzMedia master/Interfaces/PartialHelmholtzMedium/Ancillary/saturationTemperature_h_liq.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia master/Interfaces/PartialHelmholtzMedium/Ancillary/saturationTemperature_h_liq.mo" 2022-03-10 09:57:36.688143959 +0000 +++ "converted-libraries/.openmodelica/libraries/HelmholtzMedia master/Interfaces/PartialHelmholtzMedium/Ancillary/saturationTemperature_h_liq.mo" 2022-03-10 09:57:52.388145950 +0000 @@ -2,8 +2,8 @@ function saturationTemperature_h_liq "ancillary iterative function: calculate saturation temperature for a given enthalpy by iterating the ancillary function" - input Modelica.SIunits.SpecificEnthalpy h; - output Modelica.SIunits.Temperature T; + input Modelica.Units.SI.SpecificEnthalpy h; + output Modelica.Units.SI.Temperature T; protected constant Temperature T_trip=fluidConstants[1].triplePointTemperature; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia master/Interfaces/PartialHelmholtzMedium/Ancillary/saturationTemperature_p.mo" "converted-libraries/.openmodelica/libraries/HelmholtzMedia master/Interfaces/PartialHelmholtzMedium/Ancillary/saturationTemperature_p.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia master/Interfaces/PartialHelmholtzMedium/Ancillary/saturationTemperature_p.mo" 2022-03-10 09:57:36.688143959 +0000 +++ "converted-libraries/.openmodelica/libraries/HelmholtzMedia master/Interfaces/PartialHelmholtzMedium/Ancillary/saturationTemperature_p.mo" 2022-03-10 09:57:52.376145948 +0000 @@ -2,8 +2,8 @@ function saturationTemperature_p "ancillary iterative function: calculate saturation temperature for a given pressure by iterating the ancillary function" - input Modelica.SIunits.AbsolutePressure p; - output Modelica.SIunits.Temperature T; + input Modelica.Units.SI.AbsolutePressure p; + output Modelica.Units.SI.Temperature T; protected constant Temperature T_trip=fluidConstants[1].triplePointTemperature; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia master/Interfaces/PartialHelmholtzMedium/Ancillary/saturationTemperature_s_liq.mo" "converted-libraries/.openmodelica/libraries/HelmholtzMedia master/Interfaces/PartialHelmholtzMedium/Ancillary/saturationTemperature_s_liq.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia master/Interfaces/PartialHelmholtzMedium/Ancillary/saturationTemperature_s_liq.mo" 2022-03-10 09:57:36.688143959 +0000 +++ "converted-libraries/.openmodelica/libraries/HelmholtzMedia master/Interfaces/PartialHelmholtzMedium/Ancillary/saturationTemperature_s_liq.mo" 2022-03-10 09:57:52.364145946 +0000 @@ -2,8 +2,8 @@ function saturationTemperature_s_liq "ancillary iterative function: calculate saturation temperature for a given entropy by iterating the ancillary function" - input Modelica.SIunits.SpecificEntropy s; - output Modelica.SIunits.Temperature T; + input Modelica.Units.SI.SpecificEntropy s; + output Modelica.Units.SI.Temperature T; protected constant Temperature T_trip=fluidConstants[1].triplePointTemperature; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia master/Interfaces/PartialHelmholtzMedium/Transport/dynamicViscosity.mo" "converted-libraries/.openmodelica/libraries/HelmholtzMedia master/Interfaces/PartialHelmholtzMedium/Transport/dynamicViscosity.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia master/Interfaces/PartialHelmholtzMedium/Transport/dynamicViscosity.mo" 2022-03-10 09:57:36.688143959 +0000 +++ "converted-libraries/.openmodelica/libraries/HelmholtzMedia master/Interfaces/PartialHelmholtzMedium/Transport/dynamicViscosity.mo" 2022-03-10 09:57:51.648145856 +0000 @@ -1,4 +1,4 @@ -within HelmholtzMedia.Interfaces.PartialHelmholtzMedium.Transport; +within HelmholtzMedia.Interfaces.PartialHelmholtzMedium.Transport; function dynamicViscosity "Returns dynamic Viscosity" input ThermodynamicState state; output DynamicViscosity eta; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia master/Interfaces/PartialHelmholtzMedium/package.mo" "converted-libraries/.openmodelica/libraries/HelmholtzMedia master/Interfaces/PartialHelmholtzMedium/package.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia master/Interfaces/PartialHelmholtzMedium/package.mo" 2022-03-10 09:57:36.688143959 +0000 +++ "converted-libraries/.openmodelica/libraries/HelmholtzMedia master/Interfaces/PartialHelmholtzMedium/package.mo" 2022-03-10 09:57:51.176145796 +0000 @@ -72,7 +72,7 @@ equation MM = fluidConstants[1].molarMass; - R = Modelica.Constants.R/MM; + R_s = Modelica.Constants.R/MM; // use functions to calculate properties if (componentInputChoice == InputChoice.ph) then @@ -1934,4 +1934,5 @@ annotation ( inverse(s=specificEntropy_ph(p=p, h=h, phase=phase))); end specificEnthalpy_ps; + end PartialHelmholtzMedium; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia master/openmodelica.metadata.json" "converted-libraries/.openmodelica/libraries/HelmholtzMedia master/openmodelica.metadata.json" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia master/openmodelica.metadata.json" 2022-03-10 09:57:36.688143959 +0000 +++ "converted-libraries/.openmodelica/libraries/HelmholtzMedia master/openmodelica.metadata.json" 2022-03-10 09:57:53.844146133 +0000 @@ -1 +1 @@ -{"path":"HelmholtzMedia", "sha":"258c87e6ad7e7e75636cfd425c5e9e8f36977876", "support":"noSupport", "uses":{"Modelica":"3.2.3"}, "version":"master", "zipfile":"https://github.com/thorade/HelmholtzMedia/archive/258c87e6ad7e7e75636cfd425c5e9e8f36977876.zip"} +{"path": "HelmholtzMedia", "sha": "258c87e6ad7e7e75636cfd425c5e9e8f36977876", "support": "noSupport", "uses": {"Modelica": "4.0.0"}, "version": "master", "zipfile": "https://github.com/thorade/HelmholtzMedia/archive/258c87e6ad7e7e75636cfd425c5e9e8f36977876.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/HelmholtzMedia master/package.mo" "converted-libraries/.openmodelica/libraries/HelmholtzMedia master/package.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia master/package.mo" 2022-03-10 09:57:36.688143959 +0000 +++ "converted-libraries/.openmodelica/libraries/HelmholtzMedia master/package.mo" 2022-03-10 09:57:53.840146134 +0000 @@ -5,5 +5,5 @@ - annotation (uses(Modelica(version="3.2.3"))); + annotation (uses(Modelica(version= "4.0.0"))); end HelmholtzMedia;