This is a partial model for models that describe the bi-directional diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Airflow/Multizone/BaseClasses/powerLaw.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Airflow/Multizone/BaseClasses/powerLaw.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Airflow/Multizone/BaseClasses/powerLaw.mo" 2022-03-10 09:57:42.044144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Airflow/Multizone/BaseClasses/powerLaw.mo" 2022-03-10 09:58:23.668149912 +0000 @@ -1,13 +1,13 @@ within IBPSA.Airflow.Multizone.BaseClasses; function powerLaw "Power law used in orifice equations" input Real k "Flow coefficient, k = V_flow/ dp^m"; - input Modelica.SIunits.PressureDifference dp(displayUnit="Pa") "Pressure difference"; + input Modelica.Units.SI.PressureDifference dp(displayUnit="Pa") "Pressure difference"; input Real m(min=0.5, max=1) "Flow exponent, m=0.5 for turbulent, m=1 for laminar"; - input Modelica.SIunits.PressureDifference dp_turbulent(min=0, + input Modelica.Units.SI.PressureDifference dp_turbulent(min=0, displayUnit="Pa")=0.001 "Pressure difference where regularization starts"; - output Modelica.SIunits.VolumeFlowRate V_flow "Volume flow rate"; + output Modelica.Units.SI.VolumeFlowRate V_flow "Volume flow rate"; protected constant Real gamma(min=1) = 1.5 "Normalized flow rate where dphi(0)/dpi intersects phi(1)"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Airflow/Multizone/BaseClasses/powerLawFixedM.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Airflow/Multizone/BaseClasses/powerLawFixedM.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Airflow/Multizone/BaseClasses/powerLawFixedM.mo" 2022-03-10 09:57:42.044144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Airflow/Multizone/BaseClasses/powerLawFixedM.mo" 2022-03-10 09:58:23.652149910 +0000 @@ -2,16 +2,16 @@ function powerLawFixedM "Power law used in orifice equations when m is constant" input Real k "Flow coefficient, k = V_flow/ dp^m"; - input Modelica.SIunits.PressureDifference dp(displayUnit="Pa") "Pressure difference"; + input Modelica.Units.SI.PressureDifference dp(displayUnit="Pa") "Pressure difference"; input Real m(min=0.5, max=1) "Flow exponent, m=0.5 for turbulent, m=1 for laminar"; input Real a "Polynomial coefficient"; input Real b "Polynomial coefficient"; input Real c "Polynomial coefficient"; input Real d "Polynomial coefficient"; - input Modelica.SIunits.PressureDifference dp_turbulent(min=0)=0.001 + input Modelica.Units.SI.PressureDifference dp_turbulent(min=0)=0.001 "Pressure difference where regularization starts"; - output Modelica.SIunits.VolumeFlowRate V_flow "Volume flow rate"; + output Modelica.Units.SI.VolumeFlowRate V_flow "Volume flow rate"; protected constant Real gamma(min=1) = 1.5 "Normalized flow rate where dphi(0)/dpi intersects phi(1)"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Airflow/Multizone/BaseClasses/windPressureLowRise.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Airflow/Multizone/BaseClasses/windPressureLowRise.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Airflow/Multizone/BaseClasses/windPressureLowRise.mo" 2022-03-10 09:57:42.044144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Airflow/Multizone/BaseClasses/windPressureLowRise.mo" 2022-03-10 09:58:23.640149908 +0000 @@ -2,24 +2,24 @@ function windPressureLowRise "Wind pressure coefficient for low-rise buildings" input Real Cp0(min=0) "Wind pressure coefficient for normal wind incidence angle"; - input Modelica.SIunits.Angle incAng + input Modelica.Units.SI.Angle incAng "Wind incidence angle (0: normal to wall)"; input Real G "Natural logarithm of side ratio"; output Real Cp "Wind pressure coefficient"; protected - constant Modelica.SIunits.Angle pi2 = 2*Modelica.Constants.pi; - constant Modelica.SIunits.Angle aRDel = 5*Modelica.Constants.pi/180 + constant Modelica.Units.SI.Angle pi2 = 2*Modelica.Constants.pi; + constant Modelica.Units.SI.Angle aRDel = 5*Modelica.Constants.pi/180 "Lower bound where transition occurs"; - constant Modelica.SIunits.Angle aRDel2 = aRDel/2 + constant Modelica.Units.SI.Angle aRDel2 = aRDel/2 "Half-width of transition interval"; - constant Modelica.SIunits.Angle aRMax = 175*Modelica.Constants.pi/180 + constant Modelica.Units.SI.Angle aRMax = 175*Modelica.Constants.pi/180 "Upper bound where transition occurs"; Real a180 = Modelica.Math.log(1.248 - 0.703 + 0.131*Modelica.Math.sin(2*Modelica.Constants.pi*G)^3 + 0.071*G^2) "Attenuation factor at 180 degree incidence angle"; - Modelica.SIunits.Angle aR "alpha, restricted to 0...pi"; - Modelica.SIunits.Angle incAng2 "0.5*wind incidence angle"; + Modelica.Units.SI.Angle aR "alpha, restricted to 0...pi"; + Modelica.Units.SI.Angle incAng2 "0.5*wind incidence angle"; Real sinA2 "=sin(alpha/2)"; Real cosA2 "=cos(alpha/2)"; Real a "Attenuation factor"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Airflow/Multizone/DoorDiscretizedOperable.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Airflow/Multizone/DoorDiscretizedOperable.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Airflow/Multizone/DoorDiscretizedOperable.mo" 2022-03-10 09:57:42.044144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Airflow/Multizone/DoorDiscretizedOperable.mo" 2022-03-10 09:58:23.612149905 +0000 @@ -3,7 +3,7 @@ "Door model using discretization along height coordinate" extends IBPSA.Airflow.Multizone.BaseClasses.DoorDiscretized; - parameter Modelica.SIunits.PressureDifference dpCloRat(min=0, + parameter Modelica.Units.SI.PressureDifference dpCloRat(min=0, displayUnit="Pa") = 4 "Pressure drop at rating condition of closed door" annotation (Dialog(group="Rating conditions")); @@ -12,7 +12,7 @@ "Discharge coefficient at rating conditions of closed door" annotation (Dialog(group="Rating conditions")); - parameter Modelica.SIunits.Area LClo(min=0) + parameter Modelica.Units.SI.Area LClo(min=0) "Effective leakage area of closed door" annotation (Dialog(group="Closed door")); @@ -30,8 +30,8 @@ "Opening signal, 0=closed, 1=open" annotation (Placement(transformation(extent={{-120,-10},{-100,10}}), iconTransformation(extent={{-120,-10},{-100,10}}))); protected - parameter Modelica.SIunits.Area AOpe=wOpe*hOpe "Open aperture area"; - parameter Modelica.SIunits.Area AClo(fixed=false) "Closed aperture area"; + parameter Modelica.Units.SI.Area AOpe=wOpe*hOpe "Open aperture area"; + parameter Modelica.Units.SI.Area AClo(fixed=false) "Closed aperture area"; Real kOpe "Open aperture flow coefficient, k = V_flow/ dp^m"; Real kClo "Closed aperture flow coefficient, k = V_flow/ dp^m"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Airflow/Multizone/EffectiveAirLeakageArea.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Airflow/Multizone/EffectiveAirLeakageArea.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Airflow/Multizone/EffectiveAirLeakageArea.mo" 2022-03-10 09:57:42.044144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Airflow/Multizone/EffectiveAirLeakageArea.mo" 2022-03-10 09:58:23.592149902 +0000 @@ -4,7 +4,7 @@ m=0.65, final k=L * CDRat * sqrt(2.0/rho_default) * dpRat^(0.5-m)); - parameter Modelica.SIunits.PressureDifference dpRat( + parameter Modelica.Units.SI.PressureDifference dpRat( min=0, displayUnit="Pa") = 4 "Pressure drop" annotation (Dialog(group="Rating conditions")); @@ -13,8 +13,8 @@ max=1) = 1 "Discharge coefficient" annotation (Dialog(group="Rating conditions")); - parameter Modelica.SIunits.Area L(min=0) "Effective leakage area"; + parameter Modelica.Units.SI.Area L(min=0) "Effective leakage area"; equation v = V_flow/L; annotation (Icon(graphics={ diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Airflow/Multizone/Examples/ClosedDoors.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Airflow/Multizone/Examples/ClosedDoors.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Airflow/Multizone/Examples/ClosedDoors.mo" 2022-03-10 09:57:42.044144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Airflow/Multizone/Examples/ClosedDoors.mo" 2022-03-10 09:58:23.504149891 +0000 @@ -27,7 +27,7 @@ annotation (Placement(transformation(extent={{40,40},{60,60}}))); Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow PrescribedHeatFlow1 annotation (Placement(transformation(extent={{4,40},{24,60}}))); - Modelica.Blocks.Sources.Sine Sine1(freqHz=1/3600) annotation (Placement( + Modelica.Blocks.Sources.Sine Sine1(f =1/3600) annotation (Placement( transformation(extent={{-68,40},{-48,60}}))); Modelica.Blocks.Math.Gain Gain1(k=100) annotation (Placement(transformation( extent={{-28,40},{-8,60}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Airflow/Multizone/Examples/OneEffectiveAirLeakageArea.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Airflow/Multizone/Examples/OneEffectiveAirLeakageArea.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Airflow/Multizone/Examples/OneEffectiveAirLeakageArea.mo" 2022-03-10 09:57:42.044144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Airflow/Multizone/Examples/OneEffectiveAirLeakageArea.mo" 2022-03-10 09:58:23.472149887 +0000 @@ -21,7 +21,7 @@ annotation (Placement(transformation(extent={{70,20},{90,40}}))); Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow preHeaFlo annotation (Placement(transformation(extent={{0,20},{20,40}}))); - Modelica.Blocks.Sources.Sine Sine1(freqHz=1/3600) annotation (Placement( + Modelica.Blocks.Sources.Sine Sine1(f =1/3600) annotation (Placement( transformation(extent={{-80,20},{-60,40}}))); Modelica.Blocks.Math.Gain Gain1(k=100) annotation (Placement(transformation( extent={{-40,20},{-20,40}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Airflow/Multizone/Examples/OneOpenDoor.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Airflow/Multizone/Examples/OneOpenDoor.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Airflow/Multizone/Examples/OneOpenDoor.mo" 2022-03-10 09:57:42.044144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Airflow/Multizone/Examples/OneOpenDoor.mo" 2022-03-10 09:58:23.448149884 +0000 @@ -26,7 +26,7 @@ annotation (Placement(transformation(extent={{60,60},{80,80}}))); Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow preHeaFlo annotation (Placement(transformation(extent={{14,60},{34,80}}))); - Modelica.Blocks.Sources.Sine heaSou(freqHz=1/3600) annotation (Placement( + Modelica.Blocks.Sources.Sine heaSou(f =1/3600) annotation (Placement( transformation(extent={{-60,60},{-40,80}}))); Modelica.Blocks.Math.Gain Gain1(k=100) annotation (Placement(transformation( extent={{-20,60},{0,80}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Airflow/Multizone/Examples/ZonalFlow.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Airflow/Multizone/Examples/ZonalFlow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Airflow/Multizone/Examples/ZonalFlow.mo" 2022-03-10 09:57:42.044144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Airflow/Multizone/Examples/ZonalFlow.mo" 2022-03-10 09:58:23.304149866 +0000 @@ -2,8 +2,8 @@ model ZonalFlow "Model with prescribed air exchange between two volumes" extends Modelica.Icons.Example; package Medium = IBPSA.Media.Air; - parameter Modelica.SIunits.Volume volA=100 "Volume of room A"; - parameter Modelica.SIunits.Volume volB=1 "Volume of room B"; + parameter Modelica.Units.SI.Volume volA=100 "Volume of room A"; + parameter Modelica.Units.SI.Volume volB=1 "Volume of room B"; IBPSA.Fluid.MixingVolumes.MixingVolume rooA( V=volA, redeclare package Medium = Medium, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Airflow/Multizone/MediumColumn.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Airflow/Multizone/MediumColumn.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Airflow/Multizone/MediumColumn.mo" 2022-03-10 09:57:42.044144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Airflow/Multizone/MediumColumn.mo" 2022-03-10 09:58:23.292149864 +0000 @@ -5,7 +5,7 @@ replaceable package Medium = Modelica.Media.Interfaces.PartialMedium "Medium in the component" annotation (choicesAllMatching=true); - parameter Modelica.SIunits.Length h(min=0) = 3 "Height of shaft"; + parameter Modelica.Units.SI.Length h(min=0) = 3 "Height of shaft"; parameter IBPSA.Airflow.Multizone.Types.densitySelection densitySelection "Select how to pick density" annotation (Evaluate=true); @@ -22,13 +22,13 @@ "Fluid connector b (positive design flow direction is from port_a to port_b)" annotation (Placement(transformation(extent={{10,-110},{-10,-90}}), iconTransformation(extent={{10,-110},{-10,-90}}))); - Modelica.SIunits.VolumeFlowRate V_flow + Modelica.Units.SI.VolumeFlowRate V_flow "Volume flow rate at inflowing port (positive when flow from port_a to port_b)"; - Modelica.SIunits.MassFlowRate m_flow + Modelica.Units.SI.MassFlowRate m_flow "Mass flow rate from port_a to port_b (m_flow > 0 is design flow direction)"; - Modelica.SIunits.PressureDifference dp(displayUnit="Pa") + Modelica.Units.SI.PressureDifference dp(displayUnit="Pa") "Pressure difference between port_a and port_b"; - Modelica.SIunits.Density rho "Density in medium column"; + Modelica.Units.SI.Density rho "Density in medium column"; protected Medium.ThermodynamicState sta_a=Medium.setState_phX( port_a.p, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Airflow/Multizone/MediumColumnDynamic.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Airflow/Multizone/MediumColumnDynamic.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Airflow/Multizone/MediumColumnDynamic.mo" 2022-03-10 09:57:42.044144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Airflow/Multizone/MediumColumnDynamic.mo" 2022-03-10 09:58:23.272149862 +0000 @@ -6,9 +6,9 @@ replaceable package Medium = Modelica.Media.Interfaces.PartialMedium "Medium in the component" annotation (choicesAllMatching=true); - parameter Modelica.SIunits.Length h(min=0) = 3 "Height of shaft"; + parameter Modelica.Units.SI.Length h(min=0) = 3 "Height of shaft"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal(min=0) + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal(min=0) "Nominal mass flow rate" annotation(Dialog(group = "Nominal condition, used only for steady-state model")); @@ -56,7 +56,7 @@ "Medium colum that connects to bottom port" annotation (Placement(transformation(extent={{-10,-60},{10,-40}}))); - parameter Modelica.SIunits.Volume V "Volume in medium shaft"; + parameter Modelica.Units.SI.Volume V "Volume in medium shaft"; // Heat transfer through boundary parameter Boolean use_HeatTransfer = false diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Airflow/Multizone/Orifice.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Airflow/Multizone/Orifice.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Airflow/Multizone/Orifice.mo" 2022-03-10 09:57:42.044144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Airflow/Multizone/Orifice.mo" 2022-03-10 09:58:23.252149859 +0000 @@ -4,7 +4,7 @@ m=0.5, k=CD*A*sqrt(2.0/rho_default)); - parameter Modelica.SIunits.Area A "Area of orifice" + parameter Modelica.Units.SI.Area A "Area of orifice" annotation (Dialog(group="Orifice characteristics")); parameter Real CD=0.65 "Discharge coefficient" annotation (Dialog(group="Orifice characteristics")); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Airflow/Multizone/ZonalFlow_ACS.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Airflow/Multizone/ZonalFlow_ACS.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Airflow/Multizone/ZonalFlow_ACS.mo" 2022-03-10 09:57:42.044144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Airflow/Multizone/ZonalFlow_ACS.mo" 2022-03-10 09:58:23.148149847 +0000 @@ -4,18 +4,18 @@ parameter Boolean useDefaultProperties = false "Set to true to use constant density"; - parameter Modelica.SIunits.Volume V "Volume of room"; + parameter Modelica.Units.SI.Volume V "Volume of room"; Modelica.Blocks.Interfaces.RealInput ACS "Air change per seconds, relative to the smaller of the two volumes" annotation (Placement(transformation(extent={{-120,90},{-100,110}}))); protected - Modelica.SIunits.VolumeFlowRate V_flow + Modelica.Units.SI.VolumeFlowRate V_flow "Volume flow rate at standard pressure"; - Modelica.SIunits.MassFlowRate m_flow "Mass flow rate"; + Modelica.Units.SI.MassFlowRate m_flow "Mass flow rate"; parameter Medium.ThermodynamicState sta_default = Medium.setState_pTX(T=Medium.T_default, p=Medium.p_default, X=Medium.X_default); - parameter Modelica.SIunits.Density rho_default=Medium.density(sta_default) + parameter Modelica.Units.SI.Density rho_default=Medium.density(sta_default) "Density, used to compute fluid volume"; Medium.ThermodynamicState sta_a1_inflow= diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SkyTemperature/BlackBody.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SkyTemperature/BlackBody.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SkyTemperature/BlackBody.mo" 2022-03-10 09:57:42.044144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SkyTemperature/BlackBody.mo" 2022-03-10 09:58:23.104149841 +0000 @@ -31,8 +31,8 @@ nominal=100) "Horizontal infrared irradiation" annotation (Placement(transformation(extent={{-140,-100},{-100,-60}}))); protected - Modelica.SIunits.Temperature TDewPoiK "Dewpoint temperature"; - Modelica.SIunits.Emissivity epsSky "Black-body absorptivity of sky"; + Modelica.Units.SI.Temperature TDewPoiK "Dewpoint temperature"; + Modelica.Units.SI.Emissivity epsSky "Black-body absorptivity of sky"; Real nOpa10(min=0, max=10) "Opaque sky cover in [0, 10]"; equation if calTSky == IBPSA.BoundaryConditions.Types.SkyTemperatureCalculation.TemperaturesAndSkyCover then diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SolarGeometry/BaseClasses/Examples/SolarAzimuth.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SolarGeometry/BaseClasses/Examples/SolarAzimuth.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SolarGeometry/BaseClasses/Examples/SolarAzimuth.mo" 2022-03-10 09:57:42.044144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SolarGeometry/BaseClasses/Examples/SolarAzimuth.mo" 2022-03-10 09:58:22.944149820 +0000 @@ -1,7 +1,7 @@ within IBPSA.BoundaryConditions.SolarGeometry.BaseClasses.Examples; model SolarAzimuth "Test model for zenith angle" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Angle lat= 41.98*Modelica.Constants.pi/180 + parameter Modelica.Units.SI.Angle lat= 41.98*Modelica.Constants.pi/180 "Latitude"; IBPSA.BoundaryConditions.SolarGeometry.BaseClasses.SolarHourAngle solHouAng "Solar hour angle" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SolarGeometry/BaseClasses/Examples/WallSolarAzimuth.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SolarGeometry/BaseClasses/Examples/WallSolarAzimuth.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SolarGeometry/BaseClasses/Examples/WallSolarAzimuth.mo" 2022-03-10 09:57:42.044144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SolarGeometry/BaseClasses/Examples/WallSolarAzimuth.mo" 2022-03-10 09:58:22.924149818 +0000 @@ -17,7 +17,7 @@ IBPSA.BoundaryConditions.SolarGeometry.BaseClasses.AltitudeAngle altAng "Altitude angle" annotation (Placement(transformation(extent={{-20,20},{0,40}}))); - parameter Modelica.SIunits.Angle lat=41.98*Modelica.Constants.pi/180 + parameter Modelica.Units.SI.Angle lat=41.98*Modelica.Constants.pi/180 "Latitude"; equation connect(weaDat.weaBus, weaBus) annotation (Line( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SolarGeometry/BaseClasses/IncidenceAngle.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SolarGeometry/BaseClasses/IncidenceAngle.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SolarGeometry/BaseClasses/IncidenceAngle.mo" 2022-03-10 09:57:42.044144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SolarGeometry/BaseClasses/IncidenceAngle.mo" 2022-03-10 09:58:22.900149814 +0000 @@ -1,10 +1,10 @@ within IBPSA.BoundaryConditions.SolarGeometry.BaseClasses; block IncidenceAngle "The solar incidence angle on a tilted surface" extends Modelica.Blocks.Icons.Block; - parameter Modelica.SIunits.Angle lat "Latitude"; - parameter Modelica.SIunits.Angle azi(displayUnit="deg") + parameter Modelica.Units.SI.Angle lat "Latitude"; + parameter Modelica.Units.SI.Angle azi(displayUnit="deg") "Surface azimuth. azi=-90 degree if surface outward unit normal points toward east; azi=0 if it points toward south"; - parameter Modelica.SIunits.Angle til(displayUnit="deg") + parameter Modelica.Units.SI.Angle til(displayUnit="deg") "Surface tilt. til=90 degree for walls; til=0 for ceilings; til=180 for roof"; Modelica.Blocks.Interfaces.RealInput solHouAng(quantity="Angle", unit="rad") "Solar hour angle" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SolarGeometry/BaseClasses/SolarAzimuth.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SolarGeometry/BaseClasses/SolarAzimuth.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SolarGeometry/BaseClasses/SolarAzimuth.mo" 2022-03-10 09:57:42.044144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SolarGeometry/BaseClasses/SolarAzimuth.mo" 2022-03-10 09:58:22.888149813 +0000 @@ -1,7 +1,7 @@ within IBPSA.BoundaryConditions.SolarGeometry.BaseClasses; block SolarAzimuth "Solar azimuth" extends Modelica.Blocks.Icons.Block; - parameter Modelica.SIunits.Angle lat "Latitude"; + parameter Modelica.Units.SI.Angle lat "Latitude"; Modelica.Blocks.Interfaces.RealInput zen(quantity="Angle", unit="rad") "Zenith angle" annotation (Placement(transformation(extent={{-140,40},{-100,80}}))); @@ -22,8 +22,8 @@ Real tmp "cos(solAzi) before data validity check"; Real solAziTem "Temporary variable for solar azimuth"; - constant Modelica.SIunits.Time day=86400 "Number of seconds in a day"; - constant Modelica.SIunits.Angle polarCircle = 1.1617 + constant Modelica.Units.SI.Time day=86400 "Number of seconds in a day"; + constant Modelica.Units.SI.Angle polarCircle = 1.1617 "Latitude of polar circle (66 degree 33 min 44 sec)"; final parameter Boolean outsidePolarCircle = lat < polarCircle and lat > -polarCircle "Flag, true if latitude is outside polar region"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SolarGeometry/BaseClasses/WallSolarAzimuth.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SolarGeometry/BaseClasses/WallSolarAzimuth.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SolarGeometry/BaseClasses/WallSolarAzimuth.mo" 2022-03-10 09:57:42.044144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SolarGeometry/BaseClasses/WallSolarAzimuth.mo" 2022-03-10 09:58:22.860149810 +0000 @@ -20,9 +20,9 @@ "Angle between projection of sun's rays and normal to vertical surface" annotation (Placement(transformation(extent={{100,-10},{120,10}}))); protected - constant Modelica.SIunits.Angle delta = 1*Modelica.Constants.pi/180 + constant Modelica.Units.SI.Angle delta = 1*Modelica.Constants.pi/180 "Small angle"; - constant Modelica.SIunits.Angle ninety= Modelica.Constants.pi/2-delta + constant Modelica.Units.SI.Angle ninety= Modelica.Constants.pi/2-delta "+89 degree"; constant Real deltaX = 1E-4 "Small number used for smoothing"; Real alt_c "Cosine of altitude, bounded away from zero"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SolarGeometry/BaseClasses/ZenithAngle.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SolarGeometry/BaseClasses/ZenithAngle.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SolarGeometry/BaseClasses/ZenithAngle.mo" 2022-03-10 09:57:42.044144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SolarGeometry/BaseClasses/ZenithAngle.mo" 2022-03-10 09:58:22.844149807 +0000 @@ -1,7 +1,7 @@ within IBPSA.BoundaryConditions.SolarGeometry.BaseClasses; block ZenithAngle "Zenith angle" extends Modelica.Blocks.Icons.Block; - parameter Modelica.SIunits.Angle lat "Latitude"; + parameter Modelica.Units.SI.Angle lat "Latitude"; Modelica.Blocks.Interfaces.RealInput solHouAng(quantity="Angle", unit="rad") "Solar hour angle" annotation (Placement(transformation(extent={{-140,-68},{-100,-28}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SolarGeometry/IncidenceAngle.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SolarGeometry/IncidenceAngle.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SolarGeometry/IncidenceAngle.mo" 2022-03-10 09:57:42.044144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SolarGeometry/IncidenceAngle.mo" 2022-03-10 09:58:22.764149798 +0000 @@ -1,9 +1,9 @@ within IBPSA.BoundaryConditions.SolarGeometry; block IncidenceAngle "Solar incidence angle on a tilted surface" extends Modelica.Blocks.Icons.Block; - parameter Modelica.SIunits.Angle lat "Latitude"; - parameter Modelica.SIunits.Angle azi "Surface azimuth"; - parameter Modelica.SIunits.Angle til "Surface tilt"; + parameter Modelica.Units.SI.Angle lat "Latitude"; + parameter Modelica.Units.SI.Angle azi "Surface azimuth"; + parameter Modelica.Units.SI.Angle til "Surface tilt"; Modelica.Blocks.Interfaces.RealOutput y( final quantity="Angle", diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SolarGeometry/ZenithAngle.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SolarGeometry/ZenithAngle.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SolarGeometry/ZenithAngle.mo" 2022-03-10 09:57:42.044144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SolarGeometry/ZenithAngle.mo" 2022-03-10 09:58:22.740149794 +0000 @@ -1,7 +1,7 @@ within IBPSA.BoundaryConditions.SolarGeometry; block ZenithAngle "Zenith angle" extends Modelica.Blocks.Icons.Block; - parameter Modelica.SIunits.Angle lat "Latitude"; + parameter Modelica.Units.SI.Angle lat "Latitude"; Modelica.Blocks.Interfaces.RealOutput y( final quantity="Angle", final unit="rad", diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SolarIrradiation/BaseClasses/DiffuseIsotropic.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SolarIrradiation/BaseClasses/DiffuseIsotropic.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SolarIrradiation/BaseClasses/DiffuseIsotropic.mo" 2022-03-10 09:57:42.044144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SolarIrradiation/BaseClasses/DiffuseIsotropic.mo" 2022-03-10 09:58:22.696149789 +0000 @@ -3,7 +3,7 @@ "Diffuse solar irradiation on a tilted surface with an isotropic model" extends Modelica.Blocks.Icons.Block; parameter Real rho=0.2 "Ground reflectance"; - parameter Modelica.SIunits.Angle til(displayUnit="deg") "Surface tilt angle"; + parameter Modelica.Units.SI.Angle til(displayUnit="deg") "Surface tilt angle"; Modelica.Blocks.Interfaces.RealInput HDifHor(quantity= "RadiantEnergyFluenceRate", unit="W/m2") diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SolarIrradiation/BaseClasses/DiffusePerez.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SolarIrradiation/BaseClasses/DiffusePerez.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SolarIrradiation/BaseClasses/DiffusePerez.mo" 2022-03-10 09:57:42.044144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SolarIrradiation/BaseClasses/DiffusePerez.mo" 2022-03-10 09:58:22.684149787 +0000 @@ -3,7 +3,7 @@ "Hemispherical diffuse irradiation on a tilted surface with Perez's anisotropic model" extends Modelica.Blocks.Icons.Block; parameter Real rho=0.2 "Ground reflectance"; - parameter Modelica.SIunits.Angle til(displayUnit="deg") "Surface tilt angle"; + parameter Modelica.Units.SI.Angle til(displayUnit="deg") "Surface tilt angle"; Modelica.Blocks.Interfaces.RealInput briCof1 "Brightening Coeffcient F1" annotation (Placement(transformation(extent={{-140,0},{-100,40}}))); Modelica.Blocks.Interfaces.RealInput briCof2 "Brightening Coeffcient F2" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SolarIrradiation/BaseClasses/PartialSolarIrradiation.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SolarIrradiation/BaseClasses/PartialSolarIrradiation.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SolarIrradiation/BaseClasses/PartialSolarIrradiation.mo" 2022-03-10 09:57:42.048144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SolarIrradiation/BaseClasses/PartialSolarIrradiation.mo" 2022-03-10 09:58:22.548149771 +0000 @@ -2,7 +2,7 @@ partial block PartialSolarIrradiation "Partial model that is used to compute the direct and diffuse solar irradiation" extends Modelica.Blocks.Icons.Block; - parameter Modelica.SIunits.Angle til(displayUnit="deg") "Surface tilt"; + parameter Modelica.Units.SI.Angle til(displayUnit="deg") "Surface tilt"; Modelica.Blocks.Interfaces.RealOutput H( final quantity="RadiantEnergyFluenceRate", final unit="W/m2") "Radiation per unit area" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SolarIrradiation/BaseClasses/SkyClearness.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SolarIrradiation/BaseClasses/SkyClearness.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SolarIrradiation/BaseClasses/SkyClearness.mo" 2022-03-10 09:57:42.048144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SolarIrradiation/BaseClasses/SkyClearness.mo" 2022-03-10 09:58:22.520149766 +0000 @@ -20,13 +20,13 @@ annotation (Placement(transformation(extent={{100,-10},{120,10}}))); // Set hSmall so that hSmall + deltaX < 1E-4. See info section. protected - constant Modelica.SIunits.Irradiance hSmall = 0.5e-4 + constant Modelica.Units.SI.Irradiance hSmall = 0.5e-4 "Small radiation for regularization"; - constant Modelica.SIunits.Irradiance deltaX = hSmall/2 + constant Modelica.Units.SI.Irradiance deltaX = hSmall/2 "Small radiation for regularization"; constant Real k = 5.534e-6*(180/Modelica.Constants.pi)^3 "Constant factor"; Real tmp1 "Intermediate variable"; - Modelica.SIunits.Irradiance HDifHorBou + Modelica.Units.SI.Irradiance HDifHorBou "Diffuse horizontal irradiation, bounded away from zero"; equation tmp1 = k*zen^3; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SolarIrradiation/DiffusePerez.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SolarIrradiation/DiffusePerez.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SolarIrradiation/DiffusePerez.mo" 2022-03-10 09:57:42.048144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SolarIrradiation/DiffusePerez.mo" 2022-03-10 09:58:22.492149764 +0000 @@ -5,8 +5,8 @@ IBPSA.BoundaryConditions.SolarIrradiation.BaseClasses.PartialSolarIrradiation; parameter Real rho(min=0, max=1, final unit="1")=0.2 "Ground reflectance"; - parameter Modelica.SIunits.Angle lat "Latitude"; - parameter Modelica.SIunits.Angle azi "Surface azimuth"; + parameter Modelica.Units.SI.Angle lat "Latitude"; + parameter Modelica.Units.SI.Angle azi "Surface azimuth"; parameter Boolean outSkyCon=false "Output contribution of diffuse irradiation from sky"; parameter Boolean outGroCon=false diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SolarIrradiation/DirectTiltedSurface.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SolarIrradiation/DirectTiltedSurface.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SolarIrradiation/DirectTiltedSurface.mo" 2022-03-10 09:57:42.048144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SolarIrradiation/DirectTiltedSurface.mo" 2022-03-10 09:58:22.452149758 +0000 @@ -3,8 +3,8 @@ extends IBPSA.BoundaryConditions.SolarIrradiation.BaseClasses.PartialSolarIrradiation; - parameter Modelica.SIunits.Angle lat "Latitude"; - parameter Modelica.SIunits.Angle azi "Surface azimuth"; + parameter Modelica.Units.SI.Angle lat "Latitude"; + parameter Modelica.Units.SI.Angle azi "Surface azimuth"; Modelica.Blocks.Interfaces.RealOutput inc( final quantity="Angle", diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SolarIrradiation/Examples/DiffusePerez.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SolarIrradiation/Examples/DiffusePerez.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SolarIrradiation/Examples/DiffusePerez.mo" 2022-03-10 09:57:42.048144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SolarIrradiation/Examples/DiffusePerez.mo" 2022-03-10 09:58:22.404149753 +0000 @@ -2,9 +2,9 @@ model DiffusePerez "Test model for diffuse solar irradiation on a tilted surface using the Perez model" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Angle lat=37/180*Modelica.Constants.pi "Latitude"; - parameter Modelica.SIunits.Angle azi=0.3 "Azi angle"; - parameter Modelica.SIunits.Angle til=0.5 "Tilted angle"; + parameter Modelica.Units.SI.Angle lat=37/180*Modelica.Constants.pi "Latitude"; + parameter Modelica.Units.SI.Angle azi=0.3 "Azi angle"; + parameter Modelica.Units.SI.Angle til=0.5 "Tilted angle"; IBPSA.BoundaryConditions.WeatherData.ReaderTMY3 weaDat(filNam= Modelica.Utilities.Files.loadResource("modelica://IBPSA/Resources/weatherdata/USA_CA_San.Francisco.Intl.AP.724940_TMY3.mos")) annotation (Placement(transformation(extent={{-40,0},{-20,20}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SolarIrradiation/Examples/DirectTiltedSurface.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SolarIrradiation/Examples/DirectTiltedSurface.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SolarIrradiation/Examples/DirectTiltedSurface.mo" 2022-03-10 09:57:42.048144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/SolarIrradiation/Examples/DirectTiltedSurface.mo" 2022-03-10 09:58:22.376149748 +0000 @@ -2,7 +2,7 @@ model DirectTiltedSurface "Test model for direct solar irradiation on a tilted surface" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Angle lat=37/180*Modelica.Constants.pi "Latitude"; + parameter Modelica.Units.SI.Angle lat=37/180*Modelica.Constants.pi "Latitude"; IBPSA.BoundaryConditions.WeatherData.ReaderTMY3 weaDat(filNam= Modelica.Utilities.Files.loadResource("modelica://IBPSA/Resources/weatherdata/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.mos")) annotation (Placement(transformation(extent={{-60,20},{-40,40}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckBlackBodySkyTemperature.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckBlackBodySkyTemperature.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckBlackBodySkyTemperature.mo" 2022-03-10 09:57:42.048144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckBlackBodySkyTemperature.mo" 2022-03-10 09:58:22.344149744 +0000 @@ -13,11 +13,11 @@ displayUnit="degC") "Black-body sky temperature" annotation (Placement(transformation(extent={{100,-10},{120,10}}))); - parameter Modelica.SIunits.Temperature TMin(displayUnit="degC") = 203.15 + + parameter Modelica.Units.SI.Temperature TMin(displayUnit="degC") = 203.15 "Minimum allowed temperature"; - parameter Modelica.SIunits.Temperature TMax(displayUnit="degC") = 343.15 + parameter Modelica.Units.SI.Temperature TMax(displayUnit="degC") = 343.15 "Maximum allowed temperature"; - equation TOut = TIn; assert(TOut > TMin, "Temperature out of bounds.\n" + " TOut = " + String( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckCeilingHeight.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckCeilingHeight.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckCeilingHeight.mo" 2022-03-10 09:57:42.048144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckCeilingHeight.mo" 2022-03-10 09:58:22.340149745 +0000 @@ -10,7 +10,7 @@ final quantity="Height", final unit="m") "Ceiling height" annotation (Placement(transformation(extent={{100,-10},{120,10}}))); - constant Modelica.SIunits.Height ceiHeiMin=0 "Minimum allowed ceiling height"; + constant Modelica.Units.SI.Height ceiHeiMin=0 "Minimum allowed ceiling height"; equation ceiHeiOut = IBPSA.Utilities.Math.Functions.smoothMax( ceiHeiIn, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckIRRadiation.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckIRRadiation.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckIRRadiation.mo" 2022-03-10 09:57:42.048144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckIRRadiation.mo" 2022-03-10 09:58:22.332149742 +0000 @@ -10,7 +10,7 @@ final unit="W/m2") "Horizontal infrared irradiation" annotation (Placement(transformation(extent={{100,-10},{120,10}}))); - constant Modelica.SIunits.RadiantEnergyFluenceRate HMin=0.0001 + constant Modelica.Units.SI.RadiantEnergyFluenceRate HMin=0.0001 "Minimum value for radiation"; equation HOut = IBPSA.Utilities.Math.Functions.smoothMax( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckPressure.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckPressure.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckPressure.mo" 2022-03-10 09:57:42.048144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckPressure.mo" 2022-03-10 09:58:22.324149742 +0000 @@ -10,8 +10,8 @@ final quantity="Pressure", final unit="Pa") "Atmospheric pressure" annotation (Placement(transformation(extent={{100,-10},{120,10}}))); - constant Modelica.SIunits.Pressure PMin=3100 "Minimum allowed pressure"; - constant Modelica.SIunits.Pressure PMax=120000 "Maximum allowed pressure"; + constant Modelica.Units.SI.Pressure PMin=3100 "Minimum allowed pressure"; + constant Modelica.Units.SI.Pressure PMax=120000 "Maximum allowed pressure"; equation assert(PIn > PMin, "Pressure out of bounds.\n" + " PIn = " + String(PIn)); assert(PIn < PMax, "Pressure out of bounds.\n" + " PIn = " + String(PIn)); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckRadiation.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckRadiation.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckRadiation.mo" 2022-03-10 09:57:42.048144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckRadiation.mo" 2022-03-10 09:58:22.320149742 +0000 @@ -10,7 +10,7 @@ final unit="W/m2") "Radiation" annotation (Placement(transformation(extent={{100,-10},{120,10}}))); - constant Modelica.SIunits.RadiantEnergyFluenceRate HMin=0.0001 + constant Modelica.Units.SI.RadiantEnergyFluenceRate HMin=0.0001 "Minimum value for radiation"; equation HOut = IBPSA.Utilities.Math.Functions.smoothMax( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckTemperature.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckTemperature.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckTemperature.mo" 2022-03-10 09:57:42.048144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckTemperature.mo" 2022-03-10 09:58:22.292149738 +0000 @@ -12,11 +12,11 @@ displayUnit="degC") "Output temperature" annotation (Placement(transformation(extent={{100,-10},{120,10}}))); - parameter Modelica.SIunits.Temperature TMin(displayUnit="degC") = 203.15 + + parameter Modelica.Units.SI.Temperature TMin(displayUnit="degC") = 203.15 "Minimum allowed temperature"; - parameter Modelica.SIunits.Temperature TMax(displayUnit="degC") = 343.15 + parameter Modelica.Units.SI.Temperature TMax(displayUnit="degC") = 343.15 "Maximum allowed temperature"; - equation TOut = TIn; assert(TOut > TMin, "Temperature out of bounds.\n" + " TOut = " + String( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckWindSpeed.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckWindSpeed.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckWindSpeed.mo" 2022-03-10 09:57:42.048144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckWindSpeed.mo" 2022-03-10 09:58:22.240149731 +0000 @@ -7,7 +7,7 @@ Modelica.Blocks.Interfaces.RealOutput winSpeOut(final quantity="Velocity", final unit="m/s") "Wind speed" annotation (Placement(transformation(extent={{100,-10},{120,10}}))); - constant Modelica.SIunits.Velocity winSpeMin=1e-6 + constant Modelica.Units.SI.Velocity winSpeMin=1e-6 "Minimum allowed wind speed"; equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/WeatherData/BaseClasses/ConvertRadiation.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/WeatherData/BaseClasses/ConvertRadiation.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/WeatherData/BaseClasses/ConvertRadiation.mo" 2022-03-10 09:57:42.048144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/WeatherData/BaseClasses/ConvertRadiation.mo" 2022-03-10 09:58:22.236149730 +0000 @@ -11,10 +11,10 @@ annotation (Placement(transformation(extent={{100,-10},{120,10}}))); protected - constant Modelica.SIunits.Time Hou=3600 "1 hour"; + constant Modelica.Units.SI.Time Hou=3600 "1 hour"; equation - HOut = HIn/Modelica.SIunits.Conversions.to_hour(Hou); + HOut = HIn/Modelica.Units.Conversions.to_hour(Hou); annotation ( defaultComponentName="conRad", Documentation(info=" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/WeatherData/BaseClasses/ConvertTime.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/WeatherData/BaseClasses/ConvertTime.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/WeatherData/BaseClasses/ConvertTime.mo" 2022-03-10 09:57:42.048144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/WeatherData/BaseClasses/ConvertTime.mo" 2022-03-10 09:58:22.220149729 +0000 @@ -12,9 +12,9 @@ annotation (Placement(transformation(extent={{100,-10},{120,10}}))); protected - constant Modelica.SIunits.Time year=31536000 "Number of seconds in a year"; - discrete Modelica.SIunits.Time tStart "Start time of period"; + constant Modelica.Units.SI.Time year=31536000 "Number of seconds in a year"; + discrete Modelica.Units.SI.Time tStart "Start time of period"; initial equation tStart = integer(modTim/year)*year; equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/WeatherData/BaseClasses/Examples/GetHeaderElement.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/WeatherData/BaseClasses/Examples/GetHeaderElement.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/WeatherData/BaseClasses/Examples/GetHeaderElement.mo" 2022-03-10 09:57:42.048144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/WeatherData/BaseClasses/Examples/GetHeaderElement.mo" 2022-03-10 09:58:22.020149703 +0000 @@ -1,11 +1,11 @@ within IBPSA.BoundaryConditions.WeatherData.BaseClasses.Examples; model GetHeaderElement "Test model to get header element" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Angle longitude(fixed=false, displayUnit="deg") + parameter Modelica.Units.SI.Angle longitude(fixed=false, displayUnit="deg") "Longitude"; - parameter Modelica.SIunits.Angle latitude(fixed=false, displayUnit="deg") + parameter Modelica.Units.SI.Angle latitude(fixed=false, displayUnit="deg") "Latitude"; - parameter Modelica.SIunits.Time timeZone(fixed=false, displayUnit="h") + parameter Modelica.Units.SI.Time timeZone(fixed=false, displayUnit="h") "Time zone"; parameter String filNam = Modelica.Utilities.Files.loadResource("modelica://IBPSA/Resources/weatherdata/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.mos") diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/WeatherData/BaseClasses/LocalCivilTime.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/WeatherData/BaseClasses/LocalCivilTime.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/WeatherData/BaseClasses/LocalCivilTime.mo" 2022-03-10 09:57:42.048144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/WeatherData/BaseClasses/LocalCivilTime.mo" 2022-03-10 09:58:22.000149701 +0000 @@ -5,14 +5,14 @@ final quantity="Time", final unit="s") "Clock time" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - parameter Modelica.SIunits.Time timZon(displayUnit="h") "Time zone"; - parameter Modelica.SIunits.Angle lon(displayUnit="deg") "Longitude"; + parameter Modelica.Units.SI.Time timZon(displayUnit="h") "Time zone"; + parameter Modelica.Units.SI.Angle lon(displayUnit="deg") "Longitude"; Modelica.Blocks.Interfaces.RealOutput locTim( final quantity="Time", final unit="s") "Local civil time" annotation (Placement(transformation(extent={{100,-10},{120,10}}))); protected - final parameter Modelica.SIunits.Time diff = - timZon + lon*43200/Modelica.Constants.pi + final parameter Modelica.Units.SI.Time diff = - timZon + lon*43200/Modelica.Constants.pi "Difference between local and clock time"; equation locTim = cloTim + diff; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/WeatherData/BaseClasses/getLatitudeTMY3.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/WeatherData/BaseClasses/getLatitudeTMY3.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/WeatherData/BaseClasses/getLatitudeTMY3.mo" 2022-03-10 09:57:42.048144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/WeatherData/BaseClasses/getLatitudeTMY3.mo" 2022-03-10 09:58:21.924149691 +0000 @@ -5,7 +5,7 @@ annotation (Dialog( loadSelector(filter="Weather files (*.mos)", caption= "Select weather file"))); - output Modelica.SIunits.Angle lat "Latitude from the weather file"; + output Modelica.Units.SI.Angle lat "Latitude from the weather file"; protected Integer nexInd "Next index, used for error handling"; String element "String representation of the returned element"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/WeatherData/BaseClasses/getLongitudeTMY3.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/WeatherData/BaseClasses/getLongitudeTMY3.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/WeatherData/BaseClasses/getLongitudeTMY3.mo" 2022-03-10 09:57:42.048144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/WeatherData/BaseClasses/getLongitudeTMY3.mo" 2022-03-10 09:58:21.912149690 +0000 @@ -5,7 +5,7 @@ annotation (Dialog( loadSelector(filter="Weather files (*.mos)", caption= "Select weather file"))); - output Modelica.SIunits.Angle lon "Longitude from the weather file"; + output Modelica.Units.SI.Angle lon "Longitude from the weather file"; protected Integer nexInd "Next index, used for error handling"; String element "String representation of the returned element"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/WeatherData/BaseClasses/getTimeZoneTMY3.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/WeatherData/BaseClasses/getTimeZoneTMY3.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/WeatherData/BaseClasses/getTimeZoneTMY3.mo" 2022-03-10 09:57:42.048144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/WeatherData/BaseClasses/getTimeZoneTMY3.mo" 2022-03-10 09:58:21.908149689 +0000 @@ -5,7 +5,7 @@ annotation (Dialog( loadSelector(filter="Weather files (*.mos)", caption= "Select weather file"))); - output Modelica.SIunits.Time timZon "Time zone from the weather file"; + output Modelica.Units.SI.Time timZon "Time zone from the weather file"; protected Integer nexInd "Next index, used for error handling"; String element "String representation of the returned element"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/WeatherData/ReaderTMY3.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/WeatherData/ReaderTMY3.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/WeatherData/ReaderTMY3.mo" 2022-03-10 09:57:42.048144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/WeatherData/ReaderTMY3.mo" 2022-03-10 09:58:21.872149685 +0000 @@ -9,7 +9,7 @@ parameter IBPSA.BoundaryConditions.Types.DataSource pAtmSou=IBPSA.BoundaryConditions.Types.DataSource.Parameter "Atmospheric pressure" annotation (Evaluate=true, Dialog(group="Data source")); - parameter Modelica.SIunits.Pressure pAtm=101325 + parameter Modelica.Units.SI.Pressure pAtm=101325 "Atmospheric pressure (used if pAtmSou=Parameter)" annotation (Dialog(group="Data source")); Modelica.Blocks.Interfaces.RealInput pAtm_in( @@ -73,7 +73,7 @@ parameter IBPSA.BoundaryConditions.Types.DataSource TDryBulSou=IBPSA.BoundaryConditions.Types.DataSource.File "Dry bulb temperature" annotation (Evaluate=true, Dialog(group="Data source")); - parameter Modelica.SIunits.Temperature TDryBul(displayUnit="degC") = 293.15 + parameter Modelica.Units.SI.Temperature TDryBul(displayUnit="degC") = 293.15 "Dry bulb temperature (used if TDryBul=Parameter)" annotation (Dialog(group="Data source")); Modelica.Blocks.Interfaces.RealInput TDryBul_in( @@ -88,7 +88,7 @@ parameter IBPSA.BoundaryConditions.Types.DataSource TDewPoiSou=IBPSA.BoundaryConditions.Types.DataSource.File "Dew point temperature" annotation (Evaluate=true, Dialog(group="Data source")); - parameter Modelica.SIunits.Temperature TDewPoi(displayUnit="degC") = 283.15 + parameter Modelica.Units.SI.Temperature TDewPoi(displayUnit="degC") = 283.15 "Dew point temperature (used if TDewPoi=Parameter)" annotation (Dialog(group="Data source")); Modelica.Blocks.Interfaces.RealInput TDewPoi_in( @@ -102,7 +102,7 @@ // Black body sky temperature parameter IBPSA.BoundaryConditions.Types.DataSource TBlaSkySou=IBPSA.BoundaryConditions.Types.DataSource.File "Black-body sky temperature" annotation (Evaluate=true, Dialog(group="Data source")); - parameter Modelica.SIunits.Temperature TBlaSky=273.15 + parameter Modelica.Units.SI.Temperature TBlaSky=273.15 "Black-body sky temperature (used if TBlaSkySou=Parameter)" annotation (Dialog(group="Data source")); Modelica.Blocks.Interfaces.RealInput TBlaSky_in( @@ -133,7 +133,7 @@ // Wind speed parameter IBPSA.BoundaryConditions.Types.DataSource winSpeSou=IBPSA.BoundaryConditions.Types.DataSource.File "Wind speed" annotation (Evaluate=true, Dialog(group="Data source")); - parameter Modelica.SIunits.Velocity winSpe(min=0) = 1 + parameter Modelica.Units.SI.Velocity winSpe(min=0) = 1 "Wind speed (used if winSpe=Parameter)" annotation (Dialog(group="Data source")); Modelica.Blocks.Interfaces.RealInput winSpe_in( @@ -147,7 +147,7 @@ // Wind direction parameter IBPSA.BoundaryConditions.Types.DataSource winDirSou=IBPSA.BoundaryConditions.Types.DataSource.File "Wind direction" annotation (Evaluate=true, Dialog(group="Data source")); - parameter Modelica.SIunits.Angle winDir=1.0 + parameter Modelica.Units.SI.Angle winDir=1.0 "Wind direction (used if winDir=Parameter)" annotation (Dialog(group="Data source")); Modelica.Blocks.Interfaces.RealInput winDir_in( @@ -161,7 +161,7 @@ // Infrared horizontal radiation parameter IBPSA.BoundaryConditions.Types.DataSource HInfHorSou=IBPSA.BoundaryConditions.Types.DataSource.File "Infrared horizontal radiation" annotation (Evaluate=true, Dialog(group="Data source")); - parameter Modelica.SIunits.HeatFlux HInfHor=0.0 + parameter Modelica.Units.SI.HeatFlux HInfHor=0.0 "Infrared horizontal radiation (used if HInfHorSou=Parameter)" annotation (Dialog(group="Data source")); Modelica.Blocks.Interfaces.RealInput HInfHor_in( @@ -203,13 +203,13 @@ parameter String filNam="" "Name of weather data file" annotation ( Dialog(loadSelector(filter="Weather files (*.mos)", caption="Select weather file"))); - final parameter Modelica.SIunits.Angle lon(displayUnit="deg")= + final parameter Modelica.Units.SI.Angle lon(displayUnit="deg")= IBPSA.BoundaryConditions.WeatherData.BaseClasses.getLongitudeTMY3( filNam) "Longitude"; - final parameter Modelica.SIunits.Angle lat(displayUnit="deg")= + final parameter Modelica.Units.SI.Angle lat(displayUnit="deg")= IBPSA.BoundaryConditions.WeatherData.BaseClasses.getLatitudeTMY3( filNam) "Latitude"; - final parameter Modelica.SIunits.Time timZon(displayUnit="h")= + final parameter Modelica.Units.SI.Time timZon(displayUnit="h")= IBPSA.BoundaryConditions.WeatherData.BaseClasses.getTimeZoneTMY3(filNam) "Time zone"; Bus weaBus "Weather data bus" annotation (Placement(transformation(extent={{ @@ -223,7 +223,7 @@ Dialog(group="Sky temperature")); constant Real epsCos = 1e-6 "Small value to avoid division by 0"; - constant Modelica.SIunits.HeatFlux solCon = 1367.7 "Solar constant"; + constant Modelica.Units.SI.HeatFlux solCon = 1367.7 "Solar constant"; protected Modelica.Blocks.Tables.CombiTable1Ds datRea( @@ -410,12 +410,13 @@ "Check black body sky temperature" annotation (Placement(transformation(extent={{240,-260},{260,-240}}))); + // Blocks that are added in order to set the name of the output signal, // which then is displayed in the GUI of the weather data connector. block Latitude "Generate constant signal of type Real" extends Modelica.Blocks.Icons.Block; - parameter Modelica.SIunits.Angle latitude "Latitude"; + parameter Modelica.Units.SI.Angle latitude "Latitude"; Modelica.Blocks.Interfaces.RealOutput y( unit="rad", @@ -459,7 +460,7 @@ block Longitude "Generate constant signal of type Real" extends Modelica.Blocks.Icons.Block; - parameter Modelica.SIunits.Angle longitude "Longitude"; + parameter Modelica.Units.SI.Angle longitude "Longitude"; Modelica.Blocks.Interfaces.RealOutput y( unit="rad", @@ -499,7 +500,6 @@ ")); end Longitude; - equation //--------------------------------------------------------------------------- // Select atmospheric pressure connector diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/WeatherData/Validation/ReaderTMY3HDirNor.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/WeatherData/Validation/ReaderTMY3HDirNor.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/WeatherData/Validation/ReaderTMY3HDirNor.mo" 2022-03-10 09:57:42.048144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/BoundaryConditions/WeatherData/Validation/ReaderTMY3HDirNor.mo" 2022-03-10 09:58:21.472149634 +0000 @@ -9,14 +9,14 @@ annotation (Placement(transformation(extent={{68,-10},{88,10}}))); protected Modelica.Blocks.Sources.Sine HGloHor1( - freqHz=1/86400, + f =1/86400, startTime=25200, offset=0, amplitude=100) "Horizontal global radiation" annotation (Placement(transformation(extent={{-88,-30},{-68,-10}}))); Modelica.Blocks.Sources.Sine HGloHor( - freqHz=1/86400, + f =1/86400, startTime=68428, offset=0, amplitude=100) "Horizontal global radiation" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Controls/Continuous/Examples/LimPID.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Controls/Continuous/Examples/LimPID.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Controls/Continuous/Examples/LimPID.mo" 2022-03-10 09:57:42.048144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Controls/Continuous/Examples/LimPID.mo" 2022-03-10 09:58:21.412149627 +0000 @@ -10,7 +10,7 @@ Td=1, yMax=1, yMin=-1, - initType=Modelica.Blocks.Types.InitPID.InitialState) + initType=Modelica.Blocks.Types.Init.InitialState) annotation (Placement(transformation(extent={{-20,30},{0,50}}))); IBPSA.Controls.Continuous.LimPID limPIDRev( controllerType=Modelica.Blocks.Types.SimpleController.PID, @@ -19,7 +19,7 @@ Td=1, yMax=1, yMin=-1, - initType=Modelica.Blocks.Types.InitPID.InitialState) + initType=Modelica.Blocks.Types.Init.InitialState) "Controller with reverse action" annotation (Placement(transformation(extent={{-20,-20},{0,0}}))); Modelica.Blocks.Sources.Constant const(k=0.5) @@ -35,7 +35,7 @@ Td=1, yMax=1, yMin=-1, - initType=Modelica.Blocks.Types.InitPID.InitialState) + initType=Modelica.Blocks.Types.Init.InitialState) annotation (Placement(transformation(extent={{-20,70},{0,90}}))); IBPSA.Utilities.Diagnostics.AssertEquality assertEquality1( threShold=1e-3) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Controls/Continuous/Examples/NumberOfRequests.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Controls/Continuous/Examples/NumberOfRequests.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Controls/Continuous/Examples/NumberOfRequests.mo" 2022-03-10 09:57:42.048144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Controls/Continuous/Examples/NumberOfRequests.mo" 2022-03-10 09:58:21.380149623 +0000 @@ -6,7 +6,7 @@ nin=2, threShold=0, kind=0) annotation (Placement(transformation(extent={{0,20},{20,40}}))); - Modelica.Blocks.Sources.Sine sine(freqHz=2) + Modelica.Blocks.Sources.Sine sine(f =2) annotation (Placement(transformation(extent={{-60,-20},{-40,0}}))); Modelica.Blocks.Sources.Pulse pulse(period=0.35) annotation (Placement(transformation(extent={{-60,20},{-40,40}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Controls/Continuous/Examples/PIDHysteresis.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Controls/Continuous/Examples/PIDHysteresis.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Controls/Continuous/Examples/PIDHysteresis.mo" 2022-03-10 09:57:42.048144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Controls/Continuous/Examples/PIDHysteresis.mo" 2022-03-10 09:58:21.360149621 +0000 @@ -25,7 +25,7 @@ Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow Q_flow annotation (Placement(transformation(extent={{16,20},{36,40}}))); Modelica.Blocks.Sources.Sine sine( - freqHz=1/86400, + f =1/86400, offset=273.15, amplitude=20, phase=-1.5707963267949, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Controls/Continuous/Examples/PIDHysteresisTimer.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Controls/Continuous/Examples/PIDHysteresisTimer.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Controls/Continuous/Examples/PIDHysteresisTimer.mo" 2022-03-10 09:57:42.048144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Controls/Continuous/Examples/PIDHysteresisTimer.mo" 2022-03-10 09:58:21.340149617 +0000 @@ -26,7 +26,7 @@ Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow Q_flow annotation (Placement(transformation(extent={{16,20},{36,40}}))); Modelica.Blocks.Sources.Sine sine( - freqHz=1/86400, + f =1/86400, offset=273.15, amplitude=20, phase=-1.5707963267949) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Controls/Continuous/Examples/SignalRanker.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Controls/Continuous/Examples/SignalRanker.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Controls/Continuous/Examples/SignalRanker.mo" 2022-03-10 09:57:42.048144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Controls/Continuous/Examples/SignalRanker.mo" 2022-03-10 09:58:21.324149615 +0000 @@ -1,14 +1,14 @@ within IBPSA.Controls.Continuous.Examples; model SignalRanker "Example model for signal ranker" extends Modelica.Icons.Example; - Modelica.Blocks.Sources.Sine sine(freqHz=2) + Modelica.Blocks.Sources.Sine sine(f =2) annotation (Placement(transformation(extent={{-60,-20},{-40,0}}))); Modelica.Blocks.Sources.Pulse pulse(period=0.25) annotation (Placement(transformation(extent={{-60,20},{-40,40}}))); IBPSA.Controls.Continuous.SignalRanker sigRan( nin=3) annotation (Placement(transformation(extent={{-20,20},{0,40}}))); - Modelica.Blocks.Sources.ExpSine expSine(freqHz=10, damping=1) + Modelica.Blocks.Sources.ExpSine expSine(f =10, damping=1) annotation (Placement(transformation(extent={{-60,60},{-40,80}}))); equation connect(sine.y, sigRan.u[1]) annotation (Line(points={{-39,-10},{-32, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Controls/Continuous/LimPID.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Controls/Continuous/LimPID.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Controls/Continuous/LimPID.mo" 2022-03-10 09:57:42.048144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Controls/Continuous/LimPID.mo" 2022-03-10 09:58:21.304149613 +0000 @@ -9,11 +9,11 @@ parameter Modelica.Blocks.Types.SimpleController controllerType= Modelica.Blocks.Types.SimpleController.PID "Type of controller"; parameter Real k(min=0, unit="1") = 1 "Gain of controller"; - parameter Modelica.SIunits.Time Ti(min=Modelica.Constants.small)=0.5 + parameter Modelica.Units.SI.Time Ti(min=Modelica.Constants.small)=0.5 "Time constant of Integrator block" annotation (Dialog(enable= controllerType == Modelica.Blocks.Types.SimpleController.PI or controllerType == Modelica.Blocks.Types.SimpleController.PID)); - parameter Modelica.SIunits.Time Td(min=0)=0.1 + parameter Modelica.Units.SI.Time Td(min=0)=0.1 "Time constant of Derivative block" annotation (Dialog(enable= controllerType == Modelica.Blocks.Types.SimpleController.PD or controllerType == Modelica.Blocks.Types.SimpleController.PID)); @@ -31,7 +31,7 @@ "The higher Nd, the more ideal the derivative block" annotation(Dialog(enable=controllerType==.Modelica.Blocks.Types.SimpleController.PD or controllerType==.Modelica.Blocks.Types.SimpleController.PID)); - parameter Modelica.Blocks.Types.InitPID initType= Modelica.Blocks.Types.InitPID.DoNotUse_InitialIntegratorState + parameter Modelica.Blocks.Types.Init initType= Modelica.Blocks.Types.Init.InitialState "Type of initialization (1: no init, 2: steady state, 3: initial state, 4: initial output)" annotation(Evaluate=true, Dialog(group="Initialization")); @@ -93,12 +93,9 @@ final y_reset=y_reset, final k=unitTime/Ti, final y_start=xi_start, - final initType=if initType == Modelica.Blocks.Types.InitPID.SteadyState then + final initType=if initType == Modelica.Blocks.Types.Init.SteadyState then Modelica.Blocks.Types.Init.SteadyState - else if initType == Modelica.Blocks.Types.InitPID.InitialState - or initType == Modelica.Blocks.Types.InitPID.DoNotUse_InitialIntegratorState - then Modelica.Blocks.Types.Init.InitialState - else Modelica.Blocks.Types.Init.NoInit) if + else if initType == Modelica.Blocks.Types.Init.InitialState or initType == Modelica.Blocks.Types.Init.InitialState then Modelica.Blocks.Types.Init.InitialState else Modelica.Blocks.Types.Init.NoInit) if with_I "Integral term" annotation (Placement(transformation(extent={{-40,-60},{-20,-40}}))); @@ -106,15 +103,10 @@ final k=Td/unitTime, final T=max([Td/Nd,1.e-14]), final x_start=xd_start, - final initType=if initType == Modelica.Blocks.Types.InitPID.SteadyState or - initType == Modelica.Blocks.Types.InitPID.InitialOutput + final initType=if initType == Modelica.Blocks.Types.Init.SteadyState or initType == Modelica.Blocks.Types.Init.InitialOutput then Modelica.Blocks.Types.Init.SteadyState - else - if initType == Modelica.Blocks.Types.InitPID.InitialState then - Modelica.Blocks.Types.Init.InitialState - else - Modelica.Blocks.Types.Init.NoInit) if with_D "Derivative term" + else if initType == Modelica.Blocks.Types.Init.InitialState then Modelica.Blocks.Types.Init.InitialState else Modelica.Blocks.Types.Init.NoInit) if with_D "Derivative term" annotation (Placement( transformation(extent={{-40,-10},{-20,10}}))); @@ -125,7 +117,7 @@ annotation (Placement(transformation(extent={{0,-10},{20,10}}))); protected - constant Modelica.SIunits.Time unitTime=1 annotation (HideResult=true); + constant Modelica.Units.SI.Time unitTime=1 annotation (HideResult=true); final parameter Real revAct = if reverseAction then -1 else 1 "Switch for sign for reverse action"; @@ -192,14 +184,14 @@ annotation (Placement(transformation(extent={{-80,-90},{-60,-70}}))); initial equation - if initType==Modelica.Blocks.Types.InitPID.InitialOutput then + if initType== Modelica.Blocks.Types.Init.InitialOutput then gainPID.y = y_start; end if; equation assert(yMax >= yMin, "LimPID: Limits must be consistent. However, yMax (=" + String(yMax) + ") < yMin (=" + String(yMin) + ")"); - if initType == Modelica.Blocks.Types.InitPID.InitialOutput and (y_start < yMin or y_start > yMax) then + if initType == Modelica.Blocks.Types.Init.InitialOutput and (y_start < yMin or y_start > yMax) then Modelica.Utilities.Streams.error("LimPID: Start value y_start (=" + String(y_start) + ") is outside of the limits of yMin (=" + String(yMin) +") and yMax (=" + String(yMax) + ")"); end if; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Controls/Continuous/OffTimer.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Controls/Continuous/OffTimer.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Controls/Continuous/OffTimer.mo" 2022-03-10 09:57:42.048144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Controls/Continuous/OffTimer.mo" 2022-03-10 09:58:21.136149591 +0000 @@ -9,7 +9,7 @@ annotation (Placement(transformation(extent={{100,-10},{120,10}}))); protected - discrete Modelica.SIunits.Time entryTime "Time instant when u became true"; + discrete Modelica.Units.SI.Time entryTime "Time instant when u became true"; initial equation pre(entryTime) = time; equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Controls/Continuous/PIDHysteresis.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Controls/Continuous/PIDHysteresis.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Controls/Continuous/PIDHysteresis.mo" 2022-03-10 09:57:42.048144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Controls/Continuous/PIDHysteresis.mo" 2022-03-10 09:58:21.120149590 +0000 @@ -17,9 +17,9 @@ annotation (Dialog(group="Set point tracking")); parameter Real k=1 "Gain of controller" annotation (Dialog(group="Set point tracking")); - parameter Modelica.SIunits.Time Ti "Time constant of Integrator block" + parameter Modelica.Units.SI.Time Ti "Time constant of Integrator block" annotation (Dialog(group="Set point tracking")); - parameter Modelica.SIunits.Time Td "Time constant of Derivative block" + parameter Modelica.Units.SI.Time Td "Time constant of Derivative block" annotation (Dialog(group="Set point tracking")); parameter Real yMax=1 "Upper limit of output" annotation (Dialog(group="Set point tracking")); @@ -37,7 +37,7 @@ "Set to true to enable reverse action (such as for a cooling coil controller)" annotation (Dialog(group="Set point tracking")); - parameter Modelica.Blocks.Types.InitPID initType=Modelica.Blocks.Types.InitPID.DoNotUse_InitialIntegratorState + parameter Modelica.Blocks.Types.Init initType=Modelica.Blocks.Types.Init.InitialState "Type of initialization (1: no init, 2: steady state, 3: initial state, 4: initial output)" annotation (Dialog(group="Initialization")); parameter Real xi_start=0 diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Controls/Continuous/PIDHysteresisTimer.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Controls/Continuous/PIDHysteresisTimer.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Controls/Continuous/PIDHysteresisTimer.mo" 2022-03-10 09:57:42.048144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Controls/Continuous/PIDHysteresisTimer.mo" 2022-03-10 09:58:21.092149586 +0000 @@ -20,9 +20,9 @@ annotation (Dialog(group="Set point tracking")); parameter Real k=1 "Gain of controller" annotation (Dialog(group="Set point tracking")); - parameter Modelica.SIunits.Time Ti "Time constant of Integrator block" + parameter Modelica.Units.SI.Time Ti "Time constant of Integrator block" annotation (Dialog(group="Set point tracking")); - parameter Modelica.SIunits.Time Td "Time constant of Derivative block" + parameter Modelica.Units.SI.Time Td "Time constant of Derivative block" annotation (Dialog(group="Set point tracking")); parameter Real yMax=1 "Upper limit of modulating output" annotation (Dialog(group="Set point tracking")); @@ -41,7 +41,7 @@ "Set to true to enable reverse action (such as for a cooling coil controller)" annotation (Dialog(group="Set point tracking")); - parameter Modelica.Blocks.Types.InitPID initType=Modelica.Blocks.Types.InitPID.DoNotUse_InitialIntegratorState + parameter Modelica.Blocks.Types.Init initType=Modelica.Blocks.Types.Init.InitialState "Type of initialization (1: no init, 2: steady state, 3: initial state, 4: initial output)" annotation (Dialog(group="Initialization")); parameter Real xi_start=0 diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Controls/Continuous/Validation/LimPIDReset.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Controls/Continuous/Validation/LimPIDReset.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Controls/Continuous/Validation/LimPIDReset.mo" 2022-03-10 09:57:42.048144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Controls/Continuous/Validation/LimPIDReset.mo" 2022-03-10 09:58:21.020149577 +0000 @@ -3,7 +3,7 @@ "Test model for PID controller with optional intgerator reset" extends Modelica.Icons.Example; - Modelica.Blocks.Sources.Sine setPoi(freqHz=1) "Set point signal" + Modelica.Blocks.Sources.Sine setPoi(f =1) "Set point signal" annotation (Placement(transformation(extent={{-40,-20},{-20,0}}))); IBPSA.Controls.Continuous.LimPID limPIDPar( yMax=1, @@ -14,13 +14,13 @@ Td=10, k=0.2, controllerType=Modelica.Blocks.Types.SimpleController.PID, - initType=Modelica.Blocks.Types.InitPID.InitialOutput, + initType=Modelica.Blocks.Types.Init.InitialOutput, y_start=0.3) "PId controller with integrator reset to a parameter value" annotation (Placement(transformation(extent={{20,-20},{40,0}}))); Modelica.Blocks.Sources.Constant mea(k=0.5) "Measured signal" annotation (Placement(transformation(extent={{-40,-50},{-20,-30}}))); IBPSA.Controls.Continuous.LimPID limPIDDef( - initType=Modelica.Blocks.Types.InitPID.InitialState, + initType=Modelica.Blocks.Types.Init.InitialState, Td=10, k=1, Ti=1, @@ -44,14 +44,14 @@ k=0.2, Ti=20, controllerType=Modelica.Blocks.Types.SimpleController.PID, - initType=Modelica.Blocks.Types.InitPID.InitialOutput, + initType=Modelica.Blocks.Types.Init.InitialOutput, y_start=0.3) "PId controller with integrator reset to an input value" annotation (Placement(transformation(extent={{20,-80},{40,-60}}))); Modelica.Blocks.Sources.Constant conRes(k=0.9) "Signal to which integrator will be reset to" annotation (Placement(transformation(extent={{-40,-90},{-20,-70}}))); Modelica.Blocks.Continuous.LimPID limPIDOri( - initType=Modelica.Blocks.Types.InitPID.InitialState, + initType=Modelica.Blocks.Types.Init.InitialState, Td=10, k=1, Ti=1, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Controls/SetPoints/HotWaterTemperatureReset.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Controls/SetPoints/HotWaterTemperatureReset.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Controls/SetPoints/HotWaterTemperatureReset.mo" 2022-03-10 09:57:42.048144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Controls/SetPoints/HotWaterTemperatureReset.mo" 2022-03-10 09:58:20.876149558 +0000 @@ -4,23 +4,23 @@ extends Modelica.Blocks.Icons.Block; parameter Real m = 1.3 "Exponent for heat transfer"; - parameter Modelica.SIunits.Temperature TSup_nominal "Supply temperature" + parameter Modelica.Units.SI.Temperature TSup_nominal "Supply temperature" annotation (Dialog(group="Nominal conditions")); - parameter Modelica.SIunits.Temperature TRet_nominal "Return temperature" + parameter Modelica.Units.SI.Temperature TRet_nominal "Return temperature" annotation (Dialog(group="Nominal conditions")); - parameter Modelica.SIunits.Temperature TRoo_nominal = 293.15 + parameter Modelica.Units.SI.Temperature TRoo_nominal = 293.15 "Room temperature" annotation (Dialog(group="Nominal conditions")); - parameter Modelica.SIunits.Temperature TOut_nominal "Outside temperature" + parameter Modelica.Units.SI.Temperature TOut_nominal "Outside temperature" annotation (Dialog(group="Nominal conditions")); parameter Boolean use_TRoo_in = false "Get the room temperature set point from the input connector" annotation(Evaluate=true, HideResult=true); - parameter Modelica.SIunits.Temperature TRoo = 293.15 + parameter Modelica.Units.SI.Temperature TRoo = 293.15 "Fixed value of room temperature set point" annotation(Dialog(enable = not use_TRoo_in)); - parameter Modelica.SIunits.TemperatureDifference dTOutHeaBal(displayUnit="K") = 8 + parameter Modelica.Units.SI.TemperatureDifference dTOutHeaBal(displayUnit="K") = 8 "Offset for heating curve"; Modelica.Blocks.Interfaces.RealInput TRoo_in(final quantity="ThermodynamicTemperature", final unit = "K", displayUnit = "degC", min=0) if @@ -45,11 +45,11 @@ final unit = "K", displayUnit = "degC", min=0) "Needed to connect to conditional connector"; Real qRel "Relative heating load = Q_flow/Q_flow_nominal"; - Modelica.SIunits.Temperature TOutOffSet + + Modelica.Units.SI.Temperature TOutOffSet "Effective outside temperature for heat transfer (takes into account room heat gains)"; - parameter Modelica.SIunits.Temperature TOutOffSet_nominal = TOut_nominal + dTOutHeaBal + parameter Modelica.Units.SI.Temperature TOutOffSet_nominal = TOut_nominal + dTOutHeaBal "Effective outside temperature for heat transfer at nominal conditions (takes into account room heat gains)"; - equation connect(TRoo_in, TRoo_in_internal); if not use_TRoo_in then diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Controls/SetPoints/OccupancySchedule.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Controls/SetPoints/OccupancySchedule.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Controls/SetPoints/OccupancySchedule.mo" 2022-03-10 09:57:42.048144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Controls/SetPoints/OccupancySchedule.mo" 2022-03-10 09:58:20.852149555 +0000 @@ -6,7 +6,7 @@ "Occupancy table, each entry switching occupancy on or off"; parameter Boolean firstEntryOccupied = true "Set to true if first entry in occupancy denotes a changed from unoccupied to occupied"; - parameter Modelica.SIunits.Time period = 86400 "End time of periodicity"; + parameter Modelica.Units.SI.Time period = 86400 "End time of periodicity"; Modelica.Blocks.Interfaces.RealOutput tNexNonOcc "Time until next non-occupancy" @@ -21,7 +21,7 @@ final parameter Integer nRow = size(occupancy,1) "Number of rows in the schedule"; - output Modelica.SIunits.Time offSet=integer(time/period)*period + output Modelica.Units.SI.Time offSet=integer(time/period)*period "Time off-set, in multiples of period, that is used to switch the time when doing the table lookup"; output Integer nexStaInd "Next index when occupancy starts"; output Integer nexStoInd "Next index when occupancy stops"; @@ -31,8 +31,8 @@ output Integer iPerSto "Counter for the period in which the next occupancy stops"; - output Modelica.SIunits.Time tOcc "Time when next occupancy starts"; - output Modelica.SIunits.Time tNonOcc "Time when next non-occupancy starts"; + output Modelica.Units.SI.Time tOcc "Time when next occupancy starts"; + output Modelica.Units.SI.Time tNonOcc "Time when next non-occupancy starts"; encapsulated function switchInteger import Modelica; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Controls/SetPoints/Table.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Controls/SetPoints/Table.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Controls/SetPoints/Table.mo" 2022-03-10 09:57:42.048144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Controls/SetPoints/Table.mo" 2022-03-10 09:58:20.828149552 +0000 @@ -16,7 +16,7 @@ size(table,1) "Number of rows"; final parameter Real[nRow,2] offsetVector = [zeros(nRow), offset*ones(nRow)] "Vector to take offset of output signal into account"; - Modelica.Blocks.Tables.CombiTable1D tab( + Modelica.Blocks.Tables.CombiTable1Dv tab( tableOnFile=false, final table= (if constantExtrapolation then cat(1, [table[1,1]-1, table[1,2]], diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Experimental/Benchmarks/AirFlow/Components/Floor.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Experimental/Benchmarks/AirFlow/Components/Floor.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Experimental/Benchmarks/AirFlow/Components/Floor.mo" 2022-03-10 09:57:42.048144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Experimental/Benchmarks/AirFlow/Components/Floor.mo" 2022-03-10 09:58:20.732149540 +0000 @@ -7,17 +7,17 @@ parameter Integer nZones(min=1) = 4 "Number of zone elements"; - parameter Modelica.SIunits.Temperature TRoom = 298.15 + parameter Modelica.Units.SI.Temperature TRoom = 298.15 "Indoor air temperature of room in K"; - parameter Modelica.SIunits.Temperature THallway = 293.15 + parameter Modelica.Units.SI.Temperature THallway = 293.15 "Indoor air temperature of hallway in K"; - parameter Modelica.SIunits.Temperature TStaircase = 293.15 + parameter Modelica.Units.SI.Temperature TStaircase = 293.15 "Indoor air temperature of staircase in K"; - parameter Modelica.SIunits.Height heightRooms = 3 "Height of rooms in m"; + parameter Modelica.Units.SI.Height heightRooms = 3 "Height of rooms in m"; - parameter Modelica.SIunits.Length lengthZone = 5 "Length of room in m"; - parameter Modelica.SIunits.Length widthZone = 5 "Width of room in m"; - parameter Modelica.SIunits.Length widthHallway = 3 "Width of room in m"; + parameter Modelica.Units.SI.Length lengthZone = 5 "Length of room in m"; + parameter Modelica.Units.SI.Length widthZone = 5 "Width of room in m"; + parameter Modelica.Units.SI.Length widthHallway = 3 "Width of room in m"; parameter Real doorOpening = 1 "Opening of door (between 0:closed and 1:open)"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Experimental/Benchmarks/AirFlow/Components/OutsideEnvironment.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Experimental/Benchmarks/AirFlow/Components/OutsideEnvironment.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Experimental/Benchmarks/AirFlow/Components/OutsideEnvironment.mo" 2022-03-10 09:57:42.048144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Experimental/Benchmarks/AirFlow/Components/OutsideEnvironment.mo" 2022-03-10 09:58:20.704149537 +0000 @@ -5,7 +5,7 @@ replaceable package Medium = Modelica.Media.Interfaces.PartialMedium "Medium in the component"; - parameter Modelica.SIunits.Height heightRoom = 3 + parameter Modelica.Units.SI.Height heightRoom = 3 "Height of room connected to outdoor air in m"; Airflow.Multizone.MediumColumn colOutBot( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Experimental/Benchmarks/AirFlow/Components/SimpleZone.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Experimental/Benchmarks/AirFlow/Components/SimpleZone.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Experimental/Benchmarks/AirFlow/Components/SimpleZone.mo" 2022-03-10 09:57:42.048144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Experimental/Benchmarks/AirFlow/Components/SimpleZone.mo" 2022-03-10 09:58:20.688149534 +0000 @@ -6,11 +6,11 @@ parameter Medium.Temperature TRoom(start=293.15) = 293.15 "Indoor air temperature of room in K"; - parameter Modelica.SIunits.Height heightRoom = 3 "Height of room in m"; - parameter Modelica.SIunits.Length lengthRoom = 5 "Length of room in m"; - parameter Modelica.SIunits.Length widthRoom = 5 "Width of room in m"; + parameter Modelica.Units.SI.Height heightRoom = 3 "Height of room in m"; + parameter Modelica.Units.SI.Length lengthRoom = 5 "Length of room in m"; + parameter Modelica.Units.SI.Length widthRoom = 5 "Width of room in m"; - parameter Modelica.SIunits.CoefficientOfHeatTransfer UValue = 1 + parameter Modelica.Units.SI.CoefficientOfHeatTransfer UValue = 1 "Heat transfer coefficient for outside wall"; parameter Real doorOpening = 1 diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Experimental/Benchmarks/AirFlow/Components/Staircase.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Experimental/Benchmarks/AirFlow/Components/Staircase.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Experimental/Benchmarks/AirFlow/Components/Staircase.mo" 2022-03-10 09:57:42.048144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Experimental/Benchmarks/AirFlow/Components/Staircase.mo" 2022-03-10 09:58:20.660149532 +0000 @@ -5,15 +5,15 @@ replaceable package Medium = Modelica.Media.Interfaces.PartialMedium "Medium in the component"; - parameter Modelica.SIunits.Temperature TRoom = 293.15 + parameter Modelica.Units.SI.Temperature TRoom = 293.15 "Indoor air temperature of room in K"; - parameter Modelica.SIunits.Height heightRoom = 3 "Height of room in m"; - parameter Modelica.SIunits.Length lengthRoom = 3 "Length of room in m"; - parameter Modelica.SIunits.Length widthRoom = 3 "Width of room in m"; + parameter Modelica.Units.SI.Height heightRoom = 3 "Height of room in m"; + parameter Modelica.Units.SI.Length lengthRoom = 3 "Length of room in m"; + parameter Modelica.Units.SI.Length widthRoom = 3 "Width of room in m"; parameter Real doorOpening = 1 "Opening of door (between 0:closed and 1:open)"; - parameter Modelica.SIunits.CoefficientOfHeatTransfer UValue = 1 + parameter Modelica.Units.SI.CoefficientOfHeatTransfer UValue = 1 "Heat transfer coefficient for outside wall"; parameter Boolean forceErrorControlOnFlow = true diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Experimental/Benchmarks/AirFlow/Components/ZoneHallway.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Experimental/Benchmarks/AirFlow/Components/ZoneHallway.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Experimental/Benchmarks/AirFlow/Components/ZoneHallway.mo" 2022-03-10 09:57:42.048144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Experimental/Benchmarks/AirFlow/Components/ZoneHallway.mo" 2022-03-10 09:58:20.612149525 +0000 @@ -5,13 +5,13 @@ replaceable package Medium = Modelica.Media.Interfaces.PartialMedium "Medium in the component"; - parameter Modelica.SIunits.Temperature TRoom = 293.15 + parameter Modelica.Units.SI.Temperature TRoom = 293.15 "Indoor air temperature of room in K"; - parameter Modelica.SIunits.Height heightRoom = 3 "Height of room in m"; - parameter Modelica.SIunits.Length lengthRoom = 5 "Length of room in m"; - parameter Modelica.SIunits.Length widthRoom = 3 "Width of room in m"; + parameter Modelica.Units.SI.Height heightRoom = 3 "Height of room in m"; + parameter Modelica.Units.SI.Length lengthRoom = 5 "Length of room in m"; + parameter Modelica.Units.SI.Length widthRoom = 3 "Width of room in m"; - parameter Modelica.SIunits.CoefficientOfHeatTransfer UValue = 1 + parameter Modelica.Units.SI.CoefficientOfHeatTransfer UValue = 1 "Heat transfer coefficient for outside wall"; parameter Boolean forceErrorControlOnFlow = true diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Experimental/Benchmarks/AirFlow/Examples/MultipleFloorsVectors.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Experimental/Benchmarks/AirFlow/Examples/MultipleFloorsVectors.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Experimental/Benchmarks/AirFlow/Examples/MultipleFloorsVectors.mo" 2022-03-10 09:57:42.048144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Experimental/Benchmarks/AirFlow/Examples/MultipleFloorsVectors.mo" 2022-03-10 09:58:20.552149518 +0000 @@ -8,17 +8,17 @@ parameter Integer nZones(min=1) = 4 "Number of zone elements per floor"; parameter Integer nFloors(min=2) = 2 "Number of floors"; - parameter Modelica.SIunits.Temperature TRoom = 298.15 + parameter Modelica.Units.SI.Temperature TRoom = 298.15 "Indoor air temperature of room in K"; - parameter Modelica.SIunits.Temperature THallway = 293.15 + parameter Modelica.Units.SI.Temperature THallway = 293.15 "Indoor air temperature of hallway in K"; - parameter Modelica.SIunits.Temperature TStaircase = 293.15 + parameter Modelica.Units.SI.Temperature TStaircase = 293.15 "Indoor air temperature of staircase in K"; - parameter Modelica.SIunits.Height heightRooms = 3 "Height of rooms in m"; + parameter Modelica.Units.SI.Height heightRooms = 3 "Height of rooms in m"; - parameter Modelica.SIunits.Length lengthZone = 5 "Length of room in m"; - parameter Modelica.SIunits.Length widthZone = 5 "Width of room in m"; - parameter Modelica.SIunits.Length widthHallway = 3 "Width of room in m"; + parameter Modelica.Units.SI.Length lengthZone = 5 "Length of room in m"; + parameter Modelica.Units.SI.Length widthZone = 5 "Width of room in m"; + parameter Modelica.Units.SI.Length widthHallway = 3 "Width of room in m"; parameter Real doorOpening = 1 "Opening of door (between 0:closed and 1:open)"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Experimental/Benchmarks/AirFlow/Examples/ZoneStepResponse.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Experimental/Benchmarks/AirFlow/Examples/ZoneStepResponse.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Experimental/Benchmarks/AirFlow/Examples/ZoneStepResponse.mo" 2022-03-10 09:57:42.048144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Experimental/Benchmarks/AirFlow/Examples/ZoneStepResponse.mo" 2022-03-10 09:58:20.400149499 +0000 @@ -5,7 +5,7 @@ replaceable package Medium = IBPSA.Media.Air "Medium in the component"; - output Modelica.SIunits.Temperature TRoom = simpleZone.volRoom.heatPort.T + output Modelica.Units.SI.Temperature TRoom = simpleZone.volRoom.heatPort.T "Room temperature at volume's therm port"; Components.SimpleZone simpleZone(redeclare package Medium = Medium) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Actuators/BaseClasses/ActuatorSignal.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Actuators/BaseClasses/ActuatorSignal.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Actuators/BaseClasses/ActuatorSignal.mo" 2022-03-10 09:57:42.048144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Actuators/BaseClasses/ActuatorSignal.mo" 2022-03-10 09:58:20.380149495 +0000 @@ -5,7 +5,7 @@ parameter Boolean use_inputFilter=true "= true, if opening is filtered with a 2nd order CriticalDamping filter" annotation(Dialog(tab="Dynamics", group="Filtered opening")); - parameter Modelica.SIunits.Time riseTime=120 + parameter Modelica.Units.SI.Time riseTime=120 "Rise time of the filter (time to reach 99.6 % of an opening step)" annotation(Dialog(tab="Dynamics", group="Filtered opening",enable=use_inputFilter)); parameter Integer order(min=1) = 2 "Order of filter" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Actuators/BaseClasses/PartialDamperExponential.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Actuators/BaseClasses/PartialDamperExponential.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Actuators/BaseClasses/PartialDamperExponential.mo" 2022-03-10 09:57:42.048144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Actuators/BaseClasses/PartialDamperExponential.mo" 2022-03-10 09:58:20.344149492 +0000 @@ -11,8 +11,8 @@ parameter Real deltaM = 0.3 "Fraction of nominal mass flow rate where transition to turbulent occurs" annotation(Dialog(enable=use_deltaM)); - parameter Modelica.SIunits.Velocity v_nominal = 1 "Nominal face velocity"; - final parameter Modelica.SIunits.Area A=m_flow_nominal/rho_default/v_nominal + parameter Modelica.Units.SI.Velocity v_nominal = 1 "Nominal face velocity"; + final parameter Modelica.Units.SI.Area A=m_flow_nominal/rho_default/v_nominal "Face area"; parameter Boolean roundDuct = false diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Actuators/BaseClasses/PartialThreeWayValve.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Actuators/BaseClasses/PartialThreeWayValve.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Actuators/BaseClasses/PartialThreeWayValve.mo" 2022-03-10 09:57:42.048144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Actuators/BaseClasses/PartialThreeWayValve.mo" 2022-03-10 09:58:20.324149489 +0000 @@ -37,7 +37,7 @@ extends IBPSA.Fluid.Actuators.BaseClasses.ValveParameters( rhoStd=Medium.density_pTX(101325, 273.15+4, Medium.X_default)); - parameter Modelica.SIunits.PressureDifference dpFixed_nominal[2](each displayUnit="Pa", + parameter Modelica.Units.SI.PressureDifference dpFixed_nominal[2](each displayUnit="Pa", each min=0) = {0, 0} "Nominal pressure drop of pipes and other equipment in flow legs at port_1 and port_3" annotation(Dialog(group="Nominal condition")); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Actuators/BaseClasses/PartialTwoWayValve.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Actuators/BaseClasses/PartialTwoWayValve.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Actuators/BaseClasses/PartialTwoWayValve.mo" 2022-03-10 09:57:42.048144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Actuators/BaseClasses/PartialTwoWayValve.mo" 2022-03-10 09:58:20.292149485 +0000 @@ -10,7 +10,7 @@ rhoStd=Medium.density_pTX(101325, 273.15+4, Medium.X_default)); extends IBPSA.Fluid.Actuators.BaseClasses.ActuatorSignal; - parameter Modelica.SIunits.PressureDifference dpFixed_nominal(displayUnit="Pa", min=0) = 0 + parameter Modelica.Units.SI.PressureDifference dpFixed_nominal(displayUnit="Pa", min=0) = 0 "Pressure drop of pipe and other resistances that are in series" annotation(Dialog(group = "Nominal condition")); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Actuators/BaseClasses/ValveParameters.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Actuators/BaseClasses/ValveParameters.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Actuators/BaseClasses/ValveParameters.mo" 2022-03-10 09:57:42.048144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Actuators/BaseClasses/ValveParameters.mo" 2022-03-10 09:58:20.264149481 +0000 @@ -14,7 +14,7 @@ "Cv (US) flow coefficient [USG/min/(psi)^(1/2)]" annotation(Dialog(group = "Flow Coefficient", enable = (CvData==IBPSA.Fluid.Types.CvTypes.Cv))); - parameter Modelica.SIunits.Area Av( + parameter Modelica.Units.SI.Area Av( fixed= if CvData==IBPSA.Fluid.Types.CvTypes.Av then true else false) "Av (metric) flow coefficient" annotation(Dialog(group = "Flow Coefficient", @@ -23,10 +23,11 @@ parameter Real deltaM = 0.02 "Fraction of nominal flow rate where linearization starts, if y=1" annotation(Dialog(group="Pressure-flow linearization")); - parameter Modelica.SIunits.MassFlowRate m_flow_nominal + + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal "Nominal mass flow rate" annotation(Dialog(group = "Nominal condition")); - parameter Modelica.SIunits.PressureDifference dpValve_nominal( + parameter Modelica.Units.SI.PressureDifference dpValve_nominal( displayUnit="Pa", min=0, fixed= if CvData==IBPSA.Fluid.Types.CvTypes.OpPoint then true else false) @@ -34,10 +35,9 @@ annotation(Dialog(group="Nominal condition", enable = (CvData==IBPSA.Fluid.Types.CvTypes.OpPoint))); - parameter Modelica.SIunits.Density rhoStd + parameter Modelica.Units.SI.Density rhoStd "Inlet density for which valve coefficients are defined" annotation(Dialog(group="Nominal condition", tab="Advanced")); - protected parameter Real Kv_SI( min=0, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Actuators/Dampers/MixingBox.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Actuators/Dampers/MixingBox.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Actuators/Dampers/MixingBox.mo" 2022-03-10 09:57:42.048144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Actuators/Dampers/MixingBox.mo" 2022-03-10 09:58:20.132149464 +0000 @@ -37,7 +37,7 @@ parameter Real deltaM = 0.3 "Fraction of nominal mass flow rate where transition to turbulent occurs" annotation(Dialog(enable=use_deltaM)); - parameter Modelica.SIunits.Velocity v_nominal=1 "Nominal face velocity"; + parameter Modelica.Units.SI.Velocity v_nominal=1 "Nominal face velocity"; parameter Boolean roundDuct = false "Set to true for round duct, false for square cross section" @@ -97,24 +97,24 @@ "set to true if dp_nominal includes the pressure loss of the open damper" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.MassFlowRate mOut_flow_nominal + parameter Modelica.Units.SI.MassFlowRate mOut_flow_nominal "Mass flow rate outside air damper" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.PressureDifference dpOut_nominal(min=0, displayUnit="Pa") + parameter Modelica.Units.SI.PressureDifference dpOut_nominal(min=0, displayUnit="Pa") "Pressure drop outside air leg" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.MassFlowRate mRec_flow_nominal + parameter Modelica.Units.SI.MassFlowRate mRec_flow_nominal "Mass flow rate recirculation air damper" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.PressureDifference dpRec_nominal(min=0, displayUnit="Pa") + parameter Modelica.Units.SI.PressureDifference dpRec_nominal(min=0, displayUnit="Pa") "Pressure drop recirculation air leg" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.MassFlowRate mExh_flow_nominal + parameter Modelica.Units.SI.MassFlowRate mExh_flow_nominal "Mass flow rate exhaust air damper" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.PressureDifference dpExh_nominal(min=0, displayUnit="Pa") + parameter Modelica.Units.SI.PressureDifference dpExh_nominal(min=0, displayUnit="Pa") "Pressure drop exhaust air leg" annotation (Dialog(group="Nominal condition")); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Actuators/Dampers/PressureIndependent.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Actuators/Dampers/PressureIndependent.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Actuators/Dampers/PressureIndependent.mo" 2022-03-10 09:57:42.048144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Actuators/Dampers/PressureIndependent.mo" 2022-03-10 09:58:20.072149457 +0000 @@ -12,8 +12,8 @@ parameter Real deltaM = 0.3 "Fraction of nominal mass flow rate where transition to turbulent occurs" annotation(Dialog(enable=use_deltaM)); - parameter Modelica.SIunits.Velocity v_nominal = 1 "Nominal face velocity"; - final parameter Modelica.SIunits.Area A=m_flow_nominal/rho_default/v_nominal + parameter Modelica.Units.SI.Velocity v_nominal = 1 "Nominal face velocity"; + final parameter Modelica.Units.SI.Area A=m_flow_nominal/rho_default/v_nominal "Face area"; parameter Boolean roundDuct = false @@ -24,7 +24,7 @@ parameter Boolean use_constant_density=true "Set to true to use constant density for flow friction" annotation (Evaluate=true, Dialog(tab="Advanced")); - parameter Modelica.SIunits.PressureDifference dpFixed_nominal(displayUnit="Pa", min=0) = 0 + parameter Modelica.Units.SI.PressureDifference dpFixed_nominal(displayUnit="Pa", min=0) = 0 "Pressure drop of duct and other resistances that are in series" annotation(Dialog(group = "Nominal condition")); parameter Real l(min=1e-10, max=1) = 0.0001 @@ -55,17 +55,17 @@ "Parameter for avoiding unnecessary computations"; constant Real y2dd = 0 "Second derivative at second support point"; - Modelica.SIunits.MassFlowRate m_flow_set + Modelica.Units.SI.MassFlowRate m_flow_set "Requested mass flow rate"; - Modelica.SIunits.PressureDifference dp_min(displayUnit="Pa") + Modelica.Units.SI.PressureDifference dp_min(displayUnit="Pa") "Minimum pressure difference required for delivering requested mass flow rate"; - Modelica.SIunits.PressureDifference dp_x, dp_x1, dp_x2, dp_y2, dp_y1 + Modelica.Units.SI.PressureDifference dp_x, dp_x1, dp_x2, dp_y2, dp_y1 "Support points for interpolation flow functions"; - Modelica.SIunits.MassFlowRate m_flow_x, m_flow_x1, m_flow_x2, m_flow_y2, m_flow_y1 + Modelica.Units.SI.MassFlowRate m_flow_x, m_flow_x1, m_flow_x2, m_flow_y2, m_flow_y1 "Support points for interpolation flow functions"; - Modelica.SIunits.MassFlowRate m_flow_smooth + Modelica.Units.SI.MassFlowRate m_flow_smooth "Smooth interpolation result between two flow regimes"; - Modelica.SIunits.PressureDifference dp_smooth + Modelica.Units.SI.PressureDifference dp_smooth "Smooth interpolation result between two flow regimes"; initial equation assert(m_flow_turbulent > 0, "m_flow_turbulent must be bigger than zero."); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Actuators/Dampers/VAVBoxExponential.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Actuators/Dampers/VAVBoxExponential.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Actuators/Dampers/VAVBoxExponential.mo" 2022-03-10 09:57:42.048144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Actuators/Dampers/VAVBoxExponential.mo" 2022-03-10 09:58:20.004149448 +0000 @@ -8,7 +8,7 @@ "set to true if dp_nominal includes the pressure loss of the open damper" annotation(Dialog(group = "Nominal condition")); protected - parameter Modelica.SIunits.PressureDifference dpDamOpe_nominal(displayUnit="Pa")= + parameter Modelica.Units.SI.PressureDifference dpDamOpe_nominal(displayUnit="Pa")= k1*m_flow_nominal^2/2/Medium.density(sta_default)/A^2 "Pressure drop of fully open damper at nominal flow rate"; parameter Real kResSqu(unit="kg.m", fixed=false) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Actuators/Motors/IdealMotor.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Actuators/Motors/IdealMotor.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Actuators/Motors/IdealMotor.mo" 2022-03-10 09:57:42.048144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Actuators/Motors/IdealMotor.mo" 2022-03-10 09:58:19.964149444 +0000 @@ -3,8 +3,8 @@ extends Modelica.Blocks.Interfaces.SISO; parameter Real delta(min=0, max=0.5) = 0.05 "Hysteresis"; - parameter Modelica.SIunits.Time tOpe(min=0) = 120 "Opening time"; - parameter Modelica.SIunits.Time tClo(min=0) = tOpe "Closing time"; + parameter Modelica.Units.SI.Time tOpe(min=0) = 120 "Opening time"; + parameter Modelica.Units.SI.Time tClo(min=0) = tOpe "Closing time"; parameter Real y_start(min=0, max=1) = 0.5 "Start position"; Modelica.Blocks.Logical.Hysteresis uppHys(final uLow=0, uHigh=delta, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Actuators/Valves/TwoWayPressureIndependent.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Actuators/Valves/TwoWayPressureIndependent.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Actuators/Valves/TwoWayPressureIndependent.mo" 2022-03-10 09:57:42.052144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Actuators/Valves/TwoWayPressureIndependent.mo" 2022-03-10 09:58:19.708149410 +0000 @@ -18,19 +18,19 @@ "Parameter for avoiding unnecessary computations"; constant Real y2dd = 0 "Second derivative at second support point"; - Modelica.SIunits.MassFlowRate m_flow_set + + Modelica.Units.SI.MassFlowRate m_flow_set "Requested mass flow rate"; - Modelica.SIunits.PressureDifference dp_min(displayUnit="Pa") + Modelica.Units.SI.PressureDifference dp_min(displayUnit="Pa") "Minimum pressure difference required for delivering requested mass flow rate"; - Modelica.SIunits.PressureDifference dp_x, dp_x1, dp_x2, dp_y2, dp_y1 + Modelica.Units.SI.PressureDifference dp_x, dp_x1, dp_x2, dp_y2, dp_y1 "Support points for interpolation flow functions"; - Modelica.SIunits.MassFlowRate m_flow_x, m_flow_x1, m_flow_x2, m_flow_y2, m_flow_y1 + Modelica.Units.SI.MassFlowRate m_flow_x, m_flow_x1, m_flow_x2, m_flow_y2, m_flow_y1 "Support points for interpolation flow functions"; - Modelica.SIunits.MassFlowRate m_flow_smooth + Modelica.Units.SI.MassFlowRate m_flow_smooth "Smooth interpolation result between two flow regimes"; - Modelica.SIunits.PressureDifference dp_smooth + Modelica.Units.SI.PressureDifference dp_smooth "Smooth interpolation result between two flow regimes"; - equation m_flow_set = m_flow_nominal*phi; kVal = Kv_SI; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Actuators/Valves/TwoWayTable.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Actuators/Valves/TwoWayTable.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Actuators/Valves/TwoWayTable.mo" 2022-03-10 09:57:42.052144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Actuators/Valves/TwoWayTable.mo" 2022-03-10 09:58:19.664149405 +0000 @@ -11,7 +11,7 @@ // 1/k^2, the flowCharacteristics.phi[1] must not be zero. // We therefore set a lower bound. protected - Modelica.Blocks.Tables.CombiTable1D phiLooUp( + Modelica.Blocks.Tables.CombiTable1Dv phiLooUp( final tableOnFile=false, final table=[flowCharacteristics.y, cat( 1, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Actuators/Valves/Validation/ThreeWayValveParameterization.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Actuators/Valves/Validation/ThreeWayValveParameterization.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Actuators/Valves/Validation/ThreeWayValveParameterization.mo" 2022-03-10 09:57:42.052144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Actuators/Valves/Validation/ThreeWayValveParameterization.mo" 2022-03-10 09:58:19.620149399 +0000 @@ -4,9 +4,9 @@ extends Modelica.Icons.Example; package Medium = IBPSA.Media.Water "Medium in the component"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 0.4 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 0.4 "Design mass flow rate"; - parameter Modelica.SIunits.PressureDifference dp_nominal = 4500 + parameter Modelica.Units.SI.PressureDifference dp_nominal = 4500 "Design pressure drop"; parameter Real Kv_SI = m_flow_nominal/sqrt(dp_nominal) @@ -16,10 +16,10 @@ "Kv (metric) flow coefficient [m3/h/(bar)^(1/2)]"; parameter Real Cv = Kv_SI/(rhoStd*0.0631/1000/sqrt(6895)) "Cv (US) flow coefficient [USG/min/(psi)^(1/2)]"; - parameter Modelica.SIunits.Area Av = Kv_SI/sqrt(rhoStd) + parameter Modelica.Units.SI.Area Av = Kv_SI/sqrt(rhoStd) "Av (metric) flow coefficient"; - parameter Modelica.SIunits.Density rhoStd= + parameter Modelica.Units.SI.Density rhoStd= Medium.density_pTX(101325, 273.15+4, Medium.X_default) "Standard density"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Actuators/Valves/Validation/TwoWayValveParameterization.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Actuators/Valves/Validation/TwoWayValveParameterization.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Actuators/Valves/Validation/TwoWayValveParameterization.mo" 2022-03-10 09:57:42.052144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Actuators/Valves/Validation/TwoWayValveParameterization.mo" 2022-03-10 09:58:19.596149396 +0000 @@ -6,9 +6,9 @@ package Medium = IBPSA.Media.Water; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 0.4 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 0.4 "Design mass flow rate"; - parameter Modelica.SIunits.PressureDifference dp_nominal = 4500 + parameter Modelica.Units.SI.PressureDifference dp_nominal = 4500 "Design pressure drop"; parameter Real Kv_SI = m_flow_nominal/sqrt(dp_nominal) @@ -18,10 +18,10 @@ "Kv (metric) flow coefficient [m3/h/(bar)^(1/2)]"; parameter Real Cv = Kv_SI/(rhoStd*0.0631/1000/sqrt(6895)) "Cv (US) flow coefficient [USG/min/(psi)^(1/2)]"; - parameter Modelica.SIunits.Area Av = Kv_SI/sqrt(rhoStd) + parameter Modelica.Units.SI.Area Av = Kv_SI/sqrt(rhoStd) "Av (metric) flow coefficient"; - parameter Modelica.SIunits.Density rhoStd= + parameter Modelica.Units.SI.Density rhoStd= Medium.density_pTX(101325, 273.15+4, Medium.X_default) "Standard density"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_dp_DerivativeCheck.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_dp_DerivativeCheck.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_dp_DerivativeCheck.mo" 2022-03-10 09:57:42.052144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_dp_DerivativeCheck.mo" 2022-03-10 09:58:19.544149390 +0000 @@ -6,12 +6,12 @@ constant Real gain = 2 "Gain for computing the mass flow rate"; parameter Real k = 0.35 "Flow coefficient"; - parameter Modelica.SIunits.MassFlowRate m_flow_turbulent = 0.36 + parameter Modelica.Units.SI.MassFlowRate m_flow_turbulent = 0.36 "Mass flow rate where transition to turbulent flow occurs"; - Modelica.SIunits.MassFlowRate m_flow "Mass flow rate"; - Modelica.SIunits.MassFlowRate m_flow_comp "Comparison value for m_flow"; - Modelica.SIunits.PressureDifference dp "Pressure drop"; - Modelica.SIunits.MassFlowRate err "Integration error"; + Modelica.Units.SI.MassFlowRate m_flow "Mass flow rate"; + Modelica.Units.SI.MassFlowRate m_flow_comp "Comparison value for m_flow"; + Modelica.Units.SI.PressureDifference dp "Pressure drop"; + Modelica.Units.SI.MassFlowRate err "Integration error"; initial equation m_flow = m_flow_comp; equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_dp_DerivativeCheck2.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_dp_DerivativeCheck2.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_dp_DerivativeCheck2.mo" 2022-03-10 09:57:42.052144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_dp_DerivativeCheck2.mo" 2022-03-10 09:58:19.532149388 +0000 @@ -4,16 +4,16 @@ extends Modelica.Icons.Example; parameter Real k = 0.35 "Flow coefficient"; - parameter Modelica.SIunits.MassFlowRate m_flow_turbulent = 0.36 + parameter Modelica.Units.SI.MassFlowRate m_flow_turbulent = 0.36 "Mass flow rate where transition to turbulent flow occurs"; - Modelica.SIunits.MassFlowRate m_flow "Mass flow rate"; - Modelica.SIunits.MassFlowRate m_flow_comp "Comparison value for m_flow"; + Modelica.Units.SI.MassFlowRate m_flow "Mass flow rate"; + Modelica.Units.SI.MassFlowRate m_flow_comp "Comparison value for m_flow"; Real der_m_flow(unit="kg/s2") "1st order derivative of mass flow rate"; Real der_m_flow_comp(unit="kg/s2") "2nd order derivative of comparison value for m_flow"; - Modelica.SIunits.PressureDifference dp "Pressure drop"; - Modelica.SIunits.MassFlowRate err_m_flow "Integration error for m_flow"; + Modelica.Units.SI.PressureDifference dp "Pressure drop"; + Modelica.Units.SI.MassFlowRate err_m_flow "Integration error for m_flow"; Real err_der_m_flow(unit="kg/s2") "Integration error for der_m_flow"; initial equation m_flow = m_flow_comp; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_m_flow_DerivativeCheck.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_m_flow_DerivativeCheck.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_m_flow_DerivativeCheck.mo" 2022-03-10 09:57:42.052144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_m_flow_DerivativeCheck.mo" 2022-03-10 09:58:19.520149386 +0000 @@ -6,12 +6,12 @@ constant Real gain = 0.5 "Gain for computing the mass flow rate"; parameter Real k = 0.35 "Flow coefficient"; - parameter Modelica.SIunits.MassFlowRate m_flow_turbulent = 0.36 + parameter Modelica.Units.SI.MassFlowRate m_flow_turbulent = 0.36 "Mass flow rate where transition to turbulent flow occurs"; - Modelica.SIunits.MassFlowRate m_flow "Mass flow rate"; - Modelica.SIunits.PressureDifference dp "Pressure drop"; - Modelica.SIunits.PressureDifference dp_comp "Comparison value for dp"; - Modelica.SIunits.PressureDifference err "Integration error"; + Modelica.Units.SI.MassFlowRate m_flow "Mass flow rate"; + Modelica.Units.SI.PressureDifference dp "Pressure drop"; + Modelica.Units.SI.PressureDifference dp_comp "Comparison value for dp"; + Modelica.Units.SI.PressureDifference err "Integration error"; initial equation dp = dp_comp; equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_m_flow_DerivativeCheck2.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_m_flow_DerivativeCheck2.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_m_flow_DerivativeCheck2.mo" 2022-03-10 09:57:42.052144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_m_flow_DerivativeCheck2.mo" 2022-03-10 09:58:19.508149385 +0000 @@ -9,17 +9,17 @@ threShold=1e-3) "Block for checking integration error"; parameter Real k = 0.35 "Flow coefficient"; - parameter Modelica.SIunits.MassFlowRate m_flow_turbulent = 0.36 + parameter Modelica.Units.SI.MassFlowRate m_flow_turbulent = 0.36 "Mass flow rate where transition to turbulent flow occurs"; - Modelica.SIunits.PressureDifference dp "Pressure drop"; - Modelica.SIunits.PressureDifference dp_comp "Comparison value for dp"; + Modelica.Units.SI.PressureDifference dp "Pressure drop"; + Modelica.Units.SI.PressureDifference dp_comp "Comparison value for dp"; Real der_dp(unit="Pa/s") "1st order derivative of pressure drop"; Real der_dp_comp(unit="Pa/s") "2nd order derivative of comparison value for pressure drop"; - Modelica.SIunits.MassFlowRate m_flow "Mass flow rate"; + Modelica.Units.SI.MassFlowRate m_flow "Mass flow rate"; - Modelica.SIunits.PressureDifference err_dp "Integration error for dp"; + Modelica.Units.SI.PressureDifference err_dp "Integration error for dp"; Real err_der_dp(unit="Pa/s") "Integration error for der_dp"; initial equation dp = dp_comp; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/BaseClasses/FlowModels/Validation/InverseFlowFunctions.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/BaseClasses/FlowModels/Validation/InverseFlowFunctions.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/BaseClasses/FlowModels/Validation/InverseFlowFunctions.mo" 2022-03-10 09:57:42.052144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/BaseClasses/FlowModels/Validation/InverseFlowFunctions.mo" 2022-03-10 09:58:19.496149385 +0000 @@ -1,15 +1,15 @@ within IBPSA.Fluid.BaseClasses.FlowModels.Validation; model InverseFlowFunctions "Test model for flow function and its inverse" extends Modelica.Icons.Example; - Modelica.SIunits.MassFlowRate m_flow; - Modelica.SIunits.PressureDifference dp(displayUnit="Pa") "Pressure difference"; - Modelica.SIunits.PressureDifference dpCalc(displayUnit="Pa") + Modelica.Units.SI.MassFlowRate m_flow; + Modelica.Units.SI.PressureDifference dp(displayUnit="Pa") "Pressure difference"; + Modelica.Units.SI.PressureDifference dpCalc(displayUnit="Pa") "Pressure difference computed by the flow functions"; - Modelica.SIunits.Pressure deltaDp(displayUnit="Pa") + Modelica.Units.SI.Pressure deltaDp(displayUnit="Pa") "Pressure difference between input and output to the functions"; - Modelica.SIunits.Time dTime= 2; + Modelica.Units.SI.Time dTime= 2; parameter Real k = 0.5; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 1 "Nominal flow rate"; + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 1 "Nominal flow rate"; equation dp = (time-0.5)/dTime * 20; m_flow=FlowModels.basicFlowFunction_dp(dp=dp, k=k, m_flow_turbulent=m_flow_nominal*0.3); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/BaseClasses/FlowModels/Validation/InvertingBasicFlowFunction_dp.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/BaseClasses/FlowModels/Validation/InvertingBasicFlowFunction_dp.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/BaseClasses/FlowModels/Validation/InvertingBasicFlowFunction_dp.mo" 2022-03-10 09:57:42.052144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/BaseClasses/FlowModels/Validation/InvertingBasicFlowFunction_dp.mo" 2022-03-10 09:58:19.488149382 +0000 @@ -4,11 +4,11 @@ extends Modelica.Icons.Example; parameter Real k = 0.5 "Flow coefficient"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 1.5 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 1.5 "Nominal mass flow rate"; - Modelica.SIunits.MassFlowRate m_flow "Mass flow rate"; - Modelica.SIunits.PressureDifference dp(displayUnit="Pa") "Pressure difference"; + Modelica.Units.SI.MassFlowRate m_flow "Mass flow rate"; + Modelica.Units.SI.PressureDifference dp(displayUnit="Pa") "Pressure difference"; equation m_flow = 4*(time-0.5); m_flow = FlowModels.basicFlowFunction_dp(dp=dp, k=k, m_flow_turbulent=m_flow_nominal*0.3); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/BaseClasses/FlowModels/Validation/InvertingBasicFlowFunction_m_flow.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/BaseClasses/FlowModels/Validation/InvertingBasicFlowFunction_m_flow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/BaseClasses/FlowModels/Validation/InvertingBasicFlowFunction_m_flow.mo" 2022-03-10 09:57:42.052144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/BaseClasses/FlowModels/Validation/InvertingBasicFlowFunction_m_flow.mo" 2022-03-10 09:58:19.472149381 +0000 @@ -4,11 +4,11 @@ extends Modelica.Icons.Example; parameter Real k = 0.5 "Flow coefficient"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 0.5 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 0.5 "Nominal mass flow rate"; - Modelica.SIunits.MassFlowRate m_flow "Mass flow rate"; - Modelica.SIunits.PressureDifference dp(displayUnit="Pa") "Pressure difference"; + Modelica.Units.SI.MassFlowRate m_flow "Mass flow rate"; + Modelica.Units.SI.PressureDifference dp(displayUnit="Pa") "Pressure difference"; equation dp = 4*(time-0.5); dp = FlowModels.basicFlowFunction_m_flow(m_flow=m_flow, k=k, m_flow_turbulent=m_flow_nominal*0.3); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp.mo" 2022-03-10 09:57:42.052144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp.mo" 2022-03-10 09:58:19.428149376 +0000 @@ -2,16 +2,16 @@ function basicFlowFunction_dp "Function that computes mass flow rate for given pressure drop" - input Modelica.SIunits.PressureDifference dp(displayUnit="Pa") + input Modelica.Units.SI.PressureDifference dp(displayUnit="Pa") "Pressure difference between port_a and port_b (= port_a.p - port_b.p)"; input Real k(min=0, unit="") "Flow coefficient, k=m_flow/sqrt(dp), with unit=(kg.m)^(1/2)"; - input Modelica.SIunits.MassFlowRate m_flow_turbulent(min=0) + input Modelica.Units.SI.MassFlowRate m_flow_turbulent(min=0) "Mass flow rate where transition to turbulent flow occurs"; - output Modelica.SIunits.MassFlowRate m_flow + output Modelica.Units.SI.MassFlowRate m_flow "Mass flow rate in design flow direction"; protected - Modelica.SIunits.PressureDifference dp_turbulent = (m_flow_turbulent/k)^2 + Modelica.Units.SI.PressureDifference dp_turbulent = (m_flow_turbulent/k)^2 "Pressure where flow changes to turbulent"; Real dpNorm=dp/dp_turbulent "Normalised pressure difference"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp_der.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp_der.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp_der.mo" 2022-03-10 09:57:42.052144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp_der.mo" 2022-03-10 09:58:19.412149373 +0000 @@ -3,18 +3,18 @@ "1st derivative of function that computes mass flow rate for given pressure drop" extends Modelica.Icons.Function; - input Modelica.SIunits.PressureDifference dp(displayUnit="Pa") + input Modelica.Units.SI.PressureDifference dp(displayUnit="Pa") "Pressure difference between port_a and port_b (= port_a.p - port_b.p)"; input Real k(min=0, unit="") "Flow coefficient, k=m_flow/sqrt(dp), with unit=(kg.m)^(1/2)"; - input Modelica.SIunits.MassFlowRate m_flow_turbulent(min=0) + input Modelica.Units.SI.MassFlowRate m_flow_turbulent(min=0) "Mass flow rate where transition to turbulent flow occurs"; input Real dp_der "Derivative of pressure difference between port_a and port_b (= port_a.p - port_b.p)"; output Real m_flow_der(unit="kg/s2") "Derivative of mass flow rate in design flow direction"; protected - Modelica.SIunits.PressureDifference dp_turbulent = (m_flow_turbulent/k)^2 + Modelica.Units.SI.PressureDifference dp_turbulent = (m_flow_turbulent/k)^2 "Pressure where flow changes to turbulent"; Real dpNormSq=(dp/dp_turbulent)^2 "Square of normalised pressure difference"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp_der2.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp_der2.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp_der2.mo" 2022-03-10 09:57:42.052144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp_der2.mo" 2022-03-10 09:58:19.392149370 +0000 @@ -3,11 +3,11 @@ "2nd derivative of flow function2nd derivative of function that computes mass flow rate for given pressure drop" extends Modelica.Icons.Function; - input Modelica.SIunits.PressureDifference dp(displayUnit="Pa") + input Modelica.Units.SI.PressureDifference dp(displayUnit="Pa") "Pressure difference between port_a and port_b (= port_a.p - port_b.p)"; input Real k(min=0, unit="") "Flow coefficient, k=m_flow/sqrt(dp), with unit=(kg.m)^(1/2)"; - input Modelica.SIunits.MassFlowRate m_flow_turbulent(min=0) + input Modelica.Units.SI.MassFlowRate m_flow_turbulent(min=0) "Mass flow rate where transition to turbulent flow occurs"; input Real dp_der "1st derivative of pressure difference between port_a and port_b (= port_a.p - port_b.p)"; @@ -16,7 +16,7 @@ output Real m_flow_der2 "2nd derivative of mass flow rate in design flow direction"; protected - Modelica.SIunits.PressureDifference dp_turbulent = (m_flow_turbulent/k)^2 + Modelica.Units.SI.PressureDifference dp_turbulent = (m_flow_turbulent/k)^2 "Pressure where flow changes to turbulent"; Real dpNorm=dp/dp_turbulent "Normalised pressure difference"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow.mo" 2022-03-10 09:57:42.052144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow.mo" 2022-03-10 09:58:19.380149369 +0000 @@ -2,16 +2,16 @@ function basicFlowFunction_m_flow "Function that computes pressure drop for given mass flow rate" - input Modelica.SIunits.MassFlowRate m_flow + input Modelica.Units.SI.MassFlowRate m_flow "Mass flow rate in design flow direction"; input Real k(unit="") "Flow coefficient, k=m_flow/sqrt(dp), with unit=(kg.m)^(1/2)"; - input Modelica.SIunits.MassFlowRate m_flow_turbulent(min=0) + input Modelica.Units.SI.MassFlowRate m_flow_turbulent(min=0) "Mass flow rate where transition to turbulent flow occurs"; - output Modelica.SIunits.PressureDifference dp(displayUnit="Pa") + output Modelica.Units.SI.PressureDifference dp(displayUnit="Pa") "Pressure difference between port_a and port_b (= port_a.p - port_b.p)"; protected - Modelica.SIunits.PressureDifference dp_turbulent = (m_flow_turbulent/k)^2 + Modelica.Units.SI.PressureDifference dp_turbulent = (m_flow_turbulent/k)^2 "Pressure where flow changes to turbulent"; Real m_flowNorm = m_flow/m_flow_turbulent "Normalised mass flow rate"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow_der.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow_der.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow_der.mo" 2022-03-10 09:57:42.052144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow_der.mo" 2022-03-10 09:58:19.368149367 +0000 @@ -3,18 +3,18 @@ "1st derivative of function that computes pressure drop for given mass flow rate" extends Modelica.Icons.Function; - input Modelica.SIunits.MassFlowRate m_flow + input Modelica.Units.SI.MassFlowRate m_flow "Mass flow rate in design flow direction"; input Real k(unit="") "Flow coefficient, k=m_flow/sqrt(dp), with unit=(kg.m)^(1/2)"; - input Modelica.SIunits.MassFlowRate m_flow_turbulent(min=0) + input Modelica.Units.SI.MassFlowRate m_flow_turbulent(min=0) "Mass flow rate where transition to turbulent flow occurs"; input Real m_flow_der(unit="kg/s2") "Derivative of mass flow rate in design flow direction"; output Real dp_der "Derivative of pressure difference between port_a and port_b (= port_a.p - port_b.p)"; protected - Modelica.SIunits.PressureDifference dp_turbulent = (m_flow_turbulent/k)^2 + Modelica.Units.SI.PressureDifference dp_turbulent = (m_flow_turbulent/k)^2 "Pressure where flow changes to turbulent"; Real m_flowNormSq = (m_flow/m_flow_turbulent)^2 "Square of normalised mass flow rate"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow_der2.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow_der2.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow_der2.mo" 2022-03-10 09:57:42.052144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow_der2.mo" 2022-03-10 09:58:19.356149365 +0000 @@ -3,11 +3,11 @@ "2nd derivative of function that computes pressure drop for given mass flow rate" extends Modelica.Icons.Function; - input Modelica.SIunits.MassFlowRate m_flow + input Modelica.Units.SI.MassFlowRate m_flow "Mass flow rate in design flow direction"; input Real k(unit="") "Flow coefficient, k=m_flow/sqrt(dp), with unit=(kg.m)^(1/2)"; - input Modelica.SIunits.MassFlowRate m_flow_turbulent(min=0) + input Modelica.Units.SI.MassFlowRate m_flow_turbulent(min=0) "Mass flow rate where transition to turbulent flow occurs"; input Real m_flow_der(unit="kg/s2") "1st derivative of mass flow rate in design flow direction"; @@ -16,7 +16,7 @@ output Real dp_der2 "2nd derivative of pressure difference between port_a and port_b (= port_a.p - port_b.p)"; protected - Modelica.SIunits.PressureDifference dp_turbulent = (m_flow_turbulent/k)^2 + Modelica.Units.SI.PressureDifference dp_turbulent = (m_flow_turbulent/k)^2 "Pressure where flow changes to turbulent"; Real m_flowNorm = m_flow/m_flow_turbulent "Normalised mass flow rate"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/BaseClasses/PartialResistance.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/BaseClasses/PartialResistance.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/BaseClasses/PartialResistance.mo" 2022-03-10 09:57:42.052144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/BaseClasses/PartialResistance.mo" 2022-03-10 09:58:19.320149362 +0000 @@ -13,7 +13,7 @@ "= true, use m_flow = f(dp) else dp = f(m_flow)" annotation (Evaluate=true, Dialog(tab="Advanced")); - parameter Modelica.SIunits.PressureDifference dp_nominal(displayUnit="Pa") + parameter Modelica.Units.SI.PressureDifference dp_nominal(displayUnit="Pa") "Pressure drop at nominal mass flow rate" annotation(Dialog(group = "Nominal condition")); parameter Boolean homotopyInitialization = true "= true, use homotopy method" @@ -22,18 +22,18 @@ "= true, use linear relation between m_flow and dp for any flow rate" annotation(Evaluate=true, Dialog(tab="Advanced")); - parameter Modelica.SIunits.MassFlowRate m_flow_turbulent(min=0) + parameter Modelica.Units.SI.MassFlowRate m_flow_turbulent(min=0) "Turbulent flow if |m_flow| >= m_flow_turbulent"; protected parameter Medium.ThermodynamicState sta_default= Medium.setState_pTX(T=Medium.T_default, p=Medium.p_default, X=Medium.X_default); - parameter Modelica.SIunits.DynamicViscosity eta_default=Medium.dynamicViscosity(sta_default) + parameter Modelica.Units.SI.DynamicViscosity eta_default=Medium.dynamicViscosity(sta_default) "Dynamic viscosity, used to compute transition to turbulent flow regime"; - final parameter Modelica.SIunits.MassFlowRate m_flow_nominal_pos = abs(m_flow_nominal) + final parameter Modelica.Units.SI.MassFlowRate m_flow_nominal_pos = abs(m_flow_nominal) "Absolute value of nominal flow rate"; - final parameter Modelica.SIunits.PressureDifference dp_nominal_pos(displayUnit="Pa") = abs(dp_nominal) + final parameter Modelica.Units.SI.PressureDifference dp_nominal_pos(displayUnit="Pa") = abs(dp_nominal) "Absolute value of nominal pressure difference"; equation // Isenthalpic state transformation (no storage and no loss of energy) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/BaseClasses/PartialThreeWayResistance.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/BaseClasses/PartialThreeWayResistance.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/BaseClasses/PartialThreeWayResistance.mo" 2022-03-10 09:57:42.052144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/BaseClasses/PartialThreeWayResistance.mo" 2022-03-10 09:58:19.304149359 +0000 @@ -26,11 +26,11 @@ "Third port, can be either inlet or outlet" annotation (Placement(transformation(extent={{-10,-110},{10,-90}}))); - parameter Modelica.SIunits.Time tau=10 + parameter Modelica.Units.SI.Time tau=10 "Time constant at nominal flow for dynamic energy and momentum balance" annotation(Dialog(tab="Dynamics", group="Nominal condition", enable=not energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState)); - parameter Modelica.SIunits.MassFlowRate mDyn_flow_nominal + parameter Modelica.Units.SI.MassFlowRate mDyn_flow_nominal "Nominal mass flow rate for dynamic momentum and energy balance" annotation(Dialog(tab="Dynamics", group="Equations", enable=not energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState)); @@ -50,7 +50,7 @@ parameter Boolean verifyFlowReversal = false "=true, to assert that the flow does not reverse when portFlowDirection_* does not equal Bidirectional" annotation(Dialog(tab="Advanced")); - parameter Modelica.SIunits.MassFlowRate m_flow_small + parameter Modelica.Units.SI.MassFlowRate m_flow_small "Small mass flow rate for checking flow reversal" annotation(Dialog(tab="Advanced",enable=verifyFlowReversal)); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Chillers/BaseClasses/Carnot.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Chillers/BaseClasses/Carnot.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Chillers/BaseClasses/Carnot.mo" 2022-03-10 09:57:42.052144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Chillers/BaseClasses/Carnot.mo" 2022-03-10 09:58:19.204149346 +0000 @@ -4,17 +4,17 @@ m1_flow_nominal = QCon_flow_nominal/cp1_default/dTCon_nominal, m2_flow_nominal = QEva_flow_nominal/cp2_default/dTEva_nominal); - parameter Modelica.SIunits.HeatFlowRate QEva_flow_nominal(max=0) + parameter Modelica.Units.SI.HeatFlowRate QEva_flow_nominal(max=0) "Nominal cooling heat flow rate (QEva_flow_nominal < 0)" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.HeatFlowRate QCon_flow_nominal(min=0) + parameter Modelica.Units.SI.HeatFlowRate QCon_flow_nominal(min=0) "Nominal heating flow rate" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.TemperatureDifference dTEva_nominal( + parameter Modelica.Units.SI.TemperatureDifference dTEva_nominal( final max=0) = -10 "Temperature difference evaporator outlet-inlet" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.TemperatureDifference dTCon_nominal( + parameter Modelica.Units.SI.TemperatureDifference dTCon_nominal( final min=0) = 10 "Temperature difference condenser outlet-inlet" annotation (Dialog(group="Nominal condition")); @@ -32,10 +32,10 @@ "Coefficient of performance at TEva_nominal and TCon_nominal, used if use_eta_Carnot_nominal = false" annotation (Dialog(group="Efficiency", enable=not use_eta_Carnot_nominal)); - parameter Modelica.SIunits.Temperature TCon_nominal = 303.15 + parameter Modelica.Units.SI.Temperature TCon_nominal = 303.15 "Condenser temperature used to compute COP_nominal if use_eta_Carnot_nominal=false" annotation (Dialog(group="Efficiency", enable=not use_eta_Carnot_nominal)); - parameter Modelica.SIunits.Temperature TEva_nominal = 278.15 + parameter Modelica.Units.SI.Temperature TEva_nominal = 278.15 "Evaporator temperature used to compute COP_nominal if use_eta_Carnot_nominal=false" annotation (Dialog(group="Efficiency", enable=not use_eta_Carnot_nominal)); @@ -43,18 +43,18 @@ "Coefficients for efficiency curve (need p(a=a, yPL=1)=1)" annotation (Dialog(group="Efficiency")); - parameter Modelica.SIunits.Pressure dp1_nominal(displayUnit="Pa") + parameter Modelica.Units.SI.Pressure dp1_nominal(displayUnit="Pa") "Pressure difference over condenser" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.Pressure dp2_nominal(displayUnit="Pa") + parameter Modelica.Units.SI.Pressure dp2_nominal(displayUnit="Pa") "Pressure difference over evaporator" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.TemperatureDifference TAppCon_nominal(min=0) = if cp1_default < 1500 then 5 else 2 + parameter Modelica.Units.SI.TemperatureDifference TAppCon_nominal(min=0) = if cp1_default < 1500 then 5 else 2 "Temperature difference between refrigerant and working fluid outlet in condenser" annotation (Dialog(group="Efficiency")); - parameter Modelica.SIunits.TemperatureDifference TAppEva_nominal(min=0) = if cp2_default < 1500 then 5 else 2 + parameter Modelica.Units.SI.TemperatureDifference TAppEva_nominal(min=0) = if cp2_default < 1500 then 5 else 2 "Temperature difference between refrigerant and working fluid outlet in evaporator" annotation (Dialog(group="Efficiency")); @@ -82,17 +82,17 @@ "Fraction of nominal flow rate where flow transitions to laminar" annotation (Dialog(tab="Flow resistance", group="Evaporator")); - parameter Modelica.SIunits.Time tau1=60 + parameter Modelica.Units.SI.Time tau1=60 "Time constant at nominal flow rate (used if energyDynamics1 <> Modelica.Fluid.Types.Dynamics.SteadyState)" annotation (Dialog(tab="Dynamics", group="Condenser")); - parameter Modelica.SIunits.Time tau2=60 + parameter Modelica.Units.SI.Time tau2=60 "Time constant at nominal flow rate (used if energyDynamics2 <> Modelica.Fluid.Types.Dynamics.SteadyState)" annotation (Dialog(tab="Dynamics", group="Evaporator")); - parameter Modelica.SIunits.Temperature T1_start=Medium1.T_default + parameter Modelica.Units.SI.Temperature T1_start=Medium1.T_default "Initial or guess value of set point" annotation (Dialog(tab="Dynamics", group="Condenser")); - parameter Modelica.SIunits.Temperature T2_start=Medium2.T_default + parameter Modelica.Units.SI.Temperature T2_start=Medium2.T_default "Initial or guess value of set point" annotation (Dialog(tab="Dynamics", group="Evaporator")); @@ -136,11 +136,11 @@ x2=TConAct - TEvaAct, deltaX=0.25) "Carnot efficiency"; - Modelica.SIunits.Temperature TConAct(start=TCon_nominal + TAppCon_nominal)= + Modelica.Units.SI.Temperature TConAct(start=TCon_nominal + TAppCon_nominal)= Medium1.temperature(staB1) + QCon_flow/QCon_flow_nominal*TAppCon_nominal "Condenser temperature used to compute efficiency, taking into account pinch temperature between fluid and refrigerant"; - Modelica.SIunits.Temperature TEvaAct(start=TEva_nominal - TAppEva_nominal)= + Modelica.Units.SI.Temperature TEvaAct(start=TEva_nominal - TAppEva_nominal)= Medium2.temperature(staB2) - QEva_flow/QEva_flow_nominal*TAppEva_nominal "Evaporator temperature used to compute efficiency, taking into account pinch temperature between fluid and refrigerant"; @@ -162,22 +162,22 @@ "Flag, true if etaPL should be computed as it depends on yPL" annotation(Evaluate=true); - final parameter Modelica.SIunits.Temperature TUseAct_nominal= + final parameter Modelica.Units.SI.Temperature TUseAct_nominal= if COP_is_for_cooling then TEva_nominal - TAppEva_nominal else TCon_nominal + TAppCon_nominal "Nominal evaporator temperature for chiller or condenser temperature for heat pump, taking into account pinch temperature between fluid and refrigerant"; - Modelica.SIunits.Temperature TUseAct=if COP_is_for_cooling then TEvaAct else TConAct + Modelica.Units.SI.Temperature TUseAct=if COP_is_for_cooling then TEvaAct else TConAct "Temperature of useful heat (evaporator for chiller, condenser for heat pump), taking into account pinch temperature between fluid and refrigerant"; - final parameter Modelica.SIunits.SpecificHeatCapacity cp1_default= + final parameter Modelica.Units.SI.SpecificHeatCapacity cp1_default= Medium1.specificHeatCapacityCp(Medium1.setState_pTX( p = Medium1.p_default, T = Medium1.T_default, X = Medium1.X_default)) "Specific heat capacity of medium 1 at default medium state"; - final parameter Modelica.SIunits.SpecificHeatCapacity cp2_default= + final parameter Modelica.Units.SI.SpecificHeatCapacity cp2_default= Medium2.specificHeatCapacityCp(Medium2.setState_pTX( p = Medium2.p_default, T = Medium2.T_default, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Chillers/BaseClasses/PartialCarnot_y.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Chillers/BaseClasses/PartialCarnot_y.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Chillers/BaseClasses/PartialCarnot_y.mo" 2022-03-10 09:57:42.052144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Chillers/BaseClasses/PartialCarnot_y.mo" 2022-03-10 09:58:19.152149340 +0000 @@ -29,7 +29,7 @@ final homotopyInitialization=homotopyInitialization, final Q_flow_nominal=QEva_flow_nominal)); - parameter Modelica.SIunits.Power P_nominal(min=0) + parameter Modelica.Units.SI.Power P_nominal(min=0) "Nominal compressor power (at y=1)" annotation (Dialog(group="Nominal condition")); @@ -38,9 +38,9 @@ annotation (Placement(transformation(extent={{-140,70},{-100,110}}))); protected - Modelica.SIunits.HeatFlowRate QCon_flow_internal(start=QCon_flow_nominal)= + Modelica.Units.SI.HeatFlowRate QCon_flow_internal(start=QCon_flow_nominal)= P - QEva_flow_internal "Condenser heat input"; - Modelica.SIunits.HeatFlowRate QEva_flow_internal(start=QEva_flow_nominal)= + Modelica.Units.SI.HeatFlowRate QEva_flow_internal(start=QEva_flow_nominal)= if COP_is_for_cooling then -COP * P else (1-COP)*P "Evaporator heat input"; Modelica.Blocks.Sources.RealExpression yEva_flow_in( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Chillers/Carnot_TEva.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Chillers/Carnot_TEva.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Chillers/Carnot_TEva.mo" 2022-03-10 09:57:42.052144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Chillers/Carnot_TEva.mo" 2022-03-10 09:58:19.128149337 +0000 @@ -26,7 +26,7 @@ final energyDynamics=energyDynamics, final homotopyInitialization=homotopyInitialization)); - parameter Modelica.SIunits.HeatFlowRate QEva_flow_min( + parameter Modelica.Units.SI.HeatFlowRate QEva_flow_min( max=0) = -Modelica.Constants.inf "Maximum heat flow rate for cooling (negative)"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Chillers/Examples/Carnot_TEva.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Chillers/Examples/Carnot_TEva.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Chillers/Examples/Carnot_TEva.mo" 2022-03-10 09:57:42.052144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Chillers/Examples/Carnot_TEva.mo" 2022-03-10 09:58:19.092149333 +0000 @@ -5,14 +5,14 @@ package Medium1 = IBPSA.Media.Water "Medium model"; package Medium2 = IBPSA.Media.Water "Medium model"; - parameter Modelica.SIunits.TemperatureDifference dTEva_nominal=-10 + parameter Modelica.Units.SI.TemperatureDifference dTEva_nominal=-10 "Temperature difference evaporator outlet-inlet"; - parameter Modelica.SIunits.TemperatureDifference dTCon_nominal=10 + parameter Modelica.Units.SI.TemperatureDifference dTCon_nominal=10 "Temperature difference condenser outlet-inlet"; parameter Real COPc_nominal = 3 "Chiller COP"; - parameter Modelica.SIunits.HeatFlowRate QEva_flow_nominal = -100E3 + parameter Modelica.Units.SI.HeatFlowRate QEva_flow_nominal = -100E3 "Evaporator heat flow rate"; - parameter Modelica.SIunits.MassFlowRate m2_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate m2_flow_nominal= QEva_flow_nominal/dTEva_nominal/4200 "Nominal mass flow rate at chilled water side"; @@ -68,7 +68,7 @@ Modelica.Blocks.Math.Add QCon_flow(k2=-1) "Condenser heat flow rate" annotation (Placement(transformation(extent={{48,-50},{68,-30}}))); - final parameter Modelica.SIunits.SpecificHeatCapacity cp1_default= + final parameter Modelica.Units.SI.SpecificHeatCapacity cp1_default= Medium1.specificHeatCapacityCp(Medium1.setState_pTX( Medium1.p_default, Medium1.T_default, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Chillers/Examples/Carnot_y.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Chillers/Examples/Carnot_y.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Chillers/Examples/Carnot_y.mo" 2022-03-10 09:57:42.052144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Chillers/Examples/Carnot_y.mo" 2022-03-10 09:58:19.068149330 +0000 @@ -4,18 +4,18 @@ package Medium1 = IBPSA.Media.Water "Medium model"; package Medium2 = IBPSA.Media.Water "Medium model"; - parameter Modelica.SIunits.Power P_nominal=10E3 + parameter Modelica.Units.SI.Power P_nominal=10E3 "Nominal compressor power (at y=1)"; - parameter Modelica.SIunits.TemperatureDifference dTEva_nominal=-10 + parameter Modelica.Units.SI.TemperatureDifference dTEva_nominal=-10 "Temperature difference evaporator outlet-inlet"; - parameter Modelica.SIunits.TemperatureDifference dTCon_nominal=10 + parameter Modelica.Units.SI.TemperatureDifference dTCon_nominal=10 "Temperature difference condenser outlet-inlet"; parameter Real COPc_nominal = 3 "Chiller COP"; - parameter Modelica.SIunits.MassFlowRate m2_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate m2_flow_nominal= -P_nominal*COPc_nominal/dTEva_nominal/4200 "Nominal mass flow rate at chilled water side"; - parameter Modelica.SIunits.MassFlowRate m1_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate m1_flow_nominal= m2_flow_nominal*(COPc_nominal+1)/COPc_nominal "Nominal mass flow rate at condenser water wide"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Chillers/Validation/CarnotVerifyCOP.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Chillers/Validation/CarnotVerifyCOP.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Chillers/Validation/CarnotVerifyCOP.mo" 2022-03-10 09:57:42.052144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Chillers/Validation/CarnotVerifyCOP.mo" 2022-03-10 09:58:19.016149324 +0000 @@ -7,32 +7,32 @@ parameter Real COP_nominal = 3 "Coefficient of performance"; - parameter Modelica.SIunits.Temperature TCon_nominal = 273.15+30 + parameter Modelica.Units.SI.Temperature TCon_nominal = 273.15+30 "Nominal condensor temperature"; - parameter Modelica.SIunits.Temperature TEva_nominal = 273.15 + 5 + parameter Modelica.Units.SI.Temperature TEva_nominal = 273.15 + 5 "Nominal evaporator temperature"; - parameter Modelica.SIunits.HeatFlowRate QEva_flow_nominal=-10E3 + parameter Modelica.Units.SI.HeatFlowRate QEva_flow_nominal=-10E3 "Nominal evaporator heat flow rate (QEva_flow_nominal < 0)"; - parameter Modelica.SIunits.HeatFlowRate QCon_flow_nominal=-QEva_flow_nominal * (1+1/COP_nominal) + parameter Modelica.Units.SI.HeatFlowRate QCon_flow_nominal=-QEva_flow_nominal * (1+1/COP_nominal) "Nominal condenser heat flow rate (QCon_flow_nominal > 0)"; - parameter Modelica.SIunits.TemperatureDifference dTEva_nominal=-10 + parameter Modelica.Units.SI.TemperatureDifference dTEva_nominal=-10 "Temperature difference evaporator outlet-inlet"; - parameter Modelica.SIunits.TemperatureDifference dTCon_nominal=10 + parameter Modelica.Units.SI.TemperatureDifference dTCon_nominal=10 "Temperature difference condenser outlet-inlet"; - parameter Modelica.SIunits.MassFlowRate mCon_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate mCon_flow_nominal= QCon_flow_nominal/cp_default/dTCon_nominal "Nominal mass flow rate at condenser"; - parameter Modelica.SIunits.MassFlowRate mEva_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate mEva_flow_nominal= QEva_flow_nominal/cp_default/dTEva_nominal "Nominal mass flow rate of evaporator"; - final parameter Modelica.SIunits.SpecificHeatCapacity cp_default= + final parameter Modelica.Units.SI.SpecificHeatCapacity cp_default= Medium.specificHeatCapacityCp(Medium.setState_pTX( p = Medium.p_default, T = Medium.T_default, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Chillers/Validation/CarnotVerifyEtaCarnot.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Chillers/Validation/CarnotVerifyEtaCarnot.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Chillers/Validation/CarnotVerifyEtaCarnot.mo" 2022-03-10 09:57:42.052144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Chillers/Validation/CarnotVerifyEtaCarnot.mo" 2022-03-10 09:58:18.996149320 +0000 @@ -8,42 +8,42 @@ parameter Real etaCarnot_nominal=0.315046 "Carnot effectiveness (=COP/COP_Carnot) used if use_eta_Carnot_nominal = true"; - parameter Modelica.SIunits.TemperatureDifference TAppCon_nominal=2 + parameter Modelica.Units.SI.TemperatureDifference TAppCon_nominal=2 "Temperature difference between refrigerant and working fluid outlet in condenser"; - parameter Modelica.SIunits.TemperatureDifference TAppEva_nominal=2 + parameter Modelica.Units.SI.TemperatureDifference TAppEva_nominal=2 "Temperature difference between refrigerant and working fluid outlet in evaporator"; parameter Real COP_nominal = etaCarnot_nominal * (TEva_nominal-TAppEva_nominal)/ (TCon_nominal + TAppCon_nominal - (TEva_nominal-TAppEva_nominal)) "Coefficient of performance"; - parameter Modelica.SIunits.Temperature TCon_nominal = 273.15+30 + parameter Modelica.Units.SI.Temperature TCon_nominal = 273.15+30 "Nominal condensor temperature"; - parameter Modelica.SIunits.Temperature TEva_nominal = 273.15 + 5 + parameter Modelica.Units.SI.Temperature TEva_nominal = 273.15 + 5 "Nominal evaporator temperature"; - parameter Modelica.SIunits.HeatFlowRate QEva_flow_nominal=-10E3 + parameter Modelica.Units.SI.HeatFlowRate QEva_flow_nominal=-10E3 "Nominal evaporator heat flow rate (QEva_flow_nominal < 0)"; - parameter Modelica.SIunits.HeatFlowRate QCon_flow_nominal=-QEva_flow_nominal * (1+1/COP_nominal) + parameter Modelica.Units.SI.HeatFlowRate QCon_flow_nominal=-QEva_flow_nominal * (1+1/COP_nominal) "Nominal condenser heat flow rate (QCon_flow_nominal > 0)"; - parameter Modelica.SIunits.TemperatureDifference dTEva_nominal=-10 + parameter Modelica.Units.SI.TemperatureDifference dTEva_nominal=-10 "Temperature difference evaporator outlet-inlet"; - parameter Modelica.SIunits.TemperatureDifference dTCon_nominal=10 + parameter Modelica.Units.SI.TemperatureDifference dTCon_nominal=10 "Temperature difference condenser outlet-inlet"; - parameter Modelica.SIunits.MassFlowRate mCon_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate mCon_flow_nominal= QCon_flow_nominal/cp_default/dTCon_nominal "Nominal mass flow rate at condenser"; - parameter Modelica.SIunits.MassFlowRate mEva_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate mEva_flow_nominal= QEva_flow_nominal/cp_default/dTEva_nominal "Nominal mass flow rate of evaporator"; - final parameter Modelica.SIunits.SpecificHeatCapacity cp_default= + final parameter Modelica.Units.SI.SpecificHeatCapacity cp_default= Medium.specificHeatCapacityCp(Medium.setState_pTX( p = Medium.p_default, T = Medium.T_default, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Chillers/Validation/Carnot_TEva_2ndLaw.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Chillers/Validation/Carnot_TEva_2ndLaw.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Chillers/Validation/Carnot_TEva_2ndLaw.mo" 2022-03-10 09:57:42.052144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Chillers/Validation/Carnot_TEva_2ndLaw.mo" 2022-03-10 09:58:18.960149317 +0000 @@ -5,18 +5,18 @@ package Medium = IBPSA.Media.Water "Medium model"; - parameter Modelica.SIunits.TemperatureDifference dTEva_nominal=-4 + parameter Modelica.Units.SI.TemperatureDifference dTEva_nominal=-4 "Temperature difference evaporator outlet-inlet"; - parameter Modelica.SIunits.TemperatureDifference dTCon_nominal=4 + parameter Modelica.Units.SI.TemperatureDifference dTCon_nominal=4 "Temperature difference condenser outlet-inlet"; parameter Real COPc_nominal = 3 "Chiller COP"; - parameter Modelica.SIunits.HeatFlowRate QEva_flow_nominal = -100E3 + parameter Modelica.Units.SI.HeatFlowRate QEva_flow_nominal = -100E3 "Evaporator heat flow rate"; - final parameter Modelica.SIunits.MassFlowRate m2_flow_nominal= + final parameter Modelica.Units.SI.MassFlowRate m2_flow_nominal= QEva_flow_nominal/dTEva_nominal/4200 "Nominal mass flow rate at chilled water side"; - final parameter Modelica.SIunits.MassFlowRate m1_flow_nominal= + final parameter Modelica.Units.SI.MassFlowRate m1_flow_nominal= -m2_flow_nominal/dTCon_nominal*dTEva_nominal "Nominal mass flow rate at condeser water side"; @@ -56,15 +56,15 @@ replaceable package Medium2 = Modelica.Media.Interfaces.PartialMedium "Medium model"; - parameter Modelica.SIunits.TemperatureDifference dTEva_nominal + parameter Modelica.Units.SI.TemperatureDifference dTEva_nominal "Temperature difference evaporator outlet-inlet"; - parameter Modelica.SIunits.TemperatureDifference dTCon_nominal + parameter Modelica.Units.SI.TemperatureDifference dTCon_nominal "Temperature difference condenser outlet-inlet"; - parameter Modelica.SIunits.HeatFlowRate QEva_flow_nominal + parameter Modelica.Units.SI.HeatFlowRate QEva_flow_nominal "Evaporator heat flow rate"; - parameter Modelica.SIunits.MassFlowRate m1_flow_nominal + parameter Modelica.Units.SI.MassFlowRate m1_flow_nominal "Nominal mass flow rate at condeser water side"; - parameter Modelica.SIunits.MassFlowRate m2_flow_nominal + parameter Modelica.Units.SI.MassFlowRate m2_flow_nominal "Nominal mass flow rate at chilled water side"; IBPSA.Fluid.Sources.MassFlowSource_T sou1( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Chillers/Validation/Carnot_TEva_reverseFlow.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Chillers/Validation/Carnot_TEva_reverseFlow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Chillers/Validation/Carnot_TEva_reverseFlow.mo" 2022-03-10 09:57:42.052144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Chillers/Validation/Carnot_TEva_reverseFlow.mo" 2022-03-10 09:58:18.876149305 +0000 @@ -5,17 +5,17 @@ package Medium1 = IBPSA.Media.Water "Medium model"; package Medium2 = IBPSA.Media.Water "Medium model"; - parameter Modelica.SIunits.TemperatureDifference dTEva_nominal=-10 + parameter Modelica.Units.SI.TemperatureDifference dTEva_nominal=-10 "Temperature difference evaporator inlet-outlet"; - parameter Modelica.SIunits.TemperatureDifference dTCon_nominal=10 + parameter Modelica.Units.SI.TemperatureDifference dTCon_nominal=10 "Temperature difference condenser outlet-inlet"; parameter Real COPc_nominal = 3 "Chiller COP"; - parameter Modelica.SIunits.HeatFlowRate QEva_flow_nominal = -100E3 + parameter Modelica.Units.SI.HeatFlowRate QEva_flow_nominal = -100E3 "Evaporator heat flow rate"; - parameter Modelica.SIunits.MassFlowRate m2_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate m2_flow_nominal= QEva_flow_nominal/dTEva_nominal/4200 "Nominal mass flow rate at chilled water side"; - parameter Modelica.SIunits.MassFlowRate m1_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate m1_flow_nominal= m2_flow_nominal*(COPc_nominal+1)/COPc_nominal "Nominal mass flow rate at condenser water wide"; @@ -72,7 +72,7 @@ Modelica.Blocks.Math.Add QCon_flow(k2=-1) "Condenser heat flow rate" annotation (Placement(transformation(extent={{40,-50},{60,-30}}))); - final parameter Modelica.SIunits.SpecificHeatCapacity cp1_default= + final parameter Modelica.Units.SI.SpecificHeatCapacity cp1_default= Medium1.specificHeatCapacityCp(Medium1.setState_pTX( Medium1.p_default, Medium1.T_default, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Delays/DelayFirstOrder.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Delays/DelayFirstOrder.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Delays/DelayFirstOrder.mo" 2022-03-10 09:57:42.052144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Delays/DelayFirstOrder.mo" 2022-03-10 09:58:18.824149298 +0000 @@ -4,11 +4,11 @@ extends IBPSA.Fluid.MixingVolumes.MixingVolume(final V=V_nominal, final mSenFac=1); - parameter Modelica.SIunits.Time tau = 60 "Time constant at nominal flow" + parameter Modelica.Units.SI.Time tau = 60 "Time constant at nominal flow" annotation (Dialog(tab="Dynamics", group="Nominal condition")); protected - parameter Modelica.SIunits.Volume V_nominal = m_flow_nominal*tau/rho_default + parameter Modelica.Units.SI.Volume V_nominal = m_flow_nominal*tau/rho_default "Volume of delay element"; annotation ( Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},{100, 100}}), graphics={Ellipse( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Examples/FlowSystem/Basic.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Examples/FlowSystem/Basic.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Examples/FlowSystem/Basic.mo" 2022-03-10 09:57:42.052144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Examples/FlowSystem/Basic.mo" 2022-03-10 09:58:18.756149289 +0000 @@ -109,7 +109,7 @@ Modelica.Blocks.Sources.Sine sine( amplitude=0.5, offset=0.5, - freqHz=0.001) +f =0.001) "Valve control signal" annotation (Placement(transformation(extent={{-140,20},{-120,40}}))); IBPSA.Fluid.Actuators.Valves.ThreeWayLinear valSouth( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Examples/Performance/Example1v2.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Examples/Performance/Example1v2.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Examples/Performance/Example1v2.mo" 2022-03-10 09:57:42.052144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Examples/Performance/Example1v2.mo" 2022-03-10 09:58:18.500149257 +0000 @@ -1,7 +1,7 @@ within IBPSA.Fluid.Examples.Performance; model Example1v2 "Example 1 model with mixing volume" extends IBPSA.Fluid.Examples.Performance.BaseClasses.Example1; - parameter Modelica.SIunits.Time tau=10 "Time constant at nominal flow"; + parameter Modelica.Units.SI.Time tau=10 "Time constant at nominal flow"; Fluid.Delays.DelayFirstOrder[nRes.k] vol( redeclare each package Medium = Medium, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Examples/Performance/Example2.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Examples/Performance/Example2.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Examples/Performance/Example2.mo" 2022-03-10 09:57:42.052144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Examples/Performance/Example2.mo" 2022-03-10 09:58:18.492149257 +0000 @@ -3,9 +3,9 @@ extends Modelica.Icons.Example; package Medium = Modelica.Media.Water.ConstantPropertyLiquidWater; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=1 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1 "Nominal mass flow rate"; - parameter Modelica.SIunits.PressureDifference dp_nominal=1 + parameter Modelica.Units.SI.PressureDifference dp_nominal=1 "Pressure drop at nominal mass flow rate"; Fluid.Movers.FlowControlled_dp pump_dp( redeclare package Medium = Medium, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Examples/Performance/Example3.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Examples/Performance/Example3.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Examples/Performance/Example3.mo" 2022-03-10 09:57:42.052144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Examples/Performance/Example3.mo" 2022-03-10 09:58:18.468149254 +0000 @@ -4,9 +4,9 @@ extends Modelica.Icons.Example; package Medium = Modelica.Media.Water.ConstantPropertyLiquidWater; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=1 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1 "Nominal mass flow rate"; - parameter Modelica.SIunits.PressureDifference dp_nominal=1 + parameter Modelica.Units.SI.PressureDifference dp_nominal=1 "Pressure drop at nominal mass flow rate"; Fluid.Movers.FlowControlled_m_flow pump( redeclare package Medium = Medium, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Examples/Performance/Example4.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Examples/Performance/Example4.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Examples/Performance/Example4.mo" 2022-03-10 09:57:42.052144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Examples/Performance/Example4.mo" 2022-03-10 09:58:18.420149247 +0000 @@ -6,7 +6,7 @@ parameter Boolean allowFlowReversal=false "= false to simplify equations, assuming, but not enforcing, no flow reversal"; - Modelica.SIunits.MassFlowRate m_condens = min(0, -vol.ports[1].m_flow*(bou.X[1] - xSat.X[1])) + Modelica.Units.SI.MassFlowRate m_condens = min(0, -vol.ports[1].m_flow*(bou.X[1] - xSat.X[1])) "Water vapor mass flow rate"; Fluid.MixingVolumes.MixingVolumeMoistAir vol( nPorts=2, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Examples/Performance/PressureDrop/ParallelDp.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Examples/Performance/PressureDrop/ParallelDp.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Examples/Performance/PressureDrop/ParallelDp.mo" 2022-03-10 09:57:42.052144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Examples/Performance/PressureDrop/ParallelDp.mo" 2022-03-10 09:58:18.328149237 +0000 @@ -4,9 +4,9 @@ extends Modelica.Icons.Example; package Medium = IBPSA.Media.Air; parameter Integer nRes(min=2) = 10 "Number of resistances"; - parameter Modelica.SIunits.PressureDifference dp_nominal=1 + parameter Modelica.Units.SI.PressureDifference dp_nominal=1 "Pressure drop at nominal mass flow rate"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=1 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1 "Nominal mass flow rate"; Sources.Boundary_pT sou( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Examples/Performance/PressureDrop/ParallelFlow.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Examples/Performance/PressureDrop/ParallelFlow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Examples/Performance/PressureDrop/ParallelFlow.mo" 2022-03-10 09:57:42.052144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Examples/Performance/PressureDrop/ParallelFlow.mo" 2022-03-10 09:58:18.264149229 +0000 @@ -4,9 +4,9 @@ extends Modelica.Icons.Example; package Medium = IBPSA.Media.Air; parameter Integer nRes(min=2) = 10 "Number of resistances"; - parameter Modelica.SIunits.PressureDifference dp_nominal=1 + parameter Modelica.Units.SI.PressureDifference dp_nominal=1 "Pressure drop at nominal mass flow rate"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=1 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1 "Nominal mass flow rate"; Sources.MassFlowSource_T sou( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Examples/Performance/PressureDrop/SeriesDp.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Examples/Performance/PressureDrop/SeriesDp.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Examples/Performance/PressureDrop/SeriesDp.mo" 2022-03-10 09:57:42.052144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Examples/Performance/PressureDrop/SeriesDp.mo" 2022-03-10 09:58:18.244149225 +0000 @@ -4,9 +4,9 @@ extends Modelica.Icons.Example; package Medium = IBPSA.Media.Air; parameter Integer nRes(min=2) = 10 "Number of resistances"; - parameter Modelica.SIunits.PressureDifference dp_nominal=1 + parameter Modelica.Units.SI.PressureDifference dp_nominal=1 "Pressure drop at nominal mass flow rate"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=1 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1 "Nominal mass flow rate"; Sources.Boundary_pT sou( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Examples/Performance/PressureDrop/SeriesFlow.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Examples/Performance/PressureDrop/SeriesFlow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Examples/Performance/PressureDrop/SeriesFlow.mo" 2022-03-10 09:57:42.052144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Examples/Performance/PressureDrop/SeriesFlow.mo" 2022-03-10 09:58:18.220149223 +0000 @@ -4,9 +4,9 @@ extends Modelica.Icons.Example; package Medium = IBPSA.Media.Air; parameter Integer nRes(min=2) = 10 "Number of resistances"; - parameter Modelica.SIunits.PressureDifference dp_nominal=1 + parameter Modelica.Units.SI.PressureDifference dp_nominal=1 "Pressure drop at nominal mass flow rate"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=1 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1 "Nominal mass flow rate"; Sources.MassFlowSource_T sou( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Examples/Performance/PressureDrop/SeriesParallelDp.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Examples/Performance/PressureDrop/SeriesParallelDp.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Examples/Performance/PressureDrop/SeriesParallelDp.mo" 2022-03-10 09:57:42.052144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Examples/Performance/PressureDrop/SeriesParallelDp.mo" 2022-03-10 09:58:18.204149220 +0000 @@ -4,9 +4,9 @@ extends Modelica.Icons.Example; package Medium = IBPSA.Media.Air; parameter Integer nRes(min=2) = 10 "Number of resistances"; - parameter Modelica.SIunits.PressureDifference dp_nominal=1 + parameter Modelica.Units.SI.PressureDifference dp_nominal=1 "Pressure drop at nominal mass flow rate"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=1 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1 "Nominal mass flow rate"; Sources.Boundary_pT sou( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Examples/Performance/PressureDrop/SeriesParallelFlow.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Examples/Performance/PressureDrop/SeriesParallelFlow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Examples/Performance/PressureDrop/SeriesParallelFlow.mo" 2022-03-10 09:57:42.052144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Examples/Performance/PressureDrop/SeriesParallelFlow.mo" 2022-03-10 09:58:18.184149217 +0000 @@ -4,9 +4,9 @@ extends Modelica.Icons.Example; package Medium = IBPSA.Media.Air; parameter Integer nRes(min=2) = 10 "Number of resistances"; - parameter Modelica.SIunits.PressureDifference dp_nominal=1 + parameter Modelica.Units.SI.PressureDifference dp_nominal=1 "Pressure drop at nominal mass flow rate"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=1 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1 "Nominal mass flow rate"; Sources.MassFlowSource_T sou( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Examples/SimpleHouse.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Examples/SimpleHouse.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Examples/SimpleHouse.mo" 2022-03-10 09:57:42.052144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Examples/SimpleHouse.mo" 2022-03-10 09:58:18.152149214 +0000 @@ -6,18 +6,18 @@ package MediumAir = IBPSA.Media.Air; package MediumWater = IBPSA.Media.Water; - parameter Modelica.SIunits.Area A_wall = 100 "Wall area"; - parameter Modelica.SIunits.Area A_win = 5 "Window area"; + parameter Modelica.Units.SI.Area A_wall = 100 "Wall area"; + parameter Modelica.Units.SI.Area A_win = 5 "Window area"; parameter Real g_win(min=0, max=1, unit="1") = 0.3 "Solar heat gain coefficient of window"; - parameter Modelica.SIunits.Volume V_zone = A_wall*3 "Wall area"; - parameter Modelica.SIunits.HeatFlowRate QHea_nominal = 700 + parameter Modelica.Units.SI.Volume V_zone = A_wall*3 "Wall area"; + parameter Modelica.Units.SI.HeatFlowRate QHea_nominal = 700 "Nominal capacity of heating system"; - parameter Modelica.SIunits.MassFlowRate mWat_flow_nominal=QHea_nominal/10/4200 + parameter Modelica.Units.SI.MassFlowRate mWat_flow_nominal=QHea_nominal/10/4200 "Nominal mass flow rate for water loop"; - parameter Modelica.SIunits.MassFlowRate mAir_flow_nominal=V_zone*2*1.2/3600 + parameter Modelica.Units.SI.MassFlowRate mAir_flow_nominal=V_zone*2*1.2/3600 "Nominal mass flow rate for air loop"; - parameter Modelica.SIunits.PressureDifference dpAir_nominal=200 + parameter Modelica.Units.SI.PressureDifference dpAir_nominal=200 "Pressure drop at nominal mass flow rate for air loop"; parameter Boolean allowFlowReversal=false "= false because flow will not reverse in these circuits"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/Adaptors/Examples/ThermalZoneHVACNoExhaust.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/Adaptors/Examples/ThermalZoneHVACNoExhaust.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/Adaptors/Examples/ThermalZoneHVACNoExhaust.mo" 2022-03-10 09:57:42.052144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/Adaptors/Examples/ThermalZoneHVACNoExhaust.mo" 2022-03-10 09:58:17.940149186 +0000 @@ -10,12 +10,12 @@ "Adaptor for an HVAC system that is exposed through an FMI interface" annotation (Placement(transformation(extent={{20,0},{40,20}}))); - parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal = 30*6*6 + parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal = 30*6*6 "Nominal heat loss of the room"; - parameter Modelica.SIunits.Volume VRoo = 6*6*2.7 "Room volume"; + parameter Modelica.Units.SI.Volume VRoo = 6*6*2.7 "Room volume"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=VRoo*2*1.2/3600 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=VRoo*2*1.2/3600 "Nominal mass flow rate"; IBPSA.Fluid.FMI.Adaptors.ThermalZone con( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/ExportContainers/Examples/FMUs/Fan.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/ExportContainers/Examples/FMUs/Fan.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/ExportContainers/Examples/FMUs/Fan.mo" 2022-03-10 09:57:42.052144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/ExportContainers/Examples/FMUs/Fan.mo" 2022-03-10 09:58:17.544149137 +0000 @@ -8,9 +8,9 @@ false, energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState)); - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=0.01 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=0.01 "Nominal mass flow rate"; - parameter Modelica.SIunits.PressureDifference dp_nominal(displayUnit="Pa")=500 + parameter Modelica.Units.SI.PressureDifference dp_nominal(displayUnit="Pa")=500 "Pressure drop at nominal mass flow rate"; Modelica.Blocks.Interfaces.RealInput dp_in(min=0, final unit="Pa") diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/ExportContainers/Examples/FMUs/HVACZone.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/ExportContainers/Examples/FMUs/HVACZone.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/ExportContainers/Examples/FMUs/HVACZone.mo" 2022-03-10 09:57:42.052144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/ExportContainers/Examples/FMUs/HVACZone.mo" 2022-03-10 09:58:17.520149134 +0000 @@ -17,40 +17,40 @@ ///////////////////////////////////////////////////////// // Air temperatures at design conditions - parameter Modelica.SIunits.Temperature TASup_nominal = 273.15+18 + parameter Modelica.Units.SI.Temperature TASup_nominal = 273.15+18 "Nominal air temperature supplied to room"; - parameter Modelica.SIunits.Temperature TRooSet = 273.15+24 + parameter Modelica.Units.SI.Temperature TRooSet = 273.15+24 "Nominal room air temperature"; - parameter Modelica.SIunits.Temperature TOut_nominal = 273.15+30 + parameter Modelica.Units.SI.Temperature TOut_nominal = 273.15+30 "Design outlet air temperature"; - parameter Modelica.SIunits.Temperature THeaRecLvg= + parameter Modelica.Units.SI.Temperature THeaRecLvg= TOut_nominal - eps*(TOut_nominal-TRooSet) "Air temperature leaving the heat recovery"; ///////////////////////////////////////////////////////// // Cooling loads and air mass flow rates parameter Real UA(unit="W/K") = 10E3 "Average UA-value of the room"; - parameter Modelica.SIunits.HeatFlowRate QRooInt_flow= + parameter Modelica.Units.SI.HeatFlowRate QRooInt_flow= 1000 "Internal heat gains of the room"; - parameter Modelica.SIunits.HeatFlowRate QRooC_flow_nominal= + parameter Modelica.Units.SI.HeatFlowRate QRooC_flow_nominal= -QRooInt_flow-UA/30*(TOut_nominal-TRooSet) "Nominal cooling load of the room"; - parameter Modelica.SIunits.MassFlowRate mA_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate mA_flow_nominal= 1.3*QRooC_flow_nominal/1006/(TASup_nominal-TRooSet) "Nominal air mass flow rate, increased by factor 1.3 to allow for recovery after temperature setback"; - parameter Modelica.SIunits.TemperatureDifference dTFan = 2 + parameter Modelica.Units.SI.TemperatureDifference dTFan = 2 "Estimated temperature raise across fan that needs to be made up by the cooling coil"; - parameter Modelica.SIunits.HeatFlowRate QCoiC_flow_nominal=4* + parameter Modelica.Units.SI.HeatFlowRate QCoiC_flow_nominal=4* (QRooC_flow_nominal + mA_flow_nominal*(TASup_nominal-THeaRecLvg-dTFan)*1006) "Cooling load of coil, taking into account economizer, and increased due to latent heat removal"; ///////////////////////////////////////////////////////// // Water temperatures and mass flow rates - parameter Modelica.SIunits.Temperature TWSup_nominal = 273.15+16 + parameter Modelica.Units.SI.Temperature TWSup_nominal = 273.15+16 "Water supply temperature"; - parameter Modelica.SIunits.Temperature TWRet_nominal = 273.15+12 + parameter Modelica.Units.SI.Temperature TWRet_nominal = 273.15+12 "Water return temperature"; - parameter Modelica.SIunits.MassFlowRate mW_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate mW_flow_nominal= QCoiC_flow_nominal/(TWRet_nominal-TWSup_nominal)/4200 "Nominal water mass flow rate"; ///////////////////////////////////////////////////////// diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/ExportContainers/Examples/FMUs/HVACZones.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/ExportContainers/Examples/FMUs/HVACZones.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/ExportContainers/Examples/FMUs/HVACZones.mo" 2022-03-10 09:57:42.052144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/ExportContainers/Examples/FMUs/HVACZones.mo" 2022-03-10 09:58:17.476149128 +0000 @@ -20,40 +20,40 @@ ///////////////////////////////////////////////////////// // Air temperatures at design conditions - parameter Modelica.SIunits.Temperature TASup_nominal = 273.15+18 + parameter Modelica.Units.SI.Temperature TASup_nominal = 273.15+18 "Nominal air temperature supplied to room"; - parameter Modelica.SIunits.Temperature TRooSet = 273.15+24 + parameter Modelica.Units.SI.Temperature TRooSet = 273.15+24 "Nominal room air temperature"; - parameter Modelica.SIunits.Temperature TOut_nominal = 273.15+30 + parameter Modelica.Units.SI.Temperature TOut_nominal = 273.15+30 "Design outlet air temperature"; - parameter Modelica.SIunits.Temperature THeaRecLvg= + parameter Modelica.Units.SI.Temperature THeaRecLvg= TOut_nominal - eps*(TOut_nominal-TRooSet) "Air temperature leaving the heat recovery"; ///////////////////////////////////////////////////////// // Cooling loads and air mass flow rates parameter Real UA(unit="W/K") = 10E3 "Average UA-value of the room"; - parameter Modelica.SIunits.HeatFlowRate QRooInt_flow= + parameter Modelica.Units.SI.HeatFlowRate QRooInt_flow= 1000 "Internal heat gains of the room"; - parameter Modelica.SIunits.HeatFlowRate QRooC_flow_nominal= + parameter Modelica.Units.SI.HeatFlowRate QRooC_flow_nominal= -QRooInt_flow-UA/30*(TOut_nominal-TRooSet) "Nominal cooling load of the room"; - parameter Modelica.SIunits.MassFlowRate mA_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate mA_flow_nominal= 1.3*QRooC_flow_nominal/1006/(TASup_nominal-TRooSet) "Nominal air mass flow rate, increased by factor 1.3 to allow for recovery after temperature setback"; - parameter Modelica.SIunits.TemperatureDifference dTFan = 2 + parameter Modelica.Units.SI.TemperatureDifference dTFan = 2 "Estimated temperature raise across fan that needs to be made up by the cooling coil"; - parameter Modelica.SIunits.HeatFlowRate QCoiC_flow_nominal=4* + parameter Modelica.Units.SI.HeatFlowRate QCoiC_flow_nominal=4* (QRooC_flow_nominal + mA_flow_nominal*(TASup_nominal-THeaRecLvg-dTFan)*1006) "Cooling load of coil, taking into account economizer, and increased due to latent heat removal"; ///////////////////////////////////////////////////////// // Water temperatures and mass flow rates - parameter Modelica.SIunits.Temperature TWSup_nominal = 273.15+16 + parameter Modelica.Units.SI.Temperature TWSup_nominal = 273.15+16 "Water supply temperature"; - parameter Modelica.SIunits.Temperature TWRet_nominal = 273.15+12 + parameter Modelica.Units.SI.Temperature TWRet_nominal = 273.15+12 "Water return temperature"; - parameter Modelica.SIunits.MassFlowRate mW_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate mW_flow_nominal= QCoiC_flow_nominal/(TWRet_nominal-TWSup_nominal)/4200 "Nominal water mass flow rate"; ///////////////////////////////////////////////////////// diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/ExportContainers/Examples/FMUs/HeaterCooler_u.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/ExportContainers/Examples/FMUs/HeaterCooler_u.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/ExportContainers/Examples/FMUs/HeaterCooler_u.mo" 2022-03-10 09:57:42.052144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/ExportContainers/Examples/FMUs/HeaterCooler_u.mo" 2022-03-10 09:58:17.408149119 +0000 @@ -10,11 +10,11 @@ massDynamics=Modelica.Fluid.Types.Dynamics.SteadyState, energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState)); - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=0.01 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=0.01 "Nominal mass flow rate"; - parameter Modelica.SIunits.PressureDifference dp_nominal(displayUnit="Pa")=0 + parameter Modelica.Units.SI.PressureDifference dp_nominal(displayUnit="Pa")=0 "Pressure"; - parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal=100 + parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal=100 "Heat flow rate at u=1, positive for heating"; Modelica.Blocks.Interfaces.RealInput u(min=0, max=1, unit="1") "Control input" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/ExportContainers/Examples/FMUs/Heater_T.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/ExportContainers/Examples/FMUs/Heater_T.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/ExportContainers/Examples/FMUs/Heater_T.mo" 2022-03-10 09:57:42.052144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/ExportContainers/Examples/FMUs/Heater_T.mo" 2022-03-10 09:58:17.392149118 +0000 @@ -9,13 +9,13 @@ final QMax_flow=QMax_flow, final energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState)); - parameter Modelica.SIunits.HeatFlowRate QMax_flow=Modelica.Constants.inf + parameter Modelica.Units.SI.HeatFlowRate QMax_flow=Modelica.Constants.inf "Maximum heat flow rate for heating (positive)"; - parameter Modelica.SIunits.HeatFlowRate QMin_flow=-Modelica.Constants.inf + parameter Modelica.Units.SI.HeatFlowRate QMin_flow=-Modelica.Constants.inf "Maximum heat flow rate for cooling (negative)"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=0.01 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=0.01 "Nominal mass flow rate"; - parameter Modelica.SIunits.PressureDifference dp_nominal(displayUnit="Pa")=0 + parameter Modelica.Units.SI.PressureDifference dp_nominal(displayUnit="Pa")=0 "Pressure"; Modelica.Blocks.Interfaces.RealInput TSet(unit="K", displayUnit="degC") diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/ExportContainers/Examples/FMUs/Humidifier_u.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/ExportContainers/Examples/FMUs/Humidifier_u.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/ExportContainers/Examples/FMUs/Humidifier_u.mo" 2022-03-10 09:57:42.052144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/ExportContainers/Examples/FMUs/Humidifier_u.mo" 2022-03-10 09:58:17.368149115 +0000 @@ -10,13 +10,13 @@ massDynamics=Modelica.Fluid.Types.Dynamics.SteadyState, final energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState)); - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=0.01 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=0.01 "Nominal mass flow rate"; - parameter Modelica.SIunits.PressureDifference dp_nominal(displayUnit="Pa")=0 + parameter Modelica.Units.SI.PressureDifference dp_nominal(displayUnit="Pa")=0 "Pressure"; - parameter Modelica.SIunits.MassFlowRate mWat_flow_nominal=0.01*0.005 + parameter Modelica.Units.SI.MassFlowRate mWat_flow_nominal=0.01*0.005 "Water mass flow rate at u=1, positive for humidification"; Modelica.Blocks.Interfaces.RealInput u(min=0, max=1, unit="1") diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/ExportContainers/Examples/FMUs/MixingVolume.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/ExportContainers/Examples/FMUs/MixingVolume.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/ExportContainers/Examples/FMUs/MixingVolume.mo" 2022-03-10 09:57:42.052144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/ExportContainers/Examples/FMUs/MixingVolume.mo" 2022-03-10 09:58:17.312149108 +0000 @@ -3,10 +3,10 @@ extends IBPSA.Fluid.FMI.ExportContainers.PartialTwoPort( redeclare package Medium = IBPSA.Media.Air); - parameter Modelica.SIunits.Volume V=1 "Volume"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=0.01 - "Nominal mass flow rate"; + parameter Modelica.Units.SI.Volume V=1 "Volume"; + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=0.01 + "Nominal mass flow rate"; protected IBPSA.Fluid.FMI.Adaptors.Inlet bouIn( redeclare final package Medium=Medium, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/ExportContainers/Examples/FMUs/PressureDrop.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/ExportContainers/Examples/FMUs/PressureDrop.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/ExportContainers/Examples/FMUs/PressureDrop.mo" 2022-03-10 09:57:42.052144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/ExportContainers/Examples/FMUs/PressureDrop.mo" 2022-03-10 09:58:17.296149105 +0000 @@ -6,9 +6,9 @@ IBPSA.Fluid.FixedResistances.PressureDrop com(final m_flow_nominal= m_flow_nominal, final dp_nominal=if use_p_in then dp_nominal else 0)); - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=0.01 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=0.01 "Nominal mass flow rate"; - parameter Modelica.SIunits.PressureDifference dp_nominal(displayUnit="Pa")=100 + parameter Modelica.Units.SI.PressureDifference dp_nominal(displayUnit="Pa")=100 "Pressure drop at nominal mass flow rate"; annotation ( Documentation(info=" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/ExportContainers/Examples/FMUs/ResistanceVolume.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/ExportContainers/Examples/FMUs/ResistanceVolume.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/ExportContainers/Examples/FMUs/ResistanceVolume.mo" 2022-03-10 09:57:42.052144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/ExportContainers/Examples/FMUs/ResistanceVolume.mo" 2022-03-10 09:58:17.272149103 +0000 @@ -4,10 +4,10 @@ extends IBPSA.Fluid.FMI.ExportContainers.PartialTwoPort( redeclare package Medium = IBPSA.Media.Air); - parameter Modelica.SIunits.Volume V=1 "Volume"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=0.01 + parameter Modelica.Units.SI.Volume V=1 "Volume"; + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=0.01 "Nominal mass flow rate"; - parameter Modelica.SIunits.PressureDifference dp_nominal=100 + parameter Modelica.Units.SI.PressureDifference dp_nominal=100 "Nominal pressure drop"; Modelica.Blocks.Sources.RealExpression dpCom(y=res.port_a.p - res.port_b.p) if diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/ExportContainers/Examples/FMUs/ThermalZone.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/ExportContainers/Examples/FMUs/ThermalZone.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/ExportContainers/Examples/FMUs/ThermalZone.mo" 2022-03-10 09:57:42.052144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/ExportContainers/Examples/FMUs/ThermalZone.mo" 2022-03-10 09:58:17.252149099 +0000 @@ -7,25 +7,25 @@ replaceable package MediumA = IBPSA.Media.Air "Medium for air"; - parameter Modelica.SIunits.Volume V=6*10*3 "Room volume"; + parameter Modelica.Units.SI.Volume V=6*10*3 "Room volume"; ///////////////////////////////////////////////////////// // Air temperatures at design conditions - parameter Modelica.SIunits.Temperature TASup_nominal = 273.15+18 + parameter Modelica.Units.SI.Temperature TASup_nominal = 273.15+18 "Nominal air temperature supplied to room"; - parameter Modelica.SIunits.Temperature TRooSet = 273.15+24 + parameter Modelica.Units.SI.Temperature TRooSet = 273.15+24 "Nominal room air temperature"; - parameter Modelica.SIunits.Temperature TOut_nominal = 273.15+30 + parameter Modelica.Units.SI.Temperature TOut_nominal = 273.15+30 "Design outlet air temperature"; ///////////////////////////////////////////////////////// // Cooling loads and air mass flow rates - parameter Modelica.SIunits.HeatFlowRate QRooInt_flow= + parameter Modelica.Units.SI.HeatFlowRate QRooInt_flow= 1000 "Internal heat gains of the room"; - parameter Modelica.SIunits.HeatFlowRate QRooC_flow_nominal= + parameter Modelica.Units.SI.HeatFlowRate QRooC_flow_nominal= -QRooInt_flow-10E3/30*(TOut_nominal-TRooSet) "Nominal cooling load of the room"; - parameter Modelica.SIunits.MassFlowRate mA_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate mA_flow_nominal= 1.3*QRooC_flow_nominal/1006/(TASup_nominal-TRooSet) "Nominal air mass flow rate, increased by factor 1.3 to allow for recovery after temperature setback"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/ExportContainers/Examples/FMUs/ThermalZones.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/ExportContainers/Examples/FMUs/ThermalZones.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/ExportContainers/Examples/FMUs/ThermalZones.mo" 2022-03-10 09:57:42.052144639 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/ExportContainers/Examples/FMUs/ThermalZones.mo" 2022-03-10 09:58:17.224149096 +0000 @@ -8,25 +8,25 @@ replaceable package MediumA = IBPSA.Media.Air "Medium for air"; - parameter Modelica.SIunits.Volume V=6*10*3 "Room volume"; + parameter Modelica.Units.SI.Volume V=6*10*3 "Room volume"; ///////////////////////////////////////////////////////// // Air temperatures at design conditions - parameter Modelica.SIunits.Temperature TASup_nominal = 273.15+18 + parameter Modelica.Units.SI.Temperature TASup_nominal = 273.15+18 "Nominal air temperature supplied to room"; - parameter Modelica.SIunits.Temperature TRooSet = 273.15+24 + parameter Modelica.Units.SI.Temperature TRooSet = 273.15+24 "Nominal room air temperature"; - parameter Modelica.SIunits.Temperature TOut_nominal = 273.15+30 + parameter Modelica.Units.SI.Temperature TOut_nominal = 273.15+30 "Design outlet air temperature"; ///////////////////////////////////////////////////////// // Cooling loads and air mass flow rates - parameter Modelica.SIunits.HeatFlowRate QRooInt_flow= + parameter Modelica.Units.SI.HeatFlowRate QRooInt_flow= 1000 "Internal heat gains of the room"; - parameter Modelica.SIunits.HeatFlowRate QRooC_flow_nominal= + parameter Modelica.Units.SI.HeatFlowRate QRooC_flow_nominal= -QRooInt_flow-10E3/30*(TOut_nominal-TRooSet) "Nominal cooling load of the room"; - parameter Modelica.SIunits.MassFlowRate mA_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate mA_flow_nominal= 1.3*QRooC_flow_nominal/1006/(TASup_nominal-TRooSet) "Nominal air mass flow rate, increased by factor 1.3 to allow for recovery after temperature setback"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/ExportContainers/Validation/FMUs/ThermalZoneAir1.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/ExportContainers/Validation/FMUs/ThermalZoneAir1.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/ExportContainers/Validation/FMUs/ThermalZoneAir1.mo" 2022-03-10 09:57:42.056144641 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/ExportContainers/Validation/FMUs/ThermalZoneAir1.mo" 2022-03-10 09:58:16.984149065 +0000 @@ -4,25 +4,25 @@ redeclare package Medium = IBPSA.Media.Air, nPorts = 2); - parameter Modelica.SIunits.Volume V=6*10*3 "Room volume"; + parameter Modelica.Units.SI.Volume V=6*10*3 "Room volume"; ///////////////////////////////////////////////////////// // Air temperatures at design conditions - parameter Modelica.SIunits.Temperature TASup_nominal = 273.15+18 + parameter Modelica.Units.SI.Temperature TASup_nominal = 273.15+18 "Nominal air temperature supplied to room"; - parameter Modelica.SIunits.Temperature TRooSet = 273.15+24 + parameter Modelica.Units.SI.Temperature TRooSet = 273.15+24 "Nominal room air temperature"; - parameter Modelica.SIunits.Temperature TOut_nominal = 273.15+30 + parameter Modelica.Units.SI.Temperature TOut_nominal = 273.15+30 "Design outlet air temperature"; ///////////////////////////////////////////////////////// // Cooling loads and air mass flow rates - parameter Modelica.SIunits.HeatFlowRate QRooInt_flow= + parameter Modelica.Units.SI.HeatFlowRate QRooInt_flow= 1000 "Internal heat gains of the room"; - parameter Modelica.SIunits.HeatFlowRate QRooC_flow_nominal= + parameter Modelica.Units.SI.HeatFlowRate QRooC_flow_nominal= -QRooInt_flow-10E3/30*(TOut_nominal-TRooSet) "Nominal cooling load of the room"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal= 1.3*QRooC_flow_nominal/1006/(TASup_nominal-TRooSet) "Nominal air mass flow rate, increased by factor 1.3 to allow for recovery after temperature setback"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/FlowSplitter_u.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/FlowSplitter_u.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/FlowSplitter_u.mo" 2022-03-10 09:57:42.056144641 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/FlowSplitter_u.mo" 2022-03-10 09:58:16.896149054 +0000 @@ -6,7 +6,7 @@ Modelica.Media.Interfaces.PartialMedium "Medium in the component" annotation (choicesAllMatching = true); - parameter Modelica.SIunits.MassFlowRate m_flow_nominal[nout]( + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal[nout]( each min=0) "Nominal mass flow rate for each outlet"; parameter Boolean allowFlowReversal = true "= true to allow flow reversal, false restricts to design direction (inlet -> outlet)" @@ -34,7 +34,7 @@ annotation (Placement(transformation(extent={{-140,60},{-100,100}}), iconTransformation(extent={{-120,70},{-100,90}}))); protected - final parameter Modelica.SIunits.MassFlowRate mAve_flow_nominal= + final parameter Modelica.Units.SI.MassFlowRate mAve_flow_nominal= sum(m_flow_nominal)/nout "Average nominal mass flow rate"; protected IBPSA.Fluid.FMI.Interfaces.FluidProperties bacPro_internal( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/Interfaces/MassFractionConnector.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/Interfaces/MassFractionConnector.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/Interfaces/MassFractionConnector.mo" 2022-03-10 09:57:42.056144641 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/Interfaces/MassFractionConnector.mo" 2022-03-10 09:58:16.852149049 +0000 @@ -1,6 +1,6 @@ within IBPSA.Fluid.FMI.Interfaces; connector MassFractionConnector = - Modelica.SIunits.MassFraction + Modelica.Units.SI.MassFraction "Connector for mass fraction of water vapor per kg total mass" annotation ( defaultComponentName="X_w", diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/Interfaces/PressureInput.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/Interfaces/PressureInput.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/Interfaces/PressureInput.mo" 2022-03-10 09:57:42.056144641 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/Interfaces/PressureInput.mo" 2022-03-10 09:58:16.828149045 +0000 @@ -1,6 +1,6 @@ within IBPSA.Fluid.FMI.Interfaces; connector PressureInput = - input Modelica.SIunits.AbsolutePressure(displayUnit="Pa") + input Modelica.Units.SI.AbsolutePressure(displayUnit="Pa") "Connector for pressure input" annotation ( defaultComponentName="p", diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/Interfaces/PressureOutput.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/Interfaces/PressureOutput.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/Interfaces/PressureOutput.mo" 2022-03-10 09:57:42.056144641 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/Interfaces/PressureOutput.mo" 2022-03-10 09:58:16.816149044 +0000 @@ -1,6 +1,6 @@ within IBPSA.Fluid.FMI.Interfaces; connector PressureOutput = - output Modelica.SIunits.AbsolutePressure(displayUnit="Pa") + output Modelica.Units.SI.AbsolutePressure(displayUnit="Pa") "Connector for pressure output" annotation ( defaultComponentName="p", diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/Validation/FlowSplitter_u.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/Validation/FlowSplitter_u.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/Validation/FlowSplitter_u.mo" 2022-03-10 09:57:42.056144641 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/Validation/FlowSplitter_u.mo" 2022-03-10 09:58:16.700149029 +0000 @@ -3,7 +3,7 @@ extends Modelica.Icons.Example; package Medium = IBPSA.Media.Air "Medium model"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=0.1 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=0.1 "Nominal mass flow rate"; parameter Boolean use_p_in = false diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/Validation/HeaterFan.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/Validation/HeaterFan.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/Validation/HeaterFan.mo" 2022-03-10 09:57:42.056144641 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/Validation/HeaterFan.mo" 2022-03-10 09:58:16.680149028 +0000 @@ -4,11 +4,11 @@ extends Modelica.Icons.Example; package Medium = IBPSA.Media.Air "Medium model"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=Q_flow_nominal/1000/10 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=Q_flow_nominal/1000/10 "Nominal mass flow rate"; - parameter Modelica.SIunits.PressureDifference dp_nominal(displayUnit="Pa")=2000 + parameter Modelica.Units.SI.PressureDifference dp_nominal(displayUnit="Pa")=2000 "Pressure"; - parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal = 1000 + parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal = 1000 "Heat flow rate at u=1, positive for heating"; parameter Boolean use_p_in = true diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/Validation/HeaterFanPressureDriven.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/Validation/HeaterFanPressureDriven.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/Validation/HeaterFanPressureDriven.mo" 2022-03-10 09:57:42.056144641 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/Validation/HeaterFanPressureDriven.mo" 2022-03-10 09:58:16.656149024 +0000 @@ -4,11 +4,11 @@ extends Modelica.Icons.Example; package Medium = IBPSA.Media.Air "Medium model"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=Q_flow_nominal/1000/10 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=Q_flow_nominal/1000/10 "Nominal mass flow rate"; - parameter Modelica.SIunits.PressureDifference dp_nominal(displayUnit="Pa")=2000 + parameter Modelica.Units.SI.PressureDifference dp_nominal(displayUnit="Pa")=2000 "Pressure"; - parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal = 1000 + parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal = 1000 "Heat flow rate at u=1, positive for heating"; constant Boolean use_p_in = true diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/Validation/HeaterFan_noReverseFlow.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/Validation/HeaterFan_noReverseFlow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/Validation/HeaterFan_noReverseFlow.mo" 2022-03-10 09:57:42.056144641 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FMI/Validation/HeaterFan_noReverseFlow.mo" 2022-03-10 09:58:16.636149022 +0000 @@ -11,11 +11,11 @@ "= true to use a pressure from connector, false to output Medium.p_default" annotation(Evaluate=true); - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=Q_flow_nominal/1000/10 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=Q_flow_nominal/1000/10 "Nominal mass flow rate"; - parameter Modelica.SIunits.PressureDifference dp_nominal(displayUnit="Pa")=2000 + parameter Modelica.Units.SI.PressureDifference dp_nominal(displayUnit="Pa")=2000 "Pressure"; - parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal = 1000 + parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal = 1000 "Heat flow rate at u=1, positive for heating"; ExportContainers.Examples.FMUs.Fan floMac( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FixedResistances/BaseClasses/PlugFlow.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FixedResistances/BaseClasses/PlugFlow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FixedResistances/BaseClasses/PlugFlow.mo" 2022-03-10 09:57:42.056144641 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FixedResistances/BaseClasses/PlugFlow.mo" 2022-03-10 09:58:16.604149018 +0000 @@ -3,27 +3,27 @@ "Lossless pipe model with spatialDistribution plug flow implementation" extends IBPSA.Fluid.Interfaces.PartialTwoPort; - parameter Modelica.SIunits.Length dh + parameter Modelica.Units.SI.Length dh "Hydraulic diameter (assuming a round cross section area)"; - parameter Modelica.SIunits.Length length(min=0) "Pipe length"; - final parameter Modelica.SIunits.Area A=Modelica.Constants.pi*(dh/2)^2 + parameter Modelica.Units.SI.Length length(min=0) "Pipe length"; + final parameter Modelica.Units.SI.Area A=Modelica.Constants.pi*(dh/2)^2 "Cross-sectional area of pipe"; parameter Medium.MassFlowRate m_flow_small "Small mass flow rate for regularization of zero flow" annotation(Dialog(tab = "Advanced")); - parameter Modelica.SIunits.Temperature T_start_in=Medium.T_default + parameter Modelica.Units.SI.Temperature T_start_in=Medium.T_default "Initial temperature in pipe at inlet" annotation (Dialog(group="Initialization")); - parameter Modelica.SIunits.Temperature T_start_out=Medium.T_default + parameter Modelica.Units.SI.Temperature T_start_out=Medium.T_default "Initial temperature in pipe at outlet" annotation (Dialog(group="Initialization")); - Modelica.SIunits.Length x + Modelica.Units.SI.Length x "Spatial coordinate for spatialDistribution operator"; - Modelica.SIunits.Velocity v "Flow velocity of medium in pipe"; + Modelica.Units.SI.Velocity v "Flow velocity of medium in pipe"; - Modelica.SIunits.VolumeFlowRate V_flow= + Modelica.Units.SI.VolumeFlowRate V_flow= port_a.m_flow/Modelica.Fluid.Utilities.regStep(port_a.m_flow, Medium.density( Medium.setState_phX( @@ -40,13 +40,13 @@ protected - parameter Modelica.SIunits.SpecificEnthalpy h_ini_in=Medium.specificEnthalpy( + parameter Modelica.Units.SI.SpecificEnthalpy h_ini_in=Medium.specificEnthalpy( Medium.setState_pTX( T=T_start_in, p=Medium.p_default, X=Medium.X_default)) "For initialization of spatialDistribution inlet"; - parameter Modelica.SIunits.SpecificEnthalpy h_ini_out=Medium.specificEnthalpy( + parameter Modelica.Units.SI.SpecificEnthalpy h_ini_out=Medium.specificEnthalpy( Medium.setState_pTX( T=T_start_out, p=Medium.p_default, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FixedResistances/BaseClasses/PlugFlowCore.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FixedResistances/BaseClasses/PlugFlowCore.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FixedResistances/BaseClasses/PlugFlowCore.mo" 2022-03-10 09:57:42.056144641 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FixedResistances/BaseClasses/PlugFlowCore.mo" 2022-03-10 09:58:16.584149016 +0000 @@ -3,23 +3,23 @@ "Pipe model using spatialDistribution for temperature delay with modified delay tracker" extends IBPSA.Fluid.Interfaces.PartialTwoPort; - parameter Modelica.SIunits.Length dh + parameter Modelica.Units.SI.Length dh "Hydraulic diameter (assuming a round cross section area)"; - parameter Modelica.SIunits.Velocity v_nominal + parameter Modelica.Units.SI.Velocity v_nominal "Velocity at m_flow_nominal (used to compute default value for hydraulic diameter dh)" annotation(Dialog(group="Nominal condition")); - parameter Modelica.SIunits.Length length(min=0) "Pipe length"; + parameter Modelica.Units.SI.Length length(min=0) "Pipe length"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal(min=0) + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal(min=0) "Nominal mass flow rate" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.MassFlowRate m_flow_small(min=0) = 1E-4*abs( + parameter Modelica.Units.SI.MassFlowRate m_flow_small(min=0) = 1E-4*abs( m_flow_nominal) "Small mass flow rate for regularization of zero flow" annotation (Dialog(tab="Advanced")); - parameter Modelica.SIunits.Height roughness=2.5e-5 + parameter Modelica.Units.SI.Height roughness=2.5e-5 "Average height of surface asperities (default: smooth steel pipe)" annotation (Dialog(group="Geometry")); @@ -36,18 +36,18 @@ parameter Boolean from_dp=false "= true, use m_flow = f(dp) else dp = f(m_flow)" annotation (Evaluate=true, Dialog(tab="Advanced")); - parameter Modelica.SIunits.Length thickness(min=0) "Pipe wall thickness"; + parameter Modelica.Units.SI.Length thickness(min=0) "Pipe wall thickness"; - parameter Modelica.SIunits.Temperature T_start_in=Medium.T_default + parameter Modelica.Units.SI.Temperature T_start_in=Medium.T_default "Initialization temperature at pipe inlet" annotation (Dialog(tab="Initialization")); - parameter Modelica.SIunits.Temperature T_start_out=Medium.T_default + parameter Modelica.Units.SI.Temperature T_start_out=Medium.T_default "Initialization temperature at pipe outlet" annotation (Dialog(tab="Initialization")); parameter Boolean initDelay=false "Initialize delay for a constant mass flow rate if true, otherwise start from 0" annotation (Dialog(tab="Initialization")); - parameter Modelica.SIunits.MassFlowRate m_flow_start=0 + parameter Modelica.Units.SI.MassFlowRate m_flow_start=0 annotation (Dialog(tab="Initialization", enable=initDelay)); parameter Real ReC=4000 @@ -127,13 +127,13 @@ annotation (Placement(transformation(extent={{-10,90},{10,110}}))); protected - parameter Modelica.SIunits.Density rho_default=Medium.density_pTX( + + parameter Modelica.Units.SI.Density rho_default=Medium.density_pTX( p=Medium.p_default, T=Medium.T_default, X=Medium.X_default) "Default density (e.g., rho_liquidWater = 995, rho_air = 1.2)" annotation (Dialog(group="Advanced")); - equation connect(senMasFlo.m_flow, timDel.m_flow) annotation (Line( points={{-40,-11},{-40,-40},{-12,-40}}, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FixedResistances/BaseClasses/PlugFlowHeatLoss.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FixedResistances/BaseClasses/PlugFlowHeatLoss.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FixedResistances/BaseClasses/PlugFlowHeatLoss.mo" 2022-03-10 09:57:42.056144641 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FixedResistances/BaseClasses/PlugFlowHeatLoss.mo" 2022-03-10 09:58:16.548149010 +0000 @@ -11,11 +11,11 @@ parameter Real R(unit="(m.K)/W") "Thermal resistance per unit length from fluid to boundary temperature"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal "Nominal mass flow rate"; - parameter Modelica.SIunits.Temperature T_start + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal "Nominal mass flow rate"; + parameter Modelica.Units.SI.Temperature T_start "Initial output temperature"; - final parameter Modelica.SIunits.Time tau_char=R*C "Characteristic delay time"; + final parameter Modelica.Units.SI.Time tau_char=R*C "Characteristic delay time"; Modelica.Blocks.Interfaces.RealInput tau(unit="s") "Time delay at pipe level" annotation (Placement(transformation( @@ -26,21 +26,21 @@ "Heat port to connect environment (negative if heat is lost to ambient)" annotation (Placement(transformation(extent={{-10,90},{10,110}}))); - Modelica.SIunits.Temperature T_a_inflow(start=T_start) + Modelica.Units.SI.Temperature T_a_inflow(start=T_start) "Temperature at port_a for inflowing fluid"; - Modelica.SIunits.Temperature T_b_outflow(start=T_start) + Modelica.Units.SI.Temperature T_b_outflow(start=T_start) "Temperature at port_b for outflowing fluid"; - Modelica.SIunits.Temperature TAmb=heatPort.T "Environment temperature"; + Modelica.Units.SI.Temperature TAmb=heatPort.T "Environment temperature"; protected parameter Medium.ThermodynamicState sta_default=Medium.setState_pTX( T=Medium.T_default, p=Medium.p_default, X=Medium.X_default) "Default medium state"; - parameter Modelica.SIunits.SpecificHeatCapacity cp_default= + + parameter Modelica.Units.SI.SpecificHeatCapacity cp_default= Medium.specificHeatCapacityCp(state=sta_default) "Heat capacity of medium"; - equation dp = 0; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FixedResistances/BaseClasses/PlugFlowTransportDelay.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FixedResistances/BaseClasses/PlugFlowTransportDelay.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FixedResistances/BaseClasses/PlugFlowTransportDelay.mo" 2022-03-10 09:57:42.056144641 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FixedResistances/BaseClasses/PlugFlowTransportDelay.mo" 2022-03-10 09:58:16.528149008 +0000 @@ -1,34 +1,34 @@ within IBPSA.Fluid.FixedResistances.BaseClasses; model PlugFlowTransportDelay "Delay time for given normalized velocity" - parameter Modelica.SIunits.Length length "Pipe length"; - parameter Modelica.SIunits.Length dh + parameter Modelica.Units.SI.Length length "Pipe length"; + parameter Modelica.Units.SI.Length dh "Hydraulic diameter (assuming a round cross section area)"; - parameter Modelica.SIunits.Density rho "Standard density of fluid"; + parameter Modelica.Units.SI.Density rho "Standard density of fluid"; parameter Boolean initDelay=false "Initialize delay for a constant m_flow_start if true, otherwise start from 0" annotation (Dialog(group="Initialization")); - parameter Modelica.SIunits.MassFlowRate m_flow_start=0 + parameter Modelica.Units.SI.MassFlowRate m_flow_start=0 "Initialization of mass flow rate to calculate initial time delay" annotation (Dialog(group="Initialization", enable=initDelay)); - parameter Modelica.SIunits.MassFlowRate m_flow_nominal(min=0) + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal(min=0) "Nominal mass flow rate" annotation (Dialog(group="Nominal condition")); - final parameter Modelica.SIunits.Time t_in_start= + final parameter Modelica.Units.SI.Time t_in_start= if initDelay and (abs(m_flow_start) > 1E-10*m_flow_nominal) then min(length/m_flow_start*(rho*dh^2/4*Modelica.Constants.pi), 0) else 0 "Initial value of input time at inlet"; - final parameter Modelica.SIunits.Time t_out_start= + final parameter Modelica.Units.SI.Time t_out_start= if initDelay and (abs(m_flow_start) > 1E-10*m_flow_nominal) then min(-length/m_flow_start*(rho*dh^2/4*Modelica.Constants.pi), 0) else 0 "Initial value of input time at outlet"; - Modelica.SIunits.Time time_out_rev "Reverse flow direction output time"; - Modelica.SIunits.Time time_out_des "Design flow direction output time"; + Modelica.Units.SI.Time time_out_rev "Reverse flow direction output time"; + Modelica.Units.SI.Time time_out_des "Design flow direction output time"; Real x(start=0) "Spatial coordinate for spatialDistribution operator"; - Modelica.SIunits.Frequency u "Normalized fluid velocity (1/s)"; + Modelica.Units.SI.Frequency u "Normalized fluid velocity (1/s)"; Modelica.Blocks.Interfaces.RealInput m_flow "Mass flow of fluid" annotation ( Placement(transformation(extent={{-140,-20},{-100,20}}), diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FixedResistances/BaseClasses/Validation/PlugFlowCore.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FixedResistances/BaseClasses/Validation/PlugFlowCore.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FixedResistances/BaseClasses/Validation/PlugFlowCore.mo" 2022-03-10 09:57:42.056144641 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FixedResistances/BaseClasses/Validation/PlugFlowCore.mo" 2022-03-10 09:58:16.460148999 +0000 @@ -4,16 +4,16 @@ replaceable package Medium = IBPSA.Media.Water "Medium in pipes" annotation ( choicesAllMatching=true); - parameter Modelica.SIunits.Length dh=0.1 + parameter Modelica.Units.SI.Length dh=0.1 "Hydraulic diameter (assuming a round cross section area)"; - parameter Modelica.SIunits.Length dIns = 0.05 + parameter Modelica.Units.SI.Length dIns = 0.05 "Thickness of pipe insulation"; - parameter Modelica.SIunits.ThermalConductivity kIns= 0.028 + parameter Modelica.Units.SI.ThermalConductivity kIns= 0.028 "Heat conductivity of pipe insulation"; - parameter Modelica.SIunits.SpecificHeatCapacity cPip=500 + parameter Modelica.Units.SI.SpecificHeatCapacity cPip=500 "Specific heat of pipe wall material. 2300 for PE, 500 for steel"; - parameter Modelica.SIunits.Density rhoPip=8000 + parameter Modelica.Units.SI.Density rhoPip=8000 "Density of pipe wall material. 930 for PE, 8000 for steel"; parameter Real R=1/(kIns*2*Modelica.Constants.pi/ @@ -23,7 +23,7 @@ parameter Real C=rho_default*Modelica.Constants.pi*( dh/2)^2*cp_default "Thermal capacity per unit length of water in pipe"; - parameter Modelica.SIunits.Density rho_default=Medium.density_pTX( + parameter Modelica.Units.SI.Density rho_default=Medium.density_pTX( p=Medium.p_default, T=Medium.T_default, X=Medium.X_default) @@ -35,7 +35,7 @@ p=Medium.p_default, X=Medium.X_default) "Default medium state"; - parameter Modelica.SIunits.SpecificHeatCapacity cp_default= + parameter Modelica.Units.SI.SpecificHeatCapacity cp_default= Medium.specificHeatCapacityCp(state=sta_default) "Heat capacity of medium"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FixedResistances/HydraulicDiameter.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FixedResistances/HydraulicDiameter.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FixedResistances/HydraulicDiameter.mo" 2022-03-10 09:57:42.056144641 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FixedResistances/HydraulicDiameter.mo" 2022-03-10 09:58:16.388148991 +0000 @@ -4,25 +4,25 @@ final deltaM = eta_default*dh/4*Modelica.Constants.pi*ReC/m_flow_nominal_pos, final dp_nominal=fac*dpStraightPipe_nominal); - parameter Modelica.SIunits.Length dh=sqrt(4*m_flow_nominal/rho_default/v_nominal/Modelica.Constants.pi) + parameter Modelica.Units.SI.Length dh=sqrt(4*m_flow_nominal/rho_default/v_nominal/Modelica.Constants.pi) "Hydraulic diameter (assuming a round cross section area)"; - parameter Modelica.SIunits.Length length "Length of the pipe"; + parameter Modelica.Units.SI.Length length "Length of the pipe"; parameter Real ReC(min=0)=4000 "Reynolds number where transition to turbulent starts"; - parameter Modelica.SIunits.Velocity v_nominal = if rho_default < 500 then 1.5 else 0.15 + parameter Modelica.Units.SI.Velocity v_nominal = if rho_default < 500 then 1.5 else 0.15 "Velocity at m_flow_nominal (used to compute default value for hydraulic diameter dh)" annotation(Dialog(group="Nominal condition")); - parameter Modelica.SIunits.Length roughness(min=0) = 2.5e-5 + parameter Modelica.Units.SI.Length roughness(min=0) = 2.5e-5 "Absolute roughness of pipe, with a default for a smooth steel pipe (dummy if use_roughness = false)"; parameter Real fac(min=1) = 2 "Factor to take into account resistance of bends etc., fac=dp_nominal/dpStraightPipe_nominal"; - final parameter Modelica.SIunits.PressureDifference dpStraightPipe_nominal(displayUnit="Pa")= + final parameter Modelica.Units.SI.PressureDifference dpStraightPipe_nominal(displayUnit="Pa")= Modelica.Fluid.Pipes.BaseClasses.WallFriction.Detailed.pressureLoss_m_flow( m_flow=m_flow_nominal, rho_a=rho_default, @@ -35,11 +35,11 @@ m_flow_small=m_flow_small) "Pressure loss of a straight pipe at m_flow_nominal"; - Modelica.SIunits.Velocity v = m_flow/(rho_default*ARound) + Modelica.Units.SI.Velocity v = m_flow/(rho_default*ARound) "Flow velocity (assuming a round cross section area)"; protected - parameter Modelica.SIunits.Area ARound = dh^2*Modelica.Constants.pi/4 + parameter Modelica.Units.SI.Area ARound = dh^2*Modelica.Constants.pi/4 "Cross sectional area (assuming a round cross section area)"; parameter Medium.ThermodynamicState state_default= @@ -48,10 +48,10 @@ p=Medium.p_default, X=Medium.X_default[1:Medium.nXi]) "Default state"; - parameter Modelica.SIunits.Density rho_default = Medium.density(state_default) + parameter Modelica.Units.SI.Density rho_default = Medium.density(state_default) "Density at nominal condition"; - parameter Modelica.SIunits.DynamicViscosity mu_default = Medium.dynamicViscosity( + parameter Modelica.Units.SI.DynamicViscosity mu_default = Medium.dynamicViscosity( state_default) "Dynamic viscosity at nominal condition"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FixedResistances/Junction.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FixedResistances/Junction.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FixedResistances/Junction.mo" 2022-03-10 09:57:42.056144641 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FixedResistances/Junction.mo" 2022-03-10 09:58:16.368148987 +0000 @@ -26,11 +26,11 @@ homotopyInitialization=homotopyInitialization, deltaM=deltaM)); - parameter Modelica.SIunits.MassFlowRate[3] m_flow_nominal + parameter Modelica.Units.SI.MassFlowRate[3] m_flow_nominal "Mass flow rate. Set negative at outflowing ports." annotation(Dialog(group = "Nominal condition")); - parameter Modelica.SIunits.Pressure[3] dp_nominal(each displayUnit = "Pa") + parameter Modelica.Units.SI.Pressure[3] dp_nominal(each displayUnit = "Pa") "Pressure drop at nominal mass flow rate, set to zero or negative number at outflowing ports." annotation(Dialog(group = "Nominal condition")); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FixedResistances/PlugFlowPipe.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FixedResistances/PlugFlowPipe.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FixedResistances/PlugFlowPipe.mo" 2022-03-10 09:57:42.056144641 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FixedResistances/PlugFlowPipe.mo" 2022-03-10 09:58:16.344148985 +0000 @@ -7,61 +7,61 @@ "= true, use m_flow = f(dp) else dp = f(m_flow)" annotation (Dialog(tab="Advanced")); - parameter Modelica.SIunits.Length dh=sqrt(4*m_flow_nominal/rho_default/v_nominal/Modelica.Constants.pi) + parameter Modelica.Units.SI.Length dh=sqrt(4*m_flow_nominal/rho_default/v_nominal/Modelica.Constants.pi) "Hydraulic diameter (assuming a round cross section area)" annotation (Dialog(group="Material")); - parameter Modelica.SIunits.Velocity v_nominal = 1.5 + parameter Modelica.Units.SI.Velocity v_nominal = 1.5 "Velocity at m_flow_nominal (used to compute default value for hydraulic diameter dh)" annotation(Dialog(group="Nominal condition")); parameter Real ReC=4000 "Reynolds number where transition to turbulent starts"; - parameter Modelica.SIunits.Height roughness=2.5e-5 + parameter Modelica.Units.SI.Height roughness=2.5e-5 "Average height of surface asperities (default: smooth steel pipe)" annotation (Dialog(group="Material")); - parameter Modelica.SIunits.Length length "Pipe length" + parameter Modelica.Units.SI.Length length "Pipe length" annotation (Dialog(group="Material")); - parameter Modelica.SIunits.MassFlowRate m_flow_nominal + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal "Nominal mass flow rate" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.MassFlowRate m_flow_small = 1E-4*abs( + parameter Modelica.Units.SI.MassFlowRate m_flow_small = 1E-4*abs( m_flow_nominal) "Small mass flow rate for regularization of zero flow" annotation (Dialog(tab="Advanced")); - parameter Modelica.SIunits.Length dIns + parameter Modelica.Units.SI.Length dIns "Thickness of pipe insulation, used to compute R" annotation (Dialog(group="Thermal resistance")); - parameter Modelica.SIunits.ThermalConductivity kIns + parameter Modelica.Units.SI.ThermalConductivity kIns "Heat conductivity of pipe insulation, used to compute R" annotation (Dialog(group="Thermal resistance")); - parameter Modelica.SIunits.SpecificHeatCapacity cPip=2300 + parameter Modelica.Units.SI.SpecificHeatCapacity cPip=2300 "Specific heat of pipe wall material. 2300 for PE, 500 for steel" annotation (Dialog(group="Material")); - parameter Modelica.SIunits.Density rhoPip(displayUnit="kg/m3")=930 + parameter Modelica.Units.SI.Density rhoPip(displayUnit="kg/m3")=930 "Density of pipe wall material. 930 for PE, 8000 for steel" annotation (Dialog(group="Material")); - parameter Modelica.SIunits.Length thickness = 0.0035 + parameter Modelica.Units.SI.Length thickness = 0.0035 "Pipe wall thickness" annotation (Dialog(group="Material")); - parameter Modelica.SIunits.Temperature T_start_in(start=Medium.T_default)= + parameter Modelica.Units.SI.Temperature T_start_in(start=Medium.T_default)= Medium.T_default "Initialization temperature at pipe inlet" annotation (Dialog(tab="Initialization")); - parameter Modelica.SIunits.Temperature T_start_out(start=Medium.T_default)= + parameter Modelica.Units.SI.Temperature T_start_out(start=Medium.T_default)= T_start_in "Initialization temperature at pipe outlet" annotation (Dialog(tab="Initialization")); parameter Boolean initDelay(start=false) = false "Initialize delay for a constant mass flow rate if true, otherwise start from 0" annotation (Dialog(tab="Initialization")); - parameter Modelica.SIunits.MassFlowRate m_flow_start=0 "Initial value of mass flow rate through pipe" + parameter Modelica.Units.SI.MassFlowRate m_flow_start=0 "Initial value of mass flow rate through pipe" annotation (Dialog(tab="Initialization", enable=initDelay)); parameter Real R(unit="(m.K)/W")=1/(kIns*2*Modelica.Constants.pi/ @@ -125,10 +125,10 @@ annotation (Placement(transformation(extent={{60,20},{80,40}}))); protected - parameter Modelica.SIunits.HeatCapacity CPip= + parameter Modelica.Units.SI.HeatCapacity CPip= length*((dh + 2*thickness)^2 - dh^2)*Modelica.Constants.pi/4*cPip*rhoPip "Heat capacity of pipe wall"; - final parameter Modelica.SIunits.Volume VEqu=CPip/(rho_default*cp_default) + final parameter Modelica.Units.SI.Volume VEqu=CPip/(rho_default*cp_default) "Equivalent water volume to represent pipe wall thermal inertia"; parameter Medium.ThermodynamicState sta_default=Medium.setState_pTX( @@ -136,7 +136,7 @@ p=Medium.p_default, X=Medium.X_default) "Default medium state"; - parameter Modelica.SIunits.SpecificHeatCapacity cp_default= + parameter Modelica.Units.SI.SpecificHeatCapacity cp_default= Medium.specificHeatCapacityCp(state=sta_default) "Heat capacity of medium"; @@ -144,13 +144,13 @@ rho_default*Modelica.Constants.pi*(dh/2)^2*cp_default "Thermal capacity per unit length of water in pipe"; - parameter Modelica.SIunits.Density rho_default=Medium.density_pTX( + + parameter Modelica.Units.SI.Density rho_default=Medium.density_pTX( p=Medium.p_default, T=Medium.T_default, X=Medium.X_default) "Default density (e.g., rho_liquidWater = 995, rho_air = 1.2)" annotation (Dialog(group="Advanced")); - equation for i in 1:nPorts loop connect(vol.ports[i + 1], ports_b[i]) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/BaseClasses/PipeDataULg.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/BaseClasses/PipeDataULg.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/BaseClasses/PipeDataULg.mo" 2022-03-10 09:57:42.056144641 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/BaseClasses/PipeDataULg.mo" 2022-03-10 09:58:16.164148961 +0000 @@ -1,11 +1,11 @@ within IBPSA.Fluid.FixedResistances.Validation.PlugFlowPipes.Data.BaseClasses; partial record PipeDataULg "Base class for ULg experimental data" extends PipeDataBaseDefinition; - parameter Modelica.SIunits.Temp_C T_start_in = 20 + parameter Modelica.Units.NonSI.Temperature_degC T_start_in = 20 "Initial temperature at inlet"; - parameter Modelica.SIunits.Temp_C T_start_out = 20 + parameter Modelica.Units.NonSI.Temperature_degC T_start_out = 20 "Initial temperature at outlet"; - parameter Modelica.SIunits.MassFlowRate m_flowIni = 0 + parameter Modelica.Units.SI.MassFlowRate m_flowIni = 0 "Mass flow initialization"; annotation (Documentation(info="
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FixedResistances/Validation/PlugFlowPipes/MSLAIT.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FixedResistances/Validation/PlugFlowPipes/MSLAIT.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FixedResistances/Validation/PlugFlowPipes/MSLAIT.mo" 2022-03-10 09:57:42.056144641 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FixedResistances/Validation/PlugFlowPipes/MSLAIT.mo" 2022-03-10 09:58:15.532148881 +0000 @@ -83,10 +83,10 @@ origin={124,-8}))); inner Modelica.Fluid.System system annotation (Placement(transformation(extent={{-140,140},{-120,160}}))); - parameter Modelica.SIunits.ThermalResistance R= + parameter Modelica.Units.SI.ThermalResistance R= 1/(2*kIns*Modelica.Constants.pi)*log(0.18/0.0899) + 1/(2*2.4*Modelica.Constants.pi)*log(2/0.18) "Thermal resistance of main pipes"; - parameter Modelica.SIunits.ThermalResistance R80= + parameter Modelica.Units.SI.ThermalResistance R80= 1/(2*0.024*Modelica.Constants.pi)*log(0.07/0.0337) + 1/(2*2.4*Modelica.Constants.pi)*log(2/0.07) "Thermal resistance of service pipes"; @@ -246,11 +246,11 @@ extent={{-10,-10},{10,10}}, rotation=90, origin={-22,62}))); - parameter Modelica.SIunits.ThermalConductivity kIns=0.024 + parameter Modelica.Units.SI.ThermalConductivity kIns=0.024 "Heat conductivity of pipe insulation material"; - parameter Modelica.SIunits.Length dIns=0.045 + parameter Modelica.Units.SI.Length dIns=0.045 "Thickness of pipe insulation"; - parameter Modelica.SIunits.Diameter diameter=0.089 + parameter Modelica.Units.SI.Diameter diameter=0.089 "Outer diameter of pipe"; Fluid.Sensors.TemperatureTwoPort senTem_p2(redeclare package Medium = Medium, @@ -291,9 +291,9 @@ rotation=90, origin={42,80}))); - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=1 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1 "Nominal mass flow rate, used for regularization near zero flow"; - parameter Modelica.SIunits.Time tauHeaTra=6500 + parameter Modelica.Units.SI.Time tauHeaTra=6500 "Time constant for heat transfer, default 20 minutes"; Fluid.Sources.MassFlowSource_T Point5( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FixedResistances/Validation/PlugFlowPipes/MSLAIT2Nodes.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FixedResistances/Validation/PlugFlowPipes/MSLAIT2Nodes.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FixedResistances/Validation/PlugFlowPipes/MSLAIT2Nodes.mo" 2022-03-10 09:57:42.056144641 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FixedResistances/Validation/PlugFlowPipes/MSLAIT2Nodes.mo" 2022-03-10 09:58:15.456148872 +0000 @@ -245,11 +245,11 @@ extent={{-10,-10},{10,10}}, rotation=90, origin={-28,68}))); - parameter Modelica.SIunits.ThermalConductivity kIns=0.024 + parameter Modelica.Units.SI.ThermalConductivity kIns=0.024 "Heat conductivity"; - parameter Modelica.SIunits.Length dIns=0.045 + parameter Modelica.Units.SI.Length dIns=0.045 "Thickness of pipe insulation"; - parameter Modelica.SIunits.Diameter diameter=0.089 + parameter Modelica.Units.SI.Diameter diameter=0.089 "Outer diameter of pipe"; Fluid.Sensors.TemperatureTwoPort senTem_p2(redeclare package Medium = Medium, @@ -290,9 +290,9 @@ rotation=90, origin={18,112}))); - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=1 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1 "Nominal mass flow rate, used for regularization near zero flow"; - parameter Modelica.SIunits.Time tauHeaTra=6500 + parameter Modelica.Units.SI.Time tauHeaTra=6500 "Time constant for heat transfer, default 20 minutes"; Modelica.Blocks.Logical.Switch switch diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowAIT.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowAIT.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowAIT.mo" 2022-03-10 09:57:42.056144641 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowAIT.mo" 2022-03-10 09:58:15.336148857 +0000 @@ -3,7 +3,7 @@ "Validation pipe against data from Austrian Institute of Technology" extends Modelica.Icons.Example; package Medium = IBPSA.Media.Water; - parameter Modelica.SIunits.Length Lcap=1 + parameter Modelica.Units.SI.Length Lcap=1 "Length over which transient effects typically take place"; parameter Real R80(unit="(m.K)/W")=1/(2*0.024*Modelica.Constants.pi) *log(0.07/0.0337) + 1/(2*2.4*Modelica.Constants.pi)*log(2/0.07) "Thermal resistance per unit length of service pipes"; @@ -12,12 +12,12 @@ "Flag to decide whether volumes are included at the end points of the pipe"; parameter Boolean allowFlowReversal=true "= true to allow flow reversal, false restricts to design direction (port_a -> port_b)"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=1 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1 "Nominal mass flow rate, used for regularization near zero flow"; - parameter Modelica.SIunits.Time tauHeaTra=6500 + parameter Modelica.Units.SI.Time tauHeaTra=6500 "Time constant for heat transfer, default 20 minutes"; - parameter Modelica.SIunits.Length thickness=0.0032 "Pipe wall thickness"; + parameter Modelica.Units.SI.Length thickness=0.0032 "Pipe wall thickness"; Fluid.Sources.MassFlowSource_T Point1( redeclare package Medium = Medium, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowULg.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowULg.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowULg.mo" 2022-03-10 09:57:42.056144641 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowULg.mo" 2022-03-10 09:58:15.284148851 +0000 @@ -3,13 +3,13 @@ extends Modelica.Icons.Example; package Medium = IBPSA.Media.Water; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=1 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1 "Nominal mass flow rate, used for regularization near zero flow"; - parameter Modelica.SIunits.Temperature T_start_in=pipeDataULg.T_start_in + 273.15 + parameter Modelica.Units.SI.Temperature T_start_in=pipeDataULg.T_start_in + 273.15 "Initial temperature at pipe inlet"; - parameter Modelica.SIunits.Temperature T_start_out=pipeDataULg.T_start_out + 273.15 + parameter Modelica.Units.SI.Temperature T_start_out=pipeDataULg.T_start_out + 273.15 "Initial temperature at pipe outlet"; - parameter Modelica.SIunits.SpecificHeatCapacity cp_default= + parameter Modelica.Units.SI.SpecificHeatCapacity cp_default= Medium.specificHeatCapacityCp(state=sta_default) "Heat capacity of medium"; parameter Medium.ThermodynamicState sta_default=Medium.setState_pTX( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FixedResistances/Validation/PlugFlowPipes/TransportWaterAir.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FixedResistances/Validation/PlugFlowPipes/TransportWaterAir.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FixedResistances/Validation/PlugFlowPipes/TransportWaterAir.mo" 2022-03-10 09:57:42.056144641 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FixedResistances/Validation/PlugFlowPipes/TransportWaterAir.mo" 2022-03-10 09:58:15.240148845 +0000 @@ -6,7 +6,7 @@ package MediumA = IBPSA.Media.Air(extraPropertiesNames={"CO2"}) "Medium in the duct"; - parameter Modelica.SIunits.Length length=20 "Pipe length"; + parameter Modelica.Units.SI.Length length=20 "Pipe length"; Modelica.Blocks.Sources.Step Tin( startTime=100, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FixedResistances/Validation/PressureDropsSeries.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FixedResistances/Validation/PressureDropsSeries.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FixedResistances/Validation/PressureDropsSeries.mo" 2022-03-10 09:57:42.056144641 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/FixedResistances/Validation/PressureDropsSeries.mo" 2022-03-10 09:58:15.160148834 +0000 @@ -6,7 +6,7 @@ parameter Integer nRes(min=2) = 10 "Number of resistances"; - parameter Modelica.SIunits.PressureDifference dp_nominal = 5 + parameter Modelica.Units.SI.PressureDifference dp_nominal = 5 "Nominal pressure drop for each resistance"; Modelica.Blocks.Sources.Ramp P( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalHEXOneUTube.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalHEXOneUTube.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalHEXOneUTube.mo" 2022-03-10 09:57:42.056144641 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalHEXOneUTube.mo" 2022-03-10 09:58:15.112148829 +0000 @@ -5,7 +5,7 @@ parameter Integer nSeg(min=1) = 10 "Number of segments to use in vertical discretization of the boreholes"; - parameter Modelica.SIunits.Length hSeg = borFieDat.conDat.hBor/nSeg + parameter Modelica.Units.SI.Length hSeg = borFieDat.conDat.hBor/nSeg "Length of the internal heat exchanger"; package Medium = Modelica.Media.Water.ConstantPropertyLiquidWater; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalHEXTwoUTube.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalHEXTwoUTube.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalHEXTwoUTube.mo" 2022-03-10 09:57:42.056144641 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalHEXTwoUTube.mo" 2022-03-10 09:58:15.092148825 +0000 @@ -5,7 +5,7 @@ parameter Integer nSeg(min=1) = 10 "Number of segments to use in vertical discretization of the boreholes"; - parameter Modelica.SIunits.Length hSeg = borFieDat.conDat.hBor/nSeg + parameter Modelica.Units.SI.Length hSeg = borFieDat.conDat.hBor/nSeg "Length of the internal heat exchanger"; package Medium = Modelica.Media.Water.ConstantPropertyLiquidWater; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalResistancesOneUTube.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalResistancesOneUTube.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalResistancesOneUTube.mo" 2022-03-10 09:57:42.056144641 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalResistancesOneUTube.mo" 2022-03-10 09:58:15.024148818 +0000 @@ -4,12 +4,12 @@ parameter Integer nSeg(min=1) = 10 "Number of segments to use in vertical discretization of the boreholes"; - parameter Modelica.SIunits.Length hSeg = borFieDat.conDat.hBor/nSeg + parameter Modelica.Units.SI.Length hSeg = borFieDat.conDat.hBor/nSeg "Length of the internal heat exchanger"; - parameter Modelica.SIunits.ThermalResistance Rgb_val=0.0430511 "Grout node to borehole wall thermal resistance"; - parameter Modelica.SIunits.ThermalResistance Rgg_val=0.00605573 "Grout node to grout node thermal resistance"; - parameter Modelica.SIunits.ThermalResistance RCondGro_val=0.14285 "Pipe to grout node thermal resistance"; - parameter Modelica.SIunits.Temperature T_start=298.15 "Initial temperature"; + parameter Modelica.Units.SI.ThermalResistance Rgb_val=0.0430511 "Grout node to borehole wall thermal resistance"; + parameter Modelica.Units.SI.ThermalResistance Rgg_val=0.00605573 "Grout node to grout node thermal resistance"; + parameter Modelica.Units.SI.ThermalResistance RCondGro_val=0.14285 "Pipe to grout node thermal resistance"; + parameter Modelica.Units.SI.Temperature T_start=298.15 "Initial temperature"; IBPSA.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.InternalResistancesOneUTube intRes1UTub( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalResistancesTwoUTube.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalResistancesTwoUTube.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalResistancesTwoUTube.mo" 2022-03-10 09:57:42.056144641 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalResistancesTwoUTube.mo" 2022-03-10 09:58:15.008148815 +0000 @@ -4,14 +4,14 @@ parameter Integer nSeg(min=1) = 10 "Number of segments to use in vertical discretization of the boreholes"; - parameter Modelica.SIunits.Length hSeg = borFieDat.conDat.hBor/nSeg + parameter Modelica.Units.SI.Length hSeg = borFieDat.conDat.hBor/nSeg "Length of the internal heat exchanger"; - parameter Modelica.SIunits.ThermalResistance Rgb_val=0.572601 "Grout node to borehole wall thermal resistance"; - parameter Modelica.SIunits.ThermalResistance Rgg1_val=0.0406121 "Grout node to grout node thermal resistance"; - parameter Modelica.SIunits.ThermalResistance Rgg2_val=0.216904 + parameter Modelica.Units.SI.ThermalResistance Rgb_val=0.572601 "Grout node to borehole wall thermal resistance"; + parameter Modelica.Units.SI.ThermalResistance Rgg1_val=0.0406121 "Grout node to grout node thermal resistance"; + parameter Modelica.Units.SI.ThermalResistance Rgg2_val=0.216904 "Thermal resistance between two grout nodes opposite to each other"; - parameter Modelica.SIunits.ThermalResistance RCondGro_val=0.195099 "Pipe to grout node thermal resistance"; - parameter Modelica.SIunits.Temperature T_start=298.15 "Initial temperature"; + parameter Modelica.Units.SI.ThermalResistance RCondGro_val=0.195099 "Pipe to grout node thermal resistance"; + parameter Modelica.Units.SI.Temperature T_start=298.15 "Initial temperature"; Modelica.Thermal.HeatTransfer.Sources.FixedTemperature TWal(T=T_start) "Borehole wall temperature" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/ConvectionResistanceCircularPipe.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/ConvectionResistanceCircularPipe.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/ConvectionResistanceCircularPipe.mo" 2022-03-10 09:57:42.056144641 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/ConvectionResistanceCircularPipe.mo" 2022-03-10 09:58:14.976148811 +0000 @@ -3,24 +3,24 @@ "Validation of the correlation used to evaluate the convection resistance in circular pipes" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Height hSeg = 1.0 "Height of the element"; - parameter Modelica.SIunits.Radius rTub = 0.02 "Tube radius"; - parameter Modelica.SIunits.Length eTub = 0.002 "Tube thickness"; + parameter Modelica.Units.SI.Height hSeg = 1.0 "Height of the element"; + parameter Modelica.Units.SI.Radius rTub = 0.02 "Tube radius"; + parameter Modelica.Units.SI.Length eTub = 0.002 "Tube thickness"; // thermal properties - parameter Modelica.SIunits.ThermalConductivity kMed = 0.6 + parameter Modelica.Units.SI.ThermalConductivity kMed = 0.6 "Thermal conductivity of the fluid"; - parameter Modelica.SIunits.DynamicViscosity muMed = 1.002e-3 + parameter Modelica.Units.SI.DynamicViscosity muMed = 1.002e-3 "Dynamic viscosity of the fluid"; - parameter Modelica.SIunits.SpecificHeatCapacity cpMed = 4182 + parameter Modelica.Units.SI.SpecificHeatCapacity cpMed = 4182 "Specific heat capacity of the fluid"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 1 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 1 "Nominal mass flow rate"; Real Re "Reynolds number"; Real Nu "Reynolds number"; - Modelica.SIunits.MassFlowRate m_flow "Mass flow rate"; - Modelica.SIunits.ThermalResistance RConv "Convection resistance"; + Modelica.Units.SI.MassFlowRate m_flow "Mass flow rate"; + Modelica.Units.SI.ThermalResistance RConv "Convection resistance"; equation Re = time; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesOneUTube.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesOneUTube.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesOneUTube.mo" 2022-03-10 09:57:42.056144641 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesOneUTube.mo" 2022-03-10 09:58:14.968148811 +0000 @@ -7,41 +7,41 @@ // Geometry of the borehole parameter Real Rb(unit="(m.K)/W") = 0.0 "Borehole thermal resistance (Not used)"; - parameter Modelica.SIunits.Height hSeg = 1.0 "Height of the element"; - parameter Modelica.SIunits.Radius rBor = 0.07 "Radius of the borehole"; + parameter Modelica.Units.SI.Height hSeg = 1.0 "Height of the element"; + parameter Modelica.Units.SI.Radius rBor = 0.07 "Radius of the borehole"; // Geometry of the pipe - parameter Modelica.SIunits.Radius rTub = 0.02 "Radius of the tube"; - parameter Modelica.SIunits.Length eTub = 0.002 "Thickness of the tubes"; - parameter Modelica.SIunits.Length sha = 0.03 + parameter Modelica.Units.SI.Radius rTub = 0.02 "Radius of the tube"; + parameter Modelica.Units.SI.Length eTub = 0.002 "Thickness of the tubes"; + parameter Modelica.Units.SI.Length sha = 0.03 "Shank spacing, defined as the distance between the center of a pipe and the center of the borehole"; // Thermal properties (Solids) - parameter Modelica.SIunits.ThermalConductivity kFil = 1.5 + parameter Modelica.Units.SI.ThermalConductivity kFil = 1.5 "Thermal conductivity of the grout"; - parameter Modelica.SIunits.ThermalConductivity kSoi = 2.5 + parameter Modelica.Units.SI.ThermalConductivity kSoi = 2.5 "Thermal conductivity of the soi"; - parameter Modelica.SIunits.ThermalConductivity kTub = 0.4 + parameter Modelica.Units.SI.ThermalConductivity kTub = 0.4 "Thermal conductivity of the tube"; // Thermal properties (Fluid) - parameter Modelica.SIunits.ThermalConductivity kMed = 0.6 + parameter Modelica.Units.SI.ThermalConductivity kMed = 0.6 "Thermal conductivity of the fluid"; - parameter Modelica.SIunits.DynamicViscosity muMed = 1.0e-3 + parameter Modelica.Units.SI.DynamicViscosity muMed = 1.0e-3 "Dynamic viscosity of the fluid"; - parameter Modelica.SIunits.SpecificHeatCapacity cpMed = 4180.0 + parameter Modelica.Units.SI.SpecificHeatCapacity cpMed = 4180.0 "Specific heat capacity of the fluid"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 0.25 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 0.25 "Nominal mass flow rate"; // Outputs parameter Real x(fixed=false) "Capacity location"; - parameter Modelica.SIunits.ThermalResistance Rgb(fixed=false) + + parameter Modelica.Units.SI.ThermalResistance Rgb(fixed=false) "Thermal resistance between grout zone and borehole wall"; - parameter Modelica.SIunits.ThermalResistance Rgg(fixed=false) + parameter Modelica.Units.SI.ThermalResistance Rgg(fixed=false) "Thermal resistance between the two grout zones"; - parameter Modelica.SIunits.ThermalResistance RCondGro(fixed=false) + parameter Modelica.Units.SI.ThermalResistance RCondGro(fixed=false) "Thermal resistance between: pipe wall to capacity in grout"; - initial equation (x, Rgb, Rgg, RCondGro) = IBPSA.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Functions.internalResistancesOneUTube( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesOneUTubeNegative.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesOneUTubeNegative.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesOneUTubeNegative.mo" 2022-03-10 09:57:42.056144641 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesOneUTubeNegative.mo" 2022-03-10 09:58:14.956148809 +0000 @@ -6,41 +6,41 @@ // Geometry of the borehole parameter Real Rb(unit="(m.K)/W") = 0.0 "Borehole thermal resistance (Not used)"; - parameter Modelica.SIunits.Height hSeg = 1.0 "Height of the element"; - parameter Modelica.SIunits.Radius rBor = 0.07 "Radius of the borehole"; + parameter Modelica.Units.SI.Height hSeg = 1.0 "Height of the element"; + parameter Modelica.Units.SI.Radius rBor = 0.07 "Radius of the borehole"; // Geometry of the pipe - parameter Modelica.SIunits.Radius rTub = 0.02 "Radius of the tube"; - parameter Modelica.SIunits.Length eTub = 0.002 "Thickness of the tubes"; - parameter Modelica.SIunits.Length sha = 0.05 + parameter Modelica.Units.SI.Radius rTub = 0.02 "Radius of the tube"; + parameter Modelica.Units.SI.Length eTub = 0.002 "Thickness of the tubes"; + parameter Modelica.Units.SI.Length sha = 0.05 "Shank spacing, defined as the distance between the center of a pipe and the center of the borehole"; // Thermal properties (Solids) - parameter Modelica.SIunits.ThermalConductivity kFil = 1.5 + parameter Modelica.Units.SI.ThermalConductivity kFil = 1.5 "Thermal conductivity of the grout"; - parameter Modelica.SIunits.ThermalConductivity kSoi = 2.5 + parameter Modelica.Units.SI.ThermalConductivity kSoi = 2.5 "Thermal conductivity of the soi"; - parameter Modelica.SIunits.ThermalConductivity kTub = 0.4 + parameter Modelica.Units.SI.ThermalConductivity kTub = 0.4 "Thermal conductivity of the tube"; // Thermal properties (Fluid) - parameter Modelica.SIunits.ThermalConductivity kMed = 0.6 + parameter Modelica.Units.SI.ThermalConductivity kMed = 0.6 "Thermal conductivity of the fluid"; - parameter Modelica.SIunits.DynamicViscosity muMed = 1.0e-3 + parameter Modelica.Units.SI.DynamicViscosity muMed = 1.0e-3 "Dynamic viscosity of the fluid"; - parameter Modelica.SIunits.SpecificHeatCapacity cpMed = 4180.0 + parameter Modelica.Units.SI.SpecificHeatCapacity cpMed = 4180.0 "Specific heat capacity of the fluid"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 0.25 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 0.25 "Nominal mass flow rate"; // Outputs parameter Real x(fixed=false) "Capacity location"; - parameter Modelica.SIunits.ThermalResistance Rgb(fixed=false) + + parameter Modelica.Units.SI.ThermalResistance Rgb(fixed=false) "Thermal resistance between grout zone and borehole wall"; - parameter Modelica.SIunits.ThermalResistance Rgg(fixed=false) + parameter Modelica.Units.SI.ThermalResistance Rgg(fixed=false) "Thermal resistance between the two grout zones"; - parameter Modelica.SIunits.ThermalResistance RCondGro(fixed=false) + parameter Modelica.Units.SI.ThermalResistance RCondGro(fixed=false) "Thermal resistance between: pipe wall to capacity in grout"; - initial equation (x, Rgb, Rgg, RCondGro) = IBPSA.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Functions.internalResistancesOneUTube( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesTwoUTube.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesTwoUTube.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesTwoUTube.mo" 2022-03-10 09:57:42.056144641 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesTwoUTube.mo" 2022-03-10 09:58:14.940148806 +0000 @@ -6,43 +6,43 @@ // Geometry of the borehole parameter Real Rb(unit="(m.K)/W") = 0.0 "Borehole thermal resistance (Not used)"; - parameter Modelica.SIunits.Height hSeg = 1.0 "Height of the element"; - parameter Modelica.SIunits.Radius rBor = 0.07 "Radius of the borehole"; + parameter Modelica.Units.SI.Height hSeg = 1.0 "Height of the element"; + parameter Modelica.Units.SI.Radius rBor = 0.07 "Radius of the borehole"; // Geometry of the pipe - parameter Modelica.SIunits.Radius rTub = 0.02 "Radius of the tube"; - parameter Modelica.SIunits.Length eTub = 0.002 "Thickness of the tubes"; - parameter Modelica.SIunits.Length sha = 0.025 + parameter Modelica.Units.SI.Radius rTub = 0.02 "Radius of the tube"; + parameter Modelica.Units.SI.Length eTub = 0.002 "Thickness of the tubes"; + parameter Modelica.Units.SI.Length sha = 0.025 "Shank spacing, defined as the distance between the center of a pipe and the center of the borehole"; // Thermal properties (Solids) - parameter Modelica.SIunits.ThermalConductivity kFil = 0.5 + parameter Modelica.Units.SI.ThermalConductivity kFil = 0.5 "Thermal conductivity of the grout"; - parameter Modelica.SIunits.ThermalConductivity kSoi = 2.5 + parameter Modelica.Units.SI.ThermalConductivity kSoi = 2.5 "Thermal conductivity of the soi"; - parameter Modelica.SIunits.ThermalConductivity kTub = 0.4 + parameter Modelica.Units.SI.ThermalConductivity kTub = 0.4 "Thermal conductivity of the tube"; // Thermal properties (Fluid) - parameter Modelica.SIunits.ThermalConductivity kMed = 0.6 + parameter Modelica.Units.SI.ThermalConductivity kMed = 0.6 "Thermal conductivity of the fluid"; - parameter Modelica.SIunits.DynamicViscosity muMed = 1.0e-3 + parameter Modelica.Units.SI.DynamicViscosity muMed = 1.0e-3 "Dynamic viscosity of the fluid"; - parameter Modelica.SIunits.SpecificHeatCapacity cpMed = 4180.0 + parameter Modelica.Units.SI.SpecificHeatCapacity cpMed = 4180.0 "Specific heat capacity of the fluid"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 0.25 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 0.25 "Nominal mass flow rate"; // Outputs parameter Real x(fixed=false) "Capacity location"; - parameter Modelica.SIunits.ThermalResistance Rgb(fixed=false) + + parameter Modelica.Units.SI.ThermalResistance Rgb(fixed=false) "Thermal resistance between grout zone and borehole wall"; - parameter Modelica.SIunits.ThermalResistance Rgg1(fixed=false) + parameter Modelica.Units.SI.ThermalResistance Rgg1(fixed=false) "Thermal resistance between the two adjacent grout zones"; - parameter Modelica.SIunits.ThermalResistance Rgg2(fixed=false) + parameter Modelica.Units.SI.ThermalResistance Rgg2(fixed=false) "Thermal resistance between the two opposite grout zones"; - parameter Modelica.SIunits.ThermalResistance RCondGro(fixed=false) + parameter Modelica.Units.SI.ThermalResistance RCondGro(fixed=false) "Thermal resistance between: pipe wall to capacity in grout"; - initial equation (x, Rgb, Rgg1, Rgg2, RCondGro) = IBPSA.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Functions.internalResistancesTwoUTube( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesTwoUTubeNegative.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesTwoUTubeNegative.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesTwoUTubeNegative.mo" 2022-03-10 09:57:42.056144641 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesTwoUTubeNegative.mo" 2022-03-10 09:58:14.908148802 +0000 @@ -6,43 +6,43 @@ // Geometry of the borehole parameter Real Rb(unit="(m.K)/W") = 0.0 "Borehole thermal resistance (Not used)"; - parameter Modelica.SIunits.Height hSeg = 1.0 "Height of the element"; - parameter Modelica.SIunits.Radius rBor = 0.07 "Radius of the borehole"; + parameter Modelica.Units.SI.Height hSeg = 1.0 "Height of the element"; + parameter Modelica.Units.SI.Radius rBor = 0.07 "Radius of the borehole"; // Geometry of the pipe - parameter Modelica.SIunits.Radius rTub = 0.02 "Radius of the tube"; - parameter Modelica.SIunits.Length eTub = 0.002 "Thickness of the tubes"; - parameter Modelica.SIunits.Length sha = 0.05 + parameter Modelica.Units.SI.Radius rTub = 0.02 "Radius of the tube"; + parameter Modelica.Units.SI.Length eTub = 0.002 "Thickness of the tubes"; + parameter Modelica.Units.SI.Length sha = 0.05 "Shank spacing, defined as the distance between the center of a pipe and the center of the borehole"; // Thermal properties (Solids) - parameter Modelica.SIunits.ThermalConductivity kFil = 1.5 + parameter Modelica.Units.SI.ThermalConductivity kFil = 1.5 "Thermal conductivity of the grout"; - parameter Modelica.SIunits.ThermalConductivity kSoi = 2.5 + parameter Modelica.Units.SI.ThermalConductivity kSoi = 2.5 "Thermal conductivity of the soi"; - parameter Modelica.SIunits.ThermalConductivity kTub = 0.4 + parameter Modelica.Units.SI.ThermalConductivity kTub = 0.4 "Thermal conductivity of the tube"; // Thermal properties (Fluid) - parameter Modelica.SIunits.ThermalConductivity kMed = 0.6 + parameter Modelica.Units.SI.ThermalConductivity kMed = 0.6 "Thermal conductivity of the fluid"; - parameter Modelica.SIunits.DynamicViscosity muMed = 1.0e-3 + parameter Modelica.Units.SI.DynamicViscosity muMed = 1.0e-3 "Dynamic viscosity of the fluid"; - parameter Modelica.SIunits.SpecificHeatCapacity cpMed = 4180.0 + parameter Modelica.Units.SI.SpecificHeatCapacity cpMed = 4180.0 "Specific heat capacity of the fluid"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 0.25 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 0.25 "Nominal mass flow rate"; // Outputs parameter Real x(fixed=false) "Capacity location"; - parameter Modelica.SIunits.ThermalResistance Rgb(fixed=false) + + parameter Modelica.Units.SI.ThermalResistance Rgb(fixed=false) "Thermal resistance between grout zone and borehole wall"; - parameter Modelica.SIunits.ThermalResistance Rgg1(fixed=false) + parameter Modelica.Units.SI.ThermalResistance Rgg1(fixed=false) "Thermal resistance between the two adjacent grout zones"; - parameter Modelica.SIunits.ThermalResistance Rgg2(fixed=false) + parameter Modelica.Units.SI.ThermalResistance Rgg2(fixed=false) "Thermal resistance between the two opposite grout zones"; - parameter Modelica.SIunits.ThermalResistance RCondGro(fixed=false) + parameter Modelica.Units.SI.ThermalResistance RCondGro(fixed=false) "Thermal resistance between: pipe wall to capacity in grout"; - initial equation (x, Rgb, Rgg1, Rgg2, RCondGro) = IBPSA.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Functions.internalResistancesTwoUTube( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/MultipoleThermalResistances_OneUTube.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/MultipoleThermalResistances_OneUTube.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/MultipoleThermalResistances_OneUTube.mo" 2022-03-10 09:57:42.056144641 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/MultipoleThermalResistances_OneUTube.mo" 2022-03-10 09:58:14.888148800 +0000 @@ -5,21 +5,21 @@ parameter Integer nPip=2 "Number of pipes"; parameter Integer J=3 "Number of multipoles"; - parameter Modelica.SIunits.Position[nPip] xPip={0.03, -0.03} + parameter Modelica.Units.SI.Position[nPip] xPip={0.03, -0.03} "x-Coordinates of pipes"; - parameter Modelica.SIunits.Position[nPip] yPip={0.00, 0.02} + parameter Modelica.Units.SI.Position[nPip] yPip={0.00, 0.02} "y-Coordinates of pipes"; - parameter Modelica.SIunits.Radius rBor=0.07 "Borehole radius"; - parameter Modelica.SIunits.Radius[nPip] rPip=fill(0.02, nPip) + parameter Modelica.Units.SI.Radius rBor=0.07 "Borehole radius"; + parameter Modelica.Units.SI.Radius[nPip] rPip=fill(0.02, nPip) "Outter radius of pipes"; - parameter Modelica.SIunits.ThermalConductivity kFil=1.5 + parameter Modelica.Units.SI.ThermalConductivity kFil=1.5 "Thermal conductivity of grouting material"; - parameter Modelica.SIunits.ThermalConductivity kSoi=2.5 + parameter Modelica.Units.SI.ThermalConductivity kSoi=2.5 "Thermal conductivity of soil material"; parameter Real[nPip] RFluPip(unit="(m.K)/W")= fill(1.2/(2*Modelica.Constants.pi*kFil), nPip) "Fluid to pipe wall thermal resistances"; - parameter Modelica.SIunits.Temperature TBor=0 + parameter Modelica.Units.SI.Temperature TBor=0 "Average borehole wall temperature"; parameter Real[nPip,nPip] RDelta_Ref= diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/MultipoleThermalResistances_TwoUTube.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/MultipoleThermalResistances_TwoUTube.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/MultipoleThermalResistances_TwoUTube.mo" 2022-03-10 09:57:42.056144641 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/MultipoleThermalResistances_TwoUTube.mo" 2022-03-10 09:58:14.872148799 +0000 @@ -5,21 +5,21 @@ parameter Integer nPip=4 "Number of pipes"; parameter Integer J=3 "Number of multipoles"; - parameter Modelica.SIunits.Position[nPip] xPip={0.03, -0.03, -0.03, 0.03} + parameter Modelica.Units.SI.Position[nPip] xPip={0.03, -0.03, -0.03, 0.03} "x-Coordinates of pipes"; - parameter Modelica.SIunits.Position[nPip] yPip={0.03, 0.03, -0.03, -0.03} + parameter Modelica.Units.SI.Position[nPip] yPip={0.03, 0.03, -0.03, -0.03} "y-Coordinates of pipes"; - parameter Modelica.SIunits.Radius rBor=0.07 "Borehole radius"; - parameter Modelica.SIunits.Radius[nPip] rPip=fill(0.02, nPip) + parameter Modelica.Units.SI.Radius rBor=0.07 "Borehole radius"; + parameter Modelica.Units.SI.Radius[nPip] rPip=fill(0.02, nPip) "Outter radius of pipes"; - parameter Modelica.SIunits.ThermalConductivity kFil=1.5 + parameter Modelica.Units.SI.ThermalConductivity kFil=1.5 "Thermal conductivity of grouting material"; - parameter Modelica.SIunits.ThermalConductivity kSoi=2.5 + parameter Modelica.Units.SI.ThermalConductivity kSoi=2.5 "Thermal conductivity of soil material"; parameter Real[nPip] RFluPip(unit="(m.K)/W")= fill(1.2/(2*Modelica.Constants.pi*kFil), nPip) "Fluid to pipe wall thermal resistances"; - parameter Modelica.SIunits.Temperature TBor=0 + parameter Modelica.Units.SI.Temperature TBor=0 "Average borehole wall temperature"; parameter Real[nPip,nPip] RDelta_Ref(unit="(m.K)/W")= diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/convectionResistanceCircularPipe.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/convectionResistanceCircularPipe.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/convectionResistanceCircularPipe.mo" 2022-03-10 09:57:42.056144641 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/convectionResistanceCircularPipe.mo" 2022-03-10 09:58:14.852148795 +0000 @@ -3,32 +3,32 @@ "Thermal resistance from the fluid in pipes and the grout zones (Bauer et al. 2011)" // Geometry of the borehole - input Modelica.SIunits.Height hSeg "Height of the element"; - input Modelica.SIunits.Radius rTub "Tube radius"; - input Modelica.SIunits.Length eTub "Tube thickness"; + input Modelica.Units.SI.Height hSeg "Height of the element"; + input Modelica.Units.SI.Radius rTub "Tube radius"; + input Modelica.Units.SI.Length eTub "Tube thickness"; // thermal properties - input Modelica.SIunits.ThermalConductivity kMed + input Modelica.Units.SI.ThermalConductivity kMed "Thermal conductivity of the fluid"; - input Modelica.SIunits.DynamicViscosity muMed + input Modelica.Units.SI.DynamicViscosity muMed "Dynamic viscosity of the fluid"; - input Modelica.SIunits.SpecificHeatCapacity cpMed + input Modelica.Units.SI.SpecificHeatCapacity cpMed "Specific heat capacity of the fluid"; - input Modelica.SIunits.MassFlowRate m_flow "Mass flow rate"; - input Modelica.SIunits.MassFlowRate m_flow_nominal "Nominal mass flow rate"; + input Modelica.Units.SI.MassFlowRate m_flow "Mass flow rate"; + input Modelica.Units.SI.MassFlowRate m_flow_nominal "Nominal mass flow rate"; // Outputs - output Modelica.SIunits.ThermalResistance RFluPip + output Modelica.Units.SI.ThermalResistance RFluPip "Convection resistance (or conduction in fluid if no mass flow)"; protected - parameter Modelica.SIunits.Radius rTub_in = rTub - eTub + parameter Modelica.Units.SI.Radius rTub_in = rTub - eTub "Pipe inner radius"; - Modelica.SIunits.CoefficientOfHeatTransfer h + Modelica.Units.SI.CoefficientOfHeatTransfer h "Convective heat transfer coefficient of the fluid"; Real k(unit="s/kg") "Coefficient used in the computation of the convective heat transfer coefficient"; - Modelica.SIunits.MassFlowRate m_flow_abs = IBPSA.Utilities.Math.Functions.spliceFunction(m_flow,-m_flow,m_flow,m_flow_nominal/30); + Modelica.Units.SI.MassFlowRate m_flow_abs = IBPSA.Utilities.Math.Functions.spliceFunction(m_flow,-m_flow,m_flow,m_flow_nominal/30); Real Re "Reynolds number"; Real NuTurb "Nusselt at Re=2400"; Real Nu "Nusselt"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/internalResistancesOneUTube.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/internalResistancesOneUTube.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/internalResistancesOneUTube.mo" 2022-03-10 09:57:42.056144641 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/internalResistancesOneUTube.mo" 2022-03-10 09:58:14.764148785 +0000 @@ -5,22 +5,22 @@ IBPSA.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Functions.partialInternalResistances; // Outputs - output Modelica.SIunits.ThermalResistance Rgb + output Modelica.Units.SI.ThermalResistance Rgb "Thermal resistance between grout zone and borehole wall"; - output Modelica.SIunits.ThermalResistance Rgg + output Modelica.Units.SI.ThermalResistance Rgg "Thermal resistance between the two grout zones"; - output Modelica.SIunits.ThermalResistance RCondGro + output Modelica.Units.SI.ThermalResistance RCondGro "Thermal resistance between: pipe wall to capacity in grout"; protected Real[2,2] RDelta(unit="(m.K)/W") "Delta-circuit thermal resistances"; Real[2,2] R(unit="(m.K)/W") "Internal thermal resistances"; - Modelica.SIunits.Position[2] xPip = {-sha, sha} "x-Coordinates of pipes"; - Modelica.SIunits.Position[2] yPip = {0., 0.} "y-Coordinates of pipes"; - Modelica.SIunits.Radius[2] rPip = {rTub, rTub} "Outer radius of pipes"; + Modelica.Units.SI.Position[2] xPip = {-sha, sha} "x-Coordinates of pipes"; + Modelica.Units.SI.Position[2] yPip = {0., 0.} "y-Coordinates of pipes"; + Modelica.Units.SI.Radius[2] rPip = {rTub, rTub} "Outer radius of pipes"; Real[2] RFluPip(unit="(m.K)/W") = {RCondPipe+RConv, RCondPipe+RConv} "Fluid to pipe wall thermal resistances"; - Modelica.SIunits.ThermalResistance Rg + Modelica.Units.SI.ThermalResistance Rg "Thermal resistance between outer borehole wall and one tube"; - Modelica.SIunits.ThermalResistance Rar + Modelica.Units.SI.ThermalResistance Rar "Thermal resistance between the two pipe outer walls"; Real Ra(unit="(m.K)/W") diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/internalResistancesTwoUTube.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/internalResistancesTwoUTube.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/internalResistancesTwoUTube.mo" 2022-03-10 09:57:42.056144641 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/internalResistancesTwoUTube.mo" 2022-03-10 09:58:14.748148782 +0000 @@ -5,32 +5,32 @@ IBPSA.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Functions.partialInternalResistances; // Outputs - output Modelica.SIunits.ThermalResistance Rgb + output Modelica.Units.SI.ThermalResistance Rgb "Thermal resistance between a grout capacity and the borehole wall, as defined by Bauer et al (2010)"; - output Modelica.SIunits.ThermalResistance Rgg1 + output Modelica.Units.SI.ThermalResistance Rgg1 "Thermal resistance between two neightbouring grout capacities, as defined by Bauer et al (2010)"; - output Modelica.SIunits.ThermalResistance Rgg2 + output Modelica.Units.SI.ThermalResistance Rgg2 "Thermal resistance between two grout capacities opposite to each other, as defined by Bauer et al (2010)"; - output Modelica.SIunits.ThermalResistance RCondGro + output Modelica.Units.SI.ThermalResistance RCondGro "Thermal resistance between a pipe wall and the grout capacity, as defined by Bauer et al (2010)"; protected Real[4,4] RDelta(unit="(m.K)/W") "Delta-circuit thermal resistances"; Real[4,4] R(unit="(m.K)/W") "Internal thermal resistances"; - Modelica.SIunits.Position[4] xPip = {-sha, sha, 0., 0.} "x-Coordinates of pipes"; - Modelica.SIunits.Position[4] yPip = {0., 0., -sha, sha} "y-Coordinates of pipes"; - Modelica.SIunits.Radius[4] rPip = {rTub, rTub, rTub, rTub} "Outer radius of pipes"; + Modelica.Units.SI.Position[4] xPip = {-sha, sha, 0., 0.} "x-Coordinates of pipes"; + Modelica.Units.SI.Position[4] yPip = {0., 0., -sha, sha} "y-Coordinates of pipes"; + Modelica.Units.SI.Radius[4] rPip = {rTub, rTub, rTub, rTub} "Outer radius of pipes"; Real[4] RFluPip(unit="(m.K)/W") = {RCondPipe+RConv, RCondPipe+RConv, RCondPipe+RConv, RCondPipe+RConv} "Fluid to pipe wall thermal resistances"; Real Ra( unit="(m.K)/W") "Grout-to-grout resistance (2D) as defined by Hellstrom. Interaction between the different grout parts"; - Modelica.SIunits.ThermalResistance Rg + + Modelica.Units.SI.ThermalResistance Rg "Thermal resistance between outer borehole wall and one tube"; - Modelica.SIunits.ThermalResistance Rar1 + Modelica.Units.SI.ThermalResistance Rar1 "Thermal resistance between the two closest pipe outer walls"; - Modelica.SIunits.ThermalResistance Rar2 + Modelica.Units.SI.ThermalResistance Rar2 "Thermal resistance between the two farthest pipe outer walls"; - algorithm // Internal thermal resistances (RDelta, R) := diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/multipoleFluidTemperature.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/multipoleFluidTemperature.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/multipoleFluidTemperature.mo" 2022-03-10 09:57:42.056144641 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/multipoleFluidTemperature.mo" 2022-03-10 09:58:14.724148779 +0000 @@ -4,19 +4,19 @@ input Integer nPip "Number of pipes"; input Integer J "Number of multipoles"; - input Modelica.SIunits.Position xPip[nPip] "x-Coordinates of pipes"; - input Modelica.SIunits.Position yPip[nPip] "y-Coordinates of pipes"; + input Modelica.Units.SI.Position xPip[nPip] "x-Coordinates of pipes"; + input Modelica.Units.SI.Position yPip[nPip] "y-Coordinates of pipes"; input Real QPip_flow[nPip](unit="W/m") "Heat flow in pipes"; - input Modelica.SIunits.Temperature TBor "Average borehole wall temperature"; - input Modelica.SIunits.Radius rBor "Borehole radius"; - input Modelica.SIunits.Radius rPip[nPip] "Outter radius of pipes"; - input Modelica.SIunits.ThermalConductivity kFil "Thermal conductivity of grouting material"; - input Modelica.SIunits.ThermalConductivity kSoi "Thermal conductivity of soil material"; + input Modelica.Units.SI.Temperature TBor "Average borehole wall temperature"; + input Modelica.Units.SI.Radius rBor "Borehole radius"; + input Modelica.Units.SI.Radius rPip[nPip] "Outter radius of pipes"; + input Modelica.Units.SI.ThermalConductivity kFil "Thermal conductivity of grouting material"; + input Modelica.Units.SI.ThermalConductivity kSoi "Thermal conductivity of soil material"; input Real RFluPip[nPip](unit="(m.K)/W") "Fluid to pipe wall thermal resistances"; input Real eps=1.0e-5 "Iteration relative accuracy"; input Integer it_max=100 "Maximum number of iterations"; - output Modelica.SIunits.Temperature TFlu[nPip] "Fluid temperature in pipes"; + output Modelica.Units.SI.Temperature TFlu[nPip] "Fluid temperature in pipes"; protected Real pikFil(unit="(m.K)/W")=1/(2*Modelica.Constants.pi*kFil) "Coefficient based on grout thermal conductivity"; @@ -36,7 +36,7 @@ Real R0[nPip,nPip](unit="(m.K)/W") "Line source approximation of thermal resistances"; Complex deltaTFlu "Fluid temperature difference with line source approximation"; Real rbm "Intermediate coefficient"; - Modelica.SIunits.Distance dz "Pipe to pipe distance"; + Modelica.Units.SI.Distance dz "Pipe to pipe distance"; Real coeff[nPip,J] "Coefficient for multiplication with matrix F_mk"; Real diff "Difference in subsequent multipole evaluations"; Real diff_max "Maximum difference in subsequent multipole evaluations"; @@ -46,18 +46,17 @@ Real eps_max "Convergence variable"; algorithm - // Thermal resistance matrix from 0th order multipole +// Thermal resistance matrix from 0th order multipole for i in 1:nPip loop zPip_i := Complex(xPip[i], yPip[i]); - rbm := rBor^2/(rBor^2 - Modelica.ComplexMath.'abs'(zPip_i)^2); - R0[i, i] := pikFil*(log(rBor/rPip[i]) + betaPip[i] + sigma*log(rbm)); + rbm := rBor ^ 2 / (rBor ^ 2 - Modelica.ComplexMath.abs(zPip_i) ^ 2); + R0[i, i] := pikFil * (log(rBor / rPip[i]) + betaPip[i] + sigma * log(rbm)); for j in 1:nPip loop zPip_j := Complex(xPip[j], yPip[j]); if i <> j then - dz := Modelica.ComplexMath.'abs'(zPip_i - zPip_j); - rbm := rBor^2/Modelica.ComplexMath.'abs'(rBor^2 - zPip_j* - Modelica.ComplexMath.conj(zPip_i)); - R0[i, j] := pikFil*(log(rBor/dz) + sigma*log(rbm)); + dz := Modelica.ComplexMath.abs(zPip_i - zPip_j); + rbm := rBor ^ 2 / Modelica.ComplexMath.abs(rBor ^ 2 - zPip_j * Modelica.ComplexMath.conj(zPip_i)); + R0[i, j] := pikFil * (log(rBor / dz) + sigma * log(rbm)); end if; end for; end for; @@ -65,34 +64,22 @@ // Initialize maximum error and iteration counter eps_max := 1.0e99; it := 0; - // Multipoles +// Multipoles if J > 0 then for m in 1:nPip loop for k in 1:J loop - coeff[m, k] := -(1 - k*betaPip[m])/(1 + k*betaPip[m]); + coeff[m, k] := -(1 - k * betaPip[m]) / (1 + k * betaPip[m]); PRea[m, k] := 0; PIma[m, k] := 0; end for; end for; while eps_max > eps and it < it_max loop it := it + 1; - (FRea, FIma) := - IBPSA.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Functions.multipoleFmk( - nPip, - J, - QPip_flow, - PRea, - PIma, - rBor, - rPip, - xPip, - yPip, - kFil, - kSoi); + (FRea, FIma) := IBPSA.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Functions.multipoleFmk(nPip, J, QPip_flow, PRea, PIma, rBor, rPip, xPip, yPip, kFil, kSoi); for m in 1:nPip loop for k in 1:J loop F_mk := Complex(FRea[m, k], FIma[m, k]); - P_nj_new := coeff[m, k]*Modelica.ComplexMath.conj(F_mk); + P_nj_new := coeff[m, k] * Modelica.ComplexMath.conj(F_mk); PRea_new[m, k] := Modelica.ComplexMath.real(P_nj_new); PIma_new[m, k] := Modelica.ComplexMath.imag(P_nj_new); end for; @@ -103,17 +90,15 @@ for k in 1:J loop P_nj := Complex(PRea[m, k], PIma[m, k]); P_nj_new := Complex(PRea_new[m, k], PIma_new[m, k]); - diff_max := max(diff_max, - Modelica.ComplexMath.'abs'(P_nj_new - P_nj)); - diff_min := min(diff_min, - Modelica.ComplexMath.'abs'(P_nj_new - P_nj)); + diff_max := max(diff_max, Modelica.ComplexMath.abs(P_nj_new - P_nj)); + diff_min := min(diff_min, Modelica.ComplexMath.abs(P_nj_new - P_nj)); end for; end for; diff := diff_max - diff_min; if it == 1 then - diff0 :=diff; + diff0 := diff; end if; - eps_max := diff/diff0; + eps_max := diff / diff0; PRea := PRea_new; PIma := PIma_new; end while; @@ -123,26 +108,23 @@ TFlu := TBor .+ R0*QPip_flow; if J > 0 then for m in 1:nPip loop - zPip_i :=Complex(xPip[m], yPip[m]); + zPip_i := Complex(xPip[m], yPip[m]); deltaTFlu := Complex(0, 0); for n in 1:nPip loop - zPip_j :=Complex(xPip[n], yPip[n]); + zPip_j := Complex(xPip[n], yPip[n]); for j in 1:J loop P_nj := Complex(PRea[n, j], PIma[n, j]); if n <> m then - // Second term - deltaTFlu := deltaTFlu + P_nj*(rPip[n]/(zPip_i - zPip_j))^j; + deltaTFlu := deltaTFlu + P_nj * (rPip[n] / (zPip_i - zPip_j)) ^ j; end if; - // Third term - deltaTFlu := deltaTFlu + sigma*P_nj*(rPip[n]* - Modelica.ComplexMath.conj(zPip_i)/(rBor^2 - zPip_j* - Modelica.ComplexMath.conj(zPip_i)))^j; + deltaTFlu := deltaTFlu + sigma * P_nj * (rPip[n] * Modelica.ComplexMath.conj(zPip_i) / (rBor ^ 2 - zPip_j * Modelica.ComplexMath.conj(zPip_i))) ^ j; end for; end for; TFlu[m] := TFlu[m] + Modelica.ComplexMath.real(deltaTFlu); end for; end if; - +// Second term +// Third term annotation (Documentation(info="
This model evaluates the fluid temperatures using the multipole method of Claesson and Hellstrom (2011).
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/multipoleFmk.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/multipoleFmk.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/multipoleFmk.mo" 2022-03-10 09:57:42.056144641 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/multipoleFmk.mo" 2022-03-10 09:58:14.692148775 +0000 @@ -7,12 +7,12 @@ input Real QPip_flow[nPip](unit="W/m") "Heat flow in pipes"; input Real PRea[nPip,J] "Multipoles (Real part)"; input Real PIma[nPip,J] "Multipoles (Imaginary part)"; - input Modelica.SIunits.Radius rBor "Borehole radius"; - input Modelica.SIunits.Radius rPip[nPip] "Outter radius of pipes"; - input Modelica.SIunits.Position xPip[nPip] "x-Coordinates of pipes"; - input Modelica.SIunits.Position yPip[nPip] "y-Coordinates of pipes"; - input Modelica.SIunits.ThermalConductivity kFil "Thermal conductivity of grouting material"; - input Modelica.SIunits.ThermalConductivity kSoi "Thermal conductivity of soil material"; + input Modelica.Units.SI.Radius rBor "Borehole radius"; + input Modelica.Units.SI.Radius rPip[nPip] "Outter radius of pipes"; + input Modelica.Units.SI.Position xPip[nPip] "x-Coordinates of pipes"; + input Modelica.Units.SI.Position yPip[nPip] "y-Coordinates of pipes"; + input Modelica.Units.SI.ThermalConductivity kFil "Thermal conductivity of grouting material"; + input Modelica.Units.SI.ThermalConductivity kSoi "Thermal conductivity of soil material"; output Real FRea[nPip,J] "Multipole coefficients"; output Real FIma[nPip,J] "Multipole coefficients"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/multipoleThermalResistances.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/multipoleThermalResistances.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/multipoleThermalResistances.mo" 2022-03-10 09:57:42.056144641 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/multipoleThermalResistances.mo" 2022-03-10 09:58:14.672148773 +0000 @@ -5,21 +5,21 @@ input Integer nPip "Number of pipes"; input Integer J "Number of multipoles"; - input Modelica.SIunits.Position xPip[nPip] "x-Coordinates of pipes"; - input Modelica.SIunits.Position yPip[nPip] "y-Coordinates of pipes"; - input Modelica.SIunits.Radius rBor "Borehole radius"; - input Modelica.SIunits.Radius rPip[nPip] "Outter radius of pipes"; - input Modelica.SIunits.ThermalConductivity kFil "Thermal conductivity of grouting material"; - input Modelica.SIunits.ThermalConductivity kSoi "Thermal conductivity of soil material"; + input Modelica.Units.SI.Position xPip[nPip] "x-Coordinates of pipes"; + input Modelica.Units.SI.Position yPip[nPip] "y-Coordinates of pipes"; + input Modelica.Units.SI.Radius rBor "Borehole radius"; + input Modelica.Units.SI.Radius rPip[nPip] "Outter radius of pipes"; + input Modelica.Units.SI.ThermalConductivity kFil "Thermal conductivity of grouting material"; + input Modelica.Units.SI.ThermalConductivity kSoi "Thermal conductivity of soil material"; input Real RFluPip[nPip](unit="(m.K)/W") "Fluid to pipe wall thermal resistances"; - input Modelica.SIunits.Temperature TBor=0 "Average borehole wall temperature"; + input Modelica.Units.SI.Temperature TBor=0 "Average borehole wall temperature"; output Real RDelta[nPip,nPip](unit="(m.K)/W") "Delta-circuit thermal resistances"; output Real R[nPip,nPip](unit="(m.K)/W") "Internal thermal resistances"; protected Real QPip_flow[nPip](unit="W/m") "Pipe heat transfer rates"; - Modelica.SIunits.Temperature TFlu[nPip] "Fluid temperatures"; + Modelica.Units.SI.Temperature TFlu[nPip] "Fluid temperatures"; Real K[nPip,nPip](unit="W/(m.K)") "Internal thermal conductances"; algorithm diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/partialInternalResistances.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/partialInternalResistances.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/partialInternalResistances.mo" 2022-03-10 09:57:42.056144641 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/partialInternalResistances.mo" 2022-03-10 09:58:14.660148771 +0000 @@ -7,28 +7,28 @@ input Boolean use_Rb = false "True if the value Rb should be used instead of calculated"; input Real Rb(unit="(m.K)/W") "Borehole thermal resistance"; - input Modelica.SIunits.Height hSeg "Height of the element"; - input Modelica.SIunits.Radius rBor "Radius of the borehole"; + input Modelica.Units.SI.Height hSeg "Height of the element"; + input Modelica.Units.SI.Radius rBor "Radius of the borehole"; // Geometry of the pipe - input Modelica.SIunits.Radius rTub "Radius of the tube"; - input Modelica.SIunits.Length eTub "Thickness of the tubes"; - input Modelica.SIunits.Length sha + input Modelica.Units.SI.Radius rTub "Radius of the tube"; + input Modelica.Units.SI.Length eTub "Thickness of the tubes"; + input Modelica.Units.SI.Length sha "Shank spacing, defined as the distance between the center of a pipe and the center of the borehole"; // Thermal properties - input Modelica.SIunits.ThermalConductivity kFil + input Modelica.Units.SI.ThermalConductivity kFil "Thermal conductivity of the grout"; - input Modelica.SIunits.ThermalConductivity kSoi + input Modelica.Units.SI.ThermalConductivity kSoi "Thermal conductivity of the soi"; - input Modelica.SIunits.ThermalConductivity kTub + input Modelica.Units.SI.ThermalConductivity kTub "Thermal conductivity of the tube"; - input Modelica.SIunits.ThermalConductivity kMed + input Modelica.Units.SI.ThermalConductivity kMed "Thermal conductivity of the fluid"; - input Modelica.SIunits.DynamicViscosity muMed + input Modelica.Units.SI.DynamicViscosity muMed "Dynamic viscosity of the fluid"; - input Modelica.SIunits.SpecificHeatCapacity cpMed + input Modelica.Units.SI.SpecificHeatCapacity cpMed "Specific heat capacity of the fluid"; - input Modelica.SIunits.MassFlowRate m_flow_nominal "Nominal mass flow rate"; + input Modelica.Units.SI.MassFlowRate m_flow_nominal "Nominal mass flow rate"; input Boolean printDebug=false "Print resistances values in log for debug purposes."; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalResistancesOneUTube.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalResistancesOneUTube.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalResistancesOneUTube.mo" 2022-03-10 09:57:42.056144641 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalResistancesOneUTube.mo" 2022-03-10 09:58:14.588148763 +0000 @@ -4,8 +4,8 @@ extends IBPSA.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.PartialInternalResistances; - parameter Modelica.SIunits.ThermalResistance Rgg_val "Thermal resistance between the two grout zones"; - parameter Modelica.SIunits.HeatCapacity Co_fil=borFieDat.filDat.dFil*borFieDat.filDat.cFil*hSeg*Modelica.Constants.pi + parameter Modelica.Units.SI.ThermalResistance Rgg_val "Thermal resistance between the two grout zones"; + parameter Modelica.Units.SI.HeatCapacity Co_fil=borFieDat.filDat.dFil*borFieDat.filDat.cFil*hSeg*Modelica.Constants.pi *(borFieDat.conDat.rBor^2 - 2*borFieDat.conDat.rTub^2) "Heat capacity of the whole filling material"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalResistancesTwoUTube.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalResistancesTwoUTube.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalResistancesTwoUTube.mo" 2022-03-10 09:57:42.056144641 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalResistancesTwoUTube.mo" 2022-03-10 09:58:14.564148759 +0000 @@ -4,11 +4,11 @@ extends IBPSA.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.PartialInternalResistances; - parameter Modelica.SIunits.ThermalResistance Rgg1_val + parameter Modelica.Units.SI.ThermalResistance Rgg1_val "Thermal resistance between two neightbouring grout capacities, as defined by Bauer et al (2010)"; - parameter Modelica.SIunits.ThermalResistance Rgg2_val + parameter Modelica.Units.SI.ThermalResistance Rgg2_val "Thermal resistance between two grout capacities opposite to each other, as defined by Bauer et al (2010)"; - parameter Modelica.SIunits.HeatCapacity Co_fil=borFieDat.filDat.dFil*borFieDat.filDat.cFil*hSeg*Modelica.Constants.pi + parameter Modelica.Units.SI.HeatCapacity Co_fil=borFieDat.filDat.dFil*borFieDat.filDat.cFil*hSeg*Modelica.Constants.pi *(borFieDat.conDat.rBor^2 - 4*borFieDat.conDat.rTub^2) "Heat capacity of the whole filling material"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialBorehole.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialBorehole.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialBorehole.mo" 2022-03-10 09:57:42.056144641 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialBorehole.mo" 2022-03-10 09:58:14.464148746 +0000 @@ -15,11 +15,11 @@ parameter Integer nSeg(min=1) = 10 "Number of segments to use in vertical discretization of the boreholes"; - parameter Modelica.SIunits.Temperature TGro_start[nSeg] + parameter Modelica.Units.SI.Temperature TGro_start[nSeg] "Start value of grout temperature" annotation (Dialog(tab="Initialization")); - parameter Modelica.SIunits.Temperature TFlu_start[nSeg] = TGro_start + parameter Modelica.Units.SI.Temperature TFlu_start[nSeg] = TGro_start "Start value of fluid temperature" annotation (Dialog(tab="Initialization")); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialInternalHEX.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialInternalHEX.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialInternalHEX.mo" 2022-03-10 09:57:42.056144641 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialInternalHEX.mo" 2022-03-10 09:58:14.452148745 +0000 @@ -12,31 +12,31 @@ parameter Boolean dynFil=true "Set to false to remove the dynamics of the filling material" annotation (Dialog(tab="Dynamics")); - parameter Modelica.SIunits.Length hSeg + parameter Modelica.Units.SI.Length hSeg "Length of the internal heat exchanger"; - parameter Modelica.SIunits.Volume VTubSeg = hSeg*Modelica.Constants.pi*(borFieDat.conDat.rTub-borFieDat.conDat.eTub)^2 + parameter Modelica.Units.SI.Volume VTubSeg = hSeg*Modelica.Constants.pi*(borFieDat.conDat.rTub-borFieDat.conDat.eTub)^2 "Fluid volume in each tube"; - parameter Modelica.SIunits.Temperature TFlu_start + parameter Modelica.Units.SI.Temperature TFlu_start "Start value of fluid temperature" annotation (Dialog(tab="Initialization")); - parameter Modelica.SIunits.Temperature TGro_start + parameter Modelica.Units.SI.Temperature TGro_start "Start value of grout temperature" annotation (Dialog(tab="Initialization")); Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a port_wall "Thermal connection for borehole wall" annotation (Placement(transformation(extent={{-10,90},{10,110}}))); protected - parameter Modelica.SIunits.SpecificHeatCapacity cpMed= + parameter Modelica.Units.SI.SpecificHeatCapacity cpMed= Medium.specificHeatCapacityCp(Medium.setState_pTX( Medium.p_default, Medium.T_default, Medium.X_default)) "Specific heat capacity of the fluid"; - parameter Modelica.SIunits.ThermalConductivity kMed= + parameter Modelica.Units.SI.ThermalConductivity kMed= Medium.thermalConductivity(Medium.setState_pTX( Medium.p_default, Medium.T_default, Medium.X_default)) "Thermal conductivity of the fluid"; - parameter Modelica.SIunits.DynamicViscosity muMed=Medium.dynamicViscosity( + parameter Modelica.Units.SI.DynamicViscosity muMed=Medium.dynamicViscosity( Medium.setState_pTX( Medium.p_default, Medium.T_default, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialInternalResistances.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialInternalResistances.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialInternalResistances.mo" 2022-03-10 09:57:42.056144641 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialInternalResistances.mo" 2022-03-10 09:58:14.440148743 +0000 @@ -1,15 +1,15 @@ within IBPSA.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses; partial model PartialInternalResistances "Partial model to implement borehole segment internal resistance models" - parameter Modelica.SIunits.Length hSeg + parameter Modelica.Units.SI.Length hSeg "Length of the internal heat exchanger"; - parameter Modelica.SIunits.Temperature T_start + parameter Modelica.Units.SI.Temperature T_start "Initial temperature of the filling material"; parameter Data.Borefield.Template borFieDat "Borefield data" annotation (Placement(transformation(extent={{-100,-100},{-80,-80}}))); - parameter Modelica.SIunits.ThermalResistance Rgb_val + parameter Modelica.Units.SI.ThermalResistance Rgb_val "Thermal resistance between grout zone and borehole wall"; - parameter Modelica.SIunits.ThermalResistance RCondGro_val + parameter Modelica.Units.SI.ThermalResistance RCondGro_val "Thermal resistance between: pipe wall to capacity in grout"; parameter Modelica.Fluid.Types.Dynamics energyDynamics=Modelica.Fluid.Types.Dynamics.DynamicFreeInitial "Type of energy balance: dynamic (3 initialization options) or steady state" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/Examples/BaseClasses/PartialBorehole.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/Examples/BaseClasses/PartialBorehole.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/Examples/BaseClasses/PartialBorehole.mo" 2022-03-10 09:57:42.056144641 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/Examples/BaseClasses/PartialBorehole.mo" 2022-03-10 09:58:14.404148740 +0000 @@ -4,7 +4,7 @@ parameter Integer nSeg(min=1) = 10 "Number of segments to use in vertical discretization of the boreholes"; - parameter Modelica.SIunits.Temperature T_start = 273.15 + 22 + parameter Modelica.Units.SI.Temperature T_start = 273.15 + 22 "Initial soil temperature"; parameter IBPSA.Fluid.Geothermal.Borefields.Data.Borefield.Example diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/Examples/BoreholeDynamics.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/Examples/BoreholeDynamics.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/Examples/BoreholeDynamics.mo" 2022-03-10 09:57:42.056144641 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/Examples/BoreholeDynamics.mo" 2022-03-10 09:58:14.384148736 +0000 @@ -5,7 +5,7 @@ parameter Integer nSeg(min=1) = 10 "Number of segments to use in vertical discretization of the boreholes"; - parameter Modelica.SIunits.Temperature T_start = 273.15 + 22 + parameter Modelica.Units.SI.Temperature T_start = 273.15 + 22 "Initial soil temperature"; IBPSA.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.OneUTube diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Cylindrical.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Cylindrical.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Cylindrical.mo" 2022-03-10 09:57:42.060144640 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Cylindrical.mo" 2022-03-10 09:58:14.232148717 +0000 @@ -4,14 +4,14 @@ parameter IBPSA.Fluid.Geothermal.Borefields.Data.Soil.Template soiDat annotation (Placement(transformation(extent={{-100,-100},{-80,-80}}))); - parameter Modelica.SIunits.Height h "Height of the cylinder"; - parameter Modelica.SIunits.Radius r_a "Internal radius"; - parameter Modelica.SIunits.Radius r_b "External radius"; + parameter Modelica.Units.SI.Height h "Height of the cylinder"; + parameter Modelica.Units.SI.Radius r_a "Internal radius"; + parameter Modelica.Units.SI.Radius r_b "External radius"; parameter Integer nSta(min=1) = 10 "Number of state variables"; - parameter Modelica.SIunits.Temperature TInt_start + parameter Modelica.Units.SI.Temperature TInt_start "Initial temperature at port_a, used if steadyStateInitial = false" annotation (Dialog(group="Initialization", enable=not steadyStateInitial)); - parameter Modelica.SIunits.Temperature TExt_start + parameter Modelica.Units.SI.Temperature TExt_start "Initial temperature at port_b, used if steadyStateInitial = false" annotation (Dialog(group="Initialization", enable=not steadyStateInitial)); parameter Boolean steadyStateInitial=false @@ -20,7 +20,7 @@ parameter Real gridFac(min=1) = 2 "Grid factor for spacing"; - parameter Modelica.SIunits.Radius r[nSta + 1](each fixed=false) + parameter Modelica.Units.SI.Radius r[nSta + 1](each fixed=false) "Radius to the boundary of the i-th domain"; Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a port_a(T(start=TInt_start)) @@ -30,31 +30,31 @@ "Heat port at surface b" annotation (Placement(transformation(extent={{90,-10}, {110,10}},rotation=0))); - Modelica.SIunits.Temperature T[nSta]( + Modelica.Units.SI.Temperature T[nSta]( start={TInt_start + (TExt_start - TInt_start)/Modelica.Math.log(r_b/r_a)* Modelica.Math.log((r_a + (r_b - r_a)/(nSta)*(i - 0.5))/r_a) for i in 1:nSta}) "Temperature of the states"; - Modelica.SIunits.TemperatureDifference dT "port_a.T - port_b.T"; + Modelica.Units.SI.TemperatureDifference dT "port_a.T - port_b.T"; - Modelica.SIunits.HeatFlowRate Q_flow[nSta + 1] + Modelica.Units.SI.HeatFlowRate Q_flow[nSta + 1] "Heat flow rate from state i to i+1"; protected - parameter Modelica.SIunits.Radius rC[nSta](each fixed=false) + parameter Modelica.Units.SI.Radius rC[nSta](each fixed=false) "Radius to the center of the i-th domain"; - final parameter Modelica.SIunits.SpecificHeatCapacity c=soiDat.cSoi + final parameter Modelica.Units.SI.SpecificHeatCapacity c=soiDat.cSoi "Specific heat capacity"; - final parameter Modelica.SIunits.ThermalConductivity k=soiDat.kSoi + final parameter Modelica.Units.SI.ThermalConductivity k=soiDat.kSoi "Thermal conductivity of the material"; - final parameter Modelica.SIunits.Density d=soiDat.dSoi + final parameter Modelica.Units.SI.Density d=soiDat.dSoi "Density of the material"; - parameter Modelica.SIunits.ThermalConductance G[nSta + 1](each fixed=false) + parameter Modelica.Units.SI.ThermalConductance G[nSta + 1](each fixed=false) "Heat conductance between the temperature nodes"; - parameter Modelica.SIunits.HeatCapacity C[nSta](each fixed=false) + parameter Modelica.Units.SI.HeatCapacity C[nSta](each fixed=false) "Heat capacity of each state"; parameter Real gridFac_sum(fixed=false); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/GroundTemperatureResponse.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/GroundTemperatureResponse.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/GroundTemperatureResponse.mo" 2022-03-10 09:57:42.060144640 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/GroundTemperatureResponse.mo" 2022-03-10 09:58:14.200148713 +0000 @@ -1,6 +1,6 @@ within IBPSA.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer; model GroundTemperatureResponse "Model calculating discrete load aggregation" - parameter Modelica.SIunits.Time tLoaAgg(final min = Modelica.Constants.eps)=3600 + parameter Modelica.Units.SI.Time tLoaAgg(final min = Modelica.Constants.eps)=3600 "Time resolution of load aggregation"; parameter Integer nCel(min=1)=5 "Number of cells per aggregation level"; parameter Boolean forceGFunCalc = false @@ -41,7 +41,7 @@ nTimSho=nTimSho, nTimLon=nTimLon, ttsMax=ttsMax) "String with encrypted g-function arguments"; - parameter Modelica.SIunits.Time timFin= + parameter Modelica.Units.SI.Time timFin= (borFieDat.conDat.hBor^2/(9*borFieDat.soiDat.aSoi))*ttsMax "Final time for g-function calculation"; parameter Integer i(min=1)= @@ -53,29 +53,29 @@ "Number of aggregation cells"; final parameter Real[nTimTot,2] timSer(each fixed=false) "g-function input from matrix, with the second column as temperature Tstep"; - final parameter Modelica.SIunits.Time t_start(fixed=false) "Simulation start time"; - final parameter Modelica.SIunits.Time[i] nu(each fixed=false) + final parameter Modelica.Units.SI.Time t_start(fixed=false) "Simulation start time"; + final parameter Modelica.Units.SI.Time[i] nu(each fixed=false) "Time vector for load aggregation"; final parameter Real[i] kappa(each fixed=false) "Weight factor for each aggregation cell"; final parameter Real[i] rCel(each fixed=false) "Cell widths"; - discrete Modelica.SIunits.HeatFlowRate[i] QAgg_flow + discrete Modelica.Units.SI.HeatFlowRate[i] QAgg_flow "Vector of aggregated loads"; - discrete Modelica.SIunits.HeatFlowRate[i] QAggShi_flow + discrete Modelica.Units.SI.HeatFlowRate[i] QAggShi_flow "Shifted vector of aggregated loads"; discrete Integer curCel "Current occupied cell"; - discrete Modelica.SIunits.TemperatureDifference delTBor0 + discrete Modelica.Units.SI.TemperatureDifference delTBor0 "Previous time step's temperature difference current borehole wall temperature minus initial borehole temperature"; discrete Real derDelTBor0(unit="K/s") "Derivative of wall temperature change from previous time steps"; final parameter Real dTStepdt(fixed=false) "Time derivative of g/(2*pi*H*Nb*ks) within most recent cell"; - Modelica.SIunits.Heat U "Accumulated heat flow from all boreholes"; - discrete Modelica.SIunits.Heat U_old "Accumulated heat flow from all boreholes at last aggregation step"; + Modelica.Units.SI.Heat U "Accumulated heat flow from all boreholes"; + discrete Modelica.Units.SI.Heat U_old "Accumulated heat flow from all boreholes at last aggregation step"; initial equation QAgg_flow = zeros(i); curCel = 1; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/AggregationCellTimes.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/AggregationCellTimes.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/AggregationCellTimes.mo" 2022-03-10 09:57:42.060144640 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/AggregationCellTimes.mo" 2022-03-10 09:58:14.156148707 +0000 @@ -4,13 +4,13 @@ extends Modelica.Icons.Example; parameter Integer i = 6 "Number of aggregation cells"; - parameter Modelica.SIunits.Time tLoaAgg=10 "Time resolution of load aggregation"; - final parameter Modelica.SIunits.Time[i] nu(each fixed=false) - "Time vector for load aggregation"; - final parameter Modelica.SIunits.Time[i] rCel(each fixed=false) "Cell widths"; - Modelica.SIunits.Time nu_error,rCel_error "Error on chosen values"; + parameter Modelica.Units.SI.Time tLoaAgg=10 "Time resolution of load aggregation"; + final parameter Modelica.Units.SI.Time[i] nu(each fixed=false) + "Time vector for load aggregation"; + final parameter Modelica.Units.SI.Time[i] rCel(each fixed=false) "Cell widths"; + Modelica.Units.SI.Time nu_error,rCel_error "Error on chosen values"; initial equation (nu,rCel) = IBPSA.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.LoadAggregation.aggregationCellTimes( i=i, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/AggregationWeightingFactors.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/AggregationWeightingFactors.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/AggregationWeightingFactors.mo" 2022-03-10 09:57:42.060144640 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/AggregationWeightingFactors.mo" 2022-03-10 09:58:14.148148706 +0000 @@ -11,7 +11,7 @@ 6.27297603019976, 2.43435015306157e-05; 9.21672932384307, 3.00295537091117e-05] "Complete time matrix with TStep"; - Modelica.SIunits.ThermalResistance[10] kappa + Modelica.Units.SI.ThermalResistance[10] kappa "Weight factor for each aggregation cell"; equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/ShiftAggregationCells.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/ShiftAggregationCells.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/ShiftAggregationCells.mo" 2022-03-10 09:57:42.060144640 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/ShiftAggregationCells.mo" 2022-03-10 09:58:14.128148704 +0000 @@ -3,7 +3,7 @@ extends Modelica.Icons.Example; discrete Integer curCel "Current occupied cell"; - discrete Modelica.SIunits.HeatFlowRate[5] QAggShi_flow + discrete Modelica.Units.SI.HeatFlowRate[5] QAggShi_flow "Shifted vector of aggregated loads"; initial equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/TemperatureResponseMatrix.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/TemperatureResponseMatrix.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/TemperatureResponseMatrix.mo" 2022-03-10 09:57:42.060144640 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/TemperatureResponseMatrix.mo" 2022-03-10 09:58:14.116148702 +0000 @@ -3,7 +3,8 @@ "This validation case test the calculation, writing and reading of the temperature step response" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Time timSer[26+50,2]= + + parameter Modelica.Units.SI.Time timSer[26+50,2]= IBPSA.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.LoadAggregation.temperatureResponseMatrix( nBor=1, cooBor={{0,0}}, @@ -19,8 +20,7 @@ ttsMax=exp(5), sha="TemperatureResponseMatrix_validation", forceGFunCalc=true) "Resulting temperature response matrix"; - Modelica.SIunits.ThermalResistance TStep "Temperature step response"; - + Modelica.Units.SI.ThermalResistance TStep "Temperature step response"; equation TStep = Modelica.Math.Vectors.interpolate(timSer[:,1],timSer[:,2],time); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/TemporalSuperposition.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/TemporalSuperposition.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/TemporalSuperposition.mo" 2022-03-10 09:57:42.060144640 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/TemporalSuperposition.mo" 2022-03-10 09:58:14.104148701 +0000 @@ -2,13 +2,13 @@ model TemporalSuperposition "This validation case applies temporal superposition with truncated vectors" extends Modelica.Icons.Example; - parameter Modelica.SIunits.TemperatureDifference supPos = IBPSA.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.LoadAggregation.temporalSuperposition( + + parameter Modelica.Units.SI.TemperatureDifference supPos = IBPSA.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.LoadAggregation.temporalSuperposition( i=6, QAgg_flow={2,1e6,3,1e6,1e6}, kappa={0.4,0,0.2,1,0}, curCel=3) "Temporal superposition"; - Modelica.SIunits.TemperatureDifference supPosErr; - + Modelica.Units.SI.TemperatureDifference supPosErr; equation supPosErr = abs((2*0.4+3*0.2)-supPos); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/aggregationCellTimes.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/aggregationCellTimes.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/aggregationCellTimes.mo" 2022-03-10 09:57:42.060144640 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/aggregationCellTimes.mo" 2022-03-10 09:58:14.032148692 +0000 @@ -6,10 +6,10 @@ input Integer i "Size of time vector"; input Real lvlBas "Base for growth between each level, e.g. 2"; input Integer nCel "Number of cells of same size per level"; - input Modelica.SIunits.Time tLoaAgg(final min=Modelica.Constants.small) "Time resolution of load aggregation"; - input Modelica.SIunits.Time timFin "Total simulation max length"; + input Modelica.Units.SI.Time tLoaAgg(final min=Modelica.Constants.small) "Time resolution of load aggregation"; + input Modelica.Units.SI.Time timFin "Total simulation max length"; - output Modelica.SIunits.Time nu[i] "Time vector nu of size i"; + output Modelica.Units.SI.Time nu[i] "Time vector nu of size i"; output Real rCel[i](each unit="1") "Cell width vector of size i"; protected diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/aggregationWeightingFactors.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/aggregationWeightingFactors.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/aggregationWeightingFactors.mo" 2022-03-10 09:57:42.060144640 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/aggregationWeightingFactors.mo" 2022-03-10 09:58:14.024148690 +0000 @@ -5,14 +5,14 @@ input Integer i "Size of aggregation vector"; input Integer nTimTot "Size of g-function time table"; - input Modelica.SIunits.ThermalResistance TStep[nTimTot,2] "Time matrix with TStep"; - input Modelica.SIunits.Time nu[i] "Aggregation time vector nu"; + input Modelica.Units.SI.ThermalResistance TStep[nTimTot,2] "Time matrix with TStep"; + input Modelica.Units.SI.Time nu[i] "Aggregation time vector nu"; - output Modelica.SIunits.ThermalResistance kappa[i] "Weighting factors vector"; + output Modelica.Units.SI.ThermalResistance kappa[i] "Weighting factors vector"; protected - Modelica.SIunits.ThermalResistance prevT "Interpolated value of TStep at previous cell"; - Modelica.SIunits.ThermalResistance curT "Interpolated value of TStep at current cell"; + Modelica.Units.SI.ThermalResistance prevT "Interpolated value of TStep at previous cell"; + Modelica.Units.SI.ThermalResistance curT "Interpolated value of TStep at current cell"; Integer curInt "Integer to select data interval"; Real[size(TStep[:,1], 1)] d(unit="K/J") "Derivatives at the support points"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/countAggregationCells.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/countAggregationCells.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/countAggregationCells.mo" 2022-03-10 09:57:42.060144640 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/countAggregationCells.mo" 2022-03-10 09:58:14.012148689 +0000 @@ -5,15 +5,15 @@ input Real lvlBas "Base for growth between each level, e.g. 2"; input Integer nCel(min=1) "Number of cells of same size per level"; - input Modelica.SIunits.Time timFin "Total simulation max length"; - input Modelica.SIunits.Time tLoaAgg "Time resolution of load aggregation"; + input Modelica.Units.SI.Time timFin "Total simulation max length"; + input Modelica.Units.SI.Time tLoaAgg "Time resolution of load aggregation"; output Integer i(min=1) "Size of aggregation vectors"; protected - Modelica.SIunits.Duration width_i "Width of current aggregation cell"; - Modelica.SIunits.Time nu_i "End time of current aggregation cell"; + Modelica.Units.SI.Duration width_i "Width of current aggregation cell"; + Modelica.Units.SI.Time nu_i "End time of current aggregation cell"; algorithm assert(timFin > 0, "Total simulation time must be bigger than 0."); width_i := 0; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/shiftAggregationCells.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/shiftAggregationCells.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/shiftAggregationCells.mo" 2022-03-10 09:57:42.060144640 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/shiftAggregationCells.mo" 2022-03-10 09:58:14.004148688 +0000 @@ -4,14 +4,14 @@ extends Modelica.Icons.Function; input Integer i "Number of aggregation cells"; - input Modelica.SIunits.HeatFlowRate QAgg_flow[i] "Vector of aggregated loads"; + input Modelica.Units.SI.HeatFlowRate QAgg_flow[i] "Vector of aggregated loads"; input Real rCel[i](each min=Modelica.Constants.small) "Aggregation cell widths"; - input Modelica.SIunits.Time nu[i] "Cell aggregation times"; - input Modelica.SIunits.Time curTim "Current simulation time"; + input Modelica.Units.SI.Time nu[i] "Cell aggregation times"; + input Modelica.Units.SI.Time curTim "Current simulation time"; output Integer curCel "Current occupied aggregation cell"; - output Modelica.SIunits.HeatFlowRate QAggShi_flow[i] "Shifted vector of aggregated loads"; + output Modelica.Units.SI.HeatFlowRate QAggShi_flow[i] "Shifted vector of aggregated loads"; algorithm curCel := 1; for j in (i-1):-1:1 loop diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/temperatureResponseMatrix.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/temperatureResponseMatrix.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/temperatureResponseMatrix.mo" 2022-03-10 09:57:42.060144640 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/temperatureResponseMatrix.mo" 2022-03-10 09:58:13.996148687 +0000 @@ -5,12 +5,12 @@ input Integer nBor "Number of boreholes"; input Real cooBor[nBor, 2] "Borehole coordinates"; - input Modelica.SIunits.Height hBor "Borehole length"; - input Modelica.SIunits.Height dBor "Borehole buried depth"; - input Modelica.SIunits.Radius rBor "Borehole radius"; - input Modelica.SIunits.ThermalDiffusivity aSoi + input Modelica.Units.SI.Height hBor "Borehole length"; + input Modelica.Units.SI.Height dBor "Borehole buried depth"; + input Modelica.Units.SI.Radius rBor "Borehole radius"; + input Modelica.Units.SI.ThermalDiffusivity aSoi "Thermal diffusivity of soil"; - input Modelica.SIunits.ThermalConductivity kSoi + input Modelica.Units.SI.ThermalConductivity kSoi "Thermal conductivity of soil"; input Integer nSeg "Number of line source segments per borehole"; input Integer nTimSho "Number of time steps in short time region"; @@ -21,11 +21,11 @@ input Boolean forceGFunCalc "Set to true to force the thermal response to be calculated at the start"; - output Modelica.SIunits.ThermalResistance TStep[nTimTot, 2] "Temperature step-response time series"; + output Modelica.Units.SI.ThermalResistance TStep[nTimTot, 2] "Temperature step-response time series"; protected String pathSave "Path of the folder used to save the g-function"; - Modelica.SIunits.Time[nTimTot] tGFun "g-function evaluation times"; + Modelica.Units.SI.Time[nTimTot] tGFun "g-function evaluation times"; Real[nTimTot] gFun "g-function vector"; Boolean writegFun = false "True if g-function was succesfully written to file"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/temporalSuperposition.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/temporalSuperposition.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/temporalSuperposition.mo" 2022-03-10 09:57:42.060144640 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/temporalSuperposition.mo" 2022-03-10 09:58:13.984148685 +0000 @@ -4,14 +4,14 @@ extends Modelica.Icons.Function; input Integer i "Number of aggregation cells"; - input Modelica.SIunits.HeatFlowRate QAgg_flow[i] + input Modelica.Units.SI.HeatFlowRate QAgg_flow[i] "Vector of aggregated loads"; - input Modelica.SIunits.ThermalResistance kappa[i] + input Modelica.Units.SI.ThermalResistance kappa[i] "Weighting factors for each aggregation cell"; input Integer curCel "Current occupied aggregation cell"; - output Modelica.SIunits.TemperatureDifference deltaTb "Delta T at wall"; + output Modelica.Units.SI.TemperatureDifference deltaTb "Delta T at wall"; algorithm deltaTb := QAgg_flow[1:curCel]*kappa[1:curCel]; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Examples/CylindricalHeatSource.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Examples/CylindricalHeatSource.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Examples/CylindricalHeatSource.mo" 2022-03-10 09:57:42.060144640 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Examples/CylindricalHeatSource.mo" 2022-03-10 09:58:13.964148683 +0000 @@ -2,11 +2,11 @@ model CylindricalHeatSource "Test case for cylindrical heat source" extends Modelica.Icons.Example; - parameter Modelica.SIunits.ThermalDiffusivity aSoi = 1.0e-6 "Ground thermal diffusivity"; - parameter Modelica.SIunits.Radius rSource = 0.075 "Radius of cylinder source"; - parameter Modelica.SIunits.Radius[5] r = {rSource, 2*rSource, 5*rSource, 10*rSource, 20*rSource} + parameter Modelica.Units.SI.ThermalDiffusivity aSoi = 1.0e-6 "Ground thermal diffusivity"; + parameter Modelica.Units.SI.Radius rSource = 0.075 "Radius of cylinder source"; + parameter Modelica.Units.SI.Radius[5] r = {rSource, 2*rSource, 5*rSource, 10*rSource, 20*rSource} "Radial position of evaluation of the solution"; - Modelica.SIunits.Time t "Time"; + Modelica.Units.SI.Time t "Time"; Real[5] G "Cylindrical heat source solution"; equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Examples/FiniteLineSource.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Examples/FiniteLineSource.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Examples/FiniteLineSource.mo" 2022-03-10 09:57:42.060144640 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Examples/FiniteLineSource.mo" 2022-03-10 09:58:13.940148680 +0000 @@ -2,17 +2,17 @@ model FiniteLineSource "Test case for finite line source" extends Modelica.Icons.Example; - parameter Modelica.SIunits.ThermalDiffusivity aSoi = 1.0e-6 "Ground thermal diffusivity"; - parameter Modelica.SIunits.Distance[2] r = {0.075, 7.0} + parameter Modelica.Units.SI.ThermalDiffusivity aSoi = 1.0e-6 "Ground thermal diffusivity"; + parameter Modelica.Units.SI.Distance[2] r = {0.075, 7.0} "Radial position of evaluation of the solution"; - parameter Modelica.SIunits.Height len1 = 12.5 "Length of emitting source"; - parameter Modelica.SIunits.Height burDep1 = 29.0 + parameter Modelica.Units.SI.Height len1 = 12.5 "Length of emitting source"; + parameter Modelica.Units.SI.Height burDep1 = 29.0 "Buried depth of emitting source"; - parameter Modelica.SIunits.Height[7] len2 = {12.5, 8.0, 15.0, 14.0, 6.0, 20.0, 3.0} + parameter Modelica.Units.SI.Height[7] len2 = {12.5, 8.0, 15.0, 14.0, 6.0, 20.0, 3.0} "Length of receiving line"; - parameter Modelica.SIunits.Height[7] burDep2 = {29.0, 25.0, 34.0, 2.0, 32.0, 27.0, 44.0} + parameter Modelica.Units.SI.Height[7] burDep2 = {29.0, 25.0, 34.0, 2.0, 32.0, 27.0, 44.0} "Buried depth of receiving line"; - Modelica.SIunits.Time t "Time"; + Modelica.Units.SI.Time t "Time"; Real[2,7] hRea "Finite line source solution (Real part)"; Real[2,7] hMir "Finite line source solution (Mirror part)"; Real[2,7] h "Finite line source solution"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Examples/FiniteLineSource_Integrand.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Examples/FiniteLineSource_Integrand.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Examples/FiniteLineSource_Integrand.mo" 2022-03-10 09:57:42.060144640 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Examples/FiniteLineSource_Integrand.mo" 2022-03-10 09:58:13.920148677 +0000 @@ -3,11 +3,11 @@ "Test case for finite line source integrand function" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Distance dis = 0.075 "Radial distance between borehole axes"; - parameter Modelica.SIunits.Height len1 = 150.0 "Length of emitting borehole"; - parameter Modelica.SIunits.Height burDep1 = 4.0 "Buried depth of emitting borehole"; - parameter Modelica.SIunits.Height len2 = 150.0 "Length of receiving borehole"; - parameter Modelica.SIunits.Height burDep2 = 4.0 "Buried depth of receiving borehole"; + parameter Modelica.Units.SI.Distance dis = 0.075 "Radial distance between borehole axes"; + parameter Modelica.Units.SI.Height len1 = 150.0 "Length of emitting borehole"; + parameter Modelica.Units.SI.Height burDep1 = 4.0 "Buried depth of emitting borehole"; + parameter Modelica.Units.SI.Height len2 = 150.0 "Length of receiving borehole"; + parameter Modelica.Units.SI.Height burDep2 = 4.0 "Buried depth of receiving borehole"; Real u "Integration variable"; Real y "Finite line source integrand"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Examples/GFunction_100boreholes.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Examples/GFunction_100boreholes.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Examples/GFunction_100boreholes.mo" 2022-03-10 09:57:42.060144640 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Examples/GFunction_100boreholes.mo" 2022-03-10 09:58:13.908148676 +0000 @@ -4,12 +4,12 @@ extends Modelica.Icons.Example; parameter Integer nBor = 100 "Number of boreholes"; - parameter Modelica.SIunits.Position cooBor[nBor, 2] = {{7.5*mod(i-1,10), 7.5*floor((i-1)/10)} for i in 1:nBor} + parameter Modelica.Units.SI.Position cooBor[nBor, 2] = {{7.5*mod(i-1,10), 7.5*floor((i-1)/10)} for i in 1:nBor} "Coordinates of boreholes"; - parameter Modelica.SIunits.Height hBor = 150 "Borehole length"; - parameter Modelica.SIunits.Height dBor = 4 "Borehole buried depth"; - parameter Modelica.SIunits.Radius rBor = 0.075 "Borehole radius"; - parameter Modelica.SIunits.ThermalDiffusivity aSoi = 1e-6 "Ground thermal diffusivity used in g-function evaluation"; + parameter Modelica.Units.SI.Height hBor = 150 "Borehole length"; + parameter Modelica.Units.SI.Height dBor = 4 "Borehole buried depth"; + parameter Modelica.Units.SI.Radius rBor = 0.075 "Borehole radius"; + parameter Modelica.Units.SI.ThermalDiffusivity aSoi = 1e-6 "Ground thermal diffusivity used in g-function evaluation"; parameter Integer nSeg = 12 "Number of line source segments per borehole"; parameter Integer nTimSho = 26 "Number of time steps in short time region"; parameter Integer nTimLon = 50 "Number of time steps in long time region"; @@ -18,19 +18,19 @@ final parameter Integer nTimTot=nTimSho+nTimLon; final parameter Real[nTimTot] gFun(fixed=false); final parameter Real[nTimTot] lntts(fixed=false); - final parameter Modelica.SIunits.Time[nTimTot] tGFun(fixed=false); + final parameter Modelica.Units.SI.Time[nTimTot] tGFun(fixed=false); final parameter Real[nTimTot] dspline(fixed=false); Real gFun_int "Interpolated value of g-function"; Real lntts_int "Non-dimensional logarithmic time for interpolation"; discrete Integer k "Current interpolation interval"; - discrete Modelica.SIunits.Time t1 "Previous value of time for interpolation"; - discrete Modelica.SIunits.Time t2 "Next value of time for interpolation"; + discrete Modelica.Units.SI.Time t1 "Previous value of time for interpolation"; + discrete Modelica.Units.SI.Time t2 "Next value of time for interpolation"; discrete Real gFun1 "Previous g-function value for interpolation"; discrete Real gFun2 "Next g-function value for interpolation"; - parameter Modelica.SIunits.Time ts = hBor^2/(9*aSoi) "Bore field characteristic time"; + parameter Modelica.Units.SI.Time ts = hBor^2/(9*aSoi) "Bore field characteristic time"; initial equation // Evaluate g-function for the specified bore field configuration (tGFun,gFun) = diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Examples/GFunction_SmallScaleValidation.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Examples/GFunction_SmallScaleValidation.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Examples/GFunction_SmallScaleValidation.mo" 2022-03-10 09:57:42.060144640 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Examples/GFunction_SmallScaleValidation.mo" 2022-03-10 09:58:13.848148669 +0000 @@ -6,12 +6,12 @@ parameter IBPSA.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.Validation.BaseClasses.SmallScale_Borefield borFieDat "Record of borehole configuration data"; parameter Integer nBor = borFieDat.conDat.nBor "Number of boreholes"; - parameter Modelica.SIunits.Position cooBor[nBor, 2] = borFieDat.conDat.cooBor + parameter Modelica.Units.SI.Position cooBor[nBor, 2] = borFieDat.conDat.cooBor "Coordinates of boreholes"; - parameter Modelica.SIunits.Height hBor = borFieDat.conDat.hBor "Borehole length"; - parameter Modelica.SIunits.Height dBor = borFieDat.conDat.dBor "Borehole buried depth"; - parameter Modelica.SIunits.Radius rBor = borFieDat.conDat.rBor "Borehole radius"; - parameter Modelica.SIunits.ThermalDiffusivity aSoi = borFieDat.soiDat.kSoi/(borFieDat.soiDat.dSoi*borFieDat.soiDat.cSoi) + parameter Modelica.Units.SI.Height hBor = borFieDat.conDat.hBor "Borehole length"; + parameter Modelica.Units.SI.Height dBor = borFieDat.conDat.dBor "Borehole buried depth"; + parameter Modelica.Units.SI.Radius rBor = borFieDat.conDat.rBor "Borehole radius"; + parameter Modelica.Units.SI.ThermalDiffusivity aSoi = borFieDat.soiDat.kSoi/(borFieDat.soiDat.dSoi*borFieDat.soiDat.cSoi) "Ground thermal diffusivity used in g-function evaluation"; parameter Integer nSeg = 12 "Number of line source segments per borehole"; parameter Integer nTimSho = 26 "Number of time steps in short time region"; @@ -21,19 +21,19 @@ final parameter Integer nTimTot=nTimSho+nTimLon; final parameter Real[nTimTot] gFun(fixed=false); final parameter Real[nTimTot] lntts(fixed=false); - final parameter Modelica.SIunits.Time[nTimTot] tGFun(fixed=false); + final parameter Modelica.Units.SI.Time[nTimTot] tGFun(fixed=false); final parameter Real[nTimTot] dspline(fixed=false); Real gFun_int "Interpolated value of g-function"; Real lntts_int "Non-dimensional logarithmic time for interpolation"; discrete Integer k "Current interpolation interval"; - discrete Modelica.SIunits.Time t1 "Previous value of time for interpolation"; - discrete Modelica.SIunits.Time t2 "Next value of time for interpolation"; + discrete Modelica.Units.SI.Time t1 "Previous value of time for interpolation"; + discrete Modelica.Units.SI.Time t2 "Next value of time for interpolation"; discrete Real gFun1 "Previous g-function value for interpolation"; discrete Real gFun2 "Next g-function value for interpolation"; - parameter Modelica.SIunits.Time ts = hBor^2/(9*aSoi) "Bore field characteristic time"; + parameter Modelica.Units.SI.Time ts = hBor^2/(9*aSoi) "Bore field characteristic time"; initial equation // Evaluate g-function for the specified bore field configuration (tGFun,gFun) = diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Examples/InfiniteLineSource.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Examples/InfiniteLineSource.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Examples/InfiniteLineSource.mo" 2022-03-10 09:57:42.060144640 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Examples/InfiniteLineSource.mo" 2022-03-10 09:58:13.828148665 +0000 @@ -2,11 +2,11 @@ model InfiniteLineSource "Test case for infinite line source" extends Modelica.Icons.Example; - parameter Modelica.SIunits.ThermalDiffusivity aSoi = 1.0e-6 "Ground thermal diffusivity"; - parameter Modelica.SIunits.Radius rSource = 0.075 "Minimum radius"; - parameter Modelica.SIunits.Radius[5] r = {rSource, 2*rSource, 5*rSource, 10*rSource, 20*rSource} + parameter Modelica.Units.SI.ThermalDiffusivity aSoi = 1.0e-6 "Ground thermal diffusivity"; + parameter Modelica.Units.SI.Radius rSource = 0.075 "Minimum radius"; + parameter Modelica.Units.SI.Radius[5] r = {rSource, 2*rSource, 5*rSource, 10*rSource, 20*rSource} "Radial position of evaluation of the solution"; - Modelica.SIunits.Time t "Time"; + Modelica.Units.SI.Time t "Time"; Real[5] E "Infinite line source solution"; equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Examples/TimeGeometric.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Examples/TimeGeometric.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Examples/TimeGeometric.mo" 2022-03-10 09:57:42.060144640 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Examples/TimeGeometric.mo" 2022-03-10 09:58:13.804148664 +0000 @@ -3,12 +3,12 @@ "Test case for geometric expansion of time vector" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Duration dt = 2.0 "Minimum time step"; - parameter Modelica.SIunits.Time t_max = 20.0 "Maximum value of time"; + parameter Modelica.Units.SI.Duration dt = 2.0 "Minimum time step"; + parameter Modelica.Units.SI.Time t_max = 20.0 "Maximum value of time"; parameter Integer nTim = 5 "Number of time values"; - final parameter Modelica.SIunits.Time[nTim] t(fixed=false) "Time vector"; + final parameter Modelica.Units.SI.Time[nTim] t(fixed=false) "Time vector"; initial equation t = IBPSA.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.ThermalResponseFactors.timeGeometric( dt=dt, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/cylindricalHeatSource.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/cylindricalHeatSource.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/cylindricalHeatSource.mo" 2022-03-10 09:57:42.060144640 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/cylindricalHeatSource.mo" 2022-03-10 09:58:13.792148662 +0000 @@ -3,10 +3,10 @@ "Cylindrical heat source solution from Carslaw and Jaeger" extends Modelica.Icons.Function; - input Modelica.SIunits.Time t "Time"; - input Modelica.SIunits.ThermalDiffusivity aSoi "Ground thermal diffusivity"; - input Modelica.SIunits.Distance dis "Radial distance between borehole axes"; - input Modelica.SIunits.Radius rBor "Radius of emitting borehole"; + input Modelica.Units.SI.Time t "Time"; + input Modelica.Units.SI.ThermalDiffusivity aSoi "Ground thermal diffusivity"; + input Modelica.Units.SI.Distance dis "Radial distance between borehole axes"; + input Modelica.Units.SI.Radius rBor "Radius of emitting borehole"; output Real G "Thermal response factor of borehole 1 on borehole 2"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/finiteLineSource.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/finiteLineSource.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/finiteLineSource.mo" 2022-03-10 09:57:42.060144640 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/finiteLineSource.mo" 2022-03-10 09:58:13.768148659 +0000 @@ -3,13 +3,13 @@ "Finite line source solution of Claesson and Javed" extends Modelica.Icons.Function; - input Modelica.SIunits.Time t "Time"; - input Modelica.SIunits.ThermalDiffusivity aSoi "Ground thermal diffusivity"; - input Modelica.SIunits.Distance dis "Radial distance between borehole axes"; - input Modelica.SIunits.Height len1 "Length of emitting borehole"; - input Modelica.SIunits.Height burDep1 "Buried depth of emitting borehole"; - input Modelica.SIunits.Height len2 "Length of receiving borehole"; - input Modelica.SIunits.Height burDep2 "Buried depth of receiving borehole"; + input Modelica.Units.SI.Time t "Time"; + input Modelica.Units.SI.ThermalDiffusivity aSoi "Ground thermal diffusivity"; + input Modelica.Units.SI.Distance dis "Radial distance between borehole axes"; + input Modelica.Units.SI.Height len1 "Length of emitting borehole"; + input Modelica.Units.SI.Height burDep1 "Buried depth of emitting borehole"; + input Modelica.Units.SI.Height len2 "Length of receiving borehole"; + input Modelica.Units.SI.Height burDep2 "Buried depth of receiving borehole"; input Boolean includeRealSource = true "True if contribution of real source is included"; input Boolean includeMirrorSource = true "True if contribution of mirror source is included"; @@ -19,10 +19,10 @@ Real lowBou(unit="m-1") "Lower bound of integration"; // Upper bound is infinite Real uppBou(unit="m-1") = 100.0 "Upper bound of integration"; - Modelica.SIunits.Distance disMin - "Minimum distance between sources and receiving line"; - Modelica.SIunits.Time timTre "Time treshold for evaluation of the solution"; + Modelica.Units.SI.Distance disMin + "Minimum distance between sources and receiving line"; + Modelica.Units.SI.Time timTre "Time treshold for evaluation of the solution"; algorithm h_21 := 0; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/finiteLineSource_Integrand.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/finiteLineSource_Integrand.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/finiteLineSource_Integrand.mo" 2022-03-10 09:57:42.060144640 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/finiteLineSource_Integrand.mo" 2022-03-10 09:58:13.748148656 +0000 @@ -4,11 +4,11 @@ extends Modelica.Icons.Function; input Real u(unit="1/m") "Integration variable"; - input Modelica.SIunits.Distance dis "Radial distance between borehole axes"; - input Modelica.SIunits.Height len1 "Length of emitting borehole"; - input Modelica.SIunits.Height burDep1 "Buried depth of emitting borehole"; - input Modelica.SIunits.Height len2 "Length of receiving borehole"; - input Modelica.SIunits.Height burDep2 "Buried depth of receiving borehole"; + input Modelica.Units.SI.Distance dis "Radial distance between borehole axes"; + input Modelica.Units.SI.Height len1 "Length of emitting borehole"; + input Modelica.Units.SI.Height burDep1 "Buried depth of emitting borehole"; + input Modelica.Units.SI.Height len2 "Length of receiving borehole"; + input Modelica.Units.SI.Height burDep2 "Buried depth of receiving borehole"; input Boolean includeRealSource = true "true if contribution of real source is included"; input Boolean includeMirrorSource = true "true if contribution of mirror source is included"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/gFunction.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/gFunction.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/gFunction.mo" 2022-03-10 09:57:42.060144640 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/gFunction.mo" 2022-03-10 09:58:13.732148653 +0000 @@ -3,34 +3,34 @@ extends Modelica.Icons.Function; input Integer nBor "Number of boreholes"; - input Modelica.SIunits.Position cooBor[nBor, 2] "Coordinates of boreholes"; - input Modelica.SIunits.Height hBor "Borehole length"; - input Modelica.SIunits.Height dBor "Borehole buried depth"; - input Modelica.SIunits.Radius rBor "Borehole radius"; - input Modelica.SIunits.ThermalDiffusivity aSoi "Ground thermal diffusivity used in g-function evaluation"; + input Modelica.Units.SI.Position cooBor[nBor, 2] "Coordinates of boreholes"; + input Modelica.Units.SI.Height hBor "Borehole length"; + input Modelica.Units.SI.Height dBor "Borehole buried depth"; + input Modelica.Units.SI.Radius rBor "Borehole radius"; + input Modelica.Units.SI.ThermalDiffusivity aSoi "Ground thermal diffusivity used in g-function evaluation"; input Integer nSeg "Number of line source segments per borehole"; input Integer nTimSho "Number of time steps in short time region"; input Integer nTimLon "Number of time steps in long time region"; input Real ttsMax "Maximum adimensional time for gfunc calculation"; input Real relTol = 0.02 "Relative tolerance on distance between boreholes"; - output Modelica.SIunits.Time tGFun[nTimSho+nTimLon] "Time of g-function evaluation"; + output Modelica.Units.SI.Time tGFun[nTimSho+nTimLon] "Time of g-function evaluation"; output Real g[nTimSho+nTimLon] "g-function"; protected - Modelica.SIunits.Time ts = hBor^2/(9*aSoi) "Characteristic time"; - Modelica.SIunits.Time tSho_min = 1 "Minimum time for short time calculations"; - Modelica.SIunits.Time tSho_max = 3600 "Maximum time for short time calculations"; - Modelica.SIunits.Time tLon_min = tSho_max "Minimum time for long time calculations"; - Modelica.SIunits.Time tLon_max = ts*ttsMax "Maximum time for long time calculations"; - Modelica.SIunits.Time tSho[nTimSho] "Time vector for short time calculations"; - Modelica.SIunits.Time tLon[nTimLon] "Time vector for long time calculations"; - Modelica.SIunits.Distance dis "Separation distance between boreholes"; - Modelica.SIunits.Distance dis_mn "Separation distance for comparison"; - Modelica.SIunits.Radius rLin=0.0005*hBor "Radius for evaluation of same-borehole line source solutions"; + Modelica.Units.SI.Time ts = hBor^2/(9*aSoi) "Characteristic time"; + Modelica.Units.SI.Time tSho_min = 1 "Minimum time for short time calculations"; + Modelica.Units.SI.Time tSho_max = 3600 "Maximum time for short time calculations"; + Modelica.Units.SI.Time tLon_min = tSho_max "Minimum time for long time calculations"; + Modelica.Units.SI.Time tLon_max = ts*ttsMax "Maximum time for long time calculations"; + Modelica.Units.SI.Time tSho[nTimSho] "Time vector for short time calculations"; + Modelica.Units.SI.Time tLon[nTimLon] "Time vector for long time calculations"; + Modelica.Units.SI.Distance dis "Separation distance between boreholes"; + Modelica.Units.SI.Distance dis_mn "Separation distance for comparison"; + Modelica.Units.SI.Radius rLin=0.0005*hBor "Radius for evaluation of same-borehole line source solutions"; Real hSegRea[nSeg] "Real part of the FLS solution"; Real hSegMir[2*nSeg-1] "Mirror part of the FLS solution"; - Modelica.SIunits.Height dSeg "Buried depth of borehole segment"; + Modelica.Units.SI.Height dSeg "Buried depth of borehole segment"; Integer Done[nBor, nBor] "Matrix for tracking of FLS evaluations"; Real A[nSeg*nBor+1, nSeg*nBor+1] "Coefficient matrix for system of equations"; Real B[nSeg*nBor+1] "Coefficient vector for system of equations"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/shaGFunction.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/shaGFunction.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/shaGFunction.mo" 2022-03-10 09:57:42.060144640 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/shaGFunction.mo" 2022-03-10 09:58:13.696148649 +0000 @@ -3,11 +3,11 @@ "Returns a SHA1 encryption of the formatted arguments for the g-function generation" extends Modelica.Icons.Function; input Integer nBor "Number of boreholes"; - input Modelica.SIunits.Position cooBor[nBor, 2] "Coordinates of boreholes"; - input Modelica.SIunits.Height hBor "Borehole length"; - input Modelica.SIunits.Height dBor "Borehole buried depth"; - input Modelica.SIunits.Radius rBor "Borehole radius"; - input Modelica.SIunits.ThermalDiffusivity aSoi "Ground thermal diffusivity used in g-function evaluation"; + input Modelica.Units.SI.Position cooBor[nBor, 2] "Coordinates of boreholes"; + input Modelica.Units.SI.Height hBor "Borehole length"; + input Modelica.Units.SI.Height dBor "Borehole buried depth"; + input Modelica.Units.SI.Radius rBor "Borehole radius"; + input Modelica.Units.SI.ThermalDiffusivity aSoi "Ground thermal diffusivity used in g-function evaluation"; input Integer nSeg "Number of line source segments per borehole"; input Integer nTimSho "Number of time steps in short time region"; input Integer nTimLon "Number of time steps in long time region"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/timeGeometric.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/timeGeometric.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/timeGeometric.mo" 2022-03-10 09:57:42.060144640 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/timeGeometric.mo" 2022-03-10 09:58:13.680148647 +0000 @@ -2,8 +2,8 @@ function timeGeometric "Geometric expansion of time steps" extends Modelica.Icons.Function; - input Modelica.SIunits.Duration dt "Minimum time step"; - input Modelica.SIunits.Time t_max "Maximum value of time"; + input Modelica.Units.SI.Duration dt "Minimum time step"; + input Modelica.Units.SI.Time t_max "Maximum value of time"; input Integer nTim "Number of time values"; output Real t[nTim] "Time vector"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Validation/Cylindrical.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Validation/Cylindrical.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Validation/Cylindrical.mo" 2022-03-10 09:57:42.060144640 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Validation/Cylindrical.mo" 2022-03-10 09:58:13.604148637 +0000 @@ -3,7 +3,7 @@ "Comparison of the Cylindrical with the GroundTemperatureResponse" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Temperature T_start = 295.15 + parameter Modelica.Units.SI.Temperature T_start = 295.15 "Initial soil temperature"; parameter IBPSA.Fluid.Geothermal.Borefields.Data.Borefield.Template borFieDat= IBPSA.Fluid.Geothermal.Borefields.Validation.BaseClasses.SandBox_Borefield() diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Validation/FiniteDifference_1Week.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Validation/FiniteDifference_1Week.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Validation/FiniteDifference_1Week.mo" 2022-03-10 09:57:42.060144640 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Validation/FiniteDifference_1Week.mo" 2022-03-10 09:58:13.588148635 +0000 @@ -3,7 +3,7 @@ "Short term validation of ground temperature response model" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Temperature T_start = 283.15 + parameter Modelica.Units.SI.Temperature T_start = 283.15 "Initial soil temperature"; IBPSA.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.Cylindrical soi( final steadyStateInitial=false, @@ -47,7 +47,7 @@ annotation (Placement(transformation(extent={{-90,-88},{-70,-68}}))); Modelica.Blocks.Sources.Sine sine( - freqHz=1/(24*3600), + f =1/(24*3600), startTime=21600, amplitude=1e8) "Heat flow signal" annotation (Placement(transformation(extent={{-92,-10},{-72,10}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/PartialBorefield.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/PartialBorefield.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/PartialBorefield.mo" 2022-03-10 09:57:42.060144640 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/BaseClasses/PartialBorefield.mo" 2022-03-10 09:58:13.552148632 +0000 @@ -26,7 +26,7 @@ annotation(Dialog(tab = "Initialization")); // Simulation parameters - parameter Modelica.SIunits.Time tLoaAgg=300 "Time resolution of load aggregation"; + parameter Modelica.Units.SI.Time tLoaAgg=300 "Time resolution of load aggregation"; parameter Integer nCel(min=1)=5 "Number of cells per aggregation level"; parameter Integer nSeg(min=1)=10 "Number of segments to use in vertical discretization of the boreholes"; @@ -39,23 +39,23 @@ annotation (Placement(transformation(extent={{-80,-80},{-60,-60}}))); // Temperature gradient in undisturbed soil - parameter Modelica.SIunits.Temperature TExt0_start=283.15 + parameter Modelica.Units.SI.Temperature TExt0_start=283.15 "Initial far field temperature" annotation (Dialog(tab="Initialization", group="Soil")); - parameter Modelica.SIunits.Temperature TExt_start[nSeg]= + parameter Modelica.Units.SI.Temperature TExt_start[nSeg]= {if z[i] >= z0 then TExt0_start + (z[i] - z0)*dT_dz else TExt0_start for i in 1:nSeg} "Temperature of the undisturbed ground" annotation (Dialog(tab="Initialization", group="Soil")); - parameter Modelica.SIunits.Temperature TGro_start[nSeg]=TExt_start + parameter Modelica.Units.SI.Temperature TGro_start[nSeg]=TExt_start "Start value of grout temperature" annotation (Dialog(tab="Initialization", group="Filling material")); - parameter Modelica.SIunits.Temperature TFlu_start[nSeg]=TGro_start + parameter Modelica.Units.SI.Temperature TFlu_start[nSeg]=TGro_start "Start value of fluid temperature" annotation (Dialog(tab="Initialization")); - parameter Modelica.SIunits.Height z0=10 + parameter Modelica.Units.SI.Height z0=10 "Depth below which the temperature gradient starts" annotation (Dialog(tab="Initialization", group="Temperature profile")); parameter Real dT_dz(final unit="K/m", min=0) = 0.01 @@ -111,7 +111,7 @@ "Gain to multiply the heat extracted by one borehole by the number of boreholes" annotation (Placement(transformation(extent={{-20,70},{0,90}}))); protected - parameter Modelica.SIunits.Height z[nSeg]={borFieDat.conDat.hBor/nSeg*(i - 0.5) for i in 1:nSeg} + parameter Modelica.Units.SI.Height z[nSeg]={borFieDat.conDat.hBor/nSeg*(i - 0.5) for i in 1:nSeg} "Distance from the surface to the considered segment"; Modelica.Blocks.Sources.Constant TSoiUnd[nSeg]( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/Data/Configuration/Template.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/Data/Configuration/Template.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/Data/Configuration/Template.mo" 2022-03-10 09:57:42.060144640 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/Data/Configuration/Template.mo" 2022-03-10 09:58:13.384148609 +0000 @@ -11,50 +11,50 @@ parameter Real Rb(unit="(m.K)/W") = 0.0 "Borehole thermal resistance Rb. Only to fill in if known" annotation(Dialog(enable=use_Rb)); - parameter Modelica.SIunits.MassFlowRate mBor_flow_nominal + parameter Modelica.Units.SI.MassFlowRate mBor_flow_nominal "Nominal mass flow rate per borehole" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.MassFlowRate mBorFie_flow_nominal = mBor_flow_nominal*nBor + parameter Modelica.Units.SI.MassFlowRate mBorFie_flow_nominal = mBor_flow_nominal*nBor "Nominal mass flow of borefield" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.Pressure dp_nominal(displayUnit="Pa") + parameter Modelica.Units.SI.Pressure dp_nominal(displayUnit="Pa") "Pressure losses for the entire borefield" annotation (Dialog(group="Nominal condition")); //------------------------- Geometrical parameters --------------------------- - parameter Modelica.SIunits.Height hBor "Total height of the borehole" + parameter Modelica.Units.SI.Height hBor "Total height of the borehole" annotation (Dialog(group="Borehole")); - parameter Modelica.SIunits.Radius rBor "Radius of the borehole" + parameter Modelica.Units.SI.Radius rBor "Radius of the borehole" annotation (Dialog(group="Borehole")); - parameter Modelica.SIunits.Height dBor "Borehole buried depth" + parameter Modelica.Units.SI.Height dBor "Borehole buried depth" annotation (Dialog(group="Borehole")); parameter Integer nBor = size(cooBor, 1) "Total number of boreholes" annotation (Dialog(group="Borehole")); - parameter Modelica.SIunits.Length[:,2] cooBor + + parameter Modelica.Units.SI.Length[:,2] cooBor "Cartesian coordinates of the boreholes in meters" annotation (Dialog(group="Borehole")); // -- Tube - parameter Modelica.SIunits.Radius rTub "Outer radius of the tubes" + parameter Modelica.Units.SI.Radius rTub "Outer radius of the tubes" annotation (Dialog(group="Tubes")); - parameter Modelica.SIunits.ThermalConductivity kTub "Thermal conductivity of the tube" + parameter Modelica.Units.SI.ThermalConductivity kTub "Thermal conductivity of the tube" annotation (Dialog(group="Tubes")); - parameter Modelica.SIunits.Length eTub "Thickness of a tube" + parameter Modelica.Units.SI.Length eTub "Thickness of a tube" annotation (Dialog(group="Tubes")); - parameter Modelica.SIunits.Length xC + parameter Modelica.Units.SI.Length xC "Shank spacing, defined as the distance between the center of a pipe and the center of the borehole" annotation (Dialog(group="Tubes")); //------------------------- Advanced parameters ------------------------------ /*--------Flow: */ - parameter Modelica.SIunits.MassFlowRate mBor_flow_small(min=0) = 1E-4*abs(mBor_flow_nominal) + parameter Modelica.Units.SI.MassFlowRate mBor_flow_small(min=0) = 1E-4*abs(mBor_flow_nominal) "Small mass flow rate for regularization of zero flow" annotation (Dialog(tab="Advanced")); - annotation ( defaultComponentPrefixes="parameter", defaultComponentName="conDat", diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/Data/Filling/Template.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/Data/Filling/Template.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/Data/Filling/Template.mo" 2022-03-10 09:57:42.060144640 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/Data/Filling/Template.mo" 2022-03-10 09:58:13.360148606 +0000 @@ -2,16 +2,16 @@ record Template "Template for filling data records" extends Modelica.Icons.Record; - parameter Modelica.SIunits.ThermalConductivity kFil + parameter Modelica.Units.SI.ThermalConductivity kFil "Thermal conductivity of the borehole filling material"; - parameter Modelica.SIunits.SpecificHeatCapacity cFil + parameter Modelica.Units.SI.SpecificHeatCapacity cFil "Specific heat capacity of the borehole filling material"; - parameter Modelica.SIunits.Density dFil(displayUnit="kg/m3") + parameter Modelica.Units.SI.Density dFil(displayUnit="kg/m3") "Density of the borehole filling material"; parameter Boolean steadyState = (cFil < Modelica.Constants.eps or dFil < Modelica.Constants.eps) "Flag, if true, then material is computed using steady-state heat conduction" annotation(Evaluate=true); - final parameter Modelica.SIunits.ThermalDiffusivity aFil = kFil/(dFil*cFil) + final parameter Modelica.Units.SI.ThermalDiffusivity aFil = kFil/(dFil*cFil) "Heat diffusion coefficient of the borehole filling material"; annotation ( defaultComponentPrefixes="parameter", diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/Data/Soil/Template.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/Data/Soil/Template.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/Data/Soil/Template.mo" 2022-03-10 09:57:42.060144640 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/Data/Soil/Template.mo" 2022-03-10 09:58:13.340148604 +0000 @@ -2,16 +2,16 @@ record Template "Template for soil data records" extends Modelica.Icons.Record; - parameter Modelica.SIunits.ThermalConductivity kSoi + parameter Modelica.Units.SI.ThermalConductivity kSoi "Thermal conductivity of the soil material"; - parameter Modelica.SIunits.SpecificHeatCapacity cSoi + parameter Modelica.Units.SI.SpecificHeatCapacity cSoi "Specific heat capacity of the soil material"; - parameter Modelica.SIunits.Density dSoi(displayUnit="kg/m3") + parameter Modelica.Units.SI.Density dSoi(displayUnit="kg/m3") "Density of the soil material"; parameter Boolean steadyState = (cSoi < Modelica.Constants.eps or dSoi < Modelica.Constants.eps) "Flag, if true, then material is computed using steady-state heat conduction" annotation(Evaluate=true); - final parameter Modelica.SIunits.ThermalDiffusivity aSoi=kSoi/(dSoi*cSoi) + final parameter Modelica.Units.SI.ThermalDiffusivity aSoi=kSoi/(dSoi*cSoi) "Heat diffusion coefficient of the soil material"; annotation ( defaultComponentPrefixes="parameter", diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/Examples/Borefields.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/Examples/Borefields.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/Examples/Borefields.mo" 2022-03-10 09:57:42.060144640 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/Examples/Borefields.mo" 2022-03-10 09:58:13.328148602 +0000 @@ -5,10 +5,10 @@ package Medium = IBPSA.Media.Water; - parameter Modelica.SIunits.Time tLoaAgg=300 + parameter Modelica.Units.SI.Time tLoaAgg=300 "Time resolution of load aggregation"; - parameter Modelica.SIunits.Temperature TGro = 283.15 + parameter Modelica.Units.SI.Temperature TGro = 283.15 "Ground temperature"; IBPSA.Fluid.Geothermal.Borefields.TwoUTubes borFie2UTubPar( redeclare package Medium = Medium, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/Examples/RectangularBorefield.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/Examples/RectangularBorefield.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/Examples/RectangularBorefield.mo" 2022-03-10 09:57:42.060144640 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/Examples/RectangularBorefield.mo" 2022-03-10 09:58:13.296148598 +0000 @@ -4,25 +4,25 @@ package Medium = IBPSA.Media.Water "Medium model"; - parameter Modelica.SIunits.Time tLoaAgg=300 + parameter Modelica.Units.SI.Time tLoaAgg=300 "Time resolution of load aggregation"; - parameter Modelica.SIunits.Temperature TGro = 283.15 + parameter Modelica.Units.SI.Temperature TGro = 283.15 "Ground temperature"; - parameter Modelica.SIunits.Velocity v_nominal = 1 "Nominal velocity"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = nBorHol*v_nominal*rTub^2*3.14*1000 + parameter Modelica.Units.SI.Velocity v_nominal = 1 "Nominal velocity"; + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = nBorHol*v_nominal*rTub^2*3.14*1000 "Nominal mass flow rate"; - parameter Modelica.SIunits.Pressure dpBorFie_nominal = (hBor+(xBorFie+yBorFie)/2)*2 + parameter Modelica.Units.SI.Pressure dpBorFie_nominal = (hBor+(xBorFie+yBorFie)/2)*2 "Pressure losses for the entire borefield"; - parameter Modelica.SIunits.Pressure dpHex_nominal = 10000 "Pressure drop heat exchanger"; - parameter Modelica.SIunits.Pressure dp_nominal = dpBorFie_nominal + dpHex_nominal + parameter Modelica.Units.SI.Pressure dpHex_nominal = 10000 "Pressure drop heat exchanger"; + parameter Modelica.Units.SI.Pressure dp_nominal = dpBorFie_nominal + dpHex_nominal "Total pressure drop"; - parameter Modelica.SIunits.Height hBor = 100 "Total height of the borehole"; - parameter Modelica.SIunits.Radius rTub = 0.02 "Outer radius of the tubes"; - parameter Modelica.SIunits.Length xBorFie = 10 "Borefield length"; - parameter Modelica.SIunits.Length yBorFie = 30 "Borefield width"; - parameter Modelica.SIunits.Length dBorHol = 5 "Distance between two boreholes"; + parameter Modelica.Units.SI.Height hBor = 100 "Total height of the borehole"; + parameter Modelica.Units.SI.Radius rTub = 0.02 "Outer radius of the tubes"; + parameter Modelica.Units.SI.Length xBorFie = 10 "Borefield length"; + parameter Modelica.Units.SI.Length yBorFie = 30 "Borefield width"; + parameter Modelica.Units.SI.Length dBorHol = 5 "Distance between two boreholes"; final parameter Integer nXBorHol = integer((xBorFie+dBorHol)/dBorHol) "Number of boreholes in x-direction"; final parameter Integer nYBorHol = integer((yBorFie+dBorHol)/dBorHol) "Number of boreholes in y-direction"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/Validation/Sandbox.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/Validation/Sandbox.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/Validation/Sandbox.mo" 2022-03-10 09:57:42.060144640 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Geothermal/Borefields/Validation/Sandbox.mo" 2022-03-10 09:58:13.140148578 +0000 @@ -3,7 +3,7 @@ extends Modelica.Icons.Example; package Medium = IBPSA.Media.Water; - parameter Modelica.SIunits.Temperature T_start = 273.15 + 22.09 + parameter Modelica.Units.SI.Temperature T_start = 273.15 + 22.09 "Initial temperature of the sandbox"; // mSenFac is set to its numerical value because it is a constant in the borehole model. diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Convector.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Convector.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Convector.mo" 2022-03-10 09:57:42.060144640 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Convector.mo" 2022-03-10 09:58:13.048148567 +0000 @@ -12,7 +12,7 @@ parameter Integer nBeams(min=1) "Number of beams in parallel"; - parameter Modelica.SIunits.Time tau = 30 + parameter Modelica.Units.SI.Time tau = 30 "Time constant at nominal flow (if energyDynamics <> SteadyState)" annotation (Dialog(tab = "Dynamics", group="Nominal condition")); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Examples/DerivateCubicSpline.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Examples/DerivateCubicSpline.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Examples/DerivateCubicSpline.mo" 2022-03-10 09:57:42.060144640 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Examples/DerivateCubicSpline.mo" 2022-03-10 09:58:12.968148556 +0000 @@ -2,7 +2,7 @@ model DerivateCubicSpline extends Modelica.Icons.Example; - Modelica.Blocks.Sources.Clock clock "Clock" + Modelica.Blocks.Sources.ContinuousClock clock "Clock" annotation (Placement(transformation(extent={{-60,-10},{-40,10}}))); IBPSA.Fluid.HeatExchangers.ActiveBeams.BaseClasses.DerivativesCubicSpline cubSpl "Derivatives of cubic spline" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/HeatExchangers/ActiveBeams/Cooling.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/HeatExchangers/ActiveBeams/Cooling.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/HeatExchangers/ActiveBeams/Cooling.mo" 2022-03-10 09:57:42.060144640 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/HeatExchangers/ActiveBeams/Cooling.mo" 2022-03-10 09:58:12.924148551 +0000 @@ -23,7 +23,7 @@ "= true to allow flow reversal in air circuit, false restricts to design direction (port_a -> port_b)" annotation(Dialog(tab="Assumptions"), Evaluate=true); - parameter Modelica.SIunits.Time tau = 30 + parameter Modelica.Units.SI.Time tau = 30 "Time constant at nominal flow (if energyDynamics <> SteadyState)" annotation (Dialog(tab = "Dynamics", group="Nominal condition")); @@ -131,10 +131,10 @@ origin={0,-36}))); // Pressure drop - Modelica.SIunits.PressureDifference dpWatCoo(displayUnit="Pa") = watCoo_a.p - watCoo_b.p + Modelica.Units.SI.PressureDifference dpWatCoo(displayUnit="Pa") = watCoo_a.p - watCoo_b.p "Pressure difference watCoo_a minus watCoo_b"; - Modelica.SIunits.PressureDifference dpAir(displayUnit="Pa") = air_a.p - air_b.p + Modelica.Units.SI.PressureDifference dpAir(displayUnit="Pa") = air_a.p - air_b.p "Pressure difference air_a minus air_b"; FixedResistances.PressureDrop res( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/HeatExchangers/ActiveBeams/CoolingAndHeating.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/HeatExchangers/ActiveBeams/CoolingAndHeating.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/HeatExchangers/ActiveBeams/CoolingAndHeating.mo" 2022-03-10 09:57:42.060144640 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/HeatExchangers/ActiveBeams/CoolingAndHeating.mo" 2022-03-10 09:58:12.888148548 +0000 @@ -42,7 +42,7 @@ noEvent(actualStream(watHea_b.Xi_outflow))) if show_T "Medium properties in port watHea_b"; - Modelica.SIunits.PressureDifference dpWatHea(displayUnit="Pa") = watHea_a.p - watHea_b.p + Modelica.Units.SI.PressureDifference dpWatHea(displayUnit="Pa") = watHea_a.p - watHea_b.p "Pressure difference between watHea_a and watHea_b"; protected diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/HeatExchangers/ActiveBeams/Data/Generic.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/HeatExchangers/ActiveBeams/Data/Generic.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/HeatExchangers/ActiveBeams/Data/Generic.mo" 2022-03-10 09:57:42.060144640 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/HeatExchangers/ActiveBeams/Data/Generic.mo" 2022-03-10 09:58:12.808148536 +0000 @@ -15,28 +15,28 @@ f={0,0.5,1}) "Performance data for normalized temperature difference room minus water inlet"; - parameter Modelica.SIunits.MassFlowRate mAir_flow_nominal + + parameter Modelica.Units.SI.MassFlowRate mAir_flow_nominal "Nominal air mass flow rate per beam" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.MassFlowRate mWat_flow_nominal + parameter Modelica.Units.SI.MassFlowRate mWat_flow_nominal "Nominal water mass flow rate per beam" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.PressureDifference dpWat_nominal(displayUnit="Pa") + parameter Modelica.Units.SI.PressureDifference dpWat_nominal(displayUnit="Pa") "Water-side nominal pressure drop per beam" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.PressureDifference dpAir_nominal(displayUnit="Pa") + parameter Modelica.Units.SI.PressureDifference dpAir_nominal(displayUnit="Pa") "Air-side nominal pressure drop" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.TemperatureDifference dT_nominal + parameter Modelica.Units.SI.TemperatureDifference dT_nominal "Nominal temperature difference water inlet minus room air" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal + parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal "Nominal capacity per beam" annotation (Dialog(group="Nominal condition")); - annotation (defaultComponentName="per", Documentation(revisions="diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/BaseClasses/Characteristics/flowParameters.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/BaseClasses/Characteristics/flowParameters.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/BaseClasses/Characteristics/flowParameters.mo" 2022-03-10 09:57:42.068144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/BaseClasses/Characteristics/flowParameters.mo" 2022-03-10 09:58:07.780147899 +0000 @@ -2,12 +2,12 @@ record flowParameters "Record for flow parameters" extends Modelica.Icons.Record; - parameter Modelica.SIunits.VolumeFlowRate V_flow[:](each min=0) + + parameter Modelica.Units.SI.VolumeFlowRate V_flow[:](each min=0) "Volume flow rate at user-selected operating points"; - parameter Modelica.SIunits.PressureDifference dp[size(V_flow,1)]( + parameter Modelica.Units.SI.PressureDifference dp[size(V_flow,1)]( each min=0, each displayUnit="Pa") "Fan or pump total pressure at these flow rates"; - annotation (Documentation(info="
Data record for performance data that describe volume flow rate versus diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/BaseClasses/Characteristics/flowParametersInternal.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/BaseClasses/Characteristics/flowParametersInternal.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/BaseClasses/Characteristics/flowParametersInternal.mo" 2022-03-10 09:57:42.068144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/BaseClasses/Characteristics/flowParametersInternal.mo" 2022-03-10 09:58:07.776147899 +0000 @@ -3,9 +3,9 @@ extends Modelica.Icons.Record; parameter Integer n "Number of elements in each array" annotation(Evaluate=true); - parameter Modelica.SIunits.VolumeFlowRate V_flow[n](each min=0) + parameter Modelica.Units.SI.VolumeFlowRate V_flow[n](each min=0) "Volume flow rate at user-selected operating points"; - parameter Modelica.SIunits.PressureDifference dp[n]( + parameter Modelica.Units.SI.PressureDifference dp[n]( each min=0, each displayUnit="Pa") "Fan or pump total pressure at these flow rates"; annotation (Documentation(info=" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/BaseClasses/Characteristics/power.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/BaseClasses/Characteristics/power.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/BaseClasses/Characteristics/power.mo" 2022-03-10 09:57:42.068144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/BaseClasses/Characteristics/power.mo" 2022-03-10 09:58:07.768147898 +0000 @@ -3,16 +3,16 @@ extends Modelica.Icons.Function; input IBPSA.Fluid.Movers.BaseClasses.Characteristics.powerParameters per "Pressure performance data"; - input Modelica.SIunits.VolumeFlowRate V_flow "Volumetric flow rate"; + input Modelica.Units.SI.VolumeFlowRate V_flow "Volumetric flow rate"; input Real r_N(unit="1") "Relative revolution, r_N=N/N_nominal"; input Real d[:] "Derivatives at support points for spline interpolation"; input Real delta "Small value for switching implementation around zero rpm"; - output Modelica.SIunits.Power P "Power consumption"; + output Modelica.Units.SI.Power P "Power consumption"; protected Integer n=size(per.V_flow, 1) "Dimension of data vector"; - Modelica.SIunits.VolumeFlowRate rat "Ratio of V_flow/r_N"; + Modelica.Units.SI.VolumeFlowRate rat "Ratio of V_flow/r_N"; Integer i "Integer to select data interval"; algorithm diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/BaseClasses/Characteristics/powerParameters.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/BaseClasses/Characteristics/powerParameters.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/BaseClasses/Characteristics/powerParameters.mo" 2022-03-10 09:57:42.068144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/BaseClasses/Characteristics/powerParameters.mo" 2022-03-10 09:58:07.760147898 +0000 @@ -1,9 +1,9 @@ within IBPSA.Fluid.Movers.BaseClasses.Characteristics; record powerParameters "Record for electrical power parameters" extends Modelica.Icons.Record; - parameter Modelica.SIunits.VolumeFlowRate V_flow[:](each min=0) + parameter Modelica.Units.SI.VolumeFlowRate V_flow[:](each min=0) "Volume flow rate at user-selected operating points"; - parameter Modelica.SIunits.Power P[size(V_flow,1)](each min=0) + parameter Modelica.Units.SI.Power P[size(V_flow,1)](each min=0) "Fan or pump electrical power at these flow rates"; annotation (Documentation(info="
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/BaseClasses/Characteristics/pressure.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/BaseClasses/Characteristics/pressure.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/BaseClasses/Characteristics/pressure.mo" 2022-03-10 09:57:42.068144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/BaseClasses/Characteristics/pressure.mo" 2022-03-10 09:58:07.756147896 +0000 @@ -3,17 +3,17 @@ "Pump or fan head away from the origin without correction for mover flow resistance" extends Modelica.Icons.Function; - input Modelica.SIunits.VolumeFlowRate V_flow "Volumetric flow rate"; + input Modelica.Units.SI.VolumeFlowRate V_flow "Volumetric flow rate"; input Real r_N(unit="1") "Relative revolution, r_N=N/N_nominal"; input Real d[:] "Derivatives of flow rate vs. pressure at the support points"; - input Modelica.SIunits.PressureDifference dpMax(displayUnit="Pa") + input Modelica.Units.SI.PressureDifference dpMax(displayUnit="Pa") "Maximum pressure drop at nominal speed, for regularisation"; - input Modelica.SIunits.VolumeFlowRate V_flow_max + input Modelica.Units.SI.VolumeFlowRate V_flow_max "Maximum flow rate at nominal speed, for regularisation"; input IBPSA.Fluid.Movers.BaseClasses.Characteristics.flowParametersInternal per "Pressure performance data"; - output Modelica.SIunits.PressureDifference dp(displayUnit="Pa") "Pressure raise"; + output Modelica.Units.SI.PressureDifference dp(displayUnit="Pa") "Pressure raise"; protected constant Real delta = 0.05 @@ -21,8 +21,8 @@ constant Real delta2 = delta/2 "= delta/2"; Real r_R(unit="1") "Relative revolution, bounded below by delta"; Integer i "Integer to select data interval"; - Modelica.SIunits.VolumeFlowRate rat "Ratio of V_flow/r_R"; + Modelica.Units.SI.VolumeFlowRate rat "Ratio of V_flow/r_R"; algorithm // For r_N < delta, we restrict r_N in the term V_flow/r_N. // This is done using a cubic spline in a region 0.75*delta < r_N < 1.25*r_N diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/BaseClasses/FlowMachineInterface.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/BaseClasses/FlowMachineInterface.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/BaseClasses/FlowMachineInterface.mo" 2022-03-10 09:57:42.068144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/BaseClasses/FlowMachineInterface.mo" 2022-03-10 09:58:07.740147895 +0000 @@ -15,16 +15,16 @@ parameter Boolean computePowerUsingSimilarityLaws "= true, compute power exactly, using similarity laws. Otherwise approximate."; - final parameter Modelica.SIunits.VolumeFlowRate V_flow_nominal= + final parameter Modelica.Units.SI.VolumeFlowRate V_flow_nominal= per.pressure.V_flow[nOri] "Nominal volume flow rate, used for homotopy"; - parameter Modelica.SIunits.Density rho_default + parameter Modelica.Units.SI.Density rho_default "Fluid density at medium default state"; parameter Boolean haveVMax "Flag, true if user specified data that contain V_flow_max"; - parameter Modelica.SIunits.VolumeFlowRate V_flow_max + parameter Modelica.Units.SI.VolumeFlowRate V_flow_max "Maximum volume flow rate, used for smoothing"; parameter Integer nOri(min=1) "Number of data points for pressure curve" @@ -124,7 +124,7 @@ final parameter Real hydDer[size(per.hydraulicEfficiency.V_flow,1)](each fixed=false) "Coefficients for polynomial of hydraulic efficiency vs. volume flow rate"; - parameter Modelica.SIunits.PressureDifference dpMax(displayUnit="Pa")= + parameter Modelica.Units.SI.PressureDifference dpMax(displayUnit="Pa")= if haveDPMax then per.pressure.dp[1] else diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/BaseClasses/PartialFlowMachine.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/BaseClasses/PartialFlowMachine.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/BaseClasses/PartialFlowMachine.mo" 2022-03-10 09:57:42.068144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/BaseClasses/PartialFlowMachine.mo" 2022-03-10 09:58:07.644147882 +0000 @@ -41,7 +41,7 @@ parameter Boolean nominalValuesDefineDefaultPressureCurve = false "Set to true to avoid warning if m_flow_nominal and dp_nominal are used to construct the default pressure curve"; - parameter Modelica.SIunits.Time tau=1 + parameter Modelica.Units.SI.Time tau=1 "Time constant of fluid volume for nominal flow, used if energy or mass balance is dynamic" annotation (Dialog(tab="Dynamics", group="Nominal condition", @@ -52,7 +52,7 @@ parameter Boolean use_inputFilter=true "= true, if speed is filtered with a 2nd order CriticalDamping filter" annotation(Dialog(tab="Dynamics", group="Filtered speed")); - parameter Modelica.SIunits.Time riseTime=30 + parameter Modelica.Units.SI.Time riseTime=30 "Rise time of the filter (time to reach 99.6 % of the speed)" annotation(Dialog(tab="Dynamics", group="Filtered speed",enable=use_inputFilter)); parameter Modelica.Blocks.Types.Init init=Modelica.Blocks.Types.Init.InitialOutput @@ -89,8 +89,8 @@ iconTransformation(extent={{-10,-78},{10,-58}}))); // Variables - Modelica.SIunits.VolumeFlowRate VMachine_flow(start=_VMachine_flow) = eff.V_flow "Volume flow rate"; - Modelica.SIunits.PressureDifference dpMachine(displayUnit="Pa")= + Modelica.Units.SI.VolumeFlowRate VMachine_flow(start=_VMachine_flow) = eff.V_flow "Volume flow rate"; + Modelica.Units.SI.PressureDifference dpMachine(displayUnit="Pa")= -preSou.dp "Pressure difference"; Real eta(unit="1", final quantity="Efficiency") = eff.eta "Global efficiency"; @@ -99,7 +99,7 @@ // Quantity to control protected - final parameter Modelica.SIunits.VolumeFlowRate _VMachine_flow = 0 + final parameter Modelica.Units.SI.VolumeFlowRate _VMachine_flow = 0 "Start value for VMachine_flow, used to avoid a warning if not specified"; parameter Types.PrescribedVariable preVar "Type of prescribed variable"; @@ -122,7 +122,7 @@ final parameter Boolean haveVMax = (abs(per.pressure.dp[nOri]) < Modelica.Constants.eps) "Flag, true if user specified data that contain V_flow_max"; - final parameter Modelica.SIunits.VolumeFlowRate V_flow_max= + final parameter Modelica.Units.SI.VolumeFlowRate V_flow_max= if per.havePressureCurve then (if haveVMax then per.pressure.V_flow[nOri] @@ -131,7 +131,7 @@ nOri - 1])/((per.pressure.dp[nOri] - per.pressure.dp[nOri - 1]))*per.pressure.dp[nOri]) else m_flow_nominal/rho_default "Maximum volume flow rate, used for smoothing"; - final parameter Modelica.SIunits.Density rho_default= + final parameter Modelica.Units.SI.Density rho_default= Medium.density_pTX( p=Medium.p_default, T=Medium.T_default, @@ -142,7 +142,7 @@ p=p_start, X=X_start) "Medium state at start values"; - final parameter Modelica.SIunits.SpecificEnthalpy h_outflow_start = Medium.specificEnthalpy(sta_start) + final parameter Modelica.Units.SI.SpecificEnthalpy h_outflow_start = Medium.specificEnthalpy(sta_start) "Start value for outflowing enthalpy"; Modelica.Blocks.Sources.Constant[size(stageInputs, 1)] stageValues( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/BaseClasses/PowerInterface.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/BaseClasses/PowerInterface.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/BaseClasses/PowerInterface.mo" 2022-03-10 09:57:42.068144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/BaseClasses/PowerInterface.mo" 2022-03-10 09:58:07.492147863 +0000 @@ -9,7 +9,7 @@ parameter Boolean motorCooledByFluid "Flag, true if the motor is cooled by the fluid stream"; - parameter Modelica.SIunits.VolumeFlowRate delta_V_flow + parameter Modelica.Units.SI.VolumeFlowRate delta_V_flow "Factor used for setting heat input into medium to zero at very small flows"; Modelica.Blocks.Interfaces.RealInput etaHyd( @@ -40,13 +40,13 @@ final unit="W") "Heat input from fan or pump to medium" annotation (Placement(transformation(extent={{100,-10},{120,10}}))); - Modelica.SIunits.Power WHyd + Modelica.Units.SI.Power WHyd "Hydraulic power input (converted to flow work and heat)"; protected - Modelica.SIunits.HeatFlowRate QThe_flow - "Heat input from fan or pump to medium"; + Modelica.Units.SI.HeatFlowRate QThe_flow + "Heat input from fan or pump to medium"; equation // Hydraulic power (transmitted by shaft), etaHyd = WFlo/WHyd etaHyd * WHyd = WFlo; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/Data/Generic.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/Data/Generic.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/Data/Generic.mo" 2022-03-10 09:57:42.068144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/Data/Generic.mo" 2022-03-10 09:58:07.428147855 +0000 @@ -56,15 +56,15 @@ "Vector of normalized speed set points, used if inputType = IBPSA.Fluid.Types.InputType.Stages" annotation (Dialog(group="Normalized speeds (used in model, default values assigned from speeds in rpm)")); - parameter Modelica.SIunits.Conversions.NonSIunits.AngularVelocity_rpm speed_rpm_nominal=1500 + parameter Modelica.Units.NonSI.AngularVelocity_rpm speed_rpm_nominal=1500 "Nominal rotational speed for flow characteristic" annotation (Dialog(group="Speeds in RPM")); - parameter Modelica.SIunits.Conversions.NonSIunits.AngularVelocity_rpm constantSpeed_rpm=speed_rpm_nominal + parameter Modelica.Units.NonSI.AngularVelocity_rpm constantSpeed_rpm=speed_rpm_nominal "Speed set point, used if inputType = IBPSA.Fluid.Types.InputType.Constant" annotation (Dialog(group="Speeds in RPM")); - parameter Modelica.SIunits.Conversions.NonSIunits.AngularVelocity_rpm[:] speeds_rpm = {speed_rpm_nominal} + parameter Modelica.Units.NonSI.AngularVelocity_rpm[:] speeds_rpm = {speed_rpm_nominal} "Vector of speed set points, used if inputType = IBPSA.Fluid.Types.InputType.Stages" annotation (Dialog(group="Speeds in RPM")); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/Examples/ClosedLoop_y.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/Examples/ClosedLoop_y.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/Examples/ClosedLoop_y.mo" 2022-03-10 09:57:42.068144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/Examples/ClosedLoop_y.mo" 2022-03-10 09:58:07.128147818 +0000 @@ -4,9 +4,9 @@ package Medium = IBPSA.Media.Air; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal= 0.1 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal= 0.1 "Nominal mass flow rate"; - parameter Modelica.SIunits.PressureDifference dp_nominal = 500 + parameter Modelica.Units.SI.PressureDifference dp_nominal = 500 "Nominal pressure difference"; Modelica.Blocks.Sources.Pulse y( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/Examples/MoverParameter.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/Examples/MoverParameter.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/Examples/MoverParameter.mo" 2022-03-10 09:57:42.068144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/Examples/MoverParameter.mo" 2022-03-10 09:58:07.092147812 +0000 @@ -4,7 +4,7 @@ extends Modelica.Icons.Example; package Medium = IBPSA.Media.Water; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=2 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=2 "Nominal mass flow rate"; FlowControlled_m_flow pump_m_flow( @@ -60,7 +60,7 @@ energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState) "Pump with speed input" annotation (Placement(transformation(extent={{-10,30},{10,50}}))); - parameter Modelica.SIunits.PressureDifference dp_nominal=10000 + parameter Modelica.Units.SI.PressureDifference dp_nominal=10000 "Nominal pressure raise"; equation connect(sou.ports[1], pump_m_flow.port_a) annotation (Line( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/Examples/MoverStages.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/Examples/MoverStages.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/Examples/MoverStages.mo" 2022-03-10 09:57:42.068144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/Examples/MoverStages.mo" 2022-03-10 09:58:07.068147809 +0000 @@ -8,13 +8,13 @@ pump_dp(inputType=IBPSA.Fluid.Types.InputType.Stages)); package Medium = IBPSA.Media.Water; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=2 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=2 "Nominal mass flow rate"; Modelica.Blocks.Sources.IntegerTable integerTable(table=[0,1; 0.3,2; 0.6,3]) "Integer step input, 1 is off, 2 is on" annotation (Placement(transformation(extent={{-60,70},{-40,90}}))); - parameter Modelica.SIunits.PressureDifference dp_nominal=10000 "Nominal pressure raise"; + parameter Modelica.Units.SI.PressureDifference dp_nominal=10000 "Nominal pressure raise"; equation connect(integerTable.y, pump_Nrpm.stage) annotation (Line(points={{-39,80},{0,80},{0,52}}, color={255,127,0})); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/Examples/PumpsParallel.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/Examples/PumpsParallel.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/Examples/PumpsParallel.mo" 2022-03-10 09:57:42.068144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/Examples/PumpsParallel.mo" 2022-03-10 09:58:07.056147807 +0000 @@ -4,10 +4,10 @@ package Medium = IBPSA.Media.Water "Medium model"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal= 1 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal= 1 "Nominal mass flow rate"; - parameter Modelica.SIunits.Density rho_nominal=1000 + parameter Modelica.Units.SI.Density rho_nominal=1000 "Density, used to compute fluid mass"; IBPSA.Fluid.FixedResistances.PressureDrop dpIn1( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/Examples/PumpsSeries.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/Examples/PumpsSeries.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/Examples/PumpsSeries.mo" 2022-03-10 09:57:42.068144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/Examples/PumpsSeries.mo" 2022-03-10 09:58:07.024147803 +0000 @@ -3,7 +3,7 @@ extends Modelica.Icons.Example; package Medium = IBPSA.Media.Water; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=1 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1 "Nominal mass flow rate"; IBPSA.Fluid.Movers.SpeedControlled_y floMac1( @@ -24,7 +24,7 @@ T=Medium.T_default, p=Medium.p_default, X=Medium.X_default) "Start state"; - parameter Modelica.SIunits.Density rho_nominal=Medium.density( + parameter Modelica.Units.SI.Density rho_nominal=Medium.density( state_start) "Density, used to compute fluid mass"; IBPSA.Fluid.Movers.SpeedControlled_y floMac2( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/Examples/SpeedControlled_y_pumpCurves.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/Examples/SpeedControlled_y_pumpCurves.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/Examples/SpeedControlled_y_pumpCurves.mo" 2022-03-10 09:57:42.068144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/Examples/SpeedControlled_y_pumpCurves.mo" 2022-03-10 09:58:07.008147802 +0000 @@ -6,11 +6,11 @@ // For OpenModelica, changed m_flow_nominal to a constant. Otherwise // the translation fails with "Error: Cyclically dependent parameters found" - constant Modelica.SIunits.MassFlowRate m_flow_nominal = 0.5 + constant Modelica.Units.SI.MassFlowRate m_flow_nominal = 0.5 "Nominal mass flow rate"; // For OpenModelica, changed dp_nominal to a constant. Otherwise // the compilation fails. - constant Modelica.SIunits.PressureDifference dp_nominal = 10000 + constant Modelica.Units.SI.PressureDifference dp_nominal = 10000 "Nominal pressure"; model pumpModel = IBPSA.Fluid.Movers.SpeedControlled_y ( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/FlowControlled_dp.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/FlowControlled_dp.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/FlowControlled_dp.mo" 2022-03-10 09:57:42.068144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/FlowControlled_dp.mo" 2022-03-10 09:58:06.972147797 +0000 @@ -22,13 +22,13 @@ dp = {i/(nOri-1)*2.0*dp_nominal for i in (nOri-1):-1:0}), final use_powerCharacteristic = if per.havePressureCurve then per.use_powerCharacteristic else false))); - parameter Modelica.SIunits.PressureDifference dp_start( + parameter Modelica.Units.SI.PressureDifference dp_start( min=0, displayUnit="Pa")=0 "Initial value of pressure raise" annotation(Dialog(tab="Dynamics", group="Filtered speed")); // For air, we set dp_nominal = 600 as default, for water we set 10000 - parameter Modelica.SIunits.PressureDifference dp_nominal( + parameter Modelica.Units.SI.PressureDifference dp_nominal( min=0, displayUnit="Pa")= if rho_default < 500 then 500 else 10000 "Nominal pressure raise, used to normalized the filter if use_inputFilter=true, @@ -36,14 +36,14 @@ and for default pressure curve if not specified in record per" annotation(Dialog(group="Nominal condition")); - parameter Modelica.SIunits.PressureDifference constantHead( + parameter Modelica.Units.SI.PressureDifference constantHead( min=0, displayUnit="Pa")=dp_nominal "Constant pump head, used when inputType=Constant" annotation(Dialog(enable=inputType == IBPSA.Fluid.Types.InputType.Constant)); // By default, set heads proportional to sqrt(speed/speed_nominal) - parameter Modelica.SIunits.PressureDifference[:] heads( + parameter Modelica.Units.SI.PressureDifference[:] heads( each min=0, each displayUnit="Pa")= dp_nominal*{(per.speeds[i]/per.speeds[end])^2 for i in 1:size(per.speeds, 1)} diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/FlowControlled_m_flow.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/FlowControlled_m_flow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/FlowControlled_m_flow.mo" 2022-03-10 09:57:42.068144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/FlowControlled_m_flow.mo" 2022-03-10 09:58:06.932147793 +0000 @@ -23,21 +23,21 @@ preSou(m_flow_start=m_flow_start)); // For air, we set dp_nominal = 600 as default, for water we set 10000 - parameter Modelica.SIunits.PressureDifference dp_nominal(min=0, displayUnit="Pa")= + parameter Modelica.Units.SI.PressureDifference dp_nominal(min=0, displayUnit="Pa")= if rho_default < 500 then 500 else 10000 "Nominal pressure raise, used for default pressure curve if not specified in record per" annotation(Dialog(group="Nominal condition")); - parameter Modelica.SIunits.MassFlowRate m_flow_start(min=0)=0 + parameter Modelica.Units.SI.MassFlowRate m_flow_start(min=0)=0 "Initial value of mass flow rate" annotation(Dialog(tab="Dynamics", group="Filtered speed")); - parameter Modelica.SIunits.MassFlowRate constantMassFlowRate=m_flow_nominal + parameter Modelica.Units.SI.MassFlowRate constantMassFlowRate=m_flow_nominal "Constant pump mass flow rate, used when inputType=Constant" annotation(Dialog(enable=inputType == IBPSA.Fluid.Types.InputType.Constant)); // By default, set massFlowRates proportional to (speed/speed_nominal) - parameter Modelica.SIunits.MassFlowRate[:] massFlowRates= + parameter Modelica.Units.SI.MassFlowRate[:] massFlowRates= m_flow_nominal*{per.speeds[i]/per.speeds[end] for i in 1:size(per.speeds, 1)} "Vector of mass flow rate set points, used when inputType=Stage" annotation(Dialog(enable=inputType == IBPSA.Fluid.Types.InputType.Stages)); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/Validation/BaseClasses/FlowMachine_ZeroFlow.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/Validation/BaseClasses/FlowMachine_ZeroFlow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/Validation/BaseClasses/FlowMachine_ZeroFlow.mo" 2022-03-10 09:57:42.068144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/Validation/BaseClasses/FlowMachine_ZeroFlow.mo" 2022-03-10 09:58:06.796147775 +0000 @@ -5,9 +5,9 @@ replaceable package Medium = IBPSA.Media.Air constrainedby Modelica.Media.Interfaces.PartialMedium "Medium model"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal= 1 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal= 1 "Nominal mass flow rate"; - parameter Modelica.SIunits.PressureDifference dp_nominal = 500 + parameter Modelica.Units.SI.PressureDifference dp_nominal = 500 "Nominal pressure difference"; Modelica.Blocks.Sources.Ramp y( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/Validation/FlowControlled_dpSystem.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/Validation/FlowControlled_dpSystem.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/Validation/FlowControlled_dpSystem.mo" 2022-03-10 09:57:42.068144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/Validation/FlowControlled_dpSystem.mo" 2022-03-10 09:58:06.748147770 +0000 @@ -3,9 +3,9 @@ "Demonstration of the use of prescribedPressure" extends Modelica.Icons.Example; package Medium = IBPSA.Media.Air; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal= 0.1 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal= 0.1 "Nominal mass flow rate"; - parameter Modelica.SIunits.PressureDifference dp_nominal = 100 + parameter Modelica.Units.SI.PressureDifference dp_nominal = 100 "Nominal pressure difference"; Modelica.Blocks.Sources.Ramp y( duration=0.5, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/Validation/PowerSimplified.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/Validation/PowerSimplified.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/Validation/PowerSimplified.mo" 2022-03-10 09:57:42.068144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/Validation/PowerSimplified.mo" 2022-03-10 09:58:06.628147754 +0000 @@ -5,7 +5,7 @@ package Medium = IBPSA.Media.Water "Medium model"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=3 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=3 "Nominal mass flow rate"; parameter Data.Pumps.Wilo.Stratos30slash1to8 per "Pump performance data" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/Validation/PumpCurveConstruction.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/Validation/PumpCurveConstruction.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/Validation/PumpCurveConstruction.mo" 2022-03-10 09:57:42.068144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/Validation/PumpCurveConstruction.mo" 2022-03-10 09:58:06.592147750 +0000 @@ -5,12 +5,12 @@ package Medium = IBPSA.Media.Water "Medium model"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 1 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 1 "Nominal mass flow rate at zero pump head"; - parameter Modelica.SIunits.VolumeFlowRate V_flow_nominal = m_flow_nominal/1000 + parameter Modelica.Units.SI.VolumeFlowRate V_flow_nominal = m_flow_nominal/1000 "Nominal mass flow rate at zero pump head"; - parameter Modelica.SIunits.PressureDifference dp_nominal = 10000 + parameter Modelica.Units.SI.PressureDifference dp_nominal = 10000 "Nominal pump head at zero mass flow rate"; Actuators.Valves.TwoWayLinear val1( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/Validation/SpeedControlled_y_linear.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/Validation/SpeedControlled_y_linear.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/Validation/SpeedControlled_y_linear.mo" 2022-03-10 09:57:42.068144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Movers/Validation/SpeedControlled_y_linear.mo" 2022-03-10 09:58:06.492147736 +0000 @@ -4,9 +4,9 @@ extends Modelica.Icons.Example; package Medium = IBPSA.Media.Water "Medium model"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 0.5 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 0.5 "Nominal mass flow rate"; - parameter Modelica.SIunits.PressureDifference dp_nominal = 10000 + parameter Modelica.Units.SI.PressureDifference dp_nominal = 10000 "Nominal pressure"; Modelica.Blocks.Sources.Ramp y( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/BaseClasses/PartialDynamicFlowSensor.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/BaseClasses/PartialDynamicFlowSensor.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/BaseClasses/PartialDynamicFlowSensor.mo" 2022-03-10 09:57:42.068144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/BaseClasses/PartialDynamicFlowSensor.mo" 2022-03-10 09:58:06.420147728 +0000 @@ -3,7 +3,7 @@ "Partial component to model sensors that measure flow properties using a dynamic model" extends PartialFlowSensor; - parameter Modelica.SIunits.Time tau(min=0) = 1 + parameter Modelica.Units.SI.Time tau(min=0) = 1 "Time constant at nominal flow rate (use tau=0 for steady-state sensor, but see user guide for potential problems)"; parameter Modelica.Blocks.Types.Init initType = Modelica.Blocks.Types.Init.InitialState "Type of initialization (InitialState and InitialOutput are identical)" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/BaseClasses/PartialFlowSensor.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/BaseClasses/PartialFlowSensor.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/BaseClasses/PartialFlowSensor.mo" 2022-03-10 09:57:42.068144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/BaseClasses/PartialFlowSensor.mo" 2022-03-10 09:58:06.404147725 +0000 @@ -2,10 +2,10 @@ partial model PartialFlowSensor "Partial component to model sensors that measure flow properties" extends IBPSA.Fluid.Interfaces.PartialTwoPort; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal(min=0) + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal(min=0) "Nominal mass flow rate, used for regularization near zero flow" annotation(Dialog(group = "Nominal condition")); - parameter Modelica.SIunits.MassFlowRate m_flow_small(min=0) = 1E-4*m_flow_nominal + parameter Modelica.Units.SI.MassFlowRate m_flow_small(min=0) = 1E-4*m_flow_nominal "For bi-directional flow, temperature is regularized in the region |m_flow| < m_flow_small (m_flow_small > 0 required)" annotation(Dialog(tab="Advanced")); equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/Conversions/To_VolumeFraction.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/Conversions/To_VolumeFraction.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/Conversions/To_VolumeFraction.mo" 2022-03-10 09:57:42.068144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/Conversions/To_VolumeFraction.mo" 2022-03-10 09:58:06.328147715 +0000 @@ -1,8 +1,8 @@ within IBPSA.Fluid.Sensors.Conversions; model To_VolumeFraction "Conversion from mass fraction to volume fraction" - parameter Modelica.SIunits.MolarMass MMMea "Molar mass of measured substance"; - parameter Modelica.SIunits.MolarMass MMBul=Modelica.Media.IdealGases.Common.SingleGasesData.Air.MM + parameter Modelica.Units.SI.MolarMass MMMea "Molar mass of measured substance"; + parameter Modelica.Units.SI.MolarMass MMBul=Modelica.Media.IdealGases.Common.SingleGasesData.Air.MM "Molar mass of bulk medium"; Modelica.Blocks.Interfaces.RealInput m "Mass fraction" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/Density.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/Density.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/Density.mo" 2022-03-10 09:57:42.068144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/Density.mo" 2022-03-10 09:58:06.312147714 +0000 @@ -1,7 +1,7 @@ within IBPSA.Fluid.Sensors; model Density "Ideal one port density sensor" extends IBPSA.Fluid.Sensors.BaseClasses.PartialAbsoluteSensor; - extends Modelica.Icons.RotationalSensor; + extends Modelica.Icons.RoundSensor; Modelica.Blocks.Interfaces.RealOutput d(final quantity="Density", final unit="kg/m3", min=0) "Density in port medium" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/DensityTwoPort.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/DensityTwoPort.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/DensityTwoPort.mo" 2022-03-10 09:57:42.068144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/DensityTwoPort.mo" 2022-03-10 09:58:06.300147713 +0000 @@ -1,7 +1,7 @@ within IBPSA.Fluid.Sensors; model DensityTwoPort "Ideal two port density sensor" extends IBPSA.Fluid.Sensors.BaseClasses.PartialDynamicFlowSensor; - extends Modelica.Icons.RotationalSensor; + extends Modelica.Icons.RoundSensor; Modelica.Blocks.Interfaces.RealOutput d(final quantity="Density", final unit="kg/m3", min=0) "Density of the passing fluid" @@ -14,13 +14,13 @@ p=p_start, T=T_start, X=X_start)) "Initial or guess value of output (=state)" annotation (Dialog(group="Initialization")); - parameter Modelica.SIunits.Temperature T_start=Medium.T_default + parameter Modelica.Units.SI.Temperature T_start=Medium.T_default "Temperature used to compute d_start" annotation (Dialog(group="Initialization")); - parameter Modelica.SIunits.Pressure p_start=Medium.p_default + parameter Modelica.Units.SI.Pressure p_start=Medium.p_default "Pressure used to compute d_start" annotation (Dialog(group="Initialization")); - parameter Modelica.SIunits.MassFraction X_start[Medium.nX]=Medium.X_default + parameter Modelica.Units.SI.MassFraction X_start[Medium.nX]=Medium.X_default "Mass fraction used to compute d_start" annotation (Dialog(group="Initialization")); protected diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/EnthalpyFlowRate.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/EnthalpyFlowRate.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/EnthalpyFlowRate.mo" 2022-03-10 09:57:42.068144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/EnthalpyFlowRate.mo" 2022-03-10 09:58:06.276147710 +0000 @@ -1,14 +1,14 @@ within IBPSA.Fluid.Sensors; model EnthalpyFlowRate "Ideal enthalphy flow rate sensor" extends IBPSA.Fluid.Sensors.BaseClasses.PartialDynamicFlowSensor; - extends Modelica.Icons.RotationalSensor; + extends Modelica.Icons.RoundSensor; Modelica.Blocks.Interfaces.RealOutput H_flow(final unit="W") "Enthalpy flow rate, positive if from port_a to port_b" annotation (Placement(transformation( origin={0,110}, extent={{-10,-10},{10,10}}, rotation=90))); - parameter Modelica.SIunits.SpecificEnthalpy h_out_start= + parameter Modelica.Units.SI.SpecificEnthalpy h_out_start= Medium.specificEnthalpy_pTX( p=Medium.p_default, T=Medium.T_default, @@ -16,9 +16,9 @@ "Initial or guess value of measured specific enthalpy" annotation (Dialog(group="Initialization")); protected - Modelica.SIunits.SpecificEnthalpy hMed_out(start=h_out_start) + Modelica.Units.SI.SpecificEnthalpy hMed_out(start=h_out_start) "Medium enthalpy to which the sensor is exposed"; - Modelica.SIunits.SpecificEnthalpy h_out(start=h_out_start) + Modelica.Units.SI.SpecificEnthalpy h_out(start=h_out_start) "Medium enthalpy that is used to compute the enthalpy flow rate"; initial equation if dynamic then diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/EntropyFlowRate.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/EntropyFlowRate.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/EntropyFlowRate.mo" 2022-03-10 09:57:42.068144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/EntropyFlowRate.mo" 2022-03-10 09:58:06.252147706 +0000 @@ -1,25 +1,25 @@ within IBPSA.Fluid.Sensors; model EntropyFlowRate "Ideal entropy flow rate sensor" extends IBPSA.Fluid.Sensors.BaseClasses.PartialDynamicFlowSensor; - extends Modelica.Icons.RotationalSensor; + extends Modelica.Icons.RoundSensor; Modelica.Blocks.Interfaces.RealOutput S_flow(final unit="W/K") "Entropy flow rate, positive if from port_a to port_b" annotation (Placement(transformation( origin={0,110}, extent={{-10,-10},{10,10}}, rotation=90))); - parameter Modelica.SIunits.SpecificEntropy s_out_start= + parameter Modelica.Units.SI.SpecificEntropy s_out_start= Medium.specificEntropy_pTX( p=Medium.p_default, T=Medium.T_default, X=Medium.X_default) "Initial or guess value of measured specific entropy" annotation (Dialog(group="Initialization")); protected - Modelica.SIunits.SpecificEntropy sMed_out(start=s_out_start) + Modelica.Units.SI.SpecificEntropy sMed_out(start=s_out_start) "Medium entropy to which the sensor is exposed"; - Modelica.SIunits.SpecificEntropy s_out(start=s_out_start) + Modelica.Units.SI.SpecificEntropy s_out(start=s_out_start) "Medium entropy that is used to compute the entropy flow rate"; - Modelica.SIunits.SpecificEntropy port_b_s_outflow(start=s_out_start) + Modelica.Units.SI.SpecificEntropy port_b_s_outflow(start=s_out_start) "Medium entropy outflowing at port_b if mass flow were from port_a to port_b"; initial equation if dynamic then diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/Examples/PPM.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/Examples/PPM.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/Examples/PPM.mo" 2022-03-10 09:57:42.068144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/Examples/PPM.mo" 2022-03-10 09:58:06.088147685 +0000 @@ -4,7 +4,7 @@ package Medium = IBPSA.Media.Air(extraPropertiesNames={"CO2"}) "Medium model"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = volDyn.V*senPPMTwoPort.tau*3*rho_default + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = volDyn.V*senPPMTwoPort.tau*3*rho_default "Mass flow rate into and out of the volume"; IBPSA.Fluid.MixingVolumes.MixingVolume volDyn( @@ -70,10 +70,10 @@ T=Medium.T_default, p=Medium.p_default, X=Medium.X_default[1:Medium.nXi]) "Medium state at default values"; + // Density at medium default values, used to compute the size of control volumes - final parameter Modelica.SIunits.Density rho_default=Medium.density( + final parameter Modelica.Units.SI.Density rho_default=Medium.density( state=state_default) "Density, used to compute fluid mass"; - public IBPSA.Fluid.MixingVolumes.MixingVolume volSte( redeclare package Medium = Medium, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/Examples/TraceSubstances.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/Examples/TraceSubstances.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/Examples/TraceSubstances.mo" 2022-03-10 09:57:42.072144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/Examples/TraceSubstances.mo" 2022-03-10 09:58:05.888147659 +0000 @@ -4,7 +4,7 @@ package Medium = IBPSA.Media.Air(extraPropertiesNames={"CO2"}) "Medium model"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 15*1.2/3600 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 15*1.2/3600 "Mass flow rate into and out of the volume"; MixingVolumes.MixingVolume vol( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/Examples/Velocity.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/Examples/Velocity.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/Examples/Velocity.mo" 2022-03-10 09:57:42.072144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/Examples/Velocity.mo" 2022-03-10 09:58:05.856147655 +0000 @@ -4,7 +4,7 @@ package Medium = IBPSA.Media.Air "Medium model"; - parameter Modelica.SIunits.Area A = 0.1*0.1/4*Modelica.Constants.pi + parameter Modelica.Units.SI.Area A = 0.1*0.1/4*Modelica.Constants.pi "Cross sectional area of flow channel"; IBPSA.Fluid.Sources.Boundary_pT sin( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/LatentEnthalpyFlowRate.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/LatentEnthalpyFlowRate.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/LatentEnthalpyFlowRate.mo" 2022-03-10 09:57:42.072144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/LatentEnthalpyFlowRate.mo" 2022-03-10 09:58:05.828147652 +0000 @@ -5,14 +5,14 @@ redeclare replaceable package Medium = Modelica.Media.Interfaces.PartialCondensingGases); extends IBPSA.Fluid.BaseClasses.IndexMassFraction(final substanceName="water"); - extends Modelica.Icons.RotationalSensor; + extends Modelica.Icons.RoundSensor; Modelica.Blocks.Interfaces.RealOutput H_flow(final unit="W") "Latent enthalpy flow rate, positive if from port_a to port_b" annotation (Placement(transformation( origin={0,110}, extent={{-10,-10},{10,10}}, rotation=90))); - parameter Modelica.SIunits.SpecificEnthalpy h_out_start= + parameter Modelica.Units.SI.SpecificEnthalpy h_out_start= Medium.specificEnthalpy_pTX( p=Medium.p_default, T=Medium.T_default, X=Medium.X_default) -Medium.enthalpyOfNonCondensingGas(T=Medium.T_default) @@ -20,9 +20,9 @@ annotation (Dialog(group="Initialization")); protected - Modelica.SIunits.SpecificEnthalpy hMed_out(start=h_out_start) + Modelica.Units.SI.SpecificEnthalpy hMed_out(start=h_out_start) "Medium latent enthalpy to which the sensor is exposed"; - Modelica.SIunits.SpecificEnthalpy h_out(start=h_out_start) + Modelica.Units.SI.SpecificEnthalpy h_out(start=h_out_start) "Medium latent enthalpy that is used to compute the enthalpy flow rate"; Medium.MassFraction XiActual[Medium.nXi] diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/MassFlowRate.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/MassFlowRate.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/MassFlowRate.mo" 2022-03-10 09:57:42.072144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/MassFlowRate.mo" 2022-03-10 09:58:05.800147648 +0000 @@ -3,7 +3,7 @@ extends IBPSA.Fluid.Sensors.BaseClasses.PartialFlowSensor( final m_flow_nominal = 0, final m_flow_small = 0); - extends Modelica.Icons.RotationalSensor; + extends Modelica.Icons.RoundSensor; Modelica.Blocks.Interfaces.RealOutput m_flow(quantity="MassFlowRate", final unit="kg/s") "Mass flow rate from port_a to port_b" annotation (Placement( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/MassFraction.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/MassFraction.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/MassFraction.mo" 2022-03-10 09:57:42.072144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/MassFraction.mo" 2022-03-10 09:58:05.784147647 +0000 @@ -4,7 +4,7 @@ redeclare replaceable package Medium = Modelica.Media.Interfaces.PartialCondensingGases); extends IBPSA.Fluid.BaseClasses.IndexMassFraction(substanceName = "water"); - extends Modelica.Icons.RotationalSensor; + extends Modelica.Icons.RoundSensor; Modelica.Blocks.Interfaces.RealOutput X(min=-1e-3, max=1.001, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/MassFractionTwoPort.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/MassFractionTwoPort.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/MassFractionTwoPort.mo" 2022-03-10 09:57:42.072144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/MassFractionTwoPort.mo" 2022-03-10 09:58:05.764147645 +0000 @@ -4,7 +4,7 @@ redeclare replaceable package Medium = Modelica.Media.Interfaces.PartialCondensingGases); extends IBPSA.Fluid.BaseClasses.IndexMassFraction(substanceName = "water"); - extends Modelica.Icons.RotationalSensor; + extends Modelica.Icons.RoundSensor; parameter Medium.MassFraction X_start=Medium.X_default[i_x] "Initial or guess value of output (= state)" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/PPM.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/PPM.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/PPM.mo" 2022-03-10 09:57:42.072144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/PPM.mo" 2022-03-10 09:58:05.740147641 +0000 @@ -6,11 +6,11 @@ each final unit="1", each min=0, each max=1))); - extends Modelica.Icons.RotationalSensor; + extends Modelica.Icons.RoundSensor; parameter String substanceName = "CO2" "Name of trace substance"; - parameter Modelica.SIunits.MolarMass MM= + parameter Modelica.Units.SI.MolarMass MM= Modelica.Media.IdealGases.Common.SingleGasesData.CO2.MM "Molar mass of the trace substance"; @@ -26,7 +26,7 @@ then 1 else 0 for i in 1:Medium.nC} "Vector with zero everywhere except where species is"; - final parameter Modelica.SIunits.MolarMass MMBul=Medium.molarMass( + final parameter Modelica.Units.SI.MolarMass MMBul=Medium.molarMass( Medium.setState_phX( p=Medium.p_default, h=Medium.h_default, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/PPMTwoPort.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/PPMTwoPort.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/PPMTwoPort.mo" 2022-03-10 09:57:42.072144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/PPMTwoPort.mo" 2022-03-10 09:58:05.724147639 +0000 @@ -10,13 +10,13 @@ each final unit="1", each min=0, each max=1))); - extends Modelica.Icons.RotationalSensor; + extends Modelica.Icons.RoundSensor; parameter String substanceName = "CO2" "Name of trace substance"; parameter Real C_start(min=0) = 0 "Initial or guess value of output (= state)" annotation (Dialog(group="Initialization")); - parameter Modelica.SIunits.MolarMass MM= + parameter Modelica.Units.SI.MolarMass MM= Modelica.Media.IdealGases.Common.SingleGasesData.CO2.MM "Molar mass of the trace substance"; Modelica.Blocks.Interfaces.RealOutput ppm(min=0) @@ -35,7 +35,7 @@ then 1 else 0 for i in 1:Medium.nC} "Vector with zero everywhere except where species is"; - final parameter Modelica.SIunits.MolarMass MMBul=Medium.molarMass( + final parameter Modelica.Units.SI.MolarMass MMBul=Medium.molarMass( Medium.setState_phX( p=Medium.p_default, h=Medium.h_default, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/Pressure.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/Pressure.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/Pressure.mo" 2022-03-10 09:57:42.072144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/Pressure.mo" 2022-03-10 09:58:05.700147637 +0000 @@ -1,7 +1,7 @@ within IBPSA.Fluid.Sensors; model Pressure "Ideal pressure sensor" extends IBPSA.Fluid.Sensors.BaseClasses.PartialAbsoluteSensor; - extends Modelica.Icons.RotationalSensor; + extends Modelica.Icons.RoundSensor; Modelica.Blocks.Interfaces.RealOutput p(final quantity="AbsolutePressure", final unit="Pa", min=0) "Pressure at port" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/RelativeHumidity.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/RelativeHumidity.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/RelativeHumidity.mo" 2022-03-10 09:57:42.072144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/RelativeHumidity.mo" 2022-03-10 09:58:05.664147631 +0000 @@ -1,14 +1,14 @@ within IBPSA.Fluid.Sensors; model RelativeHumidity "Ideal one port relative humidity sensor" extends IBPSA.Fluid.Sensors.BaseClasses.PartialAbsoluteSensor; - extends Modelica.Icons.RotationalSensor; + extends Modelica.Icons.RoundSensor; Modelica.Blocks.Interfaces.RealOutput phi(final unit="1", min=0) "Relative humidity in port medium" annotation (Placement(transformation(extent={{100,-10},{120,10}}))); protected - Modelica.SIunits.Temperature T "Temperature of the medium"; + Modelica.Units.SI.Temperature T "Temperature of the medium"; Medium.MassFraction Xi[Medium.nXi]( quantity=Medium.substanceNames[1:Medium.nXi]) "Mass fraction of the medium"; equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/RelativeHumidityTwoPort.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/RelativeHumidityTwoPort.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/RelativeHumidityTwoPort.mo" 2022-03-10 09:57:42.072144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/RelativeHumidityTwoPort.mo" 2022-03-10 09:58:05.648147629 +0000 @@ -1,7 +1,7 @@ within IBPSA.Fluid.Sensors; model RelativeHumidityTwoPort "Ideal two port relative humidity sensor" extends IBPSA.Fluid.Sensors.BaseClasses.PartialDynamicFlowSensor; - extends Modelica.Icons.RotationalSensor; + extends Modelica.Icons.RoundSensor; Modelica.Blocks.Interfaces.RealOutput phi(final unit="1", min=0, start=phi_start) @@ -18,14 +18,14 @@ "Relative humidity to which the sensor is exposed to"; protected - Modelica.SIunits.Temperature T_a + Modelica.Units.SI.Temperature T_a "Temperature of the medium flowing from port_a to port_b"; Medium.MassFraction Xi_a[Medium.nXi]( quantity=Medium.substanceNames[1:Medium.nXi]) "Mass fraction of the medium flowing from port_a to port_b"; Real phi_a(final unit="1") "Relative humidity of the medium flowing from port_a to port_b"; - Modelica.SIunits.Temperature T_b + Modelica.Units.SI.Temperature T_b "Temperature of the medium flowing from port_b to port_a"; Medium.MassFraction Xi_b[Medium.nXi]( quantity=Medium.substanceNames[1:Medium.nXi]) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/RelativePressure.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/RelativePressure.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/RelativePressure.mo" 2022-03-10 09:57:42.072144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/RelativePressure.mo" 2022-03-10 09:58:05.628147627 +0000 @@ -1,6 +1,6 @@ within IBPSA.Fluid.Sensors; model RelativePressure "Ideal relative pressure sensor" - extends Modelica.Icons.TranslationalSensor; + extends Modelica.Icons.RectangularSensor; replaceable package Medium = Modelica.Media.Interfaces.PartialMedium "Medium in the sensor" annotation ( choicesAllMatching = true); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/RelativeTemperature.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/RelativeTemperature.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/RelativeTemperature.mo" 2022-03-10 09:57:42.072144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/RelativeTemperature.mo" 2022-03-10 09:58:05.612147626 +0000 @@ -1,6 +1,6 @@ within IBPSA.Fluid.Sensors; model RelativeTemperature "Ideal relative temperature sensor" - extends Modelica.Icons.TranslationalSensor; + extends Modelica.Icons.RectangularSensor; replaceable package Medium = Modelica.Media.Interfaces.PartialMedium "Medium in the sensor" annotation ( choicesAllMatching = true); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/SensibleEnthalpyFlowRate.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/SensibleEnthalpyFlowRate.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/SensibleEnthalpyFlowRate.mo" 2022-03-10 09:57:42.072144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/SensibleEnthalpyFlowRate.mo" 2022-03-10 09:58:05.596147623 +0000 @@ -5,21 +5,21 @@ redeclare replaceable package Medium = Modelica.Media.Interfaces.PartialCondensingGases); extends IBPSA.Fluid.BaseClasses.IndexMassFraction(final substanceName="water"); - extends Modelica.Icons.RotationalSensor; + extends Modelica.Icons.RoundSensor; Modelica.Blocks.Interfaces.RealOutput H_flow(final unit="W") "Sensible enthalpy flow rate, positive if from port_a to port_b" annotation (Placement(transformation( origin={0,110}, extent={{-10,-10},{10,10}}, rotation=90))); - parameter Modelica.SIunits.SpecificEnthalpy h_out_start= + parameter Modelica.Units.SI.SpecificEnthalpy h_out_start= Medium.enthalpyOfNonCondensingGas(T=Medium.T_default) "Initial or guess value of measured specific sensible enthalpy" annotation (Dialog(group="Initialization")); protected - Modelica.SIunits.SpecificEnthalpy hMed_out(start=h_out_start) + Modelica.Units.SI.SpecificEnthalpy hMed_out(start=h_out_start) "Medium sensible enthalpy to which the sensor is exposed"; - Modelica.SIunits.SpecificEnthalpy h_out(start=h_out_start) + Modelica.Units.SI.SpecificEnthalpy h_out(start=h_out_start) "Medium sensible enthalpy that is used to compute the enthalpy flow rate"; Medium.MassFraction XiActual[Medium.nXi] "Medium mass fraction to which sensor is exposed to"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/SpecificEnthalpy.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/SpecificEnthalpy.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/SpecificEnthalpy.mo" 2022-03-10 09:57:42.072144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/SpecificEnthalpy.mo" 2022-03-10 09:58:05.576147620 +0000 @@ -1,7 +1,7 @@ within IBPSA.Fluid.Sensors; model SpecificEnthalpy "Ideal one port specific enthalpy sensor" extends IBPSA.Fluid.Sensors.BaseClasses.PartialAbsoluteSensor; - extends Modelica.Icons.RotationalSensor; + extends Modelica.Icons.RoundSensor; Modelica.Blocks.Interfaces.RealOutput h_out(final quantity="SpecificEnergy", final unit="J/kg") "Specific enthalpy in port medium" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/SpecificEnthalpyTwoPort.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/SpecificEnthalpyTwoPort.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/SpecificEnthalpyTwoPort.mo" 2022-03-10 09:57:42.072144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/SpecificEnthalpyTwoPort.mo" 2022-03-10 09:58:05.552147617 +0000 @@ -1,8 +1,8 @@ within IBPSA.Fluid.Sensors; model SpecificEnthalpyTwoPort "Ideal two port sensor for the specific enthalpy" extends IBPSA.Fluid.Sensors.BaseClasses.PartialDynamicFlowSensor; - extends Modelica.Icons.RotationalSensor; - parameter Modelica.SIunits.SpecificEnthalpy h_out_start= + extends Modelica.Icons.RoundSensor; + parameter Modelica.Units.SI.SpecificEnthalpy h_out_start= Medium.specificEnthalpy_pTX(p=Medium.p_default, T=Medium.T_default, X=Medium.X_default) "Initial or guess value of output (= state)" annotation (Dialog(group="Initialization")); @@ -15,7 +15,7 @@ extent={{10,-10},{-10,10}}, rotation=270))); protected - Modelica.SIunits.SpecificEnthalpy hMed_out(start=h_out_start) + Modelica.Units.SI.SpecificEnthalpy hMed_out(start=h_out_start) "Medium enthalpy to which the sensor is exposed"; initial equation if dynamic then diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/SpecificEntropy.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/SpecificEntropy.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/SpecificEntropy.mo" 2022-03-10 09:57:42.072144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/SpecificEntropy.mo" 2022-03-10 09:58:05.536147616 +0000 @@ -1,7 +1,7 @@ within IBPSA.Fluid.Sensors; model SpecificEntropy "Ideal one port specific entropy sensor" extends IBPSA.Fluid.Sensors.BaseClasses.PartialAbsoluteSensor; - extends Modelica.Icons.RotationalSensor; + extends Modelica.Icons.RoundSensor; Modelica.Blocks.Interfaces.RealOutput s(final quantity="SpecificEntropy", final unit="J/(kg.K)") "Specific entropy in port medium" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/SpecificEntropyTwoPort.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/SpecificEntropyTwoPort.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/SpecificEntropyTwoPort.mo" 2022-03-10 09:57:42.072144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/SpecificEntropyTwoPort.mo" 2022-03-10 09:58:05.524147614 +0000 @@ -1,8 +1,8 @@ within IBPSA.Fluid.Sensors; model SpecificEntropyTwoPort "Ideal two port sensor for the specific entropy" extends IBPSA.Fluid.Sensors.BaseClasses.PartialDynamicFlowSensor; - extends Modelica.Icons.RotationalSensor; - parameter Modelica.SIunits.SpecificEntropy s_start= + extends Modelica.Icons.RoundSensor; + parameter Modelica.Units.SI.SpecificEntropy s_start= Medium.specificEntropy_pTX(p=Medium.p_default, T=Medium.T_default, X=Medium.X_default) "Initial or guess value of output (= state)" annotation (Dialog(group="Initialization")); @@ -15,7 +15,7 @@ extent={{10,-10},{-10,10}}, rotation=270))); protected - Modelica.SIunits.SpecificEntropy sMed(start=s_start) + Modelica.Units.SI.SpecificEntropy sMed(start=s_start) "Medium entropy to which the sensor is exposed"; Medium.SpecificEntropy s_a_inflow "Specific entropy of inflowing fluid at port_a"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/TemperatureTwoPort.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/TemperatureTwoPort.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/TemperatureTwoPort.mo" 2022-03-10 09:57:42.072144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/TemperatureTwoPort.mo" 2022-03-10 09:58:05.488147609 +0000 @@ -11,20 +11,20 @@ origin={0,110}, extent={{10,-10},{-10,10}}, rotation=270))); - parameter Modelica.SIunits.Temperature T_start=Medium.T_default + parameter Modelica.Units.SI.Temperature T_start=Medium.T_default "Initial or guess value of output (= state)" annotation (Dialog(group="Initialization")); parameter Boolean transferHeat = false "if true, temperature T converges towards TAmb when no flow" annotation(Evaluate=true, Dialog(group="Heat transfer")); - parameter Modelica.SIunits.Temperature TAmb=Medium.T_default + + parameter Modelica.Units.SI.Temperature TAmb=Medium.T_default "Fixed ambient temperature for heat transfer" annotation(Dialog(enable=transferHeat, group="Heat transfer")); - parameter Modelica.SIunits.Time tauHeaTra(min=1)=1200 + parameter Modelica.Units.SI.Time tauHeaTra(min=1)=1200 "Time constant for heat transfer, default 20 minutes" annotation(Dialog(enable=transferHeat, group="Heat transfer")); - protected parameter Real tauHeaTraInv(final unit = "1/s")= if tauHeaTra<1E-10 then 0 else 1/tauHeaTra diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/TemperatureWetBulbTwoPort.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/TemperatureWetBulbTwoPort.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/TemperatureWetBulbTwoPort.mo" 2022-03-10 09:57:42.072144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/TemperatureWetBulbTwoPort.mo" 2022-03-10 09:58:05.460147606 +0000 @@ -13,7 +13,7 @@ extent={{-10,-10},{10,10}}, rotation=90, origin={0,110}))); - parameter Modelica.SIunits.Temperature TWetBul_start = Medium.T_default + parameter Modelica.Units.SI.Temperature TWetBul_start = Medium.T_default "Initial or guess value of wet bulb temperature (used to compute initial output signal))" annotation (Dialog(group="Initialization")); @@ -23,7 +23,7 @@ IBPSA.Utilities.Psychrometrics.TWetBul_TDryBulXi wetBulMod( redeclare package Medium = Medium, TWetBul(start=TWetBul_start)) "Block for wet bulb temperature"; - Modelica.SIunits.SpecificEnthalpy h "Specific enthalpy"; + Modelica.Units.SI.SpecificEnthalpy h "Specific enthalpy"; Medium.MassFraction Xi[Medium.nXi] "Species vector, needed because indexed argument for the operator inStream is not supported"; initial equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/TraceSubstances.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/TraceSubstances.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/TraceSubstances.mo" 2022-03-10 09:57:42.072144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/TraceSubstances.mo" 2022-03-10 09:58:05.404147599 +0000 @@ -1,7 +1,7 @@ within IBPSA.Fluid.Sensors; model TraceSubstances "Ideal one port trace substances sensor" extends IBPSA.Fluid.Sensors.BaseClasses.PartialAbsoluteSensor; - extends Modelica.Icons.RotationalSensor; + extends Modelica.Icons.RoundSensor; parameter String substanceName = "CO2" "Name of trace substance"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/TraceSubstancesTwoPort.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/TraceSubstancesTwoPort.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/TraceSubstancesTwoPort.mo" 2022-03-10 09:57:42.072144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/TraceSubstancesTwoPort.mo" 2022-03-10 09:58:05.392147598 +0000 @@ -1,7 +1,7 @@ within IBPSA.Fluid.Sensors; model TraceSubstancesTwoPort "Ideal two port sensor for trace substance" extends IBPSA.Fluid.Sensors.BaseClasses.PartialDynamicFlowSensor; - extends Modelica.Icons.RotationalSensor; + extends Modelica.Icons.RoundSensor; Modelica.Blocks.Interfaces.RealOutput C(min=0, start=C_start) "Trace substance of the passing fluid" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/Velocity.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/Velocity.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/Velocity.mo" 2022-03-10 09:57:42.072144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/Velocity.mo" 2022-03-10 09:58:05.368147594 +0000 @@ -1,23 +1,23 @@ within IBPSA.Fluid.Sensors; model Velocity "Ideal sensor for flow velocity" extends IBPSA.Fluid.Sensors.BaseClasses.PartialDynamicFlowSensor; - extends Modelica.Icons.RotationalSensor; + extends Modelica.Icons.RoundSensor; parameter Medium.Density d_start=Medium.density(Medium.setState_pTX(p_start, T_start, X_start)) "Initial or guess value of density" annotation (Dialog(group="Initialization")); - parameter Modelica.SIunits.Temperature T_start=Medium.T_default + parameter Modelica.Units.SI.Temperature T_start=Medium.T_default "Temperature used to compute d_start" annotation (Dialog(group="Initialization")); - parameter Modelica.SIunits.Pressure p_start=Medium.p_default + parameter Modelica.Units.SI.Pressure p_start=Medium.p_default "Pressure used to compute d_start" annotation (Dialog(group="Initialization")); - parameter Modelica.SIunits.MassFraction X_start[Medium.nX]=Medium.X_default + parameter Modelica.Units.SI.MassFraction X_start[Medium.nX]=Medium.X_default "Mass fraction used to compute d_start" annotation (Dialog(group="Initialization")); - parameter Modelica.SIunits.Area A "Cross sectional area of flow channel"; - Modelica.SIunits.VolumeFlowRate V_flow + parameter Modelica.Units.SI.Area A "Cross sectional area of flow channel"; + Modelica.Units.SI.VolumeFlowRate V_flow "Volume flow rate from port_a to port_b"; Modelica.Blocks.Interfaces.RealOutput v(final quantity="Velocity", final unit="m/s") diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/VolumeFlowRate.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/VolumeFlowRate.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/VolumeFlowRate.mo" 2022-03-10 09:57:42.072144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sensors/VolumeFlowRate.mo" 2022-03-10 09:58:05.356147592 +0000 @@ -1,18 +1,18 @@ within IBPSA.Fluid.Sensors; model VolumeFlowRate "Ideal sensor for volume flow rate" extends IBPSA.Fluid.Sensors.BaseClasses.PartialDynamicFlowSensor; - extends Modelica.Icons.RotationalSensor; + extends Modelica.Icons.RoundSensor; parameter Medium.Density d_start=Medium.density(Medium.setState_pTX(p_start, T_start, X_start)) "Initial or guess value of density" annotation (Dialog(group="Initialization")); - parameter Modelica.SIunits.Temperature T_start=Medium.T_default + parameter Modelica.Units.SI.Temperature T_start=Medium.T_default "Temperature used to compute d_start" annotation (Dialog(group="Initialization")); - parameter Modelica.SIunits.Pressure p_start=Medium.p_default + parameter Modelica.Units.SI.Pressure p_start=Medium.p_default "Pressure used to compute d_start" annotation (Dialog(group="Initialization")); - parameter Modelica.SIunits.MassFraction X_start[Medium.nX]=Medium.X_default + parameter Modelica.Units.SI.MassFraction X_start[Medium.nX]=Medium.X_default "Mass fraction used to compute d_start" annotation (Dialog(group="Initialization")); Modelica.Blocks.Interfaces.RealOutput V_flow(final quantity="VolumeFlowRate", diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sources/BaseClasses/PartialSource_m_flow.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sources/BaseClasses/PartialSource_m_flow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sources/BaseClasses/PartialSource_m_flow.mo" 2022-03-10 09:57:42.072144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sources/BaseClasses/PartialSource_m_flow.mo" 2022-03-10 09:58:05.224147575 +0000 @@ -4,7 +4,7 @@ parameter Boolean use_m_flow_in = false "Get the mass flow rate from the input connector" annotation(Evaluate=true, HideResult=true, Dialog(group="Conditional inputs")); - parameter Modelica.SIunits.MassFlowRate m_flow = 0 + parameter Modelica.Units.SI.MassFlowRate m_flow = 0 "Fixed mass flow rate going out of the fluid port" annotation (Dialog(enable = not use_m_flow_in,group="Fixed inputs")); Modelica.Blocks.Interfaces.RealInput m_flow_in(final unit="kg/s") if use_m_flow_in diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sources/MassFlowSource_WeatherData.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sources/MassFlowSource_WeatherData.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sources/MassFlowSource_WeatherData.mo" 2022-03-10 09:57:42.072144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sources/MassFlowSource_WeatherData.mo" 2022-03-10 09:58:04.972147543 +0000 @@ -9,7 +9,7 @@ parameter Boolean use_C_in = false "Get the trace substances from the input connector" annotation(Evaluate=true, HideResult=true); - parameter Modelica.SIunits.MassFlowRate m_flow = 0 + parameter Modelica.Units.SI.MassFlowRate m_flow = 0 "Fixed mass flow rate going out of the fluid port" annotation (Dialog(enable = not use_m_flow_in)); parameter Medium.ExtraProperty C[Medium.nC]( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sources/Outside_CpLowRise.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sources/Outside_CpLowRise.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sources/Outside_CpLowRise.mo" 2022-03-10 09:57:42.072144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sources/Outside_CpLowRise.mo" 2022-03-10 09:58:04.900147535 +0000 @@ -7,12 +7,12 @@ "Wind pressure coefficient for wind normal to wall"; parameter Real s(final min=0, final unit="1") "Side ratio, s=length of this wall/length of adjacent wall"; - parameter Modelica.SIunits.Angle azi "Surface azimuth (South:0, West:pi/2)" + parameter Modelica.Units.SI.Angle azi "Surface azimuth (South:0, West:pi/2)" annotation (choicesAllMatching=true); - Modelica.SIunits.Angle alpha "Wind incidence angle (0: normal to wall)"; + Modelica.Units.SI.Angle alpha "Wind incidence angle (0: normal to wall)"; Real CpAct(min=0, final unit="1") "Actual wind pressure coefficient"; - Modelica.SIunits.Pressure pWin(displayUnit="Pa") + Modelica.Units.SI.Pressure pWin(displayUnit="Pa") "Change in pressure due to wind force"; protected Modelica.Blocks.Interfaces.RealInput pWea(min=0, nominal=1E5, final unit="Pa") @@ -27,7 +27,7 @@ Modelica.Blocks.Interfaces.RealInput winDir(final unit="rad", displayUnit="deg") "Wind direction from weather bus"; - Modelica.SIunits.Angle surOut = azi-Modelica.Constants.pi + Modelica.Units.SI.Angle surOut = azi-Modelica.Constants.pi "Angle of surface that is used to compute angle of attack of wind"; equation alpha = winDir-surOut; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sources/TraceSubstancesFlowSource.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sources/TraceSubstancesFlowSource.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sources/TraceSubstancesFlowSource.mo" 2022-03-10 09:57:42.072144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Sources/TraceSubstancesFlowSource.mo" 2022-03-10 09:58:04.860147530 +0000 @@ -8,7 +8,7 @@ "Get the trace substance mass flow rate from the input connector" annotation(Evaluate=true, HideResult=true); - parameter Modelica.SIunits.MassFlowRate m_flow = 0 + parameter Modelica.Units.SI.MassFlowRate m_flow = 0 "Fixed mass flow rate going out of the fluid port" annotation (Dialog(enable = not use_m_flow_in)); Modelica.Blocks.Interfaces.RealInput m_flow_in(final unit="kg/s") diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Storage/BaseClasses/Buoyancy.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Storage/BaseClasses/Buoyancy.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Storage/BaseClasses/Buoyancy.mo" 2022-03-10 09:57:42.072144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Storage/BaseClasses/Buoyancy.mo" 2022-03-10 09:58:04.828147526 +0000 @@ -5,27 +5,27 @@ replaceable package Medium = Modelica.Media.Interfaces.PartialMedium "Medium model" annotation ( choicesAllMatching = true); - parameter Modelica.SIunits.Volume V "Volume"; + parameter Modelica.Units.SI.Volume V "Volume"; parameter Integer nSeg(min=2) = 2 "Number of volume segments"; - parameter Modelica.SIunits.Time tau(min=0) "Time constant for mixing"; + parameter Modelica.Units.SI.Time tau(min=0) "Time constant for mixing"; Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a[nSeg] heatPort "Heat input into the volumes" annotation (Placement(transformation(extent={{90,-10},{110,10}}))); - Modelica.SIunits.HeatFlowRate[nSeg-1] Q_flow + Modelica.Units.SI.HeatFlowRate[nSeg-1] Q_flow "Heat flow rate from segment i+1 to i"; protected parameter Medium.ThermodynamicState sta_default = Medium.setState_pTX(T=Medium.T_default, p=Medium.p_default, X=Medium.X_default[1:Medium.nXi]) "Medium state at default properties"; - parameter Modelica.SIunits.Density rho_default=Medium.density(sta_default) + parameter Modelica.Units.SI.Density rho_default=Medium.density(sta_default) "Density, used to compute fluid mass"; - parameter Modelica.SIunits.SpecificHeatCapacity cp_default=Medium.specificHeatCapacityCp(sta_default) + parameter Modelica.Units.SI.SpecificHeatCapacity cp_default=Medium.specificHeatCapacityCp(sta_default) "Specific heat capacity"; parameter Real k(unit="W/K") = V*rho_default*cp_default/tau/nSeg "Proportionality constant, since we use dT instead of dH"; - Modelica.SIunits.TemperatureDifference dT[nSeg-1] + Modelica.Units.SI.TemperatureDifference dT[nSeg-1] "Temperature difference between adjoining volumes"; equation for i in 1:nSeg-1 loop diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Storage/BaseClasses/IndirectTankHeatExchanger.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Storage/BaseClasses/IndirectTankHeatExchanger.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Storage/BaseClasses/IndirectTankHeatExchanger.mo" 2022-03-10 09:57:42.072144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Storage/BaseClasses/IndirectTankHeatExchanger.mo" 2022-03-10 09:58:04.760147518 +0000 @@ -15,28 +15,28 @@ final show_T=false); parameter Integer nSeg(min=2) "Number of segments in the heat exchanger"; - parameter Modelica.SIunits.HeatCapacity CHex + parameter Modelica.Units.SI.HeatCapacity CHex "Capacitance of the heat exchanger"; - parameter Modelica.SIunits.Volume volHexFlu + parameter Modelica.Units.SI.Volume volHexFlu "Volume of heat transfer fluid in the heat exchanger"; - parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal + parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal "Heat transfer at nominal conditions" annotation(Dialog(tab="General", group="Nominal condition")); - final parameter Modelica.SIunits.ThermalConductance UA_nominal= + final parameter Modelica.Units.SI.ThermalConductance UA_nominal= abs(Q_flow_nominal/(THex_nominal-TTan_nominal)) "Nominal UA value for the heat exchanger"; - parameter Modelica.SIunits.Temperature TTan_nominal + parameter Modelica.Units.SI.Temperature TTan_nominal "Temperature of fluid inside the tank at UA_nominal" annotation(Dialog(tab="General", group="Nominal condition")); - parameter Modelica.SIunits.Temperature THex_nominal + parameter Modelica.Units.SI.Temperature THex_nominal "Temperature of fluid inside the heat exchanger at UA_nominal" annotation(Dialog(tab="General", group="Nominal condition")); parameter Real r_nominal(min=0, max=1)=0.5 "Ratio between coil inside and outside convective heat transfer" annotation(Dialog(tab="General", group="Nominal condition")); - parameter Modelica.SIunits.Diameter dExtHex + parameter Modelica.Units.SI.Diameter dExtHex "Exterior diameter of the heat exchanger pipe"; parameter Modelica.Fluid.Types.Dynamics energyDynamics=Modelica.Fluid.Types.Dynamics.DynamicFreeInitial diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Storage/BaseClasses/PartialStratified.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Storage/BaseClasses/PartialStratified.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Storage/BaseClasses/PartialStratified.mo" 2022-03-10 09:57:42.072144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Storage/BaseClasses/PartialStratified.mo" 2022-03-10 09:58:04.700147509 +0000 @@ -5,10 +5,10 @@ import Modelica.Fluid.Types; import Modelica.Fluid.Types.Dynamics; - parameter Modelica.SIunits.Volume VTan "Tank volume"; - parameter Modelica.SIunits.Length hTan "Height of tank (without insulation)"; - parameter Modelica.SIunits.Length dIns "Thickness of insulation"; - parameter Modelica.SIunits.ThermalConductivity kIns = 0.04 + parameter Modelica.Units.SI.Volume VTan "Tank volume"; + parameter Modelica.Units.SI.Length hTan "Height of tank (without insulation)"; + parameter Modelica.Units.SI.Length dIns "Thickness of insulation"; + parameter Modelica.Units.SI.ThermalConductivity kIns = 0.04 "Specific heat conductivity of insulation"; parameter Integer nSeg(min=2) = 2 "Number of volume segments"; @@ -37,7 +37,7 @@ annotation (Dialog(tab="Initialization", enable=Medium.nC > 0)); // Dynamics - parameter Modelica.SIunits.Time tau=1 "Time constant for mixing"; + parameter Modelica.Units.SI.Time tau=1 "Time constant for mixing"; //////////////////////////////////////////////////////////////////// // Connectors @@ -81,15 +81,15 @@ T=Medium.T_default, p=Medium.p_default, X=Medium.X_default[1:Medium.nXi]) "Medium state at default properties"; - parameter Modelica.SIunits.Length hSeg = hTan / nSeg + parameter Modelica.Units.SI.Length hSeg = hTan / nSeg "Height of a tank segment"; - parameter Modelica.SIunits.Area ATan = VTan/hTan + parameter Modelica.Units.SI.Area ATan = VTan/hTan "Tank cross-sectional area (without insulation)"; - parameter Modelica.SIunits.Length rTan = sqrt(ATan/Modelica.Constants.pi) + parameter Modelica.Units.SI.Length rTan = sqrt(ATan/Modelica.Constants.pi) "Tank diameter (without insulation)"; - parameter Modelica.SIunits.ThermalConductance conFluSeg = ATan*Medium.thermalConductivity(sta_default)/hSeg + parameter Modelica.Units.SI.ThermalConductance conFluSeg = ATan*Medium.thermalConductivity(sta_default)/hSeg "Thermal conductance between fluid volumes"; - parameter Modelica.SIunits.ThermalConductance conTopSeg = ATan*kIns/dIns + parameter Modelica.Units.SI.ThermalConductance conTopSeg = ATan*kIns/dIns "Thermal conductance from center of top (or bottom) volume through tank insulation at top (or bottom)"; BaseClasses.Buoyancy buo( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Storage/BaseClasses/ThirdOrderStratifier.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Storage/BaseClasses/ThirdOrderStratifier.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Storage/BaseClasses/ThirdOrderStratifier.mo" 2022-03-10 09:57:42.072144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Storage/BaseClasses/ThirdOrderStratifier.mo" 2022-03-10 09:58:04.660147504 +0000 @@ -6,7 +6,7 @@ replaceable package Medium = Modelica.Media.Interfaces.PartialMedium "Medium model" annotation (choicesAllMatching=true); - parameter Modelica.SIunits.MassFlowRate m_flow_small(min=0) + parameter Modelica.Units.SI.MassFlowRate m_flow_small(min=0) "Small mass flow rate for regularization of zero flow"; parameter Integer nSeg(min=4) "Number of volume segments"; @@ -32,11 +32,11 @@ annotation (Placement(transformation(extent={{-110,-10},{-90,10}}))); protected - Modelica.SIunits.SpecificEnthalpy[nSeg + 1] hOut + Modelica.Units.SI.SpecificEnthalpy[nSeg + 1] hOut "Extended vector with new outlet enthalpies to reduce numerical dissipation (at the boundary between two volumes)"; - Modelica.SIunits.SpecificEnthalpy[nSeg + 2] h + Modelica.Units.SI.SpecificEnthalpy[nSeg + 2] h "Extended vector with port enthalpies, needed to simplify loop"; - Modelica.SIunits.HeatFlowRate Q_flow[nSeg] + Modelica.Units.SI.HeatFlowRate Q_flow[nSeg] "Heat exchange computed using upwind third order discretization scheme"; // Modelica.SIunits.HeatFlowRate Q_flow_upWind // "Heat exchange computed using upwind third order discretization scheme"; //Used to test the energy conservation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Storage/Examples/Stratified.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Storage/Examples/Stratified.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Storage/Examples/Stratified.mo" 2022-03-10 09:57:42.072144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Storage/Examples/Stratified.mo" 2022-03-10 09:58:04.624147499 +0000 @@ -67,7 +67,7 @@ "Pressure boundary condition" annotation (Placement(transformation(extent={{20,60},{40,80}}))); Modelica.Blocks.Sources.Sine sine( - freqHz=1/86400, + f =1/86400, amplitude=10, offset=273.15 + 20) annotation (Placement(transformation(extent={{-90,62},{ -70,82}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Storage/Examples/StratifiedEnhancedInternalHex.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Storage/Examples/StratifiedEnhancedInternalHex.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Storage/Examples/StratifiedEnhancedInternalHex.mo" 2022-03-10 09:57:42.072144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Storage/Examples/StratifiedEnhancedInternalHex.mo" 2022-03-10 09:58:04.596147497 +0000 @@ -6,10 +6,10 @@ package MediumTan = IBPSA.Media.Water "Medium in the tank"; package MediumHex = IBPSA.Media.Water "Medium in the heat exchanger"; - parameter Modelica.SIunits.PressureDifference dpHex_nominal=2500 + parameter Modelica.Units.SI.PressureDifference dpHex_nominal=2500 "Pressure drop across the heat exchanger at nominal conditions"; - parameter Modelica.SIunits.MassFlowRate mHex_flow_nominal = 0.278 + parameter Modelica.Units.SI.MassFlowRate mHex_flow_nominal = 0.278 "Mass flow rate of heat exchanger"; IBPSA.Fluid.Sources.Boundary_pT bouWat(redeclare package Medium = diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Storage/Examples/StratifiedUnloadAtMinimumTemperature.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Storage/Examples/StratifiedUnloadAtMinimumTemperature.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Storage/Examples/StratifiedUnloadAtMinimumTemperature.mo" 2022-03-10 09:57:42.072144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Storage/Examples/StratifiedUnloadAtMinimumTemperature.mo" 2022-03-10 09:58:04.568147492 +0000 @@ -4,9 +4,9 @@ extends Modelica.Icons.Example; package Medium = IBPSA.Media.Water "Medium model"; - parameter Modelica.SIunits.Volume VTan=3 "Tank volume"; + parameter Modelica.Units.SI.Volume VTan=3 "Tank volume"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 3*1000/3600 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 3*1000/3600 "Nominal mass flow rate"; constant Integer nSeg=5 "Number of volume segments"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Storage/ExpansionVessel.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Storage/ExpansionVessel.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Storage/ExpansionVessel.mo" 2022-03-10 09:57:42.072144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Storage/ExpansionVessel.mo" 2022-03-10 09:58:04.460147479 +0000 @@ -4,28 +4,28 @@ final energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial, final massDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial, final mSenFac=1); - parameter Modelica.SIunits.Volume V_start(start=1) + parameter Modelica.Units.SI.Volume V_start(start=1) "Volume of liquid stored in the vessel at the start of the simulation"; - parameter Modelica.SIunits.Pressure p = Medium.p_default + parameter Modelica.Units.SI.Pressure p = Medium.p_default "Constant pressure of the expansion vessel"; Modelica.Fluid.Interfaces.FluidPort_a port_a( redeclare package Medium = Medium) "Fluid port" annotation (Placement(transformation(extent={{-10,-110},{10,-90}}))); - Modelica.SIunits.Mass m "Mass of liquid in the vessel"; + Modelica.Units.SI.Mass m "Mass of liquid in the vessel"; protected final parameter Medium.ThermodynamicState state_start = Medium.setState_pTX( T=T_start, p=p_start, X=X_start[1:Medium.nXi]) "Medium state at start values"; - final parameter Modelica.SIunits.Density rho_start=Medium.density( + final parameter Modelica.Units.SI.Density rho_start=Medium.density( state=state_start) "Density, used to compute start and guess values"; - Modelica.SIunits.Energy H "Internal energy of fluid"; - Modelica.SIunits.Mass[Medium.nXi] mXi + Modelica.Units.SI.Energy H "Internal energy of fluid"; + Modelica.Units.SI.Mass[Medium.nXi] mXi "Masses of independent components in the fluid"; - Modelica.SIunits.Mass[Medium.nC] mC "Masses of trace substances in the fluid"; + Modelica.Units.SI.Mass[Medium.nC] mC "Masses of trace substances in the fluid"; Medium.ExtraProperty C[Medium.nC](nominal=C_nominal) "Trace substance mixture content"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Storage/StratifiedEnhancedInternalHex.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Storage/StratifiedEnhancedInternalHex.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Storage/StratifiedEnhancedInternalHex.mo" 2022-03-10 09:57:42.072144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Storage/StratifiedEnhancedInternalHex.mo" 2022-03-10 09:58:04.376147468 +0000 @@ -7,11 +7,11 @@ Modelica.Media.Interfaces.PartialMedium "Medium in the heat exchanger" annotation(Dialog(tab="General", group="Heat exchanger")); - parameter Modelica.SIunits.Height hHex_a + parameter Modelica.Units.SI.Height hHex_a "Height of portHex_a of the heat exchanger, measured from tank bottom" annotation(Dialog(tab="General", group="Heat exchanger")); - parameter Modelica.SIunits.Height hHex_b + parameter Modelica.Units.SI.Height hHex_b "Height of portHex_b of the heat exchanger, measured from tank bottom" annotation(Dialog(tab="General", group="Heat exchanger")); @@ -19,28 +19,28 @@ "Number of heat exchanger segments in each tank segment" annotation(Dialog(tab="General", group="Heat exchanger")); - parameter Modelica.SIunits.Diameter dExtHex = 0.025 + parameter Modelica.Units.SI.Diameter dExtHex = 0.025 "Exterior diameter of the heat exchanger pipe" annotation(Dialog(group="Heat exchanger")); - parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal + parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal "Heat transfer at nominal conditions" annotation(Dialog(tab="General", group="Heat exchanger")); - parameter Modelica.SIunits.Temperature TTan_nominal + parameter Modelica.Units.SI.Temperature TTan_nominal "Temperature of fluid inside the tank at nominal heat transfer conditions" annotation(Dialog(tab="General", group="Heat exchanger")); - parameter Modelica.SIunits.Temperature THex_nominal + parameter Modelica.Units.SI.Temperature THex_nominal "Temperature of fluid inside the heat exchanger at nominal heat transfer conditions" annotation(Dialog(tab="General", group="Heat exchanger")); parameter Real r_nominal(min=0, max=1)=0.5 "Ratio between coil inside and outside convective heat transfer at nominal heat transfer conditions" annotation(Dialog(tab="General", group="Heat exchanger")); - parameter Modelica.SIunits.MassFlowRate mHex_flow_nominal + parameter Modelica.Units.SI.MassFlowRate mHex_flow_nominal "Nominal mass flow rate through the heat exchanger" annotation(Dialog(group="Heat exchanger")); - parameter Modelica.SIunits.PressureDifference dpHex_nominal(displayUnit="Pa") = 2500 + parameter Modelica.Units.SI.PressureDifference dpHex_nominal(displayUnit="Pa") = 2500 "Pressure drop across the heat exchanger at nominal conditions" annotation(Dialog(group="Heat exchanger")); @@ -71,25 +71,25 @@ "Formulation of energy balance for heat exchanger solid mass" annotation(Evaluate=true, Dialog(tab = "Dynamics heat exchanger", group="Equations")); - parameter Modelica.SIunits.Length lHex= + parameter Modelica.Units.SI.Length lHex= rTan*abs(segHex_a-segHex_b)*Modelica.Constants.pi "Approximate length of the heat exchanger" annotation(Dialog(tab = "Dynamics heat exchanger", group="Equations")); - parameter Modelica.SIunits.Area ACroHex= + parameter Modelica.Units.SI.Area ACroHex= (dExtHex^2-(0.8*dExtHex)^2)*Modelica.Constants.pi/4 "Cross sectional area of the heat exchanger" annotation(Dialog(tab = "Dynamics heat exchanger", group="Equations")); - parameter Modelica.SIunits.SpecificHeatCapacity cHex=490 + parameter Modelica.Units.SI.SpecificHeatCapacity cHex=490 "Specific heat capacity of the heat exchanger material" annotation(Dialog(tab = "Dynamics heat exchanger", group="Equations")); - parameter Modelica.SIunits.Density dHex=8000 + parameter Modelica.Units.SI.Density dHex=8000 "Density of the heat exchanger material" annotation(Dialog(tab = "Dynamics heat exchanger", group="Equations")); - parameter Modelica.SIunits.HeatCapacity CHex= + parameter Modelica.Units.SI.HeatCapacity CHex= ACroHex*lHex*dHex*cHex "Capacitance of the heat exchanger without the fluid" annotation(Dialog(tab = "Dynamics heat exchanger", group="Equations")); @@ -138,7 +138,7 @@ rotation=180, origin={-87,32}))); - Modelica.SIunits.HeatFlowRate QHex_flow = -sum(indTanHex.port.Q_flow) + Modelica.Units.SI.HeatFlowRate QHex_flow = -sum(indTanHex.port.Q_flow) "Heat transferred from the heat exchanger to the tank"; protected final parameter Integer segHex_a = nSeg-integer(hHex_a/segHeight) @@ -149,13 +149,13 @@ "Tank segment in which port b1 of the heat exchanger is located in" annotation(Evaluate=true, Dialog(group="Heat exchanger")); - final parameter Modelica.SIunits.Height segHeight = hTan/nSeg + final parameter Modelica.Units.SI.Height segHeight = hTan/nSeg "Height of each tank segment (relative to bottom of same segment)"; - final parameter Modelica.SIunits.Length dHHex = abs(hHex_a-hHex_b) + final parameter Modelica.Units.SI.Length dHHex = abs(hHex_a-hHex_b) "Vertical distance between the heat exchanger inlet and outlet"; - final parameter Modelica.SIunits.Volume volHexFlu= + final parameter Modelica.Units.SI.Volume volHexFlu= Modelica.Constants.pi * (0.8*dExtHex)^2/4 *lHex "Volume of the heat exchanger"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Storage/Validation/HeatExchangerDynamics.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Storage/Validation/HeatExchangerDynamics.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Storage/Validation/HeatExchangerDynamics.mo" 2022-03-10 09:57:42.072144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Storage/Validation/HeatExchangerDynamics.mo" 2022-03-10 09:58:04.320147461 +0000 @@ -7,9 +7,9 @@ constant Integer nSeg = 7 "Number of segments in tank"; - parameter Modelica.SIunits.HeatFlowRate QHex_flow_nominal = 2000 + parameter Modelica.Units.SI.HeatFlowRate QHex_flow_nominal = 2000 "Design heat flow rate of heat exchanger"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal= QHex_flow_nominal/4200/4; + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal= QHex_flow_nominal/4200/4; IBPSA.Fluid.Sources.Boundary_pT watInTan( redeclare package Medium = Medium, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Storage/Validation/HeatExchangerLocation.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Storage/Validation/HeatExchangerLocation.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Storage/Validation/HeatExchangerLocation.mo" 2022-03-10 09:57:42.072144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Storage/Validation/HeatExchangerLocation.mo" 2022-03-10 09:58:04.296147458 +0000 @@ -5,9 +5,9 @@ package Medium = IBPSA.Media.Water "Medium model"; - parameter Modelica.SIunits.HeatFlowRate QHex_flow_nominal = 6000 + parameter Modelica.Units.SI.HeatFlowRate QHex_flow_nominal = 6000 "Design heat flow rate of heat exchanger"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal= QHex_flow_nominal/4200/4; + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal= QHex_flow_nominal/4200/4; IBPSA.Fluid.Sources.Boundary_pT watInTan( redeclare package Medium = Medium, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Storage/Validation/StratifiedLoadingUnloading.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Storage/Validation/StratifiedLoadingUnloading.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Storage/Validation/StratifiedLoadingUnloading.mo" 2022-03-10 09:57:42.072144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Fluid/Storage/Validation/StratifiedLoadingUnloading.mo" 2022-03-10 09:58:04.272147456 +0000 @@ -5,7 +5,7 @@ package Medium = IBPSA.Media.Water "Medium model"; constant Integer nSeg = 7 "Number of segments in tank"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal= 1*1000/3600/4; + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal= 1*1000/3600/4; IBPSA.Fluid.Sources.Boundary_pT sou_1( p=300000 + 5000, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Media/Air.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Media/Air.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Media/Air.mo" 2022-03-10 09:57:42.072144642 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Media/Air.mo" 2022-03-10 09:58:04.176147443 +0000 @@ -51,12 +51,12 @@ final standardOrderComponents=true) "Base properties" protected - constant Modelica.SIunits.MolarMass[2] MMX = {steam.MM,dryair.MM} + constant Modelica.Units.SI.MolarMass[2] MMX = {steam.MM,dryair.MM} "Molar masses of components"; MassFraction X_steam "Mass fraction of steam water"; MassFraction X_air "Mass fraction of air"; - Modelica.SIunits.TemperatureDifference dT(start=T_default-reference_T) + Modelica.Units.SI.TemperatureDifference dT(start=T_default-reference_T) "Temperature difference used to compute enthalpy"; equation assert(T >= 200.0 and T <= 423.15, " @@ -73,7 +73,7 @@ dT = T - reference_T; h = dT*dryair.cp * X_air + (dT * steam.cp + h_fg) * X_steam; - R = dryair.R*X_air + steam.R*X_steam; + R_s = dryair.R*X_air + steam.R*X_steam; // Equation for ideal gas, from h=u+p*v and R*T=p*v, from which follows that u = h-R*T. // u = h-R*T; @@ -199,13 +199,14 @@ "Return ideal gas constant as a function from thermodynamic state, only valid for phi<1" algorithm - R := dryair.R*(1 - state.X[Water]) + steam.R*state.X[Water]; + R_s := dryair.R*(1 - state.X[Water]) + steam.R*state.X[Water]; annotation ( smoothOrder=2, Inline=true, Documentation(info=" The ideal gas constant for moist air is computed from thermodynamic state assuming that all water is in the gas phase. ")); + end gasConstant; redeclare function extends pressure @@ -301,7 +302,8 @@ "Return the specific entropy, only valid for phi<1" protected - Modelica.SIunits.MoleFraction[2] Y "Molar fraction"; + Modelica.Units.SI.MoleFraction[2] Y "Molar fraction"; + algorithm Y := massToMoleFractions( state.X, {steam.MM,dryair.MM}); @@ -374,6 +376,7 @@
@@ -133,8 +133,8 @@ function enthalpyOfLiquid "Return the specific enthalpy of liquid" extends Modelica.Icons.Function; - input Modelica.SIunits.Temperature T "Temperature"; - output Modelica.SIunits.SpecificEnthalpy h "Specific enthalpy"; + input Modelica.Units.SI.Temperature T "Temperature"; + output Modelica.Units.SI.SpecificEnthalpy h "Specific enthalpy"; algorithm h := (T - reference_T)*cp_const; annotation ( @@ -154,6 +154,7 @@ ")); + end enthalpyOfLiquid; redeclare function extends specificInternalEnergy @@ -671,12 +672,12 @@ // medium model with another medium model that does not provide an // implementation of these classes. protected - final constant Modelica.SIunits.SpecificHeatCapacity cv_const = cp_const + final constant Modelica.Units.SI.SpecificHeatCapacity cv_const = cp_const "Specific heat capacity at constant volume"; - constant Modelica.SIunits.VelocityOfSound a_const=1484 + constant Modelica.Units.SI.VelocityOfSound a_const=1484 "Constant velocity of sound"; - constant Modelica.SIunits.MolarMass MM_const=0.018015268 "Molar mass"; + constant Modelica.Units.SI.MolarMass MM_const=0.018015268 "Molar mass"; replaceable function der_specificHeatCapacityCp "Return the derivative of the specific heat capacity at constant pressure" @@ -734,8 +735,8 @@ function kinematicViscosity "Return the kinematic viscosity" extends Modelica.Icons.Function; - input Modelica.SIunits.Temperature T "Temperature"; - output Modelica.SIunits.KinematicViscosity kinVis "Kinematic viscosity"; + input Modelica.Units.SI.Temperature T "Temperature"; + output Modelica.Units.SI.KinematicViscosity kinVis "Kinematic viscosity"; algorithm kinVis := smooth(1, if T < 278.15 then @@ -785,6 +786,7 @@ ")); + end kinematicViscosity; annotation(preferredView="info", Documentation(info=" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Media/Water.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Media/Water.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Media/Water.mo" 2022-03-10 09:57:42.076144643 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Media/Water.mo" 2022-03-10 09:58:03.068147303 +0000 @@ -12,6 +12,7 @@ // cp_const and cv_const have been made final because the model sets u=h. extends Modelica.Icons.Package; + redeclare model BaseProperties "Base properties" Temperature T(stateSelect= if preferredMediumStates then StateSelect.prefer else StateSelect.default) @@ -20,14 +21,14 @@ InputMassFraction[nXi] Xi=fill(0, 0) "Structurally independent mass fractions"; InputSpecificEnthalpy h "Specific enthalpy of medium"; - Modelica.SIunits.SpecificInternalEnergy u + Modelica.Units.SI.SpecificInternalEnergy u "Specific internal energy of medium"; - Modelica.SIunits.Density d=d_const "Density of medium"; - Modelica.SIunits.MassFraction[nX] X={1} + Modelica.Units.SI.Density d=d_const "Density of medium"; + Modelica.Units.SI.MassFraction[nX] X={1} "Mass fractions (= (component mass)/total mass m_i/m)"; - final Modelica.SIunits.SpecificHeatCapacity R=0 + final Modelica.Units.SI.SpecificHeatCapacity R=0 "Gas constant (of mixture if applicable)"; - final Modelica.SIunits.MolarMass MM=MM_const + final Modelica.Units.SI.MolarMass MM=MM_const "Molar mass (of mixture or single fluid)"; ThermodynamicState state "Thermodynamic state record for optional functions"; @@ -36,21 +37,21 @@ annotation(Evaluate=true, Dialog(tab="Advanced")); final parameter Boolean standardOrderComponents=true "If true, and reducedX = true, the last element of X will be computed from the other ones"; - Modelica.SIunits.Conversions.NonSIunits.Temperature_degC T_degC= - Modelica.SIunits.Conversions.to_degC(T) + + Modelica.Units.NonSI.Temperature_degC T_degC= + Modelica.Units.Conversions.to_degC(T) "Temperature of medium in [degC]"; - Modelica.SIunits.Conversions.NonSIunits.Pressure_bar p_bar= - Modelica.SIunits.Conversions.to_bar(p) + Modelica.Units.NonSI.Pressure_bar p_bar= + Modelica.Units.Conversions.to_bar(p) "Absolute pressure of medium in [bar]"; // Local connector definition, used for equation balancing check - connector InputAbsolutePressure = input Modelica.SIunits.AbsolutePressure + connector InputAbsolutePressure = input Modelica.Units.SI.AbsolutePressure "Pressure as input signal connector"; - connector InputSpecificEnthalpy = input Modelica.SIunits.SpecificEnthalpy + connector InputSpecificEnthalpy = input Modelica.Units.SI.SpecificEnthalpy "Specific enthalpy as input signal connector"; - connector InputMassFraction = input Modelica.SIunits.MassFraction + connector InputMassFraction = input Modelica.Units.SI.MassFraction "Mass fraction as input signal connector"; - equation assert(T >= T_min and T <= T_max, " Temperature T (= " + String(T) + " K) is not @@ -77,8 +78,8 @@ function enthalpyOfLiquid "Return the specific enthalpy of liquid" extends Modelica.Icons.Function; - input Modelica.SIunits.Temperature T "Temperature"; - output Modelica.SIunits.SpecificEnthalpy h "Specific enthalpy"; + input Modelica.Units.SI.Temperature T "Temperature"; + output Modelica.Units.SI.SpecificEnthalpy h "Specific enthalpy"; algorithm h := cp_const*(T-reference_T); annotation ( @@ -99,8 +100,8 @@ ")); -end enthalpyOfLiquid; +end enthalpyOfLiquid; annotation(preferredView="info", Documentation(info="
This medium package models liquid water. diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/ThermalZones/ReducedOrder/EquivalentAirTemperature/BaseClasses/PartialVDI6007.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/ThermalZones/ReducedOrder/EquivalentAirTemperature/BaseClasses/PartialVDI6007.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/ThermalZones/ReducedOrder/EquivalentAirTemperature/BaseClasses/PartialVDI6007.mo" 2022-03-10 09:57:42.184144656 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/ThermalZones/ReducedOrder/EquivalentAirTemperature/BaseClasses/PartialVDI6007.mo" 2022-03-10 09:58:03.012147295 +0000 @@ -2,30 +2,30 @@ partial model PartialVDI6007 "Partial model for equivalent air temperature as defined in VDI 6007 Part 1" - parameter Modelica.SIunits.Emissivity aExt + parameter Modelica.Units.SI.Emissivity aExt "Coefficient of absorption of exterior walls (outdoor)"; parameter Integer n "Number of orientations (without ground)"; parameter Real wfWall[n](each final unit="1") "Weight factors of the walls"; parameter Real wfWin[n](each final unit="1") "Weight factors of the windows"; parameter Real wfGro(unit="1") "Weight factor of the ground (0 if not considered)"; - parameter Modelica.SIunits.Temperature TGro + parameter Modelica.Units.SI.Temperature TGro "Temperature of the ground in contact with floor plate"; - parameter Modelica.SIunits.CoefficientOfHeatTransfer alphaWallOut + parameter Modelica.Units.SI.CoefficientOfHeatTransfer alphaWallOut "Exterior walls convective coefficient of heat transfer (outdoor)"; - parameter Modelica.SIunits.CoefficientOfHeatTransfer alphaRad + parameter Modelica.Units.SI.CoefficientOfHeatTransfer alphaRad "Coefficient of heat transfer for linearized radiation"; parameter Boolean withLongwave=true "Set to true to include longwave radiation exchange" annotation(choices(checkBox = true)); - Modelica.SIunits.Temperature TEqWall[n] "Equivalent wall temperature"; - Modelica.SIunits.Temperature TEqWin[n] "Equivalent window temperature"; - Modelica.SIunits.TemperatureDifference delTEqLW + Modelica.Units.SI.Temperature TEqWall[n] "Equivalent wall temperature"; + Modelica.Units.SI.Temperature TEqWin[n] "Equivalent window temperature"; + Modelica.Units.SI.TemperatureDifference delTEqLW "Equivalent long wave temperature"; - Modelica.SIunits.TemperatureDifference delTEqLWWin + Modelica.Units.SI.TemperatureDifference delTEqLWWin "Equivalent long wave temperature for windows"; - Modelica.SIunits.TemperatureDifference delTEqSW[n] + Modelica.Units.SI.TemperatureDifference delTEqSW[n] "Equivalent short wave temperature"; Modelica.Blocks.Interfaces.RealInput HSol[n]( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/ThermalZones/ReducedOrder/EquivalentAirTemperature/VDI6007WithWindow.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/ThermalZones/ReducedOrder/EquivalentAirTemperature/VDI6007WithWindow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/ThermalZones/ReducedOrder/EquivalentAirTemperature/VDI6007WithWindow.mo" 2022-03-10 09:57:42.184144656 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/ThermalZones/ReducedOrder/EquivalentAirTemperature/VDI6007WithWindow.mo" 2022-03-10 09:58:02.924147284 +0000 @@ -3,7 +3,7 @@ "Equivalent air temperature as defined in VDI 6007 Part 1 with modifications" extends BaseClasses.PartialVDI6007; - parameter Modelica.SIunits.CoefficientOfHeatTransfer alphaWinOut + parameter Modelica.Units.SI.CoefficientOfHeatTransfer alphaWinOut "Windows' convective coefficient of heat transfer (outdoor)"; Modelica.Blocks.Interfaces.RealOutput TEqAirWin(final unit="K") diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/ThermalZones/ReducedOrder/RC/BaseClasses/ExteriorWall.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/ThermalZones/ReducedOrder/RC/BaseClasses/ExteriorWall.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/ThermalZones/ReducedOrder/RC/BaseClasses/ExteriorWall.mo" 2022-03-10 09:57:42.184144656 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/ThermalZones/ReducedOrder/RC/BaseClasses/ExteriorWall.mo" 2022-03-10 09:58:02.712147258 +0000 @@ -2,19 +2,19 @@ model ExteriorWall "Exterior wall consisting of variable number of RC elements" parameter Integer n(min = 1) "Number of RC-elements"; - parameter Modelica.SIunits.ThermalResistance RExt[n]( + parameter Modelica.Units.SI.ThermalResistance RExt[n]( each min=Modelica.Constants.small) "Vector of resistors, from port_a to port_b" annotation(Dialog(group="Thermal mass")); - parameter Modelica.SIunits.ThermalResistance RExtRem( + parameter Modelica.Units.SI.ThermalResistance RExtRem( min=Modelica.Constants.small) "Resistance of remaining resistor RExtRem between capacitor n and port_b" annotation(Dialog(group="Thermal mass")); - parameter Modelica.SIunits.HeatCapacity CExt[n]( + parameter Modelica.Units.SI.HeatCapacity CExt[n]( each min=Modelica.Constants.small) "Vector of heat capacities, from port_a to port_b" annotation(Dialog(group="Thermal mass")); - parameter Modelica.SIunits.Temperature T_start + parameter Modelica.Units.SI.Temperature T_start "Initial temperature of capacities" annotation(Dialog(group="Thermal mass")); Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a port_a "interior port" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/ThermalZones/ReducedOrder/RC/BaseClasses/InteriorWall.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/ThermalZones/ReducedOrder/RC/BaseClasses/InteriorWall.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/ThermalZones/ReducedOrder/RC/BaseClasses/InteriorWall.mo" 2022-03-10 09:57:42.184144656 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/ThermalZones/ReducedOrder/RC/BaseClasses/InteriorWall.mo" 2022-03-10 09:58:02.680147253 +0000 @@ -2,15 +2,15 @@ model InteriorWall "Interior wall consisting of variable number of RC elements" parameter Integer n(min = 1) "Number of RC-elements"; - parameter Modelica.SIunits.ThermalResistance RInt[n]( + parameter Modelica.Units.SI.ThermalResistance RInt[n]( each min=Modelica.Constants.small) "Vector of resistors, from port to capacitor" annotation(Dialog(group="Thermal mass")); - parameter Modelica.SIunits.HeatCapacity CInt[n]( + parameter Modelica.Units.SI.HeatCapacity CInt[n]( each min=Modelica.Constants.small) "Vector of heat capacitors, from port to center" annotation(Dialog(group="Thermal mass")); - parameter Modelica.SIunits.Temperature T_start + parameter Modelica.Units.SI.Temperature T_start "Initial temperature of capacities" annotation(Dialog(group="Thermal mass")); Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a port_a "interior port" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/ThermalZones/ReducedOrder/RC/BaseClasses/splitFacVal.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/ThermalZones/ReducedOrder/RC/BaseClasses/splitFacVal.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/ThermalZones/ReducedOrder/RC/BaseClasses/splitFacVal.mo" 2022-03-10 09:57:42.184144656 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/ThermalZones/ReducedOrder/RC/BaseClasses/splitFacVal.mo" 2022-03-10 09:58:02.640147248 +0000 @@ -4,12 +4,12 @@ input Integer nRow "Number of rows"; input Integer nCol "Number of columns"; - input Modelica.SIunits.Area[:] AArray "Vector of areas"; - input Modelica.SIunits.Area[nCol] AExt "Vector of exterior wall areas"; - input Modelica.SIunits.Area[nCol] AWin "Vector of window areas"; + input Modelica.Units.SI.Area[:] AArray "Vector of areas"; + input Modelica.Units.SI.Area[nCol] AExt "Vector of exterior wall areas"; + input Modelica.Units.SI.Area[nCol] AWin "Vector of window areas"; output Real[nRow,nCol] splitFacValues "Split factor values for ThermSplitter"; protected - Modelica.SIunits.Area ATot=sum(AArray) "Total area"; + Modelica.Units.SI.Area ATot=sum(AArray) "Total area"; Integer j=1 "Row counter"; Integer k=1 "Column counter"; Integer l=1 "AArray counter"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/ThermalZones/ReducedOrder/RC/FourElements.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/ThermalZones/ReducedOrder/RC/FourElements.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/ThermalZones/ReducedOrder/RC/FourElements.mo" 2022-03-10 09:57:42.184144656 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/ThermalZones/ReducedOrder/RC/FourElements.mo" 2022-03-10 09:58:02.628147246 +0000 @@ -3,22 +3,22 @@ interior walls, floor plate and roof" extends ThreeElements(AArray={ATotExt,ATotWin,AInt,AFloor,ARoof}); - parameter Modelica.SIunits.Area ARoof "Area of roof" + parameter Modelica.Units.SI.Area ARoof "Area of roof" annotation(Dialog(group="Roof")); - parameter Modelica.SIunits.CoefficientOfHeatTransfer alphaRoof + parameter Modelica.Units.SI.CoefficientOfHeatTransfer alphaRoof "Convective coefficient of heat transfer of roof (indoor)" annotation(Dialog(group="Roof")); parameter Integer nRoof(min = 1) "Number of RC-elements of roof" annotation(Dialog(group="Roof")); - parameter Modelica.SIunits.ThermalResistance RRoof[nExt]( + parameter Modelica.Units.SI.ThermalResistance RRoof[nExt]( each min=Modelica.Constants.small) "Vector of resistances of roof, from inside to outside" annotation(Dialog(group="Roof")); - parameter Modelica.SIunits.ThermalResistance RRoofRem( + parameter Modelica.Units.SI.ThermalResistance RRoofRem( min=Modelica.Constants.small) "Resistance of remaining resistor RRoofRem between capacity n and outside" annotation(Dialog(group="Roof")); - parameter Modelica.SIunits.HeatCapacity CRoof[nExt]( + parameter Modelica.Units.SI.HeatCapacity CRoof[nExt]( each min=Modelica.Constants.small) "Vector of heat capacities of roof, from inside to outside" annotation(Dialog(group="Roof")); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/ThermalZones/ReducedOrder/RC/OneElement.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/ThermalZones/ReducedOrder/RC/OneElement.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/ThermalZones/ReducedOrder/RC/OneElement.mo" 2022-03-10 09:57:42.184144656 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/ThermalZones/ReducedOrder/RC/OneElement.mo" 2022-03-10 09:58:02.592147243 +0000 @@ -2,9 +2,9 @@ model OneElement "Thermal Zone with one element for exterior walls" extends IBPSA.Fluid.Interfaces.LumpedVolumeDeclarations; - parameter Modelica.SIunits.Volume VAir "Air volume of the zone" + parameter Modelica.Units.SI.Volume VAir "Air volume of the zone" annotation(Dialog(group="Thermal zone")); - parameter Modelica.SIunits.CoefficientOfHeatTransfer alphaRad + parameter Modelica.Units.SI.CoefficientOfHeatTransfer alphaRad "Coefficient of heat transfer for linearized radiation exchange between walls" annotation(Dialog(group="Thermal zone")); parameter Integer nOrientations(min=1) "Number of orientations" @@ -12,18 +12,18 @@ parameter Integer nPorts=0 "Number of fluid ports" annotation(Evaluate=true, Dialog(connectorSizing=true, tab="General",group="Ports")); - parameter Modelica.SIunits.Area AWin[nOrientations] + parameter Modelica.Units.SI.Area AWin[nOrientations] "Vector of areas of windows by orientations" annotation(Dialog(group="Windows")); - parameter Modelica.SIunits.Area ATransparent[nOrientations] "Vector of areas of transparent (solar radiation transmittend) elements by + parameter Modelica.Units.SI.Area ATransparent[nOrientations] "Vector of areas of transparent (solar radiation transmittend) elements by orientations" annotation(Dialog(group="Windows")); - parameter Modelica.SIunits.CoefficientOfHeatTransfer alphaWin + parameter Modelica.Units.SI.CoefficientOfHeatTransfer alphaWin "Convective coefficient of heat transfer of windows (indoor)" annotation(Dialog(group="Windows")); - parameter Modelica.SIunits.ThermalResistance RWin "Resistor for windows" + parameter Modelica.Units.SI.ThermalResistance RWin "Resistor for windows" annotation(Dialog(group="Windows")); - parameter Modelica.SIunits.TransmissionCoefficient gWin + parameter Modelica.Units.SI.TransmissionCoefficient gWin "Total energy transmittance of windows" annotation(Dialog(group="Windows")); parameter Real ratioWinConRad @@ -32,23 +32,23 @@ parameter Boolean indoorPortWin = false "Additional heat port at indoor surface of windows" annotation(Dialog(group="Windows"),choices(checkBox = true)); - parameter Modelica.SIunits.Area AExt[nOrientations] + parameter Modelica.Units.SI.Area AExt[nOrientations] "Vector of areas of exterior walls by orientations" annotation(Dialog(group="Exterior walls")); - parameter Modelica.SIunits.CoefficientOfHeatTransfer alphaExt + parameter Modelica.Units.SI.CoefficientOfHeatTransfer alphaExt "Convective coefficient of heat transfer of exterior walls (indoor)" annotation(Dialog(group="Exterior walls")); parameter Integer nExt(min = 1) "Number of RC-elements of exterior walls" annotation(Dialog(group="Exterior walls")); - parameter Modelica.SIunits.ThermalResistance RExt[nExt]( + parameter Modelica.Units.SI.ThermalResistance RExt[nExt]( each min=Modelica.Constants.small) "Vector of resistances of exterior walls, from inside to outside" annotation(Dialog(group="Exterior walls")); - parameter Modelica.SIunits.ThermalResistance RExtRem( + parameter Modelica.Units.SI.ThermalResistance RExtRem( min=Modelica.Constants.small) "Resistance of remaining resistor RExtRem between capacity n and outside" annotation(Dialog(group="Exterior walls")); - parameter Modelica.SIunits.HeatCapacity CExt[nExt]( + parameter Modelica.Units.SI.HeatCapacity CExt[nExt]( each min=Modelica.Constants.small) "Vector of heat capacities of exterior walls, from inside to outside" annotation(Dialog(group="Exterior walls")); @@ -166,12 +166,12 @@ annotation (Placement(transformation(extent={{-158,-50},{-178,-28}}))); protected - parameter Modelica.SIunits.Area ATot=sum(AArray) "Sum of wall surface areas"; - parameter Modelica.SIunits.Area ATotExt=sum(AExt) + parameter Modelica.Units.SI.Area ATot=sum(AArray) "Sum of wall surface areas"; + parameter Modelica.Units.SI.Area ATotExt=sum(AExt) "Sum of exterior wall surface areas"; - parameter Modelica.SIunits.Area ATotWin=sum(AWin) + parameter Modelica.Units.SI.Area ATotWin=sum(AWin) "Sum of window surface areas"; - parameter Modelica.SIunits.Area[:] AArray = {ATotExt, ATotWin} + parameter Modelica.Units.SI.Area[:] AArray = {ATotExt, ATotWin} "List of all wall surface areas"; parameter Integer dimension = sum({if A>0 then 1 else 0 for A in AArray}) "Number of non-zero wall surface areas"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/ThermalZones/ReducedOrder/RC/ThreeElements.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/ThermalZones/ReducedOrder/RC/ThreeElements.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/ThermalZones/ReducedOrder/RC/ThreeElements.mo" 2022-03-10 09:57:42.184144656 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/ThermalZones/ReducedOrder/RC/ThreeElements.mo" 2022-03-10 09:58:02.408147218 +0000 @@ -3,22 +3,22 @@ interior walls and floor plate" extends TwoElements(AArray={ATotExt,ATotWin,AInt,AFloor}); - parameter Modelica.SIunits.Area AFloor "Area of floor plate" + parameter Modelica.Units.SI.Area AFloor "Area of floor plate" annotation(Dialog(group="Floor plate")); - parameter Modelica.SIunits.CoefficientOfHeatTransfer alphaFloor + parameter Modelica.Units.SI.CoefficientOfHeatTransfer alphaFloor "Convective coefficient of heat transfer of floor plate (indoor)" annotation(Dialog(group="Floor plate")); parameter Integer nFloor(min = 1) "Number of RC-elements of floor plate" annotation(Dialog(group="Floor plate")); - parameter Modelica.SIunits.ThermalResistance RFloor[nExt]( + parameter Modelica.Units.SI.ThermalResistance RFloor[nExt]( each min=Modelica.Constants.small) "Vector of resistances of floor plate, from inside to outside" annotation(Dialog(group="Floor plate")); - parameter Modelica.SIunits.ThermalResistance RFloorRem( + parameter Modelica.Units.SI.ThermalResistance RFloorRem( min=Modelica.Constants.small) "Resistance of remaining resistor RFloorRem between capacity n and outside" annotation(Dialog(group="Floor plate")); - parameter Modelica.SIunits.HeatCapacity CFloor[nExt]( + parameter Modelica.Units.SI.HeatCapacity CFloor[nExt]( each min=Modelica.Constants.small) "Vector of heat capacities of floor plate, from inside to outside" annotation(Dialog(group="Floor plate")); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/ThermalZones/ReducedOrder/RC/TwoElements.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/ThermalZones/ReducedOrder/RC/TwoElements.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/ThermalZones/ReducedOrder/RC/TwoElements.mo" 2022-03-10 09:57:42.184144656 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/ThermalZones/ReducedOrder/RC/TwoElements.mo" 2022-03-10 09:58:02.276147203 +0000 @@ -3,18 +3,18 @@ "Thermal Zone with two elements for exterior and interior walls" extends OneElement(AArray={ATotExt,ATotWin,AInt}); - parameter Modelica.SIunits.Area AInt "Area of interior walls" + parameter Modelica.Units.SI.Area AInt "Area of interior walls" annotation(Dialog(group="Interior walls")); - parameter Modelica.SIunits.CoefficientOfHeatTransfer alphaInt + parameter Modelica.Units.SI.CoefficientOfHeatTransfer alphaInt "Convective coefficient of heat transfer of interior walls (indoor)" annotation(Dialog(group="Interior walls")); parameter Integer nInt(min = 1) "Number of RC-elements of interior walls" annotation(Dialog(group="Interior walls")); - parameter Modelica.SIunits.ThermalResistance RInt[nInt]( + parameter Modelica.Units.SI.ThermalResistance RInt[nInt]( each min=Modelica.Constants.small) "Vector of resistances of interior walls, from port to center" annotation(Dialog(group="Interior walls")); - parameter Modelica.SIunits.HeatCapacity CInt[nInt]( + parameter Modelica.Units.SI.HeatCapacity CInt[nInt]( each min=Modelica.Constants.small) "Vector of heat capacities of interior walls, from port to center" annotation(Dialog(group="Interior walls")); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/ThermalZones/ReducedOrder/SolarGain/BaseClasses/PartialCorrectionG.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/ThermalZones/ReducedOrder/SolarGain/BaseClasses/PartialCorrectionG.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/ThermalZones/ReducedOrder/SolarGain/BaseClasses/PartialCorrectionG.mo" 2022-03-10 09:57:42.184144656 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/ThermalZones/ReducedOrder/SolarGain/BaseClasses/PartialCorrectionG.mo" 2022-03-10 09:58:02.208147194 +0000 @@ -3,7 +3,7 @@ "Partial model for correction of the solar gain factor" parameter Integer n(min = 1) "Vector size for input and output"; - parameter Modelica.SIunits.CoefficientOfHeatTransfer UWin + parameter Modelica.Units.SI.CoefficientOfHeatTransfer UWin "Thermal transmission coefficient of whole window"; Modelica.Blocks.Interfaces.RealInput HSkyDifTil[n]( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/ThermalZones/ReducedOrder/SolarGain/CorrectionGDoublePane.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/ThermalZones/ReducedOrder/SolarGain/CorrectionGDoublePane.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/ThermalZones/ReducedOrder/SolarGain/CorrectionGDoublePane.mo" 2022-03-10 09:57:42.184144656 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/ThermalZones/ReducedOrder/SolarGain/CorrectionGDoublePane.mo" 2022-03-10 09:58:02.196147193 +0000 @@ -2,7 +2,7 @@ model CorrectionGDoublePane "Double pane window solar correction" extends BaseClasses.PartialCorrectionG; - import con = Modelica.SIunits.Conversions; + import con = Modelica.Units.Conversions; // Parameters for the transmission correction factor based on VDI 6007 Part 3 // A0 to A6 are experimental constants VDI 6007 Part 3 page 20 @@ -20,65 +20,65 @@ "Constant 5 to calculate reference transmission"; parameter Real A6=4.74*10^(-12) "Constant 6 to calculate reference transmission"; - parameter Modelica.SIunits.TransmissionCoefficient g_dir0=0.7537 + parameter Modelica.Units.SI.TransmissionCoefficient g_dir0=0.7537 "Reference vertical parallel transmission coefficient for direct radiation for double pane window"; - parameter Modelica.SIunits.TransmissionCoefficient Ta_diff = 0.84 + parameter Modelica.Units.SI.TransmissionCoefficient Ta_diff = 0.84 "Energetic degree of transmission for diffuse radiation for uniformly overcast sky"; - parameter Modelica.SIunits.TransmissionCoefficient Tai_diff=0.903 + parameter Modelica.Units.SI.TransmissionCoefficient Tai_diff=0.903 "Pure degree of transmission for diffuse radiation"; - parameter Modelica.SIunits.TransmissionCoefficient Ta1_diff= Ta_diff*Tai_diff + parameter Modelica.Units.SI.TransmissionCoefficient Ta1_diff= Ta_diff*Tai_diff "Degreee of transmission for single pane window"; - parameter Modelica.SIunits.ReflectionCoefficient rho_T1_diff=1-(Ta_diff) + parameter Modelica.Units.SI.ReflectionCoefficient rho_T1_diff=1-(Ta_diff) "Part of degree of transmission for single pane window related to Ta1_diff"; - parameter Modelica.SIunits.ReflectionCoefficient rho_11_diff=rho_T1_diff/ + parameter Modelica.Units.SI.ReflectionCoefficient rho_11_diff=rho_T1_diff/ (2-(rho_T1_diff)) "Part of degree of transmission for single pane window related to rho_T1_diff"; - parameter Modelica.SIunits.ReflectionCoefficient rho_1_diff= rho_11_diff+ + parameter Modelica.Units.SI.ReflectionCoefficient rho_1_diff= rho_11_diff+ (((1-rho_11_diff)*Tai_diff)^2*rho_11_diff)/(1-(rho_11_diff*Tai_diff)^2) "Degree of reflection for single pane window"; - parameter Modelica.SIunits.ReflectionCoefficient XN2_diff=1-rho_1_diff^2 + parameter Modelica.Units.SI.ReflectionCoefficient XN2_diff=1-rho_1_diff^2 "Calculation factor to simplify equations"; - parameter Modelica.SIunits.TransmissionCoefficient Ta2_diff=(Ta1_diff^2)/ + parameter Modelica.Units.SI.TransmissionCoefficient Ta2_diff=(Ta1_diff^2)/ XN2_diff "Energetic dregree of transmission for second pane"; - parameter Modelica.SIunits.Emissivity a1_diff=1-Ta1_diff-rho_1_diff + parameter Modelica.Units.SI.Emissivity a1_diff=1-Ta1_diff-rho_1_diff "Degree of absorption for single pane window"; - parameter Modelica.SIunits.CoefficientOfHeatTransfer Q21_diff= + parameter Modelica.Units.SI.CoefficientOfHeatTransfer Q21_diff= a1_diff*(1+(Ta1_diff*rho_1_diff/XN2_diff))*UWin/25 "Coefficient of heat transfer for exterior pane of double pane window"; - parameter Modelica.SIunits.CoefficientOfHeatTransfer Q22_diff= + parameter Modelica.Units.SI.CoefficientOfHeatTransfer Q22_diff= a1_diff*(Ta1_diff/XN2_diff)*(1-(UWin/7.7)) "Coefficient of heat transfer for interior pane of double pane window"; - parameter Modelica.SIunits.CoefficientOfHeatTransfer Qsek2_diff= + parameter Modelica.Units.SI.CoefficientOfHeatTransfer Qsek2_diff= Q21_diff+Q22_diff "Overall coefficient of heat transfer for double pane window"; - parameter Modelica.SIunits.TransmissionCoefficient CorG_diff= + parameter Modelica.Units.SI.TransmissionCoefficient CorG_diff= (Ta2_diff+Qsek2_diff)/g_dir0 "Transmission coefficient correction factor for diffuse radiation"; - parameter Modelica.SIunits.TransmissionCoefficient CorG_gr= + parameter Modelica.Units.SI.TransmissionCoefficient CorG_gr= (Ta2_diff+Qsek2_diff)/g_dir0 "Transmission coefficient correction factor for irradiations from ground"; //Calculating the correction factor for direct solar radiation - Modelica.SIunits.TransmissionCoefficient[n] Ta_dir + Modelica.Units.SI.TransmissionCoefficient[n] Ta_dir "Energetic degree of transmission for direct radiation"; - Modelica.SIunits.TransmissionCoefficient[n] Tai_dir + Modelica.Units.SI.TransmissionCoefficient[n] Tai_dir "Pure degree of transmission for direct radiation"; - Modelica.SIunits.TransmissionCoefficient[n] Ta1_dir + Modelica.Units.SI.TransmissionCoefficient[n] Ta1_dir "Pure degree of transmission for single pane window"; - Modelica.SIunits.ReflectionCoefficient[n] rho_T1_dir + Modelica.Units.SI.ReflectionCoefficient[n] rho_T1_dir "Part of degree of transmission for single pane window related to Ta1_dir"; - Modelica.SIunits.ReflectionCoefficient[n] rho_11_dir + Modelica.Units.SI.ReflectionCoefficient[n] rho_11_dir "Part of degree of transmission for single pane window related to T1_dir"; - Modelica.SIunits.ReflectionCoefficient[n] rho_1_dir + Modelica.Units.SI.ReflectionCoefficient[n] rho_1_dir "Degree of reflection for single pane window"; - Modelica.SIunits.ReflectionCoefficient[n] XN2_dir + Modelica.Units.SI.ReflectionCoefficient[n] XN2_dir "Calculation factor to simplify equations"; - Modelica.SIunits.TransmissionCoefficient[n] Ta2_dir + Modelica.Units.SI.TransmissionCoefficient[n] Ta2_dir "Energetic dregree of transmission for second pane"; - Modelica.SIunits.Emissivity[n] a1_dir + Modelica.Units.SI.Emissivity[n] a1_dir "Degree of absorption for single pane window"; Real[n] Q21_dir "Coefficient of heat transfer for exterior pane of double pane window"; @@ -86,9 +86,9 @@ "Coefficient of heat transfer for interior pane of double pane window"; Real[n] Qsek2_dir "Overall coefficient of heat transfer for double pane window"; - Modelica.SIunits.TransmissionCoefficient[n] CorG_dir - "Transmission coefficient correction factor for direct radiation"; + Modelica.Units.SI.TransmissionCoefficient[n] CorG_dir + "Transmission coefficient correction factor for direct radiation"; equation for i in 1:n loop Ta_dir[i]= (((((A6*con.to_deg(inc[i])+A5)*con.to_deg(inc[i])+A4)*con.to_deg(inc[i])+A3)* diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/ThermalZones/ReducedOrder/Validation/VDI6007/BaseClasses/VerifyDifferenceThreePeriods.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/ThermalZones/ReducedOrder/Validation/VDI6007/BaseClasses/VerifyDifferenceThreePeriods.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/ThermalZones/ReducedOrder/Validation/VDI6007/BaseClasses/VerifyDifferenceThreePeriods.mo" 2022-03-10 09:57:42.184144656 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/ThermalZones/ReducedOrder/Validation/VDI6007/BaseClasses/VerifyDifferenceThreePeriods.mo" 2022-03-10 09:58:02.136147184 +0000 @@ -2,15 +2,15 @@ block VerifyDifferenceThreePeriods "Assert when condition is violated" extends IBPSA.Utilities.Diagnostics.BaseClasses.PartialInputCheck( message="Inputs differ by more than threShold.\n Check output 'satisfied' for when violation(s) happened."); - parameter Modelica.SIunits.Time endTime = 0 + parameter Modelica.Units.SI.Time endTime = 0 "Start time for deactivating the assert (period one)"; - parameter Modelica.SIunits.Time startTime2 = 0 + parameter Modelica.Units.SI.Time startTime2 = 0 "Start time for activating the assert (period two)"; - parameter Modelica.SIunits.Time endTime2 = 0 + parameter Modelica.Units.SI.Time endTime2 = 0 "Start time for deactivating the assert (period two)"; - parameter Modelica.SIunits.Time startTime3 = 0 + parameter Modelica.Units.SI.Time startTime3 = 0 "Start time for activating the assert (period three)"; - parameter Modelica.SIunits.Time endTime3 = 0 + parameter Modelica.Units.SI.Time endTime3 = 0 "Start time for deactivating the assert (period three)"; Modelica.Blocks.Interfaces.BooleanOutput satisfied(start=true, fixed=true) @@ -20,15 +20,15 @@ annotation (Placement(transformation(extent={{100,42},{140,82}}), iconTransformation(extent={{100,42},{140,82}}))); protected - parameter Modelica.SIunits.Time t1(fixed=false) + parameter Modelica.Units.SI.Time t1(fixed=false) "Simulation end time period one"; - parameter Modelica.SIunits.Time t3(fixed=false) + parameter Modelica.Units.SI.Time t3(fixed=false) "Simulation end time period two"; - parameter Modelica.SIunits.Time t5(fixed=false) + parameter Modelica.Units.SI.Time t5(fixed=false) "Simulation end time period three"; - parameter Modelica.SIunits.Time t2(fixed=false) + parameter Modelica.Units.SI.Time t2(fixed=false) "Simulation start time period two"; - parameter Modelica.SIunits.Time t4(fixed=false) + parameter Modelica.Units.SI.Time t4(fixed=false) "Simulation start time period three"; Integer nFai "Number of test violations"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Types/Azimuth/package.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Types/Azimuth/package.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Types/Azimuth/package.mo" 2022-03-10 09:57:42.188144658 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Types/Azimuth/package.mo" 2022-03-10 09:58:01.592147115 +0000 @@ -2,16 +2,16 @@ package Azimuth "List of possible constant values for surface azimuth" extends Modelica.Icons.TypesPackage; - constant Modelica.SIunits.Angle E = -Modelica.Constants.pi/2 + + + constant Modelica.Units.SI.Angle E = -Modelica.Constants.pi/2 "Azimuth for an exterior wall whose outer surface faces east"; - constant Modelica.SIunits.Angle N = Modelica.Constants.pi + constant Modelica.Units.SI.Angle N = Modelica.Constants.pi "Azimuth for an exterior wall whose outer surface faces north"; - constant Modelica.SIunits.Angle S = 0 + constant Modelica.Units.SI.Angle S = 0 "Azimuth for an exterior wall whose outer surface faces south"; - constant Modelica.SIunits.Angle W = +Modelica.Constants.pi/2 + constant Modelica.Units.SI.Angle W = +Modelica.Constants.pi/2 "Azimuth for an exterior wall whose outer surface faces west"; - - annotation(preferredView="info", Documentation(info="
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Types/Tilt/package.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Types/Tilt/package.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Types/Tilt/package.mo" 2022-03-10 09:57:42.188144658 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Types/Tilt/package.mo" 2022-03-10 09:58:01.576147114 +0000 @@ -2,13 +2,13 @@ package Tilt "List of possible constant values for surface tilt" extends Modelica.Icons.TypesPackage; - constant Modelica.SIunits.Angle Ceiling = 0 "Tilt for ceiling"; - constant Modelica.SIunits.Angle Floor = Modelica.Constants.pi + + constant Modelica.Units.SI.Angle Ceiling = 0 "Tilt for ceiling"; + constant Modelica.Units.SI.Angle Floor = Modelica.Constants.pi "Tilt for floor"; - constant Modelica.SIunits.Angle Wall = Modelica.Constants.pi/2 + constant Modelica.Units.SI.Angle Wall = Modelica.Constants.pi/2 "Tilt for wall"; - annotation(preferredView="info", Documentation(info="
Possible constant values to define the tilt of a surface. diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Diagnostics/BaseClasses/PartialInputCheck.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Diagnostics/BaseClasses/PartialInputCheck.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Diagnostics/BaseClasses/PartialInputCheck.mo" 2022-03-10 09:57:42.188144658 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Diagnostics/BaseClasses/PartialInputCheck.mo" 2022-03-10 09:58:01.420147094 +0000 @@ -1,7 +1,7 @@ within IBPSA.Utilities.Diagnostics.BaseClasses; block PartialInputCheck "Assert when condition is violated" extends Modelica.Blocks.Icons.Block; - parameter Modelica.SIunits.Time startTime = 0 + parameter Modelica.Units.SI.Time startTime = 0 "Start time for activating the assert"; parameter Real threShold(min=0)=1E-2 "Threshold for equality comparison"; parameter String message = "Inputs differ by more than threShold"; @@ -10,7 +10,7 @@ Modelica.Blocks.Interfaces.RealInput u2 "Value to check" annotation (Placement(transformation(extent={{-140,-80},{-100,-40}}))); protected - parameter Modelica.SIunits.Time t0( fixed=false) "Simulation start time"; + parameter Modelica.Units.SI.Time t0( fixed=false) "Simulation start time"; initial equation t0 = time + startTime; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Diagnostics/Validation/CheckEquality.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Diagnostics/Validation/CheckEquality.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Diagnostics/Validation/CheckEquality.mo" 2022-03-10 09:57:42.188144658 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Diagnostics/Validation/CheckEquality.mo" 2022-03-10 09:58:01.400147092 +0000 @@ -7,7 +7,7 @@ annotation (Placement(transformation(extent={{20,10},{40,30}}))); Modelica.Blocks.Sources.Constant con(k=0.1) "Input" annotation (Placement(transformation(extent={{-60,30},{-40,50}}))); - Modelica.Blocks.Sources.Sine sin1(freqHz=1, amplitude=0.03) + Modelica.Blocks.Sources.Sine sin1(f =1, amplitude=0.03) "Input" annotation (Placement(transformation(extent={{-60,-10},{-40,10}}))); Modelica.Blocks.Math.Add add "Adder to offset the sin input signal" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/IO/Files/BaseClasses/FileWriter.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/IO/Files/BaseClasses/FileWriter.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/IO/Files/BaseClasses/FileWriter.mo" 2022-03-10 09:57:42.188144658 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/IO/Files/BaseClasses/FileWriter.mo" 2022-03-10 09:58:01.312147080 +0000 @@ -7,7 +7,7 @@ annotation(Evaluate=true, Dialog(connectorSizing=true)); parameter String fileName = getInstanceName() + ".csv" "File name, including extension"; - parameter Modelica.SIunits.Time samplePeriod + parameter Modelica.Units.SI.Time samplePeriod "Sample period: equidistant interval for which the inputs are saved"; parameter String delimiter = "\t" "Delimiter for csv file" @@ -26,7 +26,7 @@ parameter Boolean isCombiTimeTable = false "=true, if CombiTimeTable header should be prepended upon destruction" annotation(Evaluate=true); - parameter Modelica.SIunits.Time t0(fixed=false) + parameter Modelica.Units.SI.Time t0(fixed=false) "First sample time instant"; parameter String insNam = getInstanceName() "Instance name"; IBPSA.Utilities.IO.Files.BaseClasses.FileWriterObject filWri= diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/IO/Files/Examples/BaseClasses/PartialCSV.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/IO/Files/Examples/BaseClasses/PartialCSV.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/IO/Files/Examples/BaseClasses/PartialCSV.mo" 2022-03-10 09:57:42.188144658 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/IO/Files/Examples/BaseClasses/PartialCSV.mo" 2022-03-10 09:58:01.236147071 +0000 @@ -1,7 +1,7 @@ within IBPSA.Utilities.IO.Files.Examples.BaseClasses; model PartialCSV "Base model for CSV reader and writer example" extends Modelica.Icons.Example; - Modelica.Blocks.Sources.Cosine cos(freqHz=0.345) "Cosine" + Modelica.Blocks.Sources.Cosine cos(f =0.345) "Cosine" annotation (Placement(transformation(extent={{-80,20},{-60,40}}))); Modelica.Blocks.Sources.Step step(startTime=5) "Step function" annotation (Placement(transformation(extent={{-80,-40},{-60,-20}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Math/Examples/SmoothBlocks.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Math/Examples/SmoothBlocks.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Math/Examples/SmoothBlocks.mo" 2022-03-10 09:57:42.188144658 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Math/Examples/SmoothBlocks.mo" 2022-03-10 09:58:00.900147029 +0000 @@ -5,9 +5,9 @@ -20,40},{0,60}}))); Modelica.Blocks.Math.Max max annotation (Placement(transformation(extent={{ -20,0},{0,20}}))); - Modelica.Blocks.Sources.Sine sine(freqHz=8) + Modelica.Blocks.Sources.Sine sine(f =8) annotation (Placement(transformation(extent={{-80,60},{-60,80}}))); - Modelica.Blocks.Sources.Sine sine1(freqHz=1) + Modelica.Blocks.Sources.Sine sine1(f =1) annotation (Placement(transformation( extent={{-100,0},{-80,20}}))); Diagnostics.AssertEquality assEquMax(threShold=0.08) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Math/Examples/SmoothLimit.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Math/Examples/SmoothLimit.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Math/Examples/SmoothLimit.mo" 2022-03-10 09:57:42.188144658 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Math/Examples/SmoothLimit.mo" 2022-03-10 09:58:00.852147022 +0000 @@ -1,7 +1,7 @@ within IBPSA.Utilities.Math.Examples; model SmoothLimit "Test model for smooth limit" extends Modelica.Icons.Example; - Modelica.Blocks.Sources.Sine sine(freqHz=8) + Modelica.Blocks.Sources.Sine sine(f =8) annotation (Placement(transformation(extent={{-40,0},{-20,20}}))); IBPSA.Utilities.Math.SmoothLimit smoLim( deltaX=0.001, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Math/Examples/Splice.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Math/Examples/Splice.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Math/Examples/Splice.mo" 2022-03-10 09:57:42.188144658 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Math/Examples/Splice.mo" 2022-03-10 09:58:00.804147015 +0000 @@ -3,7 +3,7 @@ extends Modelica.Icons.Example; IBPSA.Utilities.Math.Splice splice(deltax=0.2) annotation (Placement(transformation(extent={{0,0},{20,20}}))); - Modelica.Blocks.Sources.Sine sine(freqHz=0.5) + Modelica.Blocks.Sources.Sine sine(f =0.5) annotation (Placement(transformation(extent={{-60,0},{-40,20}}))); Modelica.Blocks.Sources.Constant const1(k=-0.5) annotation (Placement(transformation(extent={{-60,-40},{-40,-20}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Math/Examples/VectorFunctions.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Math/Examples/VectorFunctions.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Math/Examples/VectorFunctions.mo" 2022-03-10 09:57:42.188144658 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Math/Examples/VectorFunctions.mo" 2022-03-10 09:58:00.792147015 +0000 @@ -5,12 +5,12 @@ IBPSA.Utilities.Math.Min minVec( nin=3) annotation (Placement(transformation(extent={{-20,20},{0,40}}))); - Modelica.Blocks.Sources.Sine sine(freqHz=6) + Modelica.Blocks.Sources.Sine sine(f =6) annotation (Placement(transformation(extent={{-80,20},{-60,40}}))); Modelica.Blocks.Sources.Sine sine1( - freqHz=8) + f =8) annotation (Placement(transformation(extent={{-80,-20},{-60,0}}))); - Modelica.Blocks.Sources.Sine sine2(freqHz=10) + Modelica.Blocks.Sources.Sine sine2(f =10) annotation (Placement(transformation(extent={{-80,-60},{-60,-40}}))); IBPSA.Utilities.Math.Max maxVec( nin=3) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/BaseClasses/HumidityRatioVaporPressure.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/BaseClasses/HumidityRatioVaporPressure.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/BaseClasses/HumidityRatioVaporPressure.mo" 2022-03-10 09:57:42.188144658 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/BaseClasses/HumidityRatioVaporPressure.mo" 2022-03-10 09:57:59.776146886 +0000 @@ -5,7 +5,7 @@ parameter Boolean use_p_in = true "Get the pressure from the input connector" annotation(Evaluate=true, HideResult=true); - parameter Modelica.SIunits.Pressure p = 101325 "Fixed value of pressure" + parameter Modelica.Units.SI.Pressure p = 101325 "Fixed value of pressure" annotation (Dialog(enable = not use_p_in)); Modelica.Blocks.Interfaces.RealInput p_in(final quantity="Pressure", final unit="Pa", diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Constants.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Constants.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Constants.mo" 2022-03-10 09:57:42.188144658 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Constants.mo" 2022-03-10 09:57:59.764146885 +0000 @@ -1,15 +1,15 @@ within IBPSA.Utilities.Psychrometrics; package Constants "Library of constants for psychometric functions" extends Modelica.Icons.Package; - constant Modelica.SIunits.Temperature T_ref = 273.15 + constant Modelica.Units.SI.Temperature T_ref = 273.15 "Reference temperature for psychrometric calculations"; - constant Modelica.SIunits.SpecificHeatCapacity cpAir=1006 + constant Modelica.Units.SI.SpecificHeatCapacity cpAir=1006 "Specific heat capacity of air"; - constant Modelica.SIunits.SpecificHeatCapacity cpSte=1860 + constant Modelica.Units.SI.SpecificHeatCapacity cpSte=1860 "Specific heat capacity of water vapor"; - constant Modelica.SIunits.SpecificHeatCapacity cpWatLiq = 4184 + constant Modelica.Units.SI.SpecificHeatCapacity cpWatLiq = 4184 "Specific heat capacity of liquid water"; - constant Modelica.SIunits.SpecificEnthalpy h_fg = 2501014.5 + constant Modelica.Units.SI.SpecificEnthalpy h_fg = 2501014.5 "Enthalpy of evaporation of water at the reference temperature"; constant Real k_mair = 0.6219647130774989 "Ratio of molar weights"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Examples/TWetBul_TDryBulPhi.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Examples/TWetBul_TDryBulPhi.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Examples/TWetBul_TDryBulPhi.mo" 2022-03-10 09:57:42.188144658 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Examples/TWetBul_TDryBulPhi.mo" 2022-03-10 09:57:59.624146867 +0000 @@ -33,7 +33,7 @@ protected block Assertions extends Modelica.Blocks.Icons.Block; - constant Modelica.SIunits.Temperature dT_max=0.1 + constant Modelica.Units.SI.Temperature dT_max=0.1 "Maximum allowed deviation with reference result"; Modelica.Blocks.Interfaces.RealInput phi "Relative humidity" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/Examples/DewPointTemperatureDerivativeCheck.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/Examples/DewPointTemperatureDerivativeCheck.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/Examples/DewPointTemperatureDerivativeCheck.mo" 2022-03-10 09:57:42.188144658 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/Examples/DewPointTemperatureDerivativeCheck.mo" 2022-03-10 09:57:59.460146846 +0000 @@ -6,7 +6,7 @@ Real y "Function value"; Real y_comp "Function value for comparison"; Real err "Integration error"; - Modelica.SIunits.Temperature T "Temperature"; + Modelica.Units.SI.Temperature T "Temperature"; initial equation y=y_comp; equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/Examples/DewPointTemperatureDerivativeCheck_amb.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/Examples/DewPointTemperatureDerivativeCheck_amb.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/Examples/DewPointTemperatureDerivativeCheck_amb.mo" 2022-03-10 09:57:42.188144658 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/Examples/DewPointTemperatureDerivativeCheck_amb.mo" 2022-03-10 09:57:59.448146845 +0000 @@ -6,7 +6,7 @@ Real y "Function value"; Real y_comp "Function value for comparison"; Real err "Integration error"; - Modelica.SIunits.Temperature T "Temperature"; + Modelica.Units.SI.Temperature T "Temperature"; initial equation y=y_comp; equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/Examples/InverseDewPointTemperatureDerivativeCheck_amb.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/Examples/InverseDewPointTemperatureDerivativeCheck_amb.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/Examples/InverseDewPointTemperatureDerivativeCheck_amb.mo" 2022-03-10 09:57:42.188144658 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/Examples/InverseDewPointTemperatureDerivativeCheck_amb.mo" 2022-03-10 09:57:59.440146842 +0000 @@ -6,7 +6,7 @@ Real y "Function value"; Real y_comp "Function value for comparison"; Real err(unit="K", displayUnit="K") "Integration error"; - Modelica.SIunits.Pressure p_w "Water vapor partial pressure"; + Modelica.Units.SI.Pressure p_w "Water vapor partial pressure"; initial equation y=y_comp; equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/Examples/SaturationPressureDerivativeCheck.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/Examples/SaturationPressureDerivativeCheck.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/Examples/SaturationPressureDerivativeCheck.mo" 2022-03-10 09:57:42.188144658 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/Examples/SaturationPressureDerivativeCheck.mo" 2022-03-10 09:57:59.424146841 +0000 @@ -3,13 +3,13 @@ "Model to test correct implementation of derivative" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Temperature TMin = 190 "Temperature"; - parameter Modelica.SIunits.Temperature TMax = 373.16 "Temperature"; + parameter Modelica.Units.SI.Temperature TMin = 190 "Temperature"; + parameter Modelica.Units.SI.Temperature TMax = 373.16 "Temperature"; Real y "Function value"; Real y_comp "Function value for comparison"; Real err "Integration error"; - Modelica.SIunits.Temperature T "Temperature"; + Modelica.Units.SI.Temperature T "Temperature"; initial equation y=y_comp; equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/Examples/WaterVaporPressureDerivativeCheck.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/Examples/WaterVaporPressureDerivativeCheck.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/Examples/WaterVaporPressureDerivativeCheck.mo" 2022-03-10 09:57:42.188144658 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/Examples/WaterVaporPressureDerivativeCheck.mo" 2022-03-10 09:57:59.420146840 +0000 @@ -6,10 +6,10 @@ Real y "Function value"; Real y_comp "Function value for comparison"; Real err "Integration error"; - Modelica.SIunits.MassFraction X_w - "Water vapor mass fraction at dry bulb temperature"; - Modelica.SIunits.Pressure p "Total pressure"; + Modelica.Units.SI.MassFraction X_w + "Water vapor mass fraction at dry bulb temperature"; + Modelica.Units.SI.Pressure p "Total pressure"; initial equation y=y_comp; equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/der_TDewPoi_pW_amb.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/der_TDewPoi_pW_amb.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/der_TDewPoi_pW_amb.mo" 2022-03-10 09:57:42.188144658 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/der_TDewPoi_pW_amb.mo" 2022-03-10 09:57:59.412146839 +0000 @@ -2,15 +2,15 @@ function der_TDewPoi_pW_amb "Derivative of function TDewPoi_pW_amb" extends Modelica.Icons.Function; - input Modelica.SIunits.Pressure p_w "Water vapor partial pressure"; + input Modelica.Units.SI.Pressure p_w "Water vapor partial pressure"; input Real dp_w "Differential of water vapor partial pressure"; output Real dT "Differential of dew point temperature"; protected - constant Modelica.SIunits.Temperature T1=283.15 "First support point"; - constant Modelica.SIunits.Temperature T2=293.15 "Second support point"; - constant Modelica.SIunits.Pressure p1=1227.97 "First support point"; - constant Modelica.SIunits.Pressure p2=2338.76 "Second support point"; + constant Modelica.Units.SI.Temperature T1=283.15 "First support point"; + constant Modelica.Units.SI.Temperature T2=293.15 "Second support point"; + constant Modelica.Units.SI.Pressure p1=1227.97 "First support point"; + constant Modelica.Units.SI.Pressure p2=2338.76 "Second support point"; constant Real a1=(Modelica.Math.log(p2) - Modelica.Math.log(p1)*T2/T1)/(1 - T2/T1); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_TDewPoi.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_TDewPoi.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_TDewPoi.mo" 2022-03-10 09:57:42.192144657 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_TDewPoi.mo" 2022-03-10 09:57:59.400146838 +0000 @@ -1,7 +1,7 @@ within IBPSA.Utilities.Psychrometrics.Functions.BaseClasses; function der_pW_TDewPoi "Derivative of function pW_TDewPoi" extends Modelica.Icons.Function; - input Modelica.SIunits.Temperature T "Dew point temperature"; + input Modelica.Units.SI.Temperature T "Dew point temperature"; input Real dT "Temperature differential"; output Real dp_w "Differential of water vapor partial pressure"; protected diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_TDewPoi_amb.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_TDewPoi_amb.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_TDewPoi_amb.mo" 2022-03-10 09:57:42.192144657 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_TDewPoi_amb.mo" 2022-03-10 09:57:59.392146837 +0000 @@ -1,14 +1,14 @@ within IBPSA.Utilities.Psychrometrics.Functions.BaseClasses; function der_pW_TDewPoi_amb "Derivative of function pW_TDewPoi_amb" extends Modelica.Icons.Function; - input Modelica.SIunits.Temperature T "Dew point temperature"; + input Modelica.Units.SI.Temperature T "Dew point temperature"; input Real dT; output Real dp_w "Differential of water vapor partial pressure"; protected - constant Modelica.SIunits.Temperature T1=283.15 "First support point"; - constant Modelica.SIunits.Temperature T2=293.15 "Second support point"; - constant Modelica.SIunits.Pressure p1=1227.97 "First support point"; - constant Modelica.SIunits.Pressure p2=2338.76 "Second support point"; + constant Modelica.Units.SI.Temperature T1=283.15 "First support point"; + constant Modelica.Units.SI.Temperature T2=293.15 "Second support point"; + constant Modelica.Units.SI.Pressure p1=1227.97 "First support point"; + constant Modelica.Units.SI.Pressure p2=2338.76 "Second support point"; constant Real a1=(Modelica.Math.log(p2) - Modelica.Math.log(p1)*T2/T1)/(1 - T2/T1); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_X.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_X.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_X.mo" 2022-03-10 09:57:42.192144657 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_X.mo" 2022-03-10 09:57:59.384146837 +0000 @@ -2,11 +2,11 @@ function der_pW_X "Derivative of function pW_X" extends Modelica.Icons.Function; - input Modelica.SIunits.MassFraction X_w( + input Modelica.Units.SI.MassFraction X_w( min=0, max=1, nominal=0.01) "Species concentration at dry bulb temperature"; - input Modelica.SIunits.Pressure p=101325 "Total pressure"; + input Modelica.Units.SI.Pressure p=101325 "Total pressure"; input Real dX_w "Differential of species concentration at dry bulb temperature"; @@ -15,7 +15,7 @@ output Real dp_w "Differential of water vapor pressure"; protected - Modelica.SIunits.MassFraction x_w(nominal=0.01) + Modelica.Units.SI.MassFraction x_w(nominal=0.01) "Water mass fraction per mass of dry air"; Real dX_w_dX "Differential d (x_w) / d X_w"; algorithm diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/der_saturationPressureLiquid.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/der_saturationPressureLiquid.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/der_saturationPressureLiquid.mo" 2022-03-10 09:57:42.192144657 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/der_saturationPressureLiquid.mo" 2022-03-10 09:57:59.372146835 +0000 @@ -2,7 +2,7 @@ function der_saturationPressureLiquid "Derivative of the function saturationPressureLiquid" extends Modelica.Icons.Function; - input Modelica.SIunits.Temperature Tsat "Saturation temperature"; + input Modelica.Units.SI.Temperature Tsat "Saturation temperature"; input Real dTsat(unit="K/s") "Saturation temperature derivative"; output Real psat_der(unit="Pa/s") "Differential of saturation pressure"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/der_sublimationPressureIce.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/der_sublimationPressureIce.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/der_sublimationPressureIce.mo" 2022-03-10 09:57:42.192144657 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/der_sublimationPressureIce.mo" 2022-03-10 09:57:59.364146833 +0000 @@ -2,14 +2,14 @@ function der_sublimationPressureIce "Derivative of function sublimationPressureIce" extends Modelica.Icons.Function; - input Modelica.SIunits.Temperature TSat(displayUnit="degC", + input Modelica.Units.SI.Temperature TSat(displayUnit="degC", nominal=300) "Saturation temperature"; input Real dTsat(unit="K/s") "Sublimation temperature derivative"; output Real psat_der(unit="Pa/s") "Sublimation pressure derivative"; protected - Modelica.SIunits.Temperature TTriple=273.16 "Triple point temperature"; - Modelica.SIunits.AbsolutePressure pTriple=611.657 "Triple point pressure"; + Modelica.Units.SI.Temperature TTriple=273.16 "Triple point temperature"; + Modelica.Units.SI.AbsolutePressure pTriple=611.657 "Triple point pressure"; Real r1=TSat/TTriple "Common subexpression 1"; Real r1_der=dTsat/TTriple "Derivative of common subexpression 1"; Real a[2]={-13.9281690,34.7078238} "Coefficients a[:]"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/Examples/Density_pTX.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/Examples/Density_pTX.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/Examples/Density_pTX.mo" 2022-03-10 09:57:42.192144657 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/Examples/Density_pTX.mo" 2022-03-10 09:57:59.320146827 +0000 @@ -2,10 +2,10 @@ model Density_pTX "Model to test density_pTX" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Pressure p = 101325 "Pressure of the medium"; - Modelica.SIunits.Temperature T "Temperature"; - Modelica.SIunits.MassFraction X_w "Mass fraction"; - Modelica.SIunits.Density d "Mass density"; + parameter Modelica.Units.SI.Pressure p = 101325 "Pressure of the medium"; + Modelica.Units.SI.Temperature T "Temperature"; + Modelica.Units.SI.MassFraction X_w "Mass fraction"; + Modelica.Units.SI.Density d "Mass density"; constant Real convT(unit="1/s") = 0.999 "Conversion factor"; constant Real convX(unit="1/s") = 0.02 "Conversion factor"; equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/Examples/SaturationPressure.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/Examples/SaturationPressure.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/Examples/SaturationPressure.mo" 2022-03-10 09:57:42.192144657 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/Examples/SaturationPressure.mo" 2022-03-10 09:57:59.308146827 +0000 @@ -1,10 +1,10 @@ within IBPSA.Utilities.Psychrometrics.Functions.Examples; model SaturationPressure "Model to test the saturationPressure function" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Temperature TMin = 190 "Temperature"; - parameter Modelica.SIunits.Temperature TMax = 373.16 "Temperature"; - Modelica.SIunits.Temperature T "Temperature"; - Modelica.SIunits.AbsolutePressure pSat "Saturation pressure"; + parameter Modelica.Units.SI.Temperature TMin = 190 "Temperature"; + parameter Modelica.Units.SI.Temperature TMax = 373.16 "Temperature"; + Modelica.Units.SI.Temperature T "Temperature"; + Modelica.Units.SI.AbsolutePressure pSat "Saturation pressure"; constant Real conv(unit="1/s") = 1 "Conversion factor"; equation T = TMin + conv*time * (TMax-TMin); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/Examples/X_pSatpphi.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/Examples/X_pSatpphi.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/Examples/X_pSatpphi.mo" 2022-03-10 09:57:42.192144657 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/Examples/X_pSatpphi.mo" 2022-03-10 09:57:59.296146825 +0000 @@ -3,12 +3,12 @@ extends Modelica.Icons.Example; package Medium = IBPSA.Media.Air "Medium model" annotation (choicesAllMatching = true); - parameter Modelica.SIunits.Temperature T = 293.15 "Temperature"; - parameter Modelica.SIunits.Pressure p = 101325 "Pressure of the fluid"; + parameter Modelica.Units.SI.Temperature T = 293.15 "Temperature"; + parameter Modelica.Units.SI.Pressure p = 101325 "Pressure of the fluid"; - Modelica.SIunits.AbsolutePressure pSat "Saturation pressure"; + Modelica.Units.SI.AbsolutePressure pSat "Saturation pressure"; Real phi(min=0, max=1) "Relative humidity"; - Modelica.SIunits.MassFraction X_w( + Modelica.Units.SI.MassFraction X_w( min=0, max=1, nominal=0.01) "Water vapor concentration per total mass of air"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/Examples/pW_TDewPoi.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/Examples/pW_TDewPoi.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/Examples/pW_TDewPoi.mo" 2022-03-10 09:57:42.192144657 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/Examples/pW_TDewPoi.mo" 2022-03-10 09:57:59.284146824 +0000 @@ -2,10 +2,10 @@ model pW_TDewPoi "Model to test pW_TDewPoi and its inverse function" extends Modelica.Icons.Example; - Modelica.SIunits.Temperature T "Dew point temperature"; - Modelica.SIunits.Temperature TInv "Dew point temperature"; - Modelica.SIunits.TemperatureDifference dT "Difference between temperatures"; - Modelica.SIunits.Pressure p_w "Water vapor partial pressure"; + Modelica.Units.SI.Temperature T "Dew point temperature"; + Modelica.Units.SI.Temperature TInv "Dew point temperature"; + Modelica.Units.SI.TemperatureDifference dT "Difference between temperatures"; + Modelica.Units.SI.Pressure p_w "Water vapor partial pressure"; constant Real conv(unit="K/s") = 100 "Conversion factor"; equation T = conv*time + 273.15; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/Examples/pW_TDewPoi_comparison.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/Examples/pW_TDewPoi_comparison.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/Examples/pW_TDewPoi_comparison.mo" 2022-03-10 09:57:42.192144657 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/Examples/pW_TDewPoi_comparison.mo" 2022-03-10 09:57:59.276146823 +0000 @@ -3,12 +3,12 @@ "Model to test the approximation for pW_TDewPoi and its inverse function" extends Modelica.Icons.Example; - Modelica.SIunits.Temperature T "Dew point temperature"; - Modelica.SIunits.Temperature TInv "Dew point temperature"; - Modelica.SIunits.TemperatureDifference dT "Difference between temperatures"; - Modelica.SIunits.Pressure p_w_ashrae + Modelica.Units.SI.Temperature T "Dew point temperature"; + Modelica.Units.SI.Temperature TInv "Dew point temperature"; + Modelica.Units.SI.TemperatureDifference dT "Difference between temperatures"; + Modelica.Units.SI.Pressure p_w_ashrae "Water vapor partial pressure according to the ASHRAE handbook"; - Modelica.SIunits.Pressure p_w "Water vapor partial pressure"; + Modelica.Units.SI.Pressure p_w "Water vapor partial pressure"; constant Real conv(unit="K/s") = 30 "Conversion factor"; Real r_p "Ratio of the two approximations"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/Examples/pW_X.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/Examples/pW_X.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/Examples/pW_X.mo" 2022-03-10 09:57:42.192144657 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/Examples/pW_X.mo" 2022-03-10 09:57:59.268146821 +0000 @@ -2,10 +2,10 @@ model pW_X "Model to test pW_X and its inverse function" extends Modelica.Icons.Example; - Modelica.SIunits.MassFraction X "Mass fraction"; - Modelica.SIunits.MassFraction XInv "Mass fraction"; - Modelica.SIunits.MassFraction dX "Difference between mass fraction"; - Modelica.SIunits.Pressure p_w "Water vapor partial pressure"; + Modelica.Units.SI.MassFraction X "Mass fraction"; + Modelica.Units.SI.MassFraction XInv "Mass fraction"; + Modelica.Units.SI.MassFraction dX "Difference between mass fraction"; + Modelica.Units.SI.Pressure p_w "Water vapor partial pressure"; constant Real conv(unit="1/s") = 0.999 "Conversion factor"; equation X = conv*time; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/Examples/phi_pTX.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/Examples/phi_pTX.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/Examples/phi_pTX.mo" 2022-03-10 09:57:42.192144657 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/Examples/phi_pTX.mo" 2022-03-10 09:57:59.260146820 +0000 @@ -2,9 +2,9 @@ model phi_pTX "Model to test phi_pTX" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Pressure p = 101325 "Pressure of the medium"; - Modelica.SIunits.Temperature T "Temperature"; - Modelica.SIunits.MassFraction X_w "Mass fraction"; + parameter Modelica.Units.SI.Pressure p = 101325 "Pressure of the medium"; + Modelica.Units.SI.Temperature T "Temperature"; + Modelica.Units.SI.MassFraction X_w "Mass fraction"; Real phi "Relative humidity"; constant Real convT(unit="1/s") = 0.999 "Conversion factor"; constant Real convX(unit="1/s") = 0.02 "Conversion factor"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/Internal.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/Internal.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/Internal.mo" 2022-03-10 09:57:42.192144657 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/Internal.mo" 2022-03-10 09:57:59.248146818 +0000 @@ -1,6 +1,6 @@ within IBPSA.Utilities.Psychrometrics.Functions; package Internal "Solve f(x, data) for x with given f" - extends Modelica.Media.Common.OneNonLinearEquation; + extends ObsoleteModelica4.Media.Common.OneNonLinearEquation; redeclare function extends f_nonlinear algorithm diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/TDewPoi_pW.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/TDewPoi_pW.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/TDewPoi_pW.mo" 2022-03-10 09:57:42.192144657 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/TDewPoi_pW.mo" 2022-03-10 09:57:59.244146818 +0000 @@ -3,12 +3,12 @@ "Function to compute the water vapor partial pressure for a given dew point temperature of moist air" extends Modelica.Icons.Function; - input Modelica.SIunits.Pressure p_w(displayUnit="Pa", min=200) + input Modelica.Units.SI.Pressure p_w(displayUnit="Pa", min=200) "Water vapor partial pressure"; - output Modelica.SIunits.Temperature T "Dew point temperature"; + output Modelica.Units.SI.Temperature T "Dew point temperature"; protected - constant Modelica.Media.Common.OneNonLinearEquation.f_nonlinear_Data dummy + constant ObsoleteModelica4.Media.Common.OneNonLinearEquation.f_nonlinear_Data dummy "Dummy argument for nonlinear function solver"; algorithm T := Internal.solve( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/TDewPoi_pW_amb.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/TDewPoi_pW_amb.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/TDewPoi_pW_amb.mo" 2022-03-10 09:57:42.192144657 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/TDewPoi_pW_amb.mo" 2022-03-10 09:57:59.236146817 +0000 @@ -3,14 +3,14 @@ "Function to compute the dew point temperature of moist air for a given water vapor partial pressure" extends Modelica.Icons.Function; - input Modelica.SIunits.Pressure p_w(displayUnit="Pa", min=100) + input Modelica.Units.SI.Pressure p_w(displayUnit="Pa", min=100) "Water vapor partial pressure"; - output Modelica.SIunits.Temperature T "Dew point temperature"; + output Modelica.Units.SI.Temperature T "Dew point temperature"; protected - constant Modelica.SIunits.Temperature T1=283.15 "First support point"; - constant Modelica.SIunits.Temperature T2=293.15 "Second support point"; - constant Modelica.SIunits.Pressure p1=1227.97 "First support point"; - constant Modelica.SIunits.Pressure p2=2338.76 "Second support point"; + constant Modelica.Units.SI.Temperature T1=283.15 "First support point"; + constant Modelica.Units.SI.Temperature T2=293.15 "Second support point"; + constant Modelica.Units.SI.Pressure p1=1227.97 "First support point"; + constant Modelica.Units.SI.Pressure p2=2338.76 "Second support point"; constant Real a1=(Modelica.Math.log(p2) - Modelica.Math.log(p1)*T2/T1)/(1 - T2/T1); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/X_pSatpphi.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/X_pSatpphi.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/X_pSatpphi.mo" 2022-03-10 09:57:42.192144657 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/X_pSatpphi.mo" 2022-03-10 09:57:59.224146815 +0000 @@ -1,14 +1,14 @@ within IBPSA.Utilities.Psychrometrics.Functions; function X_pSatpphi "Humidity ratio for given water vapor pressure" extends Modelica.Icons.Function; - input Modelica.SIunits.AbsolutePressure pSat "Saturation pressure"; - input Modelica.SIunits.Pressure p "Pressure of the fluid"; + input Modelica.Units.SI.AbsolutePressure pSat "Saturation pressure"; + input Modelica.Units.SI.Pressure p "Pressure of the fluid"; input Real phi(min=0, max=1) "Relative humidity"; - output Modelica.SIunits.MassFraction X_w( + + output Modelica.Units.SI.MassFraction X_w( min=0, max=1, nominal=0.01) "Water vapor concentration per total mass of air"; - protected constant Real k = 0.621964713077499 "Ratio of molar masses"; algorithm diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/X_pW.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/X_pW.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/X_pW.mo" 2022-03-10 09:57:42.192144657 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/X_pW.mo" 2022-03-10 09:57:59.216146814 +0000 @@ -1,17 +1,17 @@ within IBPSA.Utilities.Psychrometrics.Functions; function X_pW "Humidity ratio for given water vapor pressure" extends Modelica.Icons.Function; - input Modelica.SIunits.Pressure p_w(displayUnit="Pa", + input Modelica.Units.SI.Pressure p_w(displayUnit="Pa", min=0.003, nominal=1000) "Water vapor pressure"; - input Modelica.SIunits.Pressure p=101325 "Total pressure"; - output Modelica.SIunits.MassFraction X_w( + input Modelica.Units.SI.Pressure p=101325 "Total pressure"; + output Modelica.Units.SI.MassFraction X_w( min=0, max=1, nominal=0.01) "Species concentration at dry bulb temperature"; protected - Modelica.SIunits.MassFraction x_w(nominal=0.01) + Modelica.Units.SI.MassFraction x_w(nominal=0.01) "Water mass fraction per mass of dry air"; algorithm x_w := 0.62198*p_w/(p - p_w); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/density_pTX.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/density_pTX.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/density_pTX.mo" 2022-03-10 09:57:42.192144657 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/density_pTX.mo" 2022-03-10 09:57:59.204146813 +0000 @@ -2,17 +2,17 @@ function density_pTX "Density of air as a function of pressure, temperature and species concentration" extends Modelica.Icons.Function; - input Modelica.SIunits.Pressure p "Absolute pressure of the medium"; - input Modelica.SIunits.Temperature T "Dry bulb temperature"; - input Modelica.SIunits.MassFraction X_w + input Modelica.Units.SI.Pressure p "Absolute pressure of the medium"; + input Modelica.Units.SI.Temperature T "Dry bulb temperature"; + input Modelica.Units.SI.MassFraction X_w "Water vapor mass fraction per unit mass total air"; - output Modelica.SIunits.Density d "Mass density"; + output Modelica.Units.SI.Density d "Mass density"; protected - Modelica.SIunits.SpecificHeatCapacity R + Modelica.Units.SI.SpecificHeatCapacity R "Gas constant (of mixture if applicable)"; algorithm - R := Modelica.Media.IdealGases.Common.SingleGasesData.Air.R*(1 - X_w) - + Modelica.Media.IdealGases.Common.SingleGasesData.H2O.R*X_w; + R := Modelica.Media.IdealGases.Common.SingleGasesData.Air.R_s * (1 - X_w) + + Modelica.Media.IdealGases.Common.SingleGasesData.H2O.R_s * X_w; d := p/(R*T); annotation (smoothOrder=99, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/pW_TDewPoi.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/pW_TDewPoi.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/pW_TDewPoi.mo" 2022-03-10 09:57:42.192144657 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/pW_TDewPoi.mo" 2022-03-10 09:57:59.192146811 +0000 @@ -2,8 +2,8 @@ function pW_TDewPoi "Function to compute the water vapor partial pressure for a given dew point temperature of moist air" extends Modelica.Icons.Function; - input Modelica.SIunits.Temperature T(min=100) "Dew point temperature"; - output Modelica.SIunits.Pressure p_w(displayUnit="Pa", min=100) + input Modelica.Units.SI.Temperature T(min=100) "Dew point temperature"; + output Modelica.Units.SI.Pressure p_w(displayUnit="Pa", min=100) "Water vapor partial pressure"; protected constant Real C8=-5.800226E3; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/pW_TDewPoi_amb.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/pW_TDewPoi_amb.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/pW_TDewPoi_amb.mo" 2022-03-10 09:57:42.192144657 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/pW_TDewPoi_amb.mo" 2022-03-10 09:57:59.176146810 +0000 @@ -3,14 +3,14 @@ "Function to compute the water vapor partial pressure for a given dew point temperature of moist air" extends Modelica.Icons.Function; - input Modelica.SIunits.Temperature T "Dew point temperature"; - output Modelica.SIunits.Pressure p_w(displayUnit="Pa", min=100) + input Modelica.Units.SI.Temperature T "Dew point temperature"; + output Modelica.Units.SI.Pressure p_w(displayUnit="Pa", min=100) "Water vapor partial pressure"; protected - constant Modelica.SIunits.Temperature T1=283.15 "First support point"; - constant Modelica.SIunits.Temperature T2=293.15 "Second support point"; - constant Modelica.SIunits.Pressure p1=1227.97 "First support point"; - constant Modelica.SIunits.Pressure p2=2338.76 "Second support point"; + constant Modelica.Units.SI.Temperature T1=283.15 "First support point"; + constant Modelica.Units.SI.Temperature T2=293.15 "Second support point"; + constant Modelica.Units.SI.Pressure p1=1227.97 "First support point"; + constant Modelica.Units.SI.Pressure p2=2338.76 "Second support point"; constant Real a1=(Modelica.Math.log(p2) - Modelica.Math.log(p1)*T2/T1)/(1 - T2/T1); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/pW_X.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/pW_X.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/pW_X.mo" 2022-03-10 09:57:42.192144657 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/pW_X.mo" 2022-03-10 09:57:59.072146796 +0000 @@ -1,15 +1,15 @@ within IBPSA.Utilities.Psychrometrics.Functions; function pW_X "Water vapor pressure for given humidity ratio" extends Modelica.Icons.Function; - input Modelica.SIunits.MassFraction X_w( + input Modelica.Units.SI.MassFraction X_w( min=0, max=0.99999, nominal=0.01) "Species concentration at dry bulb temperature"; - input Modelica.SIunits.Pressure p=101325 "Total pressure"; - output Modelica.SIunits.Pressure p_w(displayUnit="Pa") "Water vapor pressure"; + input Modelica.Units.SI.Pressure p=101325 "Total pressure"; + output Modelica.Units.SI.Pressure p_w(displayUnit="Pa") "Water vapor pressure"; protected - Modelica.SIunits.MassFraction x_w(nominal=0.01) + Modelica.Units.SI.MassFraction x_w(nominal=0.01) "Water mass fraction per mass of dry air"; algorithm x_w := X_w/(1 - X_w); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/phi_pTX.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/phi_pTX.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/phi_pTX.mo" 2022-03-10 09:57:42.192144657 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/phi_pTX.mo" 2022-03-10 09:57:59.064146795 +0000 @@ -2,9 +2,9 @@ function phi_pTX "Relative humidity for given pressure, dry bulb temperature and moisture mass fraction" extends Modelica.Icons.Function; - input Modelica.SIunits.Pressure p "Absolute pressure of the medium"; - input Modelica.SIunits.Temperature T "Dry bulb temperature"; - input Modelica.SIunits.MassFraction X_w + input Modelica.Units.SI.Pressure p "Absolute pressure of the medium"; + input Modelica.Units.SI.Temperature T "Dry bulb temperature"; + input Modelica.Units.SI.MassFraction X_w "Water vapor mass fraction per unit mass total air"; output Real phi(unit="1") "Relative humidity"; algorithm diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/saturationPressure.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/saturationPressure.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/saturationPressure.mo" 2022-03-10 09:57:42.192144657 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/saturationPressure.mo" 2022-03-10 09:57:59.060146794 +0000 @@ -2,12 +2,12 @@ function saturationPressure "Saturation curve valid for 223.16 <= T <= 373.16 (and slightly outside with less accuracy)" extends Modelica.Icons.Function; - input Modelica.SIunits.Temperature TSat(displayUnit="degC", + + input Modelica.Units.SI.Temperature TSat(displayUnit="degC", nominal=300) "Saturation temperature"; - output Modelica.SIunits.AbsolutePressure pSat( + output Modelica.Units.SI.AbsolutePressure pSat( displayUnit="Pa", nominal=1000) "Saturation pressure"; - algorithm pSat := IBPSA.Utilities.Math.Functions.regStep( y1=IBPSA.Utilities.Psychrometrics.Functions.saturationPressureLiquid(TSat), diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/saturationPressureLiquid.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/saturationPressureLiquid.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/saturationPressureLiquid.mo" 2022-03-10 09:57:42.192144657 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/saturationPressureLiquid.mo" 2022-03-10 09:57:59.052146794 +0000 @@ -2,9 +2,9 @@ function saturationPressureLiquid "Return saturation pressure of water as a function of temperature T in the range of 273.16 to 373.16 K" extends Modelica.Icons.Function; - input Modelica.SIunits.Temperature TSat(displayUnit="degC", + input Modelica.Units.SI.Temperature TSat(displayUnit="degC", nominal=300) "Saturation temperature"; - output Modelica.SIunits.AbsolutePressure pSat( + output Modelica.Units.SI.AbsolutePressure pSat( displayUnit="Pa", nominal=1000) "Saturation pressure"; algorithm diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/sublimationPressureIce.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/sublimationPressureIce.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/sublimationPressureIce.mo" 2022-03-10 09:57:42.192144657 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/Functions/sublimationPressureIce.mo" 2022-03-10 09:57:59.044146793 +0000 @@ -2,14 +2,14 @@ function sublimationPressureIce "Return sublimation pressure of water as a function of temperature T between 190 and 273.16 K" extends Modelica.Icons.Function; - input Modelica.SIunits.Temperature TSat(displayUnit="degC", + input Modelica.Units.SI.Temperature TSat(displayUnit="degC", nominal=300) "Saturation temperature"; - output Modelica.SIunits.AbsolutePressure pSat( + output Modelica.Units.SI.AbsolutePressure pSat( displayUnit="Pa", nominal=1000) "Saturation pressure"; protected - Modelica.SIunits.Temperature TTriple=273.16 "Triple point temperature"; - Modelica.SIunits.AbsolutePressure pTriple=611.657 "Triple point pressure"; + Modelica.Units.SI.Temperature TTriple=273.16 "Triple point temperature"; + Modelica.Units.SI.AbsolutePressure pTriple=611.657 "Triple point pressure"; Real r1=TSat/TTriple "Common subexpression"; Real a[2]={-13.9281690,34.7078238} "Coefficients a[:]"; Real n[2]={-1.5,-1.25} "Coefficients n[:]"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/TWetBul_TDryBulPhi.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/TWetBul_TDryBulPhi.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/TWetBul_TDryBulPhi.mo" 2022-03-10 09:57:42.192144657 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/TWetBul_TDryBulPhi.mo" 2022-03-10 09:57:58.976146784 +0000 @@ -32,15 +32,15 @@ annotation (Placement(transformation(extent={{100,-10},{120,10}}))); protected - Modelica.SIunits.Conversions.NonSIunits.Temperature_degC TDryBul_degC + Modelica.Units.NonSI.Temperature_degC TDryBul_degC "Dry bulb temperature in degree Celsius"; Real rh_per(min=0) "Relative humidity in percentage"; - Modelica.SIunits.MassFraction XiDryBul + + Modelica.Units.SI.MassFraction XiDryBul "Water vapor mass fraction at dry bulb state"; - Modelica.SIunits.MassFraction XiSat "Water vapor mass fraction at saturation"; - Modelica.SIunits.MassFraction XiSatRefIn + Modelica.Units.SI.MassFraction XiSat "Water vapor mass fraction at saturation"; + Modelica.Units.SI.MassFraction XiSatRefIn "Water vapor mass fraction at saturation, referenced to inlet mass flow rate"; - equation if approximateWetBulb then TDryBul_degC = TDryBul - 273.15; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/TWetBul_TDryBulXi.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/TWetBul_TDryBulXi.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/TWetBul_TDryBulXi.mo" 2022-03-10 09:57:42.192144657 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/TWetBul_TDryBulXi.mo" 2022-03-10 09:57:58.960146782 +0000 @@ -31,14 +31,14 @@ annotation (Placement(transformation(extent={{-120,-10},{-100,10}}))); protected - Modelica.SIunits.Conversions.NonSIunits.Temperature_degC TDryBul_degC + Modelica.Units.NonSI.Temperature_degC TDryBul_degC "Dry bulb temperature in degree Celsius"; Real rh_per(min=0) "Relative humidity in percentage"; - Modelica.SIunits.MassFraction XiSat(start=0.01, + Modelica.Units.SI.MassFraction XiSat(start=0.01, nominal=0.01) "Water vapor mass fraction at saturation"; - Modelica.SIunits.MassFraction XiSatRefIn + Modelica.Units.SI.MassFraction XiSatRefIn "Water vapor mass fraction at saturation, referenced to inlet mass flow rate"; parameter Integer iWat = sum({( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/X_pTphi.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/X_pTphi.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/X_pTphi.mo" 2022-03-10 09:57:42.192144657 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/X_pTphi.mo" 2022-03-10 09:57:58.896146774 +0000 @@ -16,7 +16,7 @@ "Steam mass fraction" annotation (Placement(transformation(extent={{100,-10},{120,10}}))); protected - Modelica.SIunits.AbsolutePressure pSat "Saturation pressure"; + Modelica.Units.SI.AbsolutePressure pSat "Saturation pressure"; parameter Integer i_w = sum({( if Modelica.Utilities.Strings.isEqual( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/X_pW.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/X_pW.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/X_pW.mo" 2022-03-10 09:57:42.192144657 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/X_pW.mo" 2022-03-10 09:57:58.884146772 +0000 @@ -12,7 +12,7 @@ start=2000, nominal=1000) "Water vapor pressure" annotation (Placement(transformation(extent={{-120,-10},{-100,10}}))); - output Modelica.SIunits.MassFraction x_w(min=0, max=1, nominal=0.01, start=0.001) + output Modelica.Units.SI.MassFraction x_w(min=0, max=1, nominal=0.01, start=0.001) "Water mass fraction per mass of dry air"; equation X_w = IBPSA.Utilities.Psychrometrics.Functions.X_pW(p_w=p_w, p=p_in_internal); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/pW_X.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/pW_X.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/pW_X.mo" 2022-03-10 09:57:42.192144657 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Psychrometrics/pW_X.mo" 2022-03-10 09:57:58.864146770 +0000 @@ -11,7 +11,7 @@ min = 0) "Water vapor pressure" annotation (Placement(transformation(extent={{100,-10},{120,10}}), iconTransformation(extent={{100,-10},{120,10}}))); - output Modelica.SIunits.MassFraction x_w(min=0, max=1, nominal=0.1, start=0.001) + output Modelica.Units.SI.MassFraction x_w(min=0, max=1, nominal=0.1, start=0.001) "Water mass fraction per mass of dry air"; equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Time/CalendarTime.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Time/CalendarTime.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Time/CalendarTime.mo" 2022-03-10 09:57:42.192144657 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/Utilities/Time/CalendarTime.mo" 2022-03-10 09:57:58.840146766 +0000 @@ -7,7 +7,7 @@ parameter Integer yearRef(min=firstYear, max=lastYear) = 2016 "Year when time = 0, used if zerTim=Custom" annotation(Dialog(enable=zerTim==IBPSA.Utilities.Time.Types.ZeroTime.Custom)); - parameter Modelica.SIunits.Time offset = 0 + parameter Modelica.Units.SI.Time offset = 0 "Offset that is added to 'time', may be used for computing time in different time zone" annotation(Dialog(tab="Advanced")); @@ -39,7 +39,7 @@ final constant Integer firstYear = 2010 "First year that is supported, i.e. the first year in timeStampsNewYear[:]"; final constant Integer lastYear = firstYear + size(timeStampsNewYear,1) - 1; - constant Modelica.SIunits.Time timeStampsNewYear[12] = { + constant Modelica.Units.SI.Time timeStampsNewYear[12] = { 1262304000.0, 1293840000.0, 1325376000.0, 1356998400.0, 1388534400.0, 1420070400.0, 1451606400.0, 1483228800.0, 1514764800.0, @@ -52,7 +52,7 @@ "List of leap years starting from firstYear (2010), up to and including 2020"; final constant Integer dayInMonth[12] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31} "Number of days in each month"; - parameter Modelica.SIunits.Time timOff(fixed=false) "Time offset"; + parameter Modelica.Units.SI.Time timOff(fixed=false) "Time offset"; // final parameters since the user may wrongly assume that this model shifts the // actual time of the simulation final constant Integer monthRef(min=1, max=12) = 1 "Month when time = 0" @@ -64,9 +64,9 @@ discrete Real epochLastMonth "Unix time stamp of the beginning of the current month"; - final parameter Modelica.SIunits.Time hourSampleStart(fixed=false) + final parameter Modelica.Units.SI.Time hourSampleStart(fixed=false) "Time when the sampling every hour starts"; - final parameter Modelica.SIunits.Time daySampleStart(fixed=false) + final parameter Modelica.Units.SI.Time daySampleStart(fixed=false) "Time when the sampling every day starts"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/openmodelica.metadata.json" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/openmodelica.metadata.json" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/openmodelica.metadata.json" 2022-03-10 09:57:42.192144657 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/openmodelica.metadata.json" 2022-03-10 09:58:23.848149934 +0000 @@ -1 +1 @@ -{"path":"IBPSA", "sha":"1ac463c1025c68c50887bb4e2f21520bf0129c5f", "support":"support", "uses":{"Modelica":"3.2.2"}, "version":"3.0.0", "zipfile":"https://github.com/ibpsa/modelica-ibpsa/archive/1ac463c1025c68c50887bb4e2f21520bf0129c5f.zip"} +{"path": "IBPSA", "sha": "1ac463c1025c68c50887bb4e2f21520bf0129c5f", "support": "support", "uses": {"Modelica": "4.0.0"}, "version": "3.0.0", "zipfile": "https://github.com/ibpsa/modelica-ibpsa/archive/1ac463c1025c68c50887bb4e2f21520bf0129c5f.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/IBPSA 3.0.0/package.mo" "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/package.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IBPSA 3.0.0/package.mo" 2022-03-10 09:57:42.192144657 +0000 +++ "converted-libraries/.openmodelica/libraries/IBPSA 3.0.0/package.mo" 2022-03-10 09:58:01.564147113 +0000 @@ -446,7 +446,7 @@ version="3.0.0", versionDate="2018-09-28", dateModified = "2018-09-28", -uses(Modelica(version="3.2.2")), +uses(Modelica(version= "4.0.0")), preferredView="info", Documentation(info="