This is a partial model for models that describe the bi-directional diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Airflow/Multizone/BaseClasses/powerLaw.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Airflow/Multizone/BaseClasses/powerLaw.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Airflow/Multizone/BaseClasses/powerLaw.mo" 2022-03-10 09:57:31.620143318 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Airflow/Multizone/BaseClasses/powerLaw.mo" 2022-03-10 09:58:58.076154270 +0000 @@ -1,13 +1,13 @@ within Buildings.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/Buildings 3.0.0/Airflow/Multizone/BaseClasses/powerLawFixedM.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Airflow/Multizone/BaseClasses/powerLawFixedM.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Airflow/Multizone/BaseClasses/powerLawFixedM.mo" 2022-03-10 09:57:31.620143318 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Airflow/Multizone/BaseClasses/powerLawFixedM.mo" 2022-03-10 09:58:58.068154268 +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/Buildings 3.0.0/Airflow/Multizone/BaseClasses/windPressureLowRise.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Airflow/Multizone/BaseClasses/windPressureLowRise.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Airflow/Multizone/BaseClasses/windPressureLowRise.mo" 2022-03-10 09:57:31.620143318 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Airflow/Multizone/BaseClasses/windPressureLowRise.mo" 2022-03-10 09:58:58.064154268 +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/Buildings 3.0.0/Airflow/Multizone/DoorDiscretizedOperable.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Airflow/Multizone/DoorDiscretizedOperable.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Airflow/Multizone/DoorDiscretizedOperable.mo" 2022-03-10 09:57:31.620143318 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Airflow/Multizone/DoorDiscretizedOperable.mo" 2022-03-10 09:58:58.048154265 +0000 @@ -3,13 +3,13 @@ "Door model using discretization along height coordinate" extends Buildings.Airflow.Multizone.BaseClasses.DoorDiscretized; - parameter Modelica.SIunits.PressureDifference dpCloRat(min=0, + parameter Modelica.Units.SI.PressureDifference dpCloRat(min=0, displayUnit="Pa") = 4 "|Closed aperture rating conditions|Pressure drop at rating condition"; parameter Real CDCloRat(min=0, max=1)=1 "|Closed aperture rating conditions|Discharge coefficient"; - parameter Modelica.SIunits.Area LClo(min=0) + parameter Modelica.Units.SI.Area LClo(min=0) "|Closed aperture|Effective leakage area"; parameter Real CDOpe=0.65 "|Open aperture|Discharge coefficient"; @@ -21,8 +21,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/Buildings 3.0.0/Airflow/Multizone/EffectiveAirLeakageArea.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Airflow/Multizone/EffectiveAirLeakageArea.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Airflow/Multizone/EffectiveAirLeakageArea.mo" 2022-03-10 09:57:31.620143318 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Airflow/Multizone/EffectiveAirLeakageArea.mo" 2022-03-10 09:58:58.024154262 +0000 @@ -4,14 +4,14 @@ m=0.65, final A=CD/CDRat * L * dpRat^(0.5-m)); - parameter Modelica.SIunits.PressureDifference dpRat(min=0, + parameter Modelica.Units.SI.PressureDifference dpRat(min=0, displayUnit="Pa") = 4 "|Rating conditions|Pressure drop at rating condition"; parameter Real CDRat(min=0, max=1)=1 "|Rating conditions|Discharge coefficient"; - parameter Modelica.SIunits.Area L(min=0) "Effective leakage area"; + parameter Modelica.Units.SI.Area L(min=0) "Effective leakage area"; annotation ( Icon(graphics={ Rectangle( extent={{-50,48},{50,-42}}, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Airflow/Multizone/Examples/ClosedDoors.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Airflow/Multizone/Examples/ClosedDoors.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Airflow/Multizone/Examples/ClosedDoors.mo" 2022-03-10 09:57:31.620143318 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Airflow/Multizone/Examples/ClosedDoors.mo" 2022-03-10 09:58:57.928154250 +0000 @@ -27,7 +27,7 @@ annotation (Placement(transformation(extent={{40,40},{60,60}}))); Buildings.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/Buildings 3.0.0/Airflow/Multizone/Examples/OneEffectiveAirLeakageArea.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Airflow/Multizone/Examples/OneEffectiveAirLeakageArea.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Airflow/Multizone/Examples/OneEffectiveAirLeakageArea.mo" 2022-03-10 09:57:31.620143318 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Airflow/Multizone/Examples/OneEffectiveAirLeakageArea.mo" 2022-03-10 09:58:57.896154246 +0000 @@ -21,7 +21,7 @@ annotation (Placement(transformation(extent={{70,20},{90,40}}))); Buildings.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/Buildings 3.0.0/Airflow/Multizone/Examples/OneOpenDoor.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Airflow/Multizone/Examples/OneOpenDoor.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Airflow/Multizone/Examples/OneOpenDoor.mo" 2022-03-10 09:57:31.620143318 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Airflow/Multizone/Examples/OneOpenDoor.mo" 2022-03-10 09:58:57.876154244 +0000 @@ -26,7 +26,7 @@ annotation (Placement(transformation(extent={{60,60},{80,80}}))); Buildings.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/Buildings 3.0.0/Airflow/Multizone/Examples/ZonalFlow.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Airflow/Multizone/Examples/ZonalFlow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Airflow/Multizone/Examples/ZonalFlow.mo" 2022-03-10 09:57:31.620143318 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Airflow/Multizone/Examples/ZonalFlow.mo" 2022-03-10 09:58:57.808154235 +0000 @@ -2,8 +2,8 @@ model ZonalFlow "Model with prescribed air exchange between two volumes" extends Modelica.Icons.Example; package Medium = Buildings.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"; Buildings.Fluid.MixingVolumes.MixingVolume rooA( V=volA, redeclare package Medium = Medium, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Airflow/Multizone/MediumColumn.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Airflow/Multizone/MediumColumn.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Airflow/Multizone/MediumColumn.mo" 2022-03-10 09:57:31.620143318 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Airflow/Multizone/MediumColumn.mo" 2022-03-10 09:58:57.800154234 +0000 @@ -6,7 +6,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 Buildings.Airflow.Multizone.Types.densitySelection densitySelection "Select how to pick density" annotation (Evaluate=true); parameter Boolean allowFlowReversal=true @@ -27,13 +27,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(start=0) + Modelica.Units.SI.MassFlowRate m_flow(start=0) "Mass flow rate from port_a to port_b (m_flow > 0 is design flow direction)"; - Modelica.SIunits.PressureDifference dp(start=0, displayUnit="Pa") + Modelica.Units.SI.PressureDifference dp(start=0, 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/Buildings 3.0.0/Airflow/Multizone/MediumColumnDynamic.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Airflow/Multizone/MediumColumnDynamic.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Airflow/Multizone/MediumColumnDynamic.mo" 2022-03-10 09:57:31.620143318 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Airflow/Multizone/MediumColumnDynamic.mo" 2022-03-10 09:58:57.784154232 +0000 @@ -7,12 +7,12 @@ 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 Boolean allowFlowReversal=true "= true to allow flow reversal, false restricts to design direction (port_a -> port_b)" annotation (Dialog(tab="Assumptions"),Evaluate=true); - 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")); Modelica.Fluid.Interfaces.FluidPort_a port_a( @@ -63,7 +63,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/Buildings 3.0.0/Airflow/Multizone/ZonalFlow_ACS.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Airflow/Multizone/ZonalFlow_ACS.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Airflow/Multizone/ZonalFlow_ACS.mo" 2022-03-10 09:57:31.620143318 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Airflow/Multizone/ZonalFlow_ACS.mo" 2022-03-10 09:58:57.716154224 +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/Buildings 3.0.0/BoundaryConditions/SkyTemperature/BlackBody.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/SkyTemperature/BlackBody.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/SkyTemperature/BlackBody.mo" 2022-03-10 09:57:31.620143318 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/SkyTemperature/BlackBody.mo" 2022-03-10 09:58:57.652154215 +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 == Buildings.BoundaryConditions.Types.SkyTemperatureCalculation.TemperaturesAndSkyCover then diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/SolarGeometry/BaseClasses/Examples/SolarAzimuth.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/SolarGeometry/BaseClasses/Examples/SolarAzimuth.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/SolarGeometry/BaseClasses/Examples/SolarAzimuth.mo" 2022-03-10 09:57:31.620143318 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/SolarGeometry/BaseClasses/Examples/SolarAzimuth.mo" 2022-03-10 09:58:57.584154207 +0000 @@ -1,7 +1,7 @@ within Buildings.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"; Buildings.BoundaryConditions.SolarGeometry.BaseClasses.SolarHourAngle solHouAng "Solar hour angle" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/SolarGeometry/BaseClasses/Examples/WallSolarAzimuth.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/SolarGeometry/BaseClasses/Examples/WallSolarAzimuth.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/SolarGeometry/BaseClasses/Examples/WallSolarAzimuth.mo" 2022-03-10 09:57:31.620143318 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/SolarGeometry/BaseClasses/Examples/WallSolarAzimuth.mo" 2022-03-10 09:58:57.568154204 +0000 @@ -17,7 +17,7 @@ Buildings.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/Buildings 3.0.0/BoundaryConditions/SolarGeometry/BaseClasses/IncidenceAngle.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/SolarGeometry/BaseClasses/IncidenceAngle.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/SolarGeometry/BaseClasses/IncidenceAngle.mo" 2022-03-10 09:57:31.620143318 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/SolarGeometry/BaseClasses/IncidenceAngle.mo" 2022-03-10 09:58:57.552154203 +0000 @@ -1,10 +1,10 @@ within Buildings.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="degree") + parameter Modelica.Units.SI.Angle lat "Latitude"; + parameter Modelica.Units.SI.Angle azi(displayUnit="degree") "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="degree") + parameter Modelica.Units.SI.Angle til(displayUnit="degree") "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/Buildings 3.0.0/BoundaryConditions/SolarGeometry/BaseClasses/SolarAzimuth.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/SolarGeometry/BaseClasses/SolarAzimuth.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/SolarGeometry/BaseClasses/SolarAzimuth.mo" 2022-03-10 09:57:31.620143318 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/SolarGeometry/BaseClasses/SolarAzimuth.mo" 2022-03-10 09:58:57.544154201 +0000 @@ -1,7 +1,7 @@ within Buildings.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}}))); @@ -20,8 +20,8 @@ protected Real arg "cos(solAzi) after data validity check"; Real tmp "cos(solAzi) before data validity check"; - 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/Buildings 3.0.0/BoundaryConditions/SolarGeometry/BaseClasses/WallSolarAzimuth.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/SolarGeometry/BaseClasses/WallSolarAzimuth.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/SolarGeometry/BaseClasses/WallSolarAzimuth.mo" 2022-03-10 09:57:31.620143318 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/SolarGeometry/BaseClasses/WallSolarAzimuth.mo" 2022-03-10 09:58:57.528154200 +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/Buildings 3.0.0/BoundaryConditions/SolarGeometry/BaseClasses/ZenithAngle.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/SolarGeometry/BaseClasses/ZenithAngle.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/SolarGeometry/BaseClasses/ZenithAngle.mo" 2022-03-10 09:57:31.620143318 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/SolarGeometry/BaseClasses/ZenithAngle.mo" 2022-03-10 09:58:57.492154195 +0000 @@ -1,7 +1,7 @@ within Buildings.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/Buildings 3.0.0/BoundaryConditions/SolarGeometry/Examples/ProjectedShadowLength.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/SolarGeometry/Examples/ProjectedShadowLength.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/SolarGeometry/Examples/ProjectedShadowLength.mo" 2022-03-10 09:57:31.620143318 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/SolarGeometry/Examples/ProjectedShadowLength.mo" 2022-03-10 09:58:57.472154192 +0000 @@ -1,7 +1,7 @@ within Buildings.BoundaryConditions.SolarGeometry.Examples; model ProjectedShadowLength "Test model for projected shadow length" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Length h = 2 "Height of object"; + parameter Modelica.Units.SI.Length h = 2 "Height of object"; Buildings.BoundaryConditions.SolarGeometry.ProjectedShadowLength proShaLenEas( azi=Buildings.Types.Azimuth.E, h=h, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/SolarGeometry/IncidenceAngle.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/SolarGeometry/IncidenceAngle.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/SolarGeometry/IncidenceAngle.mo" 2022-03-10 09:57:31.624143317 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/SolarGeometry/IncidenceAngle.mo" 2022-03-10 09:58:57.460154191 +0000 @@ -1,9 +1,9 @@ within Buildings.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/Buildings 3.0.0/BoundaryConditions/SolarGeometry/ProjectedShadowLength.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/SolarGeometry/ProjectedShadowLength.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/SolarGeometry/ProjectedShadowLength.mo" 2022-03-10 09:57:31.624143317 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/SolarGeometry/ProjectedShadowLength.mo" 2022-03-10 09:58:57.440154188 +0000 @@ -9,18 +9,18 @@ caption="Select weather file"), group="Location")); - parameter Modelica.SIunits.Angle lon(displayUnit="deg")= + parameter Modelica.Units.SI.Angle lon(displayUnit="deg")= Buildings.BoundaryConditions.WeatherData.BaseClasses.getLongitudeTMY3( filNam) "Longitude" annotation (Evaluate=true, Dialog(group="Location")); - parameter Modelica.SIunits.Angle lat(displayUnit="deg")= + parameter Modelica.Units.SI.Angle lat(displayUnit="deg")= Buildings.BoundaryConditions.WeatherData.BaseClasses.getLatitudeTMY3( filNam) "Latitude" annotation (Evaluate=true, Dialog(group="Location")); - parameter Modelica.SIunits.Time timZon(displayUnit="h")= + parameter Modelica.Units.SI.Time timZon(displayUnit="h")= Buildings.BoundaryConditions.WeatherData.BaseClasses.getTimeZoneTMY3(filNam) "Time zone" annotation (Evaluate=true, Dialog(group="Location")); - parameter Modelica.SIunits.Length h "Height of surface"; - parameter Modelica.SIunits.Angle azi "Surface azimuth"; + parameter Modelica.Units.SI.Length h "Height of surface"; + parameter Modelica.Units.SI.Angle azi "Surface azimuth"; Modelica.Blocks.Interfaces.RealOutput y( final quantity="Length", diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/SolarGeometry/ZenithAngle.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/SolarGeometry/ZenithAngle.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/SolarGeometry/ZenithAngle.mo" 2022-03-10 09:57:31.624143317 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/SolarGeometry/ZenithAngle.mo" 2022-03-10 09:58:57.404154184 +0000 @@ -1,7 +1,7 @@ within Buildings.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/Buildings 3.0.0/BoundaryConditions/SolarIrradiation/BaseClasses/DiffuseIsotropic.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/SolarIrradiation/BaseClasses/DiffuseIsotropic.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/SolarIrradiation/BaseClasses/DiffuseIsotropic.mo" 2022-03-10 09:57:31.624143317 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/SolarIrradiation/BaseClasses/DiffuseIsotropic.mo" 2022-03-10 09:58:57.376154181 +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/Buildings 3.0.0/BoundaryConditions/SolarIrradiation/BaseClasses/DiffusePerez.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/SolarIrradiation/BaseClasses/DiffusePerez.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/SolarIrradiation/BaseClasses/DiffusePerez.mo" 2022-03-10 09:57:31.624143317 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/SolarIrradiation/BaseClasses/DiffusePerez.mo" 2022-03-10 09:58:57.372154180 +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/Buildings 3.0.0/BoundaryConditions/SolarIrradiation/BaseClasses/PartialSolarIrradiation.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/SolarIrradiation/BaseClasses/PartialSolarIrradiation.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/SolarIrradiation/BaseClasses/PartialSolarIrradiation.mo" 2022-03-10 09:57:31.624143317 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/SolarIrradiation/BaseClasses/PartialSolarIrradiation.mo" 2022-03-10 09:58:57.312154173 +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/Buildings 3.0.0/BoundaryConditions/SolarIrradiation/DiffusePerez.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/SolarIrradiation/DiffusePerez.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/SolarIrradiation/DiffusePerez.mo" 2022-03-10 09:57:31.624143317 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/SolarIrradiation/DiffusePerez.mo" 2022-03-10 09:58:57.236154163 +0000 @@ -5,8 +5,8 @@ Buildings.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/Buildings 3.0.0/BoundaryConditions/SolarIrradiation/DirectTiltedSurface.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/SolarIrradiation/DirectTiltedSurface.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/SolarIrradiation/DirectTiltedSurface.mo" 2022-03-10 09:57:31.624143317 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/SolarIrradiation/DirectTiltedSurface.mo" 2022-03-10 09:58:57.212154160 +0000 @@ -3,8 +3,8 @@ extends Buildings.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"; Buildings.BoundaryConditions.WeatherData.Bus weaBus "Weather data" annotation (Placement(transformation(extent={{-110,-10},{-90,10}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/SolarIrradiation/Examples/DiffusePerez.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/SolarIrradiation/Examples/DiffusePerez.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/SolarIrradiation/Examples/DiffusePerez.mo" 2022-03-10 09:57:31.624143317 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/SolarIrradiation/Examples/DiffusePerez.mo" 2022-03-10 09:58:57.192154158 +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"; Buildings.BoundaryConditions.WeatherData.ReaderTMY3 weaDat(filNam= "modelica://Buildings/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/Buildings 3.0.0/BoundaryConditions/SolarIrradiation/Examples/DirectTiltedSurface.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/SolarIrradiation/Examples/DirectTiltedSurface.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/SolarIrradiation/Examples/DirectTiltedSurface.mo" 2022-03-10 09:57:31.624143317 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/SolarIrradiation/Examples/DirectTiltedSurface.mo" 2022-03-10 09:58:57.184154156 +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"; Buildings.BoundaryConditions.WeatherData.ReaderTMY3 weaDat(filNam= "modelica://Buildings/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/Buildings 3.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckBlackBodySkyTemperature.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckBlackBodySkyTemperature.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckBlackBodySkyTemperature.mo" 2022-03-10 09:57:31.624143317 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckBlackBodySkyTemperature.mo" 2022-03-10 09:58:57.152154152 +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/Buildings 3.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckCeilingHeight.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckCeilingHeight.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckCeilingHeight.mo" 2022-03-10 09:57:31.624143317 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckCeilingHeight.mo" 2022-03-10 09:58:57.140154150 +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 = Buildings.Utilities.Math.Functions.smoothMax( ceiHeiIn, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckIRRadiation.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckIRRadiation.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckIRRadiation.mo" 2022-03-10 09:57:31.624143317 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckIRRadiation.mo" 2022-03-10 09:58:57.132154149 +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 = Buildings.Utilities.Math.Functions.smoothMax( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckPressure.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckPressure.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckPressure.mo" 2022-03-10 09:57:31.624143317 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckPressure.mo" 2022-03-10 09:58:57.124154148 +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/Buildings 3.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckRadiation.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckRadiation.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckRadiation.mo" 2022-03-10 09:57:31.624143317 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckRadiation.mo" 2022-03-10 09:58:57.116154148 +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 = Buildings.Utilities.Math.Functions.smoothMax( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckTemperature.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckTemperature.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckTemperature.mo" 2022-03-10 09:57:31.624143317 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckTemperature.mo" 2022-03-10 09:58:57.100154145 +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/Buildings 3.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckWindSpeed.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckWindSpeed.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckWindSpeed.mo" 2022-03-10 09:57:31.624143317 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckWindSpeed.mo" 2022-03-10 09:58:57.084154144 +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/Buildings 3.0.0/BoundaryConditions/WeatherData/BaseClasses/ConvertRadiation.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/WeatherData/BaseClasses/ConvertRadiation.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/WeatherData/BaseClasses/ConvertRadiation.mo" 2022-03-10 09:57:31.624143317 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/WeatherData/BaseClasses/ConvertRadiation.mo" 2022-03-10 09:58:57.076154142 +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/Buildings 3.0.0/BoundaryConditions/WeatherData/BaseClasses/ConvertTime.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/WeatherData/BaseClasses/ConvertTime.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/WeatherData/BaseClasses/ConvertTime.mo" 2022-03-10 09:57:31.624143317 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/WeatherData/BaseClasses/ConvertTime.mo" 2022-03-10 09:58:57.036154137 +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/Buildings 3.0.0/BoundaryConditions/WeatherData/BaseClasses/Examples/GetHeaderElement.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/WeatherData/BaseClasses/Examples/GetHeaderElement.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/WeatherData/BaseClasses/Examples/GetHeaderElement.mo" 2022-03-10 09:57:31.624143317 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/WeatherData/BaseClasses/Examples/GetHeaderElement.mo" 2022-03-10 09:58:56.936154124 +0000 @@ -1,13 +1,13 @@ within Buildings.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"; - initial equation longitude = Buildings.BoundaryConditions.WeatherData.BaseClasses.getLongitudeTMY3( filNam="modelica://Buildings/Resources/weatherdata/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.mos"); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/WeatherData/BaseClasses/LocalCivilTime.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/WeatherData/BaseClasses/LocalCivilTime.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/WeatherData/BaseClasses/LocalCivilTime.mo" 2022-03-10 09:57:31.624143317 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/WeatherData/BaseClasses/LocalCivilTime.mo" 2022-03-10 09:58:56.920154123 +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/Buildings 3.0.0/BoundaryConditions/WeatherData/BaseClasses/getLatitudeTMY3.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/WeatherData/BaseClasses/getLatitudeTMY3.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/WeatherData/BaseClasses/getLatitudeTMY3.mo" 2022-03-10 09:57:31.624143317 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/WeatherData/BaseClasses/getLatitudeTMY3.mo" 2022-03-10 09:58:56.892154119 +0000 @@ -4,7 +4,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/Buildings 3.0.0/BoundaryConditions/WeatherData/BaseClasses/getLongitudeTMY3.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/WeatherData/BaseClasses/getLongitudeTMY3.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/WeatherData/BaseClasses/getLongitudeTMY3.mo" 2022-03-10 09:57:31.624143317 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/WeatherData/BaseClasses/getLongitudeTMY3.mo" 2022-03-10 09:58:56.856154115 +0000 @@ -4,7 +4,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/Buildings 3.0.0/BoundaryConditions/WeatherData/BaseClasses/getTimeZoneTMY3.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/WeatherData/BaseClasses/getTimeZoneTMY3.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/WeatherData/BaseClasses/getTimeZoneTMY3.mo" 2022-03-10 09:57:31.624143317 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/WeatherData/BaseClasses/getTimeZoneTMY3.mo" 2022-03-10 09:58:56.848154113 +0000 @@ -4,7 +4,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/Buildings 3.0.0/BoundaryConditions/WeatherData/ReaderTMY3.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/WeatherData/ReaderTMY3.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/WeatherData/ReaderTMY3.mo" 2022-03-10 09:57:31.624143317 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/BoundaryConditions/WeatherData/ReaderTMY3.mo" 2022-03-10 09:58:56.820154111 +0000 @@ -9,7 +9,7 @@ parameter Buildings.BoundaryConditions.Types.DataSource pAtmSou=Buildings.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 Buildings.BoundaryConditions.Types.DataSource TDryBulSou=Buildings.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 Buildings.BoundaryConditions.Types.DataSource TDewPoiSou=Buildings.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 Buildings.BoundaryConditions.Types.DataSource TBlaSkySou=Buildings.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 Buildings.BoundaryConditions.Types.DataSource winSpeSou=Buildings.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 Buildings.BoundaryConditions.Types.DataSource winDirSou=Buildings.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 Buildings.BoundaryConditions.Types.DataSource HInfHorSou=Buildings.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")= Buildings.BoundaryConditions.WeatherData.BaseClasses.getLongitudeTMY3( filNam) "Longitude"; - final parameter Modelica.SIunits.Angle lat(displayUnit="deg")= + final parameter Modelica.Units.SI.Angle lat(displayUnit="deg")= Buildings.BoundaryConditions.WeatherData.BaseClasses.getLatitudeTMY3( filNam) "Latitude"; - final parameter Modelica.SIunits.Time timZon(displayUnit="h")= + final parameter Modelica.Units.SI.Time timZon(displayUnit="h")= Buildings.BoundaryConditions.WeatherData.BaseClasses.getTimeZoneTMY3(filNam) "Time zone"; Bus weaBus "Weather data bus" annotation (Placement(transformation(extent={{ @@ -409,12 +409,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", @@ -461,7 +462,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", @@ -504,7 +505,6 @@ ")); end Longitude; - equation //--------------------------------------------------------------------------- // Select atmospheric pressure connector diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/Continuous/Examples/LimPID.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/Continuous/Examples/LimPID.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/Continuous/Examples/LimPID.mo" 2022-03-10 09:57:31.624143317 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/Continuous/Examples/LimPID.mo" 2022-03-10 09:58:56.708154096 +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}}))); Buildings.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) @@ -34,7 +34,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}}))); Buildings.Utilities.Diagnostics.AssertEquality assertEquality1( threShold=1e-10) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/Continuous/Examples/NumberOfRequests.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/Continuous/Examples/NumberOfRequests.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/Continuous/Examples/NumberOfRequests.mo" 2022-03-10 09:57:31.624143317 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/Continuous/Examples/NumberOfRequests.mo" 2022-03-10 09:58:56.692154095 +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.25) annotation (Placement(transformation(extent={{-60,20},{-40,40}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/Continuous/Examples/PIDHysteresis.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/Continuous/Examples/PIDHysteresis.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/Continuous/Examples/PIDHysteresis.mo" 2022-03-10 09:57:31.624143317 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/Continuous/Examples/PIDHysteresis.mo" 2022-03-10 09:58:56.680154093 +0000 @@ -25,7 +25,7 @@ Buildings.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/Buildings 3.0.0/Controls/Continuous/Examples/PIDHysteresisTimer.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/Continuous/Examples/PIDHysteresisTimer.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/Continuous/Examples/PIDHysteresisTimer.mo" 2022-03-10 09:57:31.624143317 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/Continuous/Examples/PIDHysteresisTimer.mo" 2022-03-10 09:58:56.668154091 +0000 @@ -26,7 +26,7 @@ Buildings.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/Buildings 3.0.0/Controls/Continuous/Examples/SignalRanker.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/Continuous/Examples/SignalRanker.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/Continuous/Examples/SignalRanker.mo" 2022-03-10 09:57:31.624143317 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/Continuous/Examples/SignalRanker.mo" 2022-03-10 09:58:56.660154091 +0000 @@ -1,14 +1,14 @@ within Buildings.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}}))); Buildings.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/Buildings 3.0.0/Controls/Continuous/OffTimer.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/Continuous/OffTimer.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/Continuous/OffTimer.mo" 2022-03-10 09:57:31.624143317 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/Continuous/OffTimer.mo" 2022-03-10 09:58:56.636154087 +0000 @@ -1,6 +1,6 @@ within Buildings.Controls.Continuous; model OffTimer "Records the time since the input changed to false" - extends Modelica.Blocks.Interfaces.partialBooleanBlockIcon; + extends Modelica.Blocks.Icons.PartialBooleanBlock; Modelica.Blocks.Interfaces.BooleanInput u "Connector of Boolean input signal" annotation (Placement(transformation( @@ -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) = 0; equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/Continuous/PIDHysteresis.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/Continuous/PIDHysteresis.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/Continuous/PIDHysteresis.mo" 2022-03-10 09:57:31.624143317 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/Continuous/PIDHysteresis.mo" 2022-03-10 09:58:56.628154085 +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 Boolean limitsAtInit=true diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/Continuous/PIDHysteresisTimer.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/Continuous/PIDHysteresisTimer.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/Continuous/PIDHysteresisTimer.mo" 2022-03-10 09:57:31.624143317 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/Continuous/PIDHysteresisTimer.mo" 2022-03-10 09:58:56.576154079 +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 Boolean limitsAtInit=true diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/DemandResponse/BaseClasses/NormalOperation.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/DemandResponse/BaseClasses/NormalOperation.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/DemandResponse/BaseClasses/NormalOperation.mo" 2022-03-10 09:57:31.624143317 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/DemandResponse/BaseClasses/NormalOperation.mo" 2022-03-10 09:58:56.524154072 +0000 @@ -1,6 +1,6 @@ within Buildings.Controls.DemandResponse.BaseClasses; block NormalOperation "Normal operation" - extends Modelica.StateGraph.StepWithSignal; + extends Modelica.StateGraph.StepWithSignal(nIn = 1, nOut = 1); Modelica.Blocks.Interfaces.RealInput PCon(unit="W") "Consumed electrical power" annotation (Placement(transformation(extent={{-140,-100},{-100,-60}}), diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/DemandResponse/BaseClasses/PartialDemandResponse.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/DemandResponse/BaseClasses/PartialDemandResponse.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/DemandResponse/BaseClasses/PartialDemandResponse.mo" 2022-03-10 09:57:31.624143317 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/DemandResponse/BaseClasses/PartialDemandResponse.mo" 2022-03-10 09:58:56.520154072 +0000 @@ -1,7 +1,7 @@ within Buildings.Controls.DemandResponse.BaseClasses; partial block PartialDemandResponse "Partial block that declares common data for demand response models" - extends Modelica.StateGraph.Step; + extends Modelica.StateGraph.Step(nIn = 1, nOut = 1); parameter Integer nSam "Number of intervals in a day for which baseline is computed"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/DemandResponse/BaseClasses/ShedOperation.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/DemandResponse/BaseClasses/ShedOperation.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/DemandResponse/BaseClasses/ShedOperation.mo" 2022-03-10 09:57:31.624143317 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/DemandResponse/BaseClasses/ShedOperation.mo" 2022-03-10 09:58:56.512154071 +0000 @@ -1,6 +1,6 @@ within Buildings.Controls.DemandResponse.BaseClasses; block ShedOperation "Computes the consumption with the shed taken into account" - extends Modelica.StateGraph.Step; + extends Modelica.StateGraph.Step(nIn = 1, nOut = 1); Modelica.Blocks.Interfaces.RealInput PCon(unit="W") "Consumed electrical power" annotation (Placement(transformation(extent={{-120,-90},{-100,-70}}), diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/DemandResponse/Client.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/DemandResponse/Client.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/DemandResponse/Client.mo" 2022-03-10 09:57:31.624143317 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/DemandResponse/Client.mo" 2022-03-10 09:58:56.508154070 +0000 @@ -1,10 +1,10 @@ within Buildings.Controls.DemandResponse; model Client "Demand response client" - extends Modelica.Blocks.Interfaces.BlockIcon; + extends Modelica.Blocks.Icons.Block; - final parameter Modelica.SIunits.Time tPeriod = 24*3600 + final parameter Modelica.Units.SI.Time tPeriod = 24*3600 "Period, generally one day"; - final parameter Modelica.SIunits.Time tSample=tPeriod/nSam + final parameter Modelica.Units.SI.Time tSample=tPeriod/nSam "Sample period, generally 900 or 3600 seconds"; parameter Integer nSam "Number of samples in a day. For 1 hour sampling, set to 24"; @@ -65,7 +65,7 @@ annotation (Placement(transformation(extent={{100,40},{120,60}}))); protected - Modelica.StateGraph.InitialStep initialStep + Modelica.StateGraph.InitialStep initialStep(nIn = 1, nOut = 1) annotation (Placement(transformation(extent={{-80,70},{-60,90}}))); inner Modelica.StateGraph.StateGraphRoot stateGraphRoot annotation (Placement(transformation(extent={{60,60},{80,80}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/Predictors/BaseClasses/Examples/SampleStart.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/Predictors/BaseClasses/Examples/SampleStart.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/Predictors/BaseClasses/Examples/SampleStart.mo" 2022-03-10 09:57:31.624143317 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/Predictors/BaseClasses/Examples/SampleStart.mo" 2022-03-10 09:58:56.416154059 +0000 @@ -1,10 +1,10 @@ within Buildings.Controls.Predictors.BaseClasses.Examples; model SampleStart "Test model for sampleStart function" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Time tSimSta[21] = {i for i in -10:10} + parameter Modelica.Units.SI.Time tSimSta[21] = {i for i in -10:10} "Simulation start times"; - parameter Modelica.SIunits.Time tSample = 5 "Sample time"; - parameter Modelica.SIunits.Time samSta[21](each fixed=false) + parameter Modelica.Units.SI.Time tSample = 5 "Sample time"; + parameter Modelica.Units.SI.Time samSta[21](each fixed=false) "Start of sampling time"; initial equation samSta = sampleStart(t= tSimSta, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/Predictors/BaseClasses/partialBaselinePrediction.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/Predictors/BaseClasses/partialBaselinePrediction.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/Predictors/BaseClasses/partialBaselinePrediction.mo" 2022-03-10 09:57:31.624143317 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/Predictors/BaseClasses/partialBaselinePrediction.mo" 2022-03-10 09:58:56.380154054 +0000 @@ -1,10 +1,10 @@ within Buildings.Controls.Predictors.BaseClasses; partial function partialBaselinePrediction "Partial function for baseline load prediction" - input Modelica.SIunits.Power P[:] + input Modelica.Units.SI.Power P[:] "Vector of power consumed in each interval of the current time of day"; input Integer k "Number of history terms that have already been stored"; - output Modelica.SIunits.Power y "Baseline power consumption"; + output Modelica.Units.SI.Power y "Baseline power consumption"; annotation (Documentation(info="
Partial function that defines the input and output arguments diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/Predictors/BaseClasses/sampleStart.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/Predictors/BaseClasses/sampleStart.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/Predictors/BaseClasses/sampleStart.mo" 2022-03-10 09:57:31.624143317 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/Predictors/BaseClasses/sampleStart.mo" 2022-03-10 09:58:56.372154053 +0000 @@ -1,9 +1,9 @@ within Buildings.Controls.Predictors.BaseClasses; function sampleStart "Start time for sampling" extends Modelica.Icons.Function; - input Modelica.SIunits.Time t "Simulation time"; - input Modelica.SIunits.Time samplePeriod "Sample Period"; - output Modelica.SIunits.Time sampleStart "Time at which first sample happens"; + input Modelica.Units.SI.Time t "Simulation time"; + input Modelica.Units.SI.Time samplePeriod "Sample Period"; + output Modelica.Units.SI.Time sampleStart "Time at which first sample happens"; algorithm sampleStart :=ceil(t/samplePeriod)*samplePeriod; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/Predictors/BaseClasses/weatherRegression.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/Predictors/BaseClasses/weatherRegression.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/Predictors/BaseClasses/weatherRegression.mo" 2022-03-10 09:57:31.624143317 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/Predictors/BaseClasses/weatherRegression.mo" 2022-03-10 09:58:56.368154052 +0000 @@ -1,12 +1,12 @@ within Buildings.Controls.Predictors.BaseClasses; function weatherRegression "Linear weather regression model" extends partialBaselinePrediction; - input Modelica.SIunits.Temperature TCur "Current temperature"; - input Modelica.SIunits.Temperature T[:] + input Modelica.Units.SI.Temperature TCur "Current temperature"; + input Modelica.Units.SI.Temperature T[:] "Vector of temperatures of each interval of the current time of day"; protected - Modelica.SIunits.Temperature TAve "Average temperature"; - Modelica.SIunits.Power PAve "Average power"; + Modelica.Units.SI.Temperature TAve "Average temperature"; + Modelica.Units.SI.Power PAve "Average power"; Real den(unit="K2") "Denominator"; Real a "Intercept"; Real b "Slope"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/Predictors/ElectricalLoad.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/Predictors/ElectricalLoad.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/Predictors/ElectricalLoad.mo" 2022-03-10 09:57:31.624143317 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/Predictors/ElectricalLoad.mo" 2022-03-10 09:58:56.364154053 +0000 @@ -17,14 +17,14 @@ parameter Boolean use_dayOfAdj=true "if true, use the day of adjustment" annotation (Dialog(group="Day of adjustment")); - parameter Modelica.SIunits.Time dayOfAdj_start( + parameter Modelica.Units.SI.Time dayOfAdj_start( max=0, displayUnit="h") = -14400 "Number of hours prior to current time when day of adjustment starts" annotation (Evaluate=true, Dialog(enable=use_dayOfAdj, group="Day of adjustment")); - parameter Modelica.SIunits.Time dayOfAdj_end( + parameter Modelica.Units.SI.Time dayOfAdj_end( max=0, displayUnit="h") = -3600 "Number of hours prior to current time when day of adjustment ends" @@ -73,9 +73,9 @@ discrete Real adj(unit="1") "Load adjustment factor"; protected - parameter Modelica.SIunits.Time samplePeriod=86400/nSam + parameter Modelica.Units.SI.Time samplePeriod=86400/nSam "Sample period of the component"; - parameter Modelica.SIunits.Time samStart(fixed=false) + parameter Modelica.Units.SI.Time samStart(fixed=false) "Time when the first sampling starts"; parameter Integer iDayOf_start = integer((nSam*dayOfAdj_start/86400+1E-8)) "Counter where day of look up begins"; @@ -84,22 +84,22 @@ parameter Integer nDayOf = iDayOf_end-iDayOf_start "Number of samples used for the day of adjustment"; - parameter Modelica.SIunits.Time dt = 86400/nSam + parameter Modelica.Units.SI.Time dt = 86400/nSam "Length of one sampling interval"; - discrete Modelica.SIunits.Power PAve "Average power over the past interval"; + discrete Modelica.Units.SI.Power PAve "Average power over the past interval"; Boolean sampleTrigger "True, if sample time instant"; - discrete output Modelica.SIunits.Energy ELast "Energy at the last sample"; - discrete output Modelica.SIunits.Time tLast + discrete output Modelica.Units.SI.Energy ELast "Energy at the last sample"; + discrete output Modelica.Units.SI.Time tLast "Time at which last sample occurred"; output Integer[nPre] iSam "Index for power of the current sampling interval"; - discrete output Modelica.SIunits.Power P[Buildings.Controls.Types.nDayTypes,nSam,nHis] + discrete output Modelica.Units.SI.Power P[Buildings.Controls.Types.nDayTypes,nSam,nHis] "Baseline power consumption"; // The temperature history is set to a zero array if it is not needed. // This significantly reduces the size of the code that needs to be compiled. - discrete output Modelica.SIunits.Temperature T[ + discrete output Modelica.Units.SI.Temperature T[ if predictionModel == Types.PredictionModel.WeatherRegression then Buildings.Controls.Types.nDayTypes else 0, if predictionModel == Types.PredictionModel.WeatherRegression then nSam else 0, if predictionModel == Types.PredictionModel.WeatherRegression then nHis else 0] @@ -116,12 +116,12 @@ Boolean _storeHistory "Flag, switched to false when block gets an storeHistory=false signal, and remaining false until midnight"; - discrete Modelica.SIunits.Energy EActAve + discrete Modelica.Units.SI.Energy EActAve "Actual energy over the day off period"; - discrete Modelica.SIunits.Energy EHisAve + discrete Modelica.Units.SI.Energy EHisAve "Actual load over the day off period, summed over all time intervals"; - discrete Modelica.SIunits.Power PPreHis[Buildings.Controls.Types.nDayTypes, nSam] + discrete Modelica.Units.SI.Power PPreHis[Buildings.Controls.Types.nDayTypes, nSam] "Predicted power consumptions for all day off time intervals"; Boolean PPreHisSet[Buildings.Controls.Types.nDayTypes, nSam](each start=false, each fixed=true) "Flag, true if a value in PPreHis has been set for that element"; @@ -148,17 +148,17 @@ // Functions function isMidNight - input Modelica.SIunits.Time t "Simulation time"; + input Modelica.Units.SI.Time t "Simulation time"; output Boolean r "True if time is midnight, false otherwise"; algorithm r := rem(t, 86400.0) < 1; end isMidNight; function getTypeOfDays - input Modelica.SIunits.Time t "Simulation time"; + input Modelica.Units.SI.Time t "Simulation time"; input Buildings.Controls.Types.Day[:] typeOfDay "Type of day as received from input connector"; - input Modelica.SIunits.Time dt "Length of one sampling interval"; + input Modelica.Units.SI.Time dt "Length of one sampling interval"; input Integer nPre "Number of predictions to be made"; output Integer[nPre] tod "Type of day for each prediction interval"; protected diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/Predictors/Validation/BaseClasses/PartialSimpleTestCase.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/Predictors/Validation/BaseClasses/PartialSimpleTestCase.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/Predictors/Validation/BaseClasses/PartialSimpleTestCase.mo" 2022-03-10 09:57:31.624143317 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/Predictors/Validation/BaseClasses/PartialSimpleTestCase.mo" 2022-03-10 09:58:56.308154046 +0000 @@ -3,8 +3,8 @@ "Partial base class for simple test case of base load prediction" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Time tPeriod = 24*3600 "Period"; - parameter Modelica.SIunits.Time tSample = 3600 "Sampling period"; + parameter Modelica.Units.SI.Time tPeriod = 24*3600 "Period"; + parameter Modelica.Units.SI.Time tSample = 3600 "Sampling period"; parameter Integer nPre(min=1) = 12 "Number of time steps to predict"; ElectricalLoad baseLoad( final nPre=nPre, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/Predictors/Validation/SineInput.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/Predictors/Validation/SineInput.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/Predictors/Validation/SineInput.mo" 2022-03-10 09:57:31.624143317 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/Predictors/Validation/SineInput.mo" 2022-03-10 09:58:56.256154039 +0000 @@ -7,7 +7,7 @@ Modelica.Blocks.Sources.Cosine PBas( amplitude=0.5, offset=0.5, - freqHz=1/tPeriod, +f =1/tPeriod, phase=3.1415926535898) "Measured power consumption" annotation (Placement(transformation(extent={{-100,-40},{-80,-20}}))); Sampler P(samplePeriod=tSample) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/SetPoints/HotWaterTemperatureReset.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/SetPoints/HotWaterTemperatureReset.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/SetPoints/HotWaterTemperatureReset.mo" 2022-03-10 09:57:31.624143317 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/SetPoints/HotWaterTemperatureReset.mo" 2022-03-10 09:58:56.208154032 +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/Buildings 3.0.0/Controls/SetPoints/OccupancySchedule.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/SetPoints/OccupancySchedule.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/SetPoints/OccupancySchedule.mo" 2022-03-10 09:57:31.624143317 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/SetPoints/OccupancySchedule.mo" 2022-03-10 09:58:56.192154030 +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 input Integer x1; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/SetPoints/Table.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/SetPoints/Table.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/SetPoints/Table.mo" 2022-03-10 09:57:31.624143317 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/SetPoints/Table.mo" 2022-03-10 09:58:56.180154030 +0000 @@ -16,7 +16,7 @@ size(table,1) "Number of columns"; final parameter Real[nCol,2] offsetVector = [zeros(nCol), offset*ones(nCol)] "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/Buildings 3.0.0/Controls/Sources/DayType.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/Sources/DayType.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/Sources/DayType.mo" 2022-03-10 09:57:31.624143317 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Controls/Sources/DayType.mo" 2022-03-10 09:58:56.136154024 +0000 @@ -21,11 +21,11 @@ {120,10}}), iconTransformation(extent={{100,-10},{120,10}}))); protected - parameter Modelica.SIunits.Time samplePeriod=86400 + parameter Modelica.Units.SI.Time samplePeriod=86400 "Sample period of the component"; output Integer iDay(min=1, max=size(days, 1)) "Pointer to days that determines what day type is sent to the output"; - parameter Modelica.SIunits.Time firstSample(fixed=false) + parameter Modelica.Units.SI.Time firstSample(fixed=false) "Time when the sampling starts"; output Boolean sampleTrigger "True, if sample time instant"; output Boolean skipIDayIncrement diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/Interfaces/PowerOutput.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/Interfaces/PowerOutput.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/Interfaces/PowerOutput.mo" 2022-03-10 09:57:31.624143317 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/Interfaces/PowerOutput.mo" 2022-03-10 09:58:56.104154020 +0000 @@ -1,9 +1,9 @@ within Buildings.Electrical.AC.Interfaces; connector PowerOutput "Connector with real power, reactive power and power factor" - output Modelica.SIunits.Power real "Real power"; - output Modelica.SIunits.ReactivePower apparent "Apparent power"; - output Modelica.SIunits.Angle phi "Phase shift"; + output Modelica.Units.SI.Power real "Real power"; + output Modelica.Units.SI.ReactivePower apparent "Apparent power"; + output Modelica.Units.SI.Angle phi "Phase shift"; output Real cosPhi "Power factor"; annotation (Icon(graphics={ Polygon( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Conversion/ACACConverter.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Conversion/ACACConverter.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Conversion/ACACConverter.mo" 2022-03-10 09:57:31.624143317 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Conversion/ACACConverter.mo" 2022-03-10 09:58:56.080154017 +0000 @@ -20,11 +20,11 @@ parameter Boolean ground_2 = true "If true, connect side 2 of converter to ground" annotation(Evaluate=true, Dialog(tab = "Ground", group="side 2")); - Modelica.SIunits.Power LossPower[2] "Loss power"; + Modelica.Units.SI.Power LossPower[2] "Loss power"; protected - Modelica.SIunits.Power P_p[2] = PhaseSystem_p.phasePowers_vi(terminal_p.v, terminal_p.i) + Modelica.Units.SI.Power P_p[2] = PhaseSystem_p.phasePowers_vi(terminal_p.v, terminal_p.i) "Power transmitted at pin p"; - Modelica.SIunits.Power P_n[2] = PhaseSystem_n.phasePowers_vi(terminal_n.v, terminal_n.i) + Modelica.Units.SI.Power P_n[2] = PhaseSystem_n.phasePowers_vi(terminal_n.v, terminal_n.i) "Power transmitted at pin n"; equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Conversion/ACACTransformer.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Conversion/ACACTransformer.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Conversion/ACACTransformer.mo" 2022-03-10 09:57:31.624143317 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Conversion/ACACTransformer.mo" 2022-03-10 09:58:56.072154016 +0000 @@ -10,11 +10,11 @@ redeclare Interfaces.Terminal_p terminal_p( i(start = zeros(PhaseSystem_p.n), each stateSelect = StateSelect.prefer))); - parameter Modelica.SIunits.Voltage VHigh + parameter Modelica.Units.SI.Voltage VHigh "Rms voltage on side 1 of the transformer (primary side)"; - parameter Modelica.SIunits.Voltage VLow + parameter Modelica.Units.SI.Voltage VLow "Rms voltage on side 2 of the transformer (secondary side)"; - parameter Modelica.SIunits.ApparentPower VABase + parameter Modelica.Units.SI.ApparentPower VABase "Nominal power of the transformer"; parameter Real XoverR "Ratio between the complex and real components of the impedance (XL/R)"; @@ -25,51 +25,51 @@ parameter Boolean ground_2 = true "If true, connect side 2 of converter to ground" annotation(Evaluate=true, Dialog(tab = "Ground", group="side 2")); - parameter Modelica.SIunits.Angle phi_1 = 0 + parameter Modelica.Units.SI.Angle phi_1 = 0 "Angle of the voltage side 1 at initialization" annotation(Evaluate=true,Dialog(tab = "Initialization")); - parameter Modelica.SIunits.Angle phi_2 = phi_1 + parameter Modelica.Units.SI.Angle phi_2 = phi_1 "Angle of the voltage side 2 at initialization" annotation(Evaluate=true, Dialog(tab = "Initialization")); - Modelica.SIunits.Efficiency eta "Efficiency"; - Modelica.SIunits.Power PLoss[2] "Loss power"; + Modelica.Units.SI.Efficiency eta "Efficiency"; + Modelica.Units.SI.Power PLoss[2] "Loss power"; protected Real N = VHigh/VLow "Winding ratio"; - Modelica.SIunits.Current IHigh = VABase/VHigh + + Modelica.Units.SI.Current IHigh = VABase/VHigh "Nominal current on primary side"; - Modelica.SIunits.Current ILow = VABase/VLow + Modelica.Units.SI.Current ILow = VABase/VLow "Nominal current on secondary side"; - Modelica.SIunits.Current IscHigh = IHigh/Zperc + Modelica.Units.SI.Current IscHigh = IHigh/Zperc "Short circuit current on primary side"; - Modelica.SIunits.Current IscLow = ILow/Zperc + Modelica.Units.SI.Current IscLow = ILow/Zperc "Short circuit current on secondary side"; - Modelica.SIunits.Impedance Zp = VHigh/IscHigh + Modelica.Units.SI.Impedance Zp = VHigh/IscHigh "Impedance of the primary side (module)"; - Modelica.SIunits.Impedance Z1[2]= + Modelica.Units.SI.Impedance Z1[2]= {Zp*cos(atan(XoverR)), Zp*sin(atan(XoverR))} "Impedance of the primary side of the transformer"; - Modelica.SIunits.Impedance Zs = VLow/IscLow + Modelica.Units.SI.Impedance Zs = VLow/IscLow "Impedance of the secondary side (module)"; - Modelica.SIunits.Impedance Z2[2]= + Modelica.Units.SI.Impedance Z2[2]= {Zs*cos(atan(XoverR)), Zs*sin(atan(XoverR))} "Impedance of the secondary side of the transformer"; - Modelica.SIunits.Voltage V1[2]( + Modelica.Units.SI.Voltage V1[2]( start = PhaseSystem_n.phaseVoltages(VHigh, phi_1)) "Voltage at the winding - primary side"; - Modelica.SIunits.Voltage V2[2]( + Modelica.Units.SI.Voltage V2[2]( start = PhaseSystem_p.phaseVoltages(VLow, phi_2)) "Voltage at the winding - secondary side"; - Modelica.SIunits.Power P_p[2]= + Modelica.Units.SI.Power P_p[2]= PhaseSystem_p.phasePowers_vi(terminal_p.v, terminal_p.i) "Power transmitted at pin p (secondary)"; - Modelica.SIunits.Power P_n[2]= + Modelica.Units.SI.Power P_n[2]= PhaseSystem_n.phasePowers_vi(terminal_n.v, terminal_n.i) "Power transmitted at pin n (primary)"; - Modelica.SIunits.Power S_p = Modelica.Fluid.Utilities.regRoot(P_p[1]^2 + P_p[2]^2, delta=0.1) + Modelica.Units.SI.Power S_p = Modelica.Fluid.Utilities.regRoot(P_p[1]^2 + P_p[2]^2, delta=0.1) "Apparent power at terminal p"; - Modelica.SIunits.Power S_n = Modelica.Fluid.Utilities.regRoot(P_n[1]^2 + P_n[2]^2, delta=0.1) + Modelica.Units.SI.Power S_n = Modelica.Fluid.Utilities.regRoot(P_n[1]^2 + P_n[2]^2, delta=0.1) "Apparent power at terminal n"; - equation // Efficiency eta = Buildings.Utilities.Math.Functions.smoothMin( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Conversion/ACACTransformerFull.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Conversion/ACACTransformerFull.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Conversion/ACACTransformerFull.mo" 2022-03-10 09:57:31.624143317 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Conversion/ACACTransformerFull.mo" 2022-03-10 09:58:56.048154013 +0000 @@ -10,13 +10,13 @@ redeclare Interfaces.Terminal_p terminal_p( i(start = zeros(PhaseSystem_p.n), each stateSelect = StateSelect.prefer))); - parameter Modelica.SIunits.Voltage VHigh + parameter Modelica.Units.SI.Voltage VHigh "RMS voltage on side 1 of the transformer (primary side)"; - parameter Modelica.SIunits.Voltage VLow + parameter Modelica.Units.SI.Voltage VLow "RMS voltage on side 2 of the transformer (secondary side)"; - parameter Modelica.SIunits.ApparentPower VABase + parameter Modelica.Units.SI.ApparentPower VABase "Nominal power of the transformer"; - parameter Modelica.SIunits.Frequency f(start=60) "Nominal frequency"; + parameter Modelica.Units.SI.Frequency f(start=60) "Nominal frequency"; parameter Buildings.Electrical.Types.PerUnit R1(min=0) "Resistance on side 1 of the transformer (pu)"; parameter Buildings.Electrical.Types.PerUnit L1(min=0) @@ -38,43 +38,43 @@ annotation(Evaluate=true,Dialog(tab = "Ground", group="side 1")); parameter Boolean ground_2 = true "Connect side 2 of converter to ground" annotation(Evaluate=true, Dialog(tab = "Ground", group="side 2")); - parameter Modelica.SIunits.Angle phi_1 = 0 + parameter Modelica.Units.SI.Angle phi_1 = 0 "Angle of the voltage side 1 at initialization" annotation(Evaluate=true,Dialog(tab = "Initialization")); - parameter Modelica.SIunits.Angle phi_2 = phi_1 + parameter Modelica.Units.SI.Angle phi_2 = phi_1 "Angle of the voltage side 2 at initialization" annotation(Evaluate=true, Dialog(tab = "Initialization")); - Modelica.SIunits.Efficiency eta "Efficiency"; - Modelica.SIunits.Power PLoss[2] "Loss power"; + Modelica.Units.SI.Efficiency eta "Efficiency"; + Modelica.Units.SI.Power PLoss[2] "Loss power"; protected - parameter Modelica.SIunits.AngularVelocity omega_n = 2*Modelica.Constants.pi*f; + parameter Modelica.Units.SI.AngularVelocity omega_n = 2*Modelica.Constants.pi*f; parameter Real N = VHigh/VLow "Winding ratio"; - parameter Modelica.SIunits.Resistance RBaseHigh = VHigh^2/VABase + parameter Modelica.Units.SI.Resistance RBaseHigh = VHigh^2/VABase "Base impedance of the primary side"; - parameter Modelica.SIunits.Resistance RBaseLow = VLow^2/VABase + parameter Modelica.Units.SI.Resistance RBaseLow = VLow^2/VABase "Base impedance of the secondary side"; - Modelica.SIunits.Impedance Z1[2] = {RBaseHigh*R1, omega*L1*RBaseHigh/omega_n} + Modelica.Units.SI.Impedance Z1[2] = {RBaseHigh*R1, omega*L1*RBaseHigh/omega_n} "Impedance of the primary side of the transformer"; - Modelica.SIunits.Impedance Z2[2] = {RBaseLow*R2, omega*L2*RBaseLow/omega_n} + Modelica.Units.SI.Impedance Z2[2] = {RBaseLow*R2, omega*L2*RBaseLow/omega_n} "Impedance of the secondary side of the transformer"; - Modelica.SIunits.Impedance Zrm[2] = {RBaseHigh*Rm, 0} + Modelica.Units.SI.Impedance Zrm[2] = {RBaseHigh*Rm, 0} "Magnetization impedance - resistance"; - Modelica.SIunits.Impedance Zlm[2] = {0, omega*Lm*RBaseHigh/omega_n} + Modelica.Units.SI.Impedance Zlm[2] = {0, omega*Lm*RBaseHigh/omega_n} "Magnetization impedance - impedence"; - Modelica.SIunits.Voltage V1[2](start = PhaseSystem_n.phaseVoltages(VHigh, phi_1)) + Modelica.Units.SI.Voltage V1[2](start = PhaseSystem_n.phaseVoltages(VHigh, phi_1)) "Voltage at the winding - primary side"; - Modelica.SIunits.Voltage V2[2](start = PhaseSystem_n.phaseVoltages(VLow, phi_2)) + Modelica.Units.SI.Voltage V2[2](start = PhaseSystem_n.phaseVoltages(VLow, phi_2)) "Voltage at the winding - secondary side"; - Modelica.SIunits.Power P_p[2] = PhaseSystem_p.phasePowers_vi(terminal_p.v, terminal_p.i) + Modelica.Units.SI.Power P_p[2] = PhaseSystem_p.phasePowers_vi(terminal_p.v, terminal_p.i) "Power transmitted at pin p (secondary)"; - Modelica.SIunits.Power P_n[2] = PhaseSystem_n.phasePowers_vi(terminal_n.v, terminal_n.i) + Modelica.Units.SI.Power P_n[2] = PhaseSystem_n.phasePowers_vi(terminal_n.v, terminal_n.i) "Power transmitted at pin n (primary)"; - Modelica.SIunits.Power S_p = Modelica.Fluid.Utilities.regRoot(P_p[1]^2 + P_p[2]^2, delta=0.1) + Modelica.Units.SI.Power S_p = Modelica.Fluid.Utilities.regRoot(P_p[1]^2 + P_p[2]^2, delta=0.1) "Apparent power at terminal p"; - Modelica.SIunits.Power S_n = Modelica.Fluid.Utilities.regRoot(P_n[1]^2 + P_n[2]^2, delta=0.1) + Modelica.Units.SI.Power S_n = Modelica.Fluid.Utilities.regRoot(P_n[1]^2 + P_n[2]^2, delta=0.1) "Apparent power at terminal n"; - Modelica.SIunits.AngularVelocity omega "Angular velocity"; - Modelica.SIunits.Current Im[2] "Magnetization current"; + Modelica.Units.SI.AngularVelocity omega "Angular velocity"; + Modelica.Units.SI.Current Im[2] "Magnetization current"; equation assert(sqrt(P_p[1]^2 + P_p[2]^2) <= VABase*1.01, "The load power of the transformer is higher than VABase"); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Conversion/ACDCConverter.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Conversion/ACDCConverter.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Conversion/ACDCConverter.mo" 2022-03-10 09:57:31.624143317 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Conversion/ACDCConverter.mo" 2022-03-10 09:58:56.020154008 +0000 @@ -13,15 +13,15 @@ "Ratio of DC voltage / AC RMS voltage"; parameter Real eta(min=0, max=1) "Converter efficiency, pLoss = (1-eta) * Ptr"; - Modelica.SIunits.Power PLoss "Loss power"; + Modelica.Units.SI.Power PLoss "Loss power"; parameter Boolean ground_AC = false "Connect AC side of converter to ground" annotation(Evaluate=true, Dialog(tab = "Ground", group="AC side")); parameter Boolean ground_DC = true "Connect DC side of converter to ground" annotation(Evaluate=true, Dialog(tab = "Ground", group="DC side")); protected PhaseSystem_p.Current i_dc "DC current"; PhaseSystem_p.Voltage v_dc "DC voltage"; - Modelica.SIunits.Power P_p[2] = PhaseSystem_p.phasePowers_vi(terminal_p.v, terminal_p.i) + Modelica.Units.SI.Power P_p[2] = PhaseSystem_p.phasePowers_vi(terminal_p.v, terminal_p.i) "Power transmitted at pin p (secondary)"; - Modelica.SIunits.Power P_n[2] = PhaseSystem_n.phasePowers_vi(terminal_n.v, terminal_n.i) + Modelica.Units.SI.Power P_n[2] = PhaseSystem_n.phasePowers_vi(terminal_n.v, terminal_n.i) "Power transmitted at pin n (primary)"; equation //voltage relation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Lines/Examples/ACLine_L.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Lines/Examples/ACLine_L.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Lines/Examples/ACLine_L.mo" 2022-03-10 09:57:31.628143318 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Lines/Examples/ACLine_L.mo" 2022-03-10 09:58:55.872153990 +0000 @@ -1,7 +1,7 @@ within Buildings.Electrical.AC.OnePhase.Lines.Examples; model ACLine_L "Test model for a single phase inductive line" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Inductance Lbase = 10/2/Modelica.Constants.pi/60 + parameter Modelica.Units.SI.Inductance Lbase = 10/2/Modelica.Constants.pi/60 "Base value for the line inductances"; Sources.FixedVoltage E( definiteReference=true, f=60, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Lines/Examples/ACLine_RL.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Lines/Examples/ACLine_RL.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Lines/Examples/ACLine_RL.mo" 2022-03-10 09:57:31.628143318 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Lines/Examples/ACLine_RL.mo" 2022-03-10 09:58:55.848153987 +0000 @@ -1,9 +1,9 @@ within Buildings.Electrical.AC.OnePhase.Lines.Examples; model ACLine_RL "Test model for a single phase inductive-resistive line" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Resistance Rbase = 10 + parameter Modelica.Units.SI.Resistance Rbase = 10 "Base value for the line resistance"; - parameter Modelica.SIunits.Inductance Lbase = Rbase/2/Modelica.Constants.pi/60 + parameter Modelica.Units.SI.Inductance Lbase = Rbase/2/Modelica.Constants.pi/60 "Base value for the line inductance"; Sources.FixedVoltage E( definiteReference=true, f=60, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Lines/Network.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Lines/Network.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Lines/Network.mo" 2022-03-10 09:57:31.628143318 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Lines/Network.mo" 2022-03-10 09:58:55.820153984 +0000 @@ -16,7 +16,7 @@ group="Assumptions", enable=use_C), choices(choice=Buildings.Electrical.Types.Load.FixedZ_steady_state "Steady state", choice=Buildings.Electrical.Types.Load.FixedZ_dynamic "Dynamic")); - Modelica.SIunits.Voltage VAbs[grid.nNodes] "RMS voltage of the grid nodes"; + Modelica.Units.SI.Voltage VAbs[grid.nNodes] "RMS voltage of the grid nodes"; equation for i in 1:grid.nLinks loop connect(lines[i].terminal_p, terminal[grid.fromTo[i,1]]); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Lines/TwoPortInductance.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Lines/TwoPortInductance.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Lines/TwoPortInductance.mo" 2022-03-10 09:57:31.628143318 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Lines/TwoPortInductance.mo" 2022-03-10 09:58:55.812153982 +0000 @@ -14,7 +14,7 @@ "Type of model (e.g., steady state, dynamic, prescribed power consumption, etc.)" annotation (Evaluate=true, Dialog(group="Modeling assumption")); protected - Modelica.SIunits.AngularVelocity omega + Modelica.Units.SI.AngularVelocity omega "Frequency of the quasi-stationary sine waves"; equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Lines/TwoPortRL.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Lines/TwoPortRL.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Lines/TwoPortRL.mo" 2022-03-10 09:57:31.628143318 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Lines/TwoPortRL.mo" 2022-03-10 09:58:55.808153983 +0000 @@ -8,7 +8,7 @@ redeclare Interfaces.Terminal_n terminal_n, redeclare Interfaces.Terminal_p terminal_p, final C=0); - parameter Modelica.SIunits.Current i_start[PhaseSystem_p.n] = zeros(PhaseSystem_p.n) + parameter Modelica.Units.SI.Current i_start[PhaseSystem_p.n] = zeros(PhaseSystem_p.n) "Initial current phasor of the line (positive if entering from terminal p)" annotation (Dialog(enable = (mode==Buildings.Electrical.Types.Load.FixedZ_dynamic))); parameter Buildings.Electrical.Types.Load mode( @@ -18,9 +18,9 @@ "Type of model (e.g., steady state, dynamic, prescribed power consumption, etc.)" annotation (Evaluate=true, Dialog(group="Modeling assumption")); protected - Modelica.SIunits.Current i_p[2](start = i_start, each stateSelect=StateSelect.prefer) + Modelica.Units.SI.Current i_p[2](start = i_start, each stateSelect=StateSelect.prefer) "Current phasor at terminal p"; - Modelica.SIunits.AngularVelocity omega + Modelica.Units.SI.AngularVelocity omega "Frequency of the quasi-stationary sine waves"; initial equation if mode==Buildings.Electrical.Types.Load.FixedZ_dynamic then diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Lines/TwoPortRLC.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Lines/TwoPortRLC.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Lines/TwoPortRLC.mo" 2022-03-10 09:57:31.628143318 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Lines/TwoPortRLC.mo" 2022-03-10 09:58:55.796153981 +0000 @@ -8,7 +8,7 @@ redeclare package PhaseSystem = PhaseSystem_n), redeclare Interfaces.Terminal_p terminal_p( redeclare package PhaseSystem = PhaseSystem_p)); - parameter Modelica.SIunits.Voltage Vc_start[2] = {V_nominal,0} + parameter Modelica.Units.SI.Voltage Vc_start[2] = {V_nominal,0} "Initial voltage phasor of the capacitance located in the middle of the line" annotation (Dialog(enable = (mode==Buildings.Electrical.Types.Load.FixedZ_dynamic))); parameter Buildings.Electrical.Types.Load mode( @@ -18,11 +18,11 @@ "Type of model (e.g., steady state, dynamic, prescribed power consumption, etc.)" annotation (Evaluate=true, Dialog(group="Modeling assumption")); protected - Modelica.SIunits.Voltage Vc[2](start = Vc_start, each stateSelect=StateSelect.prefer) + Modelica.Units.SI.Voltage Vc[2](start = Vc_start, each stateSelect=StateSelect.prefer) "Voltage of the Capacitance located in the middle of the line"; - Modelica.SIunits.Current Ic[2] + Modelica.Units.SI.Current Ic[2] "Currenbt of the capacitance located in the middle of the line"; - Modelica.SIunits.AngularVelocity omega + Modelica.Units.SI.AngularVelocity omega "Frequency of the quasi-stationary sine waves"; initial equation if C > 0 and mode == Buildings.Electrical.Types.Load.FixedZ_dynamic then diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Loads/Impedance.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Loads/Impedance.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Loads/Impedance.mo" 2022-03-10 09:57:31.628143318 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Loads/Impedance.mo" 2022-03-10 09:58:55.656153963 +0000 @@ -4,9 +4,9 @@ redeclare replaceable package PhaseSystem = PhaseSystems.OnePhase, redeclare replaceable Interfaces.Terminal_n terminal); protected - Modelica.SIunits.AngularVelocity omega + Modelica.Units.SI.AngularVelocity omega "Frequency of the quasi-stationary sine waves"; - Modelica.SIunits.Reactance X(start = 1) "Complex component of the impedance"; + Modelica.Units.SI.Reactance X(start = 1) "Complex component of the impedance"; equation omega = der(PhaseSystem.thetaRef(terminal.theta)); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Sensors/Probe.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Sensors/Probe.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Sensors/Probe.mo" 2022-03-10 09:57:31.628143318 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Sensors/Probe.mo" 2022-03-10 09:58:55.596153955 +0000 @@ -1,7 +1,7 @@ within Buildings.Electrical.AC.OnePhase.Sensors; model Probe "Model of a probe that measures RMS voltage and angle" extends Icons.GeneralizedProbe; - parameter Modelica.SIunits.Voltage V_nominal(min=0, start = 110) + parameter Modelica.Units.SI.Voltage V_nominal(min=0, start = 110) "Nominal voltage (V_nominal >= 0)"; parameter Boolean perUnit = true "If true, display voltage in p.u."; replaceable Interfaces.Terminal_n term "Electrical connector" annotation (Placement( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Sources/Examples/VariablePowerSource.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Sources/Examples/VariablePowerSource.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Sources/Examples/VariablePowerSource.mo" 2022-03-10 09:57:31.628143318 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Sources/Examples/VariablePowerSource.mo" 2022-03-10 09:58:55.564153951 +0000 @@ -9,7 +9,7 @@ offset=200, startTime=1, amplitude=100, - freqHz=0.05) "Generated power" +f =0.05) "Generated power" annotation (Placement(transformation(extent={{-92,-10},{-72,10}}))); Buildings.Electrical.AC.OnePhase.Loads.Inductive RL(mode=Types.Load.VariableZ_y_input, P_nominal=-300, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Sources/FixedVoltage.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Sources/FixedVoltage.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Sources/FixedVoltage.mo" 2022-03-10 09:57:31.628143318 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Sources/FixedVoltage.mo" 2022-03-10 09:58:55.548153950 +0000 @@ -3,11 +3,11 @@ extends Buildings.Electrical.Interfaces.Source( redeclare package PhaseSystem = PhaseSystems.OnePhase, redeclare Interfaces.Terminal_p terminal); - parameter Modelica.SIunits.Frequency f(start=60) "Frequency of the source"; - parameter Modelica.SIunits.Voltage V(start = 110) "RMS voltage of the source"; - parameter Modelica.SIunits.Angle phiSou = 0 "Phase shift of the source"; + parameter Modelica.Units.SI.Frequency f(start=60) "Frequency of the source"; + parameter Modelica.Units.SI.Voltage V(start = 110) "RMS voltage of the source"; + parameter Modelica.Units.SI.Angle phiSou = 0 "Phase shift of the source"; protected - Modelica.SIunits.Angle thetaRel + Modelica.Units.SI.Angle thetaRel "Absolute angle of rotating system as offset to thetaRef"; equation if Connections.isRoot(terminal.theta) then diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Sources/Generator.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Sources/Generator.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Sources/Generator.mo" 2022-03-10 09:57:31.628143318 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Sources/Generator.mo" 2022-03-10 09:58:55.536153948 +0000 @@ -3,10 +3,10 @@ extends Buildings.Electrical.Interfaces.Source( redeclare package PhaseSystem = PhaseSystems.OnePhase, redeclare Interfaces.Terminal_p terminal); - parameter Modelica.SIunits.Frequency f(start=60) "Frequency of the source"; - parameter Modelica.SIunits.Angle phiGen(displayUnit="deg") = 0 + parameter Modelica.Units.SI.Frequency f(start=60) "Frequency of the source"; + parameter Modelica.Units.SI.Angle phiGen(displayUnit="deg") = 0 "Phase shift of the source"; - Modelica.SIunits.Current I "value of current"; + Modelica.Units.SI.Current I "value of current"; Modelica.Blocks.Interfaces.RealInput P "Variable power generated by the source" annotation (Placement(transformation( @@ -15,7 +15,7 @@ extent={{-20,-20},{20,20}}, origin={-100,0}))); protected - Modelica.SIunits.Angle thetaRel + Modelica.Units.SI.Angle thetaRel "Absolute angle of rotating system as offset to thetaRef"; equation if Connections.isRoot(terminal.theta) then diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Sources/Grid.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Sources/Grid.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Sources/Grid.mo" 2022-03-10 09:57:31.628143318 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Sources/Grid.mo" 2022-03-10 09:58:55.524153947 +0000 @@ -4,9 +4,9 @@ replaceable Buildings.Electrical.AC.OnePhase.Interfaces.Terminal_p terminal annotation (Placement(transformation(extent={{-10, -110},{10,-90}}), iconTransformation(extent={{-10,-110},{10,-90}}))); - parameter Modelica.SIunits.Frequency f(start=60) "Frequency of the source"; - parameter Modelica.SIunits.Voltage V(start = 110) "RMS voltage of the source"; - parameter Modelica.SIunits.Angle phiSou = 0 "Phase shift angle of the source"; + parameter Modelica.Units.SI.Frequency f(start=60) "Frequency of the source"; + parameter Modelica.Units.SI.Voltage V(start = 110) "RMS voltage of the source"; + parameter Modelica.Units.SI.Angle phiSou = 0 "Phase shift angle of the source"; Buildings.Electrical.AC.Interfaces.PowerOutput P "Power consumed from grid if negative, or fed to grid if positive" annotation (Placement(transformation(extent={{100,-10},{120,10}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Storage/Battery.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Storage/Battery.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Storage/Battery.mo" 2022-03-10 09:57:31.628143318 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/OnePhase/Storage/Battery.mo" 2022-03-10 09:58:55.460153939 +0000 @@ -5,14 +5,14 @@ Buildings.Electrical.PhaseSystems.OnePhase constrainedby Buildings.Electrical.PhaseSystems.PartialPhaseSystem "Phase system" annotation (choicesAllMatching=true); - parameter Modelica.SIunits.Efficiency etaCha(max=1) = 0.9 + parameter Modelica.Units.SI.Efficiency etaCha(max=1) = 0.9 "Efficiency during charging"; - parameter Modelica.SIunits.Efficiency etaDis(max=1) = 0.9 + parameter Modelica.Units.SI.Efficiency etaDis(max=1) = 0.9 "Efficiency during discharging"; parameter Real SOC_start(start=0.1) "Initial charge"; - parameter Modelica.SIunits.Energy EMax(min=0, displayUnit="kWh") + parameter Modelica.Units.SI.Energy EMax(min=0, displayUnit="kWh") "Maximum available charge"; - parameter Modelica.SIunits.Voltage V_nominal(start = 110) + parameter Modelica.Units.SI.Voltage V_nominal(start = 110) "Nominal voltage (V_nominal >= 0)"; parameter Boolean linearized=false "If =true introduce a linearization in the load"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesBalanced/Lines/Examples/ACLine_L.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesBalanced/Lines/Examples/ACLine_L.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesBalanced/Lines/Examples/ACLine_L.mo" 2022-03-10 09:57:31.628143318 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesBalanced/Lines/Examples/ACLine_L.mo" 2022-03-10 09:58:55.272153914 +0000 @@ -1,7 +1,7 @@ within Buildings.Electrical.AC.ThreePhasesBalanced.Lines.Examples; model ACLine_L "Test model for single phase inductive lines" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Inductance Lbase = 10/2/Modelica.Constants.pi/60 + parameter Modelica.Units.SI.Inductance Lbase = 10/2/Modelica.Constants.pi/60 "Base value for the line inductances"; ThreePhasesBalanced.Sources.FixedVoltage E(definiteReference=true, f=60, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesBalanced/Lines/Examples/ACLine_RL.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesBalanced/Lines/Examples/ACLine_RL.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesBalanced/Lines/Examples/ACLine_RL.mo" 2022-03-10 09:57:31.628143318 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesBalanced/Lines/Examples/ACLine_RL.mo" 2022-03-10 09:58:55.248153911 +0000 @@ -1,9 +1,9 @@ within Buildings.Electrical.AC.ThreePhasesBalanced.Lines.Examples; model ACLine_RL "Test model for single phase inductive-resistive lines" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Resistance Rbase = 10 + parameter Modelica.Units.SI.Resistance Rbase = 10 "Base value for the line resistance"; - parameter Modelica.SIunits.Inductance Lbase = Rbase/2/Modelica.Constants.pi/60 + parameter Modelica.Units.SI.Inductance Lbase = Rbase/2/Modelica.Constants.pi/60 "Base value for the line inductance"; ThreePhasesBalanced.Sources.FixedVoltage E(definiteReference=true, f=60, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesBalanced/Lines/Network.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesBalanced/Lines/Network.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesBalanced/Lines/Network.mo" 2022-03-10 09:57:31.628143318 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesBalanced/Lines/Network.mo" 2022-03-10 09:58:55.220153908 +0000 @@ -7,7 +7,7 @@ redeclare Lines.Line lines( redeclare replaceable Buildings.Electrical.Transmission.LowVoltageCables.Generic commercialCable=grid.cables)); - Modelica.SIunits.Voltage VAbs[grid.nNodes] "RMS voltage of the grid nodes"; + Modelica.Units.SI.Voltage VAbs[grid.nNodes] "RMS voltage of the grid nodes"; equation for i in 1:grid.nLinks loop connect(lines[i].terminal_p, terminal[grid.fromTo[i,1]]); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesBalanced/Loads/Examples/ThreePhases.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesBalanced/Loads/Examples/ThreePhases.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesBalanced/Loads/Examples/ThreePhases.mo" 2022-03-10 09:57:31.628143318 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesBalanced/Loads/Examples/ThreePhases.mo" 2022-03-10 09:58:55.144153899 +0000 @@ -2,11 +2,11 @@ model ThreePhases "Example that provides a comparison between AC one phase and three-phase balanced" extends Modelica.Icons.Example; - Modelica.SIunits.Power errorY= + Modelica.Units.SI.Power errorY= sqrt((sen_Y.S[1] - (sen_a.S[1] + sen_b.S[1] + sen_c.S[1]))^2 + (sen_Y.S[2] - (sen_a.S[2] + sen_b.S[2] + sen_c.S[2]))^2) "Difference of the power consumption in the star (Y) connection"; - Modelica.SIunits.Power errorD= + Modelica.Units.SI.Power errorD= sqrt((sen_D.S[1] - (sen_ab.S[1] + sen_bc.S[1] + sen_ca.S[1]))^2 + (sen_D.S[2] - (sen_ab.S[2] + sen_bc.S[2] + sen_ca.S[2]))^2) "Difference of the power consumption in the triangle (D) connection"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesBalanced/Loads/Impedance.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesBalanced/Loads/Impedance.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesBalanced/Loads/Impedance.mo" 2022-03-10 09:57:31.628143318 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesBalanced/Loads/Impedance.mo" 2022-03-10 09:58:55.120153895 +0000 @@ -10,9 +10,9 @@ choice=false "Triangle", __Dymola_radioButtons=true)); protected - Modelica.SIunits.AngularVelocity omega + Modelica.Units.SI.AngularVelocity omega "Frequency of the quasi-stationary sine waves"; - Modelica.SIunits.Reactance X(start = 1) "Complex component of the impedance"; + Modelica.Units.SI.Reactance X(start = 1) "Complex component of the impedance"; equation omega = der(PhaseSystem.thetaRef(terminal.theta)); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesBalanced/Sources/Examples/VariablePowerSource.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesBalanced/Sources/Examples/VariablePowerSource.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesBalanced/Sources/Examples/VariablePowerSource.mo" 2022-03-10 09:57:31.628143318 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesBalanced/Sources/Examples/VariablePowerSource.mo" 2022-03-10 09:58:54.972153876 +0000 @@ -9,7 +9,7 @@ offset=200, startTime=1, amplitude=100, - freqHz=0.05) "Generated power" +f =0.05) "Generated power" annotation (Placement(transformation(extent={{-92,-10},{-72,10}}))); Buildings.Electrical.AC.ThreePhasesBalanced.Loads.Inductive RL(mode=Types.Load.VariableZ_y_input, P_nominal=-300, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACConverter.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACConverter.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACConverter.mo" 2022-03-10 09:57:31.628143318 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACConverter.mo" 2022-03-10 09:58:54.896153866 +0000 @@ -19,7 +19,7 @@ ground_2=ground_2)); parameter Real conversionFactor "Ratio of QS rms voltage on side 2 / QS rms voltage on side 1"; - parameter Modelica.SIunits.Efficiency eta(max=1) + parameter Modelica.Units.SI.Efficiency eta(max=1) "Converter efficiency, pLoss = (1-eta) * Ptr"; parameter Boolean ground_1 = false "Connect side 1 of converter to ground" annotation(Dialog(tab = "Ground", group="side 1")); parameter Boolean ground_2 = true "Connect side 2 of converter to ground" annotation(Dialog(tab = "Ground", group="side 2")); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformer.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformer.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformer.mo" 2022-03-10 09:57:31.628143318 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformer.mo" 2022-03-10 09:58:54.884153866 +0000 @@ -29,11 +29,11 @@ ground_2=ground_2, VABase=VABase/3, phi_1=2.0943951023932)); - parameter Modelica.SIunits.Voltage VHigh + parameter Modelica.Units.SI.Voltage VHigh "Rms voltage on side 1 of the transformer (primary side)"; - parameter Modelica.SIunits.Voltage VLow + parameter Modelica.Units.SI.Voltage VLow "Rms voltage on side 2 of the transformer (secondary side)"; - parameter Modelica.SIunits.ApparentPower VABase + parameter Modelica.Units.SI.ApparentPower VABase "Nominal power of the transformer"; parameter Real XoverR "Ratio between the complex and real components of the impedance (XL/R)"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerDD.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerDD.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerDD.mo" 2022-03-10 09:57:31.628143318 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerDD.mo" 2022-03-10 09:58:54.860153863 +0000 @@ -29,11 +29,11 @@ VHigh=VHigh, VLow=VLow, phi_1=2.6179938779915)); - parameter Modelica.SIunits.Voltage VHigh + parameter Modelica.Units.SI.Voltage VHigh "Rms voltage on side 1 of the transformer (primary side)"; - parameter Modelica.SIunits.Voltage VLow + parameter Modelica.Units.SI.Voltage VLow "Rms voltage on side 2 of the transformer (secondary side)"; - parameter Modelica.SIunits.ApparentPower VABase + parameter Modelica.Units.SI.ApparentPower VABase "Nominal power of the transformer"; parameter Real XoverR "Ratio between the complex and real components of the impedance (XL/R)"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerFull.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerFull.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerFull.mo" 2022-03-10 09:57:31.628143318 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerFull.mo" 2022-03-10 09:58:54.804153855 +0000 @@ -33,13 +33,13 @@ ground_1=ground_1, ground_2=ground_2)); - parameter Modelica.SIunits.Voltage VHigh + parameter Modelica.Units.SI.Voltage VHigh "Rms voltage on side 1 of the transformer (primary side)"; - parameter Modelica.SIunits.Voltage VLow + parameter Modelica.Units.SI.Voltage VLow "Rms voltage on side 2 of the transformer (secondary side)"; - parameter Modelica.SIunits.ApparentPower VABase + parameter Modelica.Units.SI.ApparentPower VABase "Nominal power of the transformer"; - parameter Modelica.SIunits.Frequency f(start=60) "Nominal frequency"; + parameter Modelica.Units.SI.Frequency f(start=60) "Nominal frequency"; parameter Buildings.Electrical.Types.PerUnit R1(min=0) "Resistance on side 1 of the transformer (pu)"; parameter Buildings.Electrical.Types.PerUnit L1(min=0) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerStepDownDY.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerStepDownDY.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerStepDownDY.mo" 2022-03-10 09:57:31.628143318 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerStepDownDY.mo" 2022-03-10 09:58:54.788153852 +0000 @@ -30,11 +30,11 @@ VABase=VABase/3, VLow=-VLow/sqrt(3), phi_1=-1.5707963267949)); - parameter Modelica.SIunits.Voltage VHigh + parameter Modelica.Units.SI.Voltage VHigh "Rms voltage on side 1 of the transformer (primary side)"; - parameter Modelica.SIunits.Voltage VLow + parameter Modelica.Units.SI.Voltage VLow "Rms voltage on side 2 of the transformer (secondary side)"; - parameter Modelica.SIunits.ApparentPower VABase + parameter Modelica.Units.SI.ApparentPower VABase "Nominal power of the transformer"; parameter Real XoverR "Ratio between the complex and real components of the impedance (XL/R)"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerStepDownYD.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerStepDownYD.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerStepDownYD.mo" 2022-03-10 09:57:31.628143318 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerStepDownYD.mo" 2022-03-10 09:58:54.768153850 +0000 @@ -30,11 +30,11 @@ VABase=VABase/3, VLow=VLow, phi_1=2.0943951023932)); - parameter Modelica.SIunits.Voltage VHigh + parameter Modelica.Units.SI.Voltage VHigh "Rms voltage on side 1 of the transformer (primary side)"; - parameter Modelica.SIunits.Voltage VLow + parameter Modelica.Units.SI.Voltage VLow "Rms voltage on side 2 of the transformer (secondary side)"; - parameter Modelica.SIunits.ApparentPower VABase + parameter Modelica.Units.SI.ApparentPower VABase "Nominal power of the transformer"; parameter Real XoverR "Ratio between the complex and real components of the impedance (XL/R)"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerStepUpDY.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerStepUpDY.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerStepUpDY.mo" 2022-03-10 09:57:31.628143318 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerStepUpDY.mo" 2022-03-10 09:58:54.752153849 +0000 @@ -30,11 +30,11 @@ VABase=VABase/3, VLow=VLow/sqrt(3), phi_1=2.6179938779915)); - parameter Modelica.SIunits.Voltage VHigh + parameter Modelica.Units.SI.Voltage VHigh "Rms voltage on side 1 of the transformer (primary side)"; - parameter Modelica.SIunits.Voltage VLow + parameter Modelica.Units.SI.Voltage VLow "Rms voltage on side 2 of the transformer (secondary side)"; - parameter Modelica.SIunits.ApparentPower VABase + parameter Modelica.Units.SI.ApparentPower VABase "Nominal power of the transformer"; parameter Real XoverR "Ratio between the complex and real components of the impedance (XL/R)"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerStepUpYD.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerStepUpYD.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerStepUpYD.mo" 2022-03-10 09:57:31.628143318 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerStepUpYD.mo" 2022-03-10 09:58:54.732153847 +0000 @@ -30,11 +30,11 @@ VABase=VABase/3, VLow=-VLow, phi_1=2.0943951023932)); - parameter Modelica.SIunits.Voltage VHigh + parameter Modelica.Units.SI.Voltage VHigh "Rms voltage on side 1 of the transformer (primary side)"; - parameter Modelica.SIunits.Voltage VLow + parameter Modelica.Units.SI.Voltage VLow "Rms voltage on side 2 of the transformer (secondary side)"; - parameter Modelica.SIunits.ApparentPower VABase + parameter Modelica.Units.SI.ApparentPower VABase "Nominal power of the transformer"; parameter Real XoverR "Ratio between the complex and real components of the impedance (XL/R)"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/Examples/BaseClasses/TransformerExample.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/Examples/BaseClasses/TransformerExample.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/Examples/BaseClasses/TransformerExample.mo" 2022-03-10 09:57:31.628143318 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/Examples/BaseClasses/TransformerExample.mo" 2022-03-10 09:58:54.644153835 +0000 @@ -2,9 +2,9 @@ model TransformerExample "This example represents the basic test for a transformer model" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Voltage V_primary = 12470 + parameter Modelica.Units.SI.Voltage V_primary = 12470 "RMS Voltage on the primary side of the transformer"; - parameter Modelica.SIunits.Voltage V_secondary = 4160 + parameter Modelica.Units.SI.Voltage V_secondary = 4160 "RMS Voltage on the secondary side of the transformer"; Sources.FixedVoltage sou( f=60, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_L.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_L.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_L.mo" 2022-03-10 09:57:31.632143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_L.mo" 2022-03-10 09:58:54.332153795 +0000 @@ -1,7 +1,7 @@ within Buildings.Electrical.AC.ThreePhasesUnbalanced.Lines.Examples; model ACLine_L "Test model for a three-phase unbalanced inductive line" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Inductance Lbase = 10/2/Modelica.Constants.pi/60 + parameter Modelica.Units.SI.Inductance Lbase = 10/2/Modelica.Constants.pi/60 "Base value for the line inductances"; Sources.FixedVoltage E( definiteReference=true, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_L_N.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_L_N.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_L_N.mo" 2022-03-10 09:57:31.632143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_L_N.mo" 2022-03-10 09:58:54.320153793 +0000 @@ -2,7 +2,7 @@ model ACLine_L_N "Test model for a three-phase unbalanced inductive line with neutral cable" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Inductance Lbase = 10/2/Modelica.Constants.pi/60 + parameter Modelica.Units.SI.Inductance Lbase = 10/2/Modelica.Constants.pi/60 "Base value for the line inductances"; Sources.FixedVoltage_N E( definiteReference=true, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_RL.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_RL.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_RL.mo" 2022-03-10 09:57:31.632143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_RL.mo" 2022-03-10 09:58:54.288153789 +0000 @@ -2,9 +2,9 @@ model ACLine_RL "Test model for a three-phase unbalanced inductive-resistive line" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Resistance Rbase = 3*10 + parameter Modelica.Units.SI.Resistance Rbase = 3*10 "Base value for the line resistance"; - parameter Modelica.SIunits.Inductance Lbase = Rbase/2/Modelica.Constants.pi/60 + parameter Modelica.Units.SI.Inductance Lbase = Rbase/2/Modelica.Constants.pi/60 "Base value for the line inductance"; Sources.FixedVoltage E( definiteReference=true, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_RLC.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_RLC.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_RLC.mo" 2022-03-10 09:57:31.632143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_RLC.mo" 2022-03-10 09:58:54.276153788 +0000 @@ -1,11 +1,11 @@ within Buildings.Electrical.AC.ThreePhasesUnbalanced.Lines.Examples; model ACLine_RLC "Test model for a three-phase unbalanced RLC line" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Resistance RBase = 3*10 + parameter Modelica.Units.SI.Resistance RBase = 3*10 "Base value for the line resistance"; - parameter Modelica.SIunits.Inductance LBase = RBase/(2*Modelica.Constants.pi*60) + parameter Modelica.Units.SI.Inductance LBase = RBase/(2*Modelica.Constants.pi*60) "Base value for the line inductances"; - parameter Modelica.SIunits.Capacitance CBase = 3*0.1/(2*Modelica.Constants.pi*60) + parameter Modelica.Units.SI.Capacitance CBase = 3*0.1/(2*Modelica.Constants.pi*60) "Base value for the line inductances"; Sources.FixedVoltage E( definiteReference=true, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_RLC_N.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_RLC_N.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_RLC_N.mo" 2022-03-10 09:57:31.632143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_RLC_N.mo" 2022-03-10 09:58:54.264153786 +0000 @@ -2,11 +2,11 @@ model ACLine_RLC_N "Test model for a three-phase unbalanced RLC line with neutral cable" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Resistance RBase = 3*10 + parameter Modelica.Units.SI.Resistance RBase = 3*10 "Base value for the line resistance"; - parameter Modelica.SIunits.Inductance LBase = RBase/(2*Modelica.Constants.pi*60) + parameter Modelica.Units.SI.Inductance LBase = RBase/(2*Modelica.Constants.pi*60) "Base value for the line inductances"; - parameter Modelica.SIunits.Capacitance CBase = 3*0.1/(2*Modelica.Constants.pi*60) + parameter Modelica.Units.SI.Capacitance CBase = 3*0.1/(2*Modelica.Constants.pi*60) "Base value for the line inductances"; Sources.FixedVoltage_N E( definiteReference=true, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_RL_N.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_RL_N.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_RL_N.mo" 2022-03-10 09:57:31.632143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_RL_N.mo" 2022-03-10 09:58:54.240153784 +0000 @@ -2,9 +2,9 @@ model ACLine_RL_N "Test model for a three-phase unbalanced inductive-resistive line with neutral cable" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Resistance Rbase = 3*10 + parameter Modelica.Units.SI.Resistance Rbase = 3*10 "Base value for the line resistance"; - parameter Modelica.SIunits.Inductance Lbase = Rbase/2/Modelica.Constants.pi/60 + parameter Modelica.Units.SI.Inductance Lbase = Rbase/2/Modelica.Constants.pi/60 "Base value for the line inductance"; Sources.FixedVoltage_N E( definiteReference=true, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/Network.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/Network.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/Network.mo" 2022-03-10 09:57:31.632143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/Network.mo" 2022-03-10 09:58:54.172153775 +0000 @@ -5,7 +5,7 @@ Buildings.Electrical.AC.ThreePhasesUnbalanced.Interfaces.Terminal_p terminal, redeclare replaceable Transmission.Grids.TestGrid2Nodes grid, redeclare Buildings.Electrical.AC.ThreePhasesUnbalanced.Lines.Line lines(commercialCable=grid.cables)); - Modelica.SIunits.Voltage VAbs[3,grid.nNodes] + Modelica.Units.SI.Voltage VAbs[3,grid.nNodes] "RMS voltage of the grid nodes"; equation for i in 1:grid.nLinks loop diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/Network_N.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/Network_N.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/Network_N.mo" 2022-03-10 09:57:31.632143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/Network_N.mo" 2022-03-10 09:58:54.160153773 +0000 @@ -6,7 +6,7 @@ redeclare replaceable Transmission.Grids.TestGrid2Nodes grid, redeclare Buildings.Electrical.AC.ThreePhasesUnbalanced.Lines.Line_N lines( commercialCable=grid.cables)); - Modelica.SIunits.Voltage VAbs[3,grid.nNodes] + Modelica.Units.SI.Voltage VAbs[3,grid.nNodes] "RMS voltage of the grid nodes"; equation for i in 1:grid.nLinks loop diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortInductance.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortInductance.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortInductance.mo" 2022-03-10 09:57:31.632143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortInductance.mo" 2022-03-10 09:58:54.148153772 +0000 @@ -1,7 +1,7 @@ within Buildings.Electrical.AC.ThreePhasesUnbalanced.Lines; model TwoPortInductance "Model of an inductance with two electrical ports" extends Buildings.Electrical.AC.ThreePhasesUnbalanced.Interfaces.TwoPort; - parameter Modelica.SIunits.Inductance L "Inductance"; + parameter Modelica.Units.SI.Inductance L "Inductance"; OnePhase.Lines.TwoPortInductance phase1( final L=L/3) "Inductance line 1" annotation (Placement(transformation(extent={{-10,20},{10,40}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortInductance_N.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortInductance_N.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortInductance_N.mo" 2022-03-10 09:57:31.632143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortInductance_N.mo" 2022-03-10 09:58:54.136153770 +0000 @@ -2,8 +2,8 @@ model TwoPortInductance_N "Model of an inductance with two electrical ports and neutral line cable" extends Buildings.Electrical.AC.ThreePhasesUnbalanced.Interfaces.TwoPort_N; - parameter Modelica.SIunits.Inductance L "Inductance"; - parameter Modelica.SIunits.Inductance Ln "Inductance of neutral cable"; + parameter Modelica.Units.SI.Inductance L "Inductance"; + parameter Modelica.Units.SI.Inductance Ln "Inductance of neutral cable"; OnePhase.Lines.TwoPortInductance phase1( final L=L/3) "Inductance line 1" annotation (Placement(transformation(extent={{-10,32},{10,52}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortMatrixRL.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortMatrixRL.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortMatrixRL.mo" 2022-03-10 09:57:31.632143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortMatrixRL.mo" 2022-03-10 09:58:54.088153765 +0000 @@ -2,62 +2,62 @@ model TwoPortMatrixRL "Model of an RL line parameterized with impedance matrices" extends Buildings.Electrical.AC.ThreePhasesUnbalanced.Interfaces.TwoPort; - parameter Modelica.SIunits.Voltage V_nominal(min=0, start=480) + parameter Modelica.Units.SI.Voltage V_nominal(min=0, start=480) "Nominal voltage (V_nominal >= 0)" annotation(Evaluate=true, Dialog(group="Nominal conditions")); - parameter Modelica.SIunits.Impedance Z11[2] + parameter Modelica.Units.SI.Impedance Z11[2] "Element [1,1] of impedance matrix"; - parameter Modelica.SIunits.Impedance Z12[2] + parameter Modelica.Units.SI.Impedance Z12[2] "Element [1,2] of impedance matrix"; - parameter Modelica.SIunits.Impedance Z13[2] + parameter Modelica.Units.SI.Impedance Z13[2] "Element [1,3] of impedance matrix"; - parameter Modelica.SIunits.Impedance Z22[2] + parameter Modelica.Units.SI.Impedance Z22[2] "Element [2,2] of impedance matrix"; - parameter Modelica.SIunits.Impedance Z23[2] + parameter Modelica.Units.SI.Impedance Z23[2] "Element [2,3] of impedance matrix"; - parameter Modelica.SIunits.Impedance Z33[2] + parameter Modelica.Units.SI.Impedance Z33[2] "Element [3,3] of impedance matrix"; - final parameter Modelica.SIunits.Impedance[2] Z21 = Z12 + final parameter Modelica.Units.SI.Impedance[2] Z21 = Z12 "Element [2,1] of impedance matrix"; - final parameter Modelica.SIunits.Impedance[2] Z31 = Z13 + final parameter Modelica.Units.SI.Impedance[2] Z31 = Z13 "Element [3,1] of impedance matrix"; - final parameter Modelica.SIunits.Impedance[2] Z32 = Z23 + final parameter Modelica.Units.SI.Impedance[2] Z32 = Z23 "Element [3,1] of impedance matrix"; protected function productAC1p = Buildings.Electrical.PhaseSystems.OnePhase.product "Product between complex quantities"; - Modelica.SIunits.Current i1[2]( + Modelica.Units.SI.Current i1[2]( start = zeros(Buildings.Electrical.PhaseSystems.OnePhase.n), each stateSelect = StateSelect.prefer) = terminal_n.phase[1].i "Current in line 1"; - Modelica.SIunits.Current i2[2]( + Modelica.Units.SI.Current i2[2]( start = zeros(Buildings.Electrical.PhaseSystems.OnePhase.n), each stateSelect = StateSelect.prefer) = terminal_n.phase[2].i "Current in line 2"; - Modelica.SIunits.Current i3[2]( + Modelica.Units.SI.Current i3[2]( start = zeros(Buildings.Electrical.PhaseSystems.OnePhase.n), each stateSelect = StateSelect.prefer) = terminal_n.phase[3].i "Current in line 3"; - Modelica.SIunits.Voltage v1_n[2]( + Modelica.Units.SI.Voltage v1_n[2]( start = Buildings.Electrical.PhaseSystems.OnePhase.phaseVoltages(V_nominal/sqrt(3), phi= 0), each stateSelect = StateSelect.never) = terminal_n.phase[1].v "Voltage in line 1 at connector N"; - Modelica.SIunits.Voltage v2_n[2]( + Modelica.Units.SI.Voltage v2_n[2]( start = Buildings.Electrical.PhaseSystems.OnePhase.phaseVoltages(V_nominal/sqrt(3), phi= -2*Modelica.Constants.pi/3), each stateSelect = StateSelect.never) = terminal_n.phase[2].v "Voltage in line 2 at connector N"; - Modelica.SIunits.Voltage v3_n[2]( + Modelica.Units.SI.Voltage v3_n[2]( start = Buildings.Electrical.PhaseSystems.OnePhase.phaseVoltages(V_nominal/sqrt(3), phi= 2*Modelica.Constants.pi/3), each stateSelect = StateSelect.never) = terminal_n.phase[3].v "Voltage in line 3 at connector N"; - Modelica.SIunits.Voltage v1_p[2]( + Modelica.Units.SI.Voltage v1_p[2]( start = Buildings.Electrical.PhaseSystems.OnePhase.phaseVoltages(V_nominal/sqrt(3), phi= 0), each stateSelect = StateSelect.never) = terminal_p.phase[1].v "Voltage in line 1 at connector P"; - Modelica.SIunits.Voltage v2_p[2]( + Modelica.Units.SI.Voltage v2_p[2]( start = Buildings.Electrical.PhaseSystems.OnePhase.phaseVoltages(V_nominal/sqrt(3), phi= -2*Modelica.Constants.pi/3), each stateSelect = StateSelect.never) = terminal_p.phase[2].v "Voltage in line 2 at connector P"; - Modelica.SIunits.Voltage v3_p[2]( + Modelica.Units.SI.Voltage v3_p[2]( start = Buildings.Electrical.PhaseSystems.OnePhase.phaseVoltages(V_nominal/sqrt(3), phi= 2*Modelica.Constants.pi/3), each stateSelect = StateSelect.never) = terminal_p.phase[3].v "Voltage in line 3 at connector P"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortMatrixRLC.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortMatrixRLC.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortMatrixRLC.mo" 2022-03-10 09:57:31.632143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortMatrixRLC.mo" 2022-03-10 09:58:54.068153761 +0000 @@ -2,80 +2,80 @@ model TwoPortMatrixRLC "PI model of a line parameterized with impedance and admittance matrices" extends Buildings.Electrical.AC.ThreePhasesUnbalanced.Interfaces.TwoPort; - parameter Modelica.SIunits.Voltage V_nominal(min=0, start=480) + parameter Modelica.Units.SI.Voltage V_nominal(min=0, start=480) "Nominal voltage (V_nominal >= 0)" annotation(Evaluate=true, Dialog(group="Nominal conditions")); - parameter Modelica.SIunits.Impedance Z11[2] + parameter Modelica.Units.SI.Impedance Z11[2] "Element [1,1] of impedance matrix"; - parameter Modelica.SIunits.Impedance Z12[2] + parameter Modelica.Units.SI.Impedance Z12[2] "Element [1,2] of impedance matrix"; - parameter Modelica.SIunits.Impedance Z13[2] + parameter Modelica.Units.SI.Impedance Z13[2] "Element [1,3] of impedance matrix"; - parameter Modelica.SIunits.Impedance Z22[2] + parameter Modelica.Units.SI.Impedance Z22[2] "Element [2,2] of impedance matrix"; - parameter Modelica.SIunits.Impedance Z23[2] + parameter Modelica.Units.SI.Impedance Z23[2] "Element [2,3] of impedance matrix"; - parameter Modelica.SIunits.Impedance Z33[2] + parameter Modelica.Units.SI.Impedance Z33[2] "Element [3,3] of impedance matrix"; - final parameter Modelica.SIunits.Impedance[2] Z21 = Z12 + final parameter Modelica.Units.SI.Impedance[2] Z21 = Z12 "Element [2,1] of impedance matrix"; - final parameter Modelica.SIunits.Impedance[2] Z31 = Z13 + final parameter Modelica.Units.SI.Impedance[2] Z31 = Z13 "Element [3,1] of impedance matrix"; - final parameter Modelica.SIunits.Impedance[2] Z32 = Z23 + final parameter Modelica.Units.SI.Impedance[2] Z32 = Z23 "Element [3,1] of impedance matrix"; - parameter Modelica.SIunits.Admittance B11 + parameter Modelica.Units.SI.Admittance B11 "Element [1,1] of admittance matrix"; - parameter Modelica.SIunits.Admittance B12 + parameter Modelica.Units.SI.Admittance B12 "Element [1,2] of admittance matrix"; - parameter Modelica.SIunits.Admittance B13 + parameter Modelica.Units.SI.Admittance B13 "Element [1,3] of admittance matrix"; - parameter Modelica.SIunits.Admittance B22 + parameter Modelica.Units.SI.Admittance B22 "Element [2,2] of admittance matrix"; - parameter Modelica.SIunits.Admittance B23 + parameter Modelica.Units.SI.Admittance B23 "Element [2,3] of admittance matrix"; - parameter Modelica.SIunits.Admittance B33 + parameter Modelica.Units.SI.Admittance B33 "Element [3,3] of admittance matrix"; - final parameter Modelica.SIunits.Admittance B21 = B12 + final parameter Modelica.Units.SI.Admittance B21 = B12 "Element [2,1] of admittance matrix"; - final parameter Modelica.SIunits.Admittance B31 = B13 + final parameter Modelica.Units.SI.Admittance B31 = B13 "Element [3,1] of admittance matrix"; - final parameter Modelica.SIunits.Admittance B32 = B23 + final parameter Modelica.Units.SI.Admittance B32 = B23 "Element [3,2] of admittance matrix"; protected function productAC1p = Buildings.Electrical.PhaseSystems.OnePhase.product "Product between complex quantities"; - Modelica.SIunits.Current Isr[3,2]( + Modelica.Units.SI.Current Isr[3,2]( start = zeros(3,Buildings.Electrical.PhaseSystems.OnePhase.n), each stateSelect = StateSelect.prefer) "Currents that pass through the lines"; - Modelica.SIunits.Current Ish_p[3,2]( + Modelica.Units.SI.Current Ish_p[3,2]( start = zeros(3,Buildings.Electrical.PhaseSystems.OnePhase.n), each stateSelect = StateSelect.prefer) "Shunt current on side p"; - Modelica.SIunits.Current Ish_n[3,2]( + Modelica.Units.SI.Current Ish_n[3,2]( start = zeros(3,Buildings.Electrical.PhaseSystems.OnePhase.n), each stateSelect = StateSelect.prefer) "Shunt current on side n"; - Modelica.SIunits.Voltage v1_n[2]( + Modelica.Units.SI.Voltage v1_n[2]( start = Buildings.Electrical.PhaseSystems.OnePhase.phaseVoltages(V_nominal/sqrt(3), phi= 0), each stateSelect = StateSelect.never) = terminal_n.phase[1].v "Voltage in line 1 at connector N"; - Modelica.SIunits.Voltage v2_n[2]( + Modelica.Units.SI.Voltage v2_n[2]( start = Buildings.Electrical.PhaseSystems.OnePhase.phaseVoltages(V_nominal/sqrt(3), phi= -2*Modelica.Constants.pi/3), each stateSelect = StateSelect.never) = terminal_n.phase[2].v "Voltage in line 2 at connector N"; - Modelica.SIunits.Voltage v3_n[2]( + Modelica.Units.SI.Voltage v3_n[2]( start = Buildings.Electrical.PhaseSystems.OnePhase.phaseVoltages(V_nominal/sqrt(3), phi= 2*Modelica.Constants.pi/3), each stateSelect = StateSelect.never) = terminal_n.phase[3].v "Voltage in line 3 at connector N"; - Modelica.SIunits.Voltage v1_p[2]( + Modelica.Units.SI.Voltage v1_p[2]( start = Buildings.Electrical.PhaseSystems.OnePhase.phaseVoltages(V_nominal/sqrt(3), phi= 0), each stateSelect = StateSelect.never) = terminal_p.phase[1].v "Voltage in line 1 at connector P"; - Modelica.SIunits.Voltage v2_p[2]( + Modelica.Units.SI.Voltage v2_p[2]( start = Buildings.Electrical.PhaseSystems.OnePhase.phaseVoltages(V_nominal/sqrt(3), phi= -2*Modelica.Constants.pi/3), each stateSelect = StateSelect.never) = terminal_p.phase[2].v "Voltage in line 2 at connector P"; - Modelica.SIunits.Voltage v3_p[2]( + Modelica.Units.SI.Voltage v3_p[2]( start = Buildings.Electrical.PhaseSystems.OnePhase.phaseVoltages(V_nominal/sqrt(3), phi= 2*Modelica.Constants.pi/3), each stateSelect = StateSelect.never) = terminal_p.phase[3].v "Voltage in line 3 at connector P"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortMatrixRLC_N.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortMatrixRLC_N.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortMatrixRLC_N.mo" 2022-03-10 09:57:31.632143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortMatrixRLC_N.mo" 2022-03-10 09:58:54.044153759 +0000 @@ -2,116 +2,116 @@ model TwoPortMatrixRLC_N "PI model of a line parameterized with impedance and admittance matrices and neutral line" extends Buildings.Electrical.AC.ThreePhasesUnbalanced.Interfaces.TwoPort_N; - parameter Modelica.SIunits.Voltage V_nominal(min=0, start=480) + parameter Modelica.Units.SI.Voltage V_nominal(min=0, start=480) "Nominal voltage (V_nominal >= 0)" annotation(Evaluate=true, Dialog(group="Nominal conditions")); - parameter Modelica.SIunits.Impedance Z11[2] + parameter Modelica.Units.SI.Impedance Z11[2] "Element [1,1] of impedance matrix"; - parameter Modelica.SIunits.Impedance Z12[2] + parameter Modelica.Units.SI.Impedance Z12[2] "Element [1,2] of impedance matrix"; - parameter Modelica.SIunits.Impedance Z13[2] + parameter Modelica.Units.SI.Impedance Z13[2] "Element [1,3] of impedance matrix"; - parameter Modelica.SIunits.Impedance Z14[2] + parameter Modelica.Units.SI.Impedance Z14[2] "Element [1,4] of impedance matrix"; - parameter Modelica.SIunits.Impedance Z22[2] + parameter Modelica.Units.SI.Impedance Z22[2] "Element [2,2] of impedance matrix"; - parameter Modelica.SIunits.Impedance Z23[2] + parameter Modelica.Units.SI.Impedance Z23[2] "Element [2,3] of impedance matrix"; - parameter Modelica.SIunits.Impedance Z24[2] + parameter Modelica.Units.SI.Impedance Z24[2] "Element [2,4] of impedance matrix"; - parameter Modelica.SIunits.Impedance Z33[2] + parameter Modelica.Units.SI.Impedance Z33[2] "Element [3,3] of impedance matrix"; - parameter Modelica.SIunits.Impedance Z34[2] + parameter Modelica.Units.SI.Impedance Z34[2] "Element [3,4] of impedance matrix"; - parameter Modelica.SIunits.Impedance Z44[2] + parameter Modelica.Units.SI.Impedance Z44[2] "Element [4,4] of impedance matrix"; - final parameter Modelica.SIunits.Impedance[2] Z21 = Z12 + final parameter Modelica.Units.SI.Impedance[2] Z21 = Z12 "Element [2,1] of impedance matrix"; - final parameter Modelica.SIunits.Impedance[2] Z31 = Z13 + final parameter Modelica.Units.SI.Impedance[2] Z31 = Z13 "Element [3,1] of impedance matrix"; - final parameter Modelica.SIunits.Impedance[2] Z32 = Z23 + final parameter Modelica.Units.SI.Impedance[2] Z32 = Z23 "Element [3,1] of impedance matrix"; - final parameter Modelica.SIunits.Impedance[2] Z41 = Z14 + final parameter Modelica.Units.SI.Impedance[2] Z41 = Z14 "Element [4,1] of impedance matrix"; - final parameter Modelica.SIunits.Impedance[2] Z42 = Z24 + final parameter Modelica.Units.SI.Impedance[2] Z42 = Z24 "Element [4,2] of impedance matrix"; - final parameter Modelica.SIunits.Impedance[2] Z43 = Z34 + final parameter Modelica.Units.SI.Impedance[2] Z43 = Z34 "Element [4,3] of impedance matrix"; - parameter Modelica.SIunits.Admittance B11 + parameter Modelica.Units.SI.Admittance B11 "Element [1,1] of admittance matrix"; - parameter Modelica.SIunits.Admittance B12 + parameter Modelica.Units.SI.Admittance B12 "Element [1,2] of admittance matrix"; - parameter Modelica.SIunits.Admittance B13 + parameter Modelica.Units.SI.Admittance B13 "Element [1,3] of admittance matrix"; - parameter Modelica.SIunits.Admittance B14 + parameter Modelica.Units.SI.Admittance B14 "Element [1,4] of admittance matrix"; - parameter Modelica.SIunits.Admittance B22 + parameter Modelica.Units.SI.Admittance B22 "Element [2,2] of admittance matrix"; - parameter Modelica.SIunits.Admittance B23 + parameter Modelica.Units.SI.Admittance B23 "Element [2,3] of admittance matrix"; - parameter Modelica.SIunits.Admittance B24 + parameter Modelica.Units.SI.Admittance B24 "Element [2,4] of admittance matrix"; - parameter Modelica.SIunits.Admittance B33 + parameter Modelica.Units.SI.Admittance B33 "Element [3,3] of admittance matrix"; - parameter Modelica.SIunits.Admittance B34 + parameter Modelica.Units.SI.Admittance B34 "Element [3,4] of admittance matrix"; - parameter Modelica.SIunits.Admittance B44 + parameter Modelica.Units.SI.Admittance B44 "Element [4,4] of admittance matrix"; - final parameter Modelica.SIunits.Admittance B21 = B12 + final parameter Modelica.Units.SI.Admittance B21 = B12 "Element [2,1] of admittance matrix"; - final parameter Modelica.SIunits.Admittance B31 = B13 + final parameter Modelica.Units.SI.Admittance B31 = B13 "Element [3,1] of admittance matrix"; - final parameter Modelica.SIunits.Admittance B32 = B23 + final parameter Modelica.Units.SI.Admittance B32 = B23 "Element [3,2] of admittance matrix"; - final parameter Modelica.SIunits.Admittance B41 = B14 + final parameter Modelica.Units.SI.Admittance B41 = B14 "Element [4,1] of admittance matrix"; - final parameter Modelica.SIunits.Admittance B42 = B24 + final parameter Modelica.Units.SI.Admittance B42 = B24 "Element [4,2] of admittance matrix"; - final parameter Modelica.SIunits.Admittance B43 = B34 + final parameter Modelica.Units.SI.Admittance B43 = B34 "Element [4,3] of admittance matrix"; protected function productAC1p = Buildings.Electrical.PhaseSystems.OnePhase.product "Product between complex quantities"; - Modelica.SIunits.Current Isr[4,2]( + Modelica.Units.SI.Current Isr[4,2]( start = zeros(4,Buildings.Electrical.PhaseSystems.OnePhase.n), each stateSelect = StateSelect.prefer) "Currents that pass through the lines"; - Modelica.SIunits.Current Ish_p[4,2]( + Modelica.Units.SI.Current Ish_p[4,2]( start = zeros(4,Buildings.Electrical.PhaseSystems.OnePhase.n), each stateSelect = StateSelect.prefer) "Shunt current on side p"; - Modelica.SIunits.Current Ish_n[4,2]( + Modelica.Units.SI.Current Ish_n[4,2]( start = zeros(4,Buildings.Electrical.PhaseSystems.OnePhase.n), each stateSelect = StateSelect.prefer) "Shunt current on side n"; - Modelica.SIunits.Voltage v1_n[2]( + Modelica.Units.SI.Voltage v1_n[2]( start = Buildings.Electrical.PhaseSystems.OnePhase.phaseVoltages(V_nominal/sqrt(3), phi= 0), each stateSelect = StateSelect.never) = terminal_n.phase[1].v "Voltage in line 1 at connector N"; - Modelica.SIunits.Voltage v2_n[2]( + Modelica.Units.SI.Voltage v2_n[2]( start = Buildings.Electrical.PhaseSystems.OnePhase.phaseVoltages(V_nominal/sqrt(3), phi= -2*Modelica.Constants.pi/3), each stateSelect = StateSelect.never) = terminal_n.phase[2].v "Voltage in line 2 at connector N"; - Modelica.SIunits.Voltage v3_n[2]( + Modelica.Units.SI.Voltage v3_n[2]( start = Buildings.Electrical.PhaseSystems.OnePhase.phaseVoltages(V_nominal/sqrt(3), phi= 2*Modelica.Constants.pi/3), each stateSelect = StateSelect.never) = terminal_n.phase[3].v "Voltage in line 3 at connector N"; - Modelica.SIunits.Voltage v4_n[2]( + Modelica.Units.SI.Voltage v4_n[2]( start = Buildings.Electrical.PhaseSystems.OnePhase.phaseVoltages(0), each stateSelect = StateSelect.never) = terminal_n.phase[4].v "Voltage in line 4 (neutral) at connector N"; - Modelica.SIunits.Voltage v1_p[2]( + Modelica.Units.SI.Voltage v1_p[2]( start = Buildings.Electrical.PhaseSystems.OnePhase.phaseVoltages(V_nominal/sqrt(3), phi= 0), each stateSelect = StateSelect.never) = terminal_p.phase[1].v "Voltage in line 1 at connector P"; - Modelica.SIunits.Voltage v2_p[2]( + Modelica.Units.SI.Voltage v2_p[2]( start = Buildings.Electrical.PhaseSystems.OnePhase.phaseVoltages(V_nominal/sqrt(3), phi= -2*Modelica.Constants.pi/3), each stateSelect = StateSelect.never) = terminal_p.phase[2].v "Voltage in line 2 at connector P"; - Modelica.SIunits.Voltage v3_p[2]( + Modelica.Units.SI.Voltage v3_p[2]( start = Buildings.Electrical.PhaseSystems.OnePhase.phaseVoltages(V_nominal/sqrt(3), phi= 2*Modelica.Constants.pi/3), each stateSelect = StateSelect.never) = terminal_p.phase[3].v "Voltage in line 3 at connector P"; - Modelica.SIunits.Voltage v4_p[2]( + Modelica.Units.SI.Voltage v4_p[2]( start = Buildings.Electrical.PhaseSystems.OnePhase.phaseVoltages(0), each stateSelect = StateSelect.never) = terminal_p.phase[4].v "Voltage in line 4 (neutral) at connector P"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortMatrixRL_N.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortMatrixRL_N.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortMatrixRL_N.mo" 2022-03-10 09:57:31.632143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortMatrixRL_N.mo" 2022-03-10 09:58:54.012153755 +0000 @@ -2,88 +2,88 @@ model TwoPortMatrixRL_N "Model of an RL line parameterized with impedance matrices and neutral line" extends Buildings.Electrical.AC.ThreePhasesUnbalanced.Interfaces.TwoPort_N; - parameter Modelica.SIunits.Voltage V_nominal(min=0, start=480) + parameter Modelica.Units.SI.Voltage V_nominal(min=0, start=480) "Nominal voltage (V_nominal >= 0)" annotation(Evaluate=true, Dialog(group="Nominal conditions")); - parameter Modelica.SIunits.Impedance Z11[2] + parameter Modelica.Units.SI.Impedance Z11[2] "Element [1,1] of impedance matrix"; - parameter Modelica.SIunits.Impedance Z12[2] + parameter Modelica.Units.SI.Impedance Z12[2] "Element [1,2] of impedance matrix"; - parameter Modelica.SIunits.Impedance Z13[2] + parameter Modelica.Units.SI.Impedance Z13[2] "Element [1,3] of impedance matrix"; - parameter Modelica.SIunits.Impedance Z14[2] + parameter Modelica.Units.SI.Impedance Z14[2] "Element [1,4] of impedance matrix"; - parameter Modelica.SIunits.Impedance Z22[2] + parameter Modelica.Units.SI.Impedance Z22[2] "Element [2,2] of impedance matrix"; - parameter Modelica.SIunits.Impedance Z23[2] + parameter Modelica.Units.SI.Impedance Z23[2] "Element [2,3] of impedance matrix"; - parameter Modelica.SIunits.Impedance Z24[2] + parameter Modelica.Units.SI.Impedance Z24[2] "Element [2,4] of impedance matrix"; - parameter Modelica.SIunits.Impedance Z33[2] + parameter Modelica.Units.SI.Impedance Z33[2] "Element [3,3] of impedance matrix"; - parameter Modelica.SIunits.Impedance Z34[2] + parameter Modelica.Units.SI.Impedance Z34[2] "Element [3,4] of impedance matrix"; - parameter Modelica.SIunits.Impedance Z44[2] + parameter Modelica.Units.SI.Impedance Z44[2] "Element [4,4] of impedance matrix"; - final parameter Modelica.SIunits.Impedance[2] Z21 = Z12 + final parameter Modelica.Units.SI.Impedance[2] Z21 = Z12 "Element [2,1] of impedance matrix"; - final parameter Modelica.SIunits.Impedance[2] Z31 = Z13 + final parameter Modelica.Units.SI.Impedance[2] Z31 = Z13 "Element [3,1] of impedance matrix"; - final parameter Modelica.SIunits.Impedance[2] Z32 = Z23 + final parameter Modelica.Units.SI.Impedance[2] Z32 = Z23 "Element [3,1] of impedance matrix"; - final parameter Modelica.SIunits.Impedance[2] Z41 = Z14 + final parameter Modelica.Units.SI.Impedance[2] Z41 = Z14 "Element [4,1] of impedance matrix"; - final parameter Modelica.SIunits.Impedance[2] Z42 = Z24 + final parameter Modelica.Units.SI.Impedance[2] Z42 = Z24 "Element [4,2] of impedance matrix"; - final parameter Modelica.SIunits.Impedance[2] Z43 = Z34 + final parameter Modelica.Units.SI.Impedance[2] Z43 = Z34 "Element [4,3] of impedance matrix"; protected function productAC1p = Buildings.Electrical.PhaseSystems.OnePhase.product "Product between complex quantities"; - Modelica.SIunits.Current i1[2]( + Modelica.Units.SI.Current i1[2]( start = zeros(Buildings.Electrical.PhaseSystems.OnePhase.n), each stateSelect = StateSelect.prefer) = terminal_n.phase[1].i "Current in line 1"; - Modelica.SIunits.Current i2[2]( + Modelica.Units.SI.Current i2[2]( start = zeros(Buildings.Electrical.PhaseSystems.OnePhase.n), each stateSelect = StateSelect.prefer) = terminal_n.phase[2].i "Current in line 2"; - Modelica.SIunits.Current i3[2]( + Modelica.Units.SI.Current i3[2]( start = zeros(Buildings.Electrical.PhaseSystems.OnePhase.n), each stateSelect = StateSelect.prefer) = terminal_n.phase[3].i "Current in line 3"; - Modelica.SIunits.Current i4[2]( + Modelica.Units.SI.Current i4[2]( start = zeros(Buildings.Electrical.PhaseSystems.OnePhase.n), each stateSelect = StateSelect.prefer) = terminal_n.phase[4].i "Current in line 4 (neutral)"; - Modelica.SIunits.Voltage v1_n[2]( + Modelica.Units.SI.Voltage v1_n[2]( start = Buildings.Electrical.PhaseSystems.OnePhase.phaseVoltages(V_nominal/sqrt(3), phi= 0), each stateSelect = StateSelect.never) = terminal_n.phase[1].v "Voltage in line 1 at connector N"; - Modelica.SIunits.Voltage v2_n[2]( + Modelica.Units.SI.Voltage v2_n[2]( start = Buildings.Electrical.PhaseSystems.OnePhase.phaseVoltages(V_nominal/sqrt(3), phi= -2*Modelica.Constants.pi/3), each stateSelect = StateSelect.never) = terminal_n.phase[2].v "Voltage in line 2 at connector N"; - Modelica.SIunits.Voltage v3_n[2]( + Modelica.Units.SI.Voltage v3_n[2]( start = Buildings.Electrical.PhaseSystems.OnePhase.phaseVoltages(V_nominal/sqrt(3), phi= 2*Modelica.Constants.pi/3), each stateSelect = StateSelect.never) = terminal_n.phase[3].v "Voltage in line 3 at connector N"; - Modelica.SIunits.Voltage v4_n[2]( + Modelica.Units.SI.Voltage v4_n[2]( start = Buildings.Electrical.PhaseSystems.OnePhase.phaseVoltages(0), each stateSelect = StateSelect.never) = terminal_n.phase[4].v "Voltage in line 4 (neutral) at connector N"; - Modelica.SIunits.Voltage v1_p[2]( + Modelica.Units.SI.Voltage v1_p[2]( start = Buildings.Electrical.PhaseSystems.OnePhase.phaseVoltages(V_nominal/sqrt(3), phi= 0), each stateSelect = StateSelect.never) = terminal_p.phase[1].v "Voltage in line 1 at connector P"; - Modelica.SIunits.Voltage v2_p[2]( + Modelica.Units.SI.Voltage v2_p[2]( start = Buildings.Electrical.PhaseSystems.OnePhase.phaseVoltages(V_nominal/sqrt(3), phi= -2*Modelica.Constants.pi/3), each stateSelect = StateSelect.never) = terminal_p.phase[2].v "Voltage in line 2 at connector P"; - Modelica.SIunits.Voltage v3_p[2]( + Modelica.Units.SI.Voltage v3_p[2]( start = Buildings.Electrical.PhaseSystems.OnePhase.phaseVoltages(V_nominal/sqrt(3), phi= 2*Modelica.Constants.pi/3), each stateSelect = StateSelect.never) = terminal_p.phase[3].v "Voltage in line 3 at connector P"; - Modelica.SIunits.Voltage v4_p[2]( + Modelica.Units.SI.Voltage v4_p[2]( start = Buildings.Electrical.PhaseSystems.OnePhase.phaseVoltages(0), each stateSelect = StateSelect.never) = terminal_p.phase[4].v "Voltage in line 4 (neutral) at connector P"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortRL.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortRL.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortRL.mo" 2022-03-10 09:57:31.632143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortRL.mo" 2022-03-10 09:58:53.988153752 +0000 @@ -3,21 +3,21 @@ "Model of a resistive-inductive element with two electrical ports" extends Modelica.Electrical.Analog.Interfaces.ConditionalHeatPort; extends Buildings.Electrical.AC.ThreePhasesUnbalanced.Interfaces.TwoPort; - parameter Modelica.SIunits.Resistance R "Resistance at temperature T_ref" + parameter Modelica.Units.SI.Resistance R "Resistance at temperature T_ref" annotation(Evaluate=true); - parameter Modelica.SIunits.Temperature T_ref = 298.15 "Reference temperature" + parameter Modelica.Units.SI.Temperature T_ref = 298.15 "Reference temperature" annotation(Evaluate=true); - parameter Modelica.SIunits.Temperature M = 507.65 + parameter Modelica.Units.SI.Temperature M = 507.65 "Temperature constant (R_actual = R*(M + T_heatPort)/(M + T_ref))" annotation(Evaluate=true); - parameter Modelica.SIunits.Inductance L "Inductance"; - parameter Modelica.SIunits.Current i1_start[2] = {0,0} + parameter Modelica.Units.SI.Inductance L "Inductance"; + parameter Modelica.Units.SI.Current i1_start[2] = {0,0} "Initial current phasor of phase 1 (positive if entering from terminal p)" annotation (Dialog(enable = (mode==Buildings.Electrical.Types.Load.FixedZ_dynamic))); - parameter Modelica.SIunits.Current i2_start[2] = {0,0} + parameter Modelica.Units.SI.Current i2_start[2] = {0,0} "Initial current phasor of phase 2 (positive if entering from terminal p)" annotation (Dialog(enable = (mode==Buildings.Electrical.Types.Load.FixedZ_dynamic))); - parameter Modelica.SIunits.Current i3_start[2] = {0,0} + parameter Modelica.Units.SI.Current i3_start[2] = {0,0} "Initial current phasor of phase 3 (positive if entering from terminal p)" annotation (Dialog(enable = (mode==Buildings.Electrical.Types.Load.FixedZ_dynamic))); parameter Buildings.Electrical.Types.Load mode( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortRLC.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortRLC.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortRLC.mo" 2022-03-10 09:57:31.632143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortRLC.mo" 2022-03-10 09:58:53.972153749 +0000 @@ -2,20 +2,20 @@ model TwoPortRLC "Model of an RLC element with two electrical ports" extends Modelica.Electrical.Analog.Interfaces.ConditionalHeatPort; extends Buildings.Electrical.AC.ThreePhasesUnbalanced.Interfaces.TwoPort; - parameter Modelica.SIunits.Resistance R "Resistance at temperature T_ref"; - parameter Modelica.SIunits.Capacitance C "Capacity"; - parameter Modelica.SIunits.Inductance L "Inductance"; - parameter Modelica.SIunits.Temperature T_ref = 298.15 "Reference temperature" + parameter Modelica.Units.SI.Resistance R "Resistance at temperature T_ref"; + parameter Modelica.Units.SI.Capacitance C "Capacity"; + parameter Modelica.Units.SI.Inductance L "Inductance"; + parameter Modelica.Units.SI.Temperature T_ref = 298.15 "Reference temperature" annotation(Evaluate=true); - parameter Modelica.SIunits.Temperature M = 507.65 + parameter Modelica.Units.SI.Temperature M = 507.65 "Temperature constant (R_actual = R*(M + T_heatPort)/(M + T_ref))" annotation(Evaluate=true); - parameter Modelica.SIunits.Voltage Vc1_start[2] = V_nominal/sqrt(3)*{1,0} + parameter Modelica.Units.SI.Voltage Vc1_start[2] = V_nominal/sqrt(3)*{1,0} "Initial voltage phasor of the capacitance located in the middle of phase 1" annotation (Dialog(enable = (mode==Buildings.Electrical.Types.Load.FixedZ_dynamic))); - parameter Modelica.SIunits.Voltage Vc2_start[2] = V_nominal/sqrt(3)*{-1/2,-sqrt(3)/2} + parameter Modelica.Units.SI.Voltage Vc2_start[2] = V_nominal/sqrt(3)*{-1/2,-sqrt(3)/2} "Initial voltage phasor of the capacitance located in the middle of phase 1" annotation (Dialog(enable = (mode==Buildings.Electrical.Types.Load.FixedZ_dynamic))); - parameter Modelica.SIunits.Voltage Vc3_start[2] = V_nominal/sqrt(3)*{-1/2,+sqrt(3)/2} + parameter Modelica.Units.SI.Voltage Vc3_start[2] = V_nominal/sqrt(3)*{-1/2,+sqrt(3)/2} "Initial voltage phasor of the capacitance located in the middle of phase 1" annotation (Dialog(enable = (mode==Buildings.Electrical.Types.Load.FixedZ_dynamic))); parameter Buildings.Electrical.Types.Load mode( @@ -24,7 +24,7 @@ Buildings.Electrical.Types.Load.FixedZ_steady_state "Type of model (e.g., steady state, dynamic, prescribed power consumption, etc.)" annotation (Evaluate=true, Dialog(group="Modeling assumption")); - parameter Modelica.SIunits.Voltage V_nominal(min=0, start=480) + parameter Modelica.Units.SI.Voltage V_nominal(min=0, start=480) "Nominal voltage (V_nominal >= 0)" annotation ( Evaluate=true, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortRLC_N.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortRLC_N.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortRLC_N.mo" 2022-03-10 09:57:31.632143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortRLC_N.mo" 2022-03-10 09:58:53.956153748 +0000 @@ -3,24 +3,24 @@ "Model of an RLC element with two electrical ports and neutral line cable" extends Modelica.Electrical.Analog.Interfaces.ConditionalHeatPort; extends Buildings.Electrical.AC.ThreePhasesUnbalanced.Interfaces.TwoPort_N; - parameter Modelica.SIunits.Resistance R "Resistance at temperature T_ref"; - parameter Modelica.SIunits.Resistance Rn + parameter Modelica.Units.SI.Resistance R "Resistance at temperature T_ref"; + parameter Modelica.Units.SI.Resistance Rn "Resistance of neutral cable at temperature T_ref"; - parameter Modelica.SIunits.Capacitance C "Capacity"; - parameter Modelica.SIunits.Capacitance Cn "Capacityof neutral cable"; - parameter Modelica.SIunits.Inductance L "Inductance"; - parameter Modelica.SIunits.Inductance Ln "Inductance of neutral cable"; - parameter Modelica.SIunits.Temperature T_ref = 298.15 "Reference temperature" + parameter Modelica.Units.SI.Capacitance C "Capacity"; + parameter Modelica.Units.SI.Capacitance Cn "Capacityof neutral cable"; + parameter Modelica.Units.SI.Inductance L "Inductance"; + parameter Modelica.Units.SI.Inductance Ln "Inductance of neutral cable"; + parameter Modelica.Units.SI.Temperature T_ref = 298.15 "Reference temperature" annotation(Evaluate=true); - parameter Modelica.SIunits.Temperature M = 507.65 + parameter Modelica.Units.SI.Temperature M = 507.65 "Temperature constant (R_actual = R*(M + T_heatPort)/(M + T_ref))" annotation(Evaluate=true); - parameter Modelica.SIunits.Voltage Vc1_start[2] = V_nominal/sqrt(3)*{1,0} + parameter Modelica.Units.SI.Voltage Vc1_start[2] = V_nominal/sqrt(3)*{1,0} "Initial voltage phasor of the capacitance located in the middle of phase 1" annotation (Dialog(enable = (mode==Buildings.Electrical.Types.Load.FixedZ_dynamic))); - parameter Modelica.SIunits.Voltage Vc2_start[2] = V_nominal/sqrt(3)*{-1/2,-sqrt(3)/2} + parameter Modelica.Units.SI.Voltage Vc2_start[2] = V_nominal/sqrt(3)*{-1/2,-sqrt(3)/2} "Initial voltage phasor of the capacitance located in the middle of phase 1" annotation (Dialog(enable = (mode==Buildings.Electrical.Types.Load.FixedZ_dynamic))); - parameter Modelica.SIunits.Voltage Vc3_start[2] = V_nominal/sqrt(3)*{-1/2,+sqrt(3)/2} + parameter Modelica.Units.SI.Voltage Vc3_start[2] = V_nominal/sqrt(3)*{-1/2,+sqrt(3)/2} "Initial voltage phasor of the capacitance located in the middle of phase 1" annotation (Dialog(enable = (mode==Buildings.Electrical.Types.Load.FixedZ_dynamic))); parameter Buildings.Electrical.Types.Load mode( @@ -29,7 +29,7 @@ Buildings.Electrical.Types.Load.FixedZ_steady_state "Type of model (e.g., steady state, dynamic, prescribed power consumption, etc.)" annotation (Evaluate=true, Dialog(group="Modeling assumption")); - parameter Modelica.SIunits.Voltage V_nominal(min=0, start=480) + parameter Modelica.Units.SI.Voltage V_nominal(min=0, start=480) "Nominal voltage (V_nominal >= 0)" annotation ( Evaluate=true, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortRL_N.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortRL_N.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortRL_N.mo" 2022-03-10 09:57:31.632143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortRL_N.mo" 2022-03-10 09:58:53.932153744 +0000 @@ -3,23 +3,23 @@ "Model of a resistive-inductive element with two electrical ports and neutral line cable" extends Modelica.Electrical.Analog.Interfaces.ConditionalHeatPort; extends Buildings.Electrical.AC.ThreePhasesUnbalanced.Interfaces.TwoPort_N; - parameter Modelica.SIunits.Resistance R "Resistance at temperature T_ref"; - parameter Modelica.SIunits.Resistance Rn + parameter Modelica.Units.SI.Resistance R "Resistance at temperature T_ref"; + parameter Modelica.Units.SI.Resistance Rn "Resistance of neutral cable at temperature T_ref"; - parameter Modelica.SIunits.Temperature T_ref = 298.15 "Reference temperature" + parameter Modelica.Units.SI.Temperature T_ref = 298.15 "Reference temperature" annotation(Evaluate=true); - parameter Modelica.SIunits.Temperature M = 507.65 + parameter Modelica.Units.SI.Temperature M = 507.65 "Temperature constant (R_actual = R*(M + T_heatPort)/(M + T_ref))" annotation(Evaluate=true); - parameter Modelica.SIunits.Inductance L "Inductance"; - parameter Modelica.SIunits.Inductance Ln "Inductance of neutral cable"; - parameter Modelica.SIunits.Current i1_start[2] = {0,0} + parameter Modelica.Units.SI.Inductance L "Inductance"; + parameter Modelica.Units.SI.Inductance Ln "Inductance of neutral cable"; + parameter Modelica.Units.SI.Current i1_start[2] = {0,0} "Initial current phasor of phase 1 (positive if entering from terminal p)" annotation (Dialog(enable = (mode==Buildings.Electrical.Types.Load.FixedZ_dynamic))); - parameter Modelica.SIunits.Current i2_start[2] = {0,0} + parameter Modelica.Units.SI.Current i2_start[2] = {0,0} "Initial current phasor of phase 2 (positive if entering from terminal p)" annotation (Dialog(enable = (mode==Buildings.Electrical.Types.Load.FixedZ_dynamic))); - parameter Modelica.SIunits.Current i3_start[2] = {0,0} + parameter Modelica.Units.SI.Current i3_start[2] = {0,0} "Initial current phasor of phase 3 (positive if entering from terminal p)" annotation (Dialog(enable = (mode==Buildings.Electrical.Types.Load.FixedZ_dynamic))); parameter Buildings.Electrical.Types.Load mode( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortResistance.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortResistance.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortResistance.mo" 2022-03-10 09:57:31.632143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortResistance.mo" 2022-03-10 09:58:53.912153743 +0000 @@ -2,12 +2,12 @@ model TwoPortResistance "Model of a resistance with two electrical ports" extends Modelica.Electrical.Analog.Interfaces.ConditionalHeatPort; extends Buildings.Electrical.AC.ThreePhasesUnbalanced.Interfaces.TwoPort; - parameter Modelica.SIunits.Temperature T_ref = 298.15 "Reference temperature" + parameter Modelica.Units.SI.Temperature T_ref = 298.15 "Reference temperature" annotation(Evaluate=true); - parameter Modelica.SIunits.Temperature M = 507.65 + parameter Modelica.Units.SI.Temperature M = 507.65 "Temperature constant (R_actual = R*(M + T_heatPort)/(M + T_ref))" annotation(Evaluate=true); - parameter Modelica.SIunits.Resistance R "Resistance at temperature T_ref"; + parameter Modelica.Units.SI.Resistance R "Resistance at temperature T_ref"; OnePhase.Lines.TwoPortResistance phase1( final T_ref=T_ref, final M=M, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortResistance_N.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortResistance_N.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortResistance_N.mo" 2022-03-10 09:57:31.632143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortResistance_N.mo" 2022-03-10 09:58:53.892153740 +0000 @@ -3,13 +3,13 @@ "Model of a resistance with two electrical ports and neutral cable" extends Modelica.Electrical.Analog.Interfaces.ConditionalHeatPort; extends Buildings.Electrical.AC.ThreePhasesUnbalanced.Interfaces.TwoPort_N; - parameter Modelica.SIunits.Temperature T_ref = 298.15 "Reference temperature" + parameter Modelica.Units.SI.Temperature T_ref = 298.15 "Reference temperature" annotation(Evaluate=true); - parameter Modelica.SIunits.Temperature M = 507.65 + parameter Modelica.Units.SI.Temperature M = 507.65 "Temperature constant (R_actual = R*(M + T_heatPort)/(M + T_ref))" annotation(Evaluate=true); - parameter Modelica.SIunits.Resistance R "Resistance at temperature T_ref"; - parameter Modelica.SIunits.Resistance Rn + parameter Modelica.Units.SI.Resistance R "Resistance at temperature T_ref"; + parameter Modelica.Units.SI.Resistance Rn "Resistance of neutral cable at temperature T_ref"; OnePhase.Lines.TwoPortResistance phase1( final T_ref=T_ref, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Loads/BaseClasses/BaseImpedance.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Loads/BaseClasses/BaseImpedance.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Loads/BaseClasses/BaseImpedance.mo" 2022-03-10 09:57:31.632143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Loads/BaseClasses/BaseImpedance.mo" 2022-03-10 09:58:53.848153735 +0000 @@ -62,34 +62,34 @@ choice=true "Inductive", choice=false "Capacitive", __Dymola_radioButtons=true)); - parameter Modelica.SIunits.Resistance R(start = 1,min=0) = 1 "Resistance" + parameter Modelica.Units.SI.Resistance R(start = 1,min=0) = 1 "Resistance" annotation (Dialog(enable= not use_R_in)); - parameter Modelica.SIunits.Inductance L(start=0, min=0) = 0 "Inductance" + parameter Modelica.Units.SI.Inductance L(start=0, min=0) = 0 "Inductance" annotation (Dialog(enable=inductive and (not use_L_in))); - parameter Modelica.SIunits.Capacitance C(start=0,min=0) = 0 "Capacitance" + parameter Modelica.Units.SI.Capacitance C(start=0,min=0) = 0 "Capacitance" annotation (Dialog(enable=(not inductive) and (not use_C_in))); parameter Boolean use_R_in = false "if true, R is specified by an input" annotation(Evaluate=true, Dialog(tab = "Variable load", group="Resistance")); - parameter Modelica.SIunits.Resistance RMin(start = R, min=Modelica.Constants.eps) = 1e-4 + parameter Modelica.Units.SI.Resistance RMin(start = R, min=Modelica.Constants.eps) = 1e-4 "Minimum value of the resistance" annotation(Evaluate=true, Dialog(enable = use_R_in, tab = "Variable load", group="Resistance")); - parameter Modelica.SIunits.Resistance RMax(start = R, min=Modelica.Constants.eps) = 1e2 + parameter Modelica.Units.SI.Resistance RMax(start = R, min=Modelica.Constants.eps) = 1e2 "Maximum value of the resistance" annotation(Evaluate=true, Dialog(enable = use_R_in, tab = "Variable load", group="Resistance")); parameter Boolean use_C_in = false "if true, C is specified by an input" annotation(Evaluate=true, Dialog(tab = "Variable load", group="Capacitance")); - parameter Modelica.SIunits.Capacitance CMin(start = C, min=Modelica.Constants.eps) = 1e-4 + parameter Modelica.Units.SI.Capacitance CMin(start = C, min=Modelica.Constants.eps) = 1e-4 "Minimum value of the capacitance" annotation(Evaluate=true, Dialog(enable = use_C_in, tab = "Variable load", group="Capacitance")); - parameter Modelica.SIunits.Capacitance CMax(start = C, min=Modelica.Constants.eps) = 1e2 + parameter Modelica.Units.SI.Capacitance CMax(start = C, min=Modelica.Constants.eps) = 1e2 "Maximum value of the capacitance" annotation(Evaluate=true, Dialog(enable = use_C_in, tab = "Variable load", group="Capacitance")); parameter Boolean use_L_in = false "if true, L is specified by an input" annotation(Evaluate=true, Dialog(tab = "Variable load", group="Inductance")); - parameter Modelica.SIunits.Inductance LMin(start = L, min=Modelica.Constants.eps) = 1e-4 + parameter Modelica.Units.SI.Inductance LMin(start = L, min=Modelica.Constants.eps) = 1e-4 "Minimum value of the inductance" annotation(Evaluate=true, Dialog(enable = use_L_in, tab = "Variable load", group="Inductance")); - parameter Modelica.SIunits.Inductance LMax(start = L, min=Modelica.Constants.eps) = 1e2 + parameter Modelica.Units.SI.Inductance LMax(start = L, min=Modelica.Constants.eps) = 1e2 "Maximum value of the inductance" annotation(Evaluate=true, Dialog(enable = use_L_in, tab = "Variable load", group="Inductance")); Modelica.Blocks.Interfaces.RealInput y_R(min=0, max=1) if use_R_in diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Loads/BaseClasses/BaseLoadCtrl.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Loads/BaseClasses/BaseLoadCtrl.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Loads/BaseClasses/BaseLoadCtrl.mo" 2022-03-10 09:57:31.632143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Loads/BaseClasses/BaseLoadCtrl.mo" 2022-03-10 09:58:53.824153731 +0000 @@ -13,19 +13,19 @@ Buildings.Electrical.Types.Load.FixedZ_steady_state "Parameters that specifies the mode of the load (e.g., steady state, dynamic, prescribed power consumption, etc.)" annotation(Dialog(group="Modeling assumption")); - parameter Modelica.SIunits.Power P_nominal=0 + parameter Modelica.Units.SI.Power P_nominal=0 "Nominal power (negative if consumed, positive if generated)" annotation(Dialog(group="Nominal conditions", enable = mode <> Buildings.Electrical.Types.Load.VariableZ_P_input)); - parameter Modelica.SIunits.Voltage V_nominal(min=0, start = 480) + parameter Modelica.Units.SI.Voltage V_nominal(min=0, start = 480) "Nominal voltage (V_nominal >= 0)" annotation(Dialog(group="Nominal conditions", enable = (mode==Assumptionm.FixedZ_dynamic or linear))); parameter Boolean voltageCtrl = false "This flag enables the voltage control" annotation(Evaluate=true, Dialog(group="Voltage CTRL")); parameter Real vThresh(min=0.0, max=1.0) = 0.1 "Threshold that activates voltage ctrl (ratio of nominal voltage)" annotation(Dialog(group="Voltage CTRL", enable = voltageCtrl)); - parameter Modelica.SIunits.Time tDelay = 300 + parameter Modelica.Units.SI.Time tDelay = 300 "Time to wait before plugging the load again after disconnection" annotation(Dialog(group="Voltage CTRL", enable = voltageCtrl)); parameter Types.InitMode initMode=Buildings.Electrical.Types.InitMode.zero_current diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Loads/Examples/LoadCtrl.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Loads/Examples/LoadCtrl.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Loads/Examples/LoadCtrl.mo" 2022-03-10 09:57:31.632143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Loads/Examples/LoadCtrl.mo" 2022-03-10 09:58:53.704153715 +0000 @@ -4,7 +4,7 @@ Sources.FixedVoltage_N sou(f=60, V=480) "Voltage source" annotation (Placement(transformation(extent={{-80,-10},{-60,10}}))); Modelica.Blocks.Sources.Sine pow_1( - freqHz=0.1, + f =0.1, amplitude=4500, offset=6000) "Power on phase 1" annotation (Placement(transformation(extent={{60,10},{40,30}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Loads/Examples/Loads.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Loads/Examples/Loads.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Loads/Examples/Loads.mo" 2022-03-10 09:57:31.632143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Loads/Examples/Loads.mo" 2022-03-10 09:58:53.692153714 +0000 @@ -7,7 +7,7 @@ annotation (Placement(transformation(extent={{-94,-10},{-74,10}}))); Modelica.Blocks.Sources.Sine ph_1( amplitude=2000, - freqHz=10, +f =10, offset=-2500) "Power signal for loads on phase 1" annotation (Placement(transformation(extent={{80,30},{60,50}}))); Modelica.Blocks.Sources.Constant ph_23(k=0) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Sensors/BaseClasses/GeneralizedProbe.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Sensors/BaseClasses/GeneralizedProbe.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Sensors/BaseClasses/GeneralizedProbe.mo" 2022-03-10 09:57:31.632143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Sensors/BaseClasses/GeneralizedProbe.mo" 2022-03-10 09:58:53.588153702 +0000 @@ -2,7 +2,7 @@ partial model GeneralizedProbe "Partial model of a generalized three-phase probe" extends Icons.GeneralizedProbe; - parameter Modelica.SIunits.Voltage V_nominal(min=0, start=480) + parameter Modelica.Units.SI.Voltage V_nominal(min=0, start=480) "RMS Nominal voltage (V_nominal >= 0)"; parameter Boolean perUnit = true "This flag display voltage in p.u."; Modelica.Blocks.Interfaces.RealOutput V[3](each unit="1") diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Sources/BaseClasses/BaseUnbalancedPV.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Sources/BaseClasses/BaseUnbalancedPV.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Sources/BaseClasses/BaseUnbalancedPV.mo" 2022-03-10 09:57:31.632143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Sources/BaseClasses/BaseUnbalancedPV.mo" 2022-03-10 09:58:53.480153687 +0000 @@ -3,7 +3,7 @@ extends Buildings.Electrical.Interfaces.PartialPluggableUnbalanced; extends Buildings.Electrical.Interfaces.PartialPvBase; extends Buildings.Electrical.Interfaces.PartialAcDcParameters; - parameter Modelica.SIunits.Voltage V_nominal(min=0, start=480) + parameter Modelica.Units.SI.Voltage V_nominal(min=0, start=480) "Nominal voltage (V_nominal >= 0)" annotation(Dialog(group="Nominal conditions")); parameter Real areaFraction[3](each min=0, each max=1.0) = ones(3)/3 diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Sources/FixedVoltage.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Sources/FixedVoltage.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Sources/FixedVoltage.mo" 2022-03-10 09:57:31.632143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Sources/FixedVoltage.mo" 2022-03-10 09:58:53.292153664 +0000 @@ -2,16 +2,16 @@ model FixedVoltage "Fixed voltage source" extends Buildings.Electrical.AC.ThreePhasesUnbalanced.Sources.BaseClasses.PartialSource; - parameter Modelica.SIunits.Frequency f(start=60) "Frequency of the source"; - parameter Modelica.SIunits.Voltage V(start=480) "RMS voltage of the source"; - parameter Modelica.SIunits.Angle phiSou = 0 "Phase shift of the source"; + parameter Modelica.Units.SI.Frequency f(start=60) "Frequency of the source"; + parameter Modelica.Units.SI.Voltage V(start=480) "RMS voltage of the source"; + parameter Modelica.Units.SI.Angle phiSou = 0 "Phase shift of the source"; parameter Boolean potentialReference = true "Serve as potential root for the reference angle theta" annotation (Evaluate=true, Dialog(group="Reference Parameters")); parameter Boolean definiteReference = false "Serve as definite root for the reference angle theta" annotation (Evaluate=true, Dialog(group="Reference Parameters")); - constant Modelica.SIunits.Angle angle120 = 2*Modelica.Constants.pi/3 + constant Modelica.Units.SI.Angle angle120 = 2*Modelica.Constants.pi/3 "Phase shift between the phase voltages"; OnePhase.Sources.FixedVoltage vPhase[3]( each f=f, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Sources/FixedVoltage_N.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Sources/FixedVoltage_N.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Sources/FixedVoltage_N.mo" 2022-03-10 09:57:31.632143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Sources/FixedVoltage_N.mo" 2022-03-10 09:58:53.276153661 +0000 @@ -2,16 +2,16 @@ model FixedVoltage_N "Fixed voltage source with neutral cable" extends Buildings.Electrical.AC.ThreePhasesUnbalanced.Sources.BaseClasses.PartialSource_N; - parameter Modelica.SIunits.Frequency f(start = 60) "Frequency of the source"; - parameter Modelica.SIunits.Voltage V(start = 480) "RMS voltage of the source"; - parameter Modelica.SIunits.Angle phiSou = 0 "Phase shift of the source"; + parameter Modelica.Units.SI.Frequency f(start = 60) "Frequency of the source"; + parameter Modelica.Units.SI.Voltage V(start = 480) "RMS voltage of the source"; + parameter Modelica.Units.SI.Angle phiSou = 0 "Phase shift of the source"; parameter Boolean potentialReference = true "Serve as potential root for the reference angle theta" annotation (Evaluate=true, Dialog(group="Reference Parameters")); parameter Boolean definiteReference = false "Serve as definite root for the reference angle theta" annotation (Evaluate=true, Dialog(group="Reference Parameters")); - constant Modelica.SIunits.Angle angle120 = 2*Modelica.Constants.pi/3 + constant Modelica.Units.SI.Angle angle120 = 2*Modelica.Constants.pi/3 "Phase shift between the phase voltages"; OnePhase.Sources.FixedVoltage vPhase[3]( each f=f, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Sources/Grid.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Sources/Grid.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Sources/Grid.mo" 2022-03-10 09:57:31.632143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Sources/Grid.mo" 2022-03-10 09:58:53.260153660 +0000 @@ -1,8 +1,8 @@ within Buildings.Electrical.AC.ThreePhasesUnbalanced.Sources; model Grid "Electrical grid" - parameter Modelica.SIunits.Frequency f(start = 60) "Frequency of the source"; - parameter Modelica.SIunits.Voltage V(start = 480) "RMS voltage of the source"; - parameter Modelica.SIunits.Angle phiSou = 0 "Phase shift of the source"; + parameter Modelica.Units.SI.Frequency f(start = 60) "Frequency of the source"; + parameter Modelica.Units.SI.Voltage V(start = 480) "RMS voltage of the source"; + parameter Modelica.Units.SI.Angle phiSou = 0 "Phase shift of the source"; Buildings.Electrical.AC.Interfaces.PowerOutput P[3] "Power consumed from grid if negative, or fed to grid if positive" annotation (Placement(transformation(extent={{100,-10},{120,10}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Sources/Grid_N.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Sources/Grid_N.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Sources/Grid_N.mo" 2022-03-10 09:57:31.632143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Sources/Grid_N.mo" 2022-03-10 09:58:53.244153657 +0000 @@ -1,8 +1,8 @@ within Buildings.Electrical.AC.ThreePhasesUnbalanced.Sources; model Grid_N "Electrical grid with neutral cable" - parameter Modelica.SIunits.Frequency f(start = 60) "Frequency of the source"; - parameter Modelica.SIunits.Voltage V(start = 480) "RMS voltage of the source"; - parameter Modelica.SIunits.Angle phiSou = 0 "Phase shift of the source"; + parameter Modelica.Units.SI.Frequency f(start = 60) "Frequency of the source"; + parameter Modelica.Units.SI.Voltage V(start = 480) "RMS voltage of the source"; + parameter Modelica.Units.SI.Angle phiSou = 0 "Phase shift of the source"; Buildings.Electrical.AC.Interfaces.PowerOutput P[3] "Power consumed from grid if negative, or fed to grid if positive" annotation (Placement(transformation(extent={{100,-10},{120,10}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Sources/PVsimpleOriented.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Sources/PVsimpleOriented.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Sources/PVsimpleOriented.mo" 2022-03-10 09:57:31.632143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Sources/PVsimpleOriented.mo" 2022-03-10 09:58:53.220153654 +0000 @@ -6,9 +6,9 @@ redeclare Buildings.Electrical.AC.OnePhase.Sources.PVSimple pv_phase1, redeclare Buildings.Electrical.AC.OnePhase.Sources.PVSimple pv_phase2, redeclare Buildings.Electrical.AC.OnePhase.Sources.PVSimple pv_phase3); - parameter Modelica.SIunits.Angle til "Surface tilt" annotation(Dialog(group="Orientation")); - parameter Modelica.SIunits.Angle lat "Latitude" annotation(Dialog(group="Orientation")); - parameter Modelica.SIunits.Angle azi "Surface Azimith" annotation(Dialog(group="Orientation")); + parameter Modelica.Units.SI.Angle til "Surface tilt" annotation(Dialog(group="Orientation")); + parameter Modelica.Units.SI.Angle lat "Latitude" annotation(Dialog(group="Orientation")); + parameter Modelica.Units.SI.Angle azi "Surface Azimith" annotation(Dialog(group="Orientation")); BoundaryConditions.SolarIrradiation.DiffusePerez HDifTil( final til=til, final lat=lat, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Sources/PVsimpleOriented_N.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Sources/PVsimpleOriented_N.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Sources/PVsimpleOriented_N.mo" 2022-03-10 09:57:31.632143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Sources/PVsimpleOriented_N.mo" 2022-03-10 09:58:53.208153652 +0000 @@ -5,9 +5,9 @@ redeclare Buildings.Electrical.AC.OnePhase.Sources.PVSimple pv_phase1, redeclare Buildings.Electrical.AC.OnePhase.Sources.PVSimple pv_phase2, redeclare Buildings.Electrical.AC.OnePhase.Sources.PVSimple pv_phase3); - parameter Modelica.SIunits.Angle til "Surface tilt" annotation(Dialog(group="Orientation")); - parameter Modelica.SIunits.Angle lat "Latitude" annotation(Dialog(group="Orientation")); - parameter Modelica.SIunits.Angle azi "Surface Azimith" annotation(Dialog(group="Orientation")); + parameter Modelica.Units.SI.Angle til "Surface tilt" annotation(Dialog(group="Orientation")); + parameter Modelica.Units.SI.Angle lat "Latitude" annotation(Dialog(group="Orientation")); + parameter Modelica.Units.SI.Angle azi "Surface Azimith" annotation(Dialog(group="Orientation")); BoundaryConditions.SolarIrradiation.DiffusePerez HDifTil( final til=til, final lat=lat, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Validation/IEEETests/Test4NodesFeeder/BaseClasses/IEEE4.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Validation/IEEETests/Test4NodesFeeder/BaseClasses/IEEE4.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Validation/IEEETests/Test4NodesFeeder/BaseClasses/IEEE4.mo" 2022-03-10 09:57:31.632143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/AC/ThreePhasesUnbalanced/Validation/IEEETests/Test4NodesFeeder/BaseClasses/IEEE4.mo" 2022-03-10 09:58:53.056153633 +0000 @@ -1,12 +1,12 @@ within Buildings.Electrical.AC.ThreePhasesUnbalanced.Validation.IEEETests.Test4NodesFeeder.BaseClasses; partial model IEEE4 "Base model of the IEEE 4 nodes test feeder" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Voltage VLL_side1 = 12.47e3 + parameter Modelica.Units.SI.Voltage VLL_side1 = 12.47e3 "Voltage line to line side 1"; - parameter Modelica.SIunits.Voltage VLL_side2 = 4.16e3 + parameter Modelica.Units.SI.Voltage VLL_side2 = 4.16e3 "Voltage line to line side 2"; - parameter Modelica.SIunits.ApparentPower VARbase = 6000e3 + parameter Modelica.Units.SI.ApparentPower VARbase = 6000e3 "Base VA power of the transformer"; parameter Boolean line1_use_Z_y = true @@ -14,29 +14,29 @@ parameter Boolean line2_use_Z_y = true "Choose between Zy or Zd impedance matrix for line 2"; - parameter Modelica.SIunits.Voltage V2_ref[3] = {7107, 7140, 7121} + parameter Modelica.Units.SI.Voltage V2_ref[3] = {7107, 7140, 7121} "Reference RMS voltage node 2 - IEEE results"; - parameter Modelica.SIunits.Voltage V3_ref[3] = {2247, 2269, 2256} + parameter Modelica.Units.SI.Voltage V3_ref[3] = {2247, 2269, 2256} "Reference RMS voltage node 3 - IEEE results"; - parameter Modelica.SIunits.Voltage V4_ref[3] = {1918, 2061, 1981} + parameter Modelica.Units.SI.Voltage V4_ref[3] = {1918, 2061, 1981} "Reference RMS voltage node 4 - IEEE results"; - parameter Modelica.SIunits.Angle Theta2_ref[3](each displayUnit="deg") = {-0.3, -120.3, 119.6} + parameter Modelica.Units.SI.Angle Theta2_ref[3](each displayUnit="deg") = {-0.3, -120.3, 119.6} "Reference voltage phase angle node 2 - IEEE results"; - parameter Modelica.SIunits.Angle Theta3_ref[3](each displayUnit="deg") = {-3.7, -123.5, 116.4} + parameter Modelica.Units.SI.Angle Theta3_ref[3](each displayUnit="deg") = {-3.7, -123.5, 116.4} "Reference voltage phase angle node 3 - IEEE results"; - parameter Modelica.SIunits.Angle Theta4_ref[3](each displayUnit="deg") = {-9.1, -128.3, 110.9} + parameter Modelica.Units.SI.Angle Theta4_ref[3](each displayUnit="deg") = {-9.1, -128.3, 110.9} "Reference voltage phase angle node 4 - IEEE results"; - Modelica.SIunits.Voltage err_V2[3] = node2.V - V2_ref + Modelica.Units.SI.Voltage err_V2[3] = node2.V - V2_ref "Error on voltage at node 2"; - Modelica.SIunits.Voltage err_V3[3] = node3.V - V3_ref + Modelica.Units.SI.Voltage err_V3[3] = node3.V - V3_ref "Error on voltage at node 3"; - Modelica.SIunits.Voltage err_V4[3] = node4.V - V4_ref + Modelica.Units.SI.Voltage err_V4[3] = node4.V - V4_ref "Error on voltage at node 4"; - Modelica.SIunits.Angle err_Theta2[3](each displayUnit="deg") = node2.theta - Theta2_ref + Modelica.Units.SI.Angle err_Theta2[3](each displayUnit="deg") = node2.theta - Theta2_ref "Error on voltage at node 2"; - Modelica.SIunits.Angle err_Theta3[3](each displayUnit="deg") = node3.theta - Theta3_ref + Modelica.Units.SI.Angle err_Theta3[3](each displayUnit="deg") = node3.theta - Theta3_ref "Error on voltage at node 3"; - Modelica.SIunits.Angle err_Theta4[3](each displayUnit="deg") = node4.theta - Theta4_ref + Modelica.Units.SI.Angle err_Theta4[3](each displayUnit="deg") = node4.theta - Theta4_ref "Error on voltage at node 4"; Real err_V2_percent[3] = 100*{err_V2[i]/V2_ref[i] for i in 1:3} "Error in RMS voltage at node 2 -- percent"; @@ -100,30 +100,30 @@ parameter Real L1 = 2000*(1.0/5280.0) "Length line 1 in miles"; parameter Real L2 = 2500*(1.0/5280.0) "Length line 2 in miles"; - parameter Modelica.SIunits.Impedance Z11_d[2] = {0.4013,1.4133} + parameter Modelica.Units.SI.Impedance Z11_d[2] = {0.4013,1.4133} "Element [1,1] of impedance matrix"; - parameter Modelica.SIunits.Impedance Z12_d[2] = {0.0953,0.8515} + parameter Modelica.Units.SI.Impedance Z12_d[2] = {0.0953,0.8515} "Element [1,2] of impedance matrix"; - parameter Modelica.SIunits.Impedance Z13_d[2] = {0.0953,0.7266} + parameter Modelica.Units.SI.Impedance Z13_d[2] = {0.0953,0.7266} "Element [1,3] of impedance matrix"; - parameter Modelica.SIunits.Impedance Z22_d[2] = {0.4013,1.4133} + parameter Modelica.Units.SI.Impedance Z22_d[2] = {0.4013,1.4133} "Element [2,2] of impedance matrix"; - parameter Modelica.SIunits.Impedance Z23_d[2] = {0.0953,0.7802} + parameter Modelica.Units.SI.Impedance Z23_d[2] = {0.0953,0.7802} "Element [2,3] of impedance matrix"; - parameter Modelica.SIunits.Impedance Z33_d[2] = {0.4013,1.4133} + parameter Modelica.Units.SI.Impedance Z33_d[2] = {0.4013,1.4133} "Element [3,3] of impedance matrix"; - parameter Modelica.SIunits.Impedance Z11_y[2] = {0.4576,1.078} + parameter Modelica.Units.SI.Impedance Z11_y[2] = {0.4576,1.078} "Element [1,1] of impedance matrix"; - parameter Modelica.SIunits.Impedance Z12_y[2] = {0.1559,0.5017} + parameter Modelica.Units.SI.Impedance Z12_y[2] = {0.1559,0.5017} "Element [1,2] of impedance matrix"; - parameter Modelica.SIunits.Impedance Z13_y[2] = {0.1535,0.3849} + parameter Modelica.Units.SI.Impedance Z13_y[2] = {0.1535,0.3849} "Element [1,3] of impedance matrix"; - parameter Modelica.SIunits.Impedance Z22_y[2] = {0.4666,1.0482} + parameter Modelica.Units.SI.Impedance Z22_y[2] = {0.4666,1.0482} "Element [2,2] of impedance matrix"; - parameter Modelica.SIunits.Impedance Z23_y[2] = {0.158,0.4236} + parameter Modelica.Units.SI.Impedance Z23_y[2] = {0.158,0.4236} "Element [2,3] of impedance matrix"; - parameter Modelica.SIunits.Impedance Z33_y[2] = {0.4615,1.0651} + parameter Modelica.Units.SI.Impedance Z33_y[2] = {0.4615,1.0651} "Element [3,3] of impedance matrix"; equation connect(source.terminal, line1.terminal_n) annotation (Line( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/DC/Conversion/DCDCConverter.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/DC/Conversion/DCDCConverter.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/DC/Conversion/DCDCConverter.mo" 2022-03-10 09:57:31.632143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/DC/Conversion/DCDCConverter.mo" 2022-03-10 09:58:52.924153616 +0000 @@ -5,21 +5,21 @@ redeclare package PhaseSystem_n = PhaseSystems.TwoConductor, redeclare Interfaces.Terminal_n terminal_n, redeclare Interfaces.Terminal_p terminal_p); - parameter Modelica.SIunits.Voltage VHigh + parameter Modelica.Units.SI.Voltage VHigh "DC voltage on side 1 of the transformer (primary side)"; - parameter Modelica.SIunits.Voltage VLow + parameter Modelica.Units.SI.Voltage VLow "DC voltage on side 2 of the transformer (secondary side)"; - parameter Modelica.SIunits.Efficiency eta(max=1) "Converter efficiency"; + parameter Modelica.Units.SI.Efficiency eta(max=1) "Converter efficiency"; parameter Boolean ground_1 = true "Connect side 1 of converter to ground" annotation(Evaluate=true, Dialog(tab = "Ground", group="side 1")); parameter Boolean ground_2 = true "Connect side 2 of converter to ground" annotation(Evaluate=true, Dialog(tab = "Ground", group="side 2")); - Modelica.SIunits.Power LossPower "Loss power"; + Modelica.Units.SI.Power LossPower "Loss power"; protected parameter Real conversionFactor = VLow/VHigh "Ratio of high versus low voltage"; - Modelica.SIunits.Current i1,i2; - Modelica.SIunits.Voltage v1,v2; - Modelica.SIunits.Power P_p "Power at terminal p"; - Modelica.SIunits.Power P_n "Power at terminal n"; + Modelica.Units.SI.Current i1,i2; + Modelica.Units.SI.Voltage v1,v2; + Modelica.Units.SI.Power P_p "Power at terminal p"; + Modelica.Units.SI.Power P_n "Power at terminal n"; equation Connections.potentialRoot(terminal_n.theta); Connections.potentialRoot(terminal_p.theta); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/DC/Lines/Examples/DCLines.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/DC/Lines/Examples/DCLines.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/DC/Lines/Examples/DCLines.mo" 2022-03-10 09:57:31.632143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/DC/Lines/Examples/DCLines.mo" 2022-03-10 09:58:52.828153604 +0000 @@ -5,7 +5,7 @@ parameter Boolean linearLoads = false "Flag that selects between linearized or nonlinear load models"; parameter Real L = 10 "Lenght of each cable"; - Modelica.SIunits.Power Sloads = load1.S[1] + load2.S[1] +load3.S[1] +load4.S[1] + + Modelica.Units.SI.Power Sloads = load1.S[1] + load2.S[1] +load3.S[1] +load4.S[1] + load5.S[1] +load6.S[1] +load7.S[1] +load8.S[1] +load9.S[1] + load10.S[1] "Sum of the power consumed by the loads"; Line line( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/DC/Lines/TwoPortRCLine.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/DC/Lines/TwoPortRCLine.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/DC/Lines/TwoPortRCLine.mo" 2022-03-10 09:57:31.632143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/DC/Lines/TwoPortRCLine.mo" 2022-03-10 09:58:52.732153592 +0000 @@ -9,9 +9,9 @@ parameter Boolean use_C = false "Set to true to add a capacitance in the center of the line" annotation(Dialog(tab="Model", group="Assumptions")); - parameter Modelica.SIunits.Voltage Vc_start = V_nominal + parameter Modelica.Units.SI.Voltage Vc_start = V_nominal "Initial value of the voltage of the capacitance in the middle of the line"; - Modelica.SIunits.Voltage Vc(start = Vc_start, stateSelect = StateSelect.prefer) + Modelica.Units.SI.Voltage Vc(start = Vc_start, stateSelect = StateSelect.prefer) "Voltage of the capacitor"; initial equation if C>0 and use_C then diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/DC/Loads/Conductor.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/DC/Loads/Conductor.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/DC/Loads/Conductor.mo" 2022-03-10 09:57:31.632143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/DC/Loads/Conductor.mo" 2022-03-10 09:58:52.696153587 +0000 @@ -4,7 +4,7 @@ redeclare package PhaseSystem = PhaseSystems.TwoConductor, redeclare Interfaces.Terminal_n terminal); protected - Modelica.SIunits.Voltage absDV + Modelica.Units.SI.Voltage absDV "Absolute value of the voltage difference between the two conductors (used by the linearized model)"; equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/DC/Loads/Resistor.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/DC/Loads/Resistor.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/DC/Loads/Resistor.mo" 2022-03-10 09:57:31.632143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/DC/Loads/Resistor.mo" 2022-03-10 09:58:52.644153581 +0000 @@ -6,12 +6,12 @@ final mode=Buildings.Electrical.Types.Load.FixedZ_steady_state, final P_nominal=V_nominal^2/max(R, Modelica.Constants.small)); extends Modelica.Electrical.Analog.Interfaces.ConditionalHeatPort(T = T_ref); - parameter Modelica.SIunits.Resistance R(start=1) + parameter Modelica.Units.SI.Resistance R(start=1) "Resistance at temperature T_ref"; - parameter Modelica.SIunits.Temperature T_ref=300.15 "Reference temperature"; - parameter Modelica.SIunits.LinearTemperatureCoefficient alpha=0 + parameter Modelica.Units.SI.Temperature T_ref=300.15 "Reference temperature"; + parameter Modelica.Units.SI.LinearTemperatureCoefficient alpha=0 "Temperature coefficient of resistance (R_actual = R*(1 + alpha*(T_heatPort - T_ref))"; - Modelica.SIunits.Resistance R_actual + Modelica.Units.SI.Resistance R_actual "Actual resistance = R*(1 + alpha*(T_heatPort - T_ref))"; equation assert((1 + alpha*(T_heatPort - T_ref)) >= Modelica.Constants.eps, "Temperature outside of scope of model"); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/DC/Sources/BaseClasses/WindCorrection.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/DC/Sources/BaseClasses/WindCorrection.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/DC/Sources/BaseClasses/WindCorrection.mo" 2022-03-10 09:57:31.632143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/DC/Sources/BaseClasses/WindCorrection.mo" 2022-03-10 09:58:52.548153569 +0000 @@ -1,8 +1,8 @@ within Buildings.Electrical.DC.Sources.BaseClasses; block WindCorrection "Block for wind correction" - extends Modelica.Blocks.Interfaces.BlockIcon; - parameter Modelica.SIunits.Height h "Height over ground"; - parameter Modelica.SIunits.Height hRef + extends Modelica.Blocks.Icons.Block; + parameter Modelica.Units.SI.Height h "Height over ground"; + parameter Modelica.Units.SI.Height hRef "Reference height for wind measurement"; parameter Real n(min=0) = 0.4 "Height exponent for wind profile calculation"; Modelica.Blocks.Interfaces.RealOutput vLoc( unit="m/s") diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/DC/Sources/ConstantVoltage.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/DC/Sources/ConstantVoltage.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/DC/Sources/ConstantVoltage.mo" 2022-03-10 09:57:31.632143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/DC/Sources/ConstantVoltage.mo" 2022-03-10 09:58:52.540153569 +0000 @@ -5,7 +5,7 @@ redeclare Interfaces.Terminal_p terminal, final potentialReference=true, final definiteReference=false); - parameter Modelica.SIunits.Voltage V(start=1) "Value of constant voltage"; + parameter Modelica.Units.SI.Voltage V(start=1) "Value of constant voltage"; Modelica.Electrical.Analog.Interfaces.NegativePin n "Negative pin" annotation (Placement(transformation(extent={{-110,-10},{-90,10}}))); equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/DC/Sources/Examples/VoltageSource.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/DC/Sources/Examples/VoltageSource.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/DC/Sources/Examples/VoltageSource.mo" 2022-03-10 09:57:31.632143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/DC/Sources/Examples/VoltageSource.mo" 2022-03-10 09:58:52.512153564 +0000 @@ -15,7 +15,7 @@ annotation (Placement(transformation(extent={{-14,-10},{6,10}}))); Modelica.Blocks.Sources.Sine cosine( phase=0, - freqHz=1, +f =1, offset=12, amplitude=3) "Variable voltage signal" annotation (Placement(transformation(extent={{-120,-4},{-100,16}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/DC/Storage/BaseClasses/Charge.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/DC/Storage/BaseClasses/Charge.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/DC/Storage/BaseClasses/Charge.mo" 2022-03-10 09:57:31.636143319 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/DC/Storage/BaseClasses/Charge.mo" 2022-03-10 09:58:52.448153556 +0000 @@ -1,15 +1,15 @@ within Buildings.Electrical.DC.Storage.BaseClasses; model Charge "Model to compute the battery charge" extends Modelica.Blocks.Icons.Block; - parameter Modelica.SIunits.Efficiency etaCha(max=1) = 0.9 + parameter Modelica.Units.SI.Efficiency etaCha(max=1) = 0.9 "Efficiency during charging"; - parameter Modelica.SIunits.Efficiency etaDis(max=1) = 0.9 + parameter Modelica.Units.SI.Efficiency etaDis(max=1) = 0.9 "Efficiency during discharging"; parameter Real SOC_start(min=0, max=1, unit="1")=0.1 "Initial state of charge"; - parameter Modelica.SIunits.Energy EMax(min=0, displayUnit="kWh") + parameter Modelica.Units.SI.Energy EMax(min=0, displayUnit="kWh") "Maximum available charge"; - Modelica.SIunits.Power PAct "Actual power"; + Modelica.Units.SI.Power PAct "Actual power"; Modelica.Blocks.Interfaces.RealInput P(final quantity="Power", final unit="W") annotation (Placement(transformation( extent={{-140,-20},{-100,20}}),iconTransformation(extent={{-140,-20},{ diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/DC/Storage/Battery.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/DC/Storage/Battery.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/DC/Storage/Battery.mo" 2022-03-10 09:57:31.636143319 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/DC/Storage/Battery.mo" 2022-03-10 09:58:52.436153555 +0000 @@ -1,13 +1,13 @@ within Buildings.Electrical.DC.Storage; model Battery "Simple model of a battery" - parameter Modelica.SIunits.Efficiency etaCha(max=1) = 0.9 + parameter Modelica.Units.SI.Efficiency etaCha(max=1) = 0.9 "Efficiency during charging"; - parameter Modelica.SIunits.Efficiency etaDis(max=1) = 0.9 + parameter Modelica.Units.SI.Efficiency etaDis(max=1) = 0.9 "Efficiency during discharging"; parameter Real SOC_start(min=0, max=1, unit="1")=0.1 "Initial state of charge"; - parameter Modelica.SIunits.Energy EMax(min=0, displayUnit="kWh") + parameter Modelica.Units.SI.Energy EMax(min=0, displayUnit="kWh") "Maximum available charge"; - parameter Modelica.SIunits.Voltage V_nominal + parameter Modelica.Units.SI.Voltage V_nominal "Nominal voltage (V_nominal >= 0)"; Modelica.Blocks.Interfaces.RealInput P(unit="W") "Power stored in battery (if positive), or extracted from battery (if negative)" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/Examples/RenewableSources.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/Examples/RenewableSources.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/Examples/RenewableSources.mo" 2022-03-10 09:57:31.636143319 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/Examples/RenewableSources.mo" 2022-03-10 09:58:52.396153550 +0000 @@ -2,19 +2,19 @@ model RenewableSources "Example model that shows the impact of renewable sources on the electrical grid" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Frequency f = 60 "Nominal grid frequency"; - parameter Modelica.SIunits.Voltage V_nominal = 480 "Nominal grid voltage"; - parameter Modelica.SIunits.Power PLoa_nominal = 3500 + parameter Modelica.Units.SI.Frequency f = 60 "Nominal grid frequency"; + parameter Modelica.Units.SI.Voltage V_nominal = 480 "Nominal grid voltage"; + parameter Modelica.Units.SI.Power PLoa_nominal = 3500 "Nominal power of a load"; - parameter Modelica.SIunits.Power PWin = PLoa_nominal*4 + parameter Modelica.Units.SI.Power PWin = PLoa_nominal*4 "Nominal power of the wind turbine"; - parameter Modelica.SIunits.Power PSun = PLoa_nominal*1.0 + parameter Modelica.Units.SI.Power PSun = PLoa_nominal*1.0 "Nominal power of the PV"; - parameter Modelica.SIunits.DensityOfHeatFlowRate W_m2_nominal = 1000 + parameter Modelica.Units.SI.DensityOfHeatFlowRate W_m2_nominal = 1000 "Nominal solar power per unit area"; parameter Real eff_PV = 0.12*0.85*0.9 "Nominal solar power conversion efficiency (this should consider converion efficiency, area covered, AC/DC losses)"; - parameter Modelica.SIunits.Area A_PV = PSun/eff_PV/W_m2_nominal + parameter Modelica.Units.SI.Area A_PV = PSun/eff_PV/W_m2_nominal "Nominal area of a P installation"; AC.ThreePhasesBalanced.Sources.Grid gri( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/Interfaces/CapacitiveLoad.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/Interfaces/CapacitiveLoad.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/Interfaces/CapacitiveLoad.mo" 2022-03-10 09:57:31.636143319 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/Interfaces/CapacitiveLoad.mo" 2022-03-10 09:58:52.260153532 +0000 @@ -20,11 +20,11 @@ function j = PhaseSystem.j "J operator that rotates of 90 degrees"; Modelica.Blocks.Interfaces.RealInput pf_internal "Hidden value of the input load for the conditional connector"; - Modelica.SIunits.ElectricCharge q[2](each stateSelect=StateSelect.prefer) + Modelica.Units.SI.ElectricCharge q[2](each stateSelect=StateSelect.prefer) "Electric charge"; - Modelica.SIunits.Admittance[2] Y "Admittance"; - Modelica.SIunits.AngularVelocity omega "Angular velocity"; - Modelica.SIunits.Power Q = P*tan(-acos(pf_internal)) + Modelica.Units.SI.Admittance[2] Y "Admittance"; + Modelica.Units.SI.AngularVelocity omega "Angular velocity"; + Modelica.Units.SI.Power Q = P*tan(-acos(pf_internal)) "Reactive power (negative because capacitive load)"; equation connect(pf_in, pf_internal); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/Interfaces/Impedance.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/Interfaces/Impedance.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/Interfaces/Impedance.mo" 2022-03-10 09:57:31.636143319 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/Interfaces/Impedance.mo" 2022-03-10 09:58:52.240153530 +0000 @@ -11,34 +11,34 @@ choice=true "Inductive", choice=false "Capacitive", __Dymola_radioButtons=true)); - parameter Modelica.SIunits.Resistance R(start = 1,min=0) = 1 "Resistance" + parameter Modelica.Units.SI.Resistance R(start = 1,min=0) = 1 "Resistance" annotation (Dialog(enable= not use_R_in)); - parameter Modelica.SIunits.Inductance L(start=0, min=0) = 0 "Inductance" + parameter Modelica.Units.SI.Inductance L(start=0, min=0) = 0 "Inductance" annotation (Dialog(enable=inductive and (not use_L_in))); - parameter Modelica.SIunits.Capacitance C(start=0,min=0) = 0 "Capacitance" + parameter Modelica.Units.SI.Capacitance C(start=0,min=0) = 0 "Capacitance" annotation (Dialog(enable=(not inductive) and (not use_C_in))); parameter Boolean use_R_in = false "If true, R is specified by an input" annotation(Evaluate=true, Dialog(tab = "Variable load", group="Resistance")); - parameter Modelica.SIunits.Resistance RMin(start = R, min=Modelica.Constants.eps) = 1e-4 + parameter Modelica.Units.SI.Resistance RMin(start = R, min=Modelica.Constants.eps) = 1e-4 "Minimum value of the resistance" annotation(Evaluate=true, Dialog(enable = use_R_in, tab = "Variable load", group="Resistance")); - parameter Modelica.SIunits.Resistance RMax(start = R, min=Modelica.Constants.eps) = 1e2 + parameter Modelica.Units.SI.Resistance RMax(start = R, min=Modelica.Constants.eps) = 1e2 "Maximum value of the resistance" annotation(Evaluate=true, Dialog(enable = use_R_in, tab = "Variable load", group="Resistance")); parameter Boolean use_C_in = false "If true, C is specified by an input" annotation(Evaluate=true, Dialog(tab = "Variable load", group="Capacitance")); - parameter Modelica.SIunits.Capacitance CMin(start = C, min=Modelica.Constants.eps) = 1e-4 + parameter Modelica.Units.SI.Capacitance CMin(start = C, min=Modelica.Constants.eps) = 1e-4 "Minimum value of the capacitance" annotation(Evaluate=true, Dialog(enable = use_C_in, tab = "Variable load", group="Capacitance")); - parameter Modelica.SIunits.Capacitance CMax(start = C, min=Modelica.Constants.eps) = 1e2 + parameter Modelica.Units.SI.Capacitance CMax(start = C, min=Modelica.Constants.eps) = 1e2 "Maximum value of the capacitance" annotation(Evaluate=true, Dialog(enable = use_C_in, tab = "Variable load", group="Capacitance")); parameter Boolean use_L_in = false "If true, L is specified by an input" annotation(Evaluate=true, Dialog(tab = "Variable load", group="Inductance")); - parameter Modelica.SIunits.Inductance LMin(start = L, min=Modelica.Constants.eps) = 1e-4 + parameter Modelica.Units.SI.Inductance LMin(start = L, min=Modelica.Constants.eps) = 1e-4 "Minimum value of the inductance" annotation(Evaluate=true, Dialog(enable = use_L_in, tab = "Variable load", group="Inductance")); - parameter Modelica.SIunits.Inductance LMax(start = L, min=Modelica.Constants.eps) = 1e2 + parameter Modelica.Units.SI.Inductance LMax(start = L, min=Modelica.Constants.eps) = 1e2 "Maximum value of the inductance" annotation(Evaluate=true, Dialog(enable = use_L_in, tab = "Variable load", group="Inductance")); Modelica.Blocks.Interfaces.RealInput y_R(min=0, max=1) if use_R_in @@ -66,11 +66,11 @@ "Internal signal used to compute the variable C_internal"; Modelica.Blocks.Interfaces.RealOutput y_L_internal "Internal signal used to compute the variable L_internal"; - Modelica.SIunits.Resistance R_internal + Modelica.Units.SI.Resistance R_internal "Actual resistance used to compute the impedance"; - Modelica.SIunits.Inductance L_internal + Modelica.Units.SI.Inductance L_internal "Actual inductance used to compute the impedance"; - Modelica.SIunits.Capacitance C_internal + Modelica.Units.SI.Capacitance C_internal "Actual capacitance used to compute the impedance"; equation // These assertions ensures that if the variable R, L or C is computed using the inputs diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/Interfaces/InductiveLoad.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/Interfaces/InductiveLoad.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/Interfaces/InductiveLoad.mo" 2022-03-10 09:57:31.636143319 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/Interfaces/InductiveLoad.mo" 2022-03-10 09:58:52.216153527 +0000 @@ -20,11 +20,11 @@ function j = PhaseSystem.j "J operator that rotates of 90 degrees"; Modelica.Blocks.Interfaces.RealInput pf_internal "Hidden value of the input load for the conditional connector"; - Modelica.SIunits.MagneticFlux psi[2](each stateSelect=StateSelect.prefer) + Modelica.Units.SI.MagneticFlux psi[2](each stateSelect=StateSelect.prefer) "Magnetic flux"; - Modelica.SIunits.Impedance Z[2] "Impedance of the load"; - Modelica.SIunits.AngularVelocity omega "Angular frequency"; - Modelica.SIunits.Power Q = P*tan(acos(pf_internal)) + Modelica.Units.SI.Impedance Z[2] "Impedance of the load"; + Modelica.Units.SI.AngularVelocity omega "Angular frequency"; + Modelica.Units.SI.Power Q = P*tan(acos(pf_internal)) "Reactive power (positive because inductive load)"; equation connect(pf_in, pf_internal); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/Interfaces/Load.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/Interfaces/Load.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/Interfaces/Load.mo" 2022-03-10 09:57:31.636143319 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/Interfaces/Load.mo" 2022-03-10 09:58:52.208153526 +0000 @@ -12,12 +12,12 @@ "Type of load model (e.g., steady state, dynamic, prescribed power consumption, etc.)" annotation (Evaluate=true, Dialog(group="Modeling assumption")); - parameter Modelica.SIunits.Power P_nominal = 0 + parameter Modelica.Units.SI.Power P_nominal = 0 "Nominal power (negative if consumed, positive if generated). Used if mode <> Buildings.Electrical.Types.Load.VariableZ_P_input" annotation(Dialog(group="Nominal conditions", enable = mode <> Buildings.Electrical.Types.Load.VariableZ_P_input)); - parameter Modelica.SIunits.Voltage V_nominal(min=0, start=110) + parameter Modelica.Units.SI.Voltage V_nominal(min=0, start=110) "Nominal voltage (V_nominal >= 0)" annotation ( Evaluate=true, @@ -28,13 +28,13 @@ max=Buildings.Electrical.Types.InitMode.linearized) = Buildings.Electrical.Types.InitMode.zero_current "Initialization mode for homotopy operator" annotation(Dialog(tab = "Initialization")); - Modelica.SIunits.Voltage v[:](start = PhaseSystem.phaseVoltages(V_nominal)) = terminal.v + Modelica.Units.SI.Voltage v[:](start = PhaseSystem.phaseVoltages(V_nominal)) = terminal.v "Voltage vector"; - Modelica.SIunits.Current i[:](start = PhaseSystem.phaseCurrents(0.0)) = terminal.i + Modelica.Units.SI.Current i[:](start = PhaseSystem.phaseCurrents(0.0)) = terminal.i "Current vector"; - Modelica.SIunits.Power S[PhaseSystem.n] = PhaseSystem.phasePowers_vi(v, -i) + Modelica.Units.SI.Power S[PhaseSystem.n] = PhaseSystem.phasePowers_vi(v, -i) "Phase powers"; - Modelica.SIunits.Power P + Modelica.Units.SI.Power P "Power of the load (negative if consumed, positive if fed into the electrical grid)"; Modelica.Blocks.Interfaces.RealInput y(min=0, max=1, unit="1") if diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/Interfaces/PartialConversion.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/Interfaces/PartialConversion.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/Interfaces/PartialConversion.mo" 2022-03-10 09:57:31.636143319 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/Interfaces/PartialConversion.mo" 2022-03-10 09:58:52.172153522 +0000 @@ -2,10 +2,10 @@ model PartialConversion "Model representing a generic two port system for conversion" extends Buildings.Electrical.Interfaces.PartialTwoPort; - Modelica.SIunits.Voltage v_p "Voltage drop between the two positive pins"; - Modelica.SIunits.Voltage v_n "Voltage drop between the two negative pins"; - Modelica.SIunits.Current i_p "Current flowing through the positive pins"; - Modelica.SIunits.Current i_n "Current flowing through the negative pins"; + Modelica.Units.SI.Voltage v_p "Voltage drop between the two positive pins"; + Modelica.Units.SI.Voltage v_n "Voltage drop between the two negative pins"; + Modelica.Units.SI.Current i_p "Current flowing through the positive pins"; + Modelica.Units.SI.Current i_n "Current flowing through the negative pins"; equation i_p = PhaseSystem_p.systemCurrent(terminal_p.i); i_n = PhaseSystem_n.systemCurrent(terminal_n.i); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/Interfaces/PartialPV.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/Interfaces/PartialPV.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/Interfaces/PartialPV.mo" 2022-03-10 09:57:31.636143319 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/Interfaces/PartialPV.mo" 2022-03-10 09:58:52.164153520 +0000 @@ -5,7 +5,7 @@ Buildings.Electrical.PhaseSystems.PartialPhaseSystem constrainedby Buildings.Electrical.PhaseSystems.PartialPhaseSystem "Phase system" annotation (choicesAllMatching=true); - parameter Modelica.SIunits.Voltage V_nominal(min=0, start=110) + parameter Modelica.Units.SI.Voltage V_nominal(min=0, start=110) "Nominal voltage (V_nominal >= 0)" annotation(Evaluate=true, Dialog(group="Nominal conditions")); Modelica.Blocks.Interfaces.RealInput G(unit="W/m2") "Total solar irradiation per unit area" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/Interfaces/PartialPVOriented.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/Interfaces/PartialPVOriented.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/Interfaces/PartialPVOriented.mo" 2022-03-10 09:57:31.636143319 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/Interfaces/PartialPVOriented.mo" 2022-03-10 09:58:52.148153519 +0000 @@ -7,13 +7,13 @@ Buildings.Electrical.PhaseSystems.PartialPhaseSystem "Phase system" annotation (choicesAllMatching=true); - parameter Modelica.SIunits.Angle til "Surface tilt" + parameter Modelica.Units.SI.Angle til "Surface tilt" annotation(Evaluate=true,Dialog(group="Orientation")); - parameter Modelica.SIunits.Angle lat "Latitude" + parameter Modelica.Units.SI.Angle lat "Latitude" annotation(Evaluate=true,Dialog(group="Orientation")); - parameter Modelica.SIunits.Angle azi "Surface azimuth" + parameter Modelica.Units.SI.Angle azi "Surface azimuth" annotation(Evaluate=true,Dialog(group="Orientation")); - parameter Modelica.SIunits.Voltage V_nominal(min=0, start=110) + parameter Modelica.Units.SI.Voltage V_nominal(min=0, start=110) "Nominal voltage (V_nominal >= 0)" annotation(Evaluate=true, Dialog(group="Nominal conditions")); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/Interfaces/PartialPvBase.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/Interfaces/PartialPvBase.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/Interfaces/PartialPvBase.mo" 2022-03-10 09:57:31.636143319 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/Interfaces/PartialPvBase.mo" 2022-03-10 09:58:52.124153515 +0000 @@ -1,6 +1,6 @@ within Buildings.Electrical.Interfaces; partial model PartialPvBase "Partial model with basic parameters for PVs" - parameter Modelica.SIunits.Area A "Net surface area"; + parameter Modelica.Units.SI.Area A "Net surface area"; parameter Real fAct(min=0, max=1, unit="1") = 0.9 "Fraction of surface area with active solar cells"; parameter Real eta(min=0, max=1, unit="1") = 0.12 diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/Interfaces/PartialWindTurbineBase.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/Interfaces/PartialWindTurbineBase.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/Interfaces/PartialWindTurbineBase.mo" 2022-03-10 09:57:31.636143319 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/Interfaces/PartialWindTurbineBase.mo" 2022-03-10 09:58:52.104153514 +0000 @@ -1,16 +1,16 @@ within Buildings.Electrical.Interfaces; partial model PartialWindTurbineBase "Base class for turbine model that contains basic parameters" - final parameter Modelica.SIunits.Velocity vIn = table[1,1] + final parameter Modelica.Units.SI.Velocity vIn = table[1,1] "Cut-in steady wind speed"; - final parameter Modelica.SIunits.Velocity vOut = table[size(table,1), 1] + final parameter Modelica.Units.SI.Velocity vOut = table[size(table,1), 1] "Cut-out steady wind speed"; parameter Real scale(min=0)=1 "Scaling factor, used to allow adjusting the power output without changing the table"; parameter Real h "Height over ground" annotation (Dialog(group="Wind correction")); - parameter Modelica.SIunits.Height hRef = 10 + parameter Modelica.Units.SI.Height hRef = 10 "Reference height for wind measurement" annotation (Dialog(group="Wind correction")); parameter Real nWin(min=0) = 0.4 @@ -29,7 +29,7 @@ parameter String tableName="NoName" "Table name on file or in function usertab (see documentation)"; parameter String fileName="NoName" "File where matrix is stored"; - parameter Modelica.SIunits.Voltage V_nominal(min=0, start=110) + parameter Modelica.Units.SI.Voltage V_nominal(min=0, start=110) "Nominal voltage (V_nominal >= 0)" annotation(Evaluate=true, Dialog(group="Nominal conditions")); Modelica.Blocks.Interfaces.RealInput vWin(unit="m/s") "Steady wind speed" annotation (Placement(transformation( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/Interfaces/Source.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/Interfaces/Source.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/Interfaces/Source.mo" 2022-03-10 09:57:31.636143319 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/Interfaces/Source.mo" 2022-03-10 09:58:52.092153512 +0000 @@ -10,10 +10,10 @@ parameter Boolean definiteReference = false "Serve as definite root for the reference angle theta" annotation (Evaluate=true, Dialog(group="Reference Parameters")); - Modelica.SIunits.Power S[PhaseSystem.n]= + Modelica.Units.SI.Power S[PhaseSystem.n]= PhaseSystem.phasePowers_vi(terminal.v, terminal.i) "Complex power S[1] = P, S[2]= Q"; - Modelica.SIunits.Angle phi= + Modelica.Units.SI.Angle phi= PhaseSystem.phase(terminal.v) - PhaseSystem.phase(-terminal.i) "Phase shift with respect to reference angle"; replaceable Buildings.Electrical.Interfaces.Terminal terminal( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/Interfaces/VariableVoltageSource.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/Interfaces/VariableVoltageSource.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/Interfaces/VariableVoltageSource.mo" 2022-03-10 09:57:31.636143319 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/Interfaces/VariableVoltageSource.mo" 2022-03-10 09:58:52.048153506 +0000 @@ -3,7 +3,7 @@ "Partial model of a generic variable voltage source." extends Buildings.Electrical.Interfaces.Source; parameter Boolean use_V_in = true "If true, the voltage is an input"; - parameter Modelica.SIunits.Voltage V = 1 "Value of constant voltage" + parameter Modelica.Units.SI.Voltage V = 1 "Value of constant voltage" annotation (Dialog(enable= not use_V_in)); Modelica.Blocks.Interfaces.RealInput V_in(unit="V", min=0, start = 1) if use_V_in "Input voltage" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/PhaseSystems/PartialPhaseSystem.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/PhaseSystems/PartialPhaseSystem.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/PhaseSystems/PartialPhaseSystem.mo" 2022-03-10 09:57:31.636143319 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/PhaseSystems/PartialPhaseSystem.mo" 2022-03-10 09:58:52.024153503 +0000 @@ -63,7 +63,7 @@ "Rotate a vector of an angle theta (anti-counterclock)" extends Modelica.Icons.Function; input Real x[n]; - input Modelica.SIunits.Angle theta; + input Modelica.Units.SI.Angle theta; output Real y[n]; end rotate; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/PhaseSystems/package.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/PhaseSystems/package.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/PhaseSystems/package.mo" 2022-03-10 09:57:31.636143319 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/PhaseSystems/package.mo" 2022-03-10 09:58:52.040153506 +0000 @@ -1,10 +1,11 @@ within Buildings.Electrical; package PhaseSystems "Phase systems used in power connectors" extends Modelica.Icons.Package; - import SI = Modelica.SIunits; + import Modelica.Units.SI; import Modelica.Constants.pi; + annotation (Icon(graphics={Line( points={{-70,-52},{50,-52}}, color={95,95,95}, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/Transmission/BaseClasses/BaseCable.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/Transmission/BaseClasses/BaseCable.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/Transmission/BaseClasses/BaseCable.mo" 2022-03-10 09:57:31.636143319 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/Transmission/BaseClasses/BaseCable.mo" 2022-03-10 09:58:51.964153496 +0000 @@ -2,22 +2,23 @@ record BaseCable "Record that contains the properties of a generic cable" parameter Buildings.Electrical.Transmission.Types.Material material = Buildings.Electrical.Transmission.Types.Material.Al "Material of the cable"; - parameter Modelica.SIunits.Current Amp(start=0.0)=0.0 + + parameter Modelica.Units.SI.Current Amp(start=0.0)=0.0 "Ampacitance of the cable"; - parameter Modelica.SIunits.Temperature T_ref = 298.15 + parameter Modelica.Units.SI.Temperature T_ref = 298.15 "Reference cable temperature"; - parameter Modelica.SIunits.Temperature M = 228.1 + 273.15 + parameter Modelica.Units.SI.Temperature M = 228.1 + 273.15 "Temperature constant of the material"; replaceable partial function lineResistance "Function that computes the resistance of a cable" extends Modelica.Icons.Function; - input Modelica.SIunits.Length l "Length of the cable"; - input Modelica.SIunits.Frequency f = 50 + input Modelica.Units.SI.Length l "Length of the cable"; + input Modelica.Units.SI.Frequency f = 50 "Frequency considered in the definition of cables properties"; - output Modelica.SIunits.Resistance R "Resistance of the cable"; + output Modelica.Units.SI.Resistance R "Resistance of the cable"; protected - parameter Modelica.SIunits.AngularVelocity omega = 2*Modelica.Constants.pi*f; + parameter Modelica.Units.SI.AngularVelocity omega = 2*Modelica.Constants.pi*f; annotation (Documentation(revisions="
This is a base record for specifying physical properties for medium diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/Utilities/Controllers/StateMachineVoltCtrl.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/Utilities/Controllers/StateMachineVoltCtrl.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/Utilities/Controllers/StateMachineVoltCtrl.mo" 2022-03-10 09:57:31.636143319 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/Utilities/Controllers/StateMachineVoltCtrl.mo" 2022-03-10 09:58:51.480153434 +0000 @@ -2,11 +2,11 @@ model StateMachineVoltCtrl "This model represents a simple voltage controller that unplug a load when there is a voltage fluctuation higher that a given threshold." Modelica.Blocks.Interfaces.RealInput V "Voltage of the node to be controlled"; - parameter Modelica.SIunits.Voltage V_nominal + parameter Modelica.Units.SI.Voltage V_nominal "Nominal voltage of the node to be controlled"; parameter Real vThresh(min=0.0, max=1.0) = 0.1 "Threshold that activates voltage ctrl (ratio of nominal voltage)"; - parameter Modelica.SIunits.Time tDelay = 300 + parameter Modelica.Units.SI.Time tDelay = 300 "Time to wait before plugging the load back"; output Real y "Output signal that represents whether the load should be connected to the grid or not"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/Utilities/Examples/TestVoltageCTRL.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/Utilities/Examples/TestVoltageCTRL.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/Utilities/Examples/TestVoltageCTRL.mo" 2022-03-10 09:57:31.636143319 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/Utilities/Examples/TestVoltageCTRL.mo" 2022-03-10 09:58:51.388153422 +0000 @@ -15,7 +15,7 @@ annotation (Placement(transformation(extent={{-70,-36},{-50,-16}}))); Modelica.Blocks.Sources.Sine cosine( amplitude=20, - freqHz=0.1, +f =0.1, phase=0, offset=120) "Variable voltage signal" annotation (Placement(transformation(extent={{-94,-4},{-74,16}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/Utilities/VoltageControl.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/Utilities/VoltageControl.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/Utilities/VoltageControl.mo" 2022-03-10 09:57:31.636143319 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Electrical/Utilities/VoltageControl.mo" 2022-03-10 09:58:51.372153420 +0000 @@ -4,18 +4,18 @@ Buildings.Electrical.PhaseSystems.PartialPhaseSystem constrainedby Buildings.Electrical.PhaseSystems.PartialPhaseSystem "Phase system" annotation (choicesAllMatching=true); - parameter Modelica.SIunits.Voltage V_nominal + parameter Modelica.Units.SI.Voltage V_nominal "Nominal voltage of the node to be controlled"; parameter Real vThresh(min=0.0, max=1.0) = 0.1 "Threshold that activates voltage ctrl (ratio of nominal voltage)"; - parameter Modelica.SIunits.Time tDelay = 300 + parameter Modelica.Units.SI.Time tDelay = 300 "Time to wait before plugging the load back"; - parameter Modelica.SIunits.Time T = 0.01 + parameter Modelica.Units.SI.Time T = 0.01 "Time constant representing the switching time"; parameter Real y_start = 1.0 "Initial value of the control output signal"; - final parameter Modelica.SIunits.Voltage Vmin = V_nominal*(1-vThresh) + final parameter Modelica.Units.SI.Voltage Vmin = V_nominal*(1-vThresh) "Low threshold"; - final parameter Modelica.SIunits.Voltage Vmax = V_nominal*(1+vThresh) + final parameter Modelica.Units.SI.Voltage Vmax = V_nominal*(1+vThresh) "High threshold"; Modelica.Blocks.Interfaces.RealOutput y(start = y_start, stateSelect = StateSelect.prefer) "Control signal" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/ChillerPlant/BaseClasses/Controls/BatteryControl.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/ChillerPlant/BaseClasses/Controls/BatteryControl.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/ChillerPlant/BaseClasses/Controls/BatteryControl.mo" 2022-03-10 09:57:31.636143319 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/ChillerPlant/BaseClasses/Controls/BatteryControl.mo" 2022-03-10 09:58:51.340153416 +0000 @@ -1,6 +1,6 @@ within Buildings.Examples.ChillerPlant.BaseClasses.Controls; model BatteryControl "Controller for battery" - extends Modelica.Blocks.Interfaces.BlockIcon; + extends Modelica.Blocks.Icons.Block; Modelica.Blocks.Interfaces.RealInput SOC "State of charge" annotation ( Placement(transformation(extent={{-140,-20},{-100,20}}), iconTransformation(extent={{-140,-20},{-100,20}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/ChillerPlant/BaseClasses/Controls/ChillerSwitch.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/ChillerPlant/BaseClasses/Controls/ChillerSwitch.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/ChillerPlant/BaseClasses/Controls/ChillerSwitch.mo" 2022-03-10 09:57:31.636143319 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/ChillerPlant/BaseClasses/Controls/ChillerSwitch.mo" 2022-03-10 09:58:51.320153414 +0000 @@ -18,7 +18,7 @@ displayUnit="deg") "Set temperature of chiller" annotation (Placement( transformation(extent={{-140,-80},{-100,-40}}), iconTransformation( extent={{-120,-60},{-100,-40}}))); - parameter Modelica.SIunits.Temperature deaBan + parameter Modelica.Units.SI.Temperature deaBan "Dead band of temperature to prevent chiller short cycling"; Modelica.Blocks.Logical.Hysteresis hysteresis(uLow=0, uHigh=deaBan) annotation (Placement(transformation(extent={{20,-10},{40,10}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/ChillerPlant/BaseClasses/Controls/Examples/BatteryControl.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/ChillerPlant/BaseClasses/Controls/Examples/BatteryControl.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/ChillerPlant/BaseClasses/Controls/Examples/BatteryControl.mo" 2022-03-10 09:57:31.636143319 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/ChillerPlant/BaseClasses/Controls/Examples/BatteryControl.mo" 2022-03-10 09:58:51.304153411 +0000 @@ -5,7 +5,7 @@ con "Battery control" annotation (Placement(transformation(extent={{0,0},{20,20}}))); Modelica.Blocks.Sources.Sine SOC( - freqHz=1/86400, + f =1/86400, offset=0.5, amplitude=0.6) "State of charge" annotation (Placement(transformation(extent={{-40,0},{-20,20}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/ChillerPlant/BaseClasses/Controls/Examples/ChillerSetPointControl.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/ChillerPlant/BaseClasses/Controls/Examples/ChillerSetPointControl.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/ChillerPlant/BaseClasses/Controls/Examples/ChillerSetPointControl.mo" 2022-03-10 09:57:31.636143319 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/ChillerPlant/BaseClasses/Controls/Examples/ChillerSetPointControl.mo" 2022-03-10 09:58:51.296153411 +0000 @@ -5,12 +5,12 @@ package Medium1 = Buildings.Media.Water; package Medium2 = Buildings.Media.Water; package MediumAir = Buildings.Media.Air "Medium model"; - parameter Modelica.SIunits.MassFlowRate mAir_flow_nominal=61.6*2 + parameter Modelica.Units.SI.MassFlowRate mAir_flow_nominal=61.6*2 "Nominal mass flow rate at fan"; parameter Real COPc_nominal=3 "Chiller COP"; - parameter Modelica.SIunits.MassFlowRate mCHW_flow_nominal=15.2 + parameter Modelica.Units.SI.MassFlowRate mCHW_flow_nominal=15.2 "Nominal mass flow rate at chilled water"; - parameter Modelica.SIunits.MassFlowRate mCW_flow_nominal=mCHW_flow_nominal/ + parameter Modelica.Units.SI.MassFlowRate mCW_flow_nominal=mCHW_flow_nominal/ COPc_nominal*(COPc_nominal + 1) "Nominal mass flow rate at condenser water"; parameter Real QRoo=100; @@ -71,7 +71,7 @@ k=10, Ti=0.01, Td=10, - initType=Modelica.Blocks.Types.InitPID.SteadyState) + initType=Modelica.Blocks.Types.Init.SteadyState) annotation (Placement(transformation( extent={{-10,-10},{10,10}}, origin={-130,30}))); @@ -113,7 +113,7 @@ Modelica.Blocks.Sources.Sine sine( amplitude=5, offset=273.15 + 25, - freqHz=1/20000) annotation (Placement(transformation( +f =1/20000) annotation (Placement(transformation( extent={{-10,-10},{10,10}}, origin={130,-94}))); Modelica.Blocks.Continuous.FirstOrder firstOrder1(y_start=273.15 + 10, T=chi.tau1 diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/ChillerPlant/BaseClasses/Controls/Examples/ChillerSwitch.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/ChillerPlant/BaseClasses/Controls/Examples/ChillerSwitch.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/ChillerPlant/BaseClasses/Controls/Examples/ChillerSwitch.mo" 2022-03-10 09:57:31.636143319 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/ChillerPlant/BaseClasses/Controls/Examples/ChillerSwitch.mo" 2022-03-10 09:58:51.272153407 +0000 @@ -2,12 +2,12 @@ model ChillerSwitch "Test model for ChillerSwitch" extends Modelica.Icons.Example; Modelica.Blocks.Sources.Sine TSet( - freqHz=0.0002, + f =0.0002, offset=12, amplitude=8) annotation (Placement(transformation(extent={{-60,-20},{-40,0}}))); Modelica.Blocks.Sources.Sine CHWST( - freqHz=0.0001, + f =0.0001, amplitude=5, offset=15) annotation (Placement(transformation(extent={{-60,20},{-40,40}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/ChillerPlant/BaseClasses/Controls/Examples/KMinusU.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/ChillerPlant/BaseClasses/Controls/Examples/KMinusU.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/ChillerPlant/BaseClasses/Controls/Examples/KMinusU.mo" 2022-03-10 09:57:31.636143319 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/ChillerPlant/BaseClasses/Controls/Examples/KMinusU.mo" 2022-03-10 09:58:51.264153407 +0000 @@ -2,7 +2,7 @@ model KMinusU "Test model for KMinusU" extends Modelica.Icons.Example; Modelica.Blocks.Sources.Sine pulse( - freqHz=0.001, + f =0.001, amplitude=0.5, offset=0.5, phase=-1.5707963267949) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/ChillerPlant/BaseClasses/Controls/Examples/LinearPiecewiseTwo.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/ChillerPlant/BaseClasses/Controls/Examples/LinearPiecewiseTwo.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/ChillerPlant/BaseClasses/Controls/Examples/LinearPiecewiseTwo.mo" 2022-03-10 09:57:31.636143319 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/ChillerPlant/BaseClasses/Controls/Examples/LinearPiecewiseTwo.mo" 2022-03-10 09:58:51.260153406 +0000 @@ -2,7 +2,7 @@ model LinearPiecewiseTwo "Test model for LinearPiecewiseTwo" extends Modelica.Icons.Example; Modelica.Blocks.Sources.Sine pulse( - freqHz=0.001, + f =0.001, amplitude=0.5, offset=0.5, phase=-1.5707963267949) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/ChillerPlant/BaseClasses/Controls/Examples/RequestCounter.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/ChillerPlant/BaseClasses/Controls/Examples/RequestCounter.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/ChillerPlant/BaseClasses/Controls/Examples/RequestCounter.mo" 2022-03-10 09:57:31.636143319 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/ChillerPlant/BaseClasses/Controls/Examples/RequestCounter.mo" 2022-03-10 09:58:51.252153405 +0000 @@ -8,7 +8,7 @@ annotation (Placement(transformation(extent={{-80,-40},{-60,-20}}))); Modelica.Blocks.Sources.Pulse act1(period=10) annotation (Placement(transformation(extent={{-80,40},{-60,60}}))); - Modelica.Blocks.Sources.Sine act2(freqHz=0.3, offset=1) + Modelica.Blocks.Sources.Sine act2(f =0.3, offset=1) annotation (Placement(transformation(extent={{-80,0},{-60,20}}))); equation connect(act1.y, reqCou.uAct[1]) annotation (Line( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/ChillerPlant/BaseClasses/Controls/Examples/TrimAndRespond.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/ChillerPlant/BaseClasses/Controls/Examples/TrimAndRespond.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/ChillerPlant/BaseClasses/Controls/Examples/TrimAndRespond.mo" 2022-03-10 09:57:31.636143319 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/ChillerPlant/BaseClasses/Controls/Examples/TrimAndRespond.mo" 2022-03-10 09:58:51.248153404 +0000 @@ -2,11 +2,11 @@ model TrimAndRespond "Test model for TrimAndRespond" extends Modelica.Icons.Example; - Modelica.Blocks.Sources.Sine act3(freqHz=0.002, offset=0.2) + Modelica.Blocks.Sources.Sine act3(f =0.002, offset=0.2) annotation (Placement(transformation(extent={{-80,-20},{-60,0}}))); Modelica.Blocks.Sources.Pulse act1(period=500) annotation (Placement(transformation(extent={{-80,60},{-60,80}}))); - Modelica.Blocks.Sources.Sine act2(freqHz=0.001, offset=0.3) + Modelica.Blocks.Sources.Sine act2(f =0.001, offset=0.3) annotation (Placement(transformation(extent={{-80,20},{-60,40}}))); Buildings.Examples.ChillerPlant.BaseClasses.Controls.TrimAndRespond triAndRes[3]( each uTri=0.9, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/ChillerPlant/BaseClasses/Controls/WSEControl.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/ChillerPlant/BaseClasses/Controls/WSEControl.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/ChillerPlant/BaseClasses/Controls/WSEControl.mo" 2022-03-10 09:57:31.636143319 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/ChillerPlant/BaseClasses/Controls/WSEControl.mo" 2022-03-10 09:58:51.104153387 +0000 @@ -1,8 +1,8 @@ within Buildings.Examples.ChillerPlant.BaseClasses.Controls; model WSEControl "Control unit for WSE" - parameter Modelica.SIunits.TemperatureDifference dTOff = 1 + parameter Modelica.Units.SI.TemperatureDifference dTOff = 1 "Temperature difference to switch WSE off"; - parameter Modelica.SIunits.TemperatureDifference dTW = 1 + parameter Modelica.Units.SI.TemperatureDifference dTW = 1 "Temperature difference that is added to WSE on guard"; Modelica.Blocks.Interfaces.RealInput wseCHWST( final quantity="ThermodynamicTemperature", diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/ChillerPlant/BaseClasses/DataCenter.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/ChillerPlant/BaseClasses/DataCenter.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/ChillerPlant/BaseClasses/DataCenter.mo" 2022-03-10 09:57:31.636143319 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/ChillerPlant/BaseClasses/DataCenter.mo" 2022-03-10 09:58:51.092153386 +0000 @@ -3,22 +3,22 @@ "Primary only chiller plant system with water-side economizer" replaceable package MediumA = Buildings.Media.Air "Medium model"; replaceable package MediumW = Buildings.Media.Water "Medium model"; - parameter Modelica.SIunits.MassFlowRate mAir_flow_nominal=roo.QRoo_flow/(1005 + parameter Modelica.Units.SI.MassFlowRate mAir_flow_nominal=roo.QRoo_flow/(1005 *15) "Nominal mass flow rate at fan"; - parameter Modelica.SIunits.Power P_nominal=80E3 + parameter Modelica.Units.SI.Power P_nominal=80E3 "Nominal compressor power (at y=1)"; - 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.MassFlowRate mCHW_flow_nominal=2*roo.QRoo_flow/( + parameter Modelica.Units.SI.MassFlowRate mCHW_flow_nominal=2*roo.QRoo_flow/( 4200*20) "Nominal mass flow rate at chilled water"; - parameter Modelica.SIunits.MassFlowRate mCW_flow_nominal=2*roo.QRoo_flow/( + parameter Modelica.Units.SI.MassFlowRate mCW_flow_nominal=2*roo.QRoo_flow/( 4200*6) "Nominal mass flow rate at condenser water"; - parameter Modelica.SIunits.PressureDifference dp_nominal=500 + parameter Modelica.Units.SI.PressureDifference dp_nominal=500 "Nominal pressure difference"; Buildings.Fluid.Movers.FlowControlled_m_flow fan( redeclare package Medium = MediumA, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/ChillerPlant/BaseClasses/SimplifiedRoom.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/ChillerPlant/BaseClasses/SimplifiedRoom.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/ChillerPlant/BaseClasses/SimplifiedRoom.mo" 2022-03-10 09:57:31.636143319 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/ChillerPlant/BaseClasses/SimplifiedRoom.mo" 2022-03-10 09:58:51.032153377 +0000 @@ -8,10 +8,10 @@ __Dymola_connectorSizing=true, tab="General", group="Ports")); - parameter Modelica.SIunits.Length rooLen "Length of the room"; - parameter Modelica.SIunits.Length rooWid "Width of the room"; - parameter Modelica.SIunits.Height rooHei "Height of the room"; - parameter Modelica.SIunits.Power QRoo_flow + parameter Modelica.Units.SI.Length rooLen "Length of the room"; + parameter Modelica.Units.SI.Length rooWid "Width of the room"; + parameter Modelica.Units.SI.Height rooHei "Height of the room"; + parameter Modelica.Units.SI.Power QRoo_flow "Heat generation of the computer room"; Buildings.Fluid.MixingVolumes.MixingVolume rooVol( @@ -41,7 +41,7 @@ duration=36000, startTime=0) annotation (Placement(transformation(extent={{-60,-40},{-40,-20}}))); - parameter Modelica.SIunits.MassFlowRate m_flow_nominal + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal "Nominal mass flow rate"; equation connect(rooVol.ports, airPorts) annotation (Line( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/DualFanDualDuct/ClosedLoop.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/DualFanDualDuct/ClosedLoop.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/DualFanDualDuct/ClosedLoop.mo" 2022-03-10 09:57:31.636143319 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/DualFanDualDuct/ClosedLoop.mo" 2022-03-10 09:58:50.996153372 +0000 @@ -12,49 +12,49 @@ parameter Boolean linearizeFlowResistance=false "= true, use linear relation between m_flow and dp for any flow rate"; - parameter Modelica.SIunits.Volume VRooCor=2698 "Room volume corridor"; - parameter Modelica.SIunits.Volume VRooSou=568.77 "Room volume south"; - parameter Modelica.SIunits.Volume VRooNor=568.77 "Room volume north"; - parameter Modelica.SIunits.Volume VRooEas=360.08 "Room volume east"; - parameter Modelica.SIunits.Volume VRooWes=360.08 "Room volume west"; + parameter Modelica.Units.SI.Volume VRooCor=2698 "Room volume corridor"; + parameter Modelica.Units.SI.Volume VRooSou=568.77 "Room volume south"; + parameter Modelica.Units.SI.Volume VRooNor=568.77 "Room volume north"; + parameter Modelica.Units.SI.Volume VRooEas=360.08 "Room volume east"; + parameter Modelica.Units.SI.Volume VRooWes=360.08 "Room volume west"; constant Real conv=1.2/3600 "Conversion factor for nominal mass flow rate"; - parameter Modelica.SIunits.MassFlowRate m0_flow_cor=3*VRooCor*conv + parameter Modelica.Units.SI.MassFlowRate m0_flow_cor=3*VRooCor*conv "Design mass flow rate core"; - parameter Modelica.SIunits.MassFlowRate m0_flow_sou=8*VRooSou*conv + parameter Modelica.Units.SI.MassFlowRate m0_flow_sou=8*VRooSou*conv "Design mass flow rate perimeter 1"; - parameter Modelica.SIunits.MassFlowRate m0_flow_eas=9*VRooEas*conv + parameter Modelica.Units.SI.MassFlowRate m0_flow_eas=9*VRooEas*conv "Design mass flow rate perimeter 2"; - parameter Modelica.SIunits.MassFlowRate m0_flow_nor=11*VRooNor*conv + parameter Modelica.Units.SI.MassFlowRate m0_flow_nor=11*VRooNor*conv "Design mass flow rate perimeter 3"; - parameter Modelica.SIunits.MassFlowRate m0_flow_wes=10*VRooWes*conv + parameter Modelica.Units.SI.MassFlowRate m0_flow_wes=10*VRooWes*conv "Design mass flow rate perimeter 4"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=m0_flow_cor + + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=m0_flow_cor + m0_flow_sou + m0_flow_eas + m0_flow_nor + m0_flow_wes "Nominal air mass flow rate"; - parameter Modelica.SIunits.MassFlowRate mAirOut_flow_nominal = 0.3*m_flow_nominal + parameter Modelica.Units.SI.MassFlowRate mAirOut_flow_nominal = 0.3*m_flow_nominal "Nominal outside air mass flow rate"; - parameter Modelica.SIunits.MassFlowRate mAirHot_flow_nominal = 0.3*m_flow_nominal + parameter Modelica.Units.SI.MassFlowRate mAirHot_flow_nominal = 0.3*m_flow_nominal "Nominal air mass flow rate for hot deck"; - parameter Modelica.SIunits.MassFlowRate mAirCol_flow_nominal = m_flow_nominal + parameter Modelica.Units.SI.MassFlowRate mAirCol_flow_nominal = m_flow_nominal "Nominal air mass flow rate for cold deck"; /////////////////////////////////////////////////////////////////////////////////////// // Water mass flow rates - parameter Modelica.SIunits.MassFlowRate mWatPre_flow_nominal = (TMixHea_nominal-273.15-(-20))*1000/15/4200*mAirOut_flow_nominal + parameter Modelica.Units.SI.MassFlowRate mWatPre_flow_nominal = (TMixHea_nominal-273.15-(-20))*1000/15/4200*mAirOut_flow_nominal "Nominal water mass flow rate for preheat coil"; - parameter Modelica.SIunits.MassFlowRate mWatCol_flow_nominal = (28-13)*1000*1.3/4200/15*mAirCol_flow_nominal + parameter Modelica.Units.SI.MassFlowRate mWatCol_flow_nominal = (28-13)*1000*1.3/4200/15*mAirCol_flow_nominal "Nominal water mass flow rate for cooling coil of cold deck"; - parameter Modelica.SIunits.MassFlowRate mWatHot_flow_nominal = (40-(TMixHea_nominal-273.15))*1000/15/4200*mAirHot_flow_nominal + parameter Modelica.Units.SI.MassFlowRate mWatHot_flow_nominal = (40-(TMixHea_nominal-273.15))*1000/15/4200*mAirHot_flow_nominal "Nominal water mass flow rate for heating coil of cold deck"; // Water temperatures - parameter Modelica.SIunits.Temperature TMixHea_nominal = 0.3*(273.15+(-20)) + 0.7 * (273.15+20) + parameter Modelica.Units.SI.Temperature TMixHea_nominal = 0.3*(273.15+(-20)) + 0.7 * (273.15+20) "Mixed air temperature at winter design conditions"; - parameter Modelica.SIunits.Temperature TMixCoo_nominal = 0.3*(273.15+(33)) + 0.7 * (273.15+26) + parameter Modelica.Units.SI.Temperature TMixCoo_nominal = 0.3*(273.15+(33)) + 0.7 * (273.15+26) "Mixed air temperature at summer design conditions"; - parameter Modelica.SIunits.Temperature TSupCol_nominal = 12+273.15 + parameter Modelica.Units.SI.Temperature TSupCol_nominal = 12+273.15 "Cold deck temperature at nominal condition"; - parameter Modelica.SIunits.Angle lat=41.98*3.14159/180 "Latitude"; + parameter Modelica.Units.SI.Angle lat=41.98*3.14159/180 "Latitude"; Fluid.Sources.Outside amb(redeclare package Medium = MediumA, nPorts=2) "Ambient conditions" @@ -144,7 +144,7 @@ Buildings.Controls.Continuous.LimPID cooCoiCon( reverseAction=true, Td=60, - initType=Modelica.Blocks.Types.InitPID.InitialState, + initType=Modelica.Blocks.Types.Init.InitialState, yMax=1, yMin=0, Ti=120, @@ -465,7 +465,7 @@ origin={380,-50}))); Buildings.Controls.Continuous.LimPID heaCoiCon( Td=60, - initType=Modelica.Blocks.Types.InitPID.InitialState, + initType=Modelica.Blocks.Types.Init.InitialState, yMax=1, yMin=0, Ti=120, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/DualFanDualDuct/Controls/CoolingCoilTemperatureSetpoint.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/DualFanDualDuct/Controls/CoolingCoilTemperatureSetpoint.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/DualFanDualDuct/Controls/CoolingCoilTemperatureSetpoint.mo" 2022-03-10 09:57:31.636143319 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/DualFanDualDuct/Controls/CoolingCoilTemperatureSetpoint.mo" 2022-03-10 09:58:50.820153351 +0000 @@ -2,8 +2,8 @@ block CoolingCoilTemperatureSetpoint "Set point scheduler for cooling coil" extends Modelica.Blocks.Icons.Block; import Buildings.Examples.VAVReheat.Controls.OperationModes; - parameter Modelica.SIunits.Temperature TOn "Setpoint during on"; - parameter Modelica.SIunits.Temperature TOff "Setpoint during off"; + parameter Modelica.Units.SI.Temperature TOn "Setpoint during on"; + parameter Modelica.Units.SI.Temperature TOff "Setpoint during off"; Modelica.Blocks.Sources.RealExpression TSetPoi( y=if (mode.y == Integer(OperationModes.occupied) or mode.y == Integer(OperationModes.unoccupiedPreCool) or diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/DualFanDualDuct/Controls/PreHeatCoil.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/DualFanDualDuct/Controls/PreHeatCoil.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/DualFanDualDuct/Controls/PreHeatCoil.mo" 2022-03-10 09:57:31.636143319 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/DualFanDualDuct/Controls/PreHeatCoil.mo" 2022-03-10 09:58:50.720153338 +0000 @@ -6,7 +6,7 @@ yMax=1, yMin=0, Td=60, - initType=Modelica.Blocks.Types.InitPID.InitialState, + initType=Modelica.Blocks.Types.Init.InitialState, Ti=120, strict=true, controllerType=Modelica.Blocks.Types.SimpleController.PI, @@ -42,14 +42,14 @@ Modelica.Blocks.Logical.Switch swiValOp "Switch to close valve if pump is not running" annotation (Placement(transformation(extent={{60,-70},{80,-50}}))); - Modelica.StateGraph.InitialStep pumOff "Pump is off" + Modelica.StateGraph.InitialStep pumOff(nIn = 1, nOut = 1) "Pump is off" annotation (Placement(transformation(extent={{-40,60},{-20,80}}))); Modelica.StateGraph.TransitionWithSignal toOn "Switch pump on" annotation (Placement(transformation(extent={{-10,60},{10,80}}))); inner Modelica.StateGraph.StateGraphRoot stateGraphRoot annotation (Placement(transformation(extent={{-80,60},{-60,80}}))); - Modelica.StateGraph.StepWithSignal pumOn "Pump on" + Modelica.StateGraph.StepWithSignal pumOn(nIn = 1, nOut = 1) "Pump on" annotation (Placement(transformation(extent={{20,60},{40,80}}))); Modelica.StateGraph.TransitionWithSignal toOff(enableTimer=true, waitTime=30* 60) "Switch pump off" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/DualFanDualDuct/Controls/RoomMixingBox.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/DualFanDualDuct/Controls/RoomMixingBox.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/DualFanDualDuct/Controls/RoomMixingBox.mo" 2022-03-10 09:57:31.636143319 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/DualFanDualDuct/Controls/RoomMixingBox.mo" 2022-03-10 09:58:50.696153335 +0000 @@ -1,11 +1,11 @@ within Buildings.Examples.DualFanDualDuct.Controls; block RoomMixingBox "Controller for room mixing box" extends Modelica.Blocks.Icons.Block; - parameter Modelica.SIunits.MassFlowRate m_flow_min "Minimum mass flow rate"; + parameter Modelica.Units.SI.MassFlowRate m_flow_min "Minimum mass flow rate"; Buildings.Controls.Continuous.LimPID conHea( yMax=1, xi_start=0.1, - initType=Modelica.Blocks.Types.InitPID.InitialState, + initType=Modelica.Blocks.Types.Init.InitialState, Td=60, yMin=0, controllerType=Modelica.Blocks.Types.SimpleController.PI, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/DualFanDualDuct/ThermalZones/SupplyBranch.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/DualFanDualDuct/ThermalZones/SupplyBranch.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/DualFanDualDuct/ThermalZones/SupplyBranch.mo" 2022-03-10 09:57:31.636143319 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/DualFanDualDuct/ThermalZones/SupplyBranch.mo" 2022-03-10 09:58:50.668153332 +0000 @@ -20,14 +20,14 @@ parameter Boolean linearizeFlowResistance=false "= true, use linear relation between m_flow and dp for any flow rate"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal "Mass flow rate cold air deck"; - parameter Modelica.SIunits.MassFlowRate mAirHot_flow_nominal = 0.3*m_flow_nominal + parameter Modelica.Units.SI.MassFlowRate mAirHot_flow_nominal = 0.3*m_flow_nominal "Mass flow rate hot air deck"; - parameter Modelica.SIunits.MassFlowRate mAirCol_flow_nominal = m_flow_nominal + parameter Modelica.Units.SI.MassFlowRate mAirCol_flow_nominal = m_flow_nominal "Mass flow rate cold air deck"; - parameter Modelica.SIunits.Volume VRoo "Room volume"; + parameter Modelica.Units.SI.Volume VRoo "Room volume"; Controls.RoomMixingBox con(m_flow_min=VRoo*3*1.2/3600) "Room temperature controller" annotation (Placement(transformation(extent={{-40,0},{-20,20}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/HydronicHeating/TwoRoomsWithStorage.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/HydronicHeating/TwoRoomsWithStorage.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/HydronicHeating/TwoRoomsWithStorage.mo" 2022-03-10 09:57:31.640143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/HydronicHeating/TwoRoomsWithStorage.mo" 2022-03-10 09:58:50.620153325 +0000 @@ -6,34 +6,34 @@ "Medium model for air"; replaceable package MediumW = Buildings.Media.Water "Medium model"; parameter Integer nRoo = 2 "Number of rooms"; - parameter Modelica.SIunits.Volume VRoo = 4*6*3 "Volume of one room"; - parameter Modelica.SIunits.Power Q_flow_nominal = 2200 + parameter Modelica.Units.SI.Volume VRoo = 4*6*3 "Volume of one room"; + parameter Modelica.Units.SI.Power Q_flow_nominal = 2200 "Nominal power of heating plant"; // Due to the night setback, in which the radiator do not provide heat input into the room, // we scale the design power of the radiator loop parameter Real scaFacRad = 1.5 "Scaling factor to scale the power (and mass flow rate) of the radiator loop"; - parameter Modelica.SIunits.Temperature TSup_nominal=273.15 + 50 + 5 + parameter Modelica.Units.SI.Temperature TSup_nominal=273.15 + 50 + 5 "Nominal supply temperature for radiators"; - parameter Modelica.SIunits.Temperature TRet_nominal=273.15 + 40 + 5 + parameter Modelica.Units.SI.Temperature TRet_nominal=273.15 + 40 + 5 "Nominal return temperature for radiators"; - parameter Modelica.SIunits.Temperature dTRad_nominal = TSup_nominal-TRet_nominal + parameter Modelica.Units.SI.Temperature dTRad_nominal = TSup_nominal-TRet_nominal "Nominal temperature difference for radiator loop"; - parameter Modelica.SIunits.Temperature dTBoi_nominal = 20 + parameter Modelica.Units.SI.Temperature dTBoi_nominal = 20 "Nominal temperature difference for boiler loop"; - parameter Modelica.SIunits.MassFlowRate mRad_flow_nominal = scaFacRad*Q_flow_nominal/dTRad_nominal/4200 + parameter Modelica.Units.SI.MassFlowRate mRad_flow_nominal = scaFacRad*Q_flow_nominal/dTRad_nominal/4200 "Nominal mass flow rate of radiator loop"; - parameter Modelica.SIunits.MassFlowRate mBoi_flow_nominal = scaFacRad*Q_flow_nominal/dTBoi_nominal/4200 + parameter Modelica.Units.SI.MassFlowRate mBoi_flow_nominal = scaFacRad*Q_flow_nominal/dTBoi_nominal/4200 "Nominal mass flow rate of boiler loop"; - parameter Modelica.SIunits.PressureDifference dpPip_nominal = 10000 + parameter Modelica.Units.SI.PressureDifference dpPip_nominal = 10000 "Pressure difference of pipe (without valve)"; - parameter Modelica.SIunits.PressureDifference dpVal_nominal = 1000 + parameter Modelica.Units.SI.PressureDifference dpVal_nominal = 1000 "Pressure difference of valve"; - parameter Modelica.SIunits.PressureDifference dpRoo_nominal = 6000 + parameter Modelica.Units.SI.PressureDifference dpRoo_nominal = 6000 "Pressure difference of flow leg that serves a room"; - parameter Modelica.SIunits.PressureDifference dpThrWayVal_nominal = 6000 + parameter Modelica.Units.SI.PressureDifference dpThrWayVal_nominal = 6000 "Pressure difference of three-way valve"; - parameter Modelica.SIunits.PressureDifference dp_nominal= + parameter Modelica.Units.SI.PressureDifference dp_nominal= dpPip_nominal + dpVal_nominal + dpRoo_nominal + dpThrWayVal_nominal "Pressure difference of loop"; // Room model @@ -235,7 +235,7 @@ Controls.Continuous.LimPID conVal( yMax=1, yMin=0, - initType=Modelica.Blocks.Types.InitPID.InitialState, + initType=Modelica.Blocks.Types.Init.InitialState, xi_start=1, Td=60, k=0.1, @@ -502,13 +502,13 @@ "Controller for the free cooling and the mechanical cooling" extends Modelica.Blocks.Icons.Block; - parameter Modelica.SIunits.Temperature TRooCoo = 25+273.15 + parameter Modelica.Units.SI.Temperature TRooCoo = 25+273.15 "Set point for mechanical cooling"; - parameter Modelica.SIunits.Temperature TRooFre = 22+273.15 + parameter Modelica.Units.SI.Temperature TRooFre = 22+273.15 "Maximum temperature above which free cooling is enabled"; - parameter Modelica.SIunits.Temperature TOutFre = 16+273.15 + parameter Modelica.Units.SI.Temperature TOutFre = 16+273.15 "Outside temperature above which free cooling is allowed"; - parameter Modelica.SIunits.TemperatureDifference dT = 1 + parameter Modelica.Units.SI.TemperatureDifference dT = 1 "Dead-band for free cooling"; parameter Real Kp(min=0) = 1 "Proportional band for mechanical cooling"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/Tutorial/Boiler/System1.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/Tutorial/Boiler/System1.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/Tutorial/Boiler/System1.mo" 2022-03-10 09:57:31.640143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/Tutorial/Boiler/System1.mo" 2022-03-10 09:58:50.388153295 +0000 @@ -14,10 +14,10 @@ Modelica.Thermal.HeatTransfer.Components.ThermalConductor theCon(G=20000/30) "Thermal conductance with the ambient" annotation (Placement(transformation(extent={{20,40},{40,60}}))); - parameter Modelica.SIunits.Volume V=6*10*3 "Room volume"; - parameter Modelica.SIunits.MassFlowRate mA_flow_nominal = V*6/3600 + parameter Modelica.Units.SI.Volume V=6*10*3 "Room volume"; + parameter Modelica.Units.SI.MassFlowRate mA_flow_nominal = V*6/3600 "Nominal mass flow rate"; - parameter Modelica.SIunits.HeatFlowRate QRooInt_flow = 4000 + parameter Modelica.Units.SI.HeatFlowRate QRooInt_flow = 4000 "Internal heat gains of the room"; Modelica.Thermal.HeatTransfer.Sources.FixedTemperature TOut(T=263.15) "Outside temperature" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/Tutorial/Boiler/System2.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/Tutorial/Boiler/System2.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/Tutorial/Boiler/System2.mo" 2022-03-10 09:57:31.640143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/Tutorial/Boiler/System2.mo" 2022-03-10 09:58:50.376153294 +0000 @@ -11,13 +11,13 @@ //-------------------------------------------------------------------------// //------------------------Step 4: Design conditions------------------------// - parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal = 20000 + parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal = 20000 "Nominal heat flow rate of radiator"; - parameter Modelica.SIunits.Temperature TRadSup_nominal = 273.15+50 + parameter Modelica.Units.SI.Temperature TRadSup_nominal = 273.15+50 "Radiator nominal supply water temperature"; - parameter Modelica.SIunits.Temperature TRadRet_nominal = 273.15+40 + parameter Modelica.Units.SI.Temperature TRadRet_nominal = 273.15+40 "Radiator nominal return water temperature"; - parameter Modelica.SIunits.MassFlowRate mRad_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate mRad_flow_nominal= Q_flow_nominal/4200/(TRadSup_nominal-TRadRet_nominal) "Radiator nominal mass flow rate"; //------------------------------------------------------------------------// @@ -31,10 +31,10 @@ Modelica.Thermal.HeatTransfer.Components.ThermalConductor theCon(G=20000/30) "Thermal conductance with the ambient" annotation (Placement(transformation(extent={{20,40},{40,60}}))); - parameter Modelica.SIunits.Volume V=6*10*3 "Room volume"; - parameter Modelica.SIunits.MassFlowRate mA_flow_nominal = V*6/3600 + parameter Modelica.Units.SI.Volume V=6*10*3 "Room volume"; + parameter Modelica.Units.SI.MassFlowRate mA_flow_nominal = V*6/3600 "Nominal mass flow rate"; - parameter Modelica.SIunits.HeatFlowRate QRooInt_flow = 4000 + parameter Modelica.Units.SI.HeatFlowRate QRooInt_flow = 4000 "Internal heat gains of the room"; Modelica.Thermal.HeatTransfer.Sources.FixedTemperature TOut(T=263.15) "Outside temperature" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/Tutorial/Boiler/System3.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/Tutorial/Boiler/System3.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/Tutorial/Boiler/System3.mo" 2022-03-10 09:57:31.640143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/Tutorial/Boiler/System3.mo" 2022-03-10 09:58:50.348153291 +0000 @@ -7,28 +7,28 @@ replaceable package MediumW = Buildings.Media.Water "Medium model"; - parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal = 20000 + parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal = 20000 "Nominal heat flow rate of radiator"; - parameter Modelica.SIunits.Temperature TRadSup_nominal = 273.15+50 + parameter Modelica.Units.SI.Temperature TRadSup_nominal = 273.15+50 "Radiator nominal supply water temperature"; - parameter Modelica.SIunits.Temperature TRadRet_nominal = 273.15+40 + parameter Modelica.Units.SI.Temperature TRadRet_nominal = 273.15+40 "Radiator nominal return water temperature"; - parameter Modelica.SIunits.MassFlowRate mRad_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate mRad_flow_nominal= Q_flow_nominal/4200/(TRadSup_nominal-TRadRet_nominal) "Radiator nominal mass flow rate"; //-------------------------Step 4: Boiler design values-------------------------// - parameter Modelica.SIunits.Temperature TBoiSup_nominal = 273.15+70 + parameter Modelica.Units.SI.Temperature TBoiSup_nominal = 273.15+70 "Boiler nominal supply water temperature"; - parameter Modelica.SIunits.Temperature TBoiRet_min = 273.15+60 + parameter Modelica.Units.SI.Temperature TBoiRet_min = 273.15+60 "Boiler minimum return water temperature"; - parameter Modelica.SIunits.MassFlowRate mBoi_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate mBoi_flow_nominal= Q_flow_nominal/4200/(TBoiSup_nominal-TBoiRet_min) "Boiler nominal mass flow rate"; //------------------------------------------------------------------------------// //----------------Radiator loop: Three-way valve: mass flow rate----------------// - parameter Modelica.SIunits.MassFlowRate mRadVal_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate mRadVal_flow_nominal= Q_flow_nominal/4200/(TBoiSup_nominal-TRadRet_nominal) "Radiator nominal mass flow rate"; //------------------------------------------------------------------------------// @@ -42,10 +42,10 @@ Modelica.Thermal.HeatTransfer.Components.ThermalConductor theCon(G=20000/30) "Thermal conductance with the ambient" annotation (Placement(transformation(extent={{20,40},{40,60}}))); - parameter Modelica.SIunits.Volume V=6*10*3 "Room volume"; - parameter Modelica.SIunits.MassFlowRate mA_flow_nominal = V*6/3600 + parameter Modelica.Units.SI.Volume V=6*10*3 "Room volume"; + parameter Modelica.Units.SI.MassFlowRate mA_flow_nominal = V*6/3600 "Nominal mass flow rate"; - parameter Modelica.SIunits.HeatFlowRate QRooInt_flow = 4000 + parameter Modelica.Units.SI.HeatFlowRate QRooInt_flow = 4000 "Internal heat gains of the room"; Modelica.Thermal.HeatTransfer.Sources.FixedTemperature TOut(T=263.15) "Outside temperature" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/Tutorial/Boiler/System4.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/Tutorial/Boiler/System4.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/Tutorial/Boiler/System4.mo" 2022-03-10 09:57:31.640143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/Tutorial/Boiler/System4.mo" 2022-03-10 09:58:50.300153284 +0000 @@ -7,28 +7,28 @@ replaceable package MediumW = Buildings.Media.Water "Medium model"; - parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal = 20000 + parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal = 20000 "Nominal heat flow rate of radiator"; - parameter Modelica.SIunits.Temperature TRadSup_nominal = 273.15+50 + parameter Modelica.Units.SI.Temperature TRadSup_nominal = 273.15+50 "Radiator nominal supply water temperature"; - parameter Modelica.SIunits.Temperature TRadRet_nominal = 273.15+40 + parameter Modelica.Units.SI.Temperature TRadRet_nominal = 273.15+40 "Radiator nominal return water temperature"; - parameter Modelica.SIunits.MassFlowRate mRad_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate mRad_flow_nominal= Q_flow_nominal/4200/(TRadSup_nominal-TRadRet_nominal) "Radiator nominal mass flow rate"; //-------------------------Step 4: Boiler design values-------------------------// - parameter Modelica.SIunits.Temperature TBoiSup_nominal = 273.15+70 + parameter Modelica.Units.SI.Temperature TBoiSup_nominal = 273.15+70 "Boiler nominal supply water temperature"; - parameter Modelica.SIunits.Temperature TBoiRet_min = 273.15+60 + parameter Modelica.Units.SI.Temperature TBoiRet_min = 273.15+60 "Boiler minimum return water temperature"; - parameter Modelica.SIunits.MassFlowRate mBoi_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate mBoi_flow_nominal= Q_flow_nominal/4200/(TBoiSup_nominal-TBoiRet_min) "Boiler nominal mass flow rate"; //------------------------------------------------------------------------------// //----------------Radiator loop: Three-way valve: mass flow rate----------------// - parameter Modelica.SIunits.MassFlowRate mRadVal_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate mRadVal_flow_nominal= Q_flow_nominal/4200/(TBoiSup_nominal-TRadRet_nominal) "Radiator nominal mass flow rate"; //------------------------------------------------------------------------------// @@ -42,10 +42,10 @@ Modelica.Thermal.HeatTransfer.Components.ThermalConductor theCon(G=20000/30) "Thermal conductance with the ambient" annotation (Placement(transformation(extent={{20,40},{40,60}}))); - parameter Modelica.SIunits.Volume V=6*10*3 "Room volume"; - parameter Modelica.SIunits.MassFlowRate mA_flow_nominal = V*6/3600 + parameter Modelica.Units.SI.Volume V=6*10*3 "Room volume"; + parameter Modelica.Units.SI.MassFlowRate mA_flow_nominal = V*6/3600 "Nominal mass flow rate"; - parameter Modelica.SIunits.HeatFlowRate QRooInt_flow = 4000 + parameter Modelica.Units.SI.HeatFlowRate QRooInt_flow = 4000 "Internal heat gains of the room"; Modelica.Thermal.HeatTransfer.Sources.FixedTemperature TOut(T=263.15) "Outside temperature" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/Tutorial/Boiler/System5.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/Tutorial/Boiler/System5.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/Tutorial/Boiler/System5.mo" 2022-03-10 09:57:31.640143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/Tutorial/Boiler/System5.mo" 2022-03-10 09:58:50.228153275 +0000 @@ -7,28 +7,28 @@ replaceable package MediumW = Buildings.Media.Water "Medium model"; - parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal = 20000 + parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal = 20000 "Nominal heat flow rate of radiator"; - parameter Modelica.SIunits.Temperature TRadSup_nominal = 273.15+50 + parameter Modelica.Units.SI.Temperature TRadSup_nominal = 273.15+50 "Radiator nominal supply water temperature"; - parameter Modelica.SIunits.Temperature TRadRet_nominal = 273.15+40 + parameter Modelica.Units.SI.Temperature TRadRet_nominal = 273.15+40 "Radiator nominal return water temperature"; - parameter Modelica.SIunits.MassFlowRate mRad_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate mRad_flow_nominal= Q_flow_nominal/4200/(TRadSup_nominal-TRadRet_nominal) "Radiator nominal mass flow rate"; //-------------------------Step 4: Boiler design values-------------------------// - parameter Modelica.SIunits.Temperature TBoiSup_nominal = 273.15+70 + parameter Modelica.Units.SI.Temperature TBoiSup_nominal = 273.15+70 "Boiler nominal supply water temperature"; - parameter Modelica.SIunits.Temperature TBoiRet_min = 273.15+60 + parameter Modelica.Units.SI.Temperature TBoiRet_min = 273.15+60 "Boiler minimum return water temperature"; - parameter Modelica.SIunits.MassFlowRate mBoi_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate mBoi_flow_nominal= Q_flow_nominal/4200/(TBoiSup_nominal-TBoiRet_min) "Boiler nominal mass flow rate"; //------------------------------------------------------------------------------// //----------------Radiator loop: Three-way valve: mass flow rate----------------// - parameter Modelica.SIunits.MassFlowRate mRadVal_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate mRadVal_flow_nominal= Q_flow_nominal/4200/(TBoiSup_nominal-TRadRet_nominal) "Radiator nominal mass flow rate"; //------------------------------------------------------------------------------// @@ -42,10 +42,10 @@ Modelica.Thermal.HeatTransfer.Components.ThermalConductor theCon(G=20000/30) "Thermal conductance with the ambient" annotation (Placement(transformation(extent={{20,40},{40,60}}))); - parameter Modelica.SIunits.Volume V=6*10*3 "Room volume"; - parameter Modelica.SIunits.MassFlowRate mA_flow_nominal = V*6/3600 + parameter Modelica.Units.SI.Volume V=6*10*3 "Room volume"; + parameter Modelica.Units.SI.MassFlowRate mA_flow_nominal = V*6/3600 "Nominal mass flow rate"; - parameter Modelica.SIunits.HeatFlowRate QRooInt_flow = 4000 + parameter Modelica.Units.SI.HeatFlowRate QRooInt_flow = 4000 "Internal heat gains of the room"; Modelica.Thermal.HeatTransfer.Sources.FixedTemperature TOut(T=263.15) "Outside temperature" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/Tutorial/Boiler/System6.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/Tutorial/Boiler/System6.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/Tutorial/Boiler/System6.mo" 2022-03-10 09:57:31.640143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/Tutorial/Boiler/System6.mo" 2022-03-10 09:58:50.184153270 +0000 @@ -7,27 +7,27 @@ replaceable package MediumW = Buildings.Media.Water "Medium model"; - parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal = 20000 + parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal = 20000 "Nominal heat flow rate of radiator"; - parameter Modelica.SIunits.Temperature TRadSup_nominal = 273.15+50 + parameter Modelica.Units.SI.Temperature TRadSup_nominal = 273.15+50 "Radiator nominal supply water temperature"; - parameter Modelica.SIunits.Temperature TRadRet_nominal = 273.15+40 + parameter Modelica.Units.SI.Temperature TRadRet_nominal = 273.15+40 "Radiator nominal return water temperature"; - parameter Modelica.SIunits.MassFlowRate mRad_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate mRad_flow_nominal= Q_flow_nominal/4200/(TRadSup_nominal-TRadRet_nominal) "Radiator nominal mass flow rate"; - parameter Modelica.SIunits.Temperature TBoiSup_nominal = 273.15+70 + parameter Modelica.Units.SI.Temperature TBoiSup_nominal = 273.15+70 "Boiler nominal supply water temperature"; - parameter Modelica.SIunits.Temperature TBoiRet_min = 273.15+60 + parameter Modelica.Units.SI.Temperature TBoiRet_min = 273.15+60 "Boiler minimum return water temperature"; - parameter Modelica.SIunits.MassFlowRate mBoi_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate mBoi_flow_nominal= Q_flow_nominal/4200/(TBoiSup_nominal-TBoiRet_min) "Boiler nominal mass flow rate"; //------------------------------------------------------------------------------// //----------------Radiator loop: Three-way valve: mass flow rate----------------// - parameter Modelica.SIunits.MassFlowRate mRadVal_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate mRadVal_flow_nominal= Q_flow_nominal/4200/(TBoiSup_nominal-TRadRet_nominal) "Radiator nominal mass flow rate"; @@ -40,10 +40,10 @@ Modelica.Thermal.HeatTransfer.Components.ThermalConductor theCon(G=20000/30) "Thermal conductance with the ambient" annotation (Placement(transformation(extent={{20,40},{40,60}}))); - parameter Modelica.SIunits.Volume V=6*10*3 "Room volume"; - parameter Modelica.SIunits.MassFlowRate mA_flow_nominal = V*6/3600 + parameter Modelica.Units.SI.Volume V=6*10*3 "Room volume"; + parameter Modelica.Units.SI.MassFlowRate mA_flow_nominal = V*6/3600 "Nominal mass flow rate"; - parameter Modelica.SIunits.HeatFlowRate QRooInt_flow = 4000 + parameter Modelica.Units.SI.HeatFlowRate QRooInt_flow = 4000 "Internal heat gains of the room"; Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow preHea "Prescribed heat flow" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/Tutorial/Boiler/System7.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/Tutorial/Boiler/System7.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/Tutorial/Boiler/System7.mo" 2022-03-10 09:57:31.640143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/Tutorial/Boiler/System7.mo" 2022-03-10 09:58:50.132153264 +0000 @@ -7,27 +7,27 @@ replaceable package MediumW = Buildings.Media.Water "Medium model"; - parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal = 20000 + parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal = 20000 "Nominal heat flow rate of radiator"; - parameter Modelica.SIunits.Temperature TRadSup_nominal = 273.15+50 + parameter Modelica.Units.SI.Temperature TRadSup_nominal = 273.15+50 "Radiator nominal supply water temperature"; - parameter Modelica.SIunits.Temperature TRadRet_nominal = 273.15+40 + parameter Modelica.Units.SI.Temperature TRadRet_nominal = 273.15+40 "Radiator nominal return water temperature"; - parameter Modelica.SIunits.MassFlowRate mRad_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate mRad_flow_nominal= Q_flow_nominal/4200/(TRadSup_nominal-TRadRet_nominal) "Radiator nominal mass flow rate"; - parameter Modelica.SIunits.Temperature TBoiSup_nominal = 273.15+70 + parameter Modelica.Units.SI.Temperature TBoiSup_nominal = 273.15+70 "Boiler nominal supply water temperature"; - parameter Modelica.SIunits.Temperature TBoiRet_min = 273.15+60 + parameter Modelica.Units.SI.Temperature TBoiRet_min = 273.15+60 "Boiler minimum return water temperature"; - parameter Modelica.SIunits.MassFlowRate mBoi_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate mBoi_flow_nominal= Q_flow_nominal/4200/(TBoiSup_nominal-TBoiRet_min) "Boiler nominal mass flow rate"; //------------------------------------------------------------------------------// //----------------Radiator loop: Three-way valve: mass flow rate----------------// - parameter Modelica.SIunits.MassFlowRate mRadVal_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate mRadVal_flow_nominal= Q_flow_nominal/4200/(TBoiSup_nominal-TRadRet_nominal) "Radiator nominal mass flow rate"; @@ -40,10 +40,10 @@ Modelica.Thermal.HeatTransfer.Components.ThermalConductor theCon(G=20000/30) "Thermal conductance with the ambient" annotation (Placement(transformation(extent={{20,40},{40,60}}))); - parameter Modelica.SIunits.Volume V=6*10*3 "Room volume"; - parameter Modelica.SIunits.MassFlowRate mA_flow_nominal = V*6/3600 + parameter Modelica.Units.SI.Volume V=6*10*3 "Room volume"; + parameter Modelica.Units.SI.MassFlowRate mA_flow_nominal = V*6/3600 "Nominal mass flow rate"; - parameter Modelica.SIunits.HeatFlowRate QRooInt_flow = 4000 + parameter Modelica.Units.SI.HeatFlowRate QRooInt_flow = 4000 "Internal heat gains of the room"; Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow preHea "Prescribed heat flow" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/Tutorial/SpaceCooling/System1.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/Tutorial/SpaceCooling/System1.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/Tutorial/SpaceCooling/System1.mo" 2022-03-10 09:57:31.640143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/Tutorial/SpaceCooling/System1.mo" 2022-03-10 09:58:50.040153251 +0000 @@ -14,10 +14,10 @@ Modelica.Thermal.HeatTransfer.Components.ThermalConductor theCon(G=10000/30) "Thermal conductance with the ambient" annotation (Placement(transformation(extent={{20,40},{40,60}}))); - parameter Modelica.SIunits.Volume V=6*10*3 "Room volume"; - parameter Modelica.SIunits.MassFlowRate mA_flow_nominal = V*6/3600 + parameter Modelica.Units.SI.Volume V=6*10*3 "Room volume"; + parameter Modelica.Units.SI.MassFlowRate mA_flow_nominal = V*6/3600 "Nominal mass flow rate"; - parameter Modelica.SIunits.HeatFlowRate QRooInt_flow = 1000 + parameter Modelica.Units.SI.HeatFlowRate QRooInt_flow = 1000 "Internal heat gains of the room"; Modelica.Thermal.HeatTransfer.Sources.FixedTemperature TOut(T=263.15) "Outside temperature" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/Tutorial/SpaceCooling/System2.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/Tutorial/SpaceCooling/System2.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/Tutorial/SpaceCooling/System2.mo" 2022-03-10 09:57:31.640143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/Tutorial/SpaceCooling/System2.mo" 2022-03-10 09:58:50.032153251 +0000 @@ -17,46 +17,46 @@ Modelica.Thermal.HeatTransfer.Components.ThermalConductor theCon(G=10000/30) "Thermal conductance with the ambient" annotation (Placement(transformation(extent={{20,40},{40,60}}))); - parameter Modelica.SIunits.Volume V=6*10*3 "Room volume"; + parameter Modelica.Units.SI.Volume V=6*10*3 "Room volume"; ////////////////////////////////////////////////////////// // Heat recovery effectiveness parameter Real eps = 0.8 "Heat recovery effectiveness"; ///////////////////////////////////////////////////////// // 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 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"; - 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/Buildings 3.0.0/Examples/Tutorial/SpaceCooling/System3.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/Tutorial/SpaceCooling/System3.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/Tutorial/SpaceCooling/System3.mo" 2022-03-10 09:57:31.640143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/Tutorial/SpaceCooling/System3.mo" 2022-03-10 09:58:50.000153247 +0000 @@ -17,46 +17,46 @@ Modelica.Thermal.HeatTransfer.Components.ThermalConductor theCon(G=10000/30) "Thermal conductance with the ambient" annotation (Placement(transformation(extent={{20,40},{40,60}}))); - parameter Modelica.SIunits.Volume V=6*10*3 "Room volume"; + parameter Modelica.Units.SI.Volume V=6*10*3 "Room volume"; ////////////////////////////////////////////////////////// // Heat recovery effectiveness parameter Real eps = 0.8 "Heat recovery effectiveness"; ///////////////////////////////////////////////////////// // 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 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"; - 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/Buildings 3.0.0/Examples/VAVCO2/BaseClasses/RoomVAV.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVCO2/BaseClasses/RoomVAV.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVCO2/BaseClasses/RoomVAV.mo" 2022-03-10 09:57:31.640143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVCO2/BaseClasses/RoomVAV.mo" 2022-03-10 09:58:49.900153234 +0000 @@ -29,7 +29,7 @@ nPorts=1) "CO2 source" annotation (extent=[-98,-70; -78,-50], Placement(transformation(extent={{-100, -70},{-80,-50}}))); - parameter Modelica.SIunits.Volume VRoo "Volume of room"; + parameter Modelica.Units.SI.Volume VRoo "Volume of room"; Buildings.Fluid.MixingVolumes.MixingVolume ple( redeclare package Medium = Medium, V=VPle, @@ -40,7 +40,7 @@ transformation(extent={{-10,-10},{10,10}}, rotation=90, origin={-10,-60}))); - parameter Modelica.SIunits.Volume VPle "Volume of plenum"; + parameter Modelica.Units.SI.Volume VPle "Volume of plenum"; Modelica.Fluid.Interfaces.FluidPort_a portRoo1(redeclare package Medium = Medium) "Fluid port" annotation (extent=[-170,-10; -150,10]); @@ -57,8 +57,8 @@ annotation (extent=[150,-10; 170,10]); Modelica.Blocks.Interfaces.RealOutput yDam "Damper control signal" annotation (extent=[160,70; 180,90]); - parameter Modelica.SIunits.Area ADam "Damper face area"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal + parameter Modelica.Units.SI.Area ADam "Damper face area"; + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal "Nominal mass flow rate"; Modelica.Blocks.Interfaces.RealInput nPeo "Number of people" annotation (extent=[-198,-80; -158,-40]); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVCO2/BaseClasses/Suite.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVCO2/BaseClasses/Suite.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVCO2/BaseClasses/Suite.mo" 2022-03-10 09:57:31.640143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVCO2/BaseClasses/Suite.mo" 2022-03-10 09:58:49.876153231 +0000 @@ -7,7 +7,7 @@ Modelica.Fluid.Interfaces.FluidPort_b port_aSup(redeclare package Medium = Medium) annotation (extent=[-110,110; -90,130]); parameter Real scaM_flow "Scaling factor for mass flow rate"; - parameter Modelica.SIunits.MassFlowRate m0Tot_flow= + parameter Modelica.Units.SI.MassFlowRate m0Tot_flow= scaM_flow*(5.196+2.8428+1.0044+0.9612+0.3624+0.1584); Buildings.Fluid.FixedResistances.SplitterFixedResistanceDpM spl34( redeclare package Medium = Medium, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVCO2/VAVSystemCTControl.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVCO2/VAVSystemCTControl.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVCO2/VAVSystemCTControl.mo" 2022-03-10 09:57:31.640143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVCO2/VAVSystemCTControl.mo" 2022-03-10 09:58:49.824153224 +0000 @@ -4,15 +4,15 @@ extends Modelica.Icons.Example; package Medium = Buildings.Media.Air(extraPropertiesNames={"CO2"}); - parameter Modelica.SIunits.MassFlowRate mMIT_flow = roo.m0Tot_flow + parameter Modelica.Units.SI.MassFlowRate mMIT_flow = roo.m0Tot_flow "Nominal mass flow rate of MIT system model as in ASHRAE 825-RP"; -parameter Modelica.SIunits.PressureDifference dpSuiSup_nominal(displayUnit="Pa") = 95 +parameter Modelica.Units.SI.PressureDifference dpSuiSup_nominal(displayUnit="Pa") = 95 "Pressure drop supply air leg with splitters of one suite (obtained from simulation)"; -parameter Modelica.SIunits.PressureDifference dpSuiRet_nominal(displayUnit="Pa") = 233 +parameter Modelica.Units.SI.PressureDifference dpSuiRet_nominal(displayUnit="Pa") = 233 "Pressure drop return air leg with splitters of one suite (obtained from simulation)"; -parameter Modelica.SIunits.PressureDifference dpFanSupMIT_nominal(displayUnit="Pa") = 1050 +parameter Modelica.Units.SI.PressureDifference dpFanSupMIT_nominal(displayUnit="Pa") = 1050 "Pressure increase over supply fan in MIT system model as in ASHRAE 825-RP (obtained from simulation)"; -parameter Modelica.SIunits.PressureDifference dpFanRetMIT_nominal(displayUnit="Pa") = 347 +parameter Modelica.Units.SI.PressureDifference dpFanRetMIT_nominal(displayUnit="Pa") = 347 "Pressure increase over supply fan in MIT system model as in ASHRAE 825-RP (obtained from simulation)"; parameter Real scaM_flow = 1 "Scaling factor for mass flow rate"; parameter Real scaDpFanSup_nominal = 1 @@ -74,7 +74,7 @@ yMin=0, Td=60, k=0.1, - initType=Modelica.Blocks.Types.InitPID.InitialState, + initType=Modelica.Blocks.Types.Init.InitialState, controllerType=Modelica.Blocks.Types.SimpleController.P) "Controller for supply fan" annotation (Placement(transformation(extent={{40,80},{60,100}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVReheat/ClosedLoop.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVReheat/ClosedLoop.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVReheat/ClosedLoop.mo" 2022-03-10 09:57:31.640143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVReheat/ClosedLoop.mo" 2022-03-10 09:58:49.800153221 +0000 @@ -6,27 +6,27 @@ Buildings.Media.Air(T_default=293.15); package MediumW = Buildings.Media.Water "Medium model for water"; - parameter Modelica.SIunits.Volume VRooCor=2698 "Room volume corridor"; - parameter Modelica.SIunits.Volume VRooSou=568.77 "Room volume south"; - parameter Modelica.SIunits.Volume VRooNor=568.77 "Room volume north"; - parameter Modelica.SIunits.Volume VRooEas=360.08 "Room volume east"; - parameter Modelica.SIunits.Volume VRooWes=360.08 "Room volume west"; + parameter Modelica.Units.SI.Volume VRooCor=2698 "Room volume corridor"; + parameter Modelica.Units.SI.Volume VRooSou=568.77 "Room volume south"; + parameter Modelica.Units.SI.Volume VRooNor=568.77 "Room volume north"; + parameter Modelica.Units.SI.Volume VRooEas=360.08 "Room volume east"; + parameter Modelica.Units.SI.Volume VRooWes=360.08 "Room volume west"; constant Real conv=1.2/3600 "Conversion factor for nominal mass flow rate"; - parameter Modelica.SIunits.MassFlowRate m0_flow_cor=6*VRooCor*conv + parameter Modelica.Units.SI.MassFlowRate m0_flow_cor=6*VRooCor*conv "Design mass flow rate core"; - parameter Modelica.SIunits.MassFlowRate m0_flow_sou=7*VRooSou*conv + parameter Modelica.Units.SI.MassFlowRate m0_flow_sou=7*VRooSou*conv "Design mass flow rate perimeter 1"; - parameter Modelica.SIunits.MassFlowRate m0_flow_eas=10*VRooEas*conv + parameter Modelica.Units.SI.MassFlowRate m0_flow_eas=10*VRooEas*conv "Design mass flow rate perimeter 2"; - parameter Modelica.SIunits.MassFlowRate m0_flow_nor=7*VRooNor*conv + parameter Modelica.Units.SI.MassFlowRate m0_flow_nor=7*VRooNor*conv "Design mass flow rate perimeter 3"; - parameter Modelica.SIunits.MassFlowRate m0_flow_wes=10*VRooWes*conv + parameter Modelica.Units.SI.MassFlowRate m0_flow_wes=10*VRooWes*conv "Design mass flow rate perimeter 4"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=m0_flow_cor + + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=m0_flow_cor + m0_flow_sou + m0_flow_eas + m0_flow_nor + m0_flow_wes "Nominal mass flow rate"; - parameter Modelica.SIunits.Angle lat=41.98*3.14159/180 "Latitude"; + parameter Modelica.Units.SI.Angle lat=41.98*3.14159/180 "Latitude"; Fluid.Sources.Outside amb(redeclare package Medium = MediumA, nPorts=2) "Ambient conditions" annotation (Placement(transformation(extent={{-130,14},{-108,36}}))); @@ -125,7 +125,7 @@ yMax=1, yMin=0, Td=60, - initType=Modelica.Blocks.Types.InitPID.InitialState, + initType=Modelica.Blocks.Types.Init.InitialState, controllerType=Modelica.Blocks.Types.SimpleController.PI, Ti=600, k=0.01) "Controller for heating coil" @@ -133,7 +133,7 @@ Buildings.Controls.Continuous.LimPID cooCoiCon( reverseAction=true, Td=60, - initType=Modelica.Blocks.Types.InitPID.InitialState, + initType=Modelica.Blocks.Types.Init.InitialState, yMax=1, yMin=0, controllerType=Modelica.Blocks.Types.SimpleController.PI, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVReheat/Controls/CoolingCoilTemperatureSetpoint.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVReheat/Controls/CoolingCoilTemperatureSetpoint.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVReheat/Controls/CoolingCoilTemperatureSetpoint.mo" 2022-03-10 09:57:31.640143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVReheat/Controls/CoolingCoilTemperatureSetpoint.mo" 2022-03-10 09:58:49.684153207 +0000 @@ -2,9 +2,9 @@ block CoolingCoilTemperatureSetpoint "Set point scheduler for cooling coil" extends Modelica.Blocks.Icons.Block; import Buildings.Examples.VAVReheat.Controls.OperationModes; - parameter Modelica.SIunits.Temperature TCooOn=273.15+12 + parameter Modelica.Units.SI.Temperature TCooOn=273.15+12 "Cooling setpoint during on"; - parameter Modelica.SIunits.Temperature TCooOff=273.15+30 + parameter Modelica.Units.SI.Temperature TCooOff=273.15+30 "Cooling setpoint during off"; Modelica.Blocks.Sources.RealExpression TSupSetCoo( y=if (mode.y == Integer(OperationModes.occupied) or diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVReheat/Controls/DuctStaticPressureSetpoint.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVReheat/Controls/DuctStaticPressureSetpoint.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVReheat/Controls/DuctStaticPressureSetpoint.mo" 2022-03-10 09:57:31.640143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVReheat/Controls/DuctStaticPressureSetpoint.mo" 2022-03-10 09:58:49.668153204 +0000 @@ -1,13 +1,13 @@ within Buildings.Examples.VAVReheat.Controls; model DuctStaticPressureSetpoint "Computes the duct static pressure setpoint" extends Modelica.Blocks.Interfaces.MISO; - parameter Modelica.SIunits.AbsolutePressure pMin(displayUnit="Pa") = 100 + parameter Modelica.Units.SI.AbsolutePressure pMin(displayUnit="Pa") = 100 "Minimum duct static pressure setpoint"; - parameter Modelica.SIunits.AbsolutePressure pMax(displayUnit="Pa") = 410 + parameter Modelica.Units.SI.AbsolutePressure pMax(displayUnit="Pa") = 410 "Maximum duct static pressure setpoint"; parameter Real k=0.1 "Gain of controller"; - parameter Modelica.SIunits.Time Ti=60 "Time constant of Integrator block"; - parameter Modelica.SIunits.Time Td=60 "Time constant of Derivative block"; + parameter Modelica.Units.SI.Time Ti=60 "Time constant of Integrator block"; + parameter Modelica.Units.SI.Time Td=60 "Time constant of Derivative block"; parameter Modelica.Blocks.Types.SimpleController controllerType=Modelica.Blocks.Types.SimpleController.PID "Type of controller"; Buildings.Controls.Continuous.LimPID limPID( @@ -15,7 +15,7 @@ k=k, Ti=Ti, Td=Td, - initType=Modelica.Blocks.Types.InitPID.InitialState, + initType=Modelica.Blocks.Types.Init.InitialState, reverseAction=true) annotation (Placement(transformation(extent={{-20,40},{0,60}}))); protected diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVReheat/Controls/Economizer.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVReheat/Controls/Economizer.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVReheat/Controls/Economizer.mo" 2022-03-10 09:57:31.640143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVReheat/Controls/Economizer.mo" 2022-03-10 09:58:49.644153202 +0000 @@ -1,9 +1,9 @@ within Buildings.Examples.VAVReheat.Controls; block Economizer "Controller for economizer" import Buildings.Examples.VAVReheat.Controls.OperationModes; - parameter Modelica.SIunits.TemperatureDifference dT(min=0.1)= 1 + parameter Modelica.Units.SI.TemperatureDifference dT(min=0.1)= 1 "Temperture offset to activate economizer"; - parameter Modelica.SIunits.VolumeFlowRate VOut_flow_min(min=0) + parameter Modelica.Units.SI.VolumeFlowRate VOut_flow_min(min=0) "Minimum outside air volume flow rate"; Modelica.Blocks.Interfaces.RealInput TSupHeaSet "Supply temperature setpoint for heating" @@ -33,7 +33,7 @@ Modelica.Blocks.Sources.Constant uni(k=1) "Unity signal" annotation (Placement(transformation(extent={{-60,-20},{-40,0}}))); parameter Real k=1 "Gain of controller"; - parameter Modelica.SIunits.Time Ti "Time constant of Integrator block"; + parameter Modelica.Units.SI.Time Ti "Time constant of Integrator block"; Modelica.Blocks.Interfaces.RealOutput yOA "Control signal for outside air damper" annotation (Placement(transformation(extent={{200,70},{220,90}}), iconTransformation(extent={{200,70},{220,90}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVReheat/Controls/EconomizerTemperatureControl.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVReheat/Controls/EconomizerTemperatureControl.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVReheat/Controls/EconomizerTemperatureControl.mo" 2022-03-10 09:57:31.640143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVReheat/Controls/EconomizerTemperatureControl.mo" 2022-03-10 09:58:49.600153197 +0000 @@ -13,7 +13,7 @@ "Controller for mixed air temperature" annotation (Placement(transformation(extent={{60,-10},{80,10}}))); parameter Real k=1 "Gain of controller"; - parameter Modelica.SIunits.Time Ti "Time constant of Integrator block"; + parameter Modelica.Units.SI.Time Ti "Time constant of Integrator block"; Modelica.Blocks.Logical.Greater signGain "Sign of control gain" annotation (Placement(transformation(extent={{-60,50},{-40,70}}))); Modelica.Blocks.Logical.Switch swi1 diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVReheat/Controls/Examples/OperationModes.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVReheat/Controls/Examples/OperationModes.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVReheat/Controls/Examples/OperationModes.mo" 2022-03-10 09:57:31.640143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVReheat/Controls/Examples/OperationModes.mo" 2022-03-10 09:58:49.536153187 +0000 @@ -45,7 +45,7 @@ annotation (Placement(transformation(extent={{-20,-130},{0,-110}}))); Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow preHeaFlo1 annotation (Placement(transformation(extent={{112,-130},{132,-110}}))); - Buildings.Controls.Continuous.LimPID PID(initType=Modelica.Blocks.Types.InitPID.InitialState) + Buildings.Controls.Continuous.LimPID PID(initType=Modelica.Blocks.Types.Init.InitialState) annotation (Placement(transformation(extent={{-80,-130},{-60,-110}}))); Modelica.Blocks.Logical.Switch switch2 annotation (Placement(transformation(extent={{20,-130},{40,-110}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVReheat/Controls/FanVFD.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVReheat/Controls/FanVFD.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVReheat/Controls/FanVFD.mo" 2022-03-10 09:57:31.640143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVReheat/Controls/FanVFD.mo" 2022-03-10 09:58:49.512153186 +0000 @@ -44,7 +44,7 @@ annotation (Dialog(group="Setpoint tracking")); parameter Real k=0.5 "Gain of controller" annotation (Dialog(group="Setpoint tracking")); - parameter Modelica.SIunits.Time Ti=15 "Time constant of Integrator block" + parameter Modelica.Units.SI.Time Ti=15 "Time constant of Integrator block" annotation (Dialog(group="Setpoint tracking")); equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVReheat/Controls/ModeSelector.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVReheat/Controls/ModeSelector.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVReheat/Controls/ModeSelector.mo" 2022-03-10 09:57:31.640143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVReheat/Controls/ModeSelector.mo" 2022-03-10 09:58:49.492153182 +0000 @@ -1,6 +1,6 @@ within Buildings.Examples.VAVReheat.Controls; model ModeSelector "Finite State Machine for the operational modes" - Modelica.StateGraph.InitialStep initialStep + Modelica.StateGraph.InitialStep initialStep(nIn = 1, nOut = 1) annotation (Placement(transformation(extent={{-80,20},{-60,40}}))); Modelica.StateGraph.Transition start "Starts the system" annotation (Placement(transformation(extent={{-50,20},{-30,40}}))); @@ -19,13 +19,13 @@ waitTime=60, condition=TRooMinErrHea.y > delTRooOnOff/2) annotation (Placement(transformation(extent={{28,20},{48,40}}))); - parameter Modelica.SIunits.TemperatureDifference delTRooOnOff(min=0.1)=1 + parameter Modelica.Units.SI.TemperatureDifference delTRooOnOff(min=0.1)=1 "Deadband in room temperature between occupied on and occupied off"; - parameter Modelica.SIunits.Temperature TRooSetHeaOcc=293.15 + parameter Modelica.Units.SI.Temperature TRooSetHeaOcc=293.15 "Set point for room air temperature during heating mode"; - parameter Modelica.SIunits.Temperature TRooSetCooOcc=299.15 + parameter Modelica.Units.SI.Temperature TRooSetCooOcc=299.15 "Set point for room air temperature during cooling mode"; - parameter Modelica.SIunits.Temperature TSetHeaCoiOut=303.15 + parameter Modelica.Units.SI.Temperature TSetHeaCoiOut=303.15 "Set point for air outlet temperature at central heating coil"; Modelica.StateGraph.Transition t1(condition=delTRooOnOff/2 < -TRooMinErrHea.y, enableTimer=true, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVReheat/Controls/PreCoolingStarter.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVReheat/Controls/PreCoolingStarter.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVReheat/Controls/PreCoolingStarter.mo" 2022-03-10 09:57:31.640143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVReheat/Controls/PreCoolingStarter.mo" 2022-03-10 09:58:49.452153177 +0000 @@ -1,9 +1,9 @@ within Buildings.Examples.VAVReheat.Controls; block PreCoolingStarter "Outputs true when precooling should start" extends Modelica.Blocks.Interfaces.BooleanSignalSource; - parameter Modelica.SIunits.Temperature TOutLim = 286.15 + parameter Modelica.Units.SI.Temperature TOutLim = 286.15 "Limit for activating precooling"; - parameter Modelica.SIunits.Temperature TRooSetCooOcc + parameter Modelica.Units.SI.Temperature TRooSetCooOcc "Set point for room air temperature during cooling mode"; ControlBus controlBus annotation (Placement(transformation(extent={{-72,50},{-52,70}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVReheat/Controls/RoomTemperatureSetpoint.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVReheat/Controls/RoomTemperatureSetpoint.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVReheat/Controls/RoomTemperatureSetpoint.mo" 2022-03-10 09:57:31.640143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVReheat/Controls/RoomTemperatureSetpoint.mo" 2022-03-10 09:58:49.444153176 +0000 @@ -2,13 +2,13 @@ block RoomTemperatureSetpoint "Set point scheduler for room temperature" extends Modelica.Blocks.Icons.Block; import Buildings.Examples.VAVReheat.Controls.OperationModes; - parameter Modelica.SIunits.Temperature THeaOn=293.15 + parameter Modelica.Units.SI.Temperature THeaOn=293.15 "Heating setpoint during on"; - parameter Modelica.SIunits.Temperature THeaOff=285.15 + parameter Modelica.Units.SI.Temperature THeaOff=285.15 "Heating setpoint during off"; - parameter Modelica.SIunits.Temperature TCooOn=297.15 + parameter Modelica.Units.SI.Temperature TCooOn=297.15 "Cooling setpoint during on"; - parameter Modelica.SIunits.Temperature TCooOff=303.15 + parameter Modelica.Units.SI.Temperature TCooOff=303.15 "Cooling setpoint during off"; ControlBus controlBus annotation (Placement(transformation(extent={{10,50},{30,70}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVReheat/Controls/RoomVAV.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVReheat/Controls/RoomVAV.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVReheat/Controls/RoomVAV.mo" 2022-03-10 09:57:31.640143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVReheat/Controls/RoomVAV.mo" 2022-03-10 09:58:49.432153175 +0000 @@ -6,7 +6,7 @@ Buildings.Controls.Continuous.LimPID conHea( yMax=1, xi_start=0.1, - initType=Modelica.Blocks.Types.InitPID.InitialState, + initType=Modelica.Blocks.Types.Init.InitialState, Td=60, yMin=0, controllerType=Modelica.Blocks.Types.SimpleController.PI, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVReheat/Controls/State.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVReheat/Controls/State.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVReheat/Controls/State.mo" 2022-03-10 09:57:31.640143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVReheat/Controls/State.mo" 2022-03-10 09:58:49.416153172 +0000 @@ -1,7 +1,7 @@ within Buildings.Examples.VAVReheat.Controls; model State "Block that outputs the mode if the state is active, or zero otherwise" - extends Modelica.StateGraph.StepWithSignal; + extends Modelica.StateGraph.StepWithSignal(nIn = 1, nOut = 1); parameter OperationModes mode "Enter enumeration of mode"; Modelica.Blocks.Interfaces.IntegerOutput y "Mode signal (=0 if not active)" annotation (Placement(transformation(extent={{100,-70},{120,-50}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVReheat/ThermalZones/Floor.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVReheat/ThermalZones/Floor.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVReheat/ThermalZones/Floor.mo" 2022-03-10 09:57:31.640143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVReheat/ThermalZones/Floor.mo" 2022-03-10 09:58:49.408153171 +0000 @@ -4,11 +4,11 @@ "Medium model for air" annotation (choicesAllMatching=true); parameter HeatTransfer.Types.InteriorConvection intConMod=Buildings.HeatTransfer.Types.InteriorConvection.Temperature "Convective heat transfer model for room-facing surfaces of opaque constructions"; - parameter Modelica.SIunits.Angle lat "Latitude"; + parameter Modelica.Units.SI.Angle lat "Latitude"; parameter Real winWalRat( min=0.01, max=0.99) = 0.33 "Window to wall ratio for exterior walls"; - parameter Modelica.SIunits.Length hWin = 1.5 "Height of windows"; + parameter Modelica.Units.SI.Length hWin = 1.5 "Height of windows"; parameter HeatTransfer.Data.Solids.Plywood matFur(x=0.15, nStaRef=5) "Material for furniture" annotation (Placement(transformation(extent={{140,460},{160,480}}))); @@ -71,7 +71,7 @@ haveInteriorShade=false, haveExteriorShade=false) "Data record for the glazing system" annotation (Placement(transformation(extent={{240,460},{260,480}}))); - constant Modelica.SIunits.Height hRoo=2.74 "Room height"; + constant Modelica.Units.SI.Height hRoo=2.74 "Room height"; Rooms.MixedAir sou( redeclare package Medium = Medium, lat=lat, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVReheat/ThermalZones/RoomLeakage.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVReheat/ThermalZones/RoomLeakage.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVReheat/ThermalZones/RoomLeakage.mo" 2022-03-10 09:57:31.640143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVReheat/ThermalZones/RoomLeakage.mo" 2022-03-10 09:58:49.320153160 +0000 @@ -3,7 +3,7 @@ extends Buildings.BaseClasses.BaseIcon; replaceable package Medium = Modelica.Media.Interfaces.PartialMedium "Medium in the component" annotation (choicesAllMatching=true); - parameter Modelica.SIunits.Volume VRoo "Room volume"; + parameter Modelica.Units.SI.Volume VRoo "Room volume"; Buildings.Fluid.FixedResistances.FixedResistanceDpM res( redeclare package Medium = Medium, dp_nominal=50, @@ -28,7 +28,7 @@ "Air change per hour due to infiltration" annotation (Placement(transformation(extent={{12,30},{32,50}}))); parameter Real s "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)"; equation connect(res.port_b, port_b) annotation (Line(points={{40,6.10623e-16},{55, 6.10623e-16},{55,1.16573e-15},{70,1.16573e-15},{70,5.55112e-16},{100, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVReheat/ThermalZones/VAVBranch.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVReheat/ThermalZones/VAVBranch.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVReheat/ThermalZones/VAVBranch.mo" 2022-03-10 09:57:31.640143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Examples/VAVReheat/ThermalZones/VAVBranch.mo" 2022-03-10 09:58:49.312153159 +0000 @@ -47,9 +47,9 @@ "Fluid connector b (positive design flow direction is from port_a1 to port_b1)" annotation (Placement(transformation(extent={{40,190},{60,210}}), iconTransformation(extent={{40,190},{60,210}}))); - parameter Modelica.SIunits.MassFlowRate m_flow_nominal + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal "Mass flow rate of this thermal zone"; - parameter Modelica.SIunits.Volume VRoo "Room volume"; + parameter Modelica.Units.SI.Volume VRoo "Room volume"; Controls.RoomVAV con "Room temperature controller" annotation (Placement(transformation(extent={{0,-6},{20,14}}))); Controls.ControlBus controlBus annotation (Placement(transformation(extent={{ diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Actuators/BaseClasses/ActuatorSignal.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Actuators/BaseClasses/ActuatorSignal.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Actuators/BaseClasses/ActuatorSignal.mo" 2022-03-10 09:57:31.640143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Actuators/BaseClasses/ActuatorSignal.mo" 2022-03-10 09:58:49.276153155 +0000 @@ -5,7 +5,7 @@ parameter Boolean filteredOpening=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=filteredOpening)); parameter Modelica.Blocks.Types.Init init=Modelica.Blocks.Types.Init.InitialOutput diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Actuators/BaseClasses/PartialDamperExponential.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Actuators/BaseClasses/PartialDamperExponential.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Actuators/BaseClasses/PartialDamperExponential.mo" 2022-03-10 09:57:31.640143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Actuators/BaseClasses/PartialDamperExponential.mo" 2022-03-10 09:58:49.212153147 +0000 @@ -12,9 +12,9 @@ annotation(Dialog(enable=use_deltaM)); parameter Boolean use_v_nominal = true "Set to true to use face velocity to compute area"; - parameter Modelica.SIunits.Velocity v_nominal=1 "Nominal face velocity" + parameter Modelica.Units.SI.Velocity v_nominal=1 "Nominal face velocity" annotation(Dialog(enable=use_v_nominal)); - parameter Modelica.SIunits.Area A=m_flow_nominal/rho_default/v_nominal + parameter Modelica.Units.SI.Area A=m_flow_nominal/rho_default/v_nominal "Face area" annotation(Dialog(enable=not use_v_nominal)); parameter Boolean roundDuct = false @@ -59,7 +59,7 @@ (Modelica.Math.log(k1)*yU^2 + b*yU^2 + (-2*b - 2*a)*yU + b + a)/(yU^2 - 2*yU + 1)} "Polynomial coefficients for curve fit for y > yu"; parameter Real facRouDuc= if roundDuct then sqrt(Modelica.Constants.pi)/2 else 1; - parameter Modelica.SIunits.Area area= + parameter Modelica.Units.SI.Area area= if use_v_nominal then m_flow_nominal/rho_default/v_nominal else A "Face velocity used in the computation"; initial equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Actuators/BaseClasses/PartialThreeWayValve.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Actuators/BaseClasses/PartialThreeWayValve.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Actuators/BaseClasses/PartialThreeWayValve.mo" 2022-03-10 09:57:31.640143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Actuators/BaseClasses/PartialThreeWayValve.mo" 2022-03-10 09:58:49.192153144 +0000 @@ -36,7 +36,7 @@ extends Buildings.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/Buildings 3.0.0/Fluid/Actuators/BaseClasses/PartialTwoWayValve.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Actuators/BaseClasses/PartialTwoWayValve.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Actuators/BaseClasses/PartialTwoWayValve.mo" 2022-03-10 09:57:31.640143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Actuators/BaseClasses/PartialTwoWayValve.mo" 2022-03-10 09:58:49.176153142 +0000 @@ -10,7 +10,7 @@ rhoStd=Medium.density_pTX(101325, 273.15+4, Medium.X_default)); extends Buildings.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/Buildings 3.0.0/Fluid/Actuators/BaseClasses/ValveParameters.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Actuators/BaseClasses/ValveParameters.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Actuators/BaseClasses/ValveParameters.mo" 2022-03-10 09:57:31.640143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Actuators/BaseClasses/ValveParameters.mo" 2022-03-10 09:58:49.160153140 +0000 @@ -14,7 +14,7 @@ "Cv (US) flow coefficient [USG/min/(psi)^(1/2)]" annotation(Dialog(group = "Flow Coefficient", enable = (CvData==Buildings.Fluid.Types.CvTypes.Cv))); - parameter Modelica.SIunits.Area Av( + parameter Modelica.Units.SI.Area Av( fixed= if CvData==Buildings.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==Buildings.Fluid.Types.CvTypes.OpPoint then true else false) @@ -34,10 +35,9 @@ annotation(Dialog(group="Nominal condition", enable = (CvData==Buildings.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/Buildings 3.0.0/Fluid/Actuators/Dampers/MixingBox.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Actuators/Dampers/MixingBox.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Actuators/Dampers/MixingBox.mo" 2022-03-10 09:57:31.640143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Actuators/Dampers/MixingBox.mo" 2022-03-10 09:58:49.068153128 +0000 @@ -41,7 +41,7 @@ annotation(Dialog(enable=use_deltaM)); parameter Boolean use_v_nominal = true "Set to true to use face velocity to compute area"; - parameter Modelica.SIunits.Velocity v_nominal=1 "Nominal face velocity" + parameter Modelica.Units.SI.Velocity v_nominal=1 "Nominal face velocity" annotation(Dialog(enable=use_v_nominal)); parameter Boolean roundDuct = false @@ -51,7 +51,7 @@ "Reynolds number where transition to turbulent starts" annotation(Dialog(enable=not use_deltaM)); - parameter Modelica.SIunits.Area AOut=mOut_flow_nominal/rho_default/v_nominal + parameter Modelica.Units.SI.Area AOut=mOut_flow_nominal/rho_default/v_nominal "Face area outside air damper" annotation(Dialog(enable=not use_v_nominal)); VAVBoxExponential damExh(A=AExh, @@ -77,7 +77,7 @@ allowFlowReversal=allowFlowReversal, final filteredOpening=false) "Exhaust air damper" annotation (Placement(transformation(extent={{-20,-70},{-40,-50}}))); - parameter Modelica.SIunits.Area AExh=mExh_flow_nominal/rho_default/v_nominal + parameter Modelica.Units.SI.Area AExh=mExh_flow_nominal/rho_default/v_nominal "Face area exhaust air damper" annotation(Dialog(enable=not use_v_nominal)); VAVBoxExponential damRec(A=ARec, @@ -106,7 +106,7 @@ origin={30,0}, extent={{-10,-10},{10,10}}, rotation=90))); - parameter Modelica.SIunits.Area ARec=mRec_flow_nominal/rho_default/v_nominal + parameter Modelica.Units.SI.Area ARec=mRec_flow_nominal/rho_default/v_nominal "Face area recirculation air damper" annotation(Dialog(enable=not use_v_nominal)); @@ -114,24 +114,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/Buildings 3.0.0/Fluid/Actuators/Dampers/MixingBoxMinimumFlow.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Actuators/Dampers/MixingBoxMinimumFlow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Actuators/Dampers/MixingBoxMinimumFlow.mo" 2022-03-10 09:57:31.640143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Actuators/Dampers/MixingBoxMinimumFlow.mo" 2022-03-10 09:58:49.032153125 +0000 @@ -4,13 +4,13 @@ extends Buildings.Fluid.Actuators.Dampers.MixingBox; import Modelica.Constants; - parameter Modelica.SIunits.Area AOutMin + parameter Modelica.Units.SI.Area AOutMin "Face area minimum outside air damper"; - parameter Modelica.SIunits.MassFlowRate mOutMin_flow_nominal + parameter Modelica.Units.SI.MassFlowRate mOutMin_flow_nominal "Mass flow rate minimum outside air damper" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.PressureDifference dpOutMin_nominal(min=0, + parameter Modelica.Units.SI.PressureDifference dpOutMin_nominal(min=0, displayUnit="Pa") "Pressure drop minimum outside air leg" annotation (Dialog(group="Nominal condition")); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Actuators/Dampers/VAVBoxExponential.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Actuators/Dampers/VAVBoxExponential.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Actuators/Dampers/VAVBoxExponential.mo" 2022-03-10 09:57:31.640143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Actuators/Dampers/VAVBoxExponential.mo" 2022-03-10 09:58:49.016153122 +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/Buildings 3.0.0/Fluid/Actuators/Motors/IdealMotor.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Actuators/Motors/IdealMotor.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Actuators/Motors/IdealMotor.mo" 2022-03-10 09:57:31.640143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Actuators/Motors/IdealMotor.mo" 2022-03-10 09:58:48.964153115 +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/Buildings 3.0.0/Fluid/Actuators/Valves/TwoWayPressureIndependent.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Actuators/Valves/TwoWayPressureIndependent.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Actuators/Valves/TwoWayPressureIndependent.mo" 2022-03-10 09:57:31.640143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Actuators/Valves/TwoWayPressureIndependent.mo" 2022-03-10 09:58:48.768153091 +0000 @@ -12,10 +12,10 @@ annotation(Dialog(tab="Advanced")); protected - Modelica.SIunits.MassFlowRate m_flow_set "Requested mass flow rate"; - Modelica.SIunits.PressureDifference dp_min(displayUnit="Pa") - "Minimum pressure difference required for delivering requested mass flow rate"; + Modelica.Units.SI.MassFlowRate m_flow_set "Requested mass flow rate"; + Modelica.Units.SI.PressureDifference dp_min(displayUnit="Pa") + "Minimum pressure difference required for delivering requested mass flow rate"; equation m_flow_set = m_flow_nominal*phi; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Actuators/Valves/TwoWayTable.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Actuators/Valves/TwoWayTable.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Actuators/Valves/TwoWayTable.mo" 2022-03-10 09:57:31.640143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Actuators/Valves/TwoWayTable.mo" 2022-03-10 09:58:48.716153085 +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/Buildings 3.0.0/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_dp_DerivativeCheck.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_dp_DerivativeCheck.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_dp_DerivativeCheck.mo" 2022-03-10 09:57:31.640143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_dp_DerivativeCheck.mo" 2022-03-10 09:58:48.692153081 +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/Buildings 3.0.0/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_dp_DerivativeCheck2.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_dp_DerivativeCheck2.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_dp_DerivativeCheck2.mo" 2022-03-10 09:57:31.640143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_dp_DerivativeCheck2.mo" 2022-03-10 09:58:48.684153081 +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/Buildings 3.0.0/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_m_flow_DerivativeCheck.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_m_flow_DerivativeCheck.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_m_flow_DerivativeCheck.mo" 2022-03-10 09:57:31.640143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_m_flow_DerivativeCheck.mo" 2022-03-10 09:58:48.676153079 +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/Buildings 3.0.0/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_m_flow_DerivativeCheck2.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_m_flow_DerivativeCheck2.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_m_flow_DerivativeCheck2.mo" 2022-03-10 09:57:31.640143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_m_flow_DerivativeCheck2.mo" 2022-03-10 09:58:48.668153078 +0000 @@ -4,17 +4,17 @@ 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.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/Buildings 3.0.0/Fluid/BaseClasses/FlowModels/Validation/InverseFlowFunctions.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/BaseClasses/FlowModels/Validation/InverseFlowFunctions.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/BaseClasses/FlowModels/Validation/InverseFlowFunctions.mo" 2022-03-10 09:57:31.640143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/BaseClasses/FlowModels/Validation/InverseFlowFunctions.mo" 2022-03-10 09:58:48.656153076 +0000 @@ -1,15 +1,15 @@ within Buildings.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/Buildings 3.0.0/Fluid/BaseClasses/FlowModels/Validation/InvertingBasicFlowFunction_dp.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/BaseClasses/FlowModels/Validation/InvertingBasicFlowFunction_dp.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/BaseClasses/FlowModels/Validation/InvertingBasicFlowFunction_dp.mo" 2022-03-10 09:57:31.640143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/BaseClasses/FlowModels/Validation/InvertingBasicFlowFunction_dp.mo" 2022-03-10 09:58:48.648153075 +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/Buildings 3.0.0/Fluid/BaseClasses/FlowModels/Validation/InvertingBasicFlowFunction_m_flow.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/BaseClasses/FlowModels/Validation/InvertingBasicFlowFunction_m_flow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/BaseClasses/FlowModels/Validation/InvertingBasicFlowFunction_m_flow.mo" 2022-03-10 09:57:31.640143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/BaseClasses/FlowModels/Validation/InvertingBasicFlowFunction_m_flow.mo" 2022-03-10 09:58:48.640153075 +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/Buildings 3.0.0/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp.mo" 2022-03-10 09:57:31.640143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp.mo" 2022-03-10 09:58:48.636153074 +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^2/k/k + Modelica.Units.SI.PressureDifference dp_turbulent = m_flow_turbulent^2/k/k "Pressure where flow changes to turbulent"; algorithm m_flow := if noEvent(dp>dp_turbulent) then k*sqrt(abs(dp)) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp_der.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp_der.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp_der.mo" 2022-03-10 09:57:31.640143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp_der.mo" 2022-03-10 09:58:48.628153074 +0000 @@ -3,11 +3,11 @@ "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)"; @@ -15,7 +15,7 @@ "Derivative of mass flow rate in design flow direction"; protected Real m_k = m_flow_turbulent/k "Auxiliary variable"; - Modelica.SIunits.PressureDifference dp_turbulent = (m_k)^2 + Modelica.Units.SI.PressureDifference dp_turbulent = (m_k)^2 "Pressure where flow changes to turbulent"; algorithm m_flow_der := (if noEvent(dp>dp_turbulent) then 0.5*k/sqrt(dp) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp_der2.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp_der2.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp_der2.mo" 2022-03-10 09:57:31.640143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp_der2.mo" 2022-03-10 09:58:48.620153073 +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)"; @@ -17,7 +17,7 @@ "2nd derivative of mass flow rate in design flow direction"; protected Real m_k = m_flow_turbulent/k "Auxiliary variable"; - Modelica.SIunits.PressureDifference dp_turbulent = (m_k)^2 + Modelica.Units.SI.PressureDifference dp_turbulent = (m_k)^2 "Pressure where flow changes to turbulent"; algorithm m_flow_der2 := if noEvent(dp>dp_turbulent) then diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow.mo" 2022-03-10 09:57:31.640143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow.mo" 2022-03-10 09:58:48.616153071 +0000 @@ -2,13 +2,13 @@ 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)"; algorithm dp :=if (m_flow>m_flow_turbulent) then (m_flow/k)^2 diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow_der.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow_der.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow_der.mo" 2022-03-10 09:57:31.640143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow_der.mo" 2022-03-10 09:58:48.608153071 +0000 @@ -3,11 +3,11 @@ "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"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow_der2.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow_der2.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow_der2.mo" 2022-03-10 09:57:31.640143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow_der2.mo" 2022-03-10 09:58:48.600153069 +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"; @@ -17,7 +17,7 @@ "2nd derivative of pressure difference between port_a and port_b (= port_a.p - port_b.p)"; protected Real m_k = m_flow_turbulent/k "Auxiliary variable"; - Modelica.SIunits.PressureDifference dp_turbulent = (m_k)^2 + Modelica.Units.SI.PressureDifference dp_turbulent = (m_k)^2 "Pressure where flow changes to turbulent"; algorithm dp_der2 :=if (m_flow>m_flow_turbulent) then diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/BaseClasses/PartialResistance.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/BaseClasses/PartialResistance.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/BaseClasses/PartialResistance.mo" 2022-03-10 09:57:31.640143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/BaseClasses/PartialResistance.mo" 2022-03-10 09:58:48.592153068 +0000 @@ -14,7 +14,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" @@ -23,18 +23,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/Buildings 3.0.0/Fluid/BaseClasses/PartialThreeWayResistance.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/BaseClasses/PartialThreeWayResistance.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/BaseClasses/PartialThreeWayResistance.mo" 2022-03-10 09:57:31.640143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/BaseClasses/PartialThreeWayResistance.mo" 2022-03-10 09:58:48.580153067 +0000 @@ -23,11 +23,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)); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Boilers/BoilerPolynomial.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Boilers/BoilerPolynomial.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Boilers/BoilerPolynomial.mo" 2022-03-10 09:57:31.640143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Boilers/BoilerPolynomial.mo" 2022-03-10 09:58:48.556153063 +0000 @@ -6,8 +6,8 @@ show_T = true, final tau=VWat*rho_default/m_flow_nominal); - parameter Modelica.SIunits.Power Q_flow_nominal "Nominal heating power"; - parameter Modelica.SIunits.Temperature T_nominal = 353.15 + parameter Modelica.Units.SI.Power Q_flow_nominal "Nominal heating power"; + parameter Modelica.Units.SI.Temperature T_nominal = 353.15 "Temperature used to compute nominal efficiency (only used if efficiency curve depends on temperature)"; // Assumptions parameter Buildings.Fluid.Types.EfficiencyCurves effCur=Buildings.Fluid.Types.EfficiencyCurves.Constant @@ -17,21 +17,21 @@ parameter Buildings.Fluid.Data.Fuels.Generic fue "Fuel type" annotation (choicesAllMatching = true); - parameter Modelica.SIunits.ThermalConductance UA=0.05*Q_flow_nominal/30 + parameter Modelica.Units.SI.ThermalConductance UA=0.05*Q_flow_nominal/30 "Overall UA value"; - parameter Modelica.SIunits.Volume VWat = 1.5E-6*Q_flow_nominal + parameter Modelica.Units.SI.Volume VWat = 1.5E-6*Q_flow_nominal "Water volume of boiler" annotation(Dialog(tab = "Dynamics", enable = not (energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState))); - parameter Modelica.SIunits.Mass mDry = 1.5E-3*Q_flow_nominal + parameter Modelica.Units.SI.Mass mDry = 1.5E-3*Q_flow_nominal "Mass of boiler that will be lumped to water heat capacity" annotation(Dialog(tab = "Dynamics", enable = not (energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState))); - Modelica.SIunits.Efficiency eta "Boiler efficiency"; + Modelica.Units.SI.Efficiency eta "Boiler efficiency"; - Modelica.SIunits.Power QFue_flow "Heat released by fuel"; - Modelica.SIunits.Power QWat_flow "Heat transfer from gas into water"; - Modelica.SIunits.MassFlowRate mFue_flow "Fuel mass flow rate"; - Modelica.SIunits.VolumeFlowRate VFue_flow "Fuel volume flow rate"; + Modelica.Units.SI.Power QFue_flow "Heat released by fuel"; + Modelica.Units.SI.Power QWat_flow "Heat transfer from gas into water"; + Modelica.Units.SI.MassFlowRate mFue_flow "Fuel mass flow rate"; + Modelica.Units.SI.VolumeFlowRate VFue_flow "Fuel volume flow rate"; Modelica.Blocks.Interfaces.RealInput y(min=0, max=1) "Part load ratio" annotation (Placement(transformation(extent={{-140,60},{-100,100}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Boilers/Examples/BoilerPolynomial.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Boilers/Examples/BoilerPolynomial.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Boilers/Examples/BoilerPolynomial.mo" 2022-03-10 09:57:31.640143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Boilers/Examples/BoilerPolynomial.mo" 2022-03-10 09:58:48.536153061 +0000 @@ -2,12 +2,12 @@ model BoilerPolynomial "Test model" extends Modelica.Icons.Example; package Medium = Buildings.Media.Water "Medium model"; - parameter Modelica.SIunits.Power Q_flow_nominal = 3000 "Nominal power"; - parameter Modelica.SIunits.Temperature dT_nominal = 20 + parameter Modelica.Units.SI.Power Q_flow_nominal = 3000 "Nominal power"; + parameter Modelica.Units.SI.Temperature dT_nominal = 20 "Nominal temperature difference"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = Q_flow_nominal/dT_nominal/4200 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = Q_flow_nominal/dT_nominal/4200 "Nominal mass flow rate"; - parameter Modelica.SIunits.PressureDifference dp_nominal = 3000 + parameter Modelica.Units.SI.PressureDifference dp_nominal = 3000 "Pressure drop at m_flow_nominal"; Buildings.Fluid.Sources.Boundary_pT sin( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Boilers/Examples/BoilerPolynomialClosedLoop.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Boilers/Examples/BoilerPolynomialClosedLoop.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Boilers/Examples/BoilerPolynomialClosedLoop.mo" 2022-03-10 09:57:31.640143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Boilers/Examples/BoilerPolynomialClosedLoop.mo" 2022-03-10 09:58:48.488153056 +0000 @@ -2,10 +2,10 @@ model BoilerPolynomialClosedLoop "Boiler with closed loop control" extends Modelica.Icons.Example; package Medium = Buildings.Media.Water "Medium model"; - parameter Modelica.SIunits.Power Q_flow_nominal = 20000 "Nominal power"; - parameter Modelica.SIunits.Temperature dT_nominal = 20 + parameter Modelica.Units.SI.Power Q_flow_nominal = 20000 "Nominal power"; + parameter Modelica.Units.SI.Temperature dT_nominal = 20 "Nominal temperature difference"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = Q_flow_nominal/dT_nominal/4200 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = Q_flow_nominal/dT_nominal/4200 "Nominal mass flow rate"; Buildings.Fluid.Boilers.BoilerPolynomial boi( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Chillers/BaseClasses/Carnot.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Chillers/BaseClasses/Carnot.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Chillers/BaseClasses/Carnot.mo" 2022-03-10 09:57:31.644143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Chillers/BaseClasses/Carnot.mo" 2022-03-10 09:58:48.452153051 +0000 @@ -4,10 +4,10 @@ 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")); @@ -20,10 +20,10 @@ annotation (Dialog(tab="Advanced", group="Temperature dependence"), Evaluate=True); - 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")); @@ -41,10 +41,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)); @@ -52,10 +52,10 @@ "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")); @@ -83,17 +83,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")); @@ -137,7 +137,7 @@ x2=TCon-TEva, deltaX=0.25) "Carnot efficiency"; - Modelica.SIunits.Temperature TCon(start=TCon_nominal)= + Modelica.Units.SI.Temperature TCon(start=TCon_nominal)= if effInpCon == Buildings.Fluid.Types.EfficiencyInput.port_a then Medium1.temperature(staA1) elseif effInpCon == Buildings.Fluid.Types.EfficiencyInput.port_b or @@ -146,7 +146,7 @@ else 0.5 * (Medium1.temperature(staA1)+Medium1.temperature(staB1)) "Condenser temperature used to compute efficiency"; - Modelica.SIunits.Temperature TEva(start=TEva_nominal)= + Modelica.Units.SI.Temperature TEva(start=TEva_nominal)= if effInpEva == Buildings.Fluid.Types.EfficiencyInput.port_a then Medium2.temperature(staA2) elseif effInpEva == Buildings.Fluid.Types.EfficiencyInput.port_b or @@ -174,19 +174,19 @@ "Flag, true if etaPL should be computed as it depends on yPL" annotation(Evaluate=true); - final parameter Modelica.SIunits.Temperature TUse_nominal= + final parameter Modelica.Units.SI.Temperature TUse_nominal= if COP_is_for_cooling then TEva_nominal else TCon_nominal "Nominal evaporator temperature for chiller or condenser temperature for heat pump"; - Modelica.SIunits.Temperature TUse = if COP_is_for_cooling then TEva else TCon + Modelica.Units.SI.Temperature TUse = if COP_is_for_cooling then TEva else TCon "Temperature of useful heat (evaporator for chiller, condenser for heat pump"; - 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/Buildings 3.0.0/Fluid/Chillers/BaseClasses/PartialCarnot_y.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Chillers/BaseClasses/PartialCarnot_y.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Chillers/BaseClasses/PartialCarnot_y.mo" 2022-03-10 09:57:31.644143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Chillers/BaseClasses/PartialCarnot_y.mo" 2022-03-10 09:58:48.412153046 +0000 @@ -29,7 +29,7 @@ final homotopyInitialization=homotopyInitialization, final Q_flow_nominal=QEva_flow_nominal)); - parameter Modelica.SIunits.Power P_nominal + parameter Modelica.Units.SI.Power P_nominal "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/Buildings 3.0.0/Fluid/Chillers/BaseClasses/PartialElectric.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Chillers/BaseClasses/PartialElectric.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Chillers/BaseClasses/PartialElectric.mo" 2022-03-10 09:57:31.644143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Chillers/BaseClasses/PartialElectric.mo" 2022-03-10 09:58:48.376153041 +0000 @@ -22,14 +22,14 @@ annotation (Placement(transformation(extent={{-140,-50},{-100,-10}}), iconTransformation(extent={{-140,-50},{-100,-10}}))); - Modelica.SIunits.Temperature TEvaEnt "Evaporator entering temperature"; - Modelica.SIunits.Temperature TEvaLvg "Evaporator leaving temperature"; - Modelica.SIunits.Temperature TConEnt "Condenser entering temperature"; - Modelica.SIunits.Temperature TConLvg "Condenser leaving temperature"; - - Modelica.SIunits.Efficiency COP "Coefficient of performance"; - Modelica.SIunits.HeatFlowRate QCon_flow "Condenser heat input"; - Modelica.SIunits.HeatFlowRate QEva_flow "Evaporator heat input"; + Modelica.Units.SI.Temperature TEvaEnt "Evaporator entering temperature"; + Modelica.Units.SI.Temperature TEvaLvg "Evaporator leaving temperature"; + Modelica.Units.SI.Temperature TConEnt "Condenser entering temperature"; + Modelica.Units.SI.Temperature TConLvg "Condenser leaving temperature"; + + Modelica.Units.SI.Efficiency COP "Coefficient of performance"; + Modelica.Units.SI.HeatFlowRate QCon_flow "Condenser heat input"; + Modelica.Units.SI.HeatFlowRate QEva_flow "Evaporator heat input"; Modelica.Blocks.Interfaces.RealOutput P(final quantity="Power", unit="W") "Electric power consumed by compressor" annotation (Placement(transformation(extent={{100,80},{120,100}}), @@ -37,44 +37,44 @@ Real capFunT(min=0, nominal=1, start=1, unit="1") "Cooling capacity factor function of temperature curve"; - Modelica.SIunits.Efficiency EIRFunT(nominal=1, start=1) + Modelica.Units.SI.Efficiency EIRFunT(nominal=1, start=1) "Power input to cooling capacity ratio function of temperature curve"; - Modelica.SIunits.Efficiency EIRFunPLR(nominal=1, start=1) + Modelica.Units.SI.Efficiency EIRFunPLR(nominal=1, start=1) "Power input to cooling capacity ratio function of part load ratio"; Real PLR1(min=0, nominal=1, start=1, unit="1") "Part load ratio"; Real PLR2(min=0, nominal=1, start=1, unit="1") "Part load ratio"; Real CR(min=0, nominal=1, start=1, unit="1") "Cycling ratio"; protected - Modelica.SIunits.HeatFlowRate QEva_flow_ava(nominal=QEva_flow_nominal,start=QEva_flow_nominal) + Modelica.Units.SI.HeatFlowRate QEva_flow_ava(nominal=QEva_flow_nominal,start=QEva_flow_nominal) "Cooling capacity available at evaporator"; - Modelica.SIunits.HeatFlowRate QEva_flow_set(nominal=QEva_flow_nominal,start=QEva_flow_nominal) + Modelica.Units.SI.HeatFlowRate QEva_flow_set(nominal=QEva_flow_nominal,start=QEva_flow_nominal) "Cooling capacity required to cool to set point temperature"; - Modelica.SIunits.SpecificEnthalpy hSet + Modelica.Units.SI.SpecificEnthalpy hSet "Enthalpy setpoint for leaving chilled water"; // Performance data - parameter Modelica.SIunits.HeatFlowRate QEva_flow_nominal(max=0) + parameter Modelica.Units.SI.HeatFlowRate QEva_flow_nominal(max=0) "Reference capacity (negative number)"; - parameter Modelica.SIunits.Efficiency COP_nominal + parameter Modelica.Units.SI.Efficiency COP_nominal "Reference coefficient of performance"; parameter Real PLRMax(min=0, unit="1") "Maximum part load ratio"; parameter Real PLRMinUnl(min=0, unit="1") "Minimum part unload ratio"; parameter Real PLRMin(min=0, unit="1") "Minimum part load ratio"; - parameter Modelica.SIunits.Efficiency etaMotor(max=1) + parameter Modelica.Units.SI.Efficiency etaMotor(max=1) "Fraction of compressor motor heat entering refrigerant"; - parameter Modelica.SIunits.MassFlowRate mEva_flow_nominal + parameter Modelica.Units.SI.MassFlowRate mEva_flow_nominal "Nominal mass flow at evaporator"; - parameter Modelica.SIunits.MassFlowRate mCon_flow_nominal + parameter Modelica.Units.SI.MassFlowRate mCon_flow_nominal "Nominal mass flow at condenser"; - parameter Modelica.SIunits.Temperature TEvaLvg_nominal + parameter Modelica.Units.SI.Temperature TEvaLvg_nominal "Temperature of fluid leaving evaporator at nominal condition"; - final parameter Modelica.SIunits.Conversions.NonSIunits.Temperature_degC + final parameter Modelica.Units.NonSI.Temperature_degC TEvaLvg_nominal_degC= - Modelica.SIunits.Conversions.to_degC(TEvaLvg_nominal) + Modelica.Units.Conversions.to_degC(TEvaLvg_nominal) "Temperature of fluid leaving evaporator at nominal condition"; - Modelica.SIunits.Conversions.NonSIunits.Temperature_degC TEvaLvg_degC + Modelica.Units.NonSI.Temperature_degC TEvaLvg_degC "Temperature of fluid leaving evaporator"; - parameter Modelica.SIunits.HeatFlowRate Q_flow_small = QEva_flow_nominal*1E-9 + parameter Modelica.Units.SI.HeatFlowRate Q_flow_small = QEva_flow_nominal*1E-9 "Small value for heat flow rate or power, used to avoid division by zero"; Buildings.HeatTransfer.Sources.PrescribedHeatFlow preHeaFloEva "Prescribed heat flow rate" @@ -101,7 +101,7 @@ // Evaporator temperatures TEvaEnt = Medium2.temperature(Medium2.setState_phX(port_a2.p, inStream(port_a2.h_outflow))); TEvaLvg = vol2.heatPort.T; - TEvaLvg_degC=Modelica.SIunits.Conversions.to_degC(TEvaLvg); + TEvaLvg_degC=Modelica.Units.Conversions.to_degC(TEvaLvg); // Enthalpy of temperature setpoint hSet = Medium2.specificEnthalpy_pTX( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Chillers/Carnot_TEva.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Chillers/Carnot_TEva.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Chillers/Carnot_TEva.mo" 2022-03-10 09:57:31.644143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Chillers/Carnot_TEva.mo" 2022-03-10 09:58:48.340153036 +0000 @@ -29,7 +29,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/Buildings 3.0.0/Fluid/Chillers/Data/BaseClasses.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Chillers/Data/BaseClasses.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Chillers/Data/BaseClasses.mo" 2022-03-10 09:57:31.644143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Chillers/Data/BaseClasses.mo" 2022-03-10 09:58:48.320153034 +0000 @@ -4,7 +4,7 @@ record Chiller "Base classes for chiller models" extends Modelica.Icons.Record; - parameter Modelica.SIunits.HeatFlowRate QEva_flow_nominal(max=0) + parameter Modelica.Units.SI.HeatFlowRate QEva_flow_nominal(max=0) "Reference capacity (negative number)" annotation (Dialog(group="Nominal condition")); parameter Real COP_nominal "Reference coefficient of performance" @@ -17,13 +17,13 @@ parameter Real etaMotor(min=0, max=1) "Fraction of compressor motor heat entering refrigerant"; - parameter Modelica.SIunits.MassFlowRate mEva_flow_nominal + parameter Modelica.Units.SI.MassFlowRate mEva_flow_nominal "Nominal mass flow at evaporator" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.MassFlowRate mCon_flow_nominal + parameter Modelica.Units.SI.MassFlowRate mCon_flow_nominal "Nominal mass flow at condenser" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.Temperature TEvaLvg_nominal + parameter Modelica.Units.SI.Temperature TEvaLvg_nominal "Temperature of fluid leaving evaporator at nominal condition" annotation (Dialog(group="Nominal condition")); @@ -39,13 +39,13 @@ annotation (Dialog(group="Performance curves")); parameter Real EIRFunPLR[nEIRFunPLR] "Coefficients for EIRFunPLR" annotation (Dialog(group="Performance curves")); - parameter Modelica.SIunits.Temperature TEvaLvgMin + + parameter Modelica.Units.SI.Temperature TEvaLvgMin "Minimum value for leaving evaporator temperature" annotation (Dialog(group="Performance curves")); - parameter Modelica.SIunits.Temperature TEvaLvgMax + parameter Modelica.Units.SI.Temperature TEvaLvgMax "Maximum value for leaving evaporator temperature" annotation (Dialog(group="Performance curves")); - annotation (preferredView="info", Documentation(info=" This is the base record for chiller models. diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Chillers/Data/ElectricEIR.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Chillers/Data/ElectricEIR.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Chillers/Data/ElectricEIR.mo" 2022-03-10 09:57:31.644143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Chillers/Data/ElectricEIR.mo" 2022-03-10 09:58:48.304153033 +0000 @@ -1,38 +1,24 @@ within Buildings.Fluid.Chillers.Data; package ElectricEIR "Performance data for chiller ElectricEIR" extends Modelica.Icons.MaterialPropertiesPackage; - annotation(preferredView="info", - Documentation(info=" -
-Package with performance data for chillers. -
-", revisions=" -Generated on 12/19/2014 15:30 by mwetter")); - record Generic "Generic data record for chiller ElectricEIR" - extends Buildings.Fluid.Chillers.Data.BaseClasses.Chiller( - final nCapFunT=6, - final nEIRFunT=6, - final nEIRFunPLR=3); - parameter Modelica.SIunits.Temperature TConEnt_nominal - "Temperature of fluid entering condenser at nominal condition"; - - parameter Modelica.SIunits.Temperature TConEntMin - "Minimum value for entering condenser temperature" - annotation (Dialog(group="Performance curves")); - parameter Modelica.SIunits.Temperature TConEntMax - "Maximum value for entering condenser temperature" - annotation (Dialog(group="Performance curves")); -annotation( -defaultComponentName="datChi", -defaultComponentPrefixes="parameter", -Documentation(info=" + record Generic "Generic data record for chiller ElectricEIR" + extends Buildings.Fluid.Chillers.Data.BaseClasses.Chiller(final nCapFunT = 6, final nEIRFunT = 6, final nEIRFunPLR = 3); + parameter Modelica.Units.SI.Temperature TConEnt_nominal "Temperature of fluid entering condenser at nominal condition"; + parameter Modelica.Units.SI.Temperature TConEntMin "Minimum value for entering condenser temperature" annotation( + Dialog(group = "Performance curves")); + parameter Modelica.Units.SI.Temperature TConEntMax "Maximum value for entering condenser temperature" annotation( + Dialog(group = "Performance curves")); + annotation( + defaultComponentName = "datChi", + defaultComponentPrefixes = "parameter", + Documentation(info = "This record is used as a template for performance data for the chiller model Buildings.Fluid.Chillers.ElectricEIR.
-", revisions=" +", revisions = "+Package with performance data for chillers. +
+", revisions = " +Generated on 12/19/2014 15:30 by mwetter")); end ElectricEIR; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Chillers/Data/ElectricReformulatedEIR.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Chillers/Data/ElectricReformulatedEIR.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Chillers/Data/ElectricReformulatedEIR.mo" 2022-03-10 09:57:31.644143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Chillers/Data/ElectricReformulatedEIR.mo" 2022-03-10 09:58:47.588152941 +0000 @@ -1,40 +1,23 @@ within Buildings.Fluid.Chillers.Data; package ElectricReformulatedEIR "Performance data for chiller ElectricReformulatedEIR" extends Modelica.Icons.MaterialPropertiesPackage; - annotation(preferredView="info", - Documentation(info=" --Package with performance data for chillers. -
-", revisions=" --Generated on 12/19/2014 15:30 by mwetter -
-")); - record Generic "Generic data record for chiller ElectricReformulatedEIR" - extends Buildings.Fluid.Chillers.Data.BaseClasses.Chiller( - final nCapFunT=6, - final nEIRFunT=6, - final nEIRFunPLR=10); - parameter Modelica.SIunits.Temperature TConLvg_nominal - "Temperature of fluid leaving condenser at nominal condition"; - - parameter Modelica.SIunits.Temperature TConLvgMin - "Minimum value for leaving condenser temperature" - annotation (Dialog(group="Performance curves")); - Modelica.SIunits.Temperature TConLvgMax - "Maximum value for leaving condenser temperature" - annotation (Dialog(group="Performance curves")); -annotation( -defaultComponentName="datChi", -defaultComponentPrefixes="parameter", -Documentation(info=" + record Generic "Generic data record for chiller ElectricReformulatedEIR" + extends Buildings.Fluid.Chillers.Data.BaseClasses.Chiller(final nCapFunT = 6, final nEIRFunT = 6, final nEIRFunPLR = 10); + parameter Modelica.Units.SI.Temperature TConLvg_nominal "Temperature of fluid leaving condenser at nominal condition"; + parameter Modelica.Units.SI.Temperature TConLvgMin "Minimum value for leaving condenser temperature" annotation( + Dialog(group = "Performance curves")); + Modelica.Units.SI.Temperature TConLvgMax "Maximum value for leaving condenser temperature" annotation( + Dialog(group = "Performance curves")); + annotation( + defaultComponentName = "datChi", + defaultComponentPrefixes = "parameter", + Documentation(info = " This record is used as a template for performance data for the chiller model Buildings.Fluid.Chillers.ElectricReformulatedEIR. -", revisions=" +", revisions = "+Package with performance data for chillers. +
+", revisions = " ++Generated on 12/19/2014 15:30 by mwetter +
+")); end ElectricReformulatedEIR; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Chillers/ElectricEIR.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Chillers/ElectricEIR.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Chillers/ElectricEIR.mo" 2022-03-10 09:57:31.644143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Chillers/ElectricEIR.mo" 2022-03-10 09:58:46.684152826 +0000 @@ -17,12 +17,12 @@ Placement(transformation(extent={{40,80},{60,100}}))); protected - final parameter Modelica.SIunits.Conversions.NonSIunits.Temperature_degC + final parameter Modelica.Units.NonSI.Temperature_degC TConEnt_nominal_degC= - Modelica.SIunits.Conversions.to_degC(per.TConEnt_nominal) + Modelica.Units.Conversions.to_degC(per.TConEnt_nominal) "Temperature of fluid entering condenser at nominal condition"; - Modelica.SIunits.Conversions.NonSIunits.Temperature_degC TConEnt_degC + Modelica.Units.NonSI.Temperature_degC TConEnt_degC "Temperature of fluid entering condenser"; initial equation // Verify correctness of performance curves, and write warning if error is bigger than 10% @@ -32,7 +32,7 @@ "Capacity as function of temperature ", "per.capFunT"); equation - TConEnt_degC=Modelica.SIunits.Conversions.to_degC(TConEnt); + TConEnt_degC=Modelica.Units.Conversions.to_degC(TConEnt); if on then // Compute the chiller capacity fraction, using a biquadratic curve. diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Chillers/ElectricReformulatedEIR.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Chillers/ElectricReformulatedEIR.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Chillers/ElectricReformulatedEIR.mo" 2022-03-10 09:57:31.644143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Chillers/ElectricReformulatedEIR.mo" 2022-03-10 09:58:46.668152825 +0000 @@ -18,12 +18,12 @@ Placement(transformation(extent={{40,80},{60,100}}))); protected - final parameter Modelica.SIunits.Conversions.NonSIunits.Temperature_degC + final parameter Modelica.Units.NonSI.Temperature_degC TConLvg_nominal_degC= - Modelica.SIunits.Conversions.to_degC(per.TConLvg_nominal) + Modelica.Units.Conversions.to_degC(per.TConLvg_nominal) "Temperature of fluid leaving condenser at nominal condition"; - Modelica.SIunits.Conversions.NonSIunits.Temperature_degC TConLvg_degC + Modelica.Units.NonSI.Temperature_degC TConLvg_degC "Temperature of fluid leaving condenser"; initial equation // Verify correctness of performance curves, and write warning if error is bigger than 10% @@ -33,7 +33,7 @@ "Capacity as a function of temperature ", "per.capFunT"); equation - TConLvg_degC=Modelica.SIunits.Conversions.to_degC(TConLvg); + TConLvg_degC=Modelica.Units.Conversions.to_degC(TConLvg); if on then // Compute the chiller capacity fraction, using a biquadratic curve. diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Chillers/Examples/BaseClasses/PartialElectric.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Chillers/Examples/BaseClasses/PartialElectric.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Chillers/Examples/BaseClasses/PartialElectric.mo" 2022-03-10 09:57:31.644143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Chillers/Examples/BaseClasses/PartialElectric.mo" 2022-03-10 09:58:46.648152823 +0000 @@ -4,16 +4,16 @@ package Medium1 = Buildings.Media.Water "Medium model"; package Medium2 = Buildings.Media.Water "Medium model"; - parameter Modelica.SIunits.Power P_nominal + parameter Modelica.Units.SI.Power P_nominal "Nominal compressor power (at y=1)"; - 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.MassFlowRate mEva_flow_nominal + parameter Modelica.Units.SI.MassFlowRate mEva_flow_nominal "Nominal mass flow rate at evaporator"; - parameter Modelica.SIunits.MassFlowRate mCon_flow_nominal + parameter Modelica.Units.SI.MassFlowRate mCon_flow_nominal "Nominal mass flow rate at condenser"; Buildings.Fluid.Sources.MassFlowSource_T sou1( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Chillers/Examples/Carnot_TEva.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Chillers/Examples/Carnot_TEva.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Chillers/Examples/Carnot_TEva.mo" 2022-03-10 09:57:31.644143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Chillers/Examples/Carnot_TEva.mo" 2022-03-10 09:58:46.636152821 +0000 @@ -5,14 +5,14 @@ package Medium1 = Buildings.Media.Water "Medium model"; package Medium2 = Buildings.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/Buildings 3.0.0/Fluid/Chillers/Examples/Carnot_y.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Chillers/Examples/Carnot_y.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Chillers/Examples/Carnot_y.mo" 2022-03-10 09:57:31.644143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Chillers/Examples/Carnot_y.mo" 2022-03-10 09:58:46.624152820 +0000 @@ -4,18 +4,18 @@ package Medium1 = Buildings.Media.Water "Medium model"; package Medium2 = Buildings.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/Buildings 3.0.0/Fluid/Chillers/Validation/Carnot_TEva_reverseFlow.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Chillers/Validation/Carnot_TEva_reverseFlow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Chillers/Validation/Carnot_TEva_reverseFlow.mo" 2022-03-10 09:57:31.644143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Chillers/Validation/Carnot_TEva_reverseFlow.mo" 2022-03-10 09:58:46.532152807 +0000 @@ -5,17 +5,17 @@ package Medium1 = Buildings.Media.Water "Medium model"; package Medium2 = Buildings.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/Buildings 3.0.0/Fluid/Data/Fuels.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Data/Fuels.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Data/Fuels.mo" 2022-03-10 09:57:31.644143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Data/Fuels.mo" 2022-03-10 09:58:46.504152805 +0000 @@ -49,9 +49,9 @@ record Generic "Generic record of fuel properties" extends Modelica.Icons.Record; - parameter Modelica.SIunits.SpecificEnthalpy h + parameter Modelica.Units.SI.SpecificEnthalpy h "Heating value (lower or upper, depending on fuel)"; - parameter Modelica.SIunits.Density d "Mass density"; + parameter Modelica.Units.SI.Density d "Mass density"; parameter Real mCO2(final min=0) "CO2 emission at combustion, in kg/kg fuel"; annotation ( defaultComponentPrefixes="parameter", diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Data/Pipes.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Data/Pipes.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Data/Pipes.mo" 2022-03-10 09:57:31.644143320 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Data/Pipes.mo" 2022-03-10 09:58:46.496152802 +0000 @@ -138,12 +138,12 @@ record Generic "Generic record for pipes" extends Modelica.Icons.Record; - parameter Modelica.SIunits.Length dOut(min=0) "Outer diameter"; - parameter Modelica.SIunits.Length dIn(min=0) "Inner diameter"; - final parameter Modelica.SIunits.Length s(min=0) = (dOut-dIn)/2 "Wall thickness"; - parameter Modelica.SIunits.Length roughness(min=0) "Roughness"; - parameter Modelica.SIunits.Density d "Mass density"; - parameter Modelica.SIunits.ThermalConductivity k "Thermal conductivity"; + parameter Modelica.Units.SI.Length dOut(min=0) "Outer diameter"; + parameter Modelica.Units.SI.Length dIn(min=0) "Inner diameter"; + final parameter Modelica.Units.SI.Length s(min=0) = (dOut-dIn)/2 "Wall thickness"; + parameter Modelica.Units.SI.Length roughness(min=0) "Roughness"; + parameter Modelica.Units.SI.Density d "Mass density"; + parameter Modelica.Units.SI.ThermalConductivity k "Thermal conductivity"; annotation ( defaultComponentPrefixes="parameter", defaultComponentName="datPip", @@ -159,6 +159,7 @@diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/CoolingTowers/BaseClasses/CoolingTower.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/CoolingTowers/BaseClasses/CoolingTower.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/CoolingTowers/BaseClasses/CoolingTower.mo" 2022-03-10 09:57:31.648143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/CoolingTowers/BaseClasses/CoolingTower.mo" 2022-03-10 09:58:44.940152606 +0000 @@ -5,13 +5,13 @@ Modelica.Blocks.Interfaces.RealOutput TLvg "Leaving water temperature" annotation (Placement(transformation(extent={{100,-70},{120,-50}}))); - Modelica.SIunits.HeatFlowRate Q_flow = QWat_flow.y + Modelica.Units.SI.HeatFlowRate Q_flow = QWat_flow.y "Heat input into water circuit"; - Modelica.SIunits.TemperatureDifference TAppAct(min=0, nominal=1, displayUnit="K") + Modelica.Units.SI.TemperatureDifference TAppAct(min=0, nominal=1, displayUnit="K") "Actual approach temperature"; protected - Modelica.SIunits.Temperature TAirHT + Modelica.Units.SI.Temperature TAirHT "Air temperature that is used to compute the heat transfer with the water"; Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow preHea diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/CoolingTowers/Correlations/BaseClasses/Bounds.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/CoolingTowers/Correlations/BaseClasses/Bounds.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/CoolingTowers/Correlations/BaseClasses/Bounds.mo" 2022-03-10 09:57:31.648143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/CoolingTowers/Correlations/BaseClasses/Bounds.mo" 2022-03-10 09:58:44.924152605 +0000 @@ -1,14 +1,14 @@ within Buildings.Fluid.HeatExchangers.CoolingTowers.Correlations.BaseClasses; record Bounds "Coefficient data record for properties of cooling tower model" extends Modelica.Icons.Record; - Modelica.SIunits.Temperature TAirInWB_min + Modelica.Units.SI.Temperature TAirInWB_min "Minimum air inlet wet bulb temperature"; - Modelica.SIunits.Temperature TAirInWB_max + Modelica.Units.SI.Temperature TAirInWB_max "Maximum air inlet wet bulb temperature"; - Modelica.SIunits.Temperature TRan_min "Minimum range temperature"; - Modelica.SIunits.Temperature TRan_max "Minimum range temperature"; - Modelica.SIunits.Temperature TApp_min "Minimum approach temperature"; - Modelica.SIunits.Temperature TApp_max "Minimum approach temperature"; + Modelica.Units.SI.Temperature TRan_min "Minimum range temperature"; + Modelica.Units.SI.Temperature TRan_max "Minimum range temperature"; + Modelica.Units.SI.Temperature TApp_min "Minimum approach temperature"; + Modelica.Units.SI.Temperature TApp_max "Minimum approach temperature"; Real FRWat_min(final min=0, final max=1) "Minimum water flow ratio"; Real FRWat_max(final min=0) "Maximum water flow ratio"; Real liqGasRat_max(final min=0) "Maximum liquid to gas ratio"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/CoolingTowers/Correlations/Examples/YorkCalc.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/CoolingTowers/Correlations/Examples/YorkCalc.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/CoolingTowers/Correlations/Examples/YorkCalc.mo" 2022-03-10 09:57:31.648143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/CoolingTowers/Correlations/Examples/YorkCalc.mo" 2022-03-10 09:58:44.912152603 +0000 @@ -2,16 +2,16 @@ model YorkCalc "Example for yorkCalc correlation" extends Modelica.Icons.Example; - parameter Modelica.SIunits.TemperatureDifference TRan = 5.56 + + parameter Modelica.Units.SI.TemperatureDifference TRan = 5.56 "Range temperature (water in - water out)"; - parameter Modelica.SIunits.Temperature TAirInWB = 25.55 + 273.15 + parameter Modelica.Units.SI.Temperature TAirInWB = 25.55 + 273.15 "Inlet air wet bulb temperature"; - Modelica.SIunits.MassFraction x "Independent variable"; - Modelica.SIunits.TemperatureDifference TApp_Wat + Modelica.Units.SI.MassFraction x "Independent variable"; + Modelica.Units.SI.TemperatureDifference TApp_Wat "Approach temperature as a function of FRWat"; - Modelica.SIunits.TemperatureDifference TApp_Air + Modelica.Units.SI.TemperatureDifference TApp_Air "Approach temperature as a function of FRAir"; - equation x = 0.25+time; TApp_Wat=Buildings.Fluid.HeatExchangers.CoolingTowers.Correlations.yorkCalc(TRan=TRan, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/CoolingTowers/Correlations/yorkCalc.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/CoolingTowers/Correlations/yorkCalc.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/CoolingTowers/Correlations/yorkCalc.mo" 2022-03-10 09:57:31.648143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/CoolingTowers/Correlations/yorkCalc.mo" 2022-03-10 09:58:44.904152602 +0000 @@ -1,21 +1,21 @@ within Buildings.Fluid.HeatExchangers.CoolingTowers.Correlations; function yorkCalc "Cooling tower performance correlation for YorkCalc model" - input Modelica.SIunits.TemperatureDifference TRan + input Modelica.Units.SI.TemperatureDifference TRan "Range temperature (water in - water out)" annotation (Dialog(group="Nominal condition")); - input Modelica.SIunits.Temperature TWetBul "Air wet-bulb inlet temperature"; - input Modelica.SIunits.MassFraction FRWat + input Modelica.Units.SI.Temperature TWetBul "Air wet-bulb inlet temperature"; + input Modelica.Units.SI.MassFraction FRWat "Ratio actual over design water mass flow ratio"; - input Modelica.SIunits.MassFraction FRAir + input Modelica.Units.SI.MassFraction FRAir "Ratio actual over design air mass flow ratio"; - output Modelica.SIunits.TemperatureDifference TApp "Approach temperature"; + output Modelica.Units.SI.TemperatureDifference TApp "Approach temperature"; protected - Modelica.SIunits.Conversions.NonSIunits.Temperature_degC TWetBul_degC + Modelica.Units.NonSI.Temperature_degC TWetBul_degC "Air wet-bulb inlet temperature"; - Modelica.SIunits.MassFraction liqGasRat "Liquid to gas mass flow ratio"; + Modelica.Units.SI.MassFraction liqGasRat "Liquid to gas mass flow ratio"; constant Real c[:] = {-0.359741205, -0.055053608, 0.0023850432, 0.173926877, -0.0248473764, 0.00048430224, -0.005589849456, 0.0005770079712, -0.00001342427256, @@ -28,7 +28,7 @@ "Polynomial coefficients"; algorithm - TWetBul_degC :=Modelica.SIunits.Conversions.to_degC(TWetBul); + TWetBul_degC :=Modelica.Units.Conversions.to_degC(TWetBul); // smoothMax is added to the numerator and denominator so that // liqGasRat -> 1, as both FRWat -> 0 and FRAir -> 0 liqGasRat := Buildings.Utilities.Math.Functions.smoothMax(x1=1E-4, x2=FRWat, deltaX=1E-5)/ diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/CoolingTowers/Examples/BaseClasses/PartialStaticTwoPortCoolingTower.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/CoolingTowers/Examples/BaseClasses/PartialStaticTwoPortCoolingTower.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/CoolingTowers/Examples/BaseClasses/PartialStaticTwoPortCoolingTower.mo" 2022-03-10 09:57:31.648143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/CoolingTowers/Examples/BaseClasses/PartialStaticTwoPortCoolingTower.mo" 2022-03-10 09:58:44.888152599 +0000 @@ -4,7 +4,7 @@ package Medium_W = Buildings.Media.Water "Medium model for water"; - parameter Modelica.SIunits.MassFlowRate mWat_flow_nominal = 0.5 + parameter Modelica.Units.SI.MassFlowRate mWat_flow_nominal = 0.5 "Design water flow rate" annotation (Dialog(group="Nominal condition")); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/CoolingTowers/Examples/YorkCalc.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/CoolingTowers/Examples/YorkCalc.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/CoolingTowers/Examples/YorkCalc.mo" 2022-03-10 09:57:31.648143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/CoolingTowers/Examples/YorkCalc.mo" 2022-03-10 09:58:44.852152594 +0000 @@ -14,7 +14,7 @@ Ti=60, Td=10, reverseAction=true, - initType=Modelica.Blocks.Types.InitPID.InitialState) + initType=Modelica.Blocks.Types.Init.InitialState) "Controller for tower fan" annotation (Placement(transformation(extent={{-20,-20},{0,0}}))); equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/CoolingTowers/FixedApproach.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/CoolingTowers/FixedApproach.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/CoolingTowers/FixedApproach.mo" 2022-03-10 09:57:31.648143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/CoolingTowers/FixedApproach.mo" 2022-03-10 09:58:44.820152590 +0000 @@ -2,7 +2,7 @@ model FixedApproach "Cooling tower with constant approach temperature" extends Buildings.Fluid.HeatExchangers.CoolingTowers.BaseClasses.CoolingTower; - parameter Modelica.SIunits.TemperatureDifference TApp(min=0, displayUnit="K") = 2 + parameter Modelica.Units.SI.TemperatureDifference TApp(min=0, displayUnit="K") = 2 "Approach temperature difference"; Modelica.Blocks.Interfaces.RealInput TAir(min=0, unit="K") "Entering air dry or wet bulb temperature" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/CoolingTowers/YorkCalc.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/CoolingTowers/YorkCalc.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/CoolingTowers/YorkCalc.mo" 2022-03-10 09:57:31.648143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/CoolingTowers/YorkCalc.mo" 2022-03-10 09:58:44.816152591 +0000 @@ -5,18 +5,18 @@ import cha = Buildings.Fluid.HeatExchangers.CoolingTowers.BaseClasses.Characteristics; - parameter Modelica.SIunits.Temperature TAirInWB_nominal = 273.15+25.55 + parameter Modelica.Units.SI.Temperature TAirInWB_nominal = 273.15+25.55 "Design inlet air wet bulb temperature" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.TemperatureDifference TApp_nominal(displayUnit="K") = 3.89 + parameter Modelica.Units.SI.TemperatureDifference TApp_nominal(displayUnit="K") = 3.89 "Design approach temperature" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.TemperatureDifference TRan_nominal(displayUnit="K") = 5.56 + parameter Modelica.Units.SI.TemperatureDifference TRan_nominal(displayUnit="K") = 5.56 "Design range temperature (water in - water out)" annotation (Dialog(group="Nominal condition")); parameter Real fraPFan_nominal(unit="W/(kg/s)") = 275/0.15 "Fan power divived by water mass flow rate at design condition"; - parameter Modelica.SIunits.Power PFan_nominal = fraPFan_nominal*m_flow_nominal + parameter Modelica.Units.SI.Power PFan_nominal = fraPFan_nominal*m_flow_nominal "Fan power"; parameter cha.efficiencyParameters fanRelPow( @@ -41,38 +41,38 @@ annotation (Placement(transformation( extent={{-140,60},{-100,100}}))); - Modelica.SIunits.TemperatureDifference TRan(nominal=1, displayUnit="K") + Modelica.Units.SI.TemperatureDifference TRan(nominal=1, displayUnit="K") "Range temperature"; - Modelica.SIunits.MassFraction FRWat + Modelica.Units.SI.MassFraction FRWat "Ratio actual over design water mass flow ratio"; - Modelica.SIunits.MassFraction FRAir + Modelica.Units.SI.MassFraction FRAir "Ratio actual over design air mass flow ratio"; - Modelica.SIunits.Power PFan "Fan power"; + Modelica.Units.SI.Power PFan "Fan power"; protected package Water = Buildings.Media.Water "Medium package for water"; - parameter Modelica.SIunits.MassFraction FRWat0(min=0, start=1, fixed=false) + parameter Modelica.Units.SI.MassFraction FRWat0(min=0, start=1, fixed=false) "Ratio actual over design water mass flow ratio at nominal condition"; - parameter Modelica.SIunits.Temperature TWatIn0(fixed=false) + parameter Modelica.Units.SI.Temperature TWatIn0(fixed=false) "Water inlet temperature at nominal condition"; - parameter Modelica.SIunits.Temperature TWatOut_nominal(fixed=false) + parameter Modelica.Units.SI.Temperature TWatOut_nominal(fixed=false) "Water outlet temperature at nominal condition"; - parameter Modelica.SIunits.MassFlowRate mRef_flow(min=0, start=m_flow_nominal, fixed=false) + parameter Modelica.Units.SI.MassFlowRate mRef_flow(min=0, start=m_flow_nominal, fixed=false) "Reference water flow rate"; - Modelica.SIunits.TemperatureDifference dTMax(nominal=1, displayUnit="K") + Modelica.Units.SI.TemperatureDifference dTMax(nominal=1, displayUnit="K") "Maximum possible temperature difference"; - Modelica.SIunits.TemperatureDifference TAppCor(min=0, nominal=1, displayUnit="K") + Modelica.Units.SI.TemperatureDifference TAppCor(min=0, nominal=1, displayUnit="K") "Approach temperature for forced convection"; - Modelica.SIunits.TemperatureDifference TAppFreCon(min=0, nominal=1, displayUnit="K") + Modelica.Units.SI.TemperatureDifference TAppFreCon(min=0, nominal=1, displayUnit="K") "Approach temperature for free convection"; final parameter Real fanRelPowDer[size(fanRelPow.r_V,1)](each fixed=false) "Coefficients for fan relative power consumption as a function of control signal"; - Modelica.SIunits.Temperature T_a "Temperature in port_a"; - Modelica.SIunits.Temperature T_b "Temperature in port_b"; + Modelica.Units.SI.Temperature T_a "Temperature in port_a"; + Modelica.Units.SI.Temperature T_b "Temperature in port_b"; initial equation TWatOut_nominal = TAirInWB_nominal + TApp_nominal; TRan_nominal = TWatIn0 - TWatOut_nominal; // by definition of the range temp. diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/BaseClasses/ApparatusDewPoint.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/BaseClasses/ApparatusDewPoint.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/BaseClasses/ApparatusDewPoint.mo" 2022-03-10 09:57:31.648143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/BaseClasses/ApparatusDewPoint.mo" 2022-03-10 09:58:44.788152586 +0000 @@ -19,13 +19,13 @@ max=373.15) "Dry bulb temperature of air at apparatus dew point" annotation (Placement(transformation(extent={{100,-60},{120,-40}}))); protected - parameter Modelica.SIunits.Temperature TSatMin = 273.15+3 + + parameter Modelica.Units.SI.Temperature TSatMin = 273.15+3 "Minimum apparatus saturation temperature"; - parameter Modelica.SIunits.MassFraction XSatMin = 0.004667 + parameter Modelica.Units.SI.MassFraction XSatMin = 0.004667 "Mass fraction at saturation of coil inlet conditions"; - parameter Modelica.SIunits.SpecificEnthalpy hMin(fixed=false) + parameter Modelica.Units.SI.SpecificEnthalpy hMin(fixed=false) "Minimum enthalpy of apparatus dew point"; - initial equation /* XSatMin = Medium.Xsaturation( Medium.setState_pTX(p=p, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/BaseClasses/ApparatusDryPoint.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/BaseClasses/ApparatusDryPoint.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/BaseClasses/ApparatusDryPoint.mo" 2022-03-10 09:57:31.648143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/BaseClasses/ApparatusDryPoint.mo" 2022-03-10 09:58:44.776152585 +0000 @@ -9,14 +9,14 @@ min=253.15, max=373.15) "Dry bulb temperature of air at dry coil condition" annotation (Placement(transformation(extent={{100,-10},{120,10}}))); - output Modelica.SIunits.SpecificEnthalpy hDry + output Modelica.Units.SI.SpecificEnthalpy hDry "Enthalpy of air at coil surface"; protected - Modelica.SIunits.MassFraction XEvaInVec[Medium.nX] + Modelica.Units.SI.MassFraction XEvaInVec[Medium.nX] "Mass fraction of air inlet condition"; - Modelica.SIunits.Temperature TADP(start=283.15) + Modelica.Units.SI.Temperature TADP(start=283.15) "Apparatus dew point temperature"; - Modelica.SIunits.SpecificEnthalpy hMin + Modelica.Units.SI.SpecificEnthalpy hMin "Minimum enthalpy of apparatus dew point"; equation XEvaInVec =cat(1,{XEvaIn},{1-sum({XEvaIn})}); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/BaseClasses/CoolingCapacity.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/BaseClasses/CoolingCapacity.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/BaseClasses/CoolingCapacity.mo" 2022-03-10 09:57:31.648143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/BaseClasses/CoolingCapacity.mo" 2022-03-10 09:58:44.756152582 +0000 @@ -25,7 +25,7 @@ parameter Integer nSta(min=1) "Number of coil stages (not counting the off stage)" annotation(Evaluate=true); - parameter Modelica.SIunits.MassFlowRate m_flow_small + parameter Modelica.Units.SI.MassFlowRate m_flow_small "Small mass flow rate for regularization"; parameter Buildings.Fluid.HeatExchangers.DXCoils.Data.Generic.BaseClasses.Stage sta[nSta] @@ -60,13 +60,7 @@ initial algorithm // Verify correctness of performance curves, and write warning if error is bigger than 10% for iSta in 1:nSta loop - Buildings.Fluid.HeatExchangers.DXCoils.BaseClasses.Functions.warnIfPerformanceOutOfBounds( - Buildings.Utilities.Math.Functions.biquadratic( - a=sta[iSta].perCur.capFunT, - x1=Modelica.SIunits.Conversions.to_degC(sta[iSta].nomVal.TEvaIn_nominal), - x2=Modelica.SIunits.Conversions.to_degC(sta[iSta].nomVal.TConIn_nominal)), - msg="Capacity as a function of temperature ", - curveName="sta[" + String(iSta) + "].perCur.capFunT"); + Buildings.Fluid.HeatExchangers.DXCoils.BaseClasses.Functions.warnIfPerformanceOutOfBounds(Buildings.Utilities.Math.Functions.biquadratic(a = sta[iSta].perCur.capFunT, x1 = Modelica.Units.Conversions.to_degC(sta[iSta].nomVal.TEvaIn_nominal), x2 = Modelica.Units.Conversions.to_degC(sta[iSta].nomVal.TConIn_nominal)), msg = "Capacity as a function of temperature ", curveName = "sta[" + String(iSta) + "].perCur.capFunT"); Buildings.Fluid.HeatExchangers.DXCoils.BaseClasses.Functions.warnIfPerformanceOutOfBounds( Buildings.Fluid.Utilities.extendedPolynomial( @@ -76,14 +70,7 @@ xMax=sta[iSta].perCur.ffMin), msg="Capacity as a function of normalized mass flow rate ", curveName="sta[" + String(iSta) + "].perCur.capFunFF"); - - Buildings.Fluid.HeatExchangers.DXCoils.BaseClasses.Functions.warnIfPerformanceOutOfBounds( - Buildings.Utilities.Math.Functions.biquadratic( - a=sta[iSta].perCur.EIRFunT, - x1=Modelica.SIunits.Conversions.to_degC(sta[iSta].nomVal.TEvaIn_nominal), - x2=Modelica.SIunits.Conversions.to_degC(sta[iSta].nomVal.TConIn_nominal)), - msg="EIR as a function of temperature ", - curveName="sta[" + String(iSta) + "].perCur.EIRFunT"); + Buildings.Fluid.HeatExchangers.DXCoils.BaseClasses.Functions.warnIfPerformanceOutOfBounds(Buildings.Utilities.Math.Functions.biquadratic(a = sta[iSta].perCur.EIRFunT, x1 = Modelica.Units.Conversions.to_degC(sta[iSta].nomVal.TEvaIn_nominal), x2 = Modelica.Units.Conversions.to_degC(sta[iSta].nomVal.TConIn_nominal)), msg = "EIR as a function of temperature ", curveName = "sta[" + String(iSta) + "].perCur.EIRFunT"); Buildings.Fluid.HeatExchangers.DXCoils.BaseClasses.Functions.warnIfPerformanceOutOfBounds( Buildings.Fluid.Utilities.extendedPolynomial( @@ -100,98 +87,61 @@ end for; equation - // Modelica requires to evaluate the when() block for each element in iSta=1...nSta. - // But we only want to check the stage that is currently running. - // Hence, the test starts with stage == iSta. - for iSta in 1:nSta loop - // Check whether data are outside of bounds - when ( stage == iSta and pre(checkBoundsTEva[stage])) then - assert( not (TEvaIn > sta[stage].perCur.TEvaInMax or TEvaIn < sta[stage].perCur.TEvaInMin), - "*** Warning: Evaporator temperature TEvaIn is out of bounds in DX coil model at time = " + String(time) + ". +// Modelica requires to evaluate the when() block for each element in iSta=1...nSta. +// But we only want to check the stage that is currently running. +// Hence, the test starts with stage == iSta. + for iSta in 1:nSta loop +// Check whether data are outside of bounds + when stage == iSta and pre(checkBoundsTEva[stage]) then + assert(not (TEvaIn > sta[stage].perCur.TEvaInMax or TEvaIn < sta[stage].perCur.TEvaInMin), "*** Warning: Evaporator temperature TEvaIn is out of bounds in DX coil model at time = " + String(time) + ". stage = " + String(iSta) + " - TEvaInMin = " + String(sta[iSta].perCur.TEvaInMin) + " Kelvin (" + - String(Modelica.SIunits.Conversions.to_degC(sta[iSta].perCur.TEvaInMin)) + " degC) - TEvaIn = " + String(TEvaIn) + " Kelvin (" + String(Modelica.SIunits.Conversions.to_degC(TEvaIn)) + " degC) - TEvaInMax = " + String(sta[iSta].perCur.TEvaInMax) + " Kelvin (" + - String(Modelica.SIunits.Conversions.to_degC(sta[iSta].perCur.TEvaInMax)) + " degC) + TEvaInMin = " + String(sta[iSta].perCur.TEvaInMin) + " Kelvin (" + String(Modelica.Units.Conversions.to_degC(sta[iSta].perCur.TEvaInMin)) + " degC) + TEvaIn = " + String(TEvaIn) + " Kelvin (" + String(Modelica.Units.Conversions.to_degC(TEvaIn)) + " degC) + TEvaInMax = " + String(sta[iSta].perCur.TEvaInMax) + " Kelvin (" + String(Modelica.Units.Conversions.to_degC(sta[iSta].perCur.TEvaInMax)) + " degC) Extrapolation can introduce large errors. - This warning will only be reported once for each stage.", - level= AssertionLevel.warning); - checkBoundsTEva[iSta] = false; - end when; - when ( stage == iSta and pre(checkBoundsTCon[stage])) then - assert( not ( TConIn > sta[stage].perCur.TConInMax or TConIn < sta[stage].perCur.TConInMin), - "*** Warning: Condenser temperature TConIn is out of bounds in DX coil model at time = " + String(time) + ". + This warning will only be reported once for each stage.", level = AssertionLevel.warning); + checkBoundsTEva[iSta] = false; + end when; + when stage == iSta and pre(checkBoundsTCon[stage]) then + assert(not (TConIn > sta[stage].perCur.TConInMax or TConIn < sta[stage].perCur.TConInMin), "*** Warning: Condenser temperature TConIn is out of bounds in DX coil model at time = " + String(time) + ". stage = " + String(iSta) + " - TConInMin = " + String(sta[iSta].perCur.TConInMin) + " Kelvin (" + - String(Modelica.SIunits.Conversions.to_degC(sta[iSta].perCur.TConInMin)) + " degC) - TConIn = " + String(TConIn) + " Kelvin (" + String(Modelica.SIunits.Conversions.to_degC(TConIn)) + " degC) - TConInMax = " + String(sta[iSta].perCur.TConInMax) + " Kelvin (" + - String(Modelica.SIunits.Conversions.to_degC(sta[iSta].perCur.TConInMax)) + " degC) + TConInMin = " + String(sta[iSta].perCur.TConInMin) + " Kelvin (" + String(Modelica.Units.Conversions.to_degC(sta[iSta].perCur.TConInMin)) + " degC) + TConIn = " + String(TConIn) + " Kelvin (" + String(Modelica.Units.Conversions.to_degC(TConIn)) + " degC) + TConInMax = " + String(sta[iSta].perCur.TConInMax) + " Kelvin (" + String(Modelica.Units.Conversions.to_degC(sta[iSta].perCur.TConInMax)) + " degC) Extrapolation can introduce large errors. - This warning will only be reported once for each stage.", - level= AssertionLevel.warning); - checkBoundsTCon[iSta] = false; - end when; - end for; - -if stage > 0 then + This warning will only be reported once for each stage.", level = AssertionLevel.warning); + checkBoundsTCon[iSta] = false; + end when; + end for; + if stage > 0 then for iSta in 1:nSta loop - - // Compute performance - ff[iSta]=Buildings.Utilities.Math.Functions.smoothMax( - x1=m_flow, - x2=m_flow_small, - deltaX=m_flow_small/10)/sta[iSta].nomVal.m_flow_nominal; - //-------------------------Cooling capacity modifiers----------------------------// - // Compute the DX coil capacity fractions, using a biquadratic curve. - // Since the regression for capacity can have negative values - // (for unreasonable temperatures), we constrain its return value to be - // non-negative. - cap_T[iSta] =Buildings.Utilities.Math.Functions.smoothMax( - x1=Buildings.Utilities.Math.Functions.biquadratic( - a=sta[iSta].perCur.capFunT, - x1=Modelica.SIunits.Conversions.to_degC(TEvaIn), - x2=Modelica.SIunits.Conversions.to_degC(TConIn)), - x2=0.001, - deltaX=0.0001) - "Cooling capacity modification factor as function of temperature"; - cap_FF[iSta] = Buildings.Fluid.Utilities.extendedPolynomial( - x=ff[iSta], - c=sta[iSta].perCur.capFunFF, - xMin=sta[iSta].perCur.ffMin, - xMax=sta[iSta].perCur.ffMin); - //-----------------------Energy Input Ratio modifiers--------------------------// - EIR_T[iSta] =Buildings.Utilities.Math.Functions.smoothMax( - x1=Buildings.Utilities.Math.Functions.biquadratic( - a=sta[iSta].perCur.EIRFunT, - x1=Modelica.SIunits.Conversions.to_degC(TEvaIn), - x2=Modelica.SIunits.Conversions.to_degC(TConIn)), - x2=0.001, - deltaX=0.0001); - EIR_FF[iSta] = Buildings.Fluid.Utilities.extendedPolynomial( - x=ff[iSta], - c=sta[iSta].perCur.EIRFunFF, - xMin=sta[iSta].perCur.ffMin, - xMax=sta[iSta].perCur.ffMin) - "Cooling capacity modification factor as function of flow fraction"; - //------------ Correction factor for flow rate outside of validity of data ---// - corFac[iSta] =Buildings.Utilities.Math.Functions.smoothHeaviside( - x=ff[iSta] - sta[iSta].perCur.ffMin/4, - delta=sta[iSta].perCur.ffMin/4); - - Q_flow[iSta] = corFac[iSta]*cap_T[iSta]*cap_FF[iSta]*sta[iSta].nomVal.Q_flow_nominal; - EIR[iSta] = corFac[iSta]*EIR_T[iSta]*EIR_FF[iSta]/sta[iSta].nomVal.COP_nominal; +// Compute performance + ff[iSta] = Buildings.Utilities.Math.Functions.smoothMax(x1 = m_flow, x2 = m_flow_small, deltaX = m_flow_small / 10) / sta[iSta].nomVal.m_flow_nominal; +//-------------------------Cooling capacity modifiers----------------------------// +// Compute the DX coil capacity fractions, using a biquadratic curve. +// Since the regression for capacity can have negative values +// (for unreasonable temperatures), we constrain its return value to be +// non-negative. + cap_T[iSta] = Buildings.Utilities.Math.Functions.smoothMax(x1 = Buildings.Utilities.Math.Functions.biquadratic(a = sta[iSta].perCur.capFunT, x1 = Modelica.Units.Conversions.to_degC(TEvaIn), x2 = Modelica.Units.Conversions.to_degC(TConIn)), x2 = 0.001, deltaX = 0.0001) "Cooling capacity modification factor as function of temperature"; + cap_FF[iSta] = Buildings.Fluid.Utilities.extendedPolynomial(x = ff[iSta], c = sta[iSta].perCur.capFunFF, xMin = sta[iSta].perCur.ffMin, xMax = sta[iSta].perCur.ffMin); +//-----------------------Energy Input Ratio modifiers--------------------------// + EIR_T[iSta] = Buildings.Utilities.Math.Functions.smoothMax(x1 = Buildings.Utilities.Math.Functions.biquadratic(a = sta[iSta].perCur.EIRFunT, x1 = Modelica.Units.Conversions.to_degC(TEvaIn), x2 = Modelica.Units.Conversions.to_degC(TConIn)), x2 = 0.001, deltaX = 0.0001); + EIR_FF[iSta] = Buildings.Fluid.Utilities.extendedPolynomial(x = ff[iSta], c = sta[iSta].perCur.EIRFunFF, xMin = sta[iSta].perCur.ffMin, xMax = sta[iSta].perCur.ffMin) "Cooling capacity modification factor as function of flow fraction"; +//------------ Correction factor for flow rate outside of validity of data ---// + corFac[iSta] = Buildings.Utilities.Math.Functions.smoothHeaviside(x = ff[iSta] - sta[iSta].perCur.ffMin / 4, delta = sta[iSta].perCur.ffMin / 4); + Q_flow[iSta] = corFac[iSta] * cap_T[iSta] * cap_FF[iSta] * sta[iSta].nomVal.Q_flow_nominal; + EIR[iSta] = corFac[iSta] * EIR_T[iSta] * EIR_FF[iSta] / sta[iSta].nomVal.COP_nominal; end for; - else //cooling coil off - ff = fill(0, nSta); - cap_T = fill(0, nSta); - cap_FF = fill(0, nSta); - EIR_T = fill(0, nSta); - EIR_FF = fill(0, nSta); - corFac = fill(0, nSta); - Q_flow = fill(0, nSta); - EIR = fill(0, nSta); + else +//cooling coil off + ff = fill(0, nSta); + cap_T = fill(0, nSta); + cap_FF = fill(0, nSta); + EIR_T = fill(0, nSta); + EIR_FF = fill(0, nSta); + corFac = fill(0, nSta); + Q_flow = fill(0, nSta); + EIR = fill(0, nSta); end if; annotation ( defaultComponentName="cooCap", diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/BaseClasses/DryWetSelector.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/BaseClasses/DryWetSelector.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/BaseClasses/DryWetSelector.mo" 2022-03-10 09:57:31.648143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/BaseClasses/DryWetSelector.mo" 2022-03-10 09:58:44.708152577 +0000 @@ -1,7 +1,7 @@ within Buildings.Fluid.HeatExchangers.DXCoils.BaseClasses; block DryWetSelector "Selects results from dry or wet coil" - constant Modelica.SIunits.MassFraction deltaX=0.0001 + constant Modelica.Units.SI.MassFraction deltaX=0.0001 "Range of x where transition between dry and wet coil occurs"; Modelica.Blocks.Interfaces.RealInput XEvaIn "Inlet air mass fraction" annotation (Placement(transformation(extent={{-120,-50},{-100,-30}}))); @@ -84,7 +84,7 @@ output Real fraWet(min=0, max=1) "Fraction of results that are taken from the wet coil model"; protected - output Modelica.SIunits.MassFraction dX + output Modelica.Units.SI.MassFraction dX "Difference between apparatus dew point mass fraction of wet coil and inlet air mass fraction"; equation dX = XADP-XEvaIn; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/BaseClasses/Evaporation.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/BaseClasses/Evaporation.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/BaseClasses/Evaporation.mo" 2022-03-10 09:57:31.648143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/BaseClasses/Evaporation.mo" 2022-03-10 09:58:44.684152574 +0000 @@ -11,12 +11,12 @@ nomVal "Nominal values" annotation (Placement(transformation(extent={{60,60},{80,80}}))); - parameter Modelica.SIunits.MassFlowRate mAir_flow_small(min=0)= + parameter Modelica.Units.SI.MassFlowRate mAir_flow_small(min=0)= 0.1*abs(nomVal.m_flow_nominal) "Small mass flow rate for regularization of zero flow" annotation(Dialog(tab = "Advanced")); - final parameter Modelica.SIunits.Mass mMax(min=0, fixed=false) + final parameter Modelica.Units.SI.Mass mMax(min=0, fixed=false) "Maximum mass of water that can accumulate on the coil"; parameter Boolean computeReevaporation=true @@ -62,32 +62,32 @@ "Total moisture mass flow rate into the air stream" annotation (Placement(transformation(extent={{100,-10},{120,10}}))); - Modelica.SIunits.Mass m(nominal=-5000*1400/2257E3, start=0, fixed=true) + Modelica.Units.SI.Mass m(nominal=-5000*1400/2257E3, start=0, fixed=true) "Mass of water that accumulated on the coil"; - Modelica.SIunits.MassFlowRate mEva_flow(max=0) + Modelica.Units.SI.MassFlowRate mEva_flow(max=0) "Moisture mass flow rate that evaporates into air stream"; //////////////////////////////////////////////////////////////////////////////// // Protected parameters and variables protected - final parameter Modelica.SIunits.HeatFlowRate QSen_flow_nominal(max=0, fixed=false) + final parameter Modelica.Units.SI.HeatFlowRate QSen_flow_nominal(max=0, fixed=false) "Nominal sensible heat flow rate (negative number)"; - final parameter Modelica.SIunits.HeatFlowRate QLat_flow_nominal(max=0, fixed=false) + final parameter Modelica.Units.SI.HeatFlowRate QLat_flow_nominal(max=0, fixed=false) "Nominal latent heat flow rate (negative number)"; - final parameter Modelica.SIunits.MassFraction XEvaIn_nominal(fixed=false) + final parameter Modelica.Units.SI.MassFraction XEvaIn_nominal(fixed=false) "Mass fraction at nominal inlet conditions"; - final parameter Modelica.SIunits.MassFraction XEvaOut_nominal(fixed=false) + final parameter Modelica.Units.SI.MassFraction XEvaOut_nominal(fixed=false) "Mass fraction at nominal outlet conditions"; - final parameter Modelica.SIunits.Temperature TEvaOut_nominal(fixed=false) + final parameter Modelica.Units.SI.Temperature TEvaOut_nominal(fixed=false) "Dry bulb temperature at nominal outlet conditions"; - final parameter Modelica.SIunits.Temperature TEvaWetBulOut_nominal(fixed=false) + final parameter Modelica.Units.SI.Temperature TEvaWetBulOut_nominal(fixed=false) "Wet bulb temperature at nominal outlet conditions"; - final parameter Modelica.SIunits.MassFraction XEvaWetBulOut_nominal(fixed=false) + final parameter Modelica.Units.SI.MassFraction XEvaWetBulOut_nominal(fixed=false) "Water vapor mass fraction at nominal outlet wet bulb condition"; - final parameter Modelica.SIunits.MassFraction dX_nominal(max=0, fixed=false) + final parameter Modelica.Units.SI.MassFraction dX_nominal(max=0, fixed=false) "Driving potential for mass transfer"; - final parameter Modelica.SIunits.SpecificEnthalpy h_fg(fixed=false) + final parameter Modelica.Units.SI.SpecificEnthalpy h_fg(fixed=false) "Latent heat of vaporization"; final parameter Real gammaMax(min=0, fixed=false) "Maximum value for gamma"; final parameter Real logArg(min=0, fixed=false) @@ -97,21 +97,21 @@ final parameter Real K2(min=0, fixed=false) "Coefficient used for convective mass transfer"; - Modelica.SIunits.MassFraction XEvaWetBulOut + Modelica.Units.SI.MassFraction XEvaWetBulOut "Water vapor mass fraction at wet bulb conditions at air inlet"; // off = not on is required because Dymola 2013 fails during model // check if on, which is an input connector, is used in the edge() function Boolean off=not on "Signal, true when component is off"; - Modelica.SIunits.Temperature TEvaWetBulOut "Wet bulb temperature at coil"; - Modelica.SIunits.MassFraction dX + Modelica.Units.SI.Temperature TEvaWetBulOut "Wet bulb temperature at coil"; + Modelica.Units.SI.MassFraction dX "Difference in water vapor concentration that drives mass transfer"; - constant Modelica.SIunits.SpecificHeatCapacity cpAir_nominal= + constant Modelica.Units.SI.SpecificHeatCapacity cpAir_nominal= Buildings.Utilities.Psychrometrics.Constants.cpAir "Specific heat capacity of air"; - constant Modelica.SIunits.SpecificHeatCapacity cpSte_nominal= + constant Modelica.Units.SI.SpecificHeatCapacity cpSte_nominal= Buildings.Utilities.Psychrometrics.Constants.cpSte "Specific heat capacity of water vapor"; initial equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/BaseClasses/Examples/EvaporationFlowReversal.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/BaseClasses/Examples/EvaporationFlowReversal.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/BaseClasses/Examples/EvaporationFlowReversal.mo" 2022-03-10 09:57:31.648143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/BaseClasses/Examples/EvaporationFlowReversal.mo" 2022-03-10 09:58:44.540152555 +0000 @@ -13,13 +13,13 @@ m_flow_nominal=5000/1006/10) "Nominal values for DX coil" annotation (Placement(transformation(extent={{80,80},{100,100}}))); - parameter Modelica.SIunits.MassFraction XEvaIn_nominal= + parameter Modelica.Units.SI.MassFraction XEvaIn_nominal= Buildings.Utilities.Psychrometrics.Functions.X_pSatpphi( pSat=Medium.saturationPressure(nomVal.TEvaIn_nominal), p=nomVal.p_nominal, phi=nomVal.phiIn_nominal) "Mass fraction at nominal inlet conditions"; - parameter Modelica.SIunits.MassFraction XEvaOut_nominal = XEvaIn_nominal + + parameter Modelica.Units.SI.MassFraction XEvaOut_nominal = XEvaIn_nominal + (1-nomVal.SHR_nominal) * nomVal.Q_flow_nominal/nomVal.m_flow_nominal/Medium.enthalpyOfVaporization(293.15) "Nominal air outlet humidity"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/BaseClasses/Examples/EvaporationPulse.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/BaseClasses/Examples/EvaporationPulse.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/BaseClasses/Examples/EvaporationPulse.mo" 2022-03-10 09:57:31.648143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/BaseClasses/Examples/EvaporationPulse.mo" 2022-03-10 09:58:44.520152553 +0000 @@ -12,13 +12,13 @@ m_flow_nominal=5000/1006/10) "Nominal values for DX coil" annotation (Placement(transformation(extent={{80,80},{100,100}}))); - parameter Modelica.SIunits.MassFraction XEvaIn_nominal= + parameter Modelica.Units.SI.MassFraction XEvaIn_nominal= Buildings.Utilities.Psychrometrics.Functions.X_pSatpphi( pSat=Medium.saturationPressure(nomVal.TEvaIn_nominal), p=nomVal.p_nominal, phi=nomVal.phiIn_nominal) "Mass fraction at nominal inlet conditions"; - parameter Modelica.SIunits.MassFraction XEvaOut_nominal = XEvaIn_nominal + + parameter Modelica.Units.SI.MassFraction XEvaOut_nominal = XEvaIn_nominal + (1-nomVal.SHR_nominal) * nomVal.Q_flow_nominal/nomVal.m_flow_nominal/Medium.enthalpyOfVaporization(293.15) "Nominal air outlet humidity"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/BaseClasses/NominalCondition.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/BaseClasses/NominalCondition.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/BaseClasses/NominalCondition.mo" 2022-03-10 09:57:31.648143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/BaseClasses/NominalCondition.mo" 2022-03-10 09:58:44.380152536 +0000 @@ -10,29 +10,29 @@ per "Performance data" annotation (choicesAllMatching = true); - final parameter Modelica.SIunits.MassFraction XEvaIn_nominal= + final parameter Modelica.Units.SI.MassFraction XEvaIn_nominal= Buildings.Utilities.Psychrometrics.Functions.X_pSatpphi( pSat=Medium.saturationPressure(per.TEvaIn_nominal), p=per.p_nominal, phi=per.phiIn_nominal) "Rated/Nominal mass fraction of air entering coil"; - final parameter Modelica.SIunits.SpecificEnthalpy hEvaIn_nominal= + final parameter Modelica.Units.SI.SpecificEnthalpy hEvaIn_nominal= Medium.specificEnthalpy_pTX( p=per.p_nominal, T=per.TEvaIn_nominal, X=cat(1,{XEvaIn_nominal}, {1-sum({XEvaIn_nominal})})) "Rated enthalpy of air entering cooling coil"; - final parameter Modelica.SIunits.SpecificEnthalpy hOut_nominal= + final parameter Modelica.Units.SI.SpecificEnthalpy hOut_nominal= hEvaIn_nominal + per.Q_flow_nominal / per.m_flow_nominal "Rated enthalpy of air exiting cooling coil"; - final parameter Modelica.SIunits.Temperature TOut_nominal= + final parameter Modelica.Units.SI.Temperature TOut_nominal= per.TEvaIn_nominal + (per.SHR_nominal * per.Q_flow_nominal)/(per.m_flow_nominal * Cp_nominal) "Dry-bulb temperature of the air leaving the cooling coil at nominal condition"; - final parameter Modelica.SIunits.MassFraction XEvaOut_nominal(start=0.005, min=0, max=1.0)= + final parameter Modelica.Units.SI.MassFraction XEvaOut_nominal(start=0.005, min=0, max=1.0)= XEvaIn_nominal + (hOut_nominal- hEvaIn_nominal)*(1-per.SHR_nominal)/ Medium.enthalpyOfCondensingGas(T=per.TEvaIn_nominal) "Rated/Nominal mass fraction of air leaving the coil"; - parameter Modelica.SIunits.SpecificHeatCapacity Cp_nominal= + parameter Modelica.Units.SI.SpecificHeatCapacity Cp_nominal= Medium.specificHeatCapacityCp(Medium.setState_pTX( p=per.p_nominal, T=per.TEvaIn_nominal, X=cat(1,{XEvaIn_nominal}, {1-sum({XEvaIn_nominal})}))) "Specific heat of air at specified nominal condition" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/BaseClasses/PartialDXCoil.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/BaseClasses/PartialDXCoil.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/BaseClasses/PartialDXCoil.mo" 2022-03-10 09:57:31.648143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/BaseClasses/PartialDXCoil.mo" 2022-03-10 09:58:44.344152530 +0000 @@ -43,11 +43,11 @@ // Q_flow and EIR are set the zero. Hence, it is safe to assume // forward flow, which will avoid an event protected - Modelica.SIunits.SpecificEnthalpy hEvaIn= + Modelica.Units.SI.SpecificEnthalpy hEvaIn= inStream(port_a.h_outflow) "Enthalpy of air entering the cooling coil"; - Modelica.SIunits.Temperature TEvaIn = Medium.temperature_phX(p=port_a.p, h=hEvaIn, X=XEvaIn) + Modelica.Units.SI.Temperature TEvaIn = Medium.temperature_phX(p=port_a.p, h=hEvaIn, X=XEvaIn) "Dry bulb temperature of air entering the cooling coil"; - Modelica.SIunits.MassFraction XEvaIn[Medium.nXi] = inStream(port_a.Xi_outflow) + Modelica.Units.SI.MassFraction XEvaIn[Medium.nXi] = inStream(port_a.Xi_outflow) "Mass fraction/absolute humidity of air entering the cooling coil"; Modelica.Blocks.Sources.RealExpression p(final y=port_a.p) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/BaseClasses/PartialSurfaceCondition.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/BaseClasses/PartialSurfaceCondition.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/BaseClasses/PartialSurfaceCondition.mo" 2022-03-10 09:57:31.648143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/BaseClasses/PartialSurfaceCondition.mo" 2022-03-10 09:58:44.296152524 +0000 @@ -10,9 +10,9 @@ constant Boolean variableSpeedCoil "Flag, set to true to interpolate data"; - final parameter Modelica.SIunits.MassFlowRate m_flow_small = datCoi.m_flow_small + final parameter Modelica.Units.SI.MassFlowRate m_flow_small = datCoi.m_flow_small "Small mass flow rate for the evaporator, used for regularization"; - final parameter Modelica.SIunits.AngularVelocity maxSpe(displayUnit="1/min")= datCoi.sta[nSta].spe + final parameter Modelica.Units.SI.AngularVelocity maxSpe(displayUnit="1/min")= datCoi.sta[nSta].spe "Maximum rotational speed"; Modelica.Blocks.Interfaces.RealInput speRat "Speed index" annotation (Placement(transformation(extent={{-120,60},{-100,80}}))); @@ -39,7 +39,7 @@ start=0.25, min=0, max=1.0) "Bypass factor"; - output Modelica.SIunits.AngularVelocity spe(displayUnit="1/min") + output Modelica.Units.SI.AngularVelocity spe(displayUnit="1/min") "Rotational speed"; Buildings.Fluid.HeatExchangers.DXCoils.BaseClasses.UACp uacp[nSta]( @@ -48,9 +48,9 @@ annotation (Placement(transformation(extent={{-20,0},{0,20}}))); protected - output Modelica.SIunits.MassFlowRate m_flow_nonzero + output Modelica.Units.SI.MassFlowRate m_flow_nonzero "Evaporator air mass flow rate, bounded away from zero"; - output Modelica.SIunits.SpecificEnthalpy delta_h( + output Modelica.Units.SI.SpecificEnthalpy delta_h( start=40000, min=0.0) "Enthalpy required to be removed from the inlet air to attain apparatus dry point condition"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/BaseClasses/SensibleHeatRatio.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/BaseClasses/SensibleHeatRatio.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/BaseClasses/SensibleHeatRatio.mo" 2022-03-10 09:57:31.648143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/BaseClasses/SensibleHeatRatio.mo" 2022-03-10 09:58:44.284152522 +0000 @@ -31,10 +31,10 @@ annotation (Placement(transformation(extent={{100,-10},{120,10}}))); protected - Modelica.SIunits.SpecificEnthalpy h_TEvaIn_XADP + Modelica.Units.SI.SpecificEnthalpy h_TEvaIn_XADP "Enthalpy at inlet air temperature and humidity mass fraction at ADP"; Real entRat "Enthalpy ratio"; - parameter Modelica.SIunits.SpecificEnthalpy epsH = 100 + parameter Modelica.Units.SI.SpecificEnthalpy epsH = 100 "Small value for enthalpy to avoid division by zero"; algorithm //===================================Sensible heat ratio calculation===========================================// diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/BaseClasses/SpeedShift.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/BaseClasses/SpeedShift.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/BaseClasses/SpeedShift.mo" 2022-03-10 09:57:31.648143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/BaseClasses/SpeedShift.mo" 2022-03-10 09:58:44.268152521 +0000 @@ -1,7 +1,7 @@ within Buildings.Fluid.HeatExchangers.DXCoils.BaseClasses; block SpeedShift "Interpolates values between speeds" parameter Integer nSta "Number of standard compressor speeds"; - parameter Modelica.SIunits.AngularVelocity speSet[nSta](each displayUnit="1/min") + parameter Modelica.Units.SI.AngularVelocity speSet[nSta](each displayUnit="1/min") "Compressor speeds"; constant Boolean variableSpeedCoil "Flag, set to true to interpolate data"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/BaseClasses/UACp.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/BaseClasses/UACp.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/BaseClasses/UACp.mo" 2022-03-10 09:57:31.648143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/BaseClasses/UACp.mo" 2022-03-10 09:58:44.260152521 +0000 @@ -2,16 +2,16 @@ model UACp "Calculates UA/Cp of the coil" extends Buildings.Fluid.HeatExchangers.DXCoils.BaseClasses.NominalCondition; extends Modelica.Blocks.Icons.Block; - final parameter Modelica.SIunits.MassFraction XADP_nominal( + final parameter Modelica.Units.SI.MassFraction XADP_nominal( start=0.008, min=0, max=1.0, fixed=false) "Rated/Nominal mass fraction of air at coil apparatus dew point"; - final parameter Modelica.SIunits.Temperature TADP_nominal( + final parameter Modelica.Units.SI.Temperature TADP_nominal( start=273.15+10, fixed=false) "Coil apparatus dew point temperature"; - final parameter Modelica.SIunits.SpecificEnthalpy hADP_nominal( + final parameter Modelica.Units.SI.SpecificEnthalpy hADP_nominal( fixed=false) "Enthalpy of air at coil apparatus dew point (at rated condition)"; final parameter Real bypass_nominal( @@ -27,7 +27,7 @@ annotation(Evaluate=true, Dialog(tab="Advanced")); protected constant Real phiADP_nominal = 1.0 "Realtive humidity at ADP"; - final parameter Modelica.SIunits.AbsolutePressure psat_ADP_nominal( + final parameter Modelica.Units.SI.AbsolutePressure psat_ADP_nominal( start=1250, fixed=false) "Saturation pressure"; initial equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/Data/DoubleSpeed.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/Data/DoubleSpeed.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/Data/DoubleSpeed.mo" 2022-03-10 09:57:31.648143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/Data/DoubleSpeed.mo" 2022-03-10 09:58:44.232152516 +0000 @@ -1,31 +1,20 @@ within Buildings.Fluid.HeatExchangers.DXCoils.Data; package DoubleSpeed "Performance data for DoubleSpeed DXCoils" extends Modelica.Icons.MaterialPropertiesPackage; - annotation( - preferredView="info", - Documentation(info=" -
-Package with performance data for DX coils. -
-", - revisions=" --Generated on 12/19/2014 15:08 by tsnouidui. -
-")); + record Generic "Generic data record for DoubleSpeed DXCoils" - extends Buildings.Fluid.HeatExchangers.DXCoils.Data.Generic.DXCoil(final nSta=2); -annotation( -defaultComponentName="datCoi", -defaultComponentPrefixes="parameter", -Documentation(info=" + extends Buildings.Fluid.HeatExchangers.DXCoils.Data.Generic.DXCoil(final nSta = 2); + annotation( + defaultComponentName = "datCoi", + defaultComponentPrefixes = "parameter", + Documentation(info = "This record is used as a template for performance data for the double speed DX coils Buildings.Fluid.HeatExchangers.DXCoils.DoubleSpeed.
-", revisions=" +", revisions = "+Package with performance data for DX coils. +
+", revisions = " ++Generated on 12/19/2014 15:08 by tsnouidui. +
+")); end DoubleSpeed; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/Data/Generic/BaseClasses/NominalValues.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/Data/Generic/BaseClasses/NominalValues.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/Data/Generic/BaseClasses/NominalValues.mo" 2022-03-10 09:57:31.648143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/Data/Generic/BaseClasses/NominalValues.mo" 2022-03-10 09:58:44.196152513 +0000 @@ -3,32 +3,32 @@ extends Modelica.Icons.Record; //-----------------------------Nominal conditions-----------------------------// - parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal(max=0) + parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal(max=0) "Nominal cooling capacity (negative number)" annotation (Dialog(group="Nominal condition")); parameter Real COP_nominal "Nominal coefficient of performance" annotation (Dialog(group="Nominal condition")); parameter Real SHR_nominal "Nominal sensible heat ratio" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.MassFlowRate m_flow_nominal + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal "Nominal air mass flow rate" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.Temperature TEvaIn_nominal=273.15+19.4 + parameter Modelica.Units.SI.Temperature TEvaIn_nominal=273.15+19.4 "Evaporator entering air dry-bulb temperature at rating condition" annotation(Dialog(tab="General",group="Nominal condition")); - parameter Modelica.SIunits.Temperature TConIn_nominal=308.15 + parameter Modelica.Units.SI.Temperature TConIn_nominal=308.15 "Condenser entering air temperature at rating condition (wet bulb for evaporative cooled coils, dry bulb otherwise)" annotation(Dialog(tab="General",group="Nominal condition")); parameter Real phiIn_nominal=0.5 "Relative humidity of entering air at nominal condition" annotation(Dialog(tab="General",group="Nominal")); - parameter Modelica.SIunits.Pressure p_nominal=101325 "Atmospheric pressure" + parameter Modelica.Units.SI.Pressure p_nominal=101325 "Atmospheric pressure" annotation(Dialog(tab="General",group="Nominal condition")); - parameter Modelica.SIunits.Time tWet = 1400 + parameter Modelica.Units.SI.Time tWet = 1400 "Time until moisture drips from coil when a dry coil is switched on" annotation(Dialog(tab="General",group="Re-evaporation data")); parameter Real gamma(min=0) = 1.5 diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/Data/Generic/BaseClasses/PerformanceCurve.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/Data/Generic/BaseClasses/PerformanceCurve.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/Data/Generic/BaseClasses/PerformanceCurve.mo" 2022-03-10 09:57:31.648143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/Data/Generic/BaseClasses/PerformanceCurve.mo" 2022-03-10 09:58:44.188152510 +0000 @@ -15,16 +15,16 @@ "Polynomial coefficients for EIR function of flow fration" annotation (Dialog(group="Performance curves")); //------------------------Range for performance curves------------------------// - parameter Modelica.SIunits.Temperature TConInMin + parameter Modelica.Units.SI.Temperature TConInMin "Minimum condenser inlet temperature for cooling capacity function" annotation (Dialog(group="Minimum and maximum values")); - parameter Modelica.SIunits.Temperature TConInMax + parameter Modelica.Units.SI.Temperature TConInMax "Maximum condenser inlet temperature for cooling capacity function" annotation (Dialog(group="Minimum and maximum values")); - parameter Modelica.SIunits.Temperature TEvaInMin + parameter Modelica.Units.SI.Temperature TEvaInMin "Minimum evaporator inlet temperature for cooling capacity function" annotation (Dialog(group="Minimum and maximum values")); - parameter Modelica.SIunits.Temperature TEvaInMax + parameter Modelica.Units.SI.Temperature TEvaInMax "Maximum evaporator inlet temperature for cooling capacity function" annotation (Dialog(group="Minimum and maximum values")); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/Data/Generic/BaseClasses/Stage.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/Data/Generic/BaseClasses/Stage.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/Data/Generic/BaseClasses/Stage.mo" 2022-03-10 09:57:31.648143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/Data/Generic/BaseClasses/Stage.mo" 2022-03-10 09:58:44.180152510 +0000 @@ -2,7 +2,7 @@ record Stage "Generic data record for a stage of a DX coil" extends Modelica.Icons.Record; - parameter Modelica.SIunits.AngularVelocity spe(displayUnit="1/min") + parameter Modelica.Units.SI.AngularVelocity spe(displayUnit="1/min") "Rotational speed"; parameter Buildings.Fluid.HeatExchangers.DXCoils.Data.Generic.BaseClasses.NominalValues diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/Data/Generic/DXCoil.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/Data/Generic/DXCoil.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/Data/Generic/DXCoil.mo" 2022-03-10 09:57:31.648143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/Data/Generic/DXCoil.mo" 2022-03-10 09:58:44.124152502 +0000 @@ -14,9 +14,10 @@ parameter Buildings.Fluid.HeatExchangers.DXCoils.Data.Generic.BaseClasses.Stage sta[nSta] "Data record for coil performance at each stage"; - parameter Modelica.SIunits.MassFlowRate m_flow_small = 0.0001*sta[1].nomVal.m_flow_nominal + parameter Modelica.Units.SI.MassFlowRate m_flow_small = 0.0001*sta[1].nomVal.m_flow_nominal "Small mass flow rate for regularization near zero flow" annotation (Dialog(group="Minimum conditions")); + annotation (preferredView="info", defaultComponentName="datCoi", defaultComponentPrefixes="parameter", diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/Data/SingleSpeed.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/Data/SingleSpeed.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/Data/SingleSpeed.mo" 2022-03-10 09:57:31.648143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/Data/SingleSpeed.mo" 2022-03-10 09:58:44.116152502 +0000 @@ -1,31 +1,20 @@ within Buildings.Fluid.HeatExchangers.DXCoils.Data; package SingleSpeed "Performance data for SingleSpeed DXCoils" extends Modelica.Icons.MaterialPropertiesPackage; - annotation( - preferredView="info", - Documentation(info=" --Package with performance data for DX coils. -
-", - revisions=" --Generated on 12/19/2014 15:08 by tsnouidui. -
-")); + record Generic "Generic data record for SingleSpeed DXCoils" - extends Buildings.Fluid.HeatExchangers.DXCoils.Data.Generic.DXCoil(final nSta=1); -annotation( -defaultComponentName="datCoi", -defaultComponentPrefixes="parameter", -Documentation(info=" + extends Buildings.Fluid.HeatExchangers.DXCoils.Data.Generic.DXCoil(final nSta = 1); + annotation( + defaultComponentName = "datCoi", + defaultComponentPrefixes = "parameter", + Documentation(info = "This record is used as a template for performance data for SingleSpeed DXCoils Buildings.Fluid.HeatExchangers.DXCoils.SingleSpeed.
-", revisions=" +", revisions = "+Package with performance data for DX coils. +
+", revisions = " ++Generated on 12/19/2014 15:08 by tsnouidui. +
+")); end SingleSpeed; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/Examples/MultiStage.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/Examples/MultiStage.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/Examples/MultiStage.mo" 2022-03-10 09:57:31.652143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/Examples/MultiStage.mo" 2022-03-10 09:58:44.068152495 +0000 @@ -2,9 +2,9 @@ model MultiStage "Test model for multi stage DX coil" package Medium = Buildings.Media.Air; extends Modelica.Icons.Example; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = datCoi.sta[datCoi.nSta].nomVal.m_flow_nominal + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = datCoi.sta[datCoi.nSta].nomVal.m_flow_nominal "Nominal mass flow rate"; - parameter Modelica.SIunits.PressureDifference dp_nominal = 1000 + parameter Modelica.Units.SI.PressureDifference dp_nominal = 1000 "Pressure drop at m_flow_nominal"; Buildings.Fluid.Sources.Boundary_pT sin( redeclare package Medium = Medium, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/Examples/SingleSpeed.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/Examples/SingleSpeed.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/Examples/SingleSpeed.mo" 2022-03-10 09:57:31.652143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/Examples/SingleSpeed.mo" 2022-03-10 09:58:44.036152491 +0000 @@ -2,9 +2,9 @@ model SingleSpeed "Test model for single speed DX coil" package Medium = Buildings.Media.Air; extends Modelica.Icons.Example; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = datCoi.sta[datCoi.nSta].nomVal.m_flow_nominal + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = datCoi.sta[datCoi.nSta].nomVal.m_flow_nominal "Nominal mass flow rate"; - parameter Modelica.SIunits.PressureDifference dp_nominal = 1000 + parameter Modelica.Units.SI.PressureDifference dp_nominal = 1000 "Pressure drop at m_flow_nominal"; Buildings.Fluid.Sources.Boundary_pT sin( redeclare package Medium = Medium, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/Examples/SpaceCooling.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/Examples/SpaceCooling.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/Examples/SpaceCooling.mo" 2022-03-10 09:57:31.652143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/Examples/SpaceCooling.mo" 2022-03-10 09:58:44.024152490 +0000 @@ -4,36 +4,36 @@ replaceable package Medium = Buildings.Media.Air; - parameter Modelica.SIunits.Volume V=6*10*3 "Room volume"; + parameter Modelica.Units.SI.Volume V=6*10*3 "Room volume"; ////////////////////////////////////////////////////////// // Heat recovery effectiveness parameter Real eps = 0.8 "Heat recovery effectiveness"; ///////////////////////////////////////////////////////// // 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 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"; - 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= + parameter Modelica.Units.SI.HeatFlowRate QCoiC_flow_nominal= (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"; @@ -308,11 +308,11 @@ parameter Integer nPorts=0 "Number of ports" annotation(Evaluate=true, Dialog(connectorSizing=true, tab="General",group="Ports")); - final parameter Modelica.SIunits.Volume V=6*10*3 "Room volume"; - parameter Modelica.SIunits.HeatFlowRate QRooInt_flow + final parameter Modelica.Units.SI.Volume V=6*10*3 "Room volume"; + parameter Modelica.Units.SI.HeatFlowRate QRooInt_flow "Internal heat gains of the room"; - parameter Modelica.SIunits.MassFlowRate mA_flow_nominal + parameter Modelica.Units.SI.MassFlowRate mA_flow_nominal "Nominal air mass flow rate"; Modelica.Blocks.Interfaces.RealInput TOutDryBul diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/Examples/VariableSpeed.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/Examples/VariableSpeed.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/Examples/VariableSpeed.mo" 2022-03-10 09:57:31.652143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/Examples/VariableSpeed.mo" 2022-03-10 09:58:43.952152481 +0000 @@ -4,9 +4,9 @@ package Medium = Buildings.Media.Air "Medium model"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = datCoi.sta[datCoi.nSta].nomVal.m_flow_nominal + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = datCoi.sta[datCoi.nSta].nomVal.m_flow_nominal "Nominal mass flow rate"; - parameter Modelica.SIunits.PressureDifference dp_nominal = 1000 + parameter Modelica.Units.SI.PressureDifference dp_nominal = 1000 "Pressure drop at m_flow_nominal"; Buildings.Fluid.Sources.Boundary_pT sin( redeclare package Medium = Medium, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/Validation/SingleSpeedEnergyPlus.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/Validation/SingleSpeedEnergyPlus.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/Validation/SingleSpeedEnergyPlus.mo" 2022-03-10 09:57:31.652143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/Validation/SingleSpeedEnergyPlus.mo" 2022-03-10 09:58:43.888152473 +0000 @@ -5,11 +5,11 @@ package Medium = Buildings.Media.Air "Medium model"; - parameter Modelica.SIunits.Power Q_flow_nominal = datCoi.sta[1].nomVal.Q_flow_nominal + parameter Modelica.Units.SI.Power Q_flow_nominal = datCoi.sta[1].nomVal.Q_flow_nominal "Nominal power"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = datCoi.sta[1].nomVal.m_flow_nominal + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = datCoi.sta[1].nomVal.m_flow_nominal "Nominal mass flow rate"; - parameter Modelica.SIunits.PressureDifference dp_nominal = 1141 + parameter Modelica.Units.SI.PressureDifference dp_nominal = 1141 "Pressure drop at m_flow_nominal"; Buildings.Fluid.Sources.Boundary_pT sin( redeclare package Medium = Medium, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/Validation/SingleSpeedPLREnergyPlus.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/Validation/SingleSpeedPLREnergyPlus.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/Validation/SingleSpeedPLREnergyPlus.mo" 2022-03-10 09:57:31.652143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DXCoils/Validation/SingleSpeedPLREnergyPlus.mo" 2022-03-10 09:58:43.840152466 +0000 @@ -5,11 +5,11 @@ package Medium = Buildings.Media.Air "Medium model"; - parameter Modelica.SIunits.Power Q_flow_nominal = datCoi.sta[1].nomVal.Q_flow_nominal + parameter Modelica.Units.SI.Power Q_flow_nominal = datCoi.sta[1].nomVal.Q_flow_nominal "Nominal power"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = datCoi.sta[1].nomVal.m_flow_nominal + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = datCoi.sta[1].nomVal.m_flow_nominal "Nominal mass flow rate"; - parameter Modelica.SIunits.PressureDifference dp_nominal = 1141 + parameter Modelica.Units.SI.PressureDifference dp_nominal = 1141 "Pressure drop at m_flow_nominal"; Buildings.Fluid.Sources.Boundary_pT sin( redeclare package Medium = Medium, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DryCoilCounterFlow.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DryCoilCounterFlow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DryCoilCounterFlow.mo" 2022-03-10 09:57:31.652143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DryCoilCounterFlow.mo" 2022-03-10 09:58:43.768152458 +0000 @@ -8,7 +8,7 @@ from_dp1=false, from_dp2=false); - parameter Modelica.SIunits.ThermalConductance UA_nominal(min=0) + parameter Modelica.Units.SI.ThermalConductance UA_nominal(min=0) "Thermal conductance at nominal flow, used to compute heat capacity" annotation (Dialog(tab="General", group="Nominal condition")); parameter Real r_nominal=2/3 @@ -22,15 +22,15 @@ "Formulation of energy balance" annotation(Evaluate=true, Dialog(tab = "Dynamics", group="Equations")); - parameter Modelica.SIunits.Time tau1=20 + parameter Modelica.Units.SI.Time tau1=20 "Time constant at nominal flow for medium 1" annotation (Dialog(group="Nominal condition", enable=not (energyDynamics==Modelica.Fluid.Types.Dynamics.SteadyState))); - parameter Modelica.SIunits.Time tau2=1 + parameter Modelica.Units.SI.Time tau2=1 "Time constant at nominal flow for medium 2" annotation (Dialog(group="Nominal condition", enable=not (energyDynamics==Modelica.Fluid.Types.Dynamics.SteadyState))); - parameter Modelica.SIunits.Time tau_m=20 + parameter Modelica.Units.SI.Time tau_m=20 "Time constant of metal at nominal UA value" annotation (Dialog(group="Nominal condition")); @@ -47,14 +47,14 @@ "Set to false to make air-side hA independent of temperature" annotation (Dialog(tab="Heat transfer")); - Modelica.SIunits.HeatFlowRate Q1_flow = sum(ele[i].Q1_flow for i in 1:nEle) + Modelica.Units.SI.HeatFlowRate Q1_flow = sum(ele[i].Q1_flow for i in 1:nEle) "Heat transferred from solid into medium 1"; - Modelica.SIunits.HeatFlowRate Q2_flow = sum(ele[i].Q2_flow for i in 1:nEle) + Modelica.Units.SI.HeatFlowRate Q2_flow = sum(ele[i].Q2_flow for i in 1:nEle) "Heat transferred from solid into medium 2"; - Modelica.SIunits.Temperature T1[nEle] = ele[:].vol1.T "Water temperature"; - Modelica.SIunits.Temperature T2[nEle] = ele[:].vol2.T "Air temperature"; - Modelica.SIunits.Temperature T_m[nEle] = ele[:].con1.solid.T + Modelica.Units.SI.Temperature T1[nEle] = ele[:].vol1.T "Water temperature"; + Modelica.Units.SI.Temperature T2[nEle] = ele[:].vol2.T "Air temperature"; + Modelica.Units.SI.Temperature T_m[nEle] = ele[:].con1.solid.T "Metal temperature"; BaseClasses.HADryCoil hA( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DryCoilDiscretized.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DryCoilDiscretized.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DryCoilDiscretized.mo" 2022-03-10 09:57:31.652143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DryCoilDiscretized.mo" 2022-03-10 09:58:43.744152454 +0000 @@ -19,7 +19,7 @@ "Set to false to make air-side hA independent of temperature" annotation(Dialog(tab="Heat transfer")); - parameter Modelica.SIunits.ThermalConductance UA_nominal(min=0) + parameter Modelica.Units.SI.ThermalConductance UA_nominal(min=0) "Thermal conductance at nominal flow, used to compute heat capacity" annotation(Dialog(tab="General", group="Nominal condition")); parameter Integer nReg(min=2)=2 "Number of registers" @@ -47,7 +47,7 @@ "Formulation of energy balance" annotation(Evaluate=true, Dialog(tab = "Dynamics", group="Equations")); - parameter Modelica.SIunits.Length dh1=0.025 + parameter Modelica.Units.SI.Length dh1=0.025 "Hydraulic diameter for a single pipe" annotation(Dialog(group = "Geometry", enable = use_dh1 and not linearizeFlowResistance1)); @@ -57,15 +57,15 @@ parameter Real ReC_2=4000 "Reynolds number where transition to turbulent starts inside ducts" annotation(Dialog(enable = use_dh2 and not linearized2, tab="Advanced")); - parameter Modelica.SIunits.Length dh2=1 "Hydraulic diameter for duct" + parameter Modelica.Units.SI.Length dh2=1 "Hydraulic diameter for duct" annotation(Dialog(group = "Geometry")); - parameter Modelica.SIunits.Time tau1=20 + parameter Modelica.Units.SI.Time tau1=20 "Time constant at nominal flow for medium 1" annotation (Dialog(group="Nominal condition", enable=not steadyState_1)); - parameter Modelica.SIunits.Time tau2=1 + parameter Modelica.Units.SI.Time tau2=1 "Time constant at nominal flow for medium 2" annotation (Dialog(group="Nominal condition", enable=not steadyState_2)); - parameter Modelica.SIunits.Time tau_m=20 + parameter Modelica.Units.SI.Time tau_m=20 "Time constant of metal at nominal UA value" annotation (Dialog(group="Nominal condition")); parameter Boolean waterSideFlowDependent = false @@ -77,16 +77,16 @@ parameter Boolean waterSideTemperatureDependent = false "Set to false to make water-side hA independent of temperature" annotation(Dialog(tab="Heat transfer")); - parameter Modelica.SIunits.MassFlowRate mStart_flow_a1=m1_flow_nominal + parameter Modelica.Units.SI.MassFlowRate mStart_flow_a1=m1_flow_nominal "Guess value for mass flow rate at port_a1" annotation(Dialog(tab="General", group="Initialization")); - parameter Modelica.SIunits.MassFlowRate mStart_flow_a2=m2_flow_nominal + parameter Modelica.Units.SI.MassFlowRate mStart_flow_a2=m2_flow_nominal "Guess value for mass flow rate at port_a2" annotation(Dialog(tab="General", group="Initialization")); - Modelica.SIunits.HeatFlowRate Q1_flow + Modelica.Units.SI.HeatFlowRate Q1_flow "Heat transferred from solid into medium 1"; - Modelica.SIunits.HeatFlowRate Q2_flow + Modelica.Units.SI.HeatFlowRate Q2_flow "Heat transferred from solid into medium 2"; Buildings.Fluid.HeatExchangers.BaseClasses.CoilRegister hexReg[nReg]( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DryEffectivenessNTU.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DryEffectivenessNTU.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DryEffectivenessNTU.mo" 2022-03-10 09:57:31.652143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/DryEffectivenessNTU.mo" 2022-03-10 09:58:43.704152450 +0000 @@ -9,12 +9,12 @@ mWat2_flow = 0); import con = Buildings.Fluid.Types.HeatExchangerConfiguration; import flo = Buildings.Fluid.Types.HeatExchangerFlowRegime; - parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal + parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal "Nominal heat transfer" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.Temperature T_a1_nominal + parameter Modelica.Units.SI.Temperature T_a1_nominal "Nominal temperature at port a1" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.Temperature T_a2_nominal + parameter Modelica.Units.SI.Temperature T_a2_nominal "Nominal temperature at port a2" annotation (Dialog(group="Nominal condition")); parameter con configuration "Heat exchanger configuration" @@ -31,14 +31,14 @@ waterSideTemperatureDependent=false, airSideTemperatureDependent=false) "Model for convective heat transfer coefficient"; - Modelica.SIunits.ThermalConductance UA "UA value"; + Modelica.Units.SI.ThermalConductance UA "UA value"; Real eps(min=0, max=1) "Heat exchanger effectiveness"; Real Z(min=0) "Ratio of capacity flow rate (CMin/CMax)"; // NTU has been removed as NTU goes to infinity as CMin goes to zero. // This quantity is not good for modeling. // Real NTU(min=0) "Number of transfer units"; - final parameter Modelica.SIunits.ThermalConductance UA_nominal(fixed=false) + final parameter Modelica.Units.SI.ThermalConductance UA_nominal(fixed=false) "Nominal UA value"; final parameter Real NTU_nominal(min=0, fixed=false) "Nominal number of transfer units"; @@ -54,25 +54,25 @@ p=Medium2.p_default, X=Medium2.X_default[1:Medium2.nXi]) "Default state for medium 2"; - parameter Modelica.SIunits.SpecificHeatCapacity cp1_nominal(fixed=false) + parameter Modelica.Units.SI.SpecificHeatCapacity cp1_nominal(fixed=false) "Specific heat capacity of medium 1 at nominal condition"; - parameter Modelica.SIunits.SpecificHeatCapacity cp2_nominal(fixed=false) + parameter Modelica.Units.SI.SpecificHeatCapacity cp2_nominal(fixed=false) "Specific heat capacity of medium 2 at nominal condition"; - parameter Modelica.SIunits.ThermalConductance C1_flow_nominal(fixed=false) + parameter Modelica.Units.SI.ThermalConductance C1_flow_nominal(fixed=false) "Nominal capacity flow rate of Medium 1"; - parameter Modelica.SIunits.ThermalConductance C2_flow_nominal(fixed=false) + parameter Modelica.Units.SI.ThermalConductance C2_flow_nominal(fixed=false) "Nominal capacity flow rate of Medium 2"; - parameter Modelica.SIunits.ThermalConductance CMin_flow_nominal(fixed=false) + parameter Modelica.Units.SI.ThermalConductance CMin_flow_nominal(fixed=false) "Minimal capacity flow rate at nominal condition"; - parameter Modelica.SIunits.ThermalConductance CMax_flow_nominal(fixed=false) + parameter Modelica.Units.SI.ThermalConductance CMax_flow_nominal(fixed=false) "Maximum capacity flow rate at nominal condition"; parameter Real Z_nominal( min=0, max=1, fixed=false) "Ratio of capacity flow rate at nominal condition"; - parameter Modelica.SIunits.Temperature T_b1_nominal(fixed=false) + parameter Modelica.Units.SI.Temperature T_b1_nominal(fixed=false) "Nominal temperature at port b1"; - parameter Modelica.SIunits.Temperature T_b2_nominal(fixed=false) + parameter Modelica.Units.SI.Temperature T_b2_nominal(fixed=false) "Nominal temperature at port b2"; parameter flo flowRegime_nominal(fixed=false) "Heat exchanger flow regime at nominal flow rates"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/Examples/BaseClasses/EffectivenessNTUMassFlow.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/Examples/BaseClasses/EffectivenessNTUMassFlow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/Examples/BaseClasses/EffectivenessNTUMassFlow.mo" 2022-03-10 09:57:31.652143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/Examples/BaseClasses/EffectivenessNTUMassFlow.mo" 2022-03-10 09:58:43.628152441 +0000 @@ -4,19 +4,19 @@ package Medium1 = Buildings.Media.Water "Medium model for water"; package Medium2 = Buildings.Media.Air "Medium model for air"; - parameter Modelica.SIunits.Temperature T_a1_nominal=5 + 273.15 + parameter Modelica.Units.SI.Temperature T_a1_nominal=5 + 273.15 "Nominal water inlet temperature"; - parameter Modelica.SIunits.Temperature T_b1_nominal=10 + 273.15 + parameter Modelica.Units.SI.Temperature T_b1_nominal=10 + 273.15 "Nominal water outlet temperature"; - parameter Modelica.SIunits.Temperature T_a2_nominal=30 + 273.15 + parameter Modelica.Units.SI.Temperature T_a2_nominal=30 + 273.15 "Nominal air inlet temperature"; - parameter Modelica.SIunits.Temperature T_b2_nominal=15 + 273.15 + parameter Modelica.Units.SI.Temperature T_b2_nominal=15 + 273.15 "Nominal air outlet temperature"; - parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal = m1_flow_nominal*4200*(T_a1_nominal-T_b1_nominal) + parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal = m1_flow_nominal*4200*(T_a1_nominal-T_b1_nominal) "Nominal heat transfer"; - parameter Modelica.SIunits.MassFlowRate m1_flow_nominal=0.1 + parameter Modelica.Units.SI.MassFlowRate m1_flow_nominal=0.1 "Nominal mass flow rate medium 1"; - parameter Modelica.SIunits.MassFlowRate m2_flow_nominal=m1_flow_nominal*4200/ + parameter Modelica.Units.SI.MassFlowRate m2_flow_nominal=m1_flow_nominal*4200/ 1000*(T_a1_nominal - T_b1_nominal)/(T_b2_nominal - T_a2_nominal) "Nominal mass flow rate medium 2"; Sources.MassFlowSource_T sin_2( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/Examples/BaseClasses/Heater.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/Examples/BaseClasses/Heater.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/Examples/BaseClasses/Heater.mo" 2022-03-10 09:57:31.652143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/Examples/BaseClasses/Heater.mo" 2022-03-10 09:58:43.616152439 +0000 @@ -4,11 +4,11 @@ replaceable package Medium = Modelica.Media.Interfaces.PartialMedium "Medium model"; - parameter Modelica.SIunits.Volume V = 6*6*2.7 "Volume"; + parameter Modelica.Units.SI.Volume V = 6*6*2.7 "Volume"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = V*1.2*6/3600 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = V*1.2*6/3600 "Nominal mass flow rate"; - 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"; Buildings.Fluid.MixingVolumes.MixingVolume vol( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/Examples/BaseClasses/WetCoilDiscretized.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/Examples/BaseClasses/WetCoilDiscretized.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/Examples/BaseClasses/WetCoilDiscretized.mo" 2022-03-10 09:57:31.652143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/Examples/BaseClasses/WetCoilDiscretized.mo" 2022-03-10 09:58:43.604152437 +0000 @@ -7,17 +7,17 @@ "Medium for air-side" annotation (choicesAllMatching = true); - parameter Modelica.SIunits.Temperature T_a1_nominal = 5+273.15 + parameter Modelica.Units.SI.Temperature T_a1_nominal = 5+273.15 "Water inlet temperature"; - parameter Modelica.SIunits.Temperature T_b1_nominal = 10+273.15 + parameter Modelica.Units.SI.Temperature T_b1_nominal = 10+273.15 "Water outlet temperature"; - parameter Modelica.SIunits.Temperature T_a2_nominal = 30+273.15 + parameter Modelica.Units.SI.Temperature T_a2_nominal = 30+273.15 "Air inlet temperature"; - parameter Modelica.SIunits.Temperature T_b2_nominal = 10+273.15 + parameter Modelica.Units.SI.Temperature T_b2_nominal = 10+273.15 "Air inlet temperature"; - parameter Modelica.SIunits.MassFlowRate m1_flow_nominal = 5 + parameter Modelica.Units.SI.MassFlowRate m1_flow_nominal = 5 "Nominal mass flow rate water-side"; - parameter Modelica.SIunits.MassFlowRate m2_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate m2_flow_nominal= m1_flow_nominal*4200/1000*(T_a1_nominal-T_b1_nominal)/(T_b2_nominal-T_a2_nominal) "Nominal mass flow rate air-side"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/Examples/DryCoilCounterFlowPControl.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/Examples/DryCoilCounterFlowPControl.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/Examples/DryCoilCounterFlowPControl.mo" 2022-03-10 09:57:31.652143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/Examples/DryCoilCounterFlowPControl.mo" 2022-03-10 09:58:43.572152433 +0000 @@ -5,13 +5,13 @@ package Medium1 = Buildings.Media.Water; package Medium2 = Buildings.Media.Air; - parameter Modelica.SIunits.Temperature T_a1_nominal=5 + 273.15; - parameter Modelica.SIunits.Temperature T_b1_nominal=10 + 273.15; - parameter Modelica.SIunits.Temperature T_a2_nominal=30 + 273.15; - parameter Modelica.SIunits.Temperature T_b2_nominal=15 + 273.15; - parameter Modelica.SIunits.MassFlowRate m1_flow_nominal=0.1 + parameter Modelica.Units.SI.Temperature T_a1_nominal=5 + 273.15; + parameter Modelica.Units.SI.Temperature T_b1_nominal=10 + 273.15; + parameter Modelica.Units.SI.Temperature T_a2_nominal=30 + 273.15; + parameter Modelica.Units.SI.Temperature T_b2_nominal=15 + 273.15; + parameter Modelica.Units.SI.MassFlowRate m1_flow_nominal=0.1 "Nominal mass flow rate medium 1"; - parameter Modelica.SIunits.MassFlowRate m2_flow_nominal=m1_flow_nominal*4200/ + parameter Modelica.Units.SI.MassFlowRate m2_flow_nominal=m1_flow_nominal*4200/ 1000*(T_a1_nominal - T_b1_nominal)/(T_b2_nominal - T_a2_nominal) "Nominal mass flow rate medium 2"; Buildings.Fluid.Sources.Boundary_pT sin_2( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/Examples/DryCoilDiscretized.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/Examples/DryCoilDiscretized.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/Examples/DryCoilDiscretized.mo" 2022-03-10 09:57:31.652143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/Examples/DryCoilDiscretized.mo" 2022-03-10 09:58:43.556152430 +0000 @@ -6,13 +6,13 @@ package Medium1 = Buildings.Media.Water; package Medium2 = Buildings.Media.Air; - parameter Modelica.SIunits.Temperature T_a1_nominal = 60+273.15; - parameter Modelica.SIunits.Temperature T_b1_nominal = 40+273.15; - parameter Modelica.SIunits.Temperature T_a2_nominal = 5+273.15; - parameter Modelica.SIunits.Temperature T_b2_nominal = 20+273.15; - parameter Modelica.SIunits.MassFlowRate m1_flow_nominal = 5 + parameter Modelica.Units.SI.Temperature T_a1_nominal = 60+273.15; + parameter Modelica.Units.SI.Temperature T_b1_nominal = 40+273.15; + parameter Modelica.Units.SI.Temperature T_a2_nominal = 5+273.15; + parameter Modelica.Units.SI.Temperature T_b2_nominal = 20+273.15; + parameter Modelica.Units.SI.MassFlowRate m1_flow_nominal = 5 "Nominal mass flow rate medium 1"; - parameter Modelica.SIunits.MassFlowRate m2_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate m2_flow_nominal= m1_flow_nominal*4200/1000*(T_a1_nominal-T_b1_nominal)/(T_b2_nominal-T_a2_nominal) "Nominal mass flow rate medium 2"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/Examples/DryCoilDiscretizedPControl.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/Examples/DryCoilDiscretizedPControl.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/Examples/DryCoilDiscretizedPControl.mo" 2022-03-10 09:57:31.652143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/Examples/DryCoilDiscretizedPControl.mo" 2022-03-10 09:58:43.540152429 +0000 @@ -5,13 +5,13 @@ package Medium1 = Buildings.Media.Water "Medium model for water"; package Medium2 = Buildings.Media.Air "Medium model for air"; - parameter Modelica.SIunits.Temperature T_a1_nominal = 60+273.15; - parameter Modelica.SIunits.Temperature T_b1_nominal = 50+273.15; - parameter Modelica.SIunits.Temperature T_a2_nominal = 20+273.15; - parameter Modelica.SIunits.Temperature T_b2_nominal = 40+273.15; - parameter Modelica.SIunits.MassFlowRate m1_flow_nominal = 5 + parameter Modelica.Units.SI.Temperature T_a1_nominal = 60+273.15; + parameter Modelica.Units.SI.Temperature T_b1_nominal = 50+273.15; + parameter Modelica.Units.SI.Temperature T_a2_nominal = 20+273.15; + parameter Modelica.Units.SI.Temperature T_b2_nominal = 40+273.15; + parameter Modelica.Units.SI.MassFlowRate m1_flow_nominal = 5 "Nominal mass flow rate medium 1"; - parameter Modelica.SIunits.MassFlowRate m2_flow_nominal = + parameter Modelica.Units.SI.MassFlowRate m2_flow_nominal = m1_flow_nominal*4200/1000*(T_a1_nominal-T_b1_nominal)/(T_b2_nominal-T_a2_nominal) "Nominal mass flow rate medium 2"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/Examples/DryEffectivenessNTU.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/Examples/DryEffectivenessNTU.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/Examples/DryEffectivenessNTU.mo" 2022-03-10 09:57:31.652143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/Examples/DryEffectivenessNTU.mo" 2022-03-10 09:58:43.524152426 +0000 @@ -6,17 +6,17 @@ package Medium1 = Buildings.Media.Water; package Medium2 = Buildings.Media.Air; - parameter Modelica.SIunits.SpecificHeatCapacity cp1= + parameter Modelica.Units.SI.SpecificHeatCapacity cp1= Medium1.specificHeatCapacityCp( Medium1.setState_pTX(Medium1.p_default, Medium1.T_default, Medium1.X_default)) "Specific heat capacity of medium 2"; - parameter Modelica.SIunits.SpecificHeatCapacity cp2= + parameter Modelica.Units.SI.SpecificHeatCapacity cp2= Medium2.specificHeatCapacityCp( Medium2.setState_pTX(Medium2.p_default, Medium2.T_default, Medium2.X_default)) "Specific heat capacity of medium 2"; - parameter Modelica.SIunits.MassFlowRate m1_flow = 5 + parameter Modelica.Units.SI.MassFlowRate m1_flow = 5 "Nominal mass flow rate medium 1"; - parameter Modelica.SIunits.MassFlowRate m2_flow = m1_flow*cp1/ + parameter Modelica.Units.SI.MassFlowRate m2_flow = m1_flow*cp1/ cp2 "Nominal mass flow rate medium 2"; Buildings.Fluid.Sources.Boundary_pT sin_2( redeclare diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/Examples/DryEffectivenessNTUPControl.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/Examples/DryEffectivenessNTUPControl.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/Examples/DryEffectivenessNTUPControl.mo" 2022-03-10 09:57:31.652143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/Examples/DryEffectivenessNTUPControl.mo" 2022-03-10 09:58:43.468152419 +0000 @@ -5,17 +5,17 @@ package Medium1 = Buildings.Media.Water "Medium model for water"; package Medium2 = Buildings.Media.Air "Medium model for air"; - parameter Modelica.SIunits.Temperature T_a1_nominal = 60+273.15 + parameter Modelica.Units.SI.Temperature T_a1_nominal = 60+273.15 "Temperature at nominal conditions as port a1"; - parameter Modelica.SIunits.Temperature T_b1_nominal = 50+273.15 + parameter Modelica.Units.SI.Temperature T_b1_nominal = 50+273.15 "Temperature at nominal conditions as port b1"; - parameter Modelica.SIunits.Temperature T_a2_nominal = 20+273.15 + parameter Modelica.Units.SI.Temperature T_a2_nominal = 20+273.15 "Temperature at nominal conditions as port a2"; - parameter Modelica.SIunits.Temperature T_b2_nominal = 40+273.15 + parameter Modelica.Units.SI.Temperature T_b2_nominal = 40+273.15 "Temperature at nominal conditions as port b2"; - parameter Modelica.SIunits.MassFlowRate m1_flow_nominal = 5 + parameter Modelica.Units.SI.MassFlowRate m1_flow_nominal = 5 "Nominal mass flow rate medium 1"; - parameter Modelica.SIunits.MassFlowRate m2_flow_nominal = m1_flow_nominal*4200/1000*(T_a1_nominal-T_b1_nominal)/(T_b2_nominal-T_a2_nominal) + parameter Modelica.Units.SI.MassFlowRate m2_flow_nominal = m1_flow_nominal*4200/1000*(T_a1_nominal-T_b1_nominal)/(T_b2_nominal-T_a2_nominal) "Nominal mass flow rate medium 2"; Buildings.Fluid.Sources.Boundary_pT sin_2( redeclare diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/Examples/WetCoilCounterFlowPControl.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/Examples/WetCoilCounterFlowPControl.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/Examples/WetCoilCounterFlowPControl.mo" 2022-03-10 09:57:31.652143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/Examples/WetCoilCounterFlowPControl.mo" 2022-03-10 09:58:43.432152416 +0000 @@ -7,13 +7,13 @@ //package Medium2 = Buildings.Media.GasesPTDecoupled.MoistAir; //package Medium2 = Buildings.Media.Air; //package Medium2 = Buildings.Media.GasesConstantDensity.MoistAir; - parameter Modelica.SIunits.Temperature T_a1_nominal=5 + 273.15; - parameter Modelica.SIunits.Temperature T_b1_nominal=10 + 273.15; - parameter Modelica.SIunits.Temperature T_a2_nominal=30 + 273.15; - parameter Modelica.SIunits.Temperature T_b2_nominal=15 + 273.15; - parameter Modelica.SIunits.MassFlowRate m1_flow_nominal=0.1 + parameter Modelica.Units.SI.Temperature T_a1_nominal=5 + 273.15; + parameter Modelica.Units.SI.Temperature T_b1_nominal=10 + 273.15; + parameter Modelica.Units.SI.Temperature T_a2_nominal=30 + 273.15; + parameter Modelica.Units.SI.Temperature T_b2_nominal=15 + 273.15; + parameter Modelica.Units.SI.MassFlowRate m1_flow_nominal=0.1 "Nominal mass flow rate medium 1"; - parameter Modelica.SIunits.MassFlowRate m2_flow_nominal=m1_flow_nominal*4200/ + parameter Modelica.Units.SI.MassFlowRate m2_flow_nominal=m1_flow_nominal*4200/ 1000*(T_a1_nominal - T_b1_nominal)/(T_b2_nominal - T_a2_nominal) "Nominal mass flow rate medium 2"; Buildings.Fluid.Sources.Boundary_pT sin_2( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/Examples/WetCoilDiscretizedPControl.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/Examples/WetCoilDiscretizedPControl.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/Examples/WetCoilDiscretizedPControl.mo" 2022-03-10 09:57:31.652143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/Examples/WetCoilDiscretizedPControl.mo" 2022-03-10 09:58:43.412152412 +0000 @@ -6,13 +6,13 @@ package Medium1 = Buildings.Media.Water; package Medium2 = Buildings.Media.Air; - parameter Modelica.SIunits.Temperature T_a1_nominal = 5+273.15; - parameter Modelica.SIunits.Temperature T_b1_nominal = 10+273.15; - parameter Modelica.SIunits.Temperature T_a2_nominal = 30+273.15; - parameter Modelica.SIunits.Temperature T_b2_nominal = 10+273.15; - parameter Modelica.SIunits.MassFlowRate m1_flow_nominal = 5 + parameter Modelica.Units.SI.Temperature T_a1_nominal = 5+273.15; + parameter Modelica.Units.SI.Temperature T_b1_nominal = 10+273.15; + parameter Modelica.Units.SI.Temperature T_a2_nominal = 30+273.15; + parameter Modelica.Units.SI.Temperature T_b2_nominal = 10+273.15; + parameter Modelica.Units.SI.MassFlowRate m1_flow_nominal = 5 "Nominal mass flow rate medium 1"; - parameter Modelica.SIunits.MassFlowRate m2_flow_nominal = m1_flow_nominal*4200/1000*(T_a1_nominal-T_b1_nominal)/(T_b2_nominal-T_a2_nominal) + parameter Modelica.Units.SI.MassFlowRate m2_flow_nominal = m1_flow_nominal*4200/1000*(T_a1_nominal-T_b1_nominal)/(T_b2_nominal-T_a2_nominal) "Nominal mass flow rate medium 2"; Buildings.Fluid.Sources.Boundary_pT sin_2( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/HeaterCooler_u.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/HeaterCooler_u.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/HeaterCooler_u.mo" 2022-03-10 09:57:31.652143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/HeaterCooler_u.mo" 2022-03-10 09:58:43.388152410 +0000 @@ -4,7 +4,7 @@ redeclare final Buildings.Fluid.MixingVolumes.MixingVolume vol( final prescribedHeatFlowRate=true)); - parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal + parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal "Heat flow rate at u=1, positive for heating"; Modelica.Blocks.Interfaces.RealInput u "Control input" annotation (Placement(transformation( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/RadiantSlabs/BaseClasses/Functions/AverageResistance.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/RadiantSlabs/BaseClasses/Functions/AverageResistance.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/RadiantSlabs/BaseClasses/Functions/AverageResistance.mo" 2022-03-10 09:57:31.652143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/RadiantSlabs/BaseClasses/Functions/AverageResistance.mo" 2022-03-10 09:58:43.364152406 +0000 @@ -1,17 +1,17 @@ within Buildings.Fluid.HeatExchangers.RadiantSlabs.BaseClasses.Functions; function AverageResistance "Average fictitious resistance for plane that contains the pipes" - input Modelica.SIunits.Distance disPip "pipe distance"; - input Modelica.SIunits.Diameter dPipOut "pipe outside diameter"; - input Modelica.SIunits.ThermalConductivity k + input Modelica.Units.SI.Distance disPip "pipe distance"; + input Modelica.Units.SI.Diameter dPipOut "pipe outside diameter"; + input Modelica.Units.SI.ThermalConductivity k "pipe level construction element thermal conductivity"; input Buildings.Fluid.HeatExchangers.RadiantSlabs.Types.SystemType sysTyp "Type of radiant system"; - input Modelica.SIunits.ThermalConductivity kIns + input Modelica.Units.SI.ThermalConductivity kIns "floor slab insulation thermal conductivity"; - input Modelica.SIunits.Thickness dIns "floor slab insulation thickness"; - output Modelica.SIunits.ThermalInsulance Rx "Thermal insulance"; + input Modelica.Units.SI.Thickness dIns "floor slab insulation thickness"; + output Modelica.Units.SI.ThermalInsulance Rx "Thermal insulance"; protected Real cri(unit="1") "Criteria used to select formula for computation of resistance"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/RadiantSlabs/BaseClasses/Functions/heatFlowRate.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/RadiantSlabs/BaseClasses/Functions/heatFlowRate.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/RadiantSlabs/BaseClasses/Functions/heatFlowRate.mo" 2022-03-10 09:57:31.652143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/RadiantSlabs/BaseClasses/Functions/heatFlowRate.mo" 2022-03-10 09:58:43.352152405 +0000 @@ -1,22 +1,22 @@ within Buildings.Fluid.HeatExchangers.RadiantSlabs.BaseClasses.Functions; function heatFlowRate "Heat flow rate for epsilon-NTU model" extends Modelica.Icons.Function; - input Modelica.SIunits.Temperature T_a "Temperature at port_a"; - input Modelica.SIunits.Temperature T_b "Temperature at port_b"; - input Modelica.SIunits.Temperature T_s "Temperature of solid"; - input Modelica.SIunits.Temperature T_f "Temperature of fluid control volume"; + input Modelica.Units.SI.Temperature T_a "Temperature at port_a"; + input Modelica.Units.SI.Temperature T_b "Temperature at port_b"; + input Modelica.Units.SI.Temperature T_s "Temperature of solid"; + input Modelica.Units.SI.Temperature T_f "Temperature of fluid control volume"; - input Modelica.SIunits.SpecificHeatCapacity c_p "Specific heat capacity"; - input Modelica.SIunits.ThermalConductance UA "UA value"; - input Modelica.SIunits.MassFlowRate m_flow + input Modelica.Units.SI.SpecificHeatCapacity c_p "Specific heat capacity"; + input Modelica.Units.SI.ThermalConductance UA "UA value"; + input Modelica.Units.SI.MassFlowRate m_flow "Mass flow rate from port_a to port_b"; - input Modelica.SIunits.MassFlowRate m_flow_nominal + input Modelica.Units.SI.MassFlowRate m_flow_nominal "Nominal mass flow rate from port_a to port_b"; - output Modelica.SIunits.HeatFlowRate Q_flow "Heat flow rate"; + output Modelica.Units.SI.HeatFlowRate Q_flow "Heat flow rate"; protected - Modelica.SIunits.MassFlowRate m_abs_flow "Absolute value of mass flow rate"; - Modelica.SIunits.Temperature T_in "Inlet fluid temperature"; + Modelica.Units.SI.MassFlowRate m_abs_flow "Absolute value of mass flow rate"; + Modelica.Units.SI.Temperature T_in "Inlet fluid temperature"; Real eps "Heat transfer effectiveness"; algorithm diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/RadiantSlabs/BaseClasses/PipeToSlabConductance.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/RadiantSlabs/BaseClasses/PipeToSlabConductance.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/RadiantSlabs/BaseClasses/PipeToSlabConductance.mo" 2022-03-10 09:57:31.652143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/RadiantSlabs/BaseClasses/PipeToSlabConductance.mo" 2022-03-10 09:58:43.304152398 +0000 @@ -9,7 +9,7 @@ heatTransfer= Buildings.Fluid.HeatExchangers.RadiantSlabs.Types.HeatTransfer.EpsilonNTU "Model for heat transfer between fluid and slab"; - parameter Modelica.SIunits.Area APip "Pipe inside surface area"; + parameter Modelica.Units.SI.Area APip "Pipe inside surface area"; parameter Modelica.Fluid.Dissipation.HeatTransfer.StraightPipe.kc_overall_IN_con @@ -25,12 +25,12 @@ m_flow=m_flow) "Variables for convective heat transfer calculation" annotation (Placement(transformation(extent={{-90,68},{-78,80}}))); - parameter Modelica.SIunits.ThermalResistance RFic + parameter Modelica.Units.SI.ThermalResistance RFic "Average fictitious thermal resistance between pipe surface and plane that contains pipe"; - parameter Modelica.SIunits.ThermalResistance RWal + parameter Modelica.Units.SI.ThermalResistance RWal "Thermal resistance through the pipe wall"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal "Nominal mass flow rate"; Modelica.Blocks.Interfaces.RealInput m_flow(unit="kg/s") @@ -57,19 +57,19 @@ Placement(transformation(extent={{90,-10},{110,10}}), iconTransformation(extent={{86,-10},{106,10}}))); - Modelica.SIunits.TemperatureDifference dT "= solid.T - fluid.T"; + Modelica.Units.SI.TemperatureDifference dT "= solid.T - fluid.T"; - Modelica.SIunits.CoefficientOfHeatTransfer hCon + Modelica.Units.SI.CoefficientOfHeatTransfer hCon "Convective heat transfer coefficient"; - Modelica.SIunits.ThermalResistance RTot + Modelica.Units.SI.ThermalResistance RTot "Thermal resistance between the fluid and the fictious plane of heat transfer"; - Modelica.SIunits.HeatFlowRate Q_flow "Heat flow rate from solid -> fluid"; + Modelica.Units.SI.HeatFlowRate Q_flow "Heat flow rate from solid -> fluid"; protected Medium.ThermodynamicState fluSta = Medium.setState_pTX(p=Medium.p_default, T=fluid.T, X=Medium.X_default) "State of the medium"; - Modelica.SIunits.SpecificHeatCapacity c_p = Medium.specificHeatCapacityCp(fluSta) + Modelica.Units.SI.SpecificHeatCapacity c_p = Medium.specificHeatCapacityCp(fluSta) "Specific heat capacity of the fluid"; equation hCon = Modelica.Fluid.Dissipation.HeatTransfer.StraightPipe.kc_overall_KC( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/RadiantSlabs/BaseClasses/Slab.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/RadiantSlabs/BaseClasses/Slab.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/RadiantSlabs/BaseClasses/Slab.mo" 2022-03-10 09:57:31.652143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/RadiantSlabs/BaseClasses/Slab.mo" 2022-03-10 09:58:43.288152397 +0000 @@ -4,7 +4,7 @@ Buildings.Fluid.HeatExchangers.RadiantSlabs.Types.SystemType sysTyp "Radiant system type"; - parameter Modelica.SIunits.Distance disPip "Pipe distance"; + parameter Modelica.Units.SI.Distance disPip "Pipe distance"; parameter Buildings.Fluid.Data.Pipes.Generic pipe "Record for pipe geometry and material" @@ -22,10 +22,10 @@ "Number of the interface layer in which the pipes are located" annotation(Dialog(group="Construction"), Evaluate=true); - parameter Modelica.SIunits.Temperature T_a_start=293.15 + parameter Modelica.Units.SI.Temperature T_a_start=293.15 "Initial temperature at surf_a, used if steadyStateInitial = false" annotation(Dialog(tab="Initialization", group="Construction")); - parameter Modelica.SIunits.Temperature T_b_start=293.15 + parameter Modelica.Units.SI.Temperature T_b_start=293.15 "Initial temperature at surf_b, used if steadyStateInitial = false" annotation(Dialog(tab="Initialization", group="Construction")); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/RadiantSlabs/Examples/SingleCircuitMultipleCircuitEpsilonNTU.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/RadiantSlabs/Examples/SingleCircuitMultipleCircuitEpsilonNTU.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/RadiantSlabs/Examples/SingleCircuitMultipleCircuitEpsilonNTU.mo" 2022-03-10 09:57:31.652143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/RadiantSlabs/Examples/SingleCircuitMultipleCircuitEpsilonNTU.mo" 2022-03-10 09:58:43.276152395 +0000 @@ -26,7 +26,7 @@ from_dp=true) "Slabe with embedded pipes" annotation (Placement(transformation(extent={{-14,10},{6,30}}))); - parameter Modelica.SIunits.MassFlowRate m_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal= 0.167 "Nominal mass flow rate for each circuit"; Modelica.Thermal.HeatTransfer.Sources.FixedTemperature TAbo(T=293.15) "Air temperature above the slab" @@ -37,7 +37,7 @@ Modelica.Thermal.HeatTransfer.Components.ThermalConductor conAbo1(G=20*A) "Combined convection and radiation resistance above the slab" annotation (Placement(transformation(extent={{-20,110},{-40,130}}))); - parameter Modelica.SIunits.Area A=10 "Heat transfer area for each circuit"; + parameter Modelica.Units.SI.Area A=10 "Heat transfer area for each circuit"; Modelica.Thermal.HeatTransfer.Components.ThermalConductor conBel1(G=20*A) "Combined convection and radiation resistance below the slab" annotation (Placement(transformation(extent={{-40,-90},{-20,-70}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/RadiantSlabs/Examples/StepResponseEpsilonNTU.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/RadiantSlabs/Examples/StepResponseEpsilonNTU.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/RadiantSlabs/Examples/StepResponseEpsilonNTU.mo" 2022-03-10 09:57:31.652143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/RadiantSlabs/Examples/StepResponseEpsilonNTU.mo" 2022-03-10 09:58:43.252152392 +0000 @@ -32,7 +32,7 @@ "Slabe with embedded pipes" annotation (Placement(transformation(extent={{10,-30},{30,-10}}))); - parameter Modelica.SIunits.MassFlowRate m_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal= 0.167 "Nominal mass flow rate"; Modelica.Thermal.HeatTransfer.Sources.FixedTemperature TAirAbo(T=293.15) "Air temperature above the slab" @@ -52,7 +52,7 @@ til=Buildings.Types.Tilt.Floor) "Convective heat transfer above the slab" annotation (Placement(transformation(extent={{0,60},{-20,80}}))); - parameter Modelica.SIunits.Area A=10 "Heat transfer area"; + parameter Modelica.Units.SI.Area A=10 "Heat transfer area"; HeatTransfer.Convection.Interior conBel( A=A, conMod=Buildings.HeatTransfer.Types.InteriorConvection.Temperature, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/RadiantSlabs/ParallelCircuitsSlab.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/RadiantSlabs/ParallelCircuitsSlab.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/RadiantSlabs/ParallelCircuitsSlab.mo" 2022-03-10 09:57:31.652143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/RadiantSlabs/ParallelCircuitsSlab.mo" 2022-03-10 09:58:43.232152390 +0000 @@ -24,20 +24,20 @@ parameter Integer nSeg(min=1) = if heatTransfer==Types.HeatTransfer.EpsilonNTU then 1 else 5 "Number of volume segments in each circuit (along flow path)"; - parameter Modelica.SIunits.Area A + parameter Modelica.Units.SI.Area A "Surface area of radiant slab (all circuits combined)" annotation(Dialog(group="Construction")); - parameter Modelica.SIunits.Length length = A/disPip/nCir + parameter Modelica.Units.SI.Length length = A/disPip/nCir "Length of the pipe of a single circuit"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal "Nominal mass flow rate of all circuits combined" annotation(Dialog(group = "Nominal condition")); - parameter Modelica.SIunits.MassFlowRate m_flow_small(min=0) = 1E-4*abs(m_flow_nominal) + parameter Modelica.Units.SI.MassFlowRate m_flow_small(min=0) = 1E-4*abs(m_flow_nominal) "Small mass flow rate of all circuits combined for regularization of zero flow" annotation(Dialog(tab = "Advanced")); - final parameter Modelica.SIunits.Velocity v_nominal= + final parameter Modelica.Units.SI.Velocity v_nominal= 4*m_flow_nominal/pipe.dIn^2/Modelica.Constants.pi/rho_default/nCir "Velocity at m_flow_nominal"; @@ -54,9 +54,9 @@ "= true, if actual temperature at port is computed" annotation(Dialog(tab="Advanced",group="Diagnostics")); - Modelica.SIunits.MassFlowRate m_flow(start=0) = port_a.m_flow + Modelica.Units.SI.MassFlowRate m_flow(start=0) = port_a.m_flow "Mass flow rate from port_a to port_b (m_flow > 0 is design flow direction) for all circuits combined"; - Modelica.SIunits.PressureDifference dp(start=0, displayUnit="Pa") = port_a.p - port_b.p + Modelica.Units.SI.PressureDifference dp(start=0, displayUnit="Pa") = port_a.p - port_b.p "Pressure difference between port_a and port_b"; Medium.ThermodynamicState sta_a=if homotopyInitialization then @@ -119,8 +119,8 @@ T=Medium.T_default, p=Medium.p_default, X=Medium.X_default[1:Medium.nXi]) "Start state"; - parameter Modelica.SIunits.Density rho_default = Medium.density(state_default); - parameter Modelica.SIunits.DynamicViscosity mu_default = Medium.dynamicViscosity(state_default) + parameter Modelica.Units.SI.Density rho_default = Medium.density(state_default); + parameter Modelica.Units.SI.DynamicViscosity mu_default = Medium.dynamicViscosity(state_default) "Dynamic viscosity at nominal condition"; Buildings.Fluid.HeatExchangers.RadiantSlabs.BaseClasses.MassFlowRateMultiplier diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/RadiantSlabs/SingleCircuitSlab.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/RadiantSlabs/SingleCircuitSlab.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/RadiantSlabs/SingleCircuitSlab.mo" 2022-03-10 09:57:31.652143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/RadiantSlabs/SingleCircuitSlab.mo" 2022-03-10 09:58:43.208152386 +0000 @@ -19,17 +19,17 @@ m_flow_small=m_flow_small), preDro(dp(nominal=200*length))); - parameter Modelica.SIunits.Area A "Surface area of radiant slab" + parameter Modelica.Units.SI.Area A "Surface area of radiant slab" annotation(Dialog(group="Construction")); parameter Buildings.Fluid.HeatExchangers.RadiantSlabs.Types.HeatTransfer heatTransfer=Types.HeatTransfer.EpsilonNTU "Model for heat transfer between fluid and slab"; - parameter Modelica.SIunits.Temperature T_c_start= + parameter Modelica.Units.SI.Temperature T_c_start= (T_a_start*con_b[1].layers.R+T_b_start*con_a[1].layers.R)/layers.R "Initial construction temperature in the layer that contains the pipes, used if steadyStateInitial = false" annotation(Dialog(tab="Initialization", group="Construction")); - final parameter Modelica.SIunits.Velocity v_nominal= + final parameter Modelica.Units.SI.Velocity v_nominal= 4*m_flow_nominal/pipe.dIn^2/Modelica.Constants.pi/rho_default "Velocity at m_flow_nominal"; @@ -79,7 +79,7 @@ rotation=180, origin={40,76}))); - final parameter Modelica.SIunits.ThermalInsulance Rx= + final parameter Modelica.Units.SI.ThermalInsulance Rx= Buildings.Fluid.HeatExchangers.RadiantSlabs.BaseClasses.Functions.AverageResistance( disPip=disPip, dPipOut=pipe.dOut, @@ -104,9 +104,9 @@ each heatTransfer=heatTransfer) "Conductance between fluid and the slab" annotation (Placement(transformation(extent={{-28,-80},{-8,-60}}))); - Modelica.SIunits.MassFraction Xi_in_a[Medium.nXi] = inStream(port_a.Xi_outflow) + Modelica.Units.SI.MassFraction Xi_in_a[Medium.nXi] = inStream(port_a.Xi_outflow) "Inflowing mass fraction at port_a"; - Modelica.SIunits.MassFraction Xi_in_b[Medium.nXi] = inStream(port_b.Xi_outflow) + Modelica.Units.SI.MassFraction Xi_in_b[Medium.nXi] = inStream(port_b.Xi_outflow) "Inflowing mass fraction at port_a"; Modelica.Blocks.Sources.RealExpression T_a( final y=Medium.temperature_phX(p=port_a.p, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/Radiators/Examples/RadiatorEN442_2.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/Radiators/Examples/RadiatorEN442_2.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/Radiators/Examples/RadiatorEN442_2.mo" 2022-03-10 09:57:31.652143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/Radiators/Examples/RadiatorEN442_2.mo" 2022-03-10 09:58:43.132152377 +0000 @@ -2,17 +2,17 @@ model RadiatorEN442_2 "Test model for radiator" extends Modelica.Icons.Example; package Medium = Buildings.Media.Water "Medium model"; - parameter Modelica.SIunits.Temperature TRoo = 20+273.15 "Room temperature" + parameter Modelica.Units.SI.Temperature TRoo = 20+273.15 "Room temperature" annotation (Evaluate=false); - parameter Modelica.SIunits.Power Q_flow_nominal = 500 "Nominal power"; - parameter Modelica.SIunits.Temperature T_a_nominal=313.15 + parameter Modelica.Units.SI.Power Q_flow_nominal = 500 "Nominal power"; + parameter Modelica.Units.SI.Temperature T_a_nominal=313.15 "Radiator inlet temperature at nominal condition"; - parameter Modelica.SIunits.Temperature T_b_nominal = 303.15 + parameter Modelica.Units.SI.Temperature T_b_nominal = 303.15 "Radiator outlet temperature at nominal condition"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal= Q_flow_nominal/(T_a_nominal-T_b_nominal)/Medium.cp_const "Nominal mass flow rate"; - parameter Modelica.SIunits.PressureDifference dp_nominal = 3000 + parameter Modelica.Units.SI.PressureDifference dp_nominal = 3000 "Pressure drop at m_flow_nominal"; Buildings.Fluid.Sources.Boundary_pT sou( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/Radiators/RadiatorEN442_2.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/Radiators/RadiatorEN442_2.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/Radiators/RadiatorEN442_2.mo" 2022-03-10 09:57:31.652143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/Radiators/RadiatorEN442_2.mo" 2022-03-10 09:58:43.116152376 +0000 @@ -15,38 +15,38 @@ parameter Real fraRad(min=0, max=1) = 0.35 "Fraction radiant heat transfer"; // Assumptions - parameter Modelica.SIunits.Power Q_flow_nominal + parameter Modelica.Units.SI.Power Q_flow_nominal "Nominal heating power (positive for heating)" annotation(Dialog(group="Nominal condition")); - parameter Modelica.SIunits.Temperature T_a_nominal + parameter Modelica.Units.SI.Temperature T_a_nominal "Water inlet temperature at nominal condition" annotation(Dialog(group="Nominal condition")); - parameter Modelica.SIunits.Temperature T_b_nominal + parameter Modelica.Units.SI.Temperature T_b_nominal "Water outlet temperature at nominal condition" annotation(Dialog(group="Nominal condition")); - parameter Modelica.SIunits.Temperature TAir_nominal = 293.15 + parameter Modelica.Units.SI.Temperature TAir_nominal = 293.15 "Air temperature at nominal condition" annotation(Dialog(group="Nominal condition")); - parameter Modelica.SIunits.Temperature TRad_nominal = TAir_nominal + parameter Modelica.Units.SI.Temperature TRad_nominal = TAir_nominal "Radiative temperature at nominal condition" annotation(Dialog(group="Nominal condition")); parameter Real n = 1.24 "Exponent for heat transfer"; - parameter Modelica.SIunits.Volume VWat = 5.8E-6*abs(Q_flow_nominal) + parameter Modelica.Units.SI.Volume VWat = 5.8E-6*abs(Q_flow_nominal) "Water volume of radiator" annotation(Dialog(tab = "Dynamics", enable = not (energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState))); - parameter Modelica.SIunits.Mass mDry = 0.0263*abs(Q_flow_nominal) + parameter Modelica.Units.SI.Mass mDry = 0.0263*abs(Q_flow_nominal) "Dry mass of radiator that will be lumped to water heat capacity" annotation(Dialog(tab = "Dynamics", enable = not (energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState))); parameter Boolean homotopyInitialization = true "= true, use homotopy method" annotation(Evaluate=true, Dialog(tab="Advanced")); // Heat flow rates - Modelica.SIunits.HeatFlowRate QCon_flow = heatPortCon.Q_flow + Modelica.Units.SI.HeatFlowRate QCon_flow = heatPortCon.Q_flow "Heat input into the water due to convective heat transfer with room air"; - Modelica.SIunits.HeatFlowRate QRad_flow = heatPortRad.Q_flow + Modelica.Units.SI.HeatFlowRate QRad_flow = heatPortRad.Q_flow "Heat input into the water due to radiative heat transfer with room"; - Modelica.SIunits.HeatFlowRate Q_flow = QCon_flow + QRad_flow + Modelica.Units.SI.HeatFlowRate Q_flow = QCon_flow + QRad_flow "Heat input into the water"; // Heat ports @@ -71,27 +71,27 @@ each final mSenFac=mSenFac) "Volume for fluid stream" annotation (Placement(transformation(extent={{-9,0},{11,-20}}))); protected - parameter Modelica.SIunits.SpecificHeatCapacity cp_nominal= + parameter Modelica.Units.SI.SpecificHeatCapacity cp_nominal= Medium.specificHeatCapacityCp( Medium.setState_pTX(Medium.p_default, T_a_nominal, Medium.X_default)) "Specific heat capacity at nominal conditions"; - parameter Modelica.SIunits.HeatFlowRate QEle_flow_nominal[nEle]( + parameter Modelica.Units.SI.HeatFlowRate QEle_flow_nominal[nEle]( each fixed=false, each start=Q_flow_nominal/nEle) "Nominal heating power of each element"; - parameter Modelica.SIunits.Temperature TWat_nominal[nEle]( + parameter Modelica.Units.SI.Temperature TWat_nominal[nEle]( each fixed=false, start={T_a_nominal - i/nEle * (T_a_nominal-T_b_nominal) for i in 1:nEle}) "Water temperature in each element at nominal conditions"; - parameter Modelica.SIunits.TemperatureDifference[nEle] dTRad_nominal( + parameter Modelica.Units.SI.TemperatureDifference[nEle] dTRad_nominal( each fixed=false, start={T_a_nominal - i/nEle * (T_a_nominal-T_b_nominal) - TRad_nominal for i in 1:nEle}) "Temperature difference for radiative heat transfer at nominal conditions"; - parameter Modelica.SIunits.TemperatureDifference[nEle] dTCon_nominal( + parameter Modelica.Units.SI.TemperatureDifference[nEle] dTCon_nominal( each fixed=false, start={T_a_nominal - i/nEle * (T_a_nominal-T_b_nominal) - TAir_nominal for i in 1:nEle}) "Temperature difference for convective heat transfer at nominal conditions"; - parameter Modelica.SIunits.ThermalConductance UAEle(fixed=false, min=0, + parameter Modelica.Units.SI.ThermalConductance UAEle(fixed=false, min=0, start=Q_flow_nominal/((T_a_nominal+T_b_nominal)/2-((1-fraRad)*TAir_nominal+fraRad*TRad_nominal))/nEle) "UA value at nominal condition for each element"; @@ -105,9 +105,9 @@ "Heat input into radiator from radiative heat transfer" annotation (Placement(transformation(extent={{-48,-80},{-28,-60}}))); - Modelica.SIunits.TemperatureDifference dTCon[nEle] = {heatPortCon.T - vol[i].T for i in 1:nEle} + Modelica.Units.SI.TemperatureDifference dTCon[nEle] = {heatPortCon.T - vol[i].T for i in 1:nEle} "Temperature difference for convective heat transfer"; - Modelica.SIunits.TemperatureDifference dTRad[nEle] = {heatPortRad.T - vol[i].T for i in 1:nEle} + Modelica.Units.SI.TemperatureDifference dTRad[nEle] = {heatPortRad.T - vol[i].T for i in 1:nEle} "Temperature difference for radiative heat transfer"; Modelica.Blocks.Sources.RealExpression QCon[nEle](y={if homotopyInitialization diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/Validation/HeaterCooler_T.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/Validation/HeaterCooler_T.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/Validation/HeaterCooler_T.mo" 2022-03-10 09:57:31.652143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/Validation/HeaterCooler_T.mo" 2022-03-10 09:58:43.072152370 +0000 @@ -3,7 +3,7 @@ "Model that demonstrates the ideal heater/cooler model for a prescribed outlet temperature, configured as steady-state" extends Modelica.Icons.Example; package Medium = Buildings.Media.Water; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=0.1 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=0.1 "Nominal mass flow rate"; Buildings.Fluid.Sources.Boundary_pT sin( redeclare package Medium = Medium, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/Validation/HeaterCooler_u.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/Validation/HeaterCooler_u.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/Validation/HeaterCooler_u.mo" 2022-03-10 09:57:31.652143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/Validation/HeaterCooler_u.mo" 2022-03-10 09:58:43.032152364 +0000 @@ -5,7 +5,7 @@ package Medium = Buildings.Media.Air; - parameter Modelica.SIunits.MassFlowRate + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=3000/1000/20 "Nominal mass flow rate"; Buildings.Fluid.Sources.Boundary_pT sin( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/WetCoilCounterFlow.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/WetCoilCounterFlow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/WetCoilCounterFlow.mo" 2022-03-10 09:57:31.652143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatExchangers/WetCoilCounterFlow.mo" 2022-03-10 09:58:43.000152360 +0000 @@ -5,17 +5,17 @@ redeclare each final Buildings.Fluid.HeatExchangers.BaseClasses.HexElementLatent ele[nEle]); - Modelica.SIunits.HeatFlowRate QSen2_flow + Modelica.Units.SI.HeatFlowRate QSen2_flow "Sensible heat input into air stream (negative if air is cooled)"; - Modelica.SIunits.HeatFlowRate QLat2_flow + Modelica.Units.SI.HeatFlowRate QLat2_flow "Latent heat input into air (negative if air is dehumidified)"; Real SHR( min=0, max=1, unit="1") "Sensible to total heat ratio"; - Modelica.SIunits.MassFlowRate mWat_flow "Water flow rate"; + Modelica.Units.SI.MassFlowRate mWat_flow "Water flow rate"; equation mWat_flow = sum(ele[i].vol2.mWat_flow for i in 1:nEle); QLat2_flow = sum(Medium2.enthalpyOfCondensingGas(ele[i].vol2.heatPort.T)*ele[i].vol2.mWat_flow for i in 1:nEle); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatPumps/Carnot_TCon.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatPumps/Carnot_TCon.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatPumps/Carnot_TCon.mo" 2022-03-10 09:57:31.652143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatPumps/Carnot_TCon.mo" 2022-03-10 09:58:42.980152358 +0000 @@ -29,7 +29,7 @@ final homotopyInitialization=homotopyInitialization, final Q_flow_nominal=QEva_flow_nominal)); - parameter Modelica.SIunits.HeatFlowRate QCon_flow_max( + parameter Modelica.Units.SI.HeatFlowRate QCon_flow_max( min=0) = Modelica.Constants.inf "Maximum heat flow rate for heating (positive)"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatPumps/Examples/Carnot_TCon.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatPumps/Examples/Carnot_TCon.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatPumps/Examples/Carnot_TCon.mo" 2022-03-10 09:57:31.652143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatPumps/Examples/Carnot_TCon.mo" 2022-03-10 09:58:42.928152351 +0000 @@ -5,13 +5,13 @@ package Medium1 = Buildings.Media.Water "Medium model"; package Medium2 = Buildings.Media.Water "Medium model"; - parameter Modelica.SIunits.TemperatureDifference dTEva_nominal=-5 + parameter Modelica.Units.SI.TemperatureDifference dTEva_nominal=-5 "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 Modelica.SIunits.HeatFlowRate QCon_flow_nominal = 100E3 + parameter Modelica.Units.SI.HeatFlowRate QCon_flow_nominal = 100E3 "Evaporator heat flow rate"; - parameter Modelica.SIunits.MassFlowRate m1_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate m1_flow_nominal= QCon_flow_nominal/dTCon_nominal/4200 "Nominal mass flow rate at condenser"; Buildings.Fluid.HeatPumps.Carnot_TCon heaPum( @@ -65,7 +65,7 @@ Modelica.Blocks.Math.Add QEva_flow(k2=-1) "Evaporator heat flow rate" annotation (Placement(transformation(extent={{32,-48},{52,-28}}))); - final parameter Modelica.SIunits.SpecificHeatCapacity cp2_default= + final parameter Modelica.Units.SI.SpecificHeatCapacity cp2_default= Medium2.specificHeatCapacityCp(Medium2.setState_pTX( Medium2.p_default, Medium2.T_default, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatPumps/Examples/Carnot_y.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatPumps/Examples/Carnot_y.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatPumps/Examples/Carnot_y.mo" 2022-03-10 09:57:31.652143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatPumps/Examples/Carnot_y.mo" 2022-03-10 09:58:42.916152350 +0000 @@ -5,16 +5,16 @@ package Medium2 = Buildings.Media.Water "Medium model"; parameter Real COP_nominal = 6 "Nominal COP"; - 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 Modelica.SIunits.MassFlowRate m2_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate m2_flow_nominal= -P_nominal*(COP_nominal-1)/cp2_default/dTEva_nominal "Nominal mass flow rate at chilled water side"; - parameter Modelica.SIunits.MassFlowRate m1_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate m1_flow_nominal= P_nominal*COP_nominal/cp1_default/dTCon_nominal "Nominal mass flow rate at condenser water wide"; Buildings.Fluid.HeatPumps.Carnot_y heaPum( @@ -76,14 +76,14 @@ startTime=900, offset=273.15 + 15) "Evaporator inlet temperature" annotation (Placement(transformation(extent={{50,-40},{70,-20}}))); - 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, Medium1.X_default)) "Specific heat capacity of medium 2 at default medium state"; - final parameter Modelica.SIunits.SpecificHeatCapacity cp2_default= + final parameter Modelica.Units.SI.SpecificHeatCapacity cp2_default= Medium2.specificHeatCapacityCp(Medium2.setState_pTX( Medium2.p_default, Medium2.T_default, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatPumps/Validation/Carnot_TCon_reverseFlow.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatPumps/Validation/Carnot_TCon_reverseFlow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatPumps/Validation/Carnot_TCon_reverseFlow.mo" 2022-03-10 09:57:31.652143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/HeatPumps/Validation/Carnot_TCon_reverseFlow.mo" 2022-03-10 09:58:42.876152345 +0000 @@ -5,20 +5,20 @@ package Medium1 = Buildings.Media.Water "Medium model"; package Medium2 = Buildings.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 Modelica.SIunits.HeatFlowRate QCon_flow_nominal = 100E3 + parameter Modelica.Units.SI.HeatFlowRate QCon_flow_nominal = 100E3 "Evaporator heat flow rate"; - parameter Modelica.SIunits.MassFlowRate m1_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate m1_flow_nominal= QCon_flow_nominal/dTCon_nominal/4200 "Nominal mass flow rate at condenser"; Modelica.Blocks.Sources.Constant TConLvg(k=273.15 + 40) "Control signal for condenser leaving temperature" annotation (Placement(transformation(extent={{-50,30},{-30,50}}))); - final parameter Modelica.SIunits.SpecificHeatCapacity cp2_default= + final parameter Modelica.Units.SI.SpecificHeatCapacity cp2_default= Medium2.specificHeatCapacityCp(Medium2.setState_pTX( Medium2.p_default, Medium2.T_default, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Interfaces/ConservationEquation.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Interfaces/ConservationEquation.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Interfaces/ConservationEquation.mo" 2022-03-10 09:57:31.652143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Interfaces/ConservationEquation.mo" 2022-03-10 09:58:42.852152342 +0000 @@ -87,42 +87,42 @@ X(start=X_start), d(start=rho_start)) "Medium properties"; - Modelica.SIunits.Energy U(start=fluidVolume*rho_start* + Modelica.Units.SI.Energy U(start=fluidVolume*rho_start* Medium.specificInternalEnergy(Medium.setState_pTX( T=T_start, p=p_start, X=X_start[1:Medium.nXi])) + (T_start - Medium.reference_T)*CSen) "Internal energy of fluid"; - Modelica.SIunits.Mass m "Mass of fluid"; - Modelica.SIunits.Mass[Medium.nXi] mXi + Modelica.Units.SI.Mass m "Mass 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"; // C need to be added here because unlike for Xi, which has medium.Xi, // there is no variable medium.C Medium.ExtraProperty C[Medium.nC](nominal=C_nominal) "Trace substance mixture content"; - Modelica.SIunits.MassFlowRate mb_flow "Mass flows across boundaries"; - Modelica.SIunits.MassFlowRate[Medium.nXi] mbXi_flow + Modelica.Units.SI.MassFlowRate mb_flow "Mass flows across boundaries"; + Modelica.Units.SI.MassFlowRate[Medium.nXi] mbXi_flow "Substance mass flows across boundaries"; Medium.ExtraPropertyFlowRate[Medium.nC] mbC_flow "Trace substance mass flows across boundaries"; - Modelica.SIunits.EnthalpyFlowRate Hb_flow + Modelica.Units.SI.EnthalpyFlowRate Hb_flow "Enthalpy flow across boundaries or energy source/sink"; // Parameters that need to be defined by an extending class - parameter Modelica.SIunits.Volume fluidVolume "Volume"; - final parameter Modelica.SIunits.HeatCapacity CSen= + parameter Modelica.Units.SI.Volume fluidVolume "Volume"; + final parameter Modelica.Units.SI.HeatCapacity CSen= (mSenFac - 1)*rho_default*cp_default*fluidVolume "Aditional heat capacity for implementing mFactor"; protected Medium.EnthalpyFlowRate ports_H_flow[nPorts]; - Modelica.SIunits.MassFlowRate ports_mXi_flow[nPorts,Medium.nXi]; + Modelica.Units.SI.MassFlowRate ports_mXi_flow[nPorts,Medium.nXi]; Medium.ExtraPropertyFlowRate ports_mC_flow[nPorts,Medium.nC]; - parameter Modelica.SIunits.SpecificHeatCapacity cp_default= + parameter Modelica.Units.SI.SpecificHeatCapacity cp_default= Medium.specificHeatCapacityCp(state=state_default) "Heat capacity, to compute additional dry mass"; - parameter Modelica.SIunits.Density rho_start=Medium.density( + parameter Modelica.Units.SI.Density rho_start=Medium.density( Medium.setState_pTX( T=T_start, p=p_start, @@ -136,7 +136,7 @@ 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"; // Parameter that is used to construct the vector mXi_flow final parameter Real s[Medium.nXi] = {if Modelica.Utilities.Strings.isEqual( @@ -145,7 +145,7 @@ caseSensitive=false) then 1 else 0 for i in 1:Medium.nXi} "Vector with zero everywhere except where species is"; - parameter Modelica.SIunits.SpecificEnthalpy hStart= + parameter Modelica.Units.SI.SpecificEnthalpy hStart= Medium.specificEnthalpy_pTX(p_start, T_start, X_start) "Start value for specific enthalpy"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Interfaces/Examples/Humidifier_u.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Interfaces/Examples/Humidifier_u.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Interfaces/Examples/Humidifier_u.mo" 2022-03-10 09:57:31.652143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Interfaces/Examples/Humidifier_u.mo" 2022-03-10 09:58:42.736152328 +0000 @@ -3,7 +3,7 @@ extends Modelica.Icons.Example; package Medium = Buildings.Media.Air; - parameter Modelica.SIunits.MassFlowRate mWat_flow_nominal = 0.001 + parameter Modelica.Units.SI.MassFlowRate mWat_flow_nominal = 0.001 "Nominal water mass flow rate"; Humidifier hea1(redeclare package Medium = Medium, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Interfaces/Examples/PrescribedOutletState.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Interfaces/Examples/PrescribedOutletState.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Interfaces/Examples/PrescribedOutletState.mo" 2022-03-10 09:57:31.652143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Interfaces/Examples/PrescribedOutletState.mo" 2022-03-10 09:58:42.644152315 +0000 @@ -4,7 +4,7 @@ package Medium = Buildings.Media.Water; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=0.1 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=0.1 "Nominal mass flow rate"; Buildings.Fluid.Sources.Boundary_pT sin( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Interfaces/FourPortFlowResistanceParameters.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Interfaces/FourPortFlowResistanceParameters.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Interfaces/FourPortFlowResistanceParameters.mo" 2022-03-10 09:57:31.652143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Interfaces/FourPortFlowResistanceParameters.mo" 2022-03-10 09:58:42.588152308 +0000 @@ -10,7 +10,7 @@ "= true, use m_flow = f(dp) else dp = f(m_flow)" annotation (Evaluate=true, Dialog(enable = computeFlowResistance1, tab="Flow resistance", group="Medium 1")); - parameter Modelica.SIunits.PressureDifference dp1_nominal(min=0, + parameter Modelica.Units.SI.PressureDifference dp1_nominal(min=0, displayUnit="Pa") "Pressure difference" annotation(Dialog(group = "Nominal condition")); @@ -30,7 +30,7 @@ "= true, use m_flow = f(dp) else dp = f(m_flow)" annotation (Evaluate=true, Dialog(enable = computeFlowResistance2, tab="Flow resistance", group="Medium 2")); - parameter Modelica.SIunits.PressureDifference dp2_nominal(min=0, + parameter Modelica.Units.SI.PressureDifference dp2_nominal(min=0, displayUnit="Pa") "Pressure difference" annotation(Dialog(group = "Nominal condition")); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Interfaces/FourPortHeatMassExchanger.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Interfaces/FourPortHeatMassExchanger.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Interfaces/FourPortHeatMassExchanger.mo" 2022-03-10 09:57:31.652143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Interfaces/FourPortHeatMassExchanger.mo" 2022-03-10 09:58:42.580152308 +0000 @@ -9,9 +9,9 @@ extends Buildings.Fluid.Interfaces.FourPortFlowResistanceParameters( final computeFlowResistance1=true, final computeFlowResistance2=true); - parameter Modelica.SIunits.Time tau1 = 30 "Time constant at nominal flow" + parameter Modelica.Units.SI.Time tau1 = 30 "Time constant at nominal flow" annotation (Dialog(tab = "Dynamics", group="Nominal condition")); - parameter Modelica.SIunits.Time tau2 = 30 "Time constant at nominal flow" + parameter Modelica.Units.SI.Time tau2 = 30 "Time constant at nominal flow" annotation (Dialog(tab = "Dynamics", group="Nominal condition")); // Advanced @@ -108,9 +108,9 @@ extent={{-10,10},{10,-10}}, rotation=180))); - Modelica.SIunits.HeatFlowRate Q1_flow = vol1.heatPort.Q_flow + Modelica.Units.SI.HeatFlowRate Q1_flow = vol1.heatPort.Q_flow "Heat flow rate into medium 1"; - Modelica.SIunits.HeatFlowRate Q2_flow = vol2.heatPort.Q_flow + Modelica.Units.SI.HeatFlowRate Q2_flow = vol2.heatPort.Q_flow "Heat flow rate into medium 2"; Buildings.Fluid.FixedResistances.FixedResistanceDpM preDro1( @@ -146,22 +146,22 @@ protected parameter Medium1.ThermodynamicState sta1_nominal=Medium1.setState_pTX( T=Medium1.T_default, p=Medium1.p_default, X=Medium1.X_default); - parameter Modelica.SIunits.Density rho1_nominal=Medium1.density(sta1_nominal) + parameter Modelica.Units.SI.Density rho1_nominal=Medium1.density(sta1_nominal) "Density, used to compute fluid volume"; parameter Medium2.ThermodynamicState sta2_nominal=Medium2.setState_pTX( T=Medium2.T_default, p=Medium2.p_default, X=Medium2.X_default); - parameter Modelica.SIunits.Density rho2_nominal=Medium2.density(sta2_nominal) + parameter Modelica.Units.SI.Density rho2_nominal=Medium2.density(sta2_nominal) "Density, used to compute fluid volume"; parameter Medium1.ThermodynamicState sta1_start=Medium1.setState_pTX( T=T1_start, p=p1_start, X=X1_start); - parameter Modelica.SIunits.SpecificEnthalpy h1_outflow_start = Medium1.specificEnthalpy(sta1_start) + parameter Modelica.Units.SI.SpecificEnthalpy h1_outflow_start = Medium1.specificEnthalpy(sta1_start) "Start value for outflowing enthalpy"; parameter Medium2.ThermodynamicState sta2_start=Medium2.setState_pTX( T=T2_start, p=p2_start, X=X2_start); - parameter Modelica.SIunits.SpecificEnthalpy h2_outflow_start = Medium2.specificEnthalpy(sta2_start) - "Start value for outflowing enthalpy"; + parameter Modelica.Units.SI.SpecificEnthalpy h2_outflow_start = Medium2.specificEnthalpy(sta2_start) + "Start value for outflowing enthalpy"; initial algorithm // Check for tau1 assert((energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState) or diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Interfaces/PartialFourPortInterface.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Interfaces/PartialFourPortInterface.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Interfaces/PartialFourPortInterface.mo" 2022-03-10 09:57:31.652143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Interfaces/PartialFourPortInterface.mo" 2022-03-10 09:58:42.504152298 +0000 @@ -2,10 +2,10 @@ partial model PartialFourPortInterface "Partial model transporting fluid between two ports without storing mass or energy" extends Buildings.Fluid.Interfaces.PartialFourPort; - parameter Modelica.SIunits.MassFlowRate m1_flow_nominal(min=0) + parameter Modelica.Units.SI.MassFlowRate m1_flow_nominal(min=0) "Nominal mass flow rate" annotation(Dialog(group = "Nominal condition")); - parameter Modelica.SIunits.MassFlowRate m2_flow_nominal(min=0) + parameter Modelica.Units.SI.MassFlowRate m2_flow_nominal(min=0) "Nominal mass flow rate" annotation(Dialog(group = "Nominal condition")); parameter Medium1.MassFlowRate m1_flow_small(min=0) = 1E-4*abs(m1_flow_nominal) @@ -21,12 +21,12 @@ Medium1.MassFlowRate m1_flow(start=0) = port_a1.m_flow "Mass flow rate from port_a1 to port_b1 (m1_flow > 0 is design flow direction)"; - Modelica.SIunits.PressureDifference dp1(start=0, displayUnit="Pa") + Modelica.Units.SI.PressureDifference dp1(start=0, displayUnit="Pa") "Pressure difference between port_a1 and port_b1"; Medium2.MassFlowRate m2_flow(start=0) = port_a2.m_flow "Mass flow rate from port_a2 to port_b2 (m2_flow > 0 is design flow direction)"; - Modelica.SIunits.PressureDifference dp2(start=0, displayUnit="Pa") + Modelica.Units.SI.PressureDifference dp2(start=0, displayUnit="Pa") "Pressure difference between port_a2 and port_b2"; Medium1.ThermodynamicState sta_a1= diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Interfaces/PartialTwoPortInterface.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Interfaces/PartialTwoPortInterface.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Interfaces/PartialTwoPortInterface.mo" 2022-03-10 09:57:31.652143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Interfaces/PartialTwoPortInterface.mo" 2022-03-10 09:58:42.488152295 +0000 @@ -5,10 +5,10 @@ port_a(p(start=Medium.p_default)), port_b(p(start=Medium.p_default))); - 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(min=0) = 1E-4*abs(m_flow_nominal) + 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")); // Diagnostics @@ -16,9 +16,9 @@ "= true, if actual temperature at port is computed" annotation(Dialog(tab="Advanced",group="Diagnostics")); - Modelica.SIunits.MassFlowRate m_flow(start=0) = port_a.m_flow + Modelica.Units.SI.MassFlowRate m_flow(start=0) = port_a.m_flow "Mass flow rate from port_a to port_b (m_flow > 0 is design flow direction)"; - Modelica.SIunits.PressureDifference dp(start=0, displayUnit="Pa") + Modelica.Units.SI.PressureDifference dp(start=0, displayUnit="Pa") "Pressure difference between port_a and port_b"; Medium.ThermodynamicState sta_a= diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Interfaces/PartialTwoPortTransport.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Interfaces/PartialTwoPortTransport.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Interfaces/PartialTwoPortTransport.mo" 2022-03-10 09:57:31.652143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Interfaces/PartialTwoPortTransport.mo" 2022-03-10 09:58:42.480152294 +0000 @@ -6,7 +6,7 @@ // Advanced // Note: value of dp_start shall be refined by derived model, // based on local dp_nominal - parameter Modelica.SIunits.PressureDifference dp_start(displayUnit="Pa") = 0 + parameter Modelica.Units.SI.PressureDifference dp_start(displayUnit="Pa") = 0 "Guess value of dp = port_a.p - port_b.p" annotation(Dialog(tab = "Advanced", enable=from_dp)); parameter Medium.MassFlowRate m_flow_start = 0 @@ -30,11 +30,11 @@ Medium.MassFlowRate m_flow( min=if allowFlowReversal then -Modelica.Constants.inf else 0, start = m_flow_start) "Mass flow rate in design flow direction"; - Modelica.SIunits.PressureDifference dp(start=dp_start, + Modelica.Units.SI.PressureDifference dp(start=dp_start, displayUnit="Pa") "Pressure difference between port_a and port_b (= port_a.p - port_b.p)"; - Modelica.SIunits.VolumeFlowRate V_flow= + Modelica.Units.SI.VolumeFlowRate V_flow= m_flow/Modelica.Fluid.Utilities.regStep(m_flow, Medium.density( Medium.setState_phX( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Interfaces/PrescribedOutletState.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Interfaces/PrescribedOutletState.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Interfaces/PrescribedOutletState.mo" 2022-03-10 09:57:31.652143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Interfaces/PrescribedOutletState.mo" 2022-03-10 09:58:42.472152294 +0000 @@ -17,7 +17,7 @@ annotation (Placement(transformation(extent={{100,70},{120,90}}))); protected - parameter Modelica.SIunits.SpecificHeatCapacity cp_default= + parameter Modelica.Units.SI.SpecificHeatCapacity cp_default= Medium.specificHeatCapacityCp( Medium.setState_pTX( p=Medium.p_default, @@ -29,26 +29,26 @@ parameter Boolean restrictCool = Q_flow_maxCool > -Modelica.Constants.inf/10.0 "Flag, true if maximum cooling power is restricted"; - parameter Modelica.SIunits.SpecificEnthalpy deltah= + parameter Modelica.Units.SI.SpecificEnthalpy deltah= cp_default*m_flow_small*0.01 "Small value for deltah used for regularization"; final parameter Boolean dynamic = tau > 1E-10 or tau < -1E-10 "Flag, true if the sensor is a dynamic sensor"; - Modelica.SIunits.MassFlowRate m_flow_pos + Modelica.Units.SI.MassFlowRate m_flow_pos "Mass flow rate, or zero if reverse flow"; - Modelica.SIunits.MassFlowRate m_flow_limited + Modelica.Units.SI.MassFlowRate m_flow_limited "Mass flow rate bounded away from zero"; - Modelica.SIunits.SpecificEnthalpy hSet + Modelica.Units.SI.SpecificEnthalpy hSet "Set point for enthalpy leaving port_b"; - Modelica.SIunits.Temperature T + Modelica.Units.SI.Temperature T "Temperature of outlet state assuming unlimited capacity and taking dynamics into account"; - Modelica.SIunits.SpecificEnthalpy dhSetAct + Modelica.Units.SI.SpecificEnthalpy dhSetAct "Actual enthalpy difference from port_a to port_b"; Real k(start=1) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Interfaces/PrescribedOutletStateParameters.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Interfaces/PrescribedOutletStateParameters.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Interfaces/PrescribedOutletStateParameters.mo" 2022-03-10 09:57:31.652143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Interfaces/PrescribedOutletStateParameters.mo" 2022-03-10 09:58:42.460152293 +0000 @@ -2,19 +2,19 @@ record PrescribedOutletStateParameters "Parameters for models with prescribed outlet state" - parameter Modelica.SIunits.HeatFlowRate Q_flow_maxHeat = Modelica.Constants.inf + parameter Modelica.Units.SI.HeatFlowRate Q_flow_maxHeat = Modelica.Constants.inf "Maximum heat flow rate for heating (positive)"; - parameter Modelica.SIunits.HeatFlowRate Q_flow_maxCool = -Modelica.Constants.inf + parameter Modelica.Units.SI.HeatFlowRate Q_flow_maxCool = -Modelica.Constants.inf "Maximum heat flow rate for cooling (negative)"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal "Nominal mass flow rate, used for regularization near zero flow" annotation(Dialog(group = "Nominal condition")); - parameter Modelica.SIunits.Time tau(min=0) = 10 + parameter Modelica.Units.SI.Time tau(min=0) = 10 "Time constant at nominal flow rate (used if energyDynamics <> Modelica.Fluid.Types.Dynamics.SteadyState)" annotation(Dialog(tab = "Dynamics")); - parameter Modelica.SIunits.Temperature T_start + parameter Modelica.Units.SI.Temperature T_start "Initial or guess value of set point" annotation (Dialog(tab = "Dynamics", group="Initialization")); parameter Modelica.Fluid.Types.Dynamics energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Interfaces/StaticFourPortHeatMassExchanger.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Interfaces/StaticFourPortHeatMassExchanger.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Interfaces/StaticFourPortHeatMassExchanger.mo" 2022-03-10 09:57:31.652143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Interfaces/StaticFourPortHeatMassExchanger.mo" 2022-03-10 09:58:42.452152292 +0000 @@ -14,11 +14,11 @@ parameter Boolean homotopyInitialization = true "= true, use homotopy method" annotation(Evaluate=true, Dialog(tab="Advanced")); - input Modelica.SIunits.HeatFlowRate Q1_flow + input Modelica.Units.SI.HeatFlowRate Q1_flow "Heat transferred into the medium 1"; input Medium1.MassFlowRate mWat1_flow "Moisture mass flow rate added to the medium 1"; - input Modelica.SIunits.HeatFlowRate Q2_flow + input Modelica.Units.SI.HeatFlowRate Q2_flow "Heat transferred into the medium 2"; input Medium2.MassFlowRate mWat2_flow "Moisture mass flow rate added to the medium 2"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Interfaces/StaticTwoPortConservationEquation.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Interfaces/StaticTwoPortConservationEquation.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Interfaces/StaticTwoPortConservationEquation.mo" 2022-03-10 09:57:31.652143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Interfaces/StaticTwoPortConservationEquation.mo" 2022-03-10 09:58:42.444152290 +0000 @@ -68,7 +68,7 @@ Real m_flowInv(unit="s/kg") "Regularization of 1/m_flow of port_a"; - Modelica.SIunits.MassFlowRate mXi_flow[Medium.nXi] + Modelica.Units.SI.MassFlowRate mXi_flow[Medium.nXi] "Mass flow rates of independent substances added to the medium"; // Parameters for inverseXRegularized. diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Interfaces/StaticTwoPortHeatMassExchanger.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Interfaces/StaticTwoPortHeatMassExchanger.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Interfaces/StaticTwoPortHeatMassExchanger.mo" 2022-03-10 09:57:31.652143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Interfaces/StaticTwoPortHeatMassExchanger.mo" 2022-03-10 09:58:42.420152288 +0000 @@ -13,8 +13,8 @@ annotation(Evaluate=true, Dialog(tab="Advanced")); // Model inputs - input Modelica.SIunits.HeatFlowRate Q_flow "Heat transferred into the medium"; - input Modelica.SIunits.MassFlowRate mWat_flow + input Modelica.Units.SI.HeatFlowRate Q_flow "Heat transferred into the medium"; + input Modelica.Units.SI.MassFlowRate mWat_flow "Moisture mass flow rate added to the medium"; // Models for conservation equations and pressure drop diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Interfaces/TwoPortFlowResistanceParameters.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Interfaces/TwoPortFlowResistanceParameters.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Interfaces/TwoPortFlowResistanceParameters.mo" 2022-03-10 09:57:31.652143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Interfaces/TwoPortFlowResistanceParameters.mo" 2022-03-10 09:58:42.408152286 +0000 @@ -10,7 +10,7 @@ "= true, use m_flow = f(dp) else dp = f(m_flow)" annotation (Evaluate=true, Dialog(enable = computeFlowResistance, tab="Flow resistance")); - parameter Modelica.SIunits.PressureDifference dp_nominal(min=0, + parameter Modelica.Units.SI.PressureDifference dp_nominal(min=0, displayUnit="Pa") "Pressure difference" annotation(Dialog(group = "Nominal condition")); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Interfaces/TwoPortHeatMassExchanger.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Interfaces/TwoPortHeatMassExchanger.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Interfaces/TwoPortHeatMassExchanger.mo" 2022-03-10 09:57:31.652143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Interfaces/TwoPortHeatMassExchanger.mo" 2022-03-10 09:58:42.400152284 +0000 @@ -7,7 +7,7 @@ extends Buildings.Fluid.Interfaces.TwoPortFlowResistanceParameters( final computeFlowResistance=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")); @@ -71,13 +71,13 @@ protected 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"; parameter Medium.ThermodynamicState sta_start=Medium.setState_pTX( T=T_start, p=p_start, X=X_start); - parameter Modelica.SIunits.SpecificEnthalpy h_outflow_start = Medium.specificEnthalpy(sta_start) - "Start value for outflowing enthalpy"; + parameter Modelica.Units.SI.SpecificEnthalpy h_outflow_start = Medium.specificEnthalpy(sta_start) + "Start value for outflowing enthalpy"; initial algorithm assert((energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState) or tau > Modelica.Constants.eps, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/MassExchangers/ConstantEffectiveness.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/MassExchangers/ConstantEffectiveness.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/MassExchangers/ConstantEffectiveness.mo" 2022-03-10 09:57:31.652143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/MassExchangers/ConstantEffectiveness.mo" 2022-03-10 09:58:42.348152278 +0000 @@ -11,19 +11,19 @@ mWat1_flow = +mWat_flow, mWat2_flow = -mWat_flow); - parameter Modelica.SIunits.Efficiency epsS(max=1) = 0.8 + parameter Modelica.Units.SI.Efficiency epsS(max=1) = 0.8 "Sensible heat exchanger effectiveness"; - parameter Modelica.SIunits.Efficiency epsL(max=1) = 0.8 + parameter Modelica.Units.SI.Efficiency epsL(max=1) = 0.8 "Latent heat exchanger effectiveness"; Medium1.MassFraction X_w_in1 "Inlet water mass fraction of medium 1"; Medium2.MassFraction X_w_in2 "Inlet water mass fraction of medium 2"; - Modelica.SIunits.MassFlowRate mWat_flow + + Modelica.Units.SI.MassFlowRate mWat_flow "Water flow rate from medium 2 to medium 1"; - Modelica.SIunits.MassFlowRate mMax_flow + Modelica.Units.SI.MassFlowRate mMax_flow "Maximum water flow rate from medium 2 to medium 1"; - protected parameter Integer i1_w(min=1, fixed=false) "Index for water substance"; parameter Integer i2_w(min=1, fixed=false) "Index for water substance"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/MassExchangers/Examples/Humidifier_u.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/MassExchangers/Examples/Humidifier_u.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/MassExchangers/Examples/Humidifier_u.mo" 2022-03-10 09:57:31.652143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/MassExchangers/Examples/Humidifier_u.mo" 2022-03-10 09:58:42.324152274 +0000 @@ -5,7 +5,7 @@ package Medium = Buildings.Media.Air; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal= 3000/1000/20 "Nominal mass flow rate"; Buildings.Fluid.Sources.MassFlowSource_T sou( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/MassExchangers/Humidifier_u.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/MassExchangers/Humidifier_u.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/MassExchangers/Humidifier_u.mo" 2022-03-10 09:57:31.652143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/MassExchangers/Humidifier_u.mo" 2022-03-10 09:58:42.304152272 +0000 @@ -11,11 +11,11 @@ "Get the temperature from the input connector" annotation(Evaluate=true, HideResult=true); - parameter Modelica.SIunits.Temperature T = 293.15 + parameter Modelica.Units.SI.Temperature T = 293.15 "Temperature of water that is added to the fluid stream (used if use_T_in=false)" annotation (Dialog(enable = not use_T_in)); - parameter Modelica.SIunits.MassFlowRate mWat_flow_nominal + parameter Modelica.Units.SI.MassFlowRate mWat_flow_nominal "Water mass flow rate at u=1, positive for humidification"; Modelica.Blocks.Interfaces.RealInput T_in if use_T_in diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/MixingVolumes/BaseClasses/PartialMixingVolume.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/MixingVolumes/BaseClasses/PartialMixingVolume.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/MixingVolumes/BaseClasses/PartialMixingVolume.mo" 2022-03-10 09:57:31.656143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/MixingVolumes/BaseClasses/PartialMixingVolume.mo" 2022-03-10 09:58:42.268152267 +0000 @@ -19,19 +19,19 @@ parameter Boolean use_C_flow = false "Set to true to enable input connector for trace substance" annotation(Evaluate=true, Dialog(tab="Advanced")); - 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")); // Port definitions parameter Integer nPorts=0 "Number of ports" annotation(Evaluate=true, Dialog(connectorSizing=true, tab="General",group="Ports")); - parameter Modelica.SIunits.MassFlowRate m_flow_small(min=0) = 1E-4*abs(m_flow_nominal) + 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 Boolean allowFlowReversal = true "= true to allow flow reversal in medium, false restricts to design direction (ports[1] -> ports[2]). Used only if model has two ports." annotation(Dialog(tab="Assumptions"), Evaluate=true); - parameter Modelica.SIunits.Volume V "Volume"; + parameter Modelica.Units.SI.Volume V "Volume"; Modelica.Fluid.Vessels.BaseClasses.VesselFluidPorts_b ports[nPorts]( redeclare each package Medium = Medium) "Fluid inlets and outlets" annotation (Placement(transformation(extent={{-40,-10},{40,10}}, @@ -43,10 +43,10 @@ "Temperature of the fluid"; Modelica.Blocks.Interfaces.RealOutput U(unit="J") "Internal energy of the component"; - Modelica.SIunits.Pressure p = if nPorts > 0 then ports[1].p else p_start + Modelica.Units.SI.Pressure p = if nPorts > 0 then ports[1].p else p_start "Pressure of the fluid"; Modelica.Blocks.Interfaces.RealOutput m(unit="kg") "Mass of the component"; - Modelica.SIunits.MassFraction Xi[Medium.nXi] = XiOut_internal + Modelica.Units.SI.MassFraction Xi[Medium.nXi] = XiOut_internal "Species concentration of the fluid"; Modelica.Blocks.Interfaces.RealOutput mXi[Medium.nXi](each unit="kg") "Species mass of the component"; @@ -89,14 +89,14 @@ annotation (Placement(transformation(extent={{60,0},{80,20}}))); // Density at start values, used to compute initial values and start guesses - parameter Modelica.SIunits.Density rho_start=Medium.density( + parameter Modelica.Units.SI.Density rho_start=Medium.density( state=state_start) "Density, used to compute start and guess values"; final parameter Medium.ThermodynamicState state_default = Medium.setState_pTX( 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"; final parameter Medium.ThermodynamicState state_start = Medium.setState_pTX( T=T_start, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/MixingVolumes/Examples/MixingVolumeMoistAir.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/MixingVolumes/Examples/MixingVolumeMoistAir.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/MixingVolumes/Examples/MixingVolumeMoistAir.mo" 2022-03-10 09:57:31.656143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/MixingVolumes/Examples/MixingVolumeMoistAir.mo" 2022-03-10 09:58:42.216152261 +0000 @@ -4,7 +4,7 @@ package Medium = Buildings.Media.Air; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 0.001 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 0.001 "Nominal mass flow rate"; Buildings.Fluid.MixingVolumes.MixingVolumeMoistAir vol1( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/MixingVolumes/Validation/BaseClasses/MixingVolumeReverseFlow.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/MixingVolumes/Validation/BaseClasses/MixingVolumeReverseFlow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/MixingVolumes/Validation/BaseClasses/MixingVolumeReverseFlow.mo" 2022-03-10 09:57:31.656143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/MixingVolumes/Validation/BaseClasses/MixingVolumeReverseFlow.mo" 2022-03-10 09:58:42.136152252 +0000 @@ -6,8 +6,8 @@ constant Boolean prescribedHeatFlowRate = false "Flag that affects what steady state balance is used in the volume"; - parameter Modelica.SIunits.Pressure dp_nominal = 10 "Nominal pressure drop"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 2.0 + parameter Modelica.Units.SI.Pressure dp_nominal = 10 "Nominal pressure drop"; + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 2.0 "Nominal mass flow rate"; Modelica.Fluid.Sources.MassFlowSource_T sou( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/MixingVolumes/Validation/MixingVolumeMassFlow.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/MixingVolumes/Validation/MixingVolumeMassFlow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/MixingVolumes/Validation/MixingVolumeMassFlow.mo" 2022-03-10 09:57:31.656143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/MixingVolumes/Validation/MixingVolumeMassFlow.mo" 2022-03-10 09:58:42.072152242 +0000 @@ -3,9 +3,9 @@ extends Modelica.Icons.Example; package Medium = Buildings.Media.Air "Medium model"; - parameter Modelica.SIunits.PressureDifference dp_nominal = 10 + parameter Modelica.Units.SI.PressureDifference dp_nominal = 10 "Nominal pressure drop"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 0.5 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 0.5 "Nominal mass flow rate"; Modelica.Fluid.Sources.MassFlowSource_T sou( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/MixingVolumes/Validation/MixingVolumeTraceSubstance.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/MixingVolumes/Validation/MixingVolumeTraceSubstance.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/MixingVolumes/Validation/MixingVolumeTraceSubstance.mo" 2022-03-10 09:57:31.656143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/MixingVolumes/Validation/MixingVolumeTraceSubstance.mo" 2022-03-10 09:58:42.044152239 +0000 @@ -5,8 +5,8 @@ package Medium = Buildings.Media.Air(extraPropertiesNames={"CO2"}) "Medium model"; - parameter Modelica.SIunits.Pressure dp_nominal = 10 "Nominal pressure drop"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 0.5 + parameter Modelica.Units.SI.Pressure dp_nominal = 10 "Nominal pressure drop"; + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 0.5 "Nominal mass flow rate"; Modelica.Fluid.Sources.MassFlowSource_T sou( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/MixingVolumes/Validation/MixingVolumeZeroFlow.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/MixingVolumes/Validation/MixingVolumeZeroFlow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/MixingVolumes/Validation/MixingVolumeZeroFlow.mo" 2022-03-10 09:57:31.656143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/MixingVolumes/Validation/MixingVolumeZeroFlow.mo" 2022-03-10 09:58:41.996152233 +0000 @@ -38,7 +38,7 @@ "Prescribed temperature" annotation (Placement(transformation(extent={{-56,34},{-44,46}}))); Modelica.Blocks.Sources.Cosine cos1( - freqHz=1, + f =1, offset=283.15, amplitude=0.001) "Cosine input" annotation (Placement(transformation(extent={{-76,34},{-64,46}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/MixingVolumes/Validation/MoistureMixingConservationDynamicBalance.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/MixingVolumes/Validation/MoistureMixingConservationDynamicBalance.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/MixingVolumes/Validation/MoistureMixingConservationDynamicBalance.mo" 2022-03-10 09:57:31.656143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/MixingVolumes/Validation/MoistureMixingConservationDynamicBalance.mo" 2022-03-10 09:58:41.976152230 +0000 @@ -14,9 +14,9 @@ hSol(k=sum(U_start)), mWatFlo3(k=0)); - parameter Modelica.SIunits.Mass[3] m_start(each fixed=false) + parameter Modelica.Units.SI.Mass[3] m_start(each fixed=false) "Initial mass of the mixing volumes"; - parameter Modelica.SIunits.InternalEnergy[3] U_start(each fixed=false) + parameter Modelica.Units.SI.InternalEnergy[3] U_start(each fixed=false) "Initial energy of the mixing volumes"; Modelica.Blocks.Continuous.Integrator intMasFloVapIn( k=1, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/BaseClasses/Characteristics/efficiency.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/BaseClasses/Characteristics/efficiency.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/BaseClasses/Characteristics/efficiency.mo" 2022-03-10 09:57:31.656143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/BaseClasses/Characteristics/efficiency.mo" 2022-03-10 09:58:41.916152224 +0000 @@ -3,12 +3,12 @@ extends Modelica.Icons.Function; input Buildings.Fluid.Movers.BaseClasses.Characteristics.efficiencyParameters per "Efficiency performance data"; - input Modelica.SIunits.VolumeFlowRate V_flow "Volumetric flow rate"; + input Modelica.Units.SI.VolumeFlowRate V_flow "Volumetric flow rate"; input Real d[:] "Derivatives at support points for spline interpolation"; input Real r_N(unit="1") "Relative revolution, r_N=N/N_nominal"; input Real delta "Small value for switching implementation around zero rpm"; - output Modelica.SIunits.Efficiency eta "Efficiency"; + output Modelica.Units.SI.Efficiency eta "Efficiency"; protected Integer n = size(per.V_flow, 1) "Number of data points"; Real rat "Ratio of V_flow/r_N"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/BaseClasses/Characteristics/efficiencyParameters.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/BaseClasses/Characteristics/efficiencyParameters.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/BaseClasses/Characteristics/efficiencyParameters.mo" 2022-03-10 09:57:31.656143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/BaseClasses/Characteristics/efficiencyParameters.mo" 2022-03-10 09:58:41.908152223 +0000 @@ -1,9 +1,9 @@ within Buildings.Fluid.Movers.BaseClasses.Characteristics; record efficiencyParameters "Record for efficiency parameters" extends Modelica.Icons.Record; - parameter Modelica.SIunits.VolumeFlowRate V_flow[:]( + parameter Modelica.Units.SI.VolumeFlowRate V_flow[:]( each min=0) "Volumetric flow rate at user-selected operating points"; - parameter Modelica.SIunits.Efficiency eta[size(V_flow,1)]( + parameter Modelica.Units.SI.Efficiency eta[size(V_flow,1)]( each max=1) "Fan or pump efficiency at these flow rates"; annotation (Documentation(info="diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/BaseClasses/Characteristics/flowApproximationAtOrigin.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/BaseClasses/Characteristics/flowApproximationAtOrigin.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/BaseClasses/Characteristics/flowApproximationAtOrigin.mo" 2022-03-10 09:57:31.656143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/BaseClasses/Characteristics/flowApproximationAtOrigin.mo" 2022-03-10 09:58:41.900152221 +0000 @@ -2,14 +2,14 @@ function flowApproximationAtOrigin "Approximation for fan or pump pressure raise at origin" 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 Modelica.SIunits.VolumeFlowRate VDelta_flow "Small volume flow rate"; - input Modelica.SIunits.PressureDifference dpDelta(displayUnit="Pa") "Small pressure"; + input Modelica.Units.SI.VolumeFlowRate VDelta_flow "Small volume flow rate"; + input Modelica.Units.SI.PressureDifference dpDelta(displayUnit="Pa") "Small pressure"; input Real delta "Small value used to transition to other fan curve"; input Real cBar[2] "Coefficients for linear approximation of pressure vs. flow rate"; - output Modelica.SIunits.PressureDifference dp "Pressure raise"; + output Modelica.Units.SI.PressureDifference dp "Pressure raise"; algorithm // see equation 20 in Buildings/Resources/Images/Fluid/Movers/UsersGuide/2013-IBPSA-Wetter.pdf diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/BaseClasses/Characteristics/flowParameters.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/BaseClasses/Characteristics/flowParameters.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/BaseClasses/Characteristics/flowParameters.mo" 2022-03-10 09:57:31.656143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/BaseClasses/Characteristics/flowParameters.mo" 2022-03-10 09:58:41.896152221 +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/Buildings 3.0.0/Fluid/Movers/BaseClasses/Characteristics/flowParametersInternal.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/BaseClasses/Characteristics/flowParametersInternal.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/BaseClasses/Characteristics/flowParametersInternal.mo" 2022-03-10 09:57:31.656143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/BaseClasses/Characteristics/flowParametersInternal.mo" 2022-03-10 09:58:41.888152219 +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/Buildings 3.0.0/Fluid/Movers/BaseClasses/Characteristics/power.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/BaseClasses/Characteristics/power.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/BaseClasses/Characteristics/power.mo" 2022-03-10 09:57:31.656143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/BaseClasses/Characteristics/power.mo" 2022-03-10 09:58:41.884152220 +0000 @@ -3,16 +3,16 @@ extends Modelica.Icons.Function; input Buildings.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/Buildings 3.0.0/Fluid/Movers/BaseClasses/Characteristics/powerParameters.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/BaseClasses/Characteristics/powerParameters.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/BaseClasses/Characteristics/powerParameters.mo" 2022-03-10 09:57:31.656143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/BaseClasses/Characteristics/powerParameters.mo" 2022-03-10 09:58:41.852152216 +0000 @@ -1,9 +1,9 @@ within Buildings.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/Buildings 3.0.0/Fluid/Movers/BaseClasses/Characteristics/pressure.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/BaseClasses/Characteristics/pressure.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/BaseClasses/Characteristics/pressure.mo" 2022-03-10 09:57:31.656143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/BaseClasses/Characteristics/pressure.mo" 2022-03-10 09:58:41.848152214 +0000 @@ -4,14 +4,14 @@ extends Modelica.Icons.Function; input Buildings.Fluid.Movers.BaseClasses.Characteristics.flowParametersInternal 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 Modelica.SIunits.VolumeFlowRate VDelta_flow "Small volume flow rate"; - input Modelica.SIunits.PressureDifference dpDelta(displayUnit="Pa") "Small pressure"; + input Modelica.Units.SI.VolumeFlowRate VDelta_flow "Small volume flow rate"; + input Modelica.Units.SI.PressureDifference dpDelta(displayUnit="Pa") "Small pressure"; - input Modelica.SIunits.VolumeFlowRate V_flow_max + input Modelica.Units.SI.VolumeFlowRate V_flow_max "Maximum volume flow rate at r_N=1 and dp=0"; - input Modelica.SIunits.PressureDifference dpMax(min=0, + input Modelica.Units.SI.PressureDifference dpMax(min=0, displayUnit="Pa") "Maximum pressure at r_N=1 and V_flow=0"; @@ -21,14 +21,15 @@ "Coefficients for linear approximation of pressure vs. flow rate"; input Real kRes(unit="kg/(s.m4)") "Linear coefficient for fan-internal pressure drop"; - output Modelica.SIunits.PressureDifference dp(displayUnit="Pa") + output Modelica.Units.SI.PressureDifference dp(displayUnit="Pa") "Pressure raise"; protected Integer dimD(min=2)=size(per.V_flow, 1) "Dimension of data vector"; + function performanceCurve "Performance curve away from the origin" - 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[dimD] "Coefficients for polynomial of pressure vs. flow rate"; input @@ -36,10 +37,10 @@ "Pressure performance data"; input Integer dimD "Dimension of data vector"; - output Modelica.SIunits.PressureDifference dp(displayUnit="Pa") "Pressure raise"; + output Modelica.Units.SI.PressureDifference dp(displayUnit="Pa") "Pressure raise"; protected - 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 rat := V_flow/r_N; @@ -63,7 +64,6 @@ y2d=d[i+1]); annotation(smoothOrder=1); end performanceCurve; - algorithm if r_N >= delta then dp := performanceCurve(V_flow=V_flow, r_N=r_N, d=d, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/BaseClasses/FlowMachineInterface.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/BaseClasses/FlowMachineInterface.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/BaseClasses/FlowMachineInterface.mo" 2022-03-10 09:57:31.656143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/BaseClasses/FlowMachineInterface.mo" 2022-03-10 09:58:41.836152213 +0000 @@ -1,7 +1,7 @@ within Buildings.Fluid.Movers.BaseClasses; model FlowMachineInterface "Partial model with performance curves for fans or pumps" - extends Modelica.Blocks.Interfaces.BlockIcon; + extends Modelica.Blocks.Icons.Block; import cha = Buildings.Fluid.Movers.BaseClasses.Characteristics; @@ -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" @@ -131,10 +131,10 @@ 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.VolumeFlowRate VDelta_flow( + parameter Modelica.Units.SI.VolumeFlowRate VDelta_flow( fixed=false, start=delta*V_flow_nominal) "Small volume flow rate"; - parameter Modelica.SIunits.PressureDifference dpDelta( + parameter Modelica.Units.SI.PressureDifference dpDelta( fixed=false, start=100, displayUnit="Pa") "Small pressure"; @@ -143,7 +143,7 @@ parameter Real cBar[2](each fixed=false) "Coefficients for linear approximation of pressure vs. 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/Buildings 3.0.0/Fluid/Movers/BaseClasses/PartialFlowMachine.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/BaseClasses/PartialFlowMachine.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/BaseClasses/PartialFlowMachine.mo" 2022-03-10 09:57:31.656143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/BaseClasses/PartialFlowMachine.mo" 2022-03-10 09:58:41.784152206 +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 filteredSpeed=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=filteredSpeed)); parameter Modelica.Blocks.Types.Init init=Modelica.Blocks.Types.Init.InitialOutput @@ -89,13 +89,13 @@ iconTransformation(extent={{-10,-78},{10,-58}}))); // Variables - Modelica.SIunits.VolumeFlowRate VMachine_flow = eff.V_flow "Volume flow rate"; - Modelica.SIunits.PressureDifference dpMachine(displayUnit="Pa")= + Modelica.Units.SI.VolumeFlowRate VMachine_flow = eff.V_flow "Volume flow rate"; + Modelica.Units.SI.PressureDifference dpMachine(displayUnit="Pa")= -preSou.dp "Pressure difference"; - Modelica.SIunits.Efficiency eta = eff.eta "Global efficiency"; - Modelica.SIunits.Efficiency etaHyd = eff.etaHyd "Hydraulic efficiency"; - Modelica.SIunits.Efficiency etaMot = eff.etaMot "Motor efficiency"; + Modelica.Units.SI.Efficiency eta = eff.eta "Global efficiency"; + Modelica.Units.SI.Efficiency etaHyd = eff.etaHyd "Hydraulic efficiency"; + Modelica.Units.SI.Efficiency etaMot = eff.etaMot "Motor efficiency"; // Quantity to control protected @@ -119,7 +119,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] @@ -128,7 +128,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, @@ -139,7 +139,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/Buildings 3.0.0/Fluid/Movers/BaseClasses/PowerInterface.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/BaseClasses/PowerInterface.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/BaseClasses/PowerInterface.mo" 2022-03-10 09:57:31.656143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/BaseClasses/PowerInterface.mo" 2022-03-10 09:58:41.732152201 +0000 @@ -1,7 +1,7 @@ within Buildings.Fluid.Movers.BaseClasses; model PowerInterface "Partial model to compute power draw and heat dissipation of fans and pumps" - extends Modelica.Blocks.Interfaces.BlockIcon; + extends Modelica.Blocks.Icons.Block; parameter Boolean homotopyInitialization = true "= true, use homotopy method" annotation(Evaluate=true, Dialog(tab="Advanced")); @@ -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( @@ -42,13 +42,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/Buildings 3.0.0/Fluid/Movers/Data/Generic.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/Data/Generic.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/Data/Generic.mo" 2022-03-10 09:57:31.656143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/Data/Generic.mo" 2022-03-10 09:58:41.660152190 +0000 @@ -56,15 +56,15 @@ "Vector of normalized speed set points, used if inputType = Buildings.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 = Buildings.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 = Buildings.Fluid.Types.InputType.Stages" annotation (Dialog(group="Speeds in RPM")); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/Examples/ClosedLoop_y.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/Examples/ClosedLoop_y.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/Examples/ClosedLoop_y.mo" 2022-03-10 09:57:31.656143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/Examples/ClosedLoop_y.mo" 2022-03-10 09:58:41.468152166 +0000 @@ -4,9 +4,9 @@ package Medium = Buildings.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/Buildings 3.0.0/Fluid/Movers/Examples/MoverParameter.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/Examples/MoverParameter.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/Examples/MoverParameter.mo" 2022-03-10 09:57:31.656143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/Examples/MoverParameter.mo" 2022-03-10 09:58:41.448152165 +0000 @@ -4,7 +4,7 @@ extends Modelica.Icons.Example; package Medium = Buildings.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( @@ -62,7 +62,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/Buildings 3.0.0/Fluid/Movers/Examples/MoverStages.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/Examples/MoverStages.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/Examples/MoverStages.mo" 2022-03-10 09:57:31.656143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/Examples/MoverStages.mo" 2022-03-10 09:58:41.436152163 +0000 @@ -8,13 +8,13 @@ pump_dp(inputType=Buildings.Fluid.Types.InputType.Stages)); package Medium = Buildings.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/Buildings 3.0.0/Fluid/Movers/Examples/PumpsParallel.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/Examples/PumpsParallel.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/Examples/PumpsParallel.mo" 2022-03-10 09:57:31.656143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/Examples/PumpsParallel.mo" 2022-03-10 09:58:41.428152162 +0000 @@ -4,10 +4,10 @@ package Medium = Buildings.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"; Buildings.Fluid.FixedResistances.FixedResistanceDpM dpIn1( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/Examples/PumpsSeries.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/Examples/PumpsSeries.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/Examples/PumpsSeries.mo" 2022-03-10 09:57:31.656143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/Examples/PumpsSeries.mo" 2022-03-10 09:58:41.416152161 +0000 @@ -3,7 +3,7 @@ extends Modelica.Icons.Example; package Medium = Buildings.Media.Water; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=1 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1 "Nominal mass flow rate"; Buildings.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"; Buildings.Fluid.Movers.SpeedControlled_y floMac2( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/Examples/SpeedControlled_y_pumpCurves.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/Examples/SpeedControlled_y_pumpCurves.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/Examples/SpeedControlled_y_pumpCurves.mo" 2022-03-10 09:57:31.656143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/Examples/SpeedControlled_y_pumpCurves.mo" 2022-03-10 09:58:41.404152159 +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 = Buildings.Fluid.Movers.SpeedControlled_y ( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/FlowControlled_dp.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/FlowControlled_dp.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/FlowControlled_dp.mo" 2022-03-10 09:57:31.656143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/FlowControlled_dp.mo" 2022-03-10 09:58:41.384152157 +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 filteredSpeed=true, @@ -36,13 +36,13 @@ 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 == Buildings.Fluid.Types.InputType.Constant)); - parameter Modelica.SIunits.PressureDifference[:] heads( + parameter Modelica.Units.SI.PressureDifference[:] heads( each min=0, each displayUnit="Pa") = dp_nominal*{1} "Vector of head set points, used when inputType=Stages" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/FlowControlled_m_flow.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/FlowControlled_m_flow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/FlowControlled_m_flow.mo" 2022-03-10 09:57:31.656143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/FlowControlled_m_flow.mo" 2022-03-10 09:58:41.368152153 +0000 @@ -23,20 +23,20 @@ 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 == Buildings.Fluid.Types.InputType.Constant)); - parameter Modelica.SIunits.MassFlowRate[:] massFlowRates = m_flow_nominal*{0} + parameter Modelica.Units.SI.MassFlowRate[:] massFlowRates = m_flow_nominal*{0} "Vector of mass flow rate set points, used when inputType=Stage" annotation(Dialog(enable=inputType == Buildings.Fluid.Types.InputType.Stages)); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/Validation/BaseClasses/FlowMachine_ZeroFlow.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/Validation/BaseClasses/FlowMachine_ZeroFlow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/Validation/BaseClasses/FlowMachine_ZeroFlow.mo" 2022-03-10 09:57:31.656143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/Validation/BaseClasses/FlowMachine_ZeroFlow.mo" 2022-03-10 09:58:41.236152137 +0000 @@ -5,9 +5,9 @@ replaceable package Medium = Buildings.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/Buildings 3.0.0/Fluid/Movers/Validation/PowerSimplified.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/Validation/PowerSimplified.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/Validation/PowerSimplified.mo" 2022-03-10 09:57:31.656143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/Validation/PowerSimplified.mo" 2022-03-10 09:58:41.196152132 +0000 @@ -5,7 +5,7 @@ package Medium = Buildings.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/Buildings 3.0.0/Fluid/Movers/Validation/PumpCurveConstruction.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/Validation/PumpCurveConstruction.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/Validation/PumpCurveConstruction.mo" 2022-03-10 09:57:31.656143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/Validation/PumpCurveConstruction.mo" 2022-03-10 09:58:41.180152129 +0000 @@ -5,12 +5,12 @@ package Medium = Buildings.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/Buildings 3.0.0/Fluid/Movers/Validation/SpeedControlled_y_linear.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/Validation/SpeedControlled_y_linear.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/Validation/SpeedControlled_y_linear.mo" 2022-03-10 09:57:31.656143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Movers/Validation/SpeedControlled_y_linear.mo" 2022-03-10 09:58:41.064152115 +0000 @@ -4,9 +4,9 @@ extends Modelica.Icons.Example; package Medium = Buildings.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/Buildings 3.0.0/Fluid/Sensors/BaseClasses/PartialDynamicFlowSensor.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/BaseClasses/PartialDynamicFlowSensor.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/BaseClasses/PartialDynamicFlowSensor.mo" 2022-03-10 09:57:31.656143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/BaseClasses/PartialDynamicFlowSensor.mo" 2022-03-10 09:58:41.028152110 +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"; 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/Buildings 3.0.0/Fluid/Sensors/BaseClasses/PartialFlowSensor.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/BaseClasses/PartialFlowSensor.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/BaseClasses/PartialFlowSensor.mo" 2022-03-10 09:57:31.656143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/BaseClasses/PartialFlowSensor.mo" 2022-03-10 09:58:41.020152109 +0000 @@ -2,10 +2,10 @@ partial model PartialFlowSensor "Partial component to model sensors that measure flow properties" extends Buildings.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/Buildings 3.0.0/Fluid/Sensors/Conversions/To_VolumeFraction.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/Conversions/To_VolumeFraction.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/Conversions/To_VolumeFraction.mo" 2022-03-10 09:57:31.656143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/Conversions/To_VolumeFraction.mo" 2022-03-10 09:58:40.992152107 +0000 @@ -1,8 +1,8 @@ within Buildings.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/Buildings 3.0.0/Fluid/Sensors/Density.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/Density.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/Density.mo" 2022-03-10 09:57:31.656143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/Density.mo" 2022-03-10 09:58:40.984152105 +0000 @@ -1,7 +1,7 @@ within Buildings.Fluid.Sensors; model Density "Ideal one port density sensor" extends Buildings.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/Buildings 3.0.0/Fluid/Sensors/DensityTwoPort.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/DensityTwoPort.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/DensityTwoPort.mo" 2022-03-10 09:57:31.656143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/DensityTwoPort.mo" 2022-03-10 09:58:40.976152104 +0000 @@ -1,7 +1,7 @@ within Buildings.Fluid.Sensors; model DensityTwoPort "Ideal two port density sensor" extends Buildings.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/Buildings 3.0.0/Fluid/Sensors/EnthalpyFlowRate.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/EnthalpyFlowRate.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/EnthalpyFlowRate.mo" 2022-03-10 09:57:31.656143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/EnthalpyFlowRate.mo" 2022-03-10 09:58:40.964152102 +0000 @@ -1,14 +1,14 @@ within Buildings.Fluid.Sensors; model EnthalpyFlowRate "Ideal enthalphy flow rate sensor" extends Buildings.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/Buildings 3.0.0/Fluid/Sensors/Examples/PPM.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/Examples/PPM.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/Examples/PPM.mo" 2022-03-10 09:57:31.656143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/Examples/PPM.mo" 2022-03-10 09:58:40.868152090 +0000 @@ -4,7 +4,7 @@ package Medium = Buildings.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"; Buildings.Fluid.MixingVolumes.MixingVolume volDyn( @@ -72,10 +72,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 Buildings.Fluid.MixingVolumes.MixingVolume volSte( redeclare package Medium = Medium, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/Examples/TraceSubstances.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/Examples/TraceSubstances.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/Examples/TraceSubstances.mo" 2022-03-10 09:57:31.656143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/Examples/TraceSubstances.mo" 2022-03-10 09:58:40.788152080 +0000 @@ -4,7 +4,7 @@ package Medium = Buildings.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/Buildings 3.0.0/Fluid/Sensors/LatentEnthalpyFlowRate.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/LatentEnthalpyFlowRate.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/LatentEnthalpyFlowRate.mo" 2022-03-10 09:57:31.656143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/LatentEnthalpyFlowRate.mo" 2022-03-10 09:58:40.752152076 +0000 @@ -5,14 +5,14 @@ redeclare replaceable package Medium = Modelica.Media.Interfaces.PartialCondensingGases); extends Buildings.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/Buildings 3.0.0/Fluid/Sensors/MassFlowRate.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/MassFlowRate.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/MassFlowRate.mo" 2022-03-10 09:57:31.656143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/MassFlowRate.mo" 2022-03-10 09:58:40.740152075 +0000 @@ -3,7 +3,7 @@ extends Buildings.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/Buildings 3.0.0/Fluid/Sensors/MassFraction.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/MassFraction.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/MassFraction.mo" 2022-03-10 09:57:31.656143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/MassFraction.mo" 2022-03-10 09:58:40.732152073 +0000 @@ -4,7 +4,7 @@ redeclare replaceable package Medium = Modelica.Media.Interfaces.PartialCondensingGases); extends Buildings.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/Buildings 3.0.0/Fluid/Sensors/MassFractionTwoPort.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/MassFractionTwoPort.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/MassFractionTwoPort.mo" 2022-03-10 09:57:31.656143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/MassFractionTwoPort.mo" 2022-03-10 09:58:40.700152069 +0000 @@ -4,7 +4,7 @@ redeclare replaceable package Medium = Modelica.Media.Interfaces.PartialCondensingGases); extends Buildings.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/Buildings 3.0.0/Fluid/Sensors/PPM.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/PPM.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/PPM.mo" 2022-03-10 09:57:31.656143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/PPM.mo" 2022-03-10 09:58:40.684152068 +0000 @@ -6,11 +6,11 @@ final unit="1", min=0, 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/Buildings 3.0.0/Fluid/Sensors/PPMTwoPort.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/PPMTwoPort.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/PPMTwoPort.mo" 2022-03-10 09:57:31.656143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/PPMTwoPort.mo" 2022-03-10 09:58:40.672152065 +0000 @@ -10,13 +10,13 @@ final unit="1", min=0, 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/Buildings 3.0.0/Fluid/Sensors/Pressure.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/Pressure.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/Pressure.mo" 2022-03-10 09:57:31.656143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/Pressure.mo" 2022-03-10 09:58:40.656152063 +0000 @@ -1,7 +1,7 @@ within Buildings.Fluid.Sensors; model Pressure "Ideal pressure sensor" extends Buildings.Fluid.Sensors.BaseClasses.PartialAbsoluteSensor; - extends Modelica.Icons.RotationalSensor; + extends Modelica.Icons.RoundSensor; Modelica.Blocks.Interfaces.RealOutput p(final quantity="Pressure", final unit="Pa", min=0) "Pressure at port" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/RelativeHumidity.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/RelativeHumidity.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/RelativeHumidity.mo" 2022-03-10 09:57:31.656143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/RelativeHumidity.mo" 2022-03-10 09:58:40.648152062 +0000 @@ -1,14 +1,14 @@ within Buildings.Fluid.Sensors; model RelativeHumidity "Ideal one port relative humidity sensor" extends Buildings.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/Buildings 3.0.0/Fluid/Sensors/RelativeHumidityTwoPort.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/RelativeHumidityTwoPort.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/RelativeHumidityTwoPort.mo" 2022-03-10 09:57:31.656143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/RelativeHumidityTwoPort.mo" 2022-03-10 09:58:40.636152061 +0000 @@ -1,7 +1,7 @@ within Buildings.Fluid.Sensors; model RelativeHumidityTwoPort "Ideal two port relative humidity sensor" extends Buildings.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/Buildings 3.0.0/Fluid/Sensors/RelativePressure.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/RelativePressure.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/RelativePressure.mo" 2022-03-10 09:57:31.656143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/RelativePressure.mo" 2022-03-10 09:58:40.624152059 +0000 @@ -1,6 +1,6 @@ within Buildings.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/Buildings 3.0.0/Fluid/Sensors/RelativeTemperature.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/RelativeTemperature.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/RelativeTemperature.mo" 2022-03-10 09:57:31.656143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/RelativeTemperature.mo" 2022-03-10 09:58:40.612152057 +0000 @@ -1,6 +1,6 @@ within Buildings.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/Buildings 3.0.0/Fluid/Sensors/SensibleEnthalpyFlowRate.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/SensibleEnthalpyFlowRate.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/SensibleEnthalpyFlowRate.mo" 2022-03-10 09:57:31.656143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/SensibleEnthalpyFlowRate.mo" 2022-03-10 09:58:40.600152057 +0000 @@ -5,21 +5,21 @@ redeclare replaceable package Medium = Modelica.Media.Interfaces.PartialCondensingGases); extends Buildings.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/Buildings 3.0.0/Fluid/Sensors/SpecificEnthalpy.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/SpecificEnthalpy.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/SpecificEnthalpy.mo" 2022-03-10 09:57:31.656143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/SpecificEnthalpy.mo" 2022-03-10 09:58:40.588152056 +0000 @@ -1,7 +1,7 @@ within Buildings.Fluid.Sensors; model SpecificEnthalpy "Ideal one port specific enthalpy sensor" extends Buildings.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/Buildings 3.0.0/Fluid/Sensors/SpecificEnthalpyTwoPort.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/SpecificEnthalpyTwoPort.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/SpecificEnthalpyTwoPort.mo" 2022-03-10 09:57:31.656143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/SpecificEnthalpyTwoPort.mo" 2022-03-10 09:58:40.580152053 +0000 @@ -1,8 +1,8 @@ within Buildings.Fluid.Sensors; model SpecificEnthalpyTwoPort "Ideal two port sensor for the specific enthalpy" extends Buildings.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/Buildings 3.0.0/Fluid/Sensors/SpecificEntropy.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/SpecificEntropy.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/SpecificEntropy.mo" 2022-03-10 09:57:31.656143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/SpecificEntropy.mo" 2022-03-10 09:58:40.568152052 +0000 @@ -1,7 +1,7 @@ within Buildings.Fluid.Sensors; model SpecificEntropy "Ideal one port specific entropy sensor" extends Buildings.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/Buildings 3.0.0/Fluid/Sensors/SpecificEntropyTwoPort.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/SpecificEntropyTwoPort.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/SpecificEntropyTwoPort.mo" 2022-03-10 09:57:31.656143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/SpecificEntropyTwoPort.mo" 2022-03-10 09:58:40.556152052 +0000 @@ -1,8 +1,8 @@ within Buildings.Fluid.Sensors; model SpecificEntropyTwoPort "Ideal two port sensor for the specific entropy" extends Buildings.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/Buildings 3.0.0/Fluid/Sensors/TemperatureTwoPort.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/TemperatureTwoPort.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/TemperatureTwoPort.mo" 2022-03-10 09:57:31.656143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/TemperatureTwoPort.mo" 2022-03-10 09:58:40.528152047 +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/Buildings 3.0.0/Fluid/Sensors/TemperatureWetBulbTwoPort.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/TemperatureWetBulbTwoPort.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/TemperatureWetBulbTwoPort.mo" 2022-03-10 09:57:31.656143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/TemperatureWetBulbTwoPort.mo" 2022-03-10 09:58:40.488152043 +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 @@ Buildings.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/Buildings 3.0.0/Fluid/Sensors/TraceSubstances.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/TraceSubstances.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/TraceSubstances.mo" 2022-03-10 09:57:31.656143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/TraceSubstances.mo" 2022-03-10 09:58:40.472152040 +0000 @@ -1,7 +1,7 @@ within Buildings.Fluid.Sensors; model TraceSubstances "Ideal one port trace substances sensor" extends Buildings.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/Buildings 3.0.0/Fluid/Sensors/TraceSubstancesTwoPort.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/TraceSubstancesTwoPort.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/TraceSubstancesTwoPort.mo" 2022-03-10 09:57:31.656143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/TraceSubstancesTwoPort.mo" 2022-03-10 09:58:40.460152038 +0000 @@ -1,7 +1,7 @@ within Buildings.Fluid.Sensors; model TraceSubstancesTwoPort "Ideal two port sensor for trace substance" extends Buildings.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/Buildings 3.0.0/Fluid/Sensors/VolumeFlowRate.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/VolumeFlowRate.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/VolumeFlowRate.mo" 2022-03-10 09:57:31.656143321 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sensors/VolumeFlowRate.mo" 2022-03-10 09:58:40.436152036 +0000 @@ -1,18 +1,18 @@ within Buildings.Fluid.Sensors; model VolumeFlowRate "Ideal sensor for volume flow rate" extends Buildings.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/Buildings 3.0.0/Fluid/SolarCollectors/BaseClasses/ASHRAEHeatLoss.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/BaseClasses/ASHRAEHeatLoss.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/BaseClasses/ASHRAEHeatLoss.mo" 2022-03-10 09:57:31.660143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/BaseClasses/ASHRAEHeatLoss.mo" 2022-03-10 09:58:40.404152032 +0000 @@ -4,11 +4,11 @@ extends Buildings.Fluid.SolarCollectors.BaseClasses.PartialHeatLoss; - parameter Modelica.SIunits.CoefficientOfHeatTransfer slope + parameter Modelica.Units.SI.CoefficientOfHeatTransfer slope "Slope from ratings data"; protected - final parameter Modelica.SIunits.ThermalConductance UA( + final parameter Modelica.Units.SI.ThermalConductance UA( start = -slope*A_c, fixed = false) "Coefficient describing heat loss to ambient conditions"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/BaseClasses/ASHRAESolarGain.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/BaseClasses/ASHRAESolarGain.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/BaseClasses/ASHRAESolarGain.mo" 2022-03-10 09:57:31.660143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/BaseClasses/ASHRAESolarGain.mo" 2022-03-10 09:58:40.396152030 +0000 @@ -14,7 +14,7 @@ max=1.0) = 0 "Shading coefficient 0.0: no shading, 1.0: full shading" annotation(Dialog(enable = not use_shaCoe_in, group = "Shading")); - parameter Modelica.SIunits.Angle til "Surface tilt"; + parameter Modelica.Units.SI.Angle til "Surface tilt"; replaceable package Medium = Modelica.Media.Interfaces.PartialMedium "Medium in the system"; @@ -49,25 +49,25 @@ annotation (Placement(transformation(extent={{100,-10},{120,10}}))); protected - constant Modelica.SIunits.Temperature dTMax = 1 + constant Modelica.Units.SI.Temperature dTMax = 1 "Safety temperature difference to prevent TFlu > Medium.T_max"; - final parameter Modelica.SIunits.Temperature TMedMax = Medium.T_max-dTMax + final parameter Modelica.Units.SI.Temperature TMedMax = Medium.T_max-dTMax "Fluid temperature above which there will be no heat gain computed to prevent TFlu > Medium.T_max"; - final parameter Modelica.SIunits.Temperature TMedMax2 = TMedMax-dTMax + final parameter Modelica.Units.SI.Temperature TMedMax2 = TMedMax-dTMax "Fluid temperature below which there will be no heat loss computed to prevent TFlu < Medium.T_min"; final parameter Real iamSky(fixed = false) "Incident angle modifier for diffuse solar radiation from the sky"; final parameter Real iamGro(fixed = false) "Incident angle modifier for diffuse solar radiation from the ground"; - final parameter Modelica.SIunits.Angle incAngSky(fixed = false) + final parameter Modelica.Units.SI.Angle incAngSky(fixed = false) "Incident angle of diffuse radiation from the sky"; - final parameter Modelica.SIunits.Angle incAngGro(fixed = false) + final parameter Modelica.Units.SI.Angle incAngGro(fixed = false) "Incident angle of diffuse radiation from the ground"; final parameter Real tilDeg( - unit = "deg") = Modelica.SIunits.Conversions.to_deg(til) + unit = "deg") = Modelica.Units.Conversions.to_deg(til) "Surface tilt angle in degrees"; - final parameter Modelica.SIunits.HeatFlux HTotMin = 1 + final parameter Modelica.Units.SI.HeatFlux HTotMin = 1 "Minimum HTot to avoid div/0"; final parameter Real HMinDel = 0.001 "Delta of the smoothing function for HTot"; @@ -79,15 +79,13 @@ "Internally used shading coefficient"; initial equation - // E+ Equ (557) - incAngSky = Modelica.SIunits.Conversions.from_deg(59.68 - 0.1388*(tilDeg) + - 0.001497*(tilDeg)^2); +// E+ Equ (557) + incAngSky = Modelica.Units.Conversions.from_deg(59.68 - 0.1388 * tilDeg + 0.001497 * tilDeg ^ 2); // Diffuse radiation from the sky // E+ Equ (555) iamSky = SolarCollectors.BaseClasses.IAM(incAngSky, B0, B1); - // E+ Equ (558) - incAngGro = Modelica.SIunits.Conversions.from_deg(90 - 0.5788*(tilDeg)+ - 0.002693*(tilDeg)^2); +// E+ Equ (558) + incAngGro = Modelica.Units.Conversions.from_deg(90 - 0.5788 * tilDeg + 0.002693 * tilDeg ^ 2); // Diffuse radiation from the ground // E+ Equ (555) iamGro = SolarCollectors.BaseClasses.IAM( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/BaseClasses/EN12975HeatLoss.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/BaseClasses/EN12975HeatLoss.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/BaseClasses/EN12975HeatLoss.mo" 2022-03-10 09:57:31.660143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/BaseClasses/EN12975HeatLoss.mo" 2022-03-10 09:58:40.376152028 +0000 @@ -4,13 +4,13 @@ extends Buildings.Fluid.SolarCollectors.BaseClasses.PartialHeatLoss; - parameter Modelica.SIunits.CoefficientOfHeatTransfer C1 + parameter Modelica.Units.SI.CoefficientOfHeatTransfer C1 "C1 from ratings data"; parameter Real C2( final unit = "W/(m2.K2)") "C2 from ratings data"; protected - final parameter Modelica.SIunits.ThermalConductance UA( + final parameter Modelica.Units.SI.ThermalConductance UA( fixed = false, start=QLos_nominal/(dT_nominal)) "Coefficient describing heat loss to ambient conditions"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/BaseClasses/EN12975SolarGain.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/BaseClasses/EN12975SolarGain.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/BaseClasses/EN12975SolarGain.mo" 2022-03-10 09:57:31.660143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/BaseClasses/EN12975SolarGain.mo" 2022-03-10 09:58:40.368152028 +0000 @@ -43,11 +43,11 @@ annotation (Placement(transformation(extent={{-140,-100},{-100,-60}}))); protected - constant Modelica.SIunits.Temperature dTMax = 1 + constant Modelica.Units.SI.Temperature dTMax = 1 "Safety temperature difference to prevent TFlu > Medium.T_max"; - final parameter Modelica.SIunits.Temperature TMedMax = Medium.T_max-dTMax + final parameter Modelica.Units.SI.Temperature TMedMax = Medium.T_max-dTMax "Fluid temperature above which there will be no heat gain computed to prevent TFlu > Medium.T_max"; - final parameter Modelica.SIunits.Temperature TMedMax2 = TMedMax-dTMax + final parameter Modelica.Units.SI.Temperature TMedMax2 = TMedMax-dTMax "Fluid temperature below which there will be no heat loss computed to prevent TFlu < Medium.T_min"; Real iamBea "Incidence angle modifier for director solar radiation"; Modelica.Blocks.Interfaces.RealInput shaCoe_internal "Internally used shaCoe"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/BaseClasses/Examples/ASHRAEHeatLoss.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/BaseClasses/Examples/ASHRAEHeatLoss.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/BaseClasses/Examples/ASHRAEHeatLoss.mo" 2022-03-10 09:57:31.660143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/BaseClasses/Examples/ASHRAEHeatLoss.mo" 2022-03-10 09:58:40.352152025 +0000 @@ -6,22 +6,22 @@ "Performance data" annotation (choicesAllMatching=true); Modelica.Blocks.Sources.Sine TEnv( - freqHz=0.01, + f =0.01, offset=273.15 + 10, amplitude=7.5) "Temperature of the surrounding environment" annotation (Placement(transformation(extent={{-80,60},{-60,80}}))); Modelica.Blocks.Sources.Sine T1( - freqHz=0.1, + f =0.1, amplitude=15, offset=273.15 + 10) "Temperature in the first segment" annotation (Placement(transformation(extent={{-80,-60},{-60,-40}}))); Modelica.Blocks.Sources.Sine T2( - freqHz=0.1, + f =0.1, amplitude=15, offset=273.15 + 15) "Temperature in the second segment" annotation (Placement(transformation(extent={{-80,-20},{-60,0}}))); Modelica.Blocks.Sources.Sine T3( - freqHz=0.1, + f =0.1, amplitude=15, offset=273.15 + 20) "Temperature in the third segment" annotation (Placement(transformation(extent={{-80,20},{-60,40}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/BaseClasses/Examples/ASHRAESolarGain.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/BaseClasses/Examples/ASHRAESolarGain.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/BaseClasses/Examples/ASHRAESolarGain.mo" 2022-03-10 09:57:31.660143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/BaseClasses/Examples/ASHRAESolarGain.mo" 2022-03-10 09:58:40.340152023 +0000 @@ -18,7 +18,7 @@ annotation (Placement(transformation(extent={{72,0},{92,20}}))); Modelica.Blocks.Sources.Sine HGroDifTil( amplitude=50, - freqHz=4/86400, +f =4/86400, offset=100) "Diffuse radiation from the ground, tilted surface" annotation (Placement(transformation(extent={{-64,44},{-44,64}}))); Modelica.Blocks.Sources.Ramp incAng(duration=86400, height=60*(2*Modelica.Constants.pi @@ -27,10 +27,10 @@ Modelica.Blocks.Sources.Sine HDirTil( offset=400, amplitude=300, - freqHz=2/86400) "Direct beam radiation, tilted surface" +f =2/86400) "Direct beam radiation, tilted surface" annotation (Placement(transformation(extent={{-90,18},{-70,38}}))); Modelica.Blocks.Sources.Sine HSkyDifTil( - freqHz=1/86400, + f =1/86400, amplitude=100, offset=100) "Diffuse radiation, tilted surface" annotation (Placement(transformation(extent={{-38,74},{-18,94}}))); @@ -40,17 +40,17 @@ offset=1) "Shading coefficient" annotation (Placement(transformation(extent={{-64,-42},{-44,-22}}))); Modelica.Blocks.Sources.Sine T3( - freqHz=2/86400, + f =2/86400, amplitude=50, offset=273.15 + 110) annotation (Placement(transformation(extent={{-38,-58},{-18,-38}}))); Modelica.Blocks.Sources.Sine T2( - freqHz=2/86400, + f =2/86400, amplitude=50, offset=273.15 + 100) annotation (Placement(transformation(extent={{-14,-74},{6,-54}}))); Modelica.Blocks.Sources.Sine T1( - freqHz=2/86400, + f =2/86400, amplitude=50, offset=273.15 + 90) annotation (Placement(transformation(extent={{10,-94},{30,-74}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/BaseClasses/Examples/EN12975HeatLoss.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/BaseClasses/Examples/EN12975HeatLoss.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/BaseClasses/Examples/EN12975HeatLoss.mo" 2022-03-10 09:57:31.660143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/BaseClasses/Examples/EN12975HeatLoss.mo" 2022-03-10 09:58:40.304152020 +0000 @@ -6,22 +6,22 @@ "Performance data" annotation (choicesAllMatching=true); Modelica.Blocks.Sources.Sine TEnv( - freqHz=0.01, + f =0.01, offset=273.15 + 10, amplitude=15) "Temperature of the surrounding environment" annotation (Placement(transformation(extent={{-80,60},{-60,80}}))); Modelica.Blocks.Sources.Sine T1( amplitude=15, - freqHz=0.1, +f =0.1, offset=273.15 + 10) "Temperature of the first segment" annotation (Placement(transformation(extent={{-80,-60},{-60,-40}}))); Modelica.Blocks.Sources.Sine T2( - freqHz=0.1, + f =0.1, amplitude=15, offset=273.15 + 15) "Temperature of the second segment" annotation (Placement(transformation(extent={{-80,-20},{-60,0}}))); Modelica.Blocks.Sources.Sine T3( - freqHz=0.1, + f =0.1, amplitude=15, offset=273.15 + 20) "Temperature of the third segment" annotation (Placement(transformation(extent={{-80,20},{-60,40}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/BaseClasses/Examples/EN12975SolarGain.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/BaseClasses/Examples/EN12975SolarGain.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/BaseClasses/Examples/EN12975SolarGain.mo" 2022-03-10 09:57:31.660143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/BaseClasses/Examples/EN12975SolarGain.mo" 2022-03-10 09:58:40.288152017 +0000 @@ -23,11 +23,11 @@ Modelica.Blocks.Sources.Sine HDirTil( offset=400, amplitude=300, - freqHz=2/86400) "Direct beam radiation, tilted surface" +f =2/86400) "Direct beam radiation, tilted surface" annotation (Placement(transformation(extent={{-40,44},{-20,64}}))); Modelica.Blocks.Sources.Sine HDifTil( amplitude=200, - freqHz=1/86400, +f =1/86400, offset=300) "Diffuse radiation, tilted surface" annotation (Placement(transformation(extent={{-40,74},{-20,94}}))); Modelica.Blocks.Sources.Ramp shaCoe( @@ -36,17 +36,17 @@ height=-1) "Shading coefficient" annotation (Placement(transformation(extent={{-80,-20},{-60,0}}))); Modelica.Blocks.Sources.Sine T3( - freqHz=2/86400, + f =2/86400, amplitude=50, offset=273.15 + 110) annotation (Placement(transformation(extent={{-50,-38},{-30,-18}}))); Modelica.Blocks.Sources.Sine T2( - freqHz=2/86400, + f =2/86400, amplitude=50, offset=273.15 + 100) annotation (Placement(transformation(extent={{-26,-54},{-6,-34}}))); Modelica.Blocks.Sources.Sine T1( - freqHz=2/86400, + f =2/86400, amplitude=50, offset=273.15 + 90) annotation (Placement(transformation(extent={{-2,-70},{18,-50}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/BaseClasses/IAM.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/BaseClasses/IAM.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/BaseClasses/IAM.mo" 2022-03-10 09:57:31.660143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/BaseClasses/IAM.mo" 2022-03-10 09:58:40.272152016 +0000 @@ -1,12 +1,12 @@ within Buildings.Fluid.SolarCollectors.BaseClasses; function IAM "Function for incident angle modifer" - input Modelica.SIunits.Angle incAng "Incident angle"; + input Modelica.Units.SI.Angle incAng "Incident angle"; input Real B0 "1st incident angle modifer coefficient"; input Real B1 "2nd incident angle modifer coefficient"; output Real incAngMod "Incident angle modifier coefficient"; protected - constant Modelica.SIunits.Angle incAngMin = Modelica.Constants.pi / 2 -0.1 + constant Modelica.Units.SI.Angle incAngMin = Modelica.Constants.pi / 2 -0.1 "Minimum incidence angle to avoid division by zero"; constant Real delta = 0.0001 "Width of the smoothing function"; Real cosIncAngMin(min=Modelica.Constants.eps)= diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/BaseClasses/PartialHeatLoss.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/BaseClasses/PartialHeatLoss.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/BaseClasses/PartialHeatLoss.mo" 2022-03-10 09:57:31.660143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/BaseClasses/PartialHeatLoss.mo" 2022-03-10 09:58:40.260152014 +0000 @@ -7,17 +7,17 @@ replaceable package Medium = Modelica.Media.Interfaces.PartialMedium "Medium in the component"; - parameter Modelica.SIunits.Irradiance G_nominal + parameter Modelica.Units.SI.Irradiance G_nominal "Irradiance at nominal conditions" annotation(Dialog(group="Nominal condition")); - parameter Modelica.SIunits.TemperatureDifference dT_nominal + parameter Modelica.Units.SI.TemperatureDifference dT_nominal "Ambient temperature at nomincal conditions" annotation(Dialog(group="Nominal condition")); - parameter Modelica.SIunits.MassFlowRate m_flow_nominal + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal "Fluid flow rate at nominal conditions" annotation(Dialog(group="Nominal condition")); - parameter Modelica.SIunits.SpecificHeatCapacity cp_default + parameter Modelica.Units.SI.SpecificHeatCapacity cp_default "Specific heat capacity of the fluid at the default temperature"; Modelica.Blocks.Interfaces.RealInput TEnv( quantity="ThermodynamicTemperature", @@ -37,26 +37,26 @@ annotation (Placement(transformation(extent={{100,-10},{120,10}}))); protected - constant Modelica.SIunits.Temperature dTMin = 1 + + constant Modelica.Units.SI.Temperature dTMin = 1 "Safety temperature difference to prevent TFlu < Medium.T_min"; - final parameter Modelica.SIunits.Temperature TMedMin = Medium.T_min + dTMin + final parameter Modelica.Units.SI.Temperature TMedMin = Medium.T_min + dTMin "Fluid temperature below which there will be no heat loss computed to prevent TFlu < Medium.T_min"; - final parameter Modelica.SIunits.Temperature TMedMin2 = TMedMin + dTMin + final parameter Modelica.Units.SI.Temperature TMedMin2 = TMedMin + dTMin "Fluid temperature below which there will be no heat loss computed to prevent TFlu < Medium.T_min"; - final parameter Modelica.SIunits.HeatFlowRate QUse_nominal(fixed = false) + final parameter Modelica.Units.SI.HeatFlowRate QUse_nominal(fixed = false) "Useful heat gain at nominal conditions"; - final parameter Modelica.SIunits.HeatFlowRate QLos_nominal(fixed = false) + final parameter Modelica.Units.SI.HeatFlowRate QLos_nominal(fixed = false) "Heat loss at nominal conditions"; - final parameter Modelica.SIunits.HeatFlowRate QLosUA[nSeg](each fixed = false) + final parameter Modelica.Units.SI.HeatFlowRate QLosUA[nSeg](each fixed = false) "Heat loss at current conditions"; - final parameter Modelica.SIunits.Temperature dT_nominal_fluid[nSeg]( + final parameter Modelica.Units.SI.Temperature dT_nominal_fluid[nSeg]( each start = 293.15, each fixed = false) "Temperature of each semgent in the collector at nominal conditions"; - Modelica.SIunits.HeatFlowRate QLosInt[nSeg] + Modelica.Units.SI.HeatFlowRate QLosInt[nSeg] "Heat loss rate at current conditions"; - equation for i in 1:nSeg loop QLos[i] = QLosInt[i] * diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/BaseClasses/PartialParameters.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/BaseClasses/PartialParameters.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/BaseClasses/PartialParameters.mo" 2022-03-10 09:57:31.660143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/BaseClasses/PartialParameters.mo" 2022-03-10 09:58:40.248152012 +0000 @@ -1,7 +1,7 @@ within Buildings.Fluid.SolarCollectors.BaseClasses; block PartialParameters "Partial model for parameters" - parameter Modelica.SIunits.Area A_c "Area of the collector"; + parameter Modelica.Units.SI.Area A_c "Area of the collector"; parameter Integer nSeg(min=3)=3 "Number of segments"; parameter Real y_intercept "Y intercept (Maximum efficiency)"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/BaseClasses/PartialSolarCollector.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/BaseClasses/PartialSolarCollector.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/BaseClasses/PartialSolarCollector.mo" 2022-03-10 09:57:31.660143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/BaseClasses/PartialSolarCollector.mo" 2022-03-10 09:58:40.240152012 +0000 @@ -7,13 +7,13 @@ parameter Integer nSeg(min=3) = 3 "Number of segments used to discretize the collector model"; - parameter Modelica.SIunits.Angle lat(displayUnit="degree") "Latitude"; - parameter Modelica.SIunits.Angle azi(displayUnit="degree") + parameter Modelica.Units.SI.Angle lat(displayUnit="degree") "Latitude"; + parameter Modelica.Units.SI.Angle azi(displayUnit="degree") "Surface azimuth (0 for south-facing; -90 degree for east-facing; +90 degree for west facing"; - parameter Modelica.SIunits.Angle til(displayUnit="degree") + parameter Modelica.Units.SI.Angle til(displayUnit="degree") "Surface tilt (0 for horizontally mounted collector)"; parameter Real rho "Ground reflectance"; - parameter Modelica.SIunits.HeatCapacity C=385*perPar.mDry + parameter Modelica.Units.SI.HeatCapacity C=385*perPar.mDry "Heat capacity of solar collector without fluid (default: cp_copper*mDry*nPanels)"; parameter Boolean use_shaCoe_in = false @@ -31,7 +31,7 @@ parameter Integer nPanels= 0 "Desired number of panels in the simulation" annotation(Dialog(group="Area declarations", enable= (nColType == Buildings.Fluid.SolarCollectors.Types.NumberSelection.Number))); - parameter Modelica.SIunits.Area totalArea=0 + parameter Modelica.Units.SI.Area totalArea=0 "Total area of panels in the simulation" annotation(Dialog(group="Area declarations", enable=(nColType == Buildings.Fluid.SolarCollectors.Types.NumberSelection.Area))); @@ -128,13 +128,13 @@ Modelica.Blocks.Interfaces.RealInput shaCoe_internal "Internally used shading coefficient"; - final parameter Modelica.SIunits.PressureDifference dp_nominal_final(displayUnit="Pa")= + final parameter Modelica.Units.SI.PressureDifference dp_nominal_final(displayUnit="Pa")= if sysConfig == Buildings.Fluid.SolarCollectors.Types.SystemConfiguration.Series then nPanels_internal*perPar.dp_nominal else perPar.dp_nominal "Nominal pressure loss across the system of collectors"; - parameter Modelica.SIunits.Area TotalArea_internal= + parameter Modelica.Units.SI.Area TotalArea_internal= nPanels_internal * perPar.A "Area used in the simulation"; parameter Real nPanels_internal= @@ -147,12 +147,12 @@ T=Medium.T_default, p=Medium.p_default, X=Medium.X_default[1:Medium.nXi]) "Medium state at default properties"; - parameter Modelica.SIunits.SpecificHeatCapacity cp_default= + + parameter Modelica.Units.SI.SpecificHeatCapacity cp_default= Medium.specificHeatCapacityCp(sta_default) "Specific heat capacity of the fluid"; - parameter Modelica.SIunits.Density rho_default= + parameter Modelica.Units.SI.Density rho_default= Medium.density(sta_default) "Density, used to compute fluid mass"; - equation connect(shaCoe_internal,shaCoe_in); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/Controls/BaseClasses/Examples/GCritCalc.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/Controls/BaseClasses/Examples/GCritCalc.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/Controls/BaseClasses/Examples/GCritCalc.mo" 2022-03-10 09:57:31.660143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/Controls/BaseClasses/Examples/GCritCalc.mo" 2022-03-10 09:58:40.184152004 +0000 @@ -7,12 +7,12 @@ annotation (Placement(transformation(extent={{-12,0},{8,20}}))); Modelica.Blocks.Sources.Sine TEnv( amplitude=10, - freqHz=0.1, +f =0.1, offset=10) annotation (Placement(transformation(extent={{-80,20},{-60,40}}))); Modelica.Blocks.Sources.Sine TIn( amplitude=10, - freqHz=0.01, +f =0.01, offset=30) annotation (Placement(transformation(extent={{-80,-20},{-60,0}}))); equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/Controls/Examples/SolarPumpController.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/Controls/Examples/SolarPumpController.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/Controls/Examples/SolarPumpController.mo" 2022-03-10 09:57:31.660143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/Controls/Examples/SolarPumpController.mo" 2022-03-10 09:58:40.160152001 +0000 @@ -12,7 +12,7 @@ annotation (Placement(transformation(extent={{-60,20},{-40,40}}))); Modelica.Blocks.Sources.Sine sine( amplitude=20, - freqHz=0.0001, +f =0.0001, offset=273.15 + 40) "Water inlet temperature" annotation (Placement(transformation(extent={{-60,-20},{-40,0}}))); equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/Data/GenericSolarCollector.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/Data/GenericSolarCollector.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/Data/GenericSolarCollector.mo" 2022-03-10 09:57:31.660143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/Data/GenericSolarCollector.mo" 2022-03-10 09:58:40.060151988 +0000 @@ -4,10 +4,10 @@ extends Modelica.Icons.Record; parameter SolarCollectors.Types.Area ATyp "Gross or aperture area"; - parameter Modelica.SIunits.Area A "Area"; - parameter Modelica.SIunits.Mass mDry "Dry weight"; - parameter Modelica.SIunits.Volume V "Fluid volume"; - parameter Modelica.SIunits.PressureDifference dp_nominal(displayUnit="Pa") + parameter Modelica.Units.SI.Area A "Area"; + parameter Modelica.Units.SI.Mass mDry "Dry weight"; + parameter Modelica.Units.SI.Volume V "Fluid volume"; + parameter Modelica.Units.SI.PressureDifference dp_nominal(displayUnit="Pa") "Pressure drop during test conditions"; parameter Real mperA_flow_nominal(unit="kg/(s.m2)") "Mass flow rate per unit area of collector"; @@ -19,9 +19,9 @@ parameter Real C1 "Heat loss coefficient from EN12975 ratings data"; parameter Real C2 "Temperature dependence of heat loss from EN12975 ratings data"; - parameter Modelica.SIunits.Irradiance G_nominal + parameter Modelica.Units.SI.Irradiance G_nominal "Nominal solar irradiance specified in ratings data"; - parameter Modelica.SIunits.TemperatureDifference dT_nominal + parameter Modelica.Units.SI.TemperatureDifference dT_nominal "Nominal temperature difference specified in ratings data"; annotation( defaultComponentPrefixes="parameter", diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/Examples/Concentrating.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/Examples/Concentrating.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/Examples/Concentrating.mo" 2022-03-10 09:57:31.660143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/Examples/Concentrating.mo" 2022-03-10 09:58:39.996151980 +0000 @@ -47,7 +47,7 @@ rotation=180, origin={-54,-10}))); Modelica.Blocks.Sources.Sine sine( - freqHz=3/86400, + f =3/86400, offset=101325, amplitude=-2*solCol.dp_nominal) annotation (Placement(transformation(extent={{-100,-20},{-80,0}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/Examples/FlatPlate.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/Examples/FlatPlate.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/Examples/FlatPlate.mo" 2022-03-10 09:57:31.660143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/Examples/FlatPlate.mo" 2022-03-10 09:58:39.984151978 +0000 @@ -49,7 +49,7 @@ rotation=180, origin={-50,-10}))); Modelica.Blocks.Sources.Sine sine( - freqHz=3/86400, + f =3/86400, amplitude=-solCol.dp_nominal, offset=1E5) "Pressure source" annotation (Placement(transformation(extent={{-100,-20},{-80,0}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/Examples/Tubular.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/Examples/Tubular.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/Examples/Tubular.mo" 2022-03-10 09:57:31.660143322 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/SolarCollectors/Examples/Tubular.mo" 2022-03-10 09:58:39.912151970 +0000 @@ -37,7 +37,7 @@ Medium, m_flow_nominal=solCol.m_flow_nominal) "Temperature sensor" annotation (Placement(transformation(extent={{-30,-20},{-10,0}}))); Modelica.Blocks.Sources.Sine sine( - freqHz=3/86400, + f =3/86400, offset=101325, amplitude=-1.5*solCol.dp_nominal) annotation (Placement(transformation(extent={{-100,-20},{-80,0}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sources/MassFlowSource_T.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sources/MassFlowSource_T.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sources/MassFlowSource_T.mo" 2022-03-10 09:57:31.664143324 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sources/MassFlowSource_T.mo" 2022-03-10 09:58:39.752151949 +0000 @@ -14,7 +14,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.Temperature T = Medium.T_default diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sources/MassFlowSource_h.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sources/MassFlowSource_h.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sources/MassFlowSource_h.mo" 2022-03-10 09:57:31.664143324 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sources/MassFlowSource_h.mo" 2022-03-10 09:58:39.736151948 +0000 @@ -15,7 +15,7 @@ "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.SpecificEnthalpy h = Medium.h_default diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sources/Outside_Cp.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sources/Outside_Cp.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sources/Outside_Cp.mo" 2022-03-10 09:57:31.664143324 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sources/Outside_Cp.mo" 2022-03-10 09:58:39.716151945 +0000 @@ -12,7 +12,7 @@ Modelica.Blocks.Interfaces.RealInput Cp_in(unit="1") if use_Cp_in "Prescribed wind pressure coefficient" annotation (Placement(transformation(extent={{-140,20},{-100,60}}))); - Modelica.SIunits.Pressure pWin(displayUnit="Pa") + Modelica.Units.SI.Pressure pWin(displayUnit="Pa") "Change in pressure due to wind force"; protected diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sources/Outside_CpLowRise.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sources/Outside_CpLowRise.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sources/Outside_CpLowRise.mo" 2022-03-10 09:57:31.664143324 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sources/Outside_CpLowRise.mo" 2022-03-10 09:58:39.712151944 +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/Buildings 3.0.0/Fluid/Sources/TraceSubstancesFlowSource.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sources/TraceSubstancesFlowSource.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sources/TraceSubstancesFlowSource.mo" 2022-03-10 09:57:31.664143324 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Sources/TraceSubstancesFlowSource.mo" 2022-03-10 09:58:39.700151942 +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/Buildings 3.0.0/Fluid/Storage/BaseClasses/Buoyancy.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Storage/BaseClasses/Buoyancy.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Storage/BaseClasses/Buoyancy.mo" 2022-03-10 09:57:31.664143324 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Storage/BaseClasses/Buoyancy.mo" 2022-03-10 09:58:39.680151940 +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/Buildings 3.0.0/Fluid/Storage/BaseClasses/IndirectTankHeatExchanger.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Storage/BaseClasses/IndirectTankHeatExchanger.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Storage/BaseClasses/IndirectTankHeatExchanger.mo" 2022-03-10 09:57:31.664143324 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Storage/BaseClasses/IndirectTankHeatExchanger.mo" 2022-03-10 09:58:39.632151933 +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/Buildings 3.0.0/Fluid/Storage/BaseClasses/ThirdOrderStratifier.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Storage/BaseClasses/ThirdOrderStratifier.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Storage/BaseClasses/ThirdOrderStratifier.mo" 2022-03-10 09:57:31.664143324 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Storage/BaseClasses/ThirdOrderStratifier.mo" 2022-03-10 09:58:39.608151932 +0000 @@ -5,7 +5,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"; @@ -31,11 +31,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/Buildings 3.0.0/Fluid/Storage/Examples/Stratified.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Storage/Examples/Stratified.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Storage/Examples/Stratified.mo" 2022-03-10 09:57:31.664143324 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Storage/Examples/Stratified.mo" 2022-03-10 09:58:39.584151928 +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/Buildings 3.0.0/Fluid/Storage/Examples/StratifiedEnhancedInternalHex.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Storage/Examples/StratifiedEnhancedInternalHex.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Storage/Examples/StratifiedEnhancedInternalHex.mo" 2022-03-10 09:57:31.664143324 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Storage/Examples/StratifiedEnhancedInternalHex.mo" 2022-03-10 09:58:39.564151926 +0000 @@ -6,10 +6,10 @@ package MediumTan = Buildings.Media.Water "Medium in the tank"; package MediumHex = Buildings.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"; Buildings.Fluid.Sources.Boundary_pT bouWat(redeclare package Medium = diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Storage/ExpansionVessel.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Storage/ExpansionVessel.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Storage/ExpansionVessel.mo" 2022-03-10 09:57:31.664143324 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Storage/ExpansionVessel.mo" 2022-03-10 09:58:39.532151922 +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/Buildings 3.0.0/Fluid/Storage/Stratified.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Storage/Stratified.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Storage/Stratified.mo" 2022-03-10 09:57:31.664143324 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Storage/Stratified.mo" 2022-03-10 09:58:39.520151920 +0000 @@ -6,10 +6,10 @@ Modelica.Media.Interfaces.PartialSimpleMedium; 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"; @@ -38,7 +38,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 @@ -85,15 +85,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)"; Sensors.EnthalpyFlowRate H_a_flow( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Storage/StratifiedEnhancedInternalHex.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Storage/StratifiedEnhancedInternalHex.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Storage/StratifiedEnhancedInternalHex.mo" 2022-03-10 09:57:31.664143324 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Storage/StratifiedEnhancedInternalHex.mo" 2022-03-10 09:58:39.476151915 +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 transfered 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/Buildings 3.0.0/Fluid/Storage/Validation/HeatExchangerDynamics.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Storage/Validation/HeatExchangerDynamics.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Storage/Validation/HeatExchangerDynamics.mo" 2022-03-10 09:57:31.664143324 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Storage/Validation/HeatExchangerDynamics.mo" 2022-03-10 09:58:39.412151907 +0000 @@ -6,9 +6,9 @@ package Medium = Buildings.Media.Water "Medium model"; 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; Buildings.Fluid.Sources.Boundary_pT watInTan( redeclare package Medium = Medium, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Storage/Validation/StratifiedLoadingUnloading.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Storage/Validation/StratifiedLoadingUnloading.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Storage/Validation/StratifiedLoadingUnloading.mo" 2022-03-10 09:57:31.664143324 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Fluid/Storage/Validation/StratifiedLoadingUnloading.mo" 2022-03-10 09:58:39.400151905 +0000 @@ -5,7 +5,7 @@ package Medium = Buildings.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; Buildings.Fluid.Sources.Boundary_pT sou_1( p=300000 + 5000, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Conduction/BaseClasses/Examples/Temperature_u.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Conduction/BaseClasses/Examples/Temperature_u.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Conduction/BaseClasses/Examples/Temperature_u.mo" 2022-03-10 09:57:31.664143324 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Conduction/BaseClasses/Examples/Temperature_u.mo" 2022-03-10 09:58:39.284151889 +0000 @@ -22,36 +22,36 @@ d=1000, k=1, x=0.2) "Phase change material with non-monotone u-T relation"; - parameter Modelica.SIunits.SpecificInternalEnergy ud[Buildings.HeatTransfer.Conduction.nSupPCM](each fixed=false) + parameter Modelica.Units.SI.SpecificInternalEnergy ud[Buildings.HeatTransfer.Conduction.nSupPCM](each fixed=false) "Support points"; - parameter Modelica.SIunits.SpecificInternalEnergy udMonotone[Buildings.HeatTransfer.Conduction.nSupPCM](each fixed=false) + parameter Modelica.Units.SI.SpecificInternalEnergy udMonotone[Buildings.HeatTransfer.Conduction.nSupPCM](each fixed=false) "Support points"; - parameter Modelica.SIunits.Temperature Td[Buildings.HeatTransfer.Conduction.nSupPCM](each fixed=false) + parameter Modelica.Units.SI.Temperature Td[Buildings.HeatTransfer.Conduction.nSupPCM](each fixed=false) "Support points"; - parameter Modelica.SIunits.Temperature TdMonotone[Buildings.HeatTransfer.Conduction.nSupPCM](each fixed=false) + parameter Modelica.Units.SI.Temperature TdMonotone[Buildings.HeatTransfer.Conduction.nSupPCM](each fixed=false) "Support points"; parameter Real dT_du[Buildings.HeatTransfer.Conduction.nSupPCM](each fixed=false, each unit="kg.K2/J") "Derivatives at the support points - non-monotone, default in Modelica PCM"; parameter Real dT_duMonotone[Buildings.HeatTransfer.Conduction.nSupPCM](each fixed=false, each unit="kg.K2/J") "Derivatives at the support points for monotone increasing cubic splines"; - Modelica.SIunits.SpecificInternalEnergy u "Specific internal energy"; - Modelica.SIunits.Temperature T + Modelica.Units.SI.SpecificInternalEnergy u "Specific internal energy"; + Modelica.Units.SI.Temperature T "Temperature for given u without monotone interpolation"; - Modelica.SIunits.Temperature TMonotone + Modelica.Units.SI.Temperature TMonotone "Temperature for given u with monotone interpolation"; - Modelica.SIunits.Temperature TExa "Exact value of temperature"; + Modelica.Units.SI.Temperature TExa "Exact value of temperature"; Real errMonotone "Relative temperature error between calculated value with monotone interpolation and exact temperature"; Real errNonMonotone "Relative temperature error between calculated value with non-monotone interpolation and exact temperature"; - parameter Modelica.SIunits.TemperatureDifference dTCha = materialMonotone.TSol+materialMonotone.TLiq + parameter Modelica.Units.SI.TemperatureDifference dTCha = materialMonotone.TSol+materialMonotone.TLiq "Characteristic temperature difference of the problem"; protected function relativeError "Relative error" - input Modelica.SIunits.Temperature T "Approximated temperature"; - input Modelica.SIunits.Temperature TExa "Exact temperature"; - input Modelica.SIunits.TemperatureDifference dTCha + input Modelica.Units.SI.Temperature T "Approximated temperature"; + input Modelica.Units.SI.Temperature TExa "Exact temperature"; + input Modelica.Units.SI.TemperatureDifference dTCha "Characteristic temperature difference"; output Real relErr "Relative error"; algorithm diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Conduction/BaseClasses/PartialConductor.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Conduction/BaseClasses/PartialConductor.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Conduction/BaseClasses/PartialConductor.mo" 2022-03-10 09:57:31.664143324 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Conduction/BaseClasses/PartialConductor.mo" 2022-03-10 09:58:39.268151888 +0000 @@ -1,15 +1,15 @@ within Buildings.HeatTransfer.Conduction.BaseClasses; partial model PartialConductor "Partial model for heat conductor" extends Buildings.BaseClasses.BaseIcon; - parameter Modelica.SIunits.Area A "Heat transfer area"; - final parameter Modelica.SIunits.CoefficientOfHeatTransfer U = UA/A + parameter Modelica.Units.SI.Area A "Heat transfer area"; + final parameter Modelica.Units.SI.CoefficientOfHeatTransfer U = UA/A "U-value (without surface heat transfer coefficients)"; - final parameter Modelica.SIunits.ThermalConductance UA = 1/R + final parameter Modelica.Units.SI.ThermalConductance UA = 1/R "Thermal conductance of construction (without surface heat transfer coefficients)"; - parameter Modelica.SIunits.ThermalResistance R + parameter Modelica.Units.SI.ThermalResistance R "Thermal resistance of construction"; - Modelica.SIunits.TemperatureDifference dT "port_a.T - port_b.T"; + Modelica.Units.SI.TemperatureDifference dT "port_a.T - port_b.T"; Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a port_a "Heat port at surface a" annotation (Placement(transformation(extent={{-110,-10}, {-90,10}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Conduction/BaseClasses/PartialConstruction.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Conduction/BaseClasses/PartialConstruction.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Conduction/BaseClasses/PartialConstruction.mo" 2022-03-10 09:57:31.664143324 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Conduction/BaseClasses/PartialConstruction.mo" 2022-03-10 09:58:39.264151887 +0000 @@ -1,7 +1,7 @@ within Buildings.HeatTransfer.Conduction.BaseClasses; model PartialConstruction "Partial model for multi-layer constructions" extends Buildings.BaseClasses.BaseIcon; - parameter Modelica.SIunits.Area A "Heat transfer area"; + parameter Modelica.Units.SI.Area A "Heat transfer area"; replaceable parameter Buildings.HeatTransfer.Data.OpaqueConstructions.Generic layers "Construction definition from Data.OpaqueConstructions" @@ -15,10 +15,10 @@ parameter Boolean steadyStateInitial=false "=true initializes dT(0)/dt=0, false initializes T(0) at fixed temperature using T_a_start and T_b_start" annotation (Dialog(group="Initialization"), Evaluate=true); - parameter Modelica.SIunits.Temperature T_a_start=293.15 + parameter Modelica.Units.SI.Temperature T_a_start=293.15 "Initial temperature at port_a, used if steadyStateInitial = false" annotation (Dialog(group="Initialization", enable=not steadyStateInitial)); - parameter Modelica.SIunits.Temperature T_b_start=293.15 + parameter Modelica.Units.SI.Temperature T_b_start=293.15 "Initial temperature at port_b, used if steadyStateInitial = false" annotation (Dialog(group="Initialization", enable=not steadyStateInitial)); annotation ( Documentation(info=" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Conduction/BaseClasses/der_temperature_u.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Conduction/BaseClasses/der_temperature_u.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Conduction/BaseClasses/der_temperature_u.mo" 2022-03-10 09:57:31.664143324 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Conduction/BaseClasses/der_temperature_u.mo" 2022-03-10 09:58:39.252151885 +0000 @@ -1,27 +1,27 @@ within Buildings.HeatTransfer.Conduction.BaseClasses; function der_temperature_u "Computes the derivative of the temperature of a phase change material with respect to specific internal energy" - input Modelica.SIunits.SpecificHeatCapacity c "Specific heat capacity"; - input Modelica.SIunits.Temperature TSol + input Modelica.Units.SI.SpecificHeatCapacity c "Specific heat capacity"; + input Modelica.Units.SI.Temperature TSol "Solidus temperature, used only for PCM."; - input Modelica.SIunits.Temperature TLiq + input Modelica.Units.SI.Temperature TLiq "Liquidus temperature, used only for PCM"; - input Modelica.SIunits.SpecificInternalEnergy LHea + input Modelica.Units.SI.SpecificInternalEnergy LHea "Latent heat of phase change"; input Boolean ensureMonotonicity = false "Set to true to force derivatives dT/du to be monotone"; - output Modelica.SIunits.SpecificInternalEnergy ud[Buildings.HeatTransfer.Conduction.nSupPCM] + output Modelica.Units.SI.SpecificInternalEnergy ud[Buildings.HeatTransfer.Conduction.nSupPCM] "Support points for derivatives"; - output Modelica.SIunits.Temperature Td[Buildings.HeatTransfer.Conduction.nSupPCM] + output Modelica.Units.SI.Temperature Td[Buildings.HeatTransfer.Conduction.nSupPCM] "Support points for derivatives"; output Real dT_du[Buildings.HeatTransfer.Conduction.nSupPCM](fixed=false, unit="kg.K2/J") "Derivatives dT/du at the support points"; protected parameter Real scale=0.999 "Used to place points on the phase transition"; - parameter Modelica.SIunits.Temperature Tm1=TSol+(1-scale)*(TLiq-TSol) + parameter Modelica.Units.SI.Temperature Tm1=TSol+(1-scale)*(TLiq-TSol) "Support point"; - parameter Modelica.SIunits.Temperature Tm2=TSol+scale*(TLiq-TSol) + parameter Modelica.Units.SI.Temperature Tm2=TSol+scale*(TLiq-TSol) "Support point"; algorithm assert(Buildings.HeatTransfer.Conduction.nSupPCM == 6, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Conduction/BaseClasses/temperature_u.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Conduction/BaseClasses/temperature_u.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Conduction/BaseClasses/temperature_u.mo" 2022-03-10 09:57:31.664143324 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Conduction/BaseClasses/temperature_u.mo" 2022-03-10 09:58:39.244151885 +0000 @@ -2,16 +2,16 @@ function temperature_u "Computes the temperature of a phase change material for a given specific internal energy" - input Modelica.SIunits.SpecificInternalEnergy ud[Buildings.HeatTransfer.Conduction.nSupPCM] + input Modelica.Units.SI.SpecificInternalEnergy ud[Buildings.HeatTransfer.Conduction.nSupPCM] "Support points for derivatives"; - input Modelica.SIunits.Temperature Td[Buildings.HeatTransfer.Conduction.nSupPCM] + input Modelica.Units.SI.Temperature Td[Buildings.HeatTransfer.Conduction.nSupPCM] "Support points for derivatives"; input Real dT_du[:](each fixed=false, unit="kg.K2/J") "Derivatives dT/du at the support points"; - input Modelica.SIunits.SpecificInternalEnergy u "Specific internal energy"; + input Modelica.Units.SI.SpecificInternalEnergy u "Specific internal energy"; - output Modelica.SIunits.Temperature T "Resulting temperature"; + output Modelica.Units.SI.Temperature T "Resulting temperature"; protected Integer i "Integer to select data interval"; algorithm diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Conduction/MultiLayer.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Conduction/MultiLayer.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Conduction/MultiLayer.mo" 2022-03-10 09:57:31.664143324 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Conduction/MultiLayer.mo" 2022-03-10 09:58:39.232151883 +0000 @@ -3,10 +3,10 @@ "Model for heat conductance through a solid with multiple material layers" extends Buildings.HeatTransfer.Conduction.BaseClasses.PartialConductor( final R=sum(layers.material[i].R for i in 1:size(layers.material, 1))); - Modelica.SIunits.Temperature T[sum(nSta)]( + Modelica.Units.SI.Temperature T[sum(nSta)]( each nominal = 300, each start=293.15) "Temperature at the states"; - Modelica.SIunits.HeatFlowRate Q_flow[sum(nSta)+nLay] + Modelica.Units.SI.HeatFlowRate Q_flow[sum(nSta)+nLay] "Heat flow rate from state i to i+1"; extends Buildings.HeatTransfer.Conduction.BaseClasses.PartialConstruction; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Conduction/SingleLayer.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Conduction/SingleLayer.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Conduction/SingleLayer.mo" 2022-03-10 09:57:31.664143324 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Conduction/SingleLayer.mo" 2022-03-10 09:58:39.212151881 +0000 @@ -7,13 +7,13 @@ // The value T[:].start is used by the solver when finding initial states // that satisfy dT/dt=0, which requires solving a system of nonlinear equations // if the convection coefficient is a function of temperature. - Modelica.SIunits.Temperature T[nSta](start= + Modelica.Units.SI.Temperature T[nSta](start= {T_a_start+(T_b_start-T_a_start) * UA * sum((if (k==1 or k==nSta+1) then RnSta2 else RnSta) for k in 1:i) for i in 1:nSta}, each nominal = 300) "Temperature at the states"; - Modelica.SIunits.HeatFlowRate Q_flow[nSta+1] + Modelica.Units.SI.HeatFlowRate Q_flow[nSta+1] "Heat flow rate from state i to i+1"; - Modelica.SIunits.SpecificInternalEnergy u[nSta](start= + Modelica.Units.SI.SpecificInternalEnergy u[nSta](start= material.c*{T_a_start+(T_b_start-T_a_start) * UA * sum((if (k==1 or k==nSta+1) then RnSta2 else RnSta) for k in 1:i) for i in 1:nSta}, each nominal = 270000) @@ -26,31 +26,31 @@ parameter Boolean steadyStateInitial=false "=true initializes dT(0)/dt=0, false initializes T(0) at fixed temperature using T_a_start and T_b_start" annotation (Dialog(group="Initialization"), Evaluate=true); - parameter Modelica.SIunits.Temperature T_a_start=293.15 + parameter Modelica.Units.SI.Temperature T_a_start=293.15 "Initial temperature at port_a, used if steadyStateInitial = false" annotation (Dialog(group="Initialization", enable=not steadyStateInitial)); - parameter Modelica.SIunits.Temperature T_b_start=293.15 + parameter Modelica.Units.SI.Temperature T_b_start=293.15 "Initial temperature at port_b, used if steadyStateInitial = false" annotation (Dialog(group="Initialization", enable=not steadyStateInitial)); protected final parameter Integer nSta(min=1) = material.nSta "Number of state variables"; - final parameter Modelica.SIunits.ThermalResistance RnSta = R/nSta + final parameter Modelica.Units.SI.ThermalResistance RnSta = R/nSta "Thermal resistance between nodes"; - final parameter Modelica.SIunits.ThermalResistance RnSta2 = RnSta/2 + final parameter Modelica.Units.SI.ThermalResistance RnSta2 = RnSta/2 "Thermal resistance between nodes and surface boundary"; - parameter Modelica.SIunits.Mass m = A*material.x*material.d/material.nSta + parameter Modelica.Units.SI.Mass m = A*material.x*material.d/material.nSta "Mass associated with the temperature state"; - final parameter Modelica.SIunits.HeatCapacity C = m*material.c + final parameter Modelica.Units.SI.HeatCapacity C = m*material.c "Heat capacity associated with the temperature state"; final parameter Real CInv = if material.steadyState then 0 else 1/C "Inverse of heat capacity associated with the temperature state"; - parameter Modelica.SIunits.SpecificInternalEnergy ud[Buildings.HeatTransfer.Conduction.nSupPCM](each fixed=false) + parameter Modelica.Units.SI.SpecificInternalEnergy ud[Buildings.HeatTransfer.Conduction.nSupPCM](each fixed=false) "Support points for derivatives (used for PCM)"; - parameter Modelica.SIunits.Temperature Td[Buildings.HeatTransfer.Conduction.nSupPCM](each fixed=false) + parameter Modelica.Units.SI.Temperature Td[Buildings.HeatTransfer.Conduction.nSupPCM](each fixed=false) "Support points for derivatives (used for PCM)"; parameter Real dT_du[Buildings.HeatTransfer.Conduction.nSupPCM](each fixed=false, each unit="kg.K2/J") "Derivatives dT/du at the support points (used for PCM)"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Conduction/SingleLayerCylinder.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Conduction/SingleLayerCylinder.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Conduction/SingleLayerCylinder.mo" 2022-03-10 09:57:31.664143324 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Conduction/SingleLayerCylinder.mo" 2022-03-10 09:58:39.192151879 +0000 @@ -4,14 +4,14 @@ "Material thermal properties" annotation (choicesAllMatching=true); - 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) "Number of state variables"; - parameter Modelica.SIunits.Temperature TInt_start=293.15 + parameter Modelica.Units.SI.Temperature TInt_start=293.15 "Initial temperature at port_a, used if steadyStateInitial = false" annotation (Dialog(group="Initialization", enable=not steadyStateInitial)); - parameter Modelica.SIunits.Temperature TExt_start=293.15 + parameter Modelica.Units.SI.Temperature TExt_start=293.15 "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 griFac(min=1) = 2 "Grid factor for spacing"; - Modelica.SIunits.TemperatureDifference dT "port_a.T - port_b.T"; + Modelica.Units.SI.TemperatureDifference dT "port_a.T - port_b.T"; Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a port_a "Heat port at surface a" annotation (Placement(transformation(extent={{-110,-10}, @@ -29,33 +29,33 @@ "Heat port at surface b" annotation (Placement(transformation(extent={{90,-10},{ 110,10}}))); - Modelica.SIunits.Temperature T[nSta](start= + 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.HeatFlowRate Q_flow[nSta+1] + Modelica.Units.SI.HeatFlowRate Q_flow[nSta+1] "Heat flow rate from state i to i+1"; // Modelica.SIunits.TemperatureSlope der_T[nSta] // "Time derivative of temperature (= der(T))"; protected - 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"; - 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= material.c + final parameter Modelica.Units.SI.SpecificHeatCapacity c= material.c "Specific heat capacity"; - final parameter Modelica.SIunits.ThermalConductivity k= material.k + final parameter Modelica.Units.SI.ThermalConductivity k= material.k "Thermal conductivity of the material"; - final parameter Modelica.SIunits.Density d = material.d + final parameter Modelica.Units.SI.Density d = material.d "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"; - initial equation assert(r_a < r_b, "Error: Model requires r_a < r_b."); assert(0 < r_a, "Error: Model requires 0 < r_a."); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Convection/BaseClasses/PartialConvection.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Convection/BaseClasses/PartialConvection.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Convection/BaseClasses/PartialConvection.mo" 2022-03-10 09:57:31.664143324 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Convection/BaseClasses/PartialConvection.mo" 2022-03-10 09:58:39.164151874 +0000 @@ -1,12 +1,12 @@ within Buildings.HeatTransfer.Convection.BaseClasses; partial model PartialConvection "Partial model for heat convection" extends Buildings.BaseClasses.BaseIcon; - parameter Modelica.SIunits.Area A "Heat transfer area"; - parameter Modelica.SIunits.CoefficientOfHeatTransfer hFixed=3 + parameter Modelica.Units.SI.Area A "Heat transfer area"; + parameter Modelica.Units.SI.CoefficientOfHeatTransfer hFixed=3 "Constant convection coefficient"; - Modelica.SIunits.HeatFlowRate Q_flow "Heat flow rate from solid -> fluid"; - Modelica.SIunits.HeatFlux q_flow "Convective heat flux from solid -> fluid"; - Modelica.SIunits.TemperatureDifference dT(start=0) "= solid.T - fluid.T"; + Modelica.Units.SI.HeatFlowRate Q_flow "Heat flow rate from solid -> fluid"; + Modelica.Units.SI.HeatFlux q_flow "Convective heat flux from solid -> fluid"; + Modelica.Units.SI.TemperatureDifference dT(start=0) "= solid.T - fluid.T"; Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a solid annotation (Placement(transformation(extent={{-110, -10},{-90,10}}))); @@ -14,7 +14,7 @@ annotation (Placement(transformation(extent={{90,-10}, {110,10}}))); - parameter Modelica.SIunits.Angle til(displayUnit="deg") "Surface tilt" + parameter Modelica.Units.SI.Angle til(displayUnit="deg") "Surface tilt" annotation (Dialog(enable= not (conMod == Buildings.HeatTransfer.Types.InteriorConvection.fixed))); protected diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Convection/Exterior.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Convection/Exterior.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Convection/Exterior.mo" 2022-03-10 09:57:31.668143323 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Convection/Exterior.mo" 2022-03-10 09:58:39.096151867 +0000 @@ -9,18 +9,18 @@ parameter Buildings.HeatTransfer.Types.SurfaceRoughness roughness= Buildings.HeatTransfer.Types.SurfaceRoughness.Medium "Surface roughness" annotation (Dialog(enable=(conMod <> Buildings.HeatTransfer.Types.InteriorConvection.Fixed))); - parameter Modelica.SIunits.Angle azi "Surface azimuth"; + parameter Modelica.Units.SI.Angle azi "Surface azimuth"; Modelica.Blocks.Interfaces.RealInput v(unit="m/s") "Wind speed" annotation (Placement(transformation(extent={{-140,80},{-100,120}}))); Modelica.Blocks.Interfaces.RealInput dir(unit="rad", displayUnit="deg", min=0, max=2*Modelica.Constants.pi) "Wind direction (0=wind from North)" annotation (Placement(transformation(extent={{-140,30},{-100,70}}))); - Modelica.SIunits.CoefficientOfHeatTransfer hF + Modelica.Units.SI.CoefficientOfHeatTransfer hF "Convective heat transfer coefficient due to forced convection"; - Modelica.SIunits.HeatFlux qN_flow + Modelica.Units.SI.HeatFlux qN_flow "Convective heat flux from solid -> fluid due to natural convection"; - Modelica.SIunits.HeatFlux qF_flow + Modelica.Units.SI.HeatFlux qF_flow "Convective heat flux from solid -> fluid due to forced convection"; protected parameter Real R(fixed=false) "Surface roughness"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Convection/Functions/HeatFlux/BaseClasses/PartialHeatFlux.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Convection/Functions/HeatFlux/BaseClasses/PartialHeatFlux.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Convection/Functions/HeatFlux/BaseClasses/PartialHeatFlux.mo" 2022-03-10 09:57:31.668143323 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Convection/Functions/HeatFlux/BaseClasses/PartialHeatFlux.mo" 2022-03-10 09:58:39.064151861 +0000 @@ -2,9 +2,9 @@ partial function PartialHeatFlux "Partial function for convective heat flux" extends Modelica.Icons.Function; - input Modelica.SIunits.TemperatureDifference dT + input Modelica.Units.SI.TemperatureDifference dT "Temperature difference solid minus fluid"; - output Modelica.SIunits.HeatFlux q_flow + output Modelica.Units.SI.HeatFlux q_flow "Convective heat flux from solid to fluid"; annotation (Documentation(info= " diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Convection/Functions/HeatFlux/constantCoefficient.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Convection/Functions/HeatFlux/constantCoefficient.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Convection/Functions/HeatFlux/constantCoefficient.mo" 2022-03-10 09:57:31.668143323 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Convection/Functions/HeatFlux/constantCoefficient.mo" 2022-03-10 09:58:39.052151861 +0000 @@ -2,7 +2,7 @@ function constantCoefficient "Constant convective heat transfer coefficient" extends Buildings.HeatTransfer.Convection.Functions.HeatFlux.BaseClasses.PartialHeatFlux; - input Modelica.SIunits.CoefficientOfHeatTransfer hCon = 3 + input Modelica.Units.SI.CoefficientOfHeatTransfer hCon = 3 "Constant for convective heat transfer coefficient"; algorithm q_flow :=hCon*dT; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Convection/Functions/HeatFlux/rayleigh.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Convection/Functions/HeatFlux/rayleigh.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Convection/Functions/HeatFlux/rayleigh.mo" 2022-03-10 09:57:31.668143323 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Convection/Functions/HeatFlux/rayleigh.mo" 2022-03-10 09:58:39.044151859 +0000 @@ -1,17 +1,17 @@ within Buildings.HeatTransfer.Convection.Functions.HeatFlux; function rayleigh "Rayleigh number with smooth transition to lower limit" extends Modelica.Icons.Function; - input Modelica.SIunits.Length x "Layer thickness"; - input Modelica.SIunits.Density rho "Mass density"; - input Modelica.SIunits.SpecificHeatCapacity c_p "Specific heat capacity"; - input Modelica.SIunits.DynamicViscosity mu "Dynamic viscosity"; - input Modelica.SIunits.ThermalConductivity k "Thermal conductivity"; - input Modelica.SIunits.Temperature T_a "Temperature of surface a"; - input Modelica.SIunits.Temperature T_b "Temperature of surface b"; + input Modelica.Units.SI.Length x "Layer thickness"; + input Modelica.Units.SI.Density rho "Mass density"; + input Modelica.Units.SI.SpecificHeatCapacity c_p "Specific heat capacity"; + input Modelica.Units.SI.DynamicViscosity mu "Dynamic viscosity"; + input Modelica.Units.SI.ThermalConductivity k "Thermal conductivity"; + input Modelica.Units.SI.Temperature T_a "Temperature of surface a"; + input Modelica.Units.SI.Temperature T_b "Temperature of surface b"; input Real Ra_min "Minimum value for Rayleigh number"; output Real Ra "Rayleigh number"; protected - Modelica.SIunits.TemperatureDifference dT "Temperature difference"; + Modelica.Units.SI.TemperatureDifference dT "Temperature difference"; algorithm Ra := Buildings.Utilities.Math.Functions.smoothMax( x1=rho^2*x^3*Modelica.Constants.g_n*c_p*abs(T_a - T_b)/((T_a+T_b)/2*mu*k), diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Convection/Functions/windDirectionModifier.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Convection/Functions/windDirectionModifier.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Convection/Functions/windDirectionModifier.mo" 2022-03-10 09:57:31.668143323 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Convection/Functions/windDirectionModifier.mo" 2022-03-10 09:58:39.032151857 +0000 @@ -3,12 +3,12 @@ "Wind direction modifier that is used to compute the wind-driven convective heat transfer coefficient" extends Modelica.Icons.Function; - input Modelica.SIunits.Angle azi "Surface azimuth"; - input Modelica.SIunits.Angle dir(min=0, max=2*Modelica.Constants.pi) + input Modelica.Units.SI.Angle azi "Surface azimuth"; + input Modelica.Units.SI.Angle dir(min=0, max=2*Modelica.Constants.pi) "Wind direction (0=wind from North)"; output Real W "Wind direction modifier"; protected - constant Modelica.SIunits.Angle lee = Modelica.SIunits.Conversions.from_deg(100) + constant Modelica.Units.SI.Angle lee = Modelica.Units.Conversions.from_deg(100) "Angle at which the transition occurs"; constant Real cosLee = Modelica.Math.cos(lee) "Cosine of the angle at which the transition occurs"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Convection/Interior.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Convection/Interior.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Convection/Interior.mo" 2022-03-10 09:57:31.668143323 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Convection/Interior.mo" 2022-03-10 09:58:39.024151857 +0000 @@ -9,7 +9,7 @@ parameter Boolean homotopyInitialization = true "= true, use homotopy method" annotation(Evaluate=true, Dialog(tab="Advanced")); protected - constant Modelica.SIunits.Temperature dT0 = 2 + constant Modelica.Units.SI.Temperature dT0 = 2 "Initial temperature used in homotopy method"; equation if (conMod == Buildings.HeatTransfer.Types.InteriorConvection.Fixed) then diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Data/BaseClasses.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Data/BaseClasses.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Data/BaseClasses.mo" 2022-03-10 09:57:31.668143323 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Data/BaseClasses.mo" 2022-03-10 09:58:39.004151854 +0000 @@ -3,10 +3,10 @@ extends Modelica.Icons.BasesPackage; record Material "Thermal properties of materials w/o storage" extends Modelica.Icons.Record; - parameter Modelica.SIunits.Length x "Material thickness"; - parameter Modelica.SIunits.ThermalConductivity k "Thermal conductivity"; - parameter Modelica.SIunits.SpecificHeatCapacity c "Specific heat capacity"; - parameter Modelica.SIunits.Density d "Mass density"; + parameter Modelica.Units.SI.Length x "Material thickness"; + parameter Modelica.Units.SI.ThermalConductivity k "Thermal conductivity"; + parameter Modelica.Units.SI.SpecificHeatCapacity c "Specific heat capacity"; + parameter Modelica.Units.SI.Density d "Mass density"; parameter Real R(unit="m2.K/W") "Thermal resistance of a unit area of material"; parameter Integer nStaRef(min=0) = 3 @@ -27,13 +27,13 @@ "Number of states as a real number" annotation (Dialog(tab="Advanced")); - parameter Modelica.SIunits.Temperature TSol + parameter Modelica.Units.SI.Temperature TSol "Solidus temperature, used only for PCM." annotation (Dialog(group="Properties for phase change material")); - parameter Modelica.SIunits.Temperature TLiq + parameter Modelica.Units.SI.Temperature TLiq "Liquidus temperature, used only for PCM" annotation (Dialog(group="Properties for phase change material")); - parameter Modelica.SIunits.SpecificInternalEnergy LHea + parameter Modelica.Units.SI.SpecificInternalEnergy LHea "Latent heat of phase change" annotation (Dialog(group="Properties for phase change material")); @@ -129,9 +129,9 @@ record ThermalProperties "Thermal properties of materials with storage" extends Modelica.Icons.Record; - parameter Modelica.SIunits.ThermalConductivity k "Thermal conductivity"; - parameter Modelica.SIunits.SpecificHeatCapacity c "Specific heat capacity"; - parameter Modelica.SIunits.Density d "Mass density"; + parameter Modelica.Units.SI.ThermalConductivity k "Thermal conductivity"; + parameter Modelica.Units.SI.SpecificHeatCapacity c "Specific heat capacity"; + parameter Modelica.Units.SI.Density d "Mass density"; parameter Boolean steadyState= (c < Modelica.Constants.eps or d < Modelica.Constants.eps) "Flag, if true, then material is computed using steady-state heat conduction" annotation(Evaluate=true); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Data/Gases.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Data/Gases.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Data/Gases.mo" 2022-03-10 09:57:31.668143323 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Data/Gases.mo" 2022-03-10 09:58:38.976151852 +0000 @@ -4,25 +4,25 @@ record Generic "Thermal properties of fill gas for windows" extends Modelica.Icons.Record; - parameter Modelica.SIunits.Length x "Gas layer thickness"; - parameter Modelica.SIunits.ThermalConductivity a_k + parameter Modelica.Units.SI.Length x "Gas layer thickness"; + parameter Modelica.Units.SI.ThermalConductivity a_k "Constant coefficient for thermal conductivity"; parameter Real b_k(unit="W/(m.K2)") "Temperature dependent coefficient for thermal conductivity"; - parameter Modelica.SIunits.DynamicViscosity a_mu + parameter Modelica.Units.SI.DynamicViscosity a_mu "Constant coefficient for dynamic viscosity"; parameter Real b_mu(unit="N.s/(m2.K)") "Temperature dependent coefficient for dynamic viscosity"; - parameter Modelica.SIunits.SpecificHeatCapacity a_c + parameter Modelica.Units.SI.SpecificHeatCapacity a_c "Constant coefficient for specific heat capacity"; parameter Real b_c(unit="J/(kg.K2)") "Temperature dependent coefficient for specific heat capacity"; - parameter Modelica.SIunits.MolarMass MM - "Molar mass (of mixture or single fluid)"; - parameter Modelica.SIunits.Pressure P0 = 101325 "Normal pressure"; + parameter Modelica.Units.SI.MolarMass MM + "Molar mass (of mixture or single fluid)"; + parameter Modelica.Units.SI.Pressure P0 = 101325 "Normal pressure"; annotation ( defaultComponentPrefixes="parameter", defaultComponentName="datGas", @@ -85,24 +85,24 @@ function thermalConductivity "Function to compute the thermal conductivity of gases" input Buildings.HeatTransfer.Data.Gases.Generic gas "Record of gas data"; - input Modelica.SIunits.Temperature T "Gas temperature"; - output Modelica.SIunits.ThermalConductivity k "Thermal conductivity"; + input Modelica.Units.SI.Temperature T "Gas temperature"; + output Modelica.Units.SI.ThermalConductivity k "Thermal conductivity"; algorithm k := gas.a_k + gas.b_k*T; end thermalConductivity; function density "Function to compute the mass density" input Buildings.HeatTransfer.Data.Gases.Generic gas "Record of gas data"; - input Modelica.SIunits.Temperature T "Gas temperature"; - output Modelica.SIunits.Density rho "Mass density"; + input Modelica.Units.SI.Temperature T "Gas temperature"; + output Modelica.Units.SI.Density rho "Mass density"; algorithm rho := gas.P0*gas.MM/Modelica.Constants.R/T; end density; function dynamicViscosity "Function to compute the dynamic viscosity for gases" input Buildings.HeatTransfer.Data.Gases.Generic gas "Record of gas data"; - input Modelica.SIunits.Temperature T "Gas temperature"; - output Modelica.SIunits.DynamicViscosity mu "Dynamic viscosity"; + input Modelica.Units.SI.Temperature T "Gas temperature"; + output Modelica.Units.SI.DynamicViscosity mu "Dynamic viscosity"; algorithm mu := gas.a_mu + gas.b_mu*T; end dynamicViscosity; @@ -110,8 +110,8 @@ function specificHeatCapacity "Function to compute the specific heat capacity for gases" input Buildings.HeatTransfer.Data.Gases.Generic gas "Record of gas data"; - input Modelica.SIunits.Temperature T "Gas temperature"; - output Modelica.SIunits.SpecificHeatCapacity c_p "Specific heat capacity"; + input Modelica.Units.SI.Temperature T "Gas temperature"; + output Modelica.Units.SI.SpecificHeatCapacity c_p "Specific heat capacity"; algorithm c_p := gas.a_c + gas.b_c*T; end specificHeatCapacity; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Data/Glasses.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Data/Glasses.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Data/Glasses.mo" 2022-03-10 09:57:31.668143323 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Data/Glasses.mo" 2022-03-10 09:58:38.952151848 +0000 @@ -3,19 +3,19 @@ extends Modelica.Icons.MaterialPropertiesPackage; record Generic "Thermal properties of window glass" extends Modelica.Icons.Record; - parameter Modelica.SIunits.Length x=0.003 "Thickness"; - parameter Modelica.SIunits.ThermalConductivity k=1 "Thermal conductivity"; - parameter Modelica.SIunits.TransmissionCoefficient tauSol[:] = {0.6} + parameter Modelica.Units.SI.Length x=0.003 "Thickness"; + parameter Modelica.Units.SI.ThermalConductivity k=1 "Thermal conductivity"; + parameter Modelica.Units.SI.TransmissionCoefficient tauSol[:] = {0.6} "Solar transmittance"; - parameter Modelica.SIunits.ReflectionCoefficient rhoSol_a[:] = {0.075} + parameter Modelica.Units.SI.ReflectionCoefficient rhoSol_a[:] = {0.075} "Solar reflectance of surface a (usually outside-facing surface)"; - parameter Modelica.SIunits.ReflectionCoefficient rhoSol_b[:] = {0.075} + parameter Modelica.Units.SI.ReflectionCoefficient rhoSol_b[:] = {0.075} "Solar reflectance of surface b (usually room-facing surface)"; - parameter Modelica.SIunits.TransmissionCoefficient tauIR = 0 + parameter Modelica.Units.SI.TransmissionCoefficient tauIR = 0 "Infrared transmissivity of glass"; - parameter Modelica.SIunits.Emissivity absIR_a = 0.84 + parameter Modelica.Units.SI.Emissivity absIR_a = 0.84 "Infrared absorptivity of surface a (usually outside-facing surface)"; - parameter Modelica.SIunits.Emissivity absIR_b = 0.84 + parameter Modelica.Units.SI.Emissivity absIR_b = 0.84 "Infrared absorptivity of surface b (usually room-facing surface)"; annotation ( defaultComponentPrefixes="parameter", diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Data/GlazingSystems.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Data/GlazingSystems.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Data/GlazingSystems.mo" 2022-03-10 09:57:31.668143323 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Data/GlazingSystems.mo" 2022-03-10 09:58:38.908151843 +0000 @@ -27,11 +27,11 @@ parameter Shades.Generic shade "Shade" annotation (choicesAllMatching=true, Dialog(enable=haveInteriorShade or haveExteriorShade)); - parameter Modelica.SIunits.CoefficientOfHeatTransfer UFra + parameter Modelica.Units.SI.CoefficientOfHeatTransfer UFra "U-value of frame"; - parameter Modelica.SIunits.Emissivity absIRFra=0.8 + parameter Modelica.Units.SI.Emissivity absIRFra=0.8 "Infrared absorptivity of window frame"; - parameter Modelica.SIunits.Emissivity absSolFra=0.5 + parameter Modelica.Units.SI.Emissivity absSolFra=0.5 "Solar absorptivity of window frame"; final parameter Boolean haveShade = haveInteriorShade or haveExteriorShade "Parameter that is true if the construction has a shade"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Data/OpaqueConstructions.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Data/OpaqueConstructions.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Data/OpaqueConstructions.mo" 2022-03-10 09:57:31.668143323 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Data/OpaqueConstructions.mo" 2022-03-10 09:58:38.896151841 +0000 @@ -12,13 +12,13 @@ final parameter Real R(unit="m2.K/W")=sum(material[i].R for i in 1:nLay) "Thermal resistance per unit area"; - parameter Modelica.SIunits.Emissivity absIR_a=0.9 + parameter Modelica.Units.SI.Emissivity absIR_a=0.9 "Infrared absorptivity of surface a (usually outside-facing surface)"; - parameter Modelica.SIunits.Emissivity absIR_b=0.9 + parameter Modelica.Units.SI.Emissivity absIR_b=0.9 "Infrared absorptivity of surface b (usually room-facing surface)"; - parameter Modelica.SIunits.Emissivity absSol_a=0.5 + parameter Modelica.Units.SI.Emissivity absSol_a=0.5 "Solar absorptivity of surface a (usually outside-facing surface)"; - parameter Modelica.SIunits.Emissivity absSol_b=0.5 + parameter Modelica.Units.SI.Emissivity absSol_b=0.5 "Solar absorptivity of surface b (usually room-facing surface)"; parameter Buildings.HeatTransfer.Types.SurfaceRoughness roughness_a= Buildings.HeatTransfer.Types.SurfaceRoughness.Medium diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Data/OpaqueSurfaces.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Data/OpaqueSurfaces.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Data/OpaqueSurfaces.mo" 2022-03-10 09:57:31.668143323 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Data/OpaqueSurfaces.mo" 2022-03-10 09:58:38.884151839 +0000 @@ -5,11 +5,11 @@ record Generic "Thermal properties of opaque surfaces" extends Modelica.Icons.Record; - parameter Modelica.SIunits.Area A "Area"; - parameter Modelica.SIunits.Angle til + parameter Modelica.Units.SI.Area A "Area"; + parameter Modelica.Units.SI.Angle til "Surface tilt (0: ceiling, pi/2: wall, pi: floor"; - parameter Modelica.SIunits.Emissivity absIR=0.84 "Infrared absorptivity"; - parameter Modelica.SIunits.Emissivity absSol=0.84 "Solar absorptivity"; + parameter Modelica.Units.SI.Emissivity absIR=0.84 "Infrared absorptivity"; + parameter Modelica.Units.SI.Emissivity absSol=0.84 "Solar absorptivity"; final parameter Boolean isFloor=til > 2.74889125 and til < 3.53428875 "Flag, true if construction is a floor" annotation (Evaluate=true); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Data/Shades.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Data/Shades.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Data/Shades.mo" 2022-03-10 09:57:31.668143323 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Data/Shades.mo" 2022-03-10 09:58:38.868151837 +0000 @@ -3,23 +3,23 @@ extends Modelica.Icons.MaterialPropertiesPackage; record Generic "Thermal properties of window shades" extends Modelica.Icons.Record; - parameter Modelica.SIunits.TransmissionCoefficient tauSol_a=0.1 + + parameter Modelica.Units.SI.TransmissionCoefficient tauSol_a=0.1 "Solar transmissivity of shade surface a (surface that faces the outside or the room)"; - parameter Modelica.SIunits.TransmissionCoefficient tauSol_b=0.1 + parameter Modelica.Units.SI.TransmissionCoefficient tauSol_b=0.1 "Solar transmissivity of shade surface b (surface that faces the glass)"; - parameter Modelica.SIunits.ReflectionCoefficient rhoSol_a=0.8 + parameter Modelica.Units.SI.ReflectionCoefficient rhoSol_a=0.8 "Solar reflection coefficient of shade surface a (surface that faces the outside or the room)"; - parameter Modelica.SIunits.ReflectionCoefficient rhoSol_b=0.8 + parameter Modelica.Units.SI.ReflectionCoefficient rhoSol_b=0.8 "Solar reflection coefficient of shade surface b (surface that faces the glass)"; - parameter Modelica.SIunits.Emissivity absIR_a=0.84 + parameter Modelica.Units.SI.Emissivity absIR_a=0.84 "Infrared absorptivity of surface a (surface that faces the outside or the room)"; - parameter Modelica.SIunits.Emissivity absIR_b=0.84 + parameter Modelica.Units.SI.Emissivity absIR_b=0.84 "Infrared absorptivity of surface b (surface that faces the glass)"; - parameter Modelica.SIunits.TransmissionCoefficient tauIR_a=0 + parameter Modelica.Units.SI.TransmissionCoefficient tauIR_a=0 "Infrared transmissivity of surface a (surface that faces the outside or the room)"; - parameter Modelica.SIunits.TransmissionCoefficient tauIR_b=0 + parameter Modelica.Units.SI.TransmissionCoefficient tauIR_b=0 "Infrared transmissivity of surface b (surface that faces the glass)"; - annotation ( defaultComponentPrefixes="parameter", defaultComponentName="datSha", diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Examples/ConductorSingleLayerCylinder.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Examples/ConductorSingleLayerCylinder.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Examples/ConductorSingleLayerCylinder.mo" 2022-03-10 09:57:31.668143323 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Examples/ConductorSingleLayerCylinder.mo" 2022-03-10 09:58:38.792151827 +0000 @@ -2,7 +2,7 @@ model ConductorSingleLayerCylinder "Test model for heat conduction in a cylinder" extends Modelica.Icons.Example; - parameter Modelica.SIunits.HeatFlowRate Q_flow=50; + parameter Modelica.Units.SI.HeatFlowRate Q_flow=50; Buildings.HeatTransfer.Conduction.SingleLayerCylinder con( material=concrete, steadyStateInitial=false, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Radiosity/BaseClasses/ParametersOneSurface.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Radiosity/BaseClasses/ParametersOneSurface.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Radiosity/BaseClasses/ParametersOneSurface.mo" 2022-03-10 09:57:31.668143323 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Radiosity/BaseClasses/ParametersOneSurface.mo" 2022-03-10 09:58:38.660151812 +0000 @@ -1,13 +1,13 @@ within Buildings.HeatTransfer.Radiosity.BaseClasses; model ParametersOneSurface "Parameters that are used to model one surface" - parameter Modelica.SIunits.Emissivity absIR "Infrared absorptivity"; - parameter Modelica.SIunits.ReflectionCoefficient rhoIR + parameter Modelica.Units.SI.Emissivity absIR "Infrared absorptivity"; + parameter Modelica.Units.SI.ReflectionCoefficient rhoIR "Infrared reflectivity"; - parameter Modelica.SIunits.TransmissionCoefficient tauIR + parameter Modelica.Units.SI.TransmissionCoefficient tauIR "Infrared transmissivity"; parameter Boolean linearize=false "Set to true to linearize emissive power" annotation (Evaluate=true); - parameter Modelica.SIunits.Temperature T0=293.15 + parameter Modelica.Units.SI.Temperature T0=293.15 "Temperature used to linearize radiative heat transfer" annotation (Dialog(enable=linearize)); protected diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Radiosity/BaseClasses/ParametersTwoSurfaces.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Radiosity/BaseClasses/ParametersTwoSurfaces.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Radiosity/BaseClasses/ParametersTwoSurfaces.mo" 2022-03-10 09:57:31.668143323 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Radiosity/BaseClasses/ParametersTwoSurfaces.mo" 2022-03-10 09:58:38.648151810 +0000 @@ -1,19 +1,19 @@ within Buildings.HeatTransfer.Radiosity.BaseClasses; model ParametersTwoSurfaces "Parameters that are used to model two surfaces with the same area" - parameter Modelica.SIunits.Emissivity absIR_a + parameter Modelica.Units.SI.Emissivity absIR_a "Infrared absorptivity of surface a"; - parameter Modelica.SIunits.Emissivity absIR_b + parameter Modelica.Units.SI.Emissivity absIR_b "Infrared absorptivity of surface b"; - parameter Modelica.SIunits.ReflectionCoefficient rhoIR_a + parameter Modelica.Units.SI.ReflectionCoefficient rhoIR_a "Infrared reflectivity of surface a"; - parameter Modelica.SIunits.ReflectionCoefficient rhoIR_b + parameter Modelica.Units.SI.ReflectionCoefficient rhoIR_b "Infrared reflectivity of surface b"; - parameter Modelica.SIunits.TransmissionCoefficient tauIR + parameter Modelica.Units.SI.TransmissionCoefficient tauIR "Infrared transmissivity of glass pane"; parameter Boolean linearize = false "Set to true to linearize emissive power" annotation (Evaluate=true); - parameter Modelica.SIunits.Temperature T0=293.15 + parameter Modelica.Units.SI.Temperature T0=293.15 "Temperature used to linearize radiative heat transfer" annotation (Dialog(enable=linearize)); protected diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Radiosity/BaseClasses/RadiosityOneSurface.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Radiosity/BaseClasses/RadiosityOneSurface.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Radiosity/BaseClasses/RadiosityOneSurface.mo" 2022-03-10 09:57:31.668143323 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Radiosity/BaseClasses/RadiosityOneSurface.mo" 2022-03-10 09:58:38.640151808 +0000 @@ -2,7 +2,7 @@ partial model RadiosityOneSurface "Model for the radiosity balance of a device with one surface" extends Buildings.BaseClasses.BaseIcon; - parameter Modelica.SIunits.Area A "Surface area"; + parameter Modelica.Units.SI.Area A "Surface area"; Buildings.HeatTransfer.Interfaces.RadiosityInflow JIn(start=A*0.8*Modelica.Constants.sigma*293.15^4) "Incoming radiosity" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Radiosity/BaseClasses/RadiosityTwoSurfaces.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Radiosity/BaseClasses/RadiosityTwoSurfaces.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Radiosity/BaseClasses/RadiosityTwoSurfaces.mo" 2022-03-10 09:57:31.668143323 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Radiosity/BaseClasses/RadiosityTwoSurfaces.mo" 2022-03-10 09:58:38.628151806 +0000 @@ -2,7 +2,7 @@ partial block RadiosityTwoSurfaces "Model for the radiosity balance of a device with two surfaces" extends Buildings.BaseClasses.BaseIcon; - parameter Modelica.SIunits.Area A "Surface area"; + parameter Modelica.Units.SI.Area A "Surface area"; Buildings.HeatTransfer.Interfaces.RadiosityInflow JIn_a(start=A*0.8*Modelica.Constants.sigma*293.15^4) "Incoming radiosity at surface a" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Radiosity/Examples/OutdoorRadiosity.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Radiosity/Examples/OutdoorRadiosity.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Radiosity/Examples/OutdoorRadiosity.mo" 2022-03-10 09:57:31.668143323 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Radiosity/Examples/OutdoorRadiosity.mo" 2022-03-10 09:58:38.596151802 +0000 @@ -7,7 +7,7 @@ Buildings.HeatTransfer.Radiosity.OutdoorRadiosity outRad(A=A, vieFacSky=0.5) "Outdoor radiosity model" annotation (Placement(transformation(extent={{-40,-22},{-20,-2}}))); - parameter Modelica.SIunits.Area A=1 "Area of receiving surface"; + parameter Modelica.Units.SI.Area A=1 "Area of receiving surface"; Modelica.Blocks.Sources.Ramp TSky( duration=1, height=30, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Radiosity/OutdoorRadiosity.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Radiosity/OutdoorRadiosity.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Radiosity/OutdoorRadiosity.mo" 2022-03-10 09:57:31.668143323 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Radiosity/OutdoorRadiosity.mo" 2022-03-10 09:58:38.536151795 +0000 @@ -1,16 +1,16 @@ within Buildings.HeatTransfer.Radiosity; model OutdoorRadiosity "Model for the outdoor radiosity that strikes the window" - parameter Modelica.SIunits.Area A "Area of receiving surface"; + parameter Modelica.Units.SI.Area A "Area of receiving surface"; parameter Real vieFacSky(final min=0, final max=1) "View factor from receiving surface to sky (=1 for roofs)"; parameter Boolean linearize=false "Set to true to linearize emissive power" annotation (Evaluate=true); - parameter Modelica.SIunits.Temperature T0=293.15 + parameter Modelica.Units.SI.Temperature T0=293.15 "Temperature used to linearize radiative heat transfer" annotation (Dialog(enable=linearize)); Real TRad4(unit="K4") "4th power of the mean outdoor temperature"; - Modelica.SIunits.Temperature TRad "Mean radiant temperature"; + Modelica.Units.SI.Temperature TRad "Mean radiant temperature"; Modelica.Blocks.Interfaces.RealInput TOut( final quantity="ThermodynamicTemperature", diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Sources/FixedHeatFlow.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Sources/FixedHeatFlow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Sources/FixedHeatFlow.mo" 2022-03-10 09:57:31.668143323 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Sources/FixedHeatFlow.mo" 2022-03-10 09:58:38.512151792 +0000 @@ -1,6 +1,6 @@ within Buildings.HeatTransfer.Sources; model FixedHeatFlow "Fixed heat flow boundary condition" - parameter Modelica.SIunits.HeatFlowRate Q_flow "Fixed heat flow rate at port"; + parameter Modelica.Units.SI.HeatFlowRate Q_flow "Fixed heat flow rate at port"; Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_b port annotation (Placement(transformation(extent={{90, -10},{110,10}}))); equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Sources/FixedTemperature.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Sources/FixedTemperature.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Sources/FixedTemperature.mo" 2022-03-10 09:57:31.668143323 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Sources/FixedTemperature.mo" 2022-03-10 09:58:38.500151790 +0000 @@ -1,7 +1,7 @@ within Buildings.HeatTransfer.Sources; model FixedTemperature "Fixed temperature boundary condition in Kelvin" - parameter Modelica.SIunits.Temperature T "Fixed temperature at port"; + parameter Modelica.Units.SI.Temperature T "Fixed temperature at port"; Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_b port annotation (Placement(transformation(extent={{90, -10},{110,10}}))); equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/AbsorbedRadiation.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/AbsorbedRadiation.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/AbsorbedRadiation.mo" 2022-03-10 09:57:31.668143323 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/AbsorbedRadiation.mo" 2022-03-10 09:58:38.440151784 +0000 @@ -32,7 +32,7 @@ annotation (Placement(transformation(extent={{100,-50},{120,-30}}), iconTransformation(extent={{100,-50},{120,-30}}))); - output Modelica.SIunits.Power absRad[2, N + 2, NSta] "Absorbed interior and exterior radiation. + output Modelica.Units.SI.Power absRad[2, N + 2, NSta] "Absorbed interior and exterior radiation. (absRad[2,1,iSta]: exterior shading device, absRad[1,2 to N+1,iSta]: glass (unshaded part), absRad[2,2 to N+1,iSta]: glass (shaded part), diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/CenterOfGlass.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/CenterOfGlass.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/CenterOfGlass.mo" 2022-03-10 09:57:31.668143323 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/CenterOfGlass.mo" 2022-03-10 09:58:38.408151780 +0000 @@ -1,8 +1,8 @@ within Buildings.HeatTransfer.Windows.BaseClasses; model CenterOfGlass "Model for center of glass of a window construction" extends Buildings.HeatTransfer.Radiosity.BaseClasses.RadiosityTwoSurfaces; - parameter Modelica.SIunits.Area A "Heat transfer area"; - parameter Modelica.SIunits.Angle til(displayUnit="deg") + parameter Modelica.Units.SI.Area A "Heat transfer area"; + parameter Modelica.Units.SI.Angle til(displayUnit="deg") "Surface tilt (only 90 degrees=vertical is implemented)"; parameter Buildings.HeatTransfer.Data.GlazingSystems.Generic glaSys diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/Examples/AbsorbedRadiation.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/Examples/AbsorbedRadiation.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/Examples/AbsorbedRadiation.mo" 2022-03-10 09:57:31.668143323 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/Examples/AbsorbedRadiation.mo" 2022-03-10 09:58:38.360151773 +0000 @@ -1,9 +1,9 @@ within Buildings.HeatTransfer.Windows.BaseClasses.Examples; model AbsorbedRadiation "Test model for absorbed radiation by windows" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Angle lat=0.34906585039887 "Latitude"; - parameter Modelica.SIunits.Angle azi=0 "Surface azimuth"; - parameter Modelica.SIunits.Angle til=1.5707963267949 "Surface tilt"; + parameter Modelica.Units.SI.Angle lat=0.34906585039887 "Latitude"; + parameter Modelica.Units.SI.Angle azi=0 "Surface azimuth"; + parameter Modelica.Units.SI.Angle til=1.5707963267949 "Surface tilt"; replaceable parameter Buildings.HeatTransfer.Data.GlazingSystems.DoubleClearAir13Clear glaSys( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/Examples/CenterOfGlass.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/Examples/CenterOfGlass.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/Examples/CenterOfGlass.mo" 2022-03-10 09:57:31.668143323 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/Examples/CenterOfGlass.mo" 2022-03-10 09:58:38.340151770 +0000 @@ -1,7 +1,7 @@ within Buildings.HeatTransfer.Windows.BaseClasses.Examples; model CenterOfGlass "Test model for center of glas heat transfer" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Area A=1 "Window surface area"; + parameter Modelica.Units.SI.Area A=1 "Window surface area"; parameter Boolean linearize = false "Set to true to linearize emissive power"; Buildings.HeatTransfer.Windows.BaseClasses.CenterOfGlass sha( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/Examples/GlassLayer.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/Examples/GlassLayer.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/Examples/GlassLayer.mo" 2022-03-10 09:57:31.668143323 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/Examples/GlassLayer.mo" 2022-03-10 09:58:38.296151765 +0000 @@ -1,7 +1,7 @@ within Buildings.HeatTransfer.Windows.BaseClasses.Examples; model GlassLayer "Test model for glass layer heat transfer" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Area A=1 "Window surface area"; + parameter Modelica.Units.SI.Area A=1 "Window surface area"; parameter Boolean linearize = false "Set to true to linearize emissive power"; Buildings.HeatTransfer.Windows.BaseClasses.GlassLayer sha( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/Examples/Shade.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/Examples/Shade.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/Examples/Shade.mo" 2022-03-10 09:57:31.668143323 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/Examples/Shade.mo" 2022-03-10 09:58:38.224151756 +0000 @@ -1,7 +1,7 @@ within Buildings.HeatTransfer.Windows.BaseClasses.Examples; model Shade "Test model for exterior shade heat transfer" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Area A=1 "Window surface area"; + parameter Modelica.Units.SI.Area A=1 "Window surface area"; parameter Boolean linearize = true "Set to true to linearize emissive power"; Buildings.HeatTransfer.Windows.BaseClasses.ShadeRadiation extShaRad( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/Examples/TransmittedRadiation.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/Examples/TransmittedRadiation.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/Examples/TransmittedRadiation.mo" 2022-03-10 09:57:31.668143323 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/Examples/TransmittedRadiation.mo" 2022-03-10 09:58:38.164151748 +0000 @@ -2,9 +2,9 @@ model TransmittedRadiation "Test model for transmitted radiation through window" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Angle lat=0.34906585039887 "Latitude"; - parameter Modelica.SIunits.Angle azi=0 "Surface azimuth"; - parameter Modelica.SIunits.Angle til=1.5707963267949 "Surface tilt"; + parameter Modelica.Units.SI.Angle lat=0.34906585039887 "Latitude"; + parameter Modelica.Units.SI.Angle azi=0 "Surface azimuth"; + parameter Modelica.Units.SI.Angle til=1.5707963267949 "Surface tilt"; parameter Buildings.HeatTransfer.Data.GlazingSystems.DoubleClearAir13Clear glaSys( shade=Buildings.HeatTransfer.Data.Shades.Gray(), diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/Examples/WindowRadiation.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/Examples/WindowRadiation.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/Examples/WindowRadiation.mo" 2022-03-10 09:57:31.668143323 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/Examples/WindowRadiation.mo" 2022-03-10 09:58:38.152151746 +0000 @@ -1,9 +1,9 @@ within Buildings.HeatTransfer.Windows.BaseClasses.Examples; model WindowRadiation "Test model for window radiation" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Angle lat=0.34906585039887 "Latitude"; - parameter Modelica.SIunits.Angle azi=0 "Surface azimuth"; - parameter Modelica.SIunits.Angle til=1.5707963267949 "Surface tilt"; + parameter Modelica.Units.SI.Angle lat=0.34906585039887 "Latitude"; + parameter Modelica.Units.SI.Angle azi=0 "Surface azimuth"; + parameter Modelica.Units.SI.Angle til=1.5707963267949 "Surface tilt"; replaceable parameter Buildings.HeatTransfer.Data.GlazingSystems.DoubleClearAir13Clear glaSys( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/ExteriorConvectionCoefficient.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/ExteriorConvectionCoefficient.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/ExteriorConvectionCoefficient.mo" 2022-03-10 09:57:31.668143323 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/ExteriorConvectionCoefficient.mo" 2022-03-10 09:58:38.108151741 +0000 @@ -2,7 +2,7 @@ model ExteriorConvectionCoefficient "Model for the heat transfer coefficient at the outside of the window" extends Modelica.Blocks.Icons.Block; - parameter Modelica.SIunits.Area A "Heat transfer area"; + parameter Modelica.Units.SI.Area A "Heat transfer area"; Modelica.Blocks.Interfaces.RealOutput GCon(unit="W/K") "Convective thermal conductance" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/GasConvection.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/GasConvection.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/GasConvection.mo" 2022-03-10 09:57:31.668143323 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/GasConvection.mo" 2022-03-10 09:58:38.100151740 +0000 @@ -8,14 +8,14 @@ parameter Buildings.HeatTransfer.Data.Gases.Generic gas "Thermophysical properties of gas fill" annotation(choicesAllMatching=true); - parameter Modelica.SIunits.Area A "Heat transfer area"; - parameter Modelica.SIunits.Area h(min=0) = sqrt(A) "Height of window"; + parameter Modelica.Units.SI.Area A "Heat transfer area"; + parameter Modelica.Units.SI.Area h(min=0) = sqrt(A) "Height of window"; - parameter Modelica.SIunits.Angle til(displayUnit="deg") + parameter Modelica.Units.SI.Angle til(displayUnit="deg") "Surface tilt (only 0, 90 and 180 degrees are implemented)"; parameter Boolean linearize=false "Set to true to linearize emissive power"; - parameter Modelica.SIunits.Temperature T0 = 293.15 + parameter Modelica.Units.SI.Temperature T0 = 293.15 "Temperature used to compute thermophysical properties"; parameter Boolean homotopyInitialization = true "= true, use homotopy method" @@ -26,17 +26,17 @@ annotation (Placement(transformation(extent={{-140,50},{-100,90}}), iconTransformation(extent={{-120,70},{-100,90}}))); - Modelica.SIunits.CoefficientOfHeatTransfer hCon(min=0, start=3) + Modelica.Units.SI.CoefficientOfHeatTransfer hCon(min=0, start=3) "Convective heat transfer coefficient"; - Modelica.SIunits.HeatFlux q_flow "Convective heat flux"; + Modelica.Units.SI.HeatFlux q_flow "Convective heat flux"; Real Nu(min=0) "Nusselt number"; Real Ra(min=0) "Rayleigh number"; protected - Modelica.SIunits.Temperature T_a + Modelica.Units.SI.Temperature T_a "Temperature used for thermophysical properties at port_a"; - Modelica.SIunits.Temperature T_b + Modelica.Units.SI.Temperature T_b "Temperature used for thermophysical properties at port_b"; - Modelica.SIunits.Temperature T_m + Modelica.Units.SI.Temperature T_m "Temperature used for thermophysical properties"; Real deltaNu(min=0.01) = 0.1 @@ -51,7 +51,7 @@ "Flag, true if the window is horizontal"; // Quantities that are only used in linearized model - parameter Modelica.SIunits.CoefficientOfHeatTransfer hCon0(fixed=false) + parameter Modelica.Units.SI.CoefficientOfHeatTransfer hCon0(fixed=false) "Convective heat transfer coefficient"; parameter Real Nu0(fixed=false, min=0) "Nusselt number"; parameter Real Ra0(fixed=false, min=0) "Rayleigh number"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/GlassLayer.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/GlassLayer.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/GlassLayer.mo" 2022-03-10 09:57:31.668143323 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/GlassLayer.mo" 2022-03-10 09:58:38.076151737 +0000 @@ -4,14 +4,14 @@ extends Buildings.HeatTransfer.Radiosity.BaseClasses.ParametersTwoSurfaces( final rhoIR_a=1-absIR_a-tauIR, final rhoIR_b=1-absIR_b-tauIR); - parameter Modelica.SIunits.Length x "Material thickness"; - parameter Modelica.SIunits.ThermalConductivity k "Thermal conductivity"; - parameter Modelica.SIunits.Area A "Heat transfer area"; - parameter Modelica.SIunits.Emissivity absIR_a + parameter Modelica.Units.SI.Length x "Material thickness"; + parameter Modelica.Units.SI.ThermalConductivity k "Thermal conductivity"; + parameter Modelica.Units.SI.Area A "Heat transfer area"; + parameter Modelica.Units.SI.Emissivity absIR_a "Infrared absorptivity of surface a (usually room-facing surface)"; - parameter Modelica.SIunits.Emissivity absIR_b + parameter Modelica.Units.SI.Emissivity absIR_b "Infrared absorptivity of surface b (usually outside-facing surface)"; - parameter Modelica.SIunits.TransmissionCoefficient tauIR + parameter Modelica.Units.SI.TransmissionCoefficient tauIR "Infrared transmittance of glass"; Modelica.Blocks.Interfaces.RealInput u @@ -42,11 +42,11 @@ "4th power of temperature at surface a"; Real T4_b(min=1E8, unit="K4", start=293.15^4, nominal=1E10) "4th power of temperature at surface b"; - Modelica.SIunits.HeatFlowRate E_a(min=0, nominal=1E2) + Modelica.Units.SI.HeatFlowRate E_a(min=0, nominal=1E2) "Emissive power of surface a"; - Modelica.SIunits.HeatFlowRate E_b(min=0, nominal=1E2) + Modelica.Units.SI.HeatFlowRate E_b(min=0, nominal=1E2) "Emissive power of surface b"; - final parameter Modelica.SIunits.ThermalResistance R = x/2/k/A + final parameter Modelica.Units.SI.ThermalResistance R = x/2/k/A "Thermal resistance from surface of glass to center of glass"; equation // Heat balance of surface node diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/InteriorConvection.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/InteriorConvection.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/InteriorConvection.mo" 2022-03-10 09:57:31.668143323 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/InteriorConvection.mo" 2022-03-10 09:58:38.064151735 +0000 @@ -16,7 +16,7 @@ iconTransformation(extent={{-120,70},{-100,90}}))); protected - constant Modelica.SIunits.Temperature dT0 = 2 + constant Modelica.Units.SI.Temperature dT0 = 2 "Initial temperature used in homotopy method"; equation if (conMod == Buildings.HeatTransfer.Types.InteriorConvection.Fixed) then diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/InteriorConvectionCoefficient.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/InteriorConvectionCoefficient.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/InteriorConvectionCoefficient.mo" 2022-03-10 09:57:31.668143323 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/InteriorConvectionCoefficient.mo" 2022-03-10 09:58:38.048151734 +0000 @@ -2,7 +2,7 @@ model InteriorConvectionCoefficient "Model for the heat transfer coefficient at the inside of the window" extends Modelica.Blocks.Icons.Block; - parameter Modelica.SIunits.Area A "Heat transfer area"; + parameter Modelica.Units.SI.Area A "Heat transfer area"; Modelica.Blocks.Interfaces.RealOutput GCon(unit="W/K") "Convective thermal conductance" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/Overhang.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/Overhang.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/Overhang.mo" 2022-03-10 09:57:31.668143323 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/Overhang.mo" 2022-03-10 09:58:38.044151733 +0000 @@ -22,49 +22,49 @@ final unit="1") "Fraction of window area exposed to the sun" annotation (Placement(transformation(extent={{100,-10},{120,10}}))); - parameter Modelica.SIunits.Angle lat "Latitude"; + parameter Modelica.Units.SI.Angle lat "Latitude"; - parameter Modelica.SIunits.Angle azi(displayUnit="deg") + parameter Modelica.Units.SI.Angle azi(displayUnit="deg") "Surface azimuth; azi= -90 degree East; azi= 0 degree South"; // Window dimensions - parameter Modelica.SIunits.Length hWin "Window height" + parameter Modelica.Units.SI.Length hWin "Window height" annotation(Dialog(tab="General",group="Window")); - parameter Modelica.SIunits.Length wWin "Window width" + parameter Modelica.Units.SI.Length wWin "Window width" annotation(Dialog(tab="General",group="Window")); Buildings.BoundaryConditions.WeatherData.Bus weaBus "Weather data" annotation (Placement(transformation(extent={{-112,-10},{-92,10}}))); protected - constant Modelica.SIunits.Angle delSolAzi = 0.005 + constant Modelica.Units.SI.Angle delSolAzi = 0.005 "Half-width of transition interval between left and right formulation for overhang"; - final parameter Modelica.SIunits.Area AWin= hWin*wWin "Window area"; - parameter Modelica.SIunits.Length tmpH[4](each fixed=false) + final parameter Modelica.Units.SI.Area AWin= hWin*wWin "Window area"; + parameter Modelica.Units.SI.Length tmpH[4](each fixed=false) "Height rectangular sections used for superposition"; - Modelica.SIunits.Length w + Modelica.Units.SI.Length w "Either wL or wR, depending on the sun relative to the wall azimuth"; - Modelica.SIunits.Length tmpW[4] + Modelica.Units.SI.Length tmpW[4] "Width of rectangular sections used for superpositions"; - Modelica.SIunits.Length del_L = wWin/100 + Modelica.Units.SI.Length del_L = wWin/100 "Fraction of window dimension over which min-max functions are smoothened"; - Modelica.SIunits.Length x1 + Modelica.Units.SI.Length x1 "Horizontal distance between window side edge and shadow corner"; - Modelica.SIunits.Length x2[4] + Modelica.Units.SI.Length x2[4] "Horizontal distance between window side edge and point where shadow line and window lower edge intersects"; - Modelica.SIunits.Length y1 + Modelica.Units.SI.Length y1 "Vertical distance between overhang and shadow lower edge"; - Modelica.SIunits.Length y2[4] + Modelica.Units.SI.Length y2[4] "Window height (vertical distance corresponding to x2)"; Real shdwTrnglRtio "Ratio of y1 and x1"; - Modelica.SIunits.Area area[4] + Modelica.Units.SI.Area area[4] "Shaded areas of the sections used in superposition"; - Modelica.SIunits.Area shdArea "Shaded area calculated from equations"; - Modelica.SIunits.Area crShdArea "Final value for shaded area"; - Modelica.SIunits.Area crShdArea1 + Modelica.Units.SI.Area shdArea "Shaded area calculated from equations"; + Modelica.Units.SI.Area crShdArea "Final value for shaded area"; + Modelica.Units.SI.Area crShdArea1 "Corrected for the sun behind the surface/wall"; - Modelica.SIunits.Area crShdArea2 "Corrected for the sun below horizon"; + Modelica.Units.SI.Area crShdArea2 "Corrected for the sun below horizon"; Buildings.BoundaryConditions.SolarGeometry.BaseClasses.SolarAzimuth solAzi(lat=lat) "Solar azimuth" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/PartialRadiation.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/PartialRadiation.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/PartialRadiation.mo" 2022-03-10 09:57:31.668143323 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/PartialRadiation.mo" 2022-03-10 09:58:38.024151730 +0000 @@ -9,7 +9,7 @@ "Set to true if window has an exterior shade"; parameter Boolean haveInteriorShade "Set to true if window has an interior shade"; - parameter Modelica.SIunits.Area AWin "Area of window"; + parameter Modelica.Units.SI.Area AWin "Area of window"; ////////////////// Derived parameters final parameter Boolean haveShade=haveExteriorShade or haveInteriorShade diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/PartialShade_weatherBus.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/PartialShade_weatherBus.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/PartialShade_weatherBus.mo" 2022-03-10 09:57:31.668143323 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/PartialShade_weatherBus.mo" 2022-03-10 09:58:38.012151729 +0000 @@ -3,9 +3,9 @@ "Partial model to implement overhang and side fins with weather bus connector" extends Buildings.HeatTransfer.Windows.BaseClasses.ShadeInterface_weatherBus; // Window dimensions - parameter Modelica.SIunits.Length hWin "Window height" + parameter Modelica.Units.SI.Length hWin "Window height" annotation(Dialog(tab="General",group="Window")); - parameter Modelica.SIunits.Length wWin "Window width" + parameter Modelica.Units.SI.Length wWin "Window width" annotation(Dialog(tab="General",group="Window")); protected diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/PartialWindowBoundaryCondition.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/PartialWindowBoundaryCondition.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/PartialWindowBoundaryCondition.mo" 2022-03-10 09:57:31.668143323 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/PartialWindowBoundaryCondition.mo" 2022-03-10 09:58:38.000151727 +0000 @@ -1,10 +1,10 @@ within Buildings.HeatTransfer.Windows.BaseClasses; partial model PartialWindowBoundaryCondition "Partial model for heat convection or radiation between a possibly shaded window that can be outside or inside the room" - parameter Modelica.SIunits.Area A "Heat transfer area of frame and window"; + parameter Modelica.Units.SI.Area A "Heat transfer area of frame and window"; parameter Real fFra "Fraction of window frame divided by total window area"; - final parameter Modelica.SIunits.Area AFra = fFra * A "Frame area"; - final parameter Modelica.SIunits.Area AGla = A-AFra "Glass area"; + final parameter Modelica.Units.SI.Area AFra = fFra * A "Frame area"; + final parameter Modelica.Units.SI.Area AGla = A-AFra "Glass area"; parameter Boolean haveExteriorShade "Set to true if window has exterior shade (at surface a)" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/RadiationBaseData.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/RadiationBaseData.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/RadiationBaseData.mo" 2022-03-10 09:57:31.668143323 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/RadiationBaseData.mo" 2022-03-10 09:58:37.984151726 +0000 @@ -9,30 +9,30 @@ "Number of window states for electrochromic windows (set to 1 for regular windows)" annotation (Evaluate=true); - parameter Modelica.SIunits.Length xGla[N] "Thickness of glass" + + parameter Modelica.Units.SI.Length xGla[N] "Thickness of glass" annotation (Dialog(group="Glass")); - parameter Modelica.SIunits.TransmissionCoefficient tauGlaSol[N, :] + parameter Modelica.Units.SI.TransmissionCoefficient tauGlaSol[N, :] "Solar transmissivity of glass" annotation (Dialog(group="Glass")); - parameter Modelica.SIunits.ReflectionCoefficient rhoGlaSol_a[N, NSta] + parameter Modelica.Units.SI.ReflectionCoefficient rhoGlaSol_a[N, NSta] "Solar reflectivity of glass at surface a (facing outside)" annotation (Dialog(group="Glass")); - parameter Modelica.SIunits.ReflectionCoefficient rhoGlaSol_b[N, NSta] + parameter Modelica.Units.SI.ReflectionCoefficient rhoGlaSol_b[N, NSta] "Solar reflectivity of glass at surface b (facing room-side)" annotation (Dialog(group="Glass")); - parameter Modelica.SIunits.TransmissionCoefficient tauShaSol_a + parameter Modelica.Units.SI.TransmissionCoefficient tauShaSol_a "Solar transmissivity of shade for irradiation from air-side" annotation (Dialog(group="Shade")); - parameter Modelica.SIunits.TransmissionCoefficient tauShaSol_b + parameter Modelica.Units.SI.TransmissionCoefficient tauShaSol_b "Solar transmissivity of shade for irradiation from glass-side" annotation (Dialog(group="Shade")); - parameter Modelica.SIunits.ReflectionCoefficient rhoShaSol_a + parameter Modelica.Units.SI.ReflectionCoefficient rhoShaSol_a "Solar reflectivity of shade for irradiation from air-side" annotation (Dialog(group="Shade")); - parameter Modelica.SIunits.ReflectionCoefficient rhoShaSol_b + parameter Modelica.Units.SI.ReflectionCoefficient rhoShaSol_b "Solar reflectivity of shade for irradiation from glass-side" annotation (Dialog(group="Shade")); - annotation (Documentation(info="
Record that defines basic parameters for the window radiation calculation. diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/RadiationData.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/RadiationData.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/RadiationData.mo" 2022-03-10 09:57:31.668143323 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/RadiationData.mo" 2022-03-10 09:58:37.976151724 +0000 @@ -8,7 +8,7 @@ rhoShaSol_a,rhoShaSol_b}} "Shading device property"; final parameter Integer NDIR=10 "Number of incident angles"; final parameter Integer HEM=NDIR + 1 "Index of hemispherical integration"; - final parameter Modelica.SIunits.Angle psi[NDIR]= + final parameter Modelica.Units.SI.Angle psi[NDIR]= Buildings.HeatTransfer.Windows.Functions.getAngle(NDIR) "Incident angles used for solar radiation calculation"; final parameter Real layer[3, N, HEM, NSta]= diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/ShadeConvection.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/ShadeConvection.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/ShadeConvection.mo" 2022-03-10 09:57:31.668143323 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/ShadeConvection.mo" 2022-03-10 09:58:37.964151722 +0000 @@ -2,7 +2,7 @@ model ShadeConvection "Model for convective heat balance of a layer that may or may not have a shade" - parameter Modelica.SIunits.Area A "Heat transfer area"; + parameter Modelica.Units.SI.Area A "Heat transfer area"; parameter Boolean thisSideHasShade "Set to true if this side of the window has a shade"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/ShadeRadiation.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/ShadeRadiation.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/ShadeRadiation.mo" 2022-03-10 09:57:31.668143323 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/ShadeRadiation.mo" 2022-03-10 09:58:37.908151716 +0000 @@ -2,27 +2,27 @@ model ShadeRadiation "Model for infrared radiative heat balance of a layer that may or may not have a shade" - parameter Modelica.SIunits.Area A "Heat transfer area"; - parameter Modelica.SIunits.Emissivity absIR_air + parameter Modelica.Units.SI.Area A "Heat transfer area"; + parameter Modelica.Units.SI.Emissivity absIR_air "Infrared absorptivity of surface that faces air"; - parameter Modelica.SIunits.Emissivity absIR_glass + parameter Modelica.Units.SI.Emissivity absIR_glass "Infrared absorptivity of surface that faces glass"; - parameter Modelica.SIunits.TransmissionCoefficient tauIR_air + parameter Modelica.Units.SI.TransmissionCoefficient tauIR_air "Infrared transmissivity of shade for radiation coming from the exterior or the room"; - parameter Modelica.SIunits.TransmissionCoefficient tauIR_glass + parameter Modelica.Units.SI.TransmissionCoefficient tauIR_glass "Infrared transmissivity of shade for radiation coming from the glass"; parameter Boolean thisSideHasShade "Set to true if this side of the window has a shade"; - final parameter Modelica.SIunits.ReflectionCoefficient rhoIR_air=1-absIR_air-tauIR_air + final parameter Modelica.Units.SI.ReflectionCoefficient rhoIR_air=1-absIR_air-tauIR_air "Infrared reflectivity of surface that faces air"; - final parameter Modelica.SIunits.ReflectionCoefficient rhoIR_glass=1-absIR_glass-tauIR_glass + final parameter Modelica.Units.SI.ReflectionCoefficient rhoIR_glass=1-absIR_glass-tauIR_glass "Infrared reflectivity of surface that faces glass"; parameter Boolean linearize = false "Set to true to linearize emissive power" annotation (Evaluate=true); parameter Boolean homotopyInitialization = true "= true, use homotopy method" annotation(Evaluate=true, Dialog(tab="Advanced")); - parameter Modelica.SIunits.Temperature T0=293.15 + parameter Modelica.Units.SI.Temperature T0=293.15 "Temperature used to linearize radiative heat transfer" annotation (Dialog(enable=linearize)); @@ -83,8 +83,8 @@ "3rd power of temperature T0"; Real T4(min=1E8, start=293.15^4, nominal=1E10, final unit="K4") "4th power of temperature"; - Modelica.SIunits.RadiantPower E_air "Emissive power of surface that faces air"; - Modelica.SIunits.RadiantPower E_glass + Modelica.Units.SI.RadiantPower E_air "Emissive power of surface that faces air"; + Modelica.Units.SI.RadiantPower E_glass "Emissive power of surface that faces glass"; equation connect(TSha_internal, TSha); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/SideFins.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/SideFins.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/SideFins.mo" 2022-03-10 09:57:31.668143323 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/SideFins.mo" 2022-03-10 09:58:37.876151711 +0000 @@ -19,43 +19,43 @@ "Fraction of window area exposed to the sun" annotation (Placement(transformation(extent={{100,-10},{120,10}}))); // Window dimensions - parameter Modelica.SIunits.Length hWin "Window height" + parameter Modelica.Units.SI.Length hWin "Window height" annotation(Dialog(tab="General",group="Window")); - parameter Modelica.SIunits.Length wWin "Window width" + parameter Modelica.Units.SI.Length wWin "Window width" annotation(Dialog(tab="General",group="Window")); // Other calculation variables protected - final parameter Modelica.SIunits.Length tmpH[4]= + final parameter Modelica.Units.SI.Length tmpH[4]= {h+hWin, h, h+hWin, h} "Height of rectangular sections used for superposition"; - final parameter Modelica.SIunits.Length tmpW[4]= + final parameter Modelica.Units.SI.Length tmpW[4]= {gap + wWin,gap + wWin,gap, gap} "Width of rectangular sections used for superpositions; c1,c2 etc"; - final parameter Modelica.SIunits.Length deltaL=wWin/100 + final parameter Modelica.Units.SI.Length deltaL=wWin/100 "Fraction of window dimension over which min-max functions are smoothened"; - final parameter Modelica.SIunits.Area AWin=hWin*wWin "Window area"; - Modelica.SIunits.Length x1[4] + final parameter Modelica.Units.SI.Area AWin=hWin*wWin "Window area"; + Modelica.Units.SI.Length x1[4] "Horizontal distance between side fin and point where shadow line and window lower edge intersects"; - Modelica.SIunits.Length x2 + Modelica.Units.SI.Length x2 "Horizontal distance between side fin and shadow corner"; - Modelica.SIunits.Length x3[4] "Window width"; - Modelica.SIunits.Length y1[4] "Window height"; - Modelica.SIunits.Length y2 + Modelica.Units.SI.Length x3[4] "Window width"; + Modelica.Units.SI.Length y1[4] "Window height"; + Modelica.Units.SI.Length y2 "Vertical distance between window upper edge and shadow corner"; - Modelica.SIunits.Length y3[4] + Modelica.Units.SI.Length y3[4] "Vertical distance between window upper edge and point where shadow line and window side edge intersects"; - Modelica.SIunits.Area area[4] + Modelica.Units.SI.Area area[4] "Shaded areas of the sections used in superposition"; - Modelica.SIunits.Area shdArea "Shaded area"; - Modelica.SIunits.Area crShdArea "Final value of shaded area"; - Modelica.SIunits.Area crShdArea1 + Modelica.Units.SI.Area shdArea "Shaded area"; + Modelica.Units.SI.Area crShdArea "Final value of shaded area"; + Modelica.Units.SI.Area crShdArea1 "Shaded area, corrected for the sun behind the surface/wall"; - Modelica.SIunits.Area crShdArea2 + Modelica.Units.SI.Area crShdArea2 "Shaded area, corrected for the sun below horizon"; - Modelica.SIunits.Length minX[4]; - Modelica.SIunits.Length minY[4]; - Modelica.SIunits.Length minX2X3[4]; - Modelica.SIunits.Length minY2Y3[4]; + Modelica.Units.SI.Length minX[4]; + Modelica.Units.SI.Length minY[4]; + Modelica.Units.SI.Length minX2X3[4]; + Modelica.Units.SI.Length minY2Y3[4]; Real delta=1e-6 "Small number to avoid division by zero"; Real tanLambda "Tangent of angle between horizontal and sun ray projection on vertical wall"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/StateInterpolator.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/StateInterpolator.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/StateInterpolator.mo" 2022-03-10 09:57:31.668143323 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/StateInterpolator.mo" 2022-03-10 09:58:37.860151709 +0000 @@ -1,6 +1,6 @@ within Buildings.HeatTransfer.Windows.BaseClasses; block StateInterpolator "Block to interpolate between different window states" - extends Modelica.Blocks.Interfaces.BlockIcon; + extends Modelica.Blocks.Icons.Block; parameter Integer NSta(min=1) "Number of window states for electrochromic windows" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/ThermalConductor.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/ThermalConductor.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/ThermalConductor.mo" 2022-03-10 09:57:31.668143323 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/ThermalConductor.mo" 2022-03-10 09:58:37.856151709 +0000 @@ -2,7 +2,7 @@ model ThermalConductor "Lumped thermal element with variable area, transporting heat without storing it" extends Modelica.Thermal.HeatTransfer.Interfaces.Element1D; - parameter Modelica.SIunits.ThermalConductance G + parameter Modelica.Units.SI.ThermalConductance G "Constant thermal conductance of material"; Modelica.Blocks.Interfaces.RealInput u(min=0) "Input signal for thermal conductance" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/TransmittedRadiation.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/TransmittedRadiation.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/TransmittedRadiation.mo" 2022-03-10 09:57:31.668143323 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/TransmittedRadiation.mo" 2022-03-10 09:58:37.848151708 +0000 @@ -10,9 +10,9 @@ final parameter Real traCoeRoo[NSta](each fixed=false) "Transmitivity of the window glass for interior radiation without shading"; - output Modelica.SIunits.Power QTraUns_flow[NSta] + output Modelica.Units.SI.Power QTraUns_flow[NSta] "Transmitted solar radiation through unshaded part of window"; - output Modelica.SIunits.Power QTraSha_flow[NSta] + output Modelica.Units.SI.Power QTraSha_flow[NSta] "Transmitted solar radiation through shaded part of window"; protected diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/convectionHorizontalCavity.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/convectionHorizontalCavity.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/convectionHorizontalCavity.mo" 2022-03-10 09:57:31.668143323 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/convectionHorizontalCavity.mo" 2022-03-10 09:58:37.820151705 +0000 @@ -4,22 +4,22 @@ "Thermophysical properties of gas fill" annotation(choicesAllMatching=true); input Real Ra(min=0) "Rayleigh number"; - input Modelica.SIunits.Temperature T_m + input Modelica.Units.SI.Temperature T_m "Temperature used for thermophysical properties"; - input Modelica.SIunits.TemperatureDifference dT + input Modelica.Units.SI.TemperatureDifference dT "Temperature difference used to compute q_flow = h*dT"; - input Modelica.SIunits.Angle til "Window tilt"; + input Modelica.Units.SI.Angle til "Window tilt"; input Real sinTil "Sine of window tilt"; input Real cosTil "Cosine of the window tilt"; - input Modelica.SIunits.Area h(min=0) = 1.5 "Height of window"; + input Modelica.Units.SI.Area h(min=0) = 1.5 "Height of window"; input Real deltaNu(min=0.01) = 0.1 "Small value for Nusselt number, used for smoothing"; input Real deltaRa(min=0.01) = 1E3 "Small value for Rayleigh number, used for smoothing"; output Real Nu(min=0) "Nusselt number"; - output Modelica.SIunits.CoefficientOfHeatTransfer hCon(min=0) + output Modelica.Units.SI.CoefficientOfHeatTransfer hCon(min=0) "Convective heat transfer coefficient"; - output Modelica.SIunits.HeatFlux q_flow "Convective heat flux"; + output Modelica.Units.SI.HeatFlux q_flow "Convective heat flux"; protected Real Nu_1(min=0) "Nusselt number"; Real Nu_2(min=0) "Nusselt number"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/convectionVerticalCavity.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/convectionVerticalCavity.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/convectionVerticalCavity.mo" 2022-03-10 09:57:31.668143323 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/convectionVerticalCavity.mo" 2022-03-10 09:58:37.812151703 +0000 @@ -4,19 +4,19 @@ "Thermophysical properties of gas fill" annotation(choicesAllMatching=true); input Real Ra(min=0) "Rayleigh number"; - input Modelica.SIunits.Temperature T_m + input Modelica.Units.SI.Temperature T_m "Temperature used for thermophysical properties"; - input Modelica.SIunits.TemperatureDifference dT + input Modelica.Units.SI.TemperatureDifference dT "Temperature difference used to compute q_flow = h*dT"; - input Modelica.SIunits.Area h(min=0) = 1.5 "Height of window"; + input Modelica.Units.SI.Area h(min=0) = 1.5 "Height of window"; input Real deltaNu(min=0.01) = 0.1 "Small value for Nusselt number, used for smoothing"; input Real deltaRa(min=0.01) = 1E3 "Small value for Rayleigh number, used for smoothing"; output Real Nu(min=0) "Nusselt number"; - output Modelica.SIunits.CoefficientOfHeatTransfer hCon(min=0) + output Modelica.Units.SI.CoefficientOfHeatTransfer hCon(min=0) "Convective heat transfer coefficient"; - output Modelica.SIunits.HeatFlux q_flow "Convective heat flux"; + output Modelica.Units.SI.HeatFlux q_flow "Convective heat flux"; protected Real Nu_1(min=0) "Nusselt number"; Real Nu_2(min=0) "Nusselt number"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/nusseltHorizontalCavityEnhanced.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/nusseltHorizontalCavityEnhanced.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/nusseltHorizontalCavityEnhanced.mo" 2022-03-10 09:57:31.668143323 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/nusseltHorizontalCavityEnhanced.mo" 2022-03-10 09:58:37.804151702 +0000 @@ -5,11 +5,11 @@ "Thermophysical properties of gas fill" annotation(choicesAllMatching=true); input Real Ra(min=0) "Rayleigh number"; - input Modelica.SIunits.Temperature T_m + input Modelica.Units.SI.Temperature T_m "Temperature used for thermophysical properties"; - input Modelica.SIunits.TemperatureDifference dT + input Modelica.Units.SI.TemperatureDifference dT "Temperature difference used to compute q_flow = h*dT"; - input Modelica.SIunits.Angle til "Window tilt"; + input Modelica.Units.SI.Angle til "Window tilt"; input Real cosTil(min=0) "Cosine of the window tilt"; output Real Nu(min=0) "Nusselt number"; protected diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/nusseltHorizontalCavityReduced.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/nusseltHorizontalCavityReduced.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/nusseltHorizontalCavityReduced.mo" 2022-03-10 09:57:31.668143323 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BaseClasses/nusseltHorizontalCavityReduced.mo" 2022-03-10 09:58:37.796151702 +0000 @@ -5,11 +5,11 @@ "Thermophysical properties of gas fill" annotation(choicesAllMatching=true); input Real Ra(min=0) "Rayleigh number"; - input Modelica.SIunits.Temperature T_m + input Modelica.Units.SI.Temperature T_m "Temperature used for thermophysical properties"; - input Modelica.SIunits.TemperatureDifference dT + input Modelica.Units.SI.TemperatureDifference dT "Temperature difference used to compute q_flow = h*dT"; - input Modelica.SIunits.Area h(min=0) = 1.5 "Height of window"; + input Modelica.Units.SI.Area h(min=0) = 1.5 "Height of window"; input Real sinTil "Sine of window tilt"; input Real deltaNu(min=0.01) = 0.1 "Small value for Nusselt number, used for smoothing"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BeamDepthInRoom.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BeamDepthInRoom.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BeamDepthInRoom.mo" 2022-03-10 09:57:31.668143323 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/BeamDepthInRoom.mo" 2022-03-10 09:58:37.784151700 +0000 @@ -9,32 +9,32 @@ caption="Select weather file"), group="Location")); - parameter Modelica.SIunits.Angle lon(displayUnit="deg")= + parameter Modelica.Units.SI.Angle lon(displayUnit="deg")= Buildings.BoundaryConditions.WeatherData.BaseClasses.getLongitudeTMY3( filNam) "Longitude" annotation (Evaluate=true, Dialog(group="Location")); - parameter Modelica.SIunits.Angle lat(displayUnit="deg")= + parameter Modelica.Units.SI.Angle lat(displayUnit="deg")= Buildings.BoundaryConditions.WeatherData.BaseClasses.getLatitudeTMY3( filNam) "Latitude" annotation (Evaluate=true, Dialog(group="Location")); - parameter Modelica.SIunits.Time timZon(displayUnit="h")= + parameter Modelica.Units.SI.Time timZon(displayUnit="h")= Buildings.BoundaryConditions.WeatherData.BaseClasses.getTimeZoneTMY3(filNam) "Time zone" annotation (Evaluate=true, Dialog(group="Location")); - parameter Modelica.SIunits.Angle azi "Surface azimuth"; + parameter Modelica.Units.SI.Angle azi "Surface azimuth"; - parameter Modelica.SIunits.Length hWorPla = 0.75 + parameter Modelica.Units.SI.Length hWorPla = 0.75 "Height of workplane above ground"; - parameter Modelica.SIunits.Length hApe + parameter Modelica.Units.SI.Length hApe "Upper height of aperature above ground" annotation (Dialog(group="Aperture")); - parameter Modelica.SIunits.Length depApe = 0.15 + parameter Modelica.Units.SI.Length depApe = 0.15 "Depth of outer corner of aperture, measured from interior surface" annotation (Dialog(group="Aperture")); - parameter Modelica.SIunits.Length depOve = 0 + parameter Modelica.Units.SI.Length depOve = 0 "Depth of overhang, meausured from other exterior surface of aperature (set to 0 if no overhang)" annotation (Dialog(group="Overhang")); - parameter Modelica.SIunits.Length gapOve = 0 + parameter Modelica.Units.SI.Length gapOve = 0 "Gap between upper height of aperature and lower height of overhang (set to 0 if no overhang)" annotation (Dialog(group="Overhang")); @@ -45,9 +45,9 @@ annotation (Placement(transformation(extent={{100,-10},{120,10}}))); protected - parameter Modelica.SIunits.Length dep = depApe + depOve + parameter Modelica.Units.SI.Length dep = depApe + depOve "Depth of outer corner that throws the shade, measured from interior surface"; - parameter Modelica.SIunits.Length h = hApe - hWorPla + gapOve + parameter Modelica.Units.SI.Length h = hApe - hWorPla + gapOve "Height of outer corner that throws the shade measure from the workplane height"; BoundaryConditions.SolarGeometry.ProjectedShadowLength proShaLen( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/Examples/BeamDepthInRoom.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/Examples/BeamDepthInRoom.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/Examples/BeamDepthInRoom.mo" 2022-03-10 09:57:31.668143323 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/Examples/BeamDepthInRoom.mo" 2022-03-10 09:58:37.744151696 +0000 @@ -1,11 +1,11 @@ within Buildings.HeatTransfer.Windows.Examples; model BeamDepthInRoom "Test model for the depth of the solar beam in the room" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Length hApe = 2.0 + parameter Modelica.Units.SI.Length hApe = 2.0 "Upper height of aperature above ground"; - parameter Modelica.SIunits.Length depOve=1.0 + parameter Modelica.Units.SI.Length depOve=1.0 "Depth of overhang, meausured from other exterior surface of aperature (set to 0 if no overhang)"; - parameter Modelica.SIunits.Length gapOve=0.5 + parameter Modelica.Units.SI.Length gapOve=0.5 "Gap between upper height of aperature and lower height of overhang (set to 0 if no overhang)"; Buildings.HeatTransfer.Windows.BeamDepthInRoom winEas( azi=Buildings.Types.Azimuth.E, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/Examples/BoundaryHeatTransfer.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/Examples/BoundaryHeatTransfer.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/Examples/BoundaryHeatTransfer.mo" 2022-03-10 09:57:31.668143323 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/Examples/BoundaryHeatTransfer.mo" 2022-03-10 09:58:37.736151693 +0000 @@ -2,7 +2,7 @@ model BoundaryHeatTransfer "Test model for the heat transfer at the window boundary condition" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Area A=1 "Window surface area"; + parameter Modelica.Units.SI.Area A=1 "Window surface area"; parameter Real fFra=0.2 "Fraction of frame, = frame area divided by total area"; parameter diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/Examples/Window.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/Examples/Window.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/Examples/Window.mo" 2022-03-10 09:57:31.668143323 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/Examples/Window.mo" 2022-03-10 09:58:37.688151688 +0000 @@ -1,15 +1,15 @@ within Buildings.HeatTransfer.Windows.Examples; model Window "Test model for the window" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Area A=1 "Window surface area"; + parameter Modelica.Units.SI.Area A=1 "Window surface area"; parameter Real fFra=0.2 "Fraction of frame, = frame area divided by total area"; - final parameter Modelica.SIunits.Area AFra = fFra * A "Frame area"; - final parameter Modelica.SIunits.Area AGla = A-AFra "Glass area"; + final parameter Modelica.Units.SI.Area AFra = fFra * A "Frame area"; + final parameter Modelica.Units.SI.Area AGla = A-AFra "Glass area"; parameter Boolean linearize = false "Set to true to linearize emissive power"; - parameter Modelica.SIunits.Angle lat=0.34906585039887 "Latitude"; - parameter Modelica.SIunits.Angle azi=0 "Surface azimuth"; - parameter Modelica.SIunits.Angle til=1.5707963267949 "Surface tilt"; + parameter Modelica.Units.SI.Angle lat=0.34906585039887 "Latitude"; + parameter Modelica.Units.SI.Angle azi=0 "Surface azimuth"; + parameter Modelica.Units.SI.Angle til=1.5707963267949 "Surface tilt"; Buildings.HeatTransfer.Windows.Window window( A=A, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/ExteriorHeatTransfer.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/ExteriorHeatTransfer.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/ExteriorHeatTransfer.mo" 2022-03-10 09:57:31.668143323 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/ExteriorHeatTransfer.mo" 2022-03-10 09:58:37.652151683 +0000 @@ -2,17 +2,17 @@ model ExteriorHeatTransfer "Model for heat convection and radiation at the exterior surface of a window that may have a shading device" extends BaseClasses.PartialWindowBoundaryCondition(final thisSideHasShade=haveExteriorShade); - parameter Modelica.SIunits.Emissivity absIRSha_air + parameter Modelica.Units.SI.Emissivity absIRSha_air "Infrared absorptivity of shade surface that faces air" annotation (Dialog(group="Shading")); - parameter Modelica.SIunits.Emissivity absIRSha_glass + parameter Modelica.Units.SI.Emissivity absIRSha_glass "Infrared absorptivity of shade surface that faces glass" annotation (Dialog(group="Shading")); - parameter Modelica.SIunits.TransmissionCoefficient tauIRSha_air + parameter Modelica.Units.SI.TransmissionCoefficient tauIRSha_air "Infrared transmissivity of shade for radiation coming from the exterior or the room" annotation (Dialog(group="Shading")); - parameter Modelica.SIunits.TransmissionCoefficient tauIRSha_glass + parameter Modelica.Units.SI.TransmissionCoefficient tauIRSha_glass "Infrared transmissivity of shade for radiation coming from the glass" annotation (Dialog(group="Shading")); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/FixedShade.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/FixedShade.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/FixedShade.mo" 2022-03-10 09:57:31.668143323 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/FixedShade.mo" 2022-03-10 09:58:37.620151679 +0000 @@ -4,8 +4,8 @@ parameter Buildings.Rooms.BaseClasses.ParameterConstructionWithWindow conPar "Construction parameters"; - 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 East; azi= 0 South"; Modelica.Blocks.Routing.Multiplex4 mulFraSun( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/Functions/getAngle.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/Functions/getAngle.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/Functions/getAngle.mo" 2022-03-10 09:57:31.668143323 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/Functions/getAngle.mo" 2022-03-10 09:58:37.504151665 +0000 @@ -1,7 +1,7 @@ within Buildings.HeatTransfer.Windows.Functions; function getAngle "Generate incident angles" input Integer NDIR "Number of incident angles"; - output Modelica.SIunits.Angle psi[NDIR] "Array of incident angles"; + output Modelica.Units.SI.Angle psi[NDIR] "Array of incident angles"; protected constant Real deltaX=0.5*Modelica.Constants.pi/(NDIR - 1); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/Functions/glassProperty.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/Functions/glassProperty.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/Functions/glassProperty.mo" 2022-03-10 09:57:31.668143323 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/Functions/glassProperty.mo" 2022-03-10 09:58:37.456151658 +0000 @@ -5,7 +5,7 @@ Buildings.HeatTransfer.Windows.Functions.BaseClasses.partialGlassRadiation; input Real glass[3, N, NSta] "Propertry of each glass pane"; input Real xGla[N] "Thickness of each glass pane"; - input Modelica.SIunits.Angle psi[HEM - 1] "Incident angles"; + input Modelica.Units.SI.Angle psi[HEM - 1] "Incident angles"; output Real layer[3, N, HEM, NSta] "Transmittance, front and back reflectance"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/Functions/glassPropertyCoated.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/Functions/glassPropertyCoated.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/Functions/glassPropertyCoated.mo" 2022-03-10 09:57:31.668143323 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/Functions/glassPropertyCoated.mo" 2022-03-10 09:58:37.448151658 +0000 @@ -4,7 +4,7 @@ extends Buildings.HeatTransfer.Windows.Functions.BaseClasses.partialSingleGlassRadiation; input Real glass[3] "Propertry of one glass pane"; - input Modelica.SIunits.Angle psi[HEM - 1] "Incident angles"; + input Modelica.Units.SI.Angle psi[HEM - 1] "Incident angles"; output Real layer[3, HEM] "Transmittance, front and back reflectance"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/Functions/glassPropertyUncoated.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/Functions/glassPropertyUncoated.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/Functions/glassPropertyUncoated.mo" 2022-03-10 09:57:31.668143323 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/Functions/glassPropertyUncoated.mo" 2022-03-10 09:58:37.436151656 +0000 @@ -5,8 +5,8 @@ Buildings.HeatTransfer.Windows.Functions.BaseClasses.partialSingleGlassRadiation; input Real glass[3] "Propertry of one glass pane"; - input Modelica.SIunits.Length x "Thickness"; - input Modelica.SIunits.Angle psi[HEM - 1] "Incident angles"; + input Modelica.Units.SI.Length x "Thickness"; + input Modelica.Units.SI.Angle psi[HEM - 1] "Incident angles"; output Real layer[3, HEM] "Transmittance, front and back reflectance"; protected diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/InteriorHeatTransferConvective.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/InteriorHeatTransferConvective.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/InteriorHeatTransferConvective.mo" 2022-03-10 09:57:31.668143323 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/InteriorHeatTransferConvective.mo" 2022-03-10 09:58:37.364151646 +0000 @@ -3,11 +3,11 @@ "Model for heat convection at the interior surface of a window that may have a shading device" extends BaseClasses.PartialWindowBoundaryCondition(final thisSideHasShade=haveInteriorShade); - parameter Modelica.SIunits.CoefficientOfHeatTransfer hFixed=4 + parameter Modelica.Units.SI.CoefficientOfHeatTransfer hFixed=4 "Constant convection coefficient"; parameter Types.InteriorConvection conMod=Buildings.HeatTransfer.Types.InteriorConvection.Fixed "Convective heat transfer model"; - parameter Modelica.SIunits.Angle til "Surface tilt"; + parameter Modelica.Units.SI.Angle til "Surface tilt"; Modelica.Blocks.Interfaces.RealInput QRadAbs_flow(final unit="W") if haveShade diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/Overhang.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/Overhang.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/Overhang.mo" 2022-03-10 09:57:31.668143323 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/Overhang.mo" 2022-03-10 09:58:37.352151646 +0000 @@ -3,8 +3,8 @@ "For a window with an overhang, outputs the fraction of the window area exposed to the sun" extends Buildings.Rooms.BaseClasses.Overhang; extends Buildings.HeatTransfer.Windows.BaseClasses.PartialShade_weatherBus; - parameter Modelica.SIunits.Angle lat(displayUnit="deg") "Latitude"; - parameter Modelica.SIunits.Angle azi(displayUnit="deg") + parameter Modelica.Units.SI.Angle lat(displayUnit="deg") "Latitude"; + parameter Modelica.Units.SI.Angle azi(displayUnit="deg") "Surface azimuth; azi= -90 degree East; azi= 0 South"; // Overhang dimensions protected diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/Window.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/Window.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/Window.mo" 2022-03-10 09:57:31.668143323 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/HeatTransfer/Windows/Window.mo" 2022-03-10 09:58:37.336151643 +0000 @@ -5,12 +5,12 @@ "Glazing system" annotation (choicesAllMatching=true, Placement(transformation(extent={{150,174}, {170,194}}))); - parameter Modelica.SIunits.Area A "Heat transfer area"; + parameter Modelica.Units.SI.Area A "Heat transfer area"; parameter Real fFra(min=0, max=1)=0.1 "Fraction of frame"; - final parameter Modelica.SIunits.Area AFra = fFra*A "Frame area"; - final parameter Modelica.SIunits.Area AGla = A-AFra "Glass area"; + final parameter Modelica.Units.SI.Area AFra = fFra*A "Frame area"; + final parameter Modelica.Units.SI.Area AGla = A-AFra "Glass area"; parameter Boolean linearize=false "Set to true to linearize emissive power"; - parameter Modelica.SIunits.Angle til(displayUnit="deg") "Surface tilt"; + parameter Modelica.Units.SI.Angle til(displayUnit="deg") "Surface tilt"; parameter Boolean homotopyInitialization = true "= true, use homotopy method" annotation(Evaluate=true, Dialog(tab="Advanced")); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Media/Air.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Media/Air.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Media/Air.mo" 2022-03-10 09:57:31.668143323 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Media/Air.mo" 2022-03-10 09:58:37.296151639 +0000 @@ -52,12 +52,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 + Modelica.Units.SI.TemperatureDifference dT "Temperature difference used to compute enthalpy"; equation assert(T >= 200.0 and T <= 423.15, " @@ -74,7 +74,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; @@ -200,13 +200,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 @@ -302,7 +303,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}); @@ -375,6 +377,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 @@
This medium package models liquid water. diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/AirHeatMassBalanceMixed.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/AirHeatMassBalanceMixed.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/AirHeatMassBalanceMixed.mo" 2022-03-10 09:57:31.816143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/AirHeatMassBalanceMixed.mo" 2022-03-10 09:58:36.772151572 +0000 @@ -3,7 +3,7 @@ "Heat and mass balance of the air, assuming completely mixed air" extends Buildings.Rooms.BaseClasses.ConstructionRecords; extends Buildings.Fluid.Interfaces.LumpedVolumeDeclarations; - 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")); // Port definitions @@ -12,12 +12,12 @@ parameter Boolean homotopyInitialization "= true, use homotopy method" annotation(Evaluate=true, Dialog(tab="Advanced")); - parameter Modelica.SIunits.Volume V "Volume"; + parameter Modelica.Units.SI.Volume V "Volume"; parameter Buildings.HeatTransfer.Types.InteriorConvection conMod "Convective heat transfer model for opaque constructions" annotation (Dialog(group="Convective heat transfer")); - parameter Modelica.SIunits.CoefficientOfHeatTransfer hFixed + parameter Modelica.Units.SI.CoefficientOfHeatTransfer hFixed "Constant convection coefficient for opaque constructions" annotation (Dialog(group="Convective heat transfer", enable=(conMod == Buildings.HeatTransfer.Types.InteriorConvection.Fixed))); @@ -186,19 +186,19 @@ // Surface areas protected - final parameter Modelica.SIunits.Area AConExt[NConExt] = datConExt.A + final parameter Modelica.Units.SI.Area AConExt[NConExt] = datConExt.A "Areas of exterior constructions"; - final parameter Modelica.SIunits.Area AConExtWinOpa[NConExtWin] = datConExtWin.AOpa + final parameter Modelica.Units.SI.Area AConExtWinOpa[NConExtWin] = datConExtWin.AOpa "Opaque areas of exterior construction that have a window"; - final parameter Modelica.SIunits.Area AConExtWinGla[NConExtWin] = (1 .- datConExtWin.fFra) .* datConExtWin.AWin + final parameter Modelica.Units.SI.Area AConExtWinGla[NConExtWin] = (1 .- datConExtWin.fFra) .* datConExtWin.AWin "Glass areas of exterior construction that have a window"; - final parameter Modelica.SIunits.Area AConExtWinFra[NConExtWin] = datConExtWin.fFra .* datConExtWin.AWin + final parameter Modelica.Units.SI.Area AConExtWinFra[NConExtWin] = datConExtWin.fFra .* datConExtWin.AWin "Frame areas of exterior construction that have a window"; - final parameter Modelica.SIunits.Area AConPar[NConPar] = datConPar.A + final parameter Modelica.Units.SI.Area AConPar[NConPar] = datConPar.A "Areas of partition constructions"; - final parameter Modelica.SIunits.Area AConBou[NConBou] = datConBou.A + final parameter Modelica.Units.SI.Area AConBou[NConBou] = datConBou.A "Areas of constructions with exterior boundary conditions exposed to outside of room model"; - final parameter Modelica.SIunits.Area ASurBou[NSurBou] = surBou.A + final parameter Modelica.Units.SI.Area ASurBou[NSurBou] = surBou.A "Area of surface models of constructions that are modeled outside of this room"; // Thermal collectors diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/CFDAirHeatMassBalance.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/CFDAirHeatMassBalance.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/CFDAirHeatMassBalance.mo" 2022-03-10 09:57:31.816143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/CFDAirHeatMassBalance.mo" 2022-03-10 09:58:36.732151566 +0000 @@ -21,7 +21,7 @@ "Set to false to deactivate the CFD interface and use instead yFixed as output" annotation (Evaluate=true); - parameter Modelica.SIunits.Time samplePeriod(min=100*Modelica.Constants.eps) + parameter Modelica.Units.SI.Time samplePeriod(min=100*Modelica.Constants.eps) "Sample period of component" annotation (Dialog(group="Sampling")); parameter Boolean haveSensor @@ -65,7 +65,7 @@ // Values that are used for uStart protected - parameter Modelica.SIunits.Time startTime(fixed=false) + parameter Modelica.Units.SI.Time startTime(fixed=false) "First sample time instant."; parameter Real uStart[kFluIntC_inflow + Medium.nC*nPorts](fixed=false) @@ -75,16 +75,16 @@ parameter Real yFixed[kSen + nSen](fixed=false) "Values used for yFixed in CFDExchange"; - parameter Modelica.SIunits.HeatFlowRate Q_flow_fixed[kSurBou + nSurBou]=fill( + parameter Modelica.Units.SI.HeatFlowRate Q_flow_fixed[kSurBou + nSurBou]=fill( 0, kSurBou + nSurBou) "Surface heat flow rate used for yFixed" annotation (Dialog(group="Outputs if activateInterface=false")); - parameter Modelica.SIunits.Temperature TRooAve_fixed=Medium.T_default + parameter Modelica.Units.SI.Temperature TRooAve_fixed=Medium.T_default "Average room air temperature used for yFixed" annotation (Dialog(group="Outputs if activateInterface=false")); - parameter Modelica.SIunits.Temperature TSha_fixed[NConExtWin]=fill(Medium.T_default, + parameter Modelica.Units.SI.Temperature TSha_fixed[NConExtWin]=fill(Medium.T_default, NConExtWin) "Shade temperature used for yFixed" annotation (Dialog(group="Outputs if activateInterface=false")); - parameter Modelica.SIunits.Temperature T_outflow_fixed[nPorts]=fill(Medium.T_default, + parameter Modelica.Units.SI.Temperature T_outflow_fixed[nPorts]=fill(Medium.T_default, nPorts) "Temperature of the fluid that flows into the HVAC system used for yFixed" annotation (Dialog(group="Outputs if activateInterface=false")); @@ -95,7 +95,7 @@ "Trace substances of the fluid that flows into the HVAC system used for yFixed" annotation (Dialog(group="Outputs if activateInterface=false")); - parameter Modelica.SIunits.Density rho_start=Medium.density( + parameter Modelica.Units.SI.Density rho_start=Medium.density( Medium.setState_pTX( T=Medium.T_default, p=p_start, @@ -266,6 +266,7 @@ final parameter Integer nSur=kSurBou + nSurBou "Number of surfaces"; protected + function assignSurfaceIdentifier input Integer nConExt(min=0) "Number of exterior constructions"; @@ -295,34 +296,34 @@ */ // Declaration of construction data input String nameConExt[nConExt] "Surface name"; - input Modelica.SIunits.Area AConExt[nConExt] "Surface area"; - input Modelica.SIunits.Angle tilConExt[nConExt] "Surface tilt"; + input Modelica.Units.SI.Area AConExt[nConExt] "Surface area"; + input Modelica.Units.SI.Angle tilConExt[nConExt] "Surface tilt"; input Buildings.Rooms.Types.CFDBoundaryConditions bouConConExt[nConExt] "Boundary condition"; input String nameConExtWin[nConExtWin] "Surface name"; - input Modelica.SIunits.Area AConExtWin[nConExtWin] "Surface area"; - input Modelica.SIunits.Angle tilConExtWin[nConExtWin] "Surface tilt"; + input Modelica.Units.SI.Area AConExtWin[nConExtWin] "Surface area"; + input Modelica.Units.SI.Angle tilConExtWin[nConExtWin] "Surface tilt"; input Buildings.Rooms.Types.CFDBoundaryConditions bouConConExtWin[ nConExtWin] "Boundary condition"; - input Modelica.SIunits.Area AGla[nConExtWin] "Surface area"; - input Modelica.SIunits.Area AFra[nConExtWin] "Surface area"; + input Modelica.Units.SI.Area AGla[nConExtWin] "Surface area"; + input Modelica.Units.SI.Area AFra[nConExtWin] "Surface area"; input Real uSha[nConExtWin] "Shade ratio"; input String nameConPar[nConPar] "Surface name"; - input Modelica.SIunits.Area AConPar[nConPar] "Surface area"; - input Modelica.SIunits.Angle tilConPar[nConPar] "Surface tilt"; + input Modelica.Units.SI.Area AConPar[nConPar] "Surface area"; + input Modelica.Units.SI.Angle tilConPar[nConPar] "Surface tilt"; input Buildings.Rooms.Types.CFDBoundaryConditions bouConConPar[nConPar] "Boundary condition"; input String nameConBou[nConBou] "Surface name"; - input Modelica.SIunits.Area AConBou[nConBou] "Surface area"; - input Modelica.SIunits.Angle tilConBou[nConBou] "Surface tilt"; + input Modelica.Units.SI.Area AConBou[nConBou] "Surface area"; + input Modelica.Units.SI.Angle tilConBou[nConBou] "Surface tilt"; input Buildings.Rooms.Types.CFDBoundaryConditions bouConConBou[nConBou] "Boundary condition"; input String nameSurBou[nSurBou] "Surface name"; - input Modelica.SIunits.Area ASurBou[nSurBou] "Surface area"; - input Modelica.SIunits.Angle tilSurBou[nSurBou] "Surface tilt"; + input Modelica.Units.SI.Area ASurBou[nSurBou] "Surface area"; + input Modelica.Units.SI.Angle tilSurBou[nSurBou] "Surface tilt"; input Buildings.Rooms.Types.CFDBoundaryConditions bouConSurBou[nSurBou] "Boundary condition"; @@ -378,7 +379,6 @@ til=tilSurBou[i], bouCon=bouConSurBou[i]) for i in 1:nSurBou}); end assignSurfaceIdentifier; - public Modelica.Blocks.Interfaces.RealInput QCon_flow "Convective sensible heat gains of the room" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/CFDExchange.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/CFDExchange.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/CFDExchange.mo" 2022-03-10 09:57:31.816143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/CFDExchange.mo" 2022-03-10 09:58:36.640151555 +0000 @@ -35,7 +35,7 @@ parameter String portName[:] "Names of fluid ports as declared in the CFD input file"; parameter Boolean verbose=false "Set to true for verbose output"; - parameter Modelica.SIunits.Density rho_start "Density at initial state"; + parameter Modelica.Units.SI.Density rho_start "Density at initial state"; Modelica.Blocks.Interfaces.RealInput u[nWri](start=_uStart, each fixed=true) "Inputs to CFD" @@ -55,7 +55,7 @@ final parameter Real _uStart[nWri]={if (flaWri[i] <= 1) then uStart[i] else uStart[i]*samplePeriod for i in 1:nWri} "Initial input signal, used during first data transfer with CFD"; - output Modelica.SIunits.Time modTimRea(fixed=false) + output Modelica.Units.SI.Time modTimRea(fixed=false) "Current model time received from CFD"; output Integer retVal(start=0, fixed=true) "Return value from CFD"; @@ -65,8 +65,8 @@ function sendParameters input String cfdFilNam "CFD input file name"; input String[nSur] name "Surface names"; - input Modelica.SIunits.Area[nSur] A "Surface areas"; - input Modelica.SIunits.Angle[nSur] til "Surface tilt"; + input Modelica.Units.SI.Area[nSur] A "Surface areas"; + input Modelica.Units.SI.Angle[nSur] til "Surface tilt"; input Buildings.Rooms.Types.CFDBoundaryConditions[nSur] bouCon "Type of boundary condition"; input Integer nPorts(min=0) @@ -86,7 +86,7 @@ input Integer nXi "Number of independent species concentration of the inflowing medium"; input Integer nC "Number of trace substances of the inflowing medium"; - input Modelica.SIunits.Density rho_start "Density at initial state"; + input Modelica.Units.SI.Density rho_start "Density at initial state"; protected Integer coSimFlag=0; algorithm @@ -125,14 +125,14 @@ // Modelica and CFD. function exchange input Integer flag "Communication flag to write to CFD"; - input Modelica.SIunits.Time t "Current simulation time in seconds to write"; - input Modelica.SIunits.Time dt(min=100*Modelica.Constants.eps) + input Modelica.Units.SI.Time t "Current simulation time in seconds to write"; + input Modelica.Units.SI.Time dt(min=100*Modelica.Constants.eps) "Requested time step length"; input Real[nU] u "Input for CFD"; input Integer nU "Number of inputs for CFD"; input Real[nY] yFixed "Fixed values (used for debugging only)"; input Integer nY "Number of outputs from CFD"; - output Modelica.SIunits.Time modTimRea + output Modelica.Units.SI.Time modTimRea "Current model time in seconds read from CFD"; input Boolean verbose "Set to true for verbose output"; output Real[nY] y "Output computed by CFD"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/CFDFluidInterface.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/CFDFluidInterface.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/CFDFluidInterface.mo" 2022-03-10 09:57:31.816143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/CFDFluidInterface.mo" 2022-03-10 09:58:36.616151552 +0000 @@ -18,10 +18,10 @@ // Parameters for the model parameter Integer nPorts(min=0)=0 "Number of ports" annotation(Evaluate=true, Dialog(connectorSizing=true, tab="General",group="Ports")); - parameter Modelica.SIunits.Density rho_start + parameter Modelica.Units.SI.Density rho_start "Density, used to compute fluid mass"; - parameter Modelica.SIunits.Volume V "Volume"; - final parameter Modelica.SIunits.Mass m_start = rho_start * V + parameter Modelica.Units.SI.Volume V "Volume"; + final parameter Modelica.Units.SI.Mass m_start = rho_start * V "Initial mass of air inside the room."; Modelica.Blocks.Interfaces.RealInput T_outflow[nPorts]( @@ -98,10 +98,10 @@ Modelica.Blocks.Interfaces.RealInput C_outflow_internal[max(nPorts, nPorts*Medium.nC)]( each min=0) "Trace substances if m_flow < 0"; - Modelica.SIunits.MassFlowRate[Medium.nXi] mbXi_flow - "Substance mass flows across boundaries"; - Modelica.SIunits.MassFlowRate ports_mXi_flow[nPorts,Medium.nXi]; + Modelica.Units.SI.MassFlowRate[Medium.nXi] mbXi_flow + "Substance mass flows across boundaries"; + Modelica.Units.SI.MassFlowRate ports_mXi_flow[nPorts,Medium.nXi]; initial equation //Disable it for shoebox model test //assert(nPorts >= 2, "The CFD model requires at least two fluid connections."); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/CFDHeatGain.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/CFDHeatGain.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/CFDHeatGain.mo" 2022-03-10 09:57:31.816143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/CFDHeatGain.mo" 2022-03-10 09:58:36.592151548 +0000 @@ -2,7 +2,7 @@ model CFDHeatGain "Model to convert internal heat gain signals" extends Buildings.BaseClasses.BaseIcon; - parameter Modelica.SIunits.Area AFlo "Floor area"; + parameter Modelica.Units.SI.Area AFlo "Floor area"; Modelica.Blocks.Interfaces.RealInput qGai_flow[3] "Radiant, convective and latent heat input into room (positive if heat gain)" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/CFDSurfaceIdentifier.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/CFDSurfaceIdentifier.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/CFDSurfaceIdentifier.mo" 2022-03-10 09:57:31.816143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/CFDSurfaceIdentifier.mo" 2022-03-10 09:58:36.580151547 +0000 @@ -2,8 +2,8 @@ record CFDSurfaceIdentifier "Data record to identify surfaces in the CFD code" extends Modelica.Icons.Record; parameter String name "Name of the surface"; - parameter Modelica.SIunits.Area A "Area of the surface"; - parameter Modelica.SIunits.Angle til "Tilt of the surface"; + parameter Modelica.Units.SI.Area A "Area of the surface"; + parameter Modelica.Units.SI.Angle til "Tilt of the surface"; parameter Buildings.Rooms.Types.CFDBoundaryConditions bouCon "Boundary condition used in the CFD simulation"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/Examples/CFDHeatGain.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/Examples/CFDHeatGain.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/Examples/CFDHeatGain.mo" 2022-03-10 09:57:31.816143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/Examples/CFDHeatGain.mo" 2022-03-10 09:58:36.480151536 +0000 @@ -4,7 +4,7 @@ package MediumA = Buildings.Media.Air "Medium model"; - parameter Modelica.SIunits.Area AFlo=50 "Floor area"; + parameter Modelica.Units.SI.Area AFlo=50 "Floor area"; Buildings.Rooms.BaseClasses.CFDHeatGain heatGain( AFlo=AFlo) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/Examples/MixedAirHeatGain.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/Examples/MixedAirHeatGain.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/Examples/MixedAirHeatGain.mo" 2022-03-10 09:57:31.816143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/Examples/MixedAirHeatGain.mo" 2022-03-10 09:58:36.456151532 +0000 @@ -29,7 +29,7 @@ annotation (Placement(transformation(extent={{30,-80},{50,-60}}))); Buildings.Utilities.Diagnostics.AssertEquality assertEquality annotation (Placement(transformation(extent={{60,64},{80,84}}))); - parameter Modelica.SIunits.Area AFlo=50 "Floor area"; + parameter Modelica.Units.SI.Area AFlo=50 "Floor area"; Modelica.Blocks.Math.Gain gainLat(k=AFlo) annotation (Placement(transformation(extent={{0,36},{20,56}}))); Buildings.Utilities.Diagnostics.AssertEquality assertEquality1 diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/ExteriorBoundaryConditions.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/ExteriorBoundaryConditions.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/ExteriorBoundaryConditions.mo" 2022-03-10 09:57:31.816143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/ExteriorBoundaryConditions.mo" 2022-03-10 09:58:36.424151528 +0000 @@ -3,7 +3,7 @@ "Model for convection and radiation bounary condition of exterior constructions" parameter Integer nCon(min=1) "Number of exterior constructions" annotation (Dialog(group="Exterior constructions")); - parameter Modelica.SIunits.Angle lat "Latitude"; + parameter Modelica.Units.SI.Angle lat "Latitude"; parameter Boolean linearizeRadiation "Set to true to linearize emissive power"; @@ -19,7 +19,7 @@ Buildings.HeatTransfer.Types.ExteriorConvection.TemperatureWind "Convective heat transfer model for opaque part of the constructions" annotation (Dialog(group="Convective heat transfer")); - parameter Modelica.SIunits.CoefficientOfHeatTransfer hFixed=10.0 + parameter Modelica.Units.SI.CoefficientOfHeatTransfer hFixed=10.0 "Constant convection coefficient for opaque part of the constructions" annotation (Dialog(group="Convective heat transfer", enable=(conMod == Buildings.HeatTransfer.Types.ExteriorConvection.Fixed))); @@ -67,7 +67,7 @@ annotation (Placement(transformation(extent={{0,100},{-20,120}}))); protected - parameter Modelica.SIunits.Area AOpa[nCon]=conPar[:].A + parameter Modelica.Units.SI.Area AOpa[nCon]=conPar[:].A "Area of opaque construction"; Buildings.HeatTransfer.Sources.PrescribedTemperature TAirConExt[ diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/ExteriorBoundaryConditionsWithWindow.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/ExteriorBoundaryConditionsWithWindow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/ExteriorBoundaryConditionsWithWindow.mo" 2022-03-10 09:57:31.816143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/ExteriorBoundaryConditionsWithWindow.mo" 2022-03-10 09:58:36.400151524 +0000 @@ -5,7 +5,7 @@ final AOpa=conPar[:].AOpa, redeclare Buildings.Rooms.BaseClasses.ParameterConstructionWithWindow conPar); - final parameter Modelica.SIunits.Area AWin[nCon] = conPar[:].hWin .* conPar[:].wWin + final parameter Modelica.Units.SI.Area AWin[nCon] = conPar[:].hWin .* conPar[:].wWin "Window area" annotation (Dialog(group="Glazing system")); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/InfraredRadiationExchange.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/InfraredRadiationExchange.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/InfraredRadiationExchange.mo" 2022-03-10 09:57:31.816143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/InfraredRadiationExchange.mo" 2022-03-10 09:58:36.368151521 +0000 @@ -30,9 +30,9 @@ min=0, max=1, fixed=false) "Reflectivity of opaque surfaces"; - final parameter Modelica.SIunits.Area AOpa[nOpa](fixed=false) + final parameter Modelica.Units.SI.Area AOpa[nOpa](fixed=false) "Surface area of opaque surfaces"; - final parameter Modelica.SIunits.Area A[nTot](fixed=false) "Surface areas"; + final parameter Modelica.Units.SI.Area A[nTot](fixed=false) "Surface areas"; final parameter Real kOpa[nOpa](unit="W/K4", fixed=false) "Product sigma*epsilon*A for opaque surfaces"; final parameter Real kOpaInv[nOpa](unit="K4/W", fixed=false) @@ -45,31 +45,31 @@ Buildings.HeatTransfer.Interfaces.RadiosityInflow JInConExtWin_internal[NConExtWin] "Incoming radiosity that connects to non-frame part of the window"; - Modelica.SIunits.HeatFlowRate J[nTot]( + Modelica.Units.SI.HeatFlowRate J[nTot]( max=0, start=A .* 0.8*Modelica.Constants.sigma*293.15^4, each nominal=10*0.8*Modelica.Constants.sigma*293.15^4) "Radiosity leaving the surface"; - Modelica.SIunits.HeatFlowRate G[nTot]( + Modelica.Units.SI.HeatFlowRate G[nTot]( min=0, start=A .* 0.8*Modelica.Constants.sigma*293.15^4, each nominal=10*0.8*Modelica.Constants.sigma*293.15^4) "Radiosity entering the surface"; constant Real T30(unit="K3") = 293.15^3 "Nominal temperature"; constant Real T40(unit="K4") = 293.15^4 "Nominal temperature"; - Modelica.SIunits.Temperature TOpa[nOpa](each start=293.15, each nominal= + Modelica.Units.SI.Temperature TOpa[nOpa](each start=293.15, each nominal= 293.15) "Temperature of opaque surfaces"; Real T4Opa[nOpa]( each unit="K4", each start=T40, each nominal=293.15^4) "Forth power of temperature of opaque surfaces"; - Modelica.SIunits.HeatFlowRate Q_flow[nTot] "Heat flow rate at surfaces"; - parameter Modelica.SIunits.Temperature T0=293.15 + Modelica.Units.SI.HeatFlowRate Q_flow[nTot] "Heat flow rate at surfaces"; + parameter Modelica.Units.SI.Temperature T0=293.15 "Temperature used to linearize radiative heat transfer"; final parameter Real T03( min=0, unit="K3") = T0^3 "3rd power of temperature T0"; - Modelica.SIunits.HeatFlowRate sumEBal "Sum of energy balance, should be zero"; + Modelica.Units.SI.HeatFlowRate sumEBal "Sum of energy balance, should be zero"; initial equation // The next loops build the array epsOpa, AOpa and kOpa that simplify // the model equations. diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/MixedAirHeatGain.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/MixedAirHeatGain.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/MixedAirHeatGain.mo" 2022-03-10 09:57:31.816143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/MixedAirHeatGain.mo" 2022-03-10 09:58:36.328151516 +0000 @@ -6,8 +6,8 @@ Modelica.Media.Interfaces.PartialMedium "Medium in the component" annotation (choicesAllMatching = true); - parameter Modelica.SIunits.Area AFlo "Floor area"; - parameter Modelica.SIunits.Temperature TWat=273.15+34 + parameter Modelica.Units.SI.Area AFlo "Floor area"; + parameter Modelica.Units.SI.Temperature TWat=273.15+34 "Temperature at which water vapor is released"; Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a QCon_flow @@ -26,10 +26,10 @@ redeclare final package Medium = Medium) "Latent heat gain" annotation (Placement(transformation(extent={{90,-70},{110,-50}}))); protected - Modelica.SIunits.MassFlowRate mWat_flow + Modelica.Units.SI.MassFlowRate mWat_flow "Water vapor flow rate released by latent gain"; - parameter Modelica.SIunits.SpecificEnergy h_fg = Medium.enthalpyOfCondensingGas(TWat) + parameter Modelica.Units.SI.SpecificEnergy h_fg = Medium.enthalpyOfCondensingGas(TWat) "Latent heat of water vapor"; // constant Medium.MassFraction Xi[Medium.nXi] = {1} // "Species concentration (water vapor only)"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/MixedAirHeatMassBalance.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/MixedAirHeatMassBalance.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/MixedAirHeatMassBalance.mo" 2022-03-10 09:57:31.816143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/MixedAirHeatMassBalance.mo" 2022-03-10 09:58:36.284151511 +0000 @@ -3,7 +3,7 @@ "Heat and mass balance of the air, assuming completely mixed air" extends Buildings.Rooms.BaseClasses.PartialAirHeatMassBalance(nPorts=1); extends Buildings.Fluid.Interfaces.LumpedVolumeDeclarations; - 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")); // Port definitions @@ -13,7 +13,7 @@ parameter Buildings.HeatTransfer.Types.InteriorConvection conMod "Convective heat transfer model for opaque constructions" annotation (Dialog(group="Convective heat transfer")); - parameter Modelica.SIunits.CoefficientOfHeatTransfer hFixed + parameter Modelica.Units.SI.CoefficientOfHeatTransfer hFixed "Constant convection coefficient for opaque constructions" annotation (Dialog(group="Convective heat transfer", enable=(conMod == Buildings.HeatTransfer.Types.InteriorConvection.Fixed))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/Overhang.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/Overhang.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/Overhang.mo" 2022-03-10 09:57:31.816143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/Overhang.mo" 2022-03-10 09:58:36.252151505 +0000 @@ -2,17 +2,17 @@ record Overhang "Record for window overhang" extends Modelica.Icons.Record; - parameter Modelica.SIunits.Length wL(min=0) + parameter Modelica.Units.SI.Length wL(min=0) "Overhang width left to the window, measured from the window corner" annotation(Dialog(tab="General",group="Overhang")); - parameter Modelica.SIunits.Length wR(min=0) + parameter Modelica.Units.SI.Length wR(min=0) "Overhang width right to the window, measured from the window corner" annotation(Dialog(tab="General",group="Overhang")); - parameter Modelica.SIunits.Length dep(min=0) + parameter Modelica.Units.SI.Length dep(min=0) "Overhang depth (measured perpendicular to the wall plane)" annotation(Dialog(tab="General",group="Overhang")); - parameter Modelica.SIunits.Length gap(min=0) + parameter Modelica.Units.SI.Length gap(min=0) "Distance between window upper edge and overhang lower edge" annotation(Dialog(tab="General",group="Overhang")); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/ParameterConstruction.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/ParameterConstruction.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/ParameterConstruction.mo" 2022-03-10 09:57:31.816143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/ParameterConstruction.mo" 2022-03-10 09:58:36.248151506 +0000 @@ -2,7 +2,7 @@ record ParameterConstruction "Record for exterior constructions that have no window" extends Buildings.Rooms.BaseClasses.PartialParameterConstruction; - parameter Modelica.SIunits.Area A "Heat transfer area"; + parameter Modelica.Units.SI.Area A "Heat transfer area"; annotation ( Documentation(info=" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/ParameterConstructionWithWindow.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/ParameterConstructionWithWindow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/ParameterConstructionWithWindow.mo" 2022-03-10 09:57:31.816143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/ParameterConstructionWithWindow.mo" 2022-03-10 09:58:36.244151504 +0000 @@ -3,17 +3,17 @@ "Record for exterior constructions that have a window" extends Buildings.Rooms.BaseClasses.PartialParameterConstruction; - parameter Modelica.SIunits.Area A + parameter Modelica.Units.SI.Area A "Heat transfer area of opaque construction and window combined"; - parameter Modelica.SIunits.Length hWin "Window height" + parameter Modelica.Units.SI.Length hWin "Window height" annotation (Dialog(group="Glazing system")); - parameter Modelica.SIunits.Length wWin "Window width" + parameter Modelica.Units.SI.Length wWin "Window width" annotation (Dialog(group="Glazing system")); - final parameter Modelica.SIunits.Area AWin=hWin*wWin + final parameter Modelica.Units.SI.Area AWin=hWin*wWin "Heat transfer area of window" annotation (Dialog(group="Glazing system")); - final parameter Modelica.SIunits.Area AOpa = A-AWin + final parameter Modelica.Units.SI.Area AOpa = A-AWin "Heat transfer area of opaque construction" annotation (Dialog(group="Opaque construction")); @@ -34,9 +34,9 @@ annotation (Dialog(group="Glazing system"), choicesAllMatching=true, Placement(transformation(extent={{60,-20}, {80,0}}))); - final parameter Modelica.SIunits.Area AFra = fFra*AWin "Frame area" + final parameter Modelica.Units.SI.Area AFra = fFra*AWin "Frame area" annotation (Dialog(group="Glazing system")); - final parameter Modelica.SIunits.Area AGla=AWin - AFra "Glass area" + final parameter Modelica.Units.SI.Area AGla=AWin - AFra "Glass area" annotation (Dialog(group="Glazing system")); parameter HeatTransfer.Data.GlazingSystems.Generic glaSys diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/PartialAirHeatMassBalance.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/PartialAirHeatMassBalance.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/PartialAirHeatMassBalance.mo" 2022-03-10 09:57:31.816143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/PartialAirHeatMassBalance.mo" 2022-03-10 09:58:36.232151503 +0000 @@ -13,7 +13,7 @@ parameter Boolean haveShade "Set to true if at least one window has an interior or exterior shade"; - parameter Modelica.SIunits.Volume V "Volume"; + parameter Modelica.Units.SI.Volume V "Volume"; // Input/output signals Modelica.Blocks.Interfaces.RealInput uSha[NConExtWin] if haveShade @@ -95,19 +95,19 @@ // Surface areas protected - final parameter Modelica.SIunits.Area AConExt[NConExt] = datConExt.A + final parameter Modelica.Units.SI.Area AConExt[NConExt] = datConExt.A "Areas of exterior constructions"; - final parameter Modelica.SIunits.Area AConExtWinOpa[NConExtWin] = datConExtWin.AOpa + final parameter Modelica.Units.SI.Area AConExtWinOpa[NConExtWin] = datConExtWin.AOpa "Opaque areas of exterior construction that have a window"; - final parameter Modelica.SIunits.Area AConExtWinGla[NConExtWin] = (1 .- datConExtWin.fFra) .* datConExtWin.AWin + final parameter Modelica.Units.SI.Area AConExtWinGla[NConExtWin] = (1 .- datConExtWin.fFra) .* datConExtWin.AWin "Glass areas of exterior construction that have a window"; - final parameter Modelica.SIunits.Area AConExtWinFra[NConExtWin] = datConExtWin.fFra .* datConExtWin.AWin + final parameter Modelica.Units.SI.Area AConExtWinFra[NConExtWin] = datConExtWin.fFra .* datConExtWin.AWin "Frame areas of exterior construction that have a window"; - final parameter Modelica.SIunits.Area AConPar[NConPar] = datConPar.A + final parameter Modelica.Units.SI.Area AConPar[NConPar] = datConPar.A "Areas of partition constructions"; - final parameter Modelica.SIunits.Area AConBou[NConBou] = datConBou.A + final parameter Modelica.Units.SI.Area AConBou[NConBou] = datConBou.A "Areas of constructions with exterior boundary conditions exposed to outside of room model"; - final parameter Modelica.SIunits.Area ASurBou[NSurBou] = surBou.A + final parameter Modelica.Units.SI.Area ASurBou[NSurBou] = surBou.A "Area of surface models of constructions that are modeled outside of this room"; annotation ( preferredView="info", diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/PartialParameterConstruction.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/PartialParameterConstruction.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/PartialParameterConstruction.mo" 2022-03-10 09:57:31.816143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/PartialParameterConstruction.mo" 2022-03-10 09:58:36.212151500 +0000 @@ -11,8 +11,8 @@ choicesAllMatching=true, Placement(transformation(extent={{146,258}, {166,278}}))); - parameter Modelica.SIunits.Angle til "Surface tilt"; - parameter Modelica.SIunits.Angle azi "Surface azimuth"; + parameter Modelica.Units.SI.Angle til "Surface tilt"; + parameter Modelica.Units.SI.Angle azi "Surface azimuth"; final parameter Boolean isFloor=til > 2.74889125 and til < 3.53428875 "Flag, true if construction is a floor" annotation (Evaluate=true); final parameter Boolean isCeiling=til > -0.392699 and til < 0.392699 @@ -24,10 +24,10 @@ parameter Boolean steadyStateInitial=false "=true initializes dT(0)/dt=0, false initializes T(0) at fixed temperature using T_a_start and T_b_start" annotation (Dialog(group="Initialization"), Evaluate=true); - parameter Modelica.SIunits.Temperature T_a_start=293.15 + parameter Modelica.Units.SI.Temperature T_a_start=293.15 "Initial temperature at port_a, used if steadyStateInitial = false" annotation (Dialog(group="Initialization", enable=not steadyStateInitial)); - parameter Modelica.SIunits.Temperature T_b_start=293.15 + parameter Modelica.Units.SI.Temperature T_b_start=293.15 "Initial temperature at port_b, used if steadyStateInitial = false" annotation (Dialog(group="Initialization", enable=not steadyStateInitial)); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/PartialSurfaceInterface.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/PartialSurfaceInterface.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/PartialSurfaceInterface.mo" 2022-03-10 09:57:31.816143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/PartialSurfaceInterface.mo" 2022-03-10 09:58:36.204151500 +0000 @@ -35,25 +35,25 @@ annotation (Placement(transformation(extent={{231, -230},{251,-210}}))); protected - final parameter Modelica.SIunits.Area AConExt[NConExt] = datConExt.A + final parameter Modelica.Units.SI.Area AConExt[NConExt] = datConExt.A "Areas of exterior constructions"; - final parameter Modelica.SIunits.Area AConExtWinOpa[NConExtWin] = datConExtWin.AOpa + final parameter Modelica.Units.SI.Area AConExtWinOpa[NConExtWin] = datConExtWin.AOpa "Opaque areas of exterior construction that have a window"; - final parameter Modelica.SIunits.Area AConExtWinGla[NConExtWin] = (1 .- datConExtWin.fFra) .* datConExtWin.AWin + final parameter Modelica.Units.SI.Area AConExtWinGla[NConExtWin] = (1 .- datConExtWin.fFra) .* datConExtWin.AWin "Glass areas of exterior construction that have a window"; - final parameter Modelica.SIunits.Area AConExtWinFra[NConExtWin] = datConExtWin.fFra .* datConExtWin.AWin + final parameter Modelica.Units.SI.Area AConExtWinFra[NConExtWin] = datConExtWin.fFra .* datConExtWin.AWin "Frame areas of exterior construction that have a window"; - final parameter Modelica.SIunits.Area AConPar[NConPar] = datConPar.A + final parameter Modelica.Units.SI.Area AConPar[NConPar] = datConPar.A "Areas of partition constructions"; - final parameter Modelica.SIunits.Area AConBou[NConBou] = datConBou.A + final parameter Modelica.Units.SI.Area AConBou[NConBou] = datConBou.A "Areas of constructions with exterior boundary conditions exposed to outside of room model"; - final parameter Modelica.SIunits.Area ASurBou[NSurBou] = surBou.A + final parameter Modelica.Units.SI.Area ASurBou[NSurBou] = surBou.A "Area of surface models of constructions that are modeled outside of this room"; protected function checkSurfaceAreas input Integer n "Number of surfaces"; - input Modelica.SIunits.Area A[:] "Surface areas"; + input Modelica.Units.SI.Area A[:] "Surface areas"; input String name "Name of the surface data record, used in error message"; algorithm if n == 0 then diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/PartialSurfaceInterfaceRadiative.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/PartialSurfaceInterfaceRadiative.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/PartialSurfaceInterfaceRadiative.mo" 2022-03-10 09:57:31.816143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/PartialSurfaceInterfaceRadiative.mo" 2022-03-10 09:58:36.188151497 +0000 @@ -4,26 +4,26 @@ extends Buildings.Rooms.BaseClasses.PartialSurfaceInterface; protected - parameter Modelica.SIunits.Emissivity epsConExt[NConExt] = datConExt.layers.absIR_b + + parameter Modelica.Units.SI.Emissivity epsConExt[NConExt] = datConExt.layers.absIR_b "Absorptivity of exterior constructions"; - parameter Modelica.SIunits.Emissivity epsConExtWinOpa[NConExtWin] = datConExtWin.layers.absIR_b + parameter Modelica.Units.SI.Emissivity epsConExtWinOpa[NConExtWin] = datConExtWin.layers.absIR_b "Absorptivity of opaque part of exterior constructions that contain a window"; - parameter Modelica.SIunits.Emissivity epsConExtWinUns[NConExtWin]= + parameter Modelica.Units.SI.Emissivity epsConExtWinUns[NConExtWin]= {(datConExtWin[i].glaSys.glass[size(datConExtWin[i].glaSys.glass, 1)].absIR_b) for i in 1:NConExtWin} "Absorptivity of unshaded part of window constructions"; - parameter Modelica.SIunits.Emissivity epsConExtWinSha[NConExtWin] = datConExtWin.glaSys.shade.absIR_a + parameter Modelica.Units.SI.Emissivity epsConExtWinSha[NConExtWin] = datConExtWin.glaSys.shade.absIR_a "Absorptivity of shaded part of window constructions"; - parameter Modelica.SIunits.Emissivity epsConExtWinFra[NConExtWin] = datConExtWin.glaSys.absIRFra + parameter Modelica.Units.SI.Emissivity epsConExtWinFra[NConExtWin] = datConExtWin.glaSys.absIRFra "Absorptivity of window frame"; - parameter Modelica.SIunits.Emissivity epsConPar_a[NConPar] = datConPar.layers.absIR_a + parameter Modelica.Units.SI.Emissivity epsConPar_a[NConPar] = datConPar.layers.absIR_a "Absorptivity of partition constructions surface a"; - parameter Modelica.SIunits.Emissivity epsConPar_b[NConPar] = datConPar.layers.absIR_b + parameter Modelica.Units.SI.Emissivity epsConPar_b[NConPar] = datConPar.layers.absIR_b "Absorptivity of partition constructions surface b"; - parameter Modelica.SIunits.Emissivity epsConBou[NConBou] = datConBou.layers.absIR_b + parameter Modelica.Units.SI.Emissivity epsConBou[NConBou] = datConBou.layers.absIR_b "Absorptivity of constructions with exterior boundary conditions exposed to outside of room model"; - parameter Modelica.SIunits.Emissivity epsSurBou[NSurBou] = surBou.absIR + parameter Modelica.Units.SI.Emissivity epsSurBou[NSurBou] = surBou.absIR "Absorptivity of surface models of constructions that are modeled outside of this room"; - annotation (Diagram(coordinateSystem(preserveAspectRatio=true, extent={{-240, -240},{240,240}}), graphics), Icon(coordinateSystem(preserveAspectRatio=true, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/RadiationTemperature.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/RadiationTemperature.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/RadiationTemperature.mo" 2022-03-10 09:57:31.816143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/RadiationTemperature.mo" 2022-03-10 09:58:36.172151496 +0000 @@ -35,7 +35,7 @@ final parameter Integer NWin = NConExtWin "Number of window surfaces"; final parameter Integer NTot = NOpa + NWin "Total number of surfaces"; - final parameter Modelica.SIunits.Area AGla[NWin] = datConExtWin.AGla + final parameter Modelica.Units.SI.Area AGla[NWin] = datConExtWin.AGla "Surface area of opaque surfaces"; final parameter Real epsGla[NWin](min=0, max=1)= {datConExtWin[i].glaSys.glass[size(datConExtWin[i].glaSys.glass, 1)].absIR_b for i in 1:NWin} @@ -47,21 +47,21 @@ {(if datConExtWin[i].glaSys.haveInteriorShade then datConExtWin[i].glaSys.shade.tauIR_a else 1) for i in 1:NWin} "Transmissivity of shade"; - final parameter Modelica.SIunits.Area epsAOpa[NOpa](fixed=false) + final parameter Modelica.Units.SI.Area epsAOpa[NOpa](fixed=false) "Product of area times absorptivity of opaque surfaces"; - final parameter Modelica.SIunits.Area epsAGla[NWin](fixed=false) + final parameter Modelica.Units.SI.Area epsAGla[NWin](fixed=false) "Product of area times absorptivity of window surfaces"; - final parameter Modelica.SIunits.Area epsASha[NWin](fixed=false) + final parameter Modelica.Units.SI.Area epsASha[NWin](fixed=false) "Product of area times absorptivity of window shade"; - final parameter Modelica.SIunits.Area epsTauASha[NWin](fixed=false) + final parameter Modelica.Units.SI.Area epsTauASha[NWin](fixed=false) "Product of area times glass absorptivity times shade transmittance"; - Modelica.SIunits.Temperature TOpa[NOpa](each start=293.15, each nominal=293.15) + Modelica.Units.SI.Temperature TOpa[NOpa](each start=293.15, each nominal=293.15) "Temperature of opaque surfaces"; - Modelica.SIunits.Temperature TGlaUns[NWin](each start=293.15, each nominal=293.15) + Modelica.Units.SI.Temperature TGlaUns[NWin](each start=293.15, each nominal=293.15) "Temperature of unshaded part of glass"; - Modelica.SIunits.Temperature TGlaSha[NWin](each start=293.15, each nominal=293.15) + Modelica.Units.SI.Temperature TGlaSha[NWin](each start=293.15, each nominal=293.15) "Temperature of shaded part of glass"; - Modelica.SIunits.Temperature TSha[NWin](each start=293.15, each nominal=293.15) + Modelica.Units.SI.Temperature TSha[NWin](each start=293.15, each nominal=293.15) "Temperature of shade"; // Internal connectors, used because of the conditionally removed connectors Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a glaUns_internal[NConExtWin] diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/RoomHeatMassBalance.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/RoomHeatMassBalance.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/RoomHeatMassBalance.mo" 2022-03-10 09:57:31.816143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/RoomHeatMassBalance.mo" 2022-03-10 09:58:36.148151492 +0000 @@ -20,10 +20,10 @@ extent={{-40,-10},{40,10}}, rotation=90, origin={-150,-100}))); - parameter Modelica.SIunits.Angle lat "Latitude"; - final parameter Modelica.SIunits.Volume V=AFlo*hRoo "Volume"; - parameter Modelica.SIunits.Area AFlo "Floor area"; - parameter Modelica.SIunits.Length hRoo "Average room height"; + parameter Modelica.Units.SI.Angle lat "Latitude"; + final parameter Modelica.Units.SI.Volume V=AFlo*hRoo "Volume"; + parameter Modelica.Units.SI.Area AFlo "Floor area"; + parameter Modelica.Units.SI.Length hRoo "Average room height"; Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a heaPorAir "Heat port to air volume" annotation (Placement(transformation(extent={{-270,30}, @@ -83,18 +83,18 @@ parameter Buildings.HeatTransfer.Types.InteriorConvection intConMod=Buildings.HeatTransfer.Types.InteriorConvection.Temperature "Convective heat transfer model for room-facing surfaces of opaque constructions" annotation (Dialog(group="Convective heat transfer")); - parameter Modelica.SIunits.CoefficientOfHeatTransfer hIntFixed=3.0 + parameter Modelica.Units.SI.CoefficientOfHeatTransfer hIntFixed=3.0 "Constant convection coefficient for room-facing surfaces of opaque constructions" annotation (Dialog(group="Convective heat transfer", enable=(conMod == Buildings.HeatTransfer.Types.InteriorConvection.Fixed))); parameter Buildings.HeatTransfer.Types.ExteriorConvection extConMod=Buildings.HeatTransfer.Types.ExteriorConvection.TemperatureWind "Convective heat transfer model for exterior facing surfaces of opaque constructions" annotation (Dialog(group="Convective heat transfer")); - parameter Modelica.SIunits.CoefficientOfHeatTransfer hExtFixed=10.0 + parameter Modelica.Units.SI.CoefficientOfHeatTransfer hExtFixed=10.0 "Constant convection coefficient for exterior facing surfaces of opaque constructions" annotation (Dialog(group="Convective heat transfer", enable=(conMod == Buildings.HeatTransfer.Types.ExteriorConvection.Fixed))); - parameter Modelica.SIunits.MassFlowRate m_flow_nominal(min=0) = V*1.2/3600 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal(min=0) = V*1.2/3600 "Nominal mass flow rate" annotation (Dialog(group="Nominal condition")); parameter Boolean homotopyInitialization = true "= true, use homotopy method" annotation(Evaluate=true, Dialog(tab="Advanced")); @@ -264,11 +264,11 @@ annotation (Placement(transformation(extent={{-60,90},{-40,110}}))); protected - final parameter Modelica.SIunits.TransmissionCoefficient tauIRSha_air[NConExtWin]= + final parameter Modelica.Units.SI.TransmissionCoefficient tauIRSha_air[NConExtWin]= datConExtWin.glaSys.shade.tauIR_a "Infrared transmissivity of shade for radiation coming from the exterior or the room" annotation (Dialog(group="Shading")); - final parameter Modelica.SIunits.TransmissionCoefficient tauIRSha_glass[ + final parameter Modelica.Units.SI.TransmissionCoefficient tauIRSha_glass[ NConExtWin]= datConExtWin.glaSys.shade.tauIR_b "Infrared transmissivity of shade for radiation coming from the glass" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/SideFins.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/SideFins.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/SideFins.mo" 2022-03-10 09:57:31.816143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/SideFins.mo" 2022-03-10 09:58:35.924151465 +0000 @@ -1,13 +1,13 @@ within Buildings.Rooms.BaseClasses; record SideFins "Record for window side fins" extends Modelica.Icons.Record; - parameter Modelica.SIunits.Length h(min=0) + parameter Modelica.Units.SI.Length h(min=0) "Height of side fin that extends above window, measured from top of window" annotation(Dialog(tab="General",group="Side fin")); - parameter Modelica.SIunits.Length dep(min=0) + parameter Modelica.Units.SI.Length dep(min=0) "Side fin depth (measured perpendicular to the wall plane)" annotation(Dialog(tab="General",group="Side fin")); - parameter Modelica.SIunits.Length gap(min=0) + parameter Modelica.Units.SI.Length gap(min=0) "Distance between side fin and window edge" annotation(Dialog(tab="General",group="Side fin")); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/SkyRadiationExchange.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/SkyRadiationExchange.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/SkyRadiationExchange.mo" 2022-03-10 09:57:31.816143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/SkyRadiationExchange.mo" 2022-03-10 09:58:35.916151463 +0000 @@ -3,11 +3,11 @@ "Radiative heat exchange with the sky and the ambient" extends Buildings.BaseClasses.BaseIcon; parameter Integer n(min=1) "Number of constructions"; - parameter Modelica.SIunits.Area A[n] "Area of exterior constructions"; + parameter Modelica.Units.SI.Area A[n] "Area of exterior constructions"; parameter Real vieFacSky[n]( each min=0, each max=1) "View factor to sky (=1 for roofs)"; - parameter Modelica.SIunits.Emissivity absIR[n] + parameter Modelica.Units.SI.Emissivity absIR[n] "Infrared absorptivity of building surface"; Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a port[n] "Heat port" annotation (Placement(transformation(extent={{90,-10},{110,10}}))); @@ -26,12 +26,12 @@ parameter Real k[n]( each unit="W/K4") = {4*A[i]*Modelica.Constants.sigma*absIR[i] for i in 1:n} "Constant for radiative heat exchange"; - Modelica.SIunits.Temperature TEnv[n] "Environment temperature"; + Modelica.Units.SI.Temperature TEnv[n] "Environment temperature"; Real TBlaSky4(unit="K4") "Auxiliary variable for radiative heat exchange"; Real TOut4(unit="K4") "Auxiliary variable for radiative heat exchange"; - Modelica.SIunits.CoefficientOfHeatTransfer h[n] - "Radiative heat transfer coefficient"; + Modelica.Units.SI.CoefficientOfHeatTransfer h[n] + "Radiative heat transfer coefficient"; equation TBlaSky4 = TBlaSky^4; TOut4 = TOut^4; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/SolarRadiationExchange.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/SolarRadiationExchange.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/SolarRadiationExchange.mo" 2022-03-10 09:57:31.820143342 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/SolarRadiationExchange.mo" 2022-03-10 09:58:35.904151461 +0000 @@ -35,7 +35,7 @@ parameter Boolean isFloorSurBou[NSurBou] "Flag to indicate if floor for constructions that are modeled outside of this room"; - parameter Modelica.SIunits.Emissivity tauGla[NConExtWin] + parameter Modelica.Units.SI.Emissivity tauGla[NConExtWin] "Transmissivity of window"; Modelica.Blocks.Interfaces.RealOutput HOutConExtWin[NConExtWin](unit="W/m2") @@ -44,10 +44,10 @@ Modelica.Blocks.Interfaces.RealInput JInConExtWin[NConExtWin](unit="W") "Solar radiation transmitted by window per unit area" annotation (Placement(transformation(extent={{260,70},{240,90}}))); - Modelica.SIunits.HeatFlowRate JOutConExtWin[NConExtWin] + Modelica.Units.SI.HeatFlowRate JOutConExtWin[NConExtWin] "Outgoing solar radiation that strikes the window"; - Modelica.SIunits.HeatFlowRate HTot + Modelica.Units.SI.HeatFlowRate HTot "Total solar radiation that enters the room"; protected @@ -55,7 +55,7 @@ "Intermediate variable for gain for solar radiation distribution"; final parameter Real k2(fixed=false) "Intermediate variable for gain for solar radiation distribution"; - Modelica.SIunits.HeatFlowRate Q_flow[NTot] + Modelica.Units.SI.HeatFlowRate Q_flow[NTot] "Total solar radiation that is absorbed by the surfaces (or transmitted back through the glass)"; final parameter Integer NOpa = NConExt+2*NConExtWin+2*NConPar+NConBou+NSurBou "Number of opaque surfaces, including the window frame"; @@ -67,8 +67,8 @@ "Solar absorptivity"; final parameter Real tau[NTot](min=0, max=1, fixed=false) "Solar transmissivity"; - final parameter Modelica.SIunits.Area AFlo(fixed=false) "Total floor area"; - final parameter Modelica.SIunits.Area A[NTot](fixed=false) "Surface areas"; + final parameter Modelica.Units.SI.Area AFlo(fixed=false) "Total floor area"; + final parameter Modelica.Units.SI.Area A[NTot](fixed=false) "Surface areas"; final parameter Real k[NTot](unit="1", fixed=false) "Gain for solar radiation distribution"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/cfdExchangeData.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/cfdExchangeData.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/cfdExchangeData.mo" 2022-03-10 09:57:31.820143342 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/cfdExchangeData.mo" 2022-03-10 09:58:35.868151458 +0000 @@ -1,13 +1,13 @@ within Buildings.Rooms.BaseClasses; function cfdExchangeData "Exchange data between CFD and Modelica" input Integer flag "Communication flag to CFD"; - input Modelica.SIunits.Time t "Current Modelica simulation time to CFD"; - input Modelica.SIunits.Time dt(min=100*Modelica.Constants.eps) + input Modelica.Units.SI.Time t "Current Modelica simulation time to CFD"; + input Modelica.Units.SI.Time dt(min=100*Modelica.Constants.eps) "Requested synchronization time step size"; input Real[nU] u "Input to CFD"; input Integer nU "Number of inputs to CFD"; input Integer nY "Number of outputs from CFD"; - output Modelica.SIunits.Time modTimRea "Current model time from CFD"; + output Modelica.Units.SI.Time modTimRea "Current model time from CFD"; output Real[nY] y "Output computed by CFD"; output Integer retVal "Return value for CFD simulation status"; external"C" retVal = cfdExchangeData( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/cfdStartCosimulation.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/cfdStartCosimulation.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/cfdStartCosimulation.mo" 2022-03-10 09:57:31.820143342 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/cfdStartCosimulation.mo" 2022-03-10 09:58:35.856151456 +0000 @@ -2,8 +2,8 @@ function cfdStartCosimulation "Start the coupled simulation with CFD" input String cfdFilNam "CFD input file name"; input String[nSur] name "Surface names"; - input Modelica.SIunits.Area[nSur] A "Surface areas"; - input Modelica.SIunits.Angle[nSur] til "Surface tilt"; + input Modelica.Units.SI.Area[nSur] A "Surface areas"; + input Modelica.Units.SI.Angle[nSur] til "Surface tilt"; input Buildings.Rooms.Types.CFDBoundaryConditions[nSur] bouCon "Type of boundary condition"; input Integer nPorts(min=0) @@ -20,7 +20,7 @@ input Integer nConExtWin(min=0) "number of exterior construction with window"; input Integer nXi(min=0) "Number of independent species"; input Integer nC(min=0) "Number of trace substances"; - input Modelica.SIunits.Density rho_start "Density at initial state"; + input Modelica.Units.SI.Density rho_start "Density at initial state"; output Integer retVal "Return value of the function (0 indicates CFD successfully started.)"; external"C" retVal = cfdStartCosimulation( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/to_W.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/to_W.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/to_W.mo" 2022-03-10 09:57:31.820143342 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/BaseClasses/to_W.mo" 2022-03-10 09:58:35.848151456 +0000 @@ -1,6 +1,6 @@ within Buildings.Rooms.BaseClasses; block to_W "Add unit [W] to data" - extends Modelica.Blocks.Interfaces.BlockIcon; + extends Modelica.Blocks.Icons.Block; Modelica.Blocks.Interfaces.RealInput u annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/CFD.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/CFD.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/CFD.mo" 2022-03-10 09:57:31.820143342 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/CFD.mo" 2022-03-10 09:58:35.844151454 +0000 @@ -26,7 +26,7 @@ parameter Boolean useCFD = true "Set to false to deactivate the CFD computation and use instead yFixed as output" annotation(Dialog(group = "CFD"), Evaluate = true); - parameter Modelica.SIunits.Time samplePeriod(min=100*Modelica.Constants.eps) + parameter Modelica.Units.SI.Time samplePeriod(min=100*Modelica.Constants.eps) "Sample period of component" annotation(Dialog(group = "Sampling")); parameter Real uSha_fixed[nConExtWin] = zeros(nConExtWin) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/Constructions/BaseClasses/PartialConstruction.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/Constructions/BaseClasses/PartialConstruction.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/Constructions/BaseClasses/PartialConstruction.mo" 2022-03-10 09:57:31.820143342 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/Constructions/BaseClasses/PartialConstruction.mo" 2022-03-10 09:58:35.816151450 +0000 @@ -2,8 +2,8 @@ partial model PartialConstruction "Partial model for exterior construction that has no window" - parameter Modelica.SIunits.Area A "Heat transfer area"; - parameter Modelica.SIunits.Area AOpa + parameter Modelica.Units.SI.Area A "Heat transfer area"; + parameter Modelica.Units.SI.Area AOpa "Heat transfer area of opaque construction" annotation (Dialog(group="Opaque construction")); @@ -13,7 +13,7 @@ choicesAllMatching=true, Placement(transformation(extent={{146,258}, {166,278}}))); - parameter Modelica.SIunits.Angle til "Surface tilt"; + parameter Modelica.Units.SI.Angle til "Surface tilt"; final parameter Boolean isFloor=til > 2.74889125 and til < 3.53428875 "Flag, true if construction is a floor" annotation (Evaluate=true); @@ -35,10 +35,10 @@ parameter Boolean steadyStateInitial=false "=true initializes dT(0)/dt=0, false initializes T(0) at fixed temperature using T_a_start and T_b_start" annotation (Dialog(group="Initialization"), Evaluate=true); - parameter Modelica.SIunits.Temperature T_a_start=293.15 + parameter Modelica.Units.SI.Temperature T_a_start=293.15 "Initial temperature at port_a, used if steadyStateInitial = false" annotation (Dialog(group="Initialization", enable=not steadyStateInitial)); - parameter Modelica.SIunits.Temperature T_b_start=293.15 + parameter Modelica.Units.SI.Temperature T_b_start=293.15 "Initial temperature at port_b, used if steadyStateInitial = false" annotation (Dialog(group="Initialization", enable=not steadyStateInitial)); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/Constructions/ConstructionWithWindow.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/Constructions/ConstructionWithWindow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/Constructions/ConstructionWithWindow.mo" 2022-03-10 09:57:31.820143342 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/Constructions/ConstructionWithWindow.mo" 2022-03-10 09:58:35.768151444 +0000 @@ -4,15 +4,15 @@ extends Buildings.Rooms.Constructions.BaseClasses.PartialConstruction( final AOpa=A-AWin); - parameter Modelica.SIunits.Area AWin "Heat transfer area of window" + parameter Modelica.Units.SI.Area AWin "Heat transfer area of window" annotation (Dialog(group="Glazing system")); parameter Real fFra( min=0, max=1) = 0.1 "Fraction of window frame divided by total window area" annotation (Dialog(group="Glazing system")); - final parameter Modelica.SIunits.Area AFra = fFra*AWin "Frame area" + final parameter Modelica.Units.SI.Area AFra = fFra*AWin "Frame area" annotation (Dialog(group="Glazing system")); - final parameter Modelica.SIunits.Area AGla=AWin - AFra "Glass area" + final parameter Modelica.Units.SI.Area AGla=AWin - AFra "Glass area" annotation (Dialog(group="Glazing system")); parameter Boolean linearizeRadiation = true "Set to true to linearize emissive power" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/Constructions/Examples/ExteriorWallTwoWindows.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/Constructions/Examples/ExteriorWallTwoWindows.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/Constructions/Examples/ExteriorWallTwoWindows.mo" 2022-03-10 09:57:31.820143342 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/Constructions/Examples/ExteriorWallTwoWindows.mo" 2022-03-10 09:58:35.716151439 +0000 @@ -3,11 +3,11 @@ "Test model for an exterior wall with two windows, one having a shade, the other not" extends Modelica.Icons.Example; parameter Integer nCon = 2 "Number of constructions"; - parameter Modelica.SIunits.Area A[:]={3*10, 3*10} + parameter Modelica.Units.SI.Area A[:]={3*10, 3*10} "Heat transfer area of wall and window"; - parameter Modelica.SIunits.Length hWin[:] = {2, 1} "Window height"; - parameter Modelica.SIunits.Length wWin[:] = {3, 3} "Window width"; - parameter Modelica.SIunits.Area AWin[:]= hWin .* wWin + parameter Modelica.Units.SI.Length hWin[:] = {2, 1} "Window height"; + parameter Modelica.Units.SI.Length wWin[:] = {3, 3} "Window width"; + parameter Modelica.Units.SI.Area AWin[:]= hWin .* wWin "Heat transfer area of frame and window"; parameter Real fFra[:]={0.1, 0.1} "Fraction of window frame divided by total window area"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/Constructions/Examples/ExteriorWallWithWindow.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/Constructions/Examples/ExteriorWallWithWindow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/Constructions/Examples/ExteriorWallWithWindow.mo" 2022-03-10 09:57:31.820143342 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/Constructions/Examples/ExteriorWallWithWindow.mo" 2022-03-10 09:58:35.688151434 +0000 @@ -1,11 +1,11 @@ within Buildings.Rooms.Constructions.Examples; model ExteriorWallWithWindow "Test model for an exterior wall with a window" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Area A=3*10 + parameter Modelica.Units.SI.Area A=3*10 "Heat transfer area of wall and window"; - parameter Modelica.SIunits.Length hWin = 2 "Window height"; - parameter Modelica.SIunits.Length wWin = 3 "Window width"; - parameter Modelica.SIunits.Area AWin=hWin*wWin + parameter Modelica.Units.SI.Length hWin = 2 "Window height"; + parameter Modelica.Units.SI.Length wWin = 3 "Window width"; + parameter Modelica.Units.SI.Area AWin=hWin*wWin "Heat transfer area of frame and window"; parameter Real fFra=0.1 "Fraction of window frame divided by total window area"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/Examples/Controls/ElectrochromicWindow.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/Examples/Controls/ElectrochromicWindow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/Examples/Controls/ElectrochromicWindow.mo" 2022-03-10 09:57:31.820143342 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/Examples/Controls/ElectrochromicWindow.mo" 2022-03-10 09:58:35.648151429 +0000 @@ -1,13 +1,13 @@ within Buildings.Rooms.Examples.Controls; block ElectrochromicWindow "Controller for electrochromic windows" extends Modelica.Blocks.Icons.Block; - parameter Modelica.SIunits.Irradiance HClear = 250 + parameter Modelica.Units.SI.Irradiance HClear = 250 "Solar irradiation below which the window will be in clear state regardless of temperature"; - parameter Modelica.SIunits.Irradiance HDark = HClear+100 + parameter Modelica.Units.SI.Irradiance HDark = HClear+100 "Solar irradiation at which the window will be in dark state if T > TDark"; - parameter Modelica.SIunits.Temperature TClear = 273.15+22 + parameter Modelica.Units.SI.Temperature TClear = 273.15+22 "Measured temperature below which the window will be in clear state for any irradiation"; - parameter Modelica.SIunits.Temperature TDark = TClear+2 + parameter Modelica.Units.SI.Temperature TDark = TClear+2 "Measured temperature above which the window will be transitioned to completely dark state if H > HDark"; Modelica.Blocks.Interfaces.RealInput T(quantity="Temperature", @@ -30,8 +30,7 @@ Modelica.Blocks.Nonlinear.Limiter limT( final uMax=1, final uMin=0, - final strict=true, - final limitsAtInit=true) "Limiter for temperature" + final strict=true) "Limiter for temperature" annotation (Placement(transformation(extent={{30,30},{50,50}}))); Modelica.Blocks.Math.Feedback feeT "Feedback for temperature" annotation (Placement(transformation(extent={{-50,30},{-30,50}}))); @@ -45,8 +44,7 @@ Modelica.Blocks.Nonlinear.Limiter limH( final uMax=1, final uMin=0, - final strict=true, - final limitsAtInit=true) "Limiter for irradiation" + final strict=true) "Limiter for irradiation" annotation (Placement(transformation(extent={{30,-50},{50,-30}}))); Modelica.Blocks.Math.Feedback feeH "Feedback for irradiation" annotation (Placement(transformation(extent={{-50,-50},{-30,-30}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/Examples/ElectroChromicWindow.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/Examples/ElectroChromicWindow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/Examples/ElectroChromicWindow.mo" 2022-03-10 09:57:31.820143342 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/Examples/ElectroChromicWindow.mo" 2022-03-10 09:58:35.624151426 +0000 @@ -4,7 +4,7 @@ extends Modelica.Icons.Example; package MediumA = Buildings.Media.Air(T_default=T_start) "Medium model"; - constant Modelica.SIunits.Temperature T_start=273.15 + 20 "Initial value"; + constant Modelica.Units.SI.Temperature T_start=273.15 + 20 "Initial value"; parameter Integer nConExtWin=1 "Number of constructions with a window"; parameter Integer nConExt=0 "Number of constructions without a window"; @@ -184,7 +184,7 @@ block Infiltration extends Modelica.Blocks.Icons.Block; - parameter Modelica.SIunits.VolumeFlowRate V_flow + parameter Modelica.Units.SI.VolumeFlowRate V_flow "Infiltration flow rate at current outdoor air density"; parameter Real A "Constant term coefficient"; parameter Real B(unit="1/K") "Temperature term coefficient"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/Validation/BESTEST/Case600.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/Validation/BESTEST/Case600.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/Validation/BESTEST/Case600.mo" 2022-03-10 09:57:31.820143342 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/Validation/BESTEST/Case600.mo" 2022-03-10 09:58:34.720151312 +0000 @@ -8,7 +8,7 @@ peakCoo(Min=-5.965*1000, Max=-6.827*1000, Mean=-6.461*1000))); Controls.Continuous.LimPID conHea( Td=60, - initType=Modelica.Blocks.Types.InitPID.InitialState, + initType=Modelica.Blocks.Types.Init.InitialState, Ti=300, controllerType=Modelica.Blocks.Types.SimpleController.PI, k=0.1) "Controller for heating" @@ -16,7 +16,7 @@ Controls.Continuous.LimPID conCoo( Td=60, reverseAction=true, - initType=Modelica.Blocks.Types.InitPID.InitialState, + initType=Modelica.Blocks.Types.Init.InitialState, Ti=300, controllerType=Modelica.Blocks.Types.SimpleController.PI, k=0.1) "Controller for cooling" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/Validation/BESTEST/Case600FF.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/Validation/BESTEST/Case600FF.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/Validation/BESTEST/Case600FF.mo" 2022-03-10 09:57:31.820143342 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/Validation/BESTEST/Case600FF.mo" 2022-03-10 09:58:34.700151309 +0000 @@ -4,19 +4,19 @@ extends Modelica.Icons.Example; package MediumA = Buildings.Media.Air "Medium model"; - parameter Modelica.SIunits.Angle S_= + parameter Modelica.Units.SI.Angle S_= Buildings.Types.Azimuth.S "Azimuth for south walls"; - parameter Modelica.SIunits.Angle E_= + parameter Modelica.Units.SI.Angle E_= Buildings.Types.Azimuth.E "Azimuth for east walls"; - parameter Modelica.SIunits.Angle W_= + parameter Modelica.Units.SI.Angle W_= Buildings.Types.Azimuth.W "Azimuth for west walls"; - parameter Modelica.SIunits.Angle N_= + parameter Modelica.Units.SI.Angle N_= Buildings.Types.Azimuth.N "Azimuth for north walls"; - parameter Modelica.SIunits.Angle C_= + parameter Modelica.Units.SI.Angle C_= Buildings.Types.Tilt.Ceiling "Tilt for ceiling"; - parameter Modelica.SIunits.Angle F_= + parameter Modelica.Units.SI.Angle F_= Buildings.Types.Tilt.Floor "Tilt for floor"; - parameter Modelica.SIunits.Angle Z_= + parameter Modelica.Units.SI.Angle Z_= Buildings.Types.Tilt.Wall "Tilt for wall"; parameter Integer nConExtWin = 1 "Number of constructions with a window"; parameter Integer nConBou = 1 diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/Validation/LBNL_71T/RoomB/ElectroChromicWindow.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/Validation/LBNL_71T/RoomB/ElectroChromicWindow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/Validation/LBNL_71T/RoomB/ElectroChromicWindow.mo" 2022-03-10 09:57:31.820143342 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/Validation/LBNL_71T/RoomB/ElectroChromicWindow.mo" 2022-03-10 09:58:34.452151279 +0000 @@ -4,7 +4,7 @@ extends Modelica.Icons.Example; package MediumA = Buildings.Media.Air "Medium model"; - parameter Modelica.SIunits.Temperature T_start=273.15 + 24 "Initial value"; + parameter Modelica.Units.SI.Temperature T_start=273.15 + 24 "Initial value"; parameter Integer nConExtWin=1 "Number of constructions with a window"; parameter Integer nConExt=0 "Number of constructions without a window"; @@ -186,7 +186,7 @@ block Infiltration extends Modelica.Blocks.Icons.Block; - parameter Modelica.SIunits.VolumeFlowRate V_flow + parameter Modelica.Units.SI.VolumeFlowRate V_flow "Infiltration flow rate at current outdoor air density"; parameter Real A "Constant term coefficient"; parameter Real B(unit="1/K") "Temperature term coefficient"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/Validation/MixedAirInitialization.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/Validation/MixedAirInitialization.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/Validation/MixedAirInitialization.mo" 2022-03-10 09:57:31.820143342 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Rooms/Validation/MixedAirInitialization.mo" 2022-03-10 09:58:34.416151273 +0000 @@ -4,7 +4,7 @@ extends Modelica.Icons.Example; package MediumA = Buildings.Media.Air "Medium model"; - parameter Modelica.SIunits.Temperature T_start=273.15-15 "Initial value"; + parameter Modelica.Units.SI.Temperature T_start=273.15-15 "Initial value"; parameter Buildings.HeatTransfer.Data.OpaqueConstructions.Insulation100Concrete200 diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Types/Azimuth/package.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Types/Azimuth/package.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Types/Azimuth/package.mo" 2022-03-10 09:57:31.820143342 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Types/Azimuth/package.mo" 2022-03-10 09:58:34.288151258 +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/Buildings 3.0.0/Types/Tilt/package.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Types/Tilt/package.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Types/Tilt/package.mo" 2022-03-10 09:57:31.820143342 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Types/Tilt/package.mo" 2022-03-10 09:58:34.280151256 +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/Buildings 3.0.0/Utilities/Comfort/Fanger.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Comfort/Fanger.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Comfort/Fanger.mo" 2022-03-10 09:57:31.824143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Comfort/Fanger.mo" 2022-03-10 09:58:34.060151229 +0000 @@ -7,9 +7,9 @@ Modelica.Blocks.Interfaces.RealOutput PPD "PPD [0.05...1]" annotation (Placement(transformation(extent={{100,-50},{120,-30}}))); - parameter Modelica.SIunits.HeatFlux W(max=0)=0 + parameter Modelica.Units.SI.HeatFlux W(max=0)=0 "Rate of mechanical work accomplished (must be non-positive, typically equal to 0)"; - parameter Modelica.SIunits.CoefficientOfHeatTransfer hRad( + parameter Modelica.Units.SI.CoefficientOfHeatTransfer hRad( min=0, max=10)=0.8*4.7 "Radiative heat transfer coefficient"; @@ -30,14 +30,14 @@ annotation(Evaluate=true, HideResult=true, Dialog(group="Conditional inputs")); - parameter Modelica.SIunits.Velocity vAir= 0.05 "Fixed value for air velocity" + parameter Modelica.Units.SI.Velocity vAir= 0.05 "Fixed value for air velocity" annotation (Dialog(enable = not use_vAir_in, group="Conditional inputs")); - parameter Modelica.SIunits.HeatFlux M = 60 "Fixed value for metabolic rate" + parameter Modelica.Units.SI.HeatFlux M = 60 "Fixed value for metabolic rate" annotation (Dialog(enable = not use_M_in, group="Conditional inputs")); parameter Real ICl = 0.7 "Fixed value for clothing insulation in units of clo (summer=0.5; winter=0.9)" annotation (Dialog(enable = not use_ICl_in, group="Conditional inputs")); - parameter Modelica.SIunits.Pressure pAir = 101325 + parameter Modelica.Units.SI.Pressure pAir = 101325 "Fixed value for air pressure" annotation (Dialog(enable = not use_pAir_in, group="Conditional inputs")); @@ -53,9 +53,9 @@ Placement(transformation(extent={{-120,50},{-100,70}}), iconTransformation(extent={{-120,50},{-100,70}}))); - Modelica.SIunits.Temperature TOpe "Operative temperature"; - Modelica.SIunits.Temperature TClo "Surface temperature of clothing"; - Modelica.SIunits.Temperature TSki( + Modelica.Units.SI.Temperature TOpe "Operative temperature"; + Modelica.Units.SI.Temperature TClo "Surface temperature of clothing"; + Modelica.Units.SI.Temperature TSki( min=273.15+10, max=273.15+42) "Skin temperature"; @@ -87,21 +87,21 @@ Placement(transformation(extent={{-120,-50},{-100,-30}}), iconTransformation(extent={{-120,-50},{-100,-30}}))); - Modelica.SIunits.CoefficientOfHeatTransfer hCom( + Modelica.Units.SI.CoefficientOfHeatTransfer hCom( min=0, max=10) "Combined heat transfer coefficient"; - Modelica.SIunits.CoefficientOfHeatTransfer hCon( + Modelica.Units.SI.CoefficientOfHeatTransfer hCon( min=0, max=10) "Convective heat transfer coefficient"; - Modelica.SIunits.Pressure pSte( + Modelica.Units.SI.Pressure pSte( min=0, max=3000) "Partial pressure of water vapor in ambient air"; - Modelica.SIunits.HeatFlux L "Thermal load of the body"; + Modelica.Units.SI.HeatFlux L "Thermal load of the body"; Real fCl(min=0) "Clothing area factor (61)"; - Modelica.SIunits.ThermalInsulance RCl "Thermal resistance of clothing (10)"; + Modelica.Units.SI.ThermalInsulance RCl "Thermal resistance of clothing (10)"; protected Buildings.Utilities.Psychrometrics.X_pTphi steRat @@ -177,7 +177,7 @@ - 0.0173*M_in_internal*(5.87 - pSte*1E-3) - 0.0014*M_in_internal*(307.15 - TAir); - TClo = Modelica.SIunits.Conversions.from_degC(35.7 - 0.0275 * (M_in_internal-W) + TClo = Modelica.Units.Conversions.from_degC(35.7 - 0.0275 * (M_in_internal-W) - RCl * ( (M_in_internal-W) + aux)); // heat load on body, see (58) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Diagnostics/BaseClasses/PartialInputCheck.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Diagnostics/BaseClasses/PartialInputCheck.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Diagnostics/BaseClasses/PartialInputCheck.mo" 2022-03-10 09:57:31.824143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Diagnostics/BaseClasses/PartialInputCheck.mo" 2022-03-10 09:58:33.984151219 +0000 @@ -1,7 +1,7 @@ within Buildings.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/Buildings 3.0.0/Utilities/IO/BCVTB/BCVTB.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/IO/BCVTB/BCVTB.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/IO/BCVTB/BCVTB.mo" 2022-03-10 09:57:31.824143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/IO/BCVTB/BCVTB.mo" 2022-03-10 09:58:33.976151217 +0000 @@ -6,7 +6,7 @@ parameter Boolean activateInterface = true "Set to false to deactivate interface and use instead yFixed as output" annotation(Evaluate = true); - parameter Modelica.SIunits.Time timeStep + parameter Modelica.Units.SI.Time timeStep "Time step used for the synchronization" annotation(Dialog(enable = activateInterface)); parameter String xmlFileName = "socket.cfg" @@ -32,7 +32,7 @@ annotation (Placement(transformation(extent={{100,-10},{120,10}}))); Integer flaRea "Flag received from BCVTB"; - Modelica.SIunits.Time simTimRea + Modelica.Units.SI.Time simTimRea "Current simulation time received from the BCVTB"; Integer retVal "Return value from the BSD socket data exchange"; protected diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/IO/BCVTB/BaseClasses/FluidInterface.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/IO/BCVTB/BaseClasses/FluidInterface.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/IO/BCVTB/BaseClasses/FluidInterface.mo" 2022-03-10 09:57:31.824143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/IO/BCVTB/BaseClasses/FluidInterface.mo" 2022-03-10 09:58:33.948151214 +0000 @@ -17,14 +17,14 @@ parameter Boolean use_m_flow_in = false "Get the 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)); - 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(group="Advanced")); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/IO/BCVTB/BaseClasses/exchangeReals.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/IO/BCVTB/BaseClasses/exchangeReals.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/IO/BCVTB/BaseClasses/exchangeReals.mo" 2022-03-10 09:57:31.824143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/IO/BCVTB/BaseClasses/exchangeReals.mo" 2022-03-10 09:58:33.920151210 +0000 @@ -3,13 +3,13 @@ input Integer socketFD(min=1) "Socket file descripter"; input Integer flaWri "Communication flag to write to the socket stream"; - input Modelica.SIunits.Time simTimWri + input Modelica.Units.SI.Time simTimWri "Current simulation time in seconds to write"; input Real[nDblWri] dblValWri "Double values to write"; input Integer nDblWri "Number of double values to write"; input Integer nDblRea "Number of double values to read"; output Integer flaRea "Communication flag read from the socket stream"; - output Modelica.SIunits.Time simTimRea + output Modelica.Units.SI.Time simTimRea "Current simulation time in seconds read from socket"; output Real[nDblRea] dblValRea "Double values read from socket"; output Integer retVal "The exit value, which is negative if an error occurred"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/IO/BCVTB/Examples/MoistAir.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/IO/BCVTB/Examples/MoistAir.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/IO/BCVTB/Examples/MoistAir.mo" 2022-03-10 09:57:31.824143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/IO/BCVTB/Examples/MoistAir.mo" 2022-03-10 09:58:33.908151210 +0000 @@ -3,7 +3,7 @@ "Model with interfaces for media with moist air that will be linked to the BCVTB which models the response of the room" extends Modelica.Icons.Example; package Medium = Buildings.Media.Air; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal= 259.2*6/1.2/3600 "Nominal mass flow rate"; Buildings.Fluid.FixedResistances.FixedResistanceDpM dp1( redeclare package Medium = Medium, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/IO/BCVTB/Examples/TwoRooms.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/IO/BCVTB/Examples/TwoRooms.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/IO/BCVTB/Examples/TwoRooms.mo" 2022-03-10 09:57:31.824143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/IO/BCVTB/Examples/TwoRooms.mo" 2022-03-10 09:58:33.876151204 +0000 @@ -2,11 +2,11 @@ model TwoRooms "Thermal model of two rooms that will be linked to the BCVTB which models the controls" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Time tau = 2*3600 "Room time constant"; - parameter Modelica.SIunits.HeatFlowRate Q_flow_nom = 100 "Nominal heat flow"; - parameter Modelica.SIunits.ThermalConductance UA = Q_flow_nom / 20 + parameter Modelica.Units.SI.Time tau = 2*3600 "Room time constant"; + parameter Modelica.Units.SI.HeatFlowRate Q_flow_nom = 100 "Nominal heat flow"; + parameter Modelica.Units.SI.ThermalConductance UA = Q_flow_nom / 20 "Thermal conductance of room"; - parameter Modelica.SIunits.Temperature TStart = 283.15 "Start temperature"; + parameter Modelica.Units.SI.Temperature TStart = 283.15 "Start temperature"; Modelica.Thermal.HeatTransfer.Components.HeatCapacitor C1(C=tau*UA, T(start= TStart, fixed=true)) "Heat capacity of room" annotation (Placement(transformation(extent={{70,70},{90,90}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/IO/BCVTB/From_degC.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/IO/BCVTB/From_degC.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/IO/BCVTB/From_degC.mo" 2022-03-10 09:57:31.824143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/IO/BCVTB/From_degC.mo" 2022-03-10 09:58:33.856151202 +0000 @@ -13,7 +13,8 @@ annotation (Placement(transformation(extent={{100,-12},{120,8}}), iconTransformation(extent={{100,-12},{120,8}}))); equation - Celsius = Modelica.SIunits.Conversions.to_degC(Kelvin); + Celsius = Modelica.Units.Conversions.to_degC(Kelvin); + annotation ( defaultComponentName="froDegC", Documentation(info=" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/IO/BCVTB/To_degC.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/IO/BCVTB/To_degC.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/IO/BCVTB/To_degC.mo" 2022-03-10 09:57:31.824143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/IO/BCVTB/To_degC.mo" 2022-03-10 09:58:33.840151201 +0000 @@ -13,7 +13,8 @@ annotation (Placement(transformation(extent={{100,-10},{120,10}}), iconTransformation(extent={{100,-10},{120,10}}))); equation - Kelvin = Modelica.SIunits.Conversions.from_degC(Celsius); + Kelvin = Modelica.Units.Conversions.from_degC(Celsius); + annotation ( defaultComponentName="toDegC", Documentation(info=" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/IO/FLEXLAB/CalBayComm.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/IO/FLEXLAB/CalBayComm.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/IO/FLEXLAB/CalBayComm.mo" 2022-03-10 09:57:31.824143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/IO/FLEXLAB/CalBayComm.mo" 2022-03-10 09:58:33.792151194 +0000 @@ -3,7 +3,7 @@ "Model calling a Python script to communicate with the CalBay adapter" extends Modelica.Icons.Example; extends Modelica.Icons.UnderConstruction; - parameter Modelica.SIunits.Time samplePeriod = 30 + parameter Modelica.Units.SI.Time samplePeriod = 30 "Sample period for communication"; Modelica.Blocks.Sources.CombiTimeTable setPoint( @@ -32,7 +32,7 @@ annotation (Placement(transformation(extent={{0,-10},{20,10}}))); block lightingController "Block for control law" extends Modelica.Blocks.Interfaces.SISO; - parameter Modelica.SIunits.Time samplePeriod "Sample period of component"; + parameter Modelica.Units.SI.Time samplePeriod "Sample period of component"; Modelica.Blocks.Math.Gain gain(k=10) annotation (Placement(transformation(extent={{-68,-10},{-48,10}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/IO/Python27/Examples/KalmanFilter.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/IO/Python27/Examples/KalmanFilter.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/IO/Python27/Examples/KalmanFilter.mo" 2022-03-10 09:57:31.824143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/IO/Python27/Examples/KalmanFilter.mo" 2022-03-10 09:58:33.768151191 +0000 @@ -9,7 +9,7 @@ moduleName="KalmanFilter", samplePeriod=samplePeriod) "Generate a random number in Python" annotation (Placement(transformation(extent={{-40,0},{-20,20}}))); - Modelica.Blocks.Sources.Clock clock + Modelica.Blocks.Sources.ContinuousClock clock annotation (Placement(transformation(extent={{-80,0},{-60,20}}))); Real_Real kalFil( moduleName="KalmanFilter", @@ -19,9 +19,9 @@ samplePeriod=samplePeriod) "Kalman filter in Python" annotation (Placement(transformation(extent={{60,20},{80,40}}))); - parameter Modelica.SIunits.Time samplePeriod=0.001 + parameter Modelica.Units.SI.Time samplePeriod=0.001 "Sample period of component"; - Modelica.Blocks.Sources.Sine sine(freqHz=1) "Sine wave" + Modelica.Blocks.Sources.Sine sine(f =1) "Sine wave" annotation (Placement(transformation(extent={{-40,40},{-20,60}}))); Modelica.Blocks.Math.Add add annotation (Placement(transformation(extent={{20,20},{40,40}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Math/Examples/SmoothBlocks.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Math/Examples/SmoothBlocks.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Math/Examples/SmoothBlocks.mo" 2022-03-10 09:57:31.824143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Math/Examples/SmoothBlocks.mo" 2022-03-10 09:58:33.492151157 +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/Buildings 3.0.0/Utilities/Math/Examples/SmoothLimit.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Math/Examples/SmoothLimit.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Math/Examples/SmoothLimit.mo" 2022-03-10 09:57:31.824143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Math/Examples/SmoothLimit.mo" 2022-03-10 09:58:33.468151153 +0000 @@ -1,7 +1,7 @@ within Buildings.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}}))); Buildings.Utilities.Math.SmoothLimit smoLim( deltaX=0.001, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Math/Examples/Splice.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Math/Examples/Splice.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Math/Examples/Splice.mo" 2022-03-10 09:57:31.824143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Math/Examples/Splice.mo" 2022-03-10 09:58:33.452151151 +0000 @@ -3,7 +3,7 @@ extends Modelica.Icons.Example; Buildings.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/Buildings 3.0.0/Utilities/Math/Examples/VectorFunctions.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Math/Examples/VectorFunctions.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Math/Examples/VectorFunctions.mo" 2022-03-10 09:57:31.824143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Math/Examples/VectorFunctions.mo" 2022-03-10 09:58:33.444151150 +0000 @@ -5,12 +5,12 @@ Buildings.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}}))); Buildings.Utilities.Math.Max maxVec( nin=3) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/BaseClasses/HumidityRatioVaporPressure.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/BaseClasses/HumidityRatioVaporPressure.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/BaseClasses/HumidityRatioVaporPressure.mo" 2022-03-10 09:57:31.824143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/BaseClasses/HumidityRatioVaporPressure.mo" 2022-03-10 09:58:32.848151075 +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/Buildings 3.0.0/Utilities/Psychrometrics/Constants.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Constants.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Constants.mo" 2022-03-10 09:57:31.824143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Constants.mo" 2022-03-10 09:58:32.836151073 +0000 @@ -2,13 +2,13 @@ package Constants "Library of constants for psychometric functions" extends Modelica.Icons.Package; - 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 evaporator of water"; constant Real k_mair = 0.6219647130774989 "Ratio of molar weights"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/Examples/DewPointTemperatureDerivativeCheck.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/Examples/DewPointTemperatureDerivativeCheck.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/Examples/DewPointTemperatureDerivativeCheck.mo" 2022-03-10 09:57:31.824143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/Examples/DewPointTemperatureDerivativeCheck.mo" 2022-03-10 09:58:32.644151050 +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/Buildings 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/Examples/DewPointTemperatureDerivativeCheck_amb.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/Examples/DewPointTemperatureDerivativeCheck_amb.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/Examples/DewPointTemperatureDerivativeCheck_amb.mo" 2022-03-10 09:57:31.824143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/Examples/DewPointTemperatureDerivativeCheck_amb.mo" 2022-03-10 09:58:32.636151048 +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/Buildings 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/Examples/InverseDewPointTemperatureDerivativeCheck_amb.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/Examples/InverseDewPointTemperatureDerivativeCheck_amb.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/Examples/InverseDewPointTemperatureDerivativeCheck_amb.mo" 2022-03-10 09:57:31.824143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/Examples/InverseDewPointTemperatureDerivativeCheck_amb.mo" 2022-03-10 09:58:32.632151048 +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/Buildings 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/Examples/SaturationPressureDerivativeCheck.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/Examples/SaturationPressureDerivativeCheck.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/Examples/SaturationPressureDerivativeCheck.mo" 2022-03-10 09:57:31.824143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/Examples/SaturationPressureDerivativeCheck.mo" 2022-03-10 09:58:32.624151046 +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/Buildings 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/Examples/WaterVaporPressureDerivativeCheck.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/Examples/WaterVaporPressureDerivativeCheck.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/Examples/WaterVaporPressureDerivativeCheck.mo" 2022-03-10 09:57:31.824143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/Examples/WaterVaporPressureDerivativeCheck.mo" 2022-03-10 09:58:32.616151045 +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/Buildings 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/der_TDewPoi_pW_amb.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/der_TDewPoi_pW_amb.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/der_TDewPoi_pW_amb.mo" 2022-03-10 09:57:31.824143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/der_TDewPoi_pW_amb.mo" 2022-03-10 09:58:32.612151044 +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/Buildings 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_TDewPoi.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_TDewPoi.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_TDewPoi.mo" 2022-03-10 09:57:31.824143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_TDewPoi.mo" 2022-03-10 09:58:32.604151044 +0000 @@ -1,7 +1,7 @@ within Buildings.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/Buildings 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_TDewPoi_amb.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_TDewPoi_amb.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_TDewPoi_amb.mo" 2022-03-10 09:57:31.824143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_TDewPoi_amb.mo" 2022-03-10 09:58:32.596151043 +0000 @@ -1,14 +1,14 @@ within Buildings.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/Buildings 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_X.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_X.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_X.mo" 2022-03-10 09:57:31.824143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_X.mo" 2022-03-10 09:58:32.588151043 +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/Buildings 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/der_saturationPressureLiquid.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/der_saturationPressureLiquid.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/der_saturationPressureLiquid.mo" 2022-03-10 09:57:31.824143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/der_saturationPressureLiquid.mo" 2022-03-10 09:58:32.580151040 +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/Buildings 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/der_sublimationPressureIce.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/der_sublimationPressureIce.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/der_sublimationPressureIce.mo" 2022-03-10 09:57:31.824143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/BaseClasses/der_sublimationPressureIce.mo" 2022-03-10 09:58:32.572151040 +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/Buildings 3.0.0/Utilities/Psychrometrics/Functions/Examples/Density_pTX.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/Examples/Density_pTX.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/Examples/Density_pTX.mo" 2022-03-10 09:57:31.824143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/Examples/Density_pTX.mo" 2022-03-10 09:58:32.560151038 +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/Buildings 3.0.0/Utilities/Psychrometrics/Functions/Examples/SaturationPressure.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/Examples/SaturationPressure.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/Examples/SaturationPressure.mo" 2022-03-10 09:57:31.824143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/Examples/SaturationPressure.mo" 2022-03-10 09:58:32.552151037 +0000 @@ -1,10 +1,10 @@ within Buildings.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/Buildings 3.0.0/Utilities/Psychrometrics/Functions/Examples/X_pSatpphi.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/Examples/X_pSatpphi.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/Examples/X_pSatpphi.mo" 2022-03-10 09:57:31.824143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/Examples/X_pSatpphi.mo" 2022-03-10 09:58:32.544151037 +0000 @@ -3,12 +3,12 @@ extends Modelica.Icons.Example; package Medium = Buildings.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/Buildings 3.0.0/Utilities/Psychrometrics/Functions/Examples/pW_TDewPoi.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/Examples/pW_TDewPoi.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/Examples/pW_TDewPoi.mo" 2022-03-10 09:57:31.824143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/Examples/pW_TDewPoi.mo" 2022-03-10 09:58:32.540151036 +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/Buildings 3.0.0/Utilities/Psychrometrics/Functions/Examples/pW_TDewPoi_comparison.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/Examples/pW_TDewPoi_comparison.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/Examples/pW_TDewPoi_comparison.mo" 2022-03-10 09:57:31.824143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/Examples/pW_TDewPoi_comparison.mo" 2022-03-10 09:58:32.532151035 +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/Buildings 3.0.0/Utilities/Psychrometrics/Functions/Examples/pW_X.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/Examples/pW_X.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/Examples/pW_X.mo" 2022-03-10 09:57:31.824143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/Examples/pW_X.mo" 2022-03-10 09:58:32.524151035 +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/Buildings 3.0.0/Utilities/Psychrometrics/Functions/Examples/phi_pTX.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/Examples/phi_pTX.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/Examples/phi_pTX.mo" 2022-03-10 09:57:31.824143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/Examples/phi_pTX.mo" 2022-03-10 09:58:32.488151030 +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/Buildings 3.0.0/Utilities/Psychrometrics/Functions/Internal.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/Internal.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/Internal.mo" 2022-03-10 09:57:31.824143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/Internal.mo" 2022-03-10 09:58:32.484151028 +0000 @@ -1,6 +1,6 @@ within Buildings.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/Buildings 3.0.0/Utilities/Psychrometrics/Functions/TDewPoi_pW.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/TDewPoi_pW.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/TDewPoi_pW.mo" 2022-03-10 09:57:31.824143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/TDewPoi_pW.mo" 2022-03-10 09:58:32.476151028 +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/Buildings 3.0.0/Utilities/Psychrometrics/Functions/TDewPoi_pW_amb.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/TDewPoi_pW_amb.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/TDewPoi_pW_amb.mo" 2022-03-10 09:57:31.824143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/TDewPoi_pW_amb.mo" 2022-03-10 09:58:32.472151027 +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/Buildings 3.0.0/Utilities/Psychrometrics/Functions/X_pSatpphi.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/X_pSatpphi.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/X_pSatpphi.mo" 2022-03-10 09:57:31.824143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/X_pSatpphi.mo" 2022-03-10 09:58:32.460151025 +0000 @@ -1,14 +1,14 @@ within Buildings.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/Buildings 3.0.0/Utilities/Psychrometrics/Functions/X_pW.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/X_pW.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/X_pW.mo" 2022-03-10 09:57:31.824143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/X_pW.mo" 2022-03-10 09:58:32.452151024 +0000 @@ -1,17 +1,17 @@ within Buildings.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/Buildings 3.0.0/Utilities/Psychrometrics/Functions/density_pTX.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/density_pTX.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/density_pTX.mo" 2022-03-10 09:57:31.824143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/density_pTX.mo" 2022-03-10 09:58:32.440151023 +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/Buildings 3.0.0/Utilities/Psychrometrics/Functions/pW_TDewPoi.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/pW_TDewPoi.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/pW_TDewPoi.mo" 2022-03-10 09:57:31.824143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/pW_TDewPoi.mo" 2022-03-10 09:58:32.428151021 +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/Buildings 3.0.0/Utilities/Psychrometrics/Functions/pW_TDewPoi_amb.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/pW_TDewPoi_amb.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/pW_TDewPoi_amb.mo" 2022-03-10 09:57:31.824143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/pW_TDewPoi_amb.mo" 2022-03-10 09:58:32.420151020 +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/Buildings 3.0.0/Utilities/Psychrometrics/Functions/pW_X.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/pW_X.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/pW_X.mo" 2022-03-10 09:57:31.824143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/pW_X.mo" 2022-03-10 09:58:32.408151019 +0000 @@ -1,15 +1,15 @@ within Buildings.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/Buildings 3.0.0/Utilities/Psychrometrics/Functions/phi_pTX.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/phi_pTX.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/phi_pTX.mo" 2022-03-10 09:57:31.824143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/phi_pTX.mo" 2022-03-10 09:58:32.400151018 +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/Buildings 3.0.0/Utilities/Psychrometrics/Functions/saturationPressure.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/saturationPressure.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/saturationPressure.mo" 2022-03-10 09:57:31.824143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/saturationPressure.mo" 2022-03-10 09:58:32.396151017 +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 := Buildings.Utilities.Math.Functions.regStep( y1=Buildings.Utilities.Psychrometrics.Functions.saturationPressureLiquid(TSat), diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/saturationPressureLiquid.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/saturationPressureLiquid.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/saturationPressureLiquid.mo" 2022-03-10 09:57:31.824143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/saturationPressureLiquid.mo" 2022-03-10 09:58:32.388151016 +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/Buildings 3.0.0/Utilities/Psychrometrics/Functions/sublimationPressureIce.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/sublimationPressureIce.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/sublimationPressureIce.mo" 2022-03-10 09:57:31.824143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/Functions/sublimationPressureIce.mo" 2022-03-10 09:58:32.380151016 +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/Buildings 3.0.0/Utilities/Psychrometrics/TWetBul_TDryBulPhi.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/TWetBul_TDryBulPhi.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/TWetBul_TDryBulPhi.mo" 2022-03-10 09:57:31.824143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/TWetBul_TDryBulPhi.mo" 2022-03-10 09:58:32.276151002 +0000 @@ -32,12 +32,12 @@ 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.Units.SI.MassFraction XiSat "Water vapor mass fraction at saturation"; equation if approximateWetBulb then TDryBul_degC = TDryBul - 273.15; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/TWetBul_TDryBulXi.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/TWetBul_TDryBulXi.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/TWetBul_TDryBulXi.mo" 2022-03-10 09:57:31.824143343 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/TWetBul_TDryBulXi.mo" 2022-03-10 09:58:32.256151000 +0000 @@ -32,11 +32,11 @@ 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"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/X_pTphi.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/X_pTphi.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/X_pTphi.mo" 2022-03-10 09:57:31.828143344 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/X_pTphi.mo" 2022-03-10 09:58:32.196150993 +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(min=1, fixed=false) "Index for water substance"; parameter Integer i_nw(min=1, fixed=false) "Index for non-water substance"; parameter Boolean found(fixed=false) "Flag, used for error checking"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/X_pW.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/X_pW.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/X_pW.mo" 2022-03-10 09:57:31.828143344 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/X_pW.mo" 2022-03-10 09:58:32.180150990 +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 = Buildings.Utilities.Psychrometrics.Functions.X_pW(p_w=p_w, p=p_in_internal); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/pW_X.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/pW_X.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/pW_X.mo" 2022-03-10 09:57:31.828143344 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Psychrometrics/pW_X.mo" 2022-03-10 09:58:32.156150987 +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/Buildings 3.0.0/Utilities/Reports/Examples/Printer.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Reports/Examples/Printer.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Reports/Examples/Printer.mo" 2022-03-10 09:57:31.828143344 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/Utilities/Reports/Examples/Printer.mo" 2022-03-10 09:58:32.132150984 +0000 @@ -6,7 +6,7 @@ nin=2, samplePeriod=0.1) annotation (Placement(transformation(extent={{-20,40}, {0,60}}))); - Modelica.Blocks.Sources.Clock clo annotation (Placement(transformation(extent= + Modelica.Blocks.Sources.ContinuousClock clo annotation (Placement(transformation(extent= {{-80,40},{-60,60}}))); Modelica.Blocks.Sources.Ramp ram(duration=2) annotation (Placement(transformation(extent= diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/openmodelica.metadata.json" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/openmodelica.metadata.json" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/openmodelica.metadata.json" 2022-03-10 09:57:31.828143344 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/openmodelica.metadata.json" 2022-03-10 09:58:58.196154285 +0000 @@ -1 +1 @@ -{"convertFromVersion":["2.0.0", "2.1.0"], "path":"Buildings", "sha":"15ed829ec502f4b99e4875bf96f1e64a71476192", "support":"obsolete", "uses":{"Modelica":"3.2.1", "Modelica_StateGraph2":"2.0.2"}, "version":"3.0.0", "zipfile":"https://github.com/lbl-srg/modelica-buildings/archive/15ed829ec502f4b99e4875bf96f1e64a71476192.zip"} +{"convertFromVersion": ["2.0.0", "2.1.0"], "path": "Buildings", "sha": "15ed829ec502f4b99e4875bf96f1e64a71476192", "support": "obsolete", "uses": {"Modelica": "4.0.0", "Modelica_StateGraph2": "2.0.2"}, "version": "3.0.0", "zipfile": "https://github.com/lbl-srg/modelica-buildings/archive/15ed829ec502f4b99e4875bf96f1e64a71476192.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/Buildings 3.0.0/package.mo" "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/package.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 3.0.0/package.mo" 2022-03-10 09:57:31.828143344 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 3.0.0/package.mo" 2022-03-10 09:58:34.272151255 +0000 @@ -5635,8 +5635,7 @@ version="3.0.0", versionDate="2016-03-29", dateModified="2016-03-29", -uses(Modelica(version="3.2.1"), - Modelica_StateGraph2(version="2.0.2")), +uses(Modelica(version = "4.0.0")), conversion( from(version={"2.0.0", "2.1.0"}, script="modelica://Buildings/Resources/Scripts/Dymola/ConvertBuildings_from_2.1_to_3.0.mos")),