diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Examples/BaseProps_sweep.mo" "converted-libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Examples/BaseProps_sweep.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Examples/BaseProps_sweep.mo" 2022-03-10 09:57:41.996144632 +0000 +++ "converted-libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Examples/BaseProps_sweep.mo" 2022-03-10 09:58:01.096147053 +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 0.9.8/Examples/ConvergenceTest/Ancillary_StartValues.mo" "converted-libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Examples/ConvergenceTest/Ancillary_StartValues.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Examples/ConvergenceTest/Ancillary_StartValues.mo" 2022-03-10 09:57:41.996144632 +0000 +++ "converted-libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Examples/ConvergenceTest/Ancillary_StartValues.mo" 2022-03-10 09:58:01.060147048 +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 0.9.8/Examples/ConvergenceTest/SinglePhase_Transport.mo" "converted-libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Examples/ConvergenceTest/SinglePhase_Transport.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Examples/ConvergenceTest/SinglePhase_Transport.mo" 2022-03-10 09:57:41.996144632 +0000 +++ "converted-libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Examples/ConvergenceTest/SinglePhase_Transport.mo" 2022-03-10 09:58:01.028147044 +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 0.9.8/Examples/ConvergenceTest/SinglePhase_setState_a.mo" "converted-libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Examples/ConvergenceTest/SinglePhase_setState_a.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Examples/ConvergenceTest/SinglePhase_setState_a.mo" 2022-03-10 09:57:41.996144632 +0000 +++ "converted-libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Examples/ConvergenceTest/SinglePhase_setState_a.mo" 2022-03-10 09:58:01.016147042 +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 0.9.8/Examples/ConvergenceTest/SinglePhase_setState_b.mo" "converted-libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Examples/ConvergenceTest/SinglePhase_setState_b.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Examples/ConvergenceTest/SinglePhase_setState_b.mo" 2022-03-10 09:57:41.996144632 +0000 +++ "converted-libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Examples/ConvergenceTest/SinglePhase_setState_b.mo" 2022-03-10 09:58:01.008147042 +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 0.9.8/Examples/ConvergenceTest/SinglePhase_setState_b_Water.mo" "converted-libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Examples/ConvergenceTest/SinglePhase_setState_b_Water.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Examples/ConvergenceTest/SinglePhase_setState_b_Water.mo" 2022-03-10 09:57:41.996144632 +0000 +++ "converted-libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Examples/ConvergenceTest/SinglePhase_setState_b_Water.mo" 2022-03-10 09:58:00.984147038 +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 0.9.8/Examples/Parameter/State_dT_parameter.mo" "converted-libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Examples/Parameter/State_dT_parameter.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Examples/Parameter/State_dT_parameter.mo" 2022-03-10 09:57:41.996144632 +0000 +++ "converted-libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Examples/Parameter/State_dT_parameter.mo" 2022-03-10 09:58:00.748147009 +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 0.9.8/Examples/Parameter/State_pT_parameter_Transport.mo" "converted-libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Examples/Parameter/State_pT_parameter_Transport.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Examples/Parameter/State_pT_parameter_Transport.mo" 2022-03-10 09:57:41.996144632 +0000 +++ "converted-libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Examples/Parameter/State_pT_parameter_Transport.mo" 2022-03-10 09:58:00.708147003 +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 0.9.8/Examples/Tests/Validation/checkReferenceState.mo" "converted-libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Examples/Tests/Validation/checkReferenceState.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Examples/Tests/Validation/checkReferenceState.mo" 2022-03-10 09:57:42.000144634 +0000 +++ "converted-libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Examples/Tests/Validation/checkReferenceState.mo" 2022-03-10 09:57:56.316146448 +0000 @@ -6,8 +6,8 @@ protected Medium.SaturationProperties sat; - final constant Medium.Temperature T_IIR = 273.15; // 0°C; - final constant Medium.Temperature T_ASHRAE = 233.15; // -40°C; + final constant Medium.Temperature T_IIR = 273.15; // 0°C; + final constant Medium.Temperature T_ASHRAE = 233.15; // -40°C; final constant Medium.AbsolutePressure p_NBP = 101325; // 1.01325 bar = 1 atm algorithm @@ -29,10 +29,10 @@
at p=1 atm = 1.01325 bar and saturated liquid set h=0 kJ/kg and s=0 kJ/kgK
International Institute of Refrigeration (IIR)
-
at T=0°C and saturated liquid set h=200 kJ/kg and s=1 kJ/kgK
+
at T=0°C and saturated liquid set h=200 kJ/kg and s=1 kJ/kgK
American Society of Heating, Refrigerating and Air-Conditioning Engineers (ASHRAE)
-
at T=-40°C and saturated liquid set h=0 kJ/kg and s=0 kJ/kgK
+
at T=-40°C and saturated liquid set h=0 kJ/kg and s=0 kJ/kgK
"), diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Examples/Validation/CheckDerivativesMedium.mo" "converted-libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Examples/Validation/CheckDerivativesMedium.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Examples/Validation/CheckDerivativesMedium.mo" 2022-03-10 09:57:42.000144634 +0000 +++ "converted-libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Examples/Validation/CheckDerivativesMedium.mo" 2022-03-10 09:58:00.620146992 +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 0.9.8/Examples/Validation/Derivatives_Helmholtz.mo" "converted-libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Examples/Validation/Derivatives_Helmholtz.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Examples/Validation/Derivatives_Helmholtz.mo" 2022-03-10 09:57:42.000144634 +0000 +++ "converted-libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Examples/Validation/Derivatives_Helmholtz.mo" 2022-03-10 09:58:00.564146985 +0000 @@ -1,4 +1,4 @@ -within HelmholtzMedia.Examples.Validation; +within HelmholtzMedia.Examples.Validation; model Derivatives_Helmholtz // validate derivatives of Helmholtz energy (single phase state) // values for comparison are given in IAPWS-95 (Table 6) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Examples/Validation/Derivatives_Helmholtz_Multiplied.mo" "converted-libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Examples/Validation/Derivatives_Helmholtz_Multiplied.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Examples/Validation/Derivatives_Helmholtz_Multiplied.mo" 2022-03-10 09:57:42.000144634 +0000 +++ "converted-libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Examples/Validation/Derivatives_Helmholtz_Multiplied.mo" 2022-03-10 09:58:00.540146983 +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 0.9.8/Examples/Validation/ReferenceState.mo" "converted-libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Examples/Validation/ReferenceState.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Examples/Validation/ReferenceState.mo" 2022-03-10 09:57:42.000144634 +0000 +++ "converted-libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Examples/Validation/ReferenceState.mo" 2022-03-10 09:58:00.280146949 +0000 @@ -1,4 +1,4 @@ -within HelmholtzMedia.Examples.Validation; +within HelmholtzMedia.Examples.Validation; model ReferenceState replaceable package Medium = HelmholtzMedia.HelmholtzFluids.Carbondioxide; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Examples/Validation/idealGasLimit.mo" "converted-libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Examples/Validation/idealGasLimit.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Examples/Validation/idealGasLimit.mo" 2022-03-10 09:57:42.000144634 +0000 +++ "converted-libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Examples/Validation/idealGasLimit.mo" 2022-03-10 09:58:00.228146942 +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 0.9.8/Interfaces/PartialHelmholtzMedium/Ancillary/bubbleDensity_T.mo" "converted-libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Interfaces/PartialHelmholtzMedium/Ancillary/bubbleDensity_T.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Interfaces/PartialHelmholtzMedium/Ancillary/bubbleDensity_T.mo" 2022-03-10 09:57:42.000144634 +0000 +++ "converted-libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Interfaces/PartialHelmholtzMedium/Ancillary/bubbleDensity_T.mo" 2022-03-10 09:57:59.836146893 +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 0.9.8/Interfaces/PartialHelmholtzMedium/Ancillary/dewDensity_T.mo" "converted-libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Interfaces/PartialHelmholtzMedium/Ancillary/dewDensity_T.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Interfaces/PartialHelmholtzMedium/Ancillary/dewDensity_T.mo" 2022-03-10 09:57:42.000144634 +0000 +++ "converted-libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Interfaces/PartialHelmholtzMedium/Ancillary/dewDensity_T.mo" 2022-03-10 09:57:59.800146888 +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 0.9.8/Interfaces/PartialHelmholtzMedium/Ancillary/saturationPressure_T.mo" "converted-libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Interfaces/PartialHelmholtzMedium/Ancillary/saturationPressure_T.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Interfaces/PartialHelmholtzMedium/Ancillary/saturationPressure_T.mo" 2022-03-10 09:57:42.000144634 +0000 +++ "converted-libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Interfaces/PartialHelmholtzMedium/Ancillary/saturationPressure_T.mo" 2022-03-10 09:57:59.760146883 +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 0.9.8/Interfaces/PartialHelmholtzMedium/Ancillary/saturationTemperature_d.mo" "converted-libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Interfaces/PartialHelmholtzMedium/Ancillary/saturationTemperature_d.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Interfaces/PartialHelmholtzMedium/Ancillary/saturationTemperature_d.mo" 2022-03-10 09:57:42.000144634 +0000 +++ "converted-libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Interfaces/PartialHelmholtzMedium/Ancillary/saturationTemperature_d.mo" 2022-03-10 09:57:59.736146880 +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 0.9.8/Interfaces/PartialHelmholtzMedium/Ancillary/saturationTemperature_h_liq.mo" "converted-libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Interfaces/PartialHelmholtzMedium/Ancillary/saturationTemperature_h_liq.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Interfaces/PartialHelmholtzMedium/Ancillary/saturationTemperature_h_liq.mo" 2022-03-10 09:57:42.000144634 +0000 +++ "converted-libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Interfaces/PartialHelmholtzMedium/Ancillary/saturationTemperature_h_liq.mo" 2022-03-10 09:57:59.716146878 +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 0.9.8/Interfaces/PartialHelmholtzMedium/Ancillary/saturationTemperature_p.mo" "converted-libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Interfaces/PartialHelmholtzMedium/Ancillary/saturationTemperature_p.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Interfaces/PartialHelmholtzMedium/Ancillary/saturationTemperature_p.mo" 2022-03-10 09:57:42.000144634 +0000 +++ "converted-libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Interfaces/PartialHelmholtzMedium/Ancillary/saturationTemperature_p.mo" 2022-03-10 09:57:59.700146877 +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 0.9.8/Interfaces/PartialHelmholtzMedium/Ancillary/saturationTemperature_s_liq.mo" "converted-libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Interfaces/PartialHelmholtzMedium/Ancillary/saturationTemperature_s_liq.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Interfaces/PartialHelmholtzMedium/Ancillary/saturationTemperature_s_liq.mo" 2022-03-10 09:57:42.000144634 +0000 +++ "converted-libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Interfaces/PartialHelmholtzMedium/Ancillary/saturationTemperature_s_liq.mo" 2022-03-10 09:57:59.680146873 +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 0.9.8/Interfaces/PartialHelmholtzMedium/Transport/dynamicViscosity.mo" "converted-libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Interfaces/PartialHelmholtzMedium/Transport/dynamicViscosity.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Interfaces/PartialHelmholtzMedium/Transport/dynamicViscosity.mo" 2022-03-10 09:57:42.000144634 +0000 +++ "converted-libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Interfaces/PartialHelmholtzMedium/Transport/dynamicViscosity.mo" 2022-03-10 09:57:58.964146782 +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 0.9.8/Interfaces/PartialHelmholtzMedium/package.mo" "converted-libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Interfaces/PartialHelmholtzMedium/package.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Interfaces/PartialHelmholtzMedium/package.mo" 2022-03-10 09:57:42.004144633 +0000 +++ "converted-libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Interfaces/PartialHelmholtzMedium/package.mo" 2022-03-10 09:57:58.452146718 +0000 @@ -76,7 +76,7 @@ equation MM = fluidConstants[1].molarMass; - R = fluidConstants[1].gasConstant/MM; + R_s = fluidConstants[1].gasConstant/MM; // use functions to calculate properties if (componentInputChoice == InputChoice.ph) then @@ -1994,4 +1994,5 @@ 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 0.9.8/Interfaces/Types/myFluidConstants.mo" "converted-libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Interfaces/Types/myFluidConstants.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Interfaces/Types/myFluidConstants.mo" 2022-03-10 09:57:42.004144633 +0000 +++ "converted-libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/Interfaces/Types/myFluidConstants.mo" 2022-03-10 09:57:57.424146587 +0000 @@ -1,5 +1,5 @@ within HelmholtzMedia.Interfaces.Types; record myFluidConstants extends HelmholtzMedia.Interfaces.Types.TwoPhase.FluidConstants; - Modelica.SIunits.MolarHeatCapacity gasConstant= Modelica.Constants.R; + Modelica.Units.SI.MolarHeatCapacity gasConstant= Modelica.Constants.R; end myFluidConstants; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/openmodelica.metadata.json" "converted-libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/openmodelica.metadata.json" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/openmodelica.metadata.json" 2022-03-10 09:57:42.004144633 +0000 +++ "converted-libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/openmodelica.metadata.json" 2022-03-10 09:58:01.120147055 +0000 @@ -1 +1 @@ -{"path":"HelmholtzMedia", "sha":"753273b48975d76f6827bbd1ad69066f10f5c3bd", "support":"support", "uses":{"Modelica":"3.2.2"}, "version":"0.9.8", "zipfile":"https://github.com/thorade/HelmholtzMedia/archive/753273b48975d76f6827bbd1ad69066f10f5c3bd.zip"} +{"path": "HelmholtzMedia", "sha": "753273b48975d76f6827bbd1ad69066f10f5c3bd", "support": "support", "uses": {"Modelica": "4.0.0"}, "version": "0.9.8", "zipfile": "https://github.com/thorade/HelmholtzMedia/archive/753273b48975d76f6827bbd1ad69066f10f5c3bd.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 0.9.8/package.mo" "converted-libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/package.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/package.mo" 2022-03-10 09:57:42.004144633 +0000 +++ "converted-libraries/.openmodelica/libraries/HelmholtzMedia 0.9.8/package.mo" 2022-03-10 09:58:01.116147056 +0000 @@ -5,5 +5,5 @@ - annotation (uses(Modelica(version="3.2.2"))); + annotation (uses(Modelica(version= "4.0.0"))); end HelmholtzMedia;