diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Air/Systems/SingleZone/VAV/BaseClasses/ControllerChillerDXHeatingEconomizer.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Air/Systems/SingleZone/VAV/BaseClasses/ControllerChillerDXHeatingEconomizer.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Air/Systems/SingleZone/VAV/BaseClasses/ControllerChillerDXHeatingEconomizer.mo" 2022-03-10 09:57:40.156144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Air/Systems/SingleZone/VAV/BaseClasses/ControllerChillerDXHeatingEconomizer.mo" 2022-03-10 09:59:03.340154935 +0000 @@ -3,7 +3,7 @@ "Controller for single zone VAV system" extends Modelica.Blocks.Icons.Block; - parameter Modelica.SIunits.Temperature TSupChi_nominal + parameter Modelica.Units.SI.Temperature TSupChi_nominal "Design value for chiller leaving water temperature"; parameter Real minAirFlo( final min=0, @@ -11,10 +11,10 @@ final unit="1") "Minimum airflow fraction of system" annotation(Dialog(group="Setpoints")); - parameter Modelica.SIunits.DimensionlessRatio minOAFra + parameter Modelica.Units.SI.DimensionlessRatio minOAFra "Minimum outdoor air fraction of system" annotation(Dialog(group="Setpoints")); - parameter Modelica.SIunits.Temperature TSetSupAir + parameter Modelica.Units.SI.Temperature TSetSupAir "Cooling supply air temperature setpoint" annotation(Dialog(group="Setpoints")); parameter Buildings.Controls.OBC.CDL.Types.SimpleController controllerTypeHea= diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Air/Systems/SingleZone/VAV/BaseClasses/Validation/ControllerChillerDXHeatingEconomizer.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Air/Systems/SingleZone/VAV/BaseClasses/Validation/ControllerChillerDXHeatingEconomizer.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Air/Systems/SingleZone/VAV/BaseClasses/Validation/ControllerChillerDXHeatingEconomizer.mo" 2022-03-10 09:57:40.156144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Air/Systems/SingleZone/VAV/BaseClasses/Validation/ControllerChillerDXHeatingEconomizer.mo" 2022-03-10 09:59:03.272154928 +0000 @@ -5,16 +5,16 @@ Modelica.Blocks.Sources.Sine mixAirTem( amplitude=7.5, - freqHz=1/86400, +f =1/86400, offset=20 + 273.15) "Mixed air temperature" annotation (Placement(transformation(extent={{-100,80},{-80,100}}))); Modelica.Blocks.Sources.Sine retAirTem( amplitude=10, - freqHz=1/86400, +f =1/86400, offset=21 + 273.15) "Return air temperature" annotation (Placement(transformation(extent={{-100,-70},{-80,-50}}))); Modelica.Blocks.Sources.Sine outAirTem( - freqHz=1/86400, + f =1/86400, amplitude=6, offset=18 + 273.15) "Measured outdoor air temperature" annotation (Placement(transformation(extent={{-100,-40},{-80,-20}}))); @@ -51,7 +51,7 @@ annotation (Placement(transformation(extent={{-100,-10},{-80,10}}))); Modelica.Blocks.Sources.Sine supAirTem( amplitude=7, - freqHz=1/86400, +f =1/86400, offset=13 + 273.15) "Supply air temperature" annotation (Placement(transformation(extent={{-100,-100},{-80,-80}}))); equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Air/Systems/SingleZone/VAV/BaseClasses/Validation/ControllerEconomizer.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Air/Systems/SingleZone/VAV/BaseClasses/Validation/ControllerEconomizer.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Air/Systems/SingleZone/VAV/BaseClasses/Validation/ControllerEconomizer.mo" 2022-03-10 09:57:40.156144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Air/Systems/SingleZone/VAV/BaseClasses/Validation/ControllerEconomizer.mo" 2022-03-10 09:59:03.252154924 +0000 @@ -7,26 +7,26 @@ annotation (Placement(transformation(extent={{40,-10},{60,10}}))); Modelica.Blocks.Sources.Sine mixAirTem( amplitude=7.5, - freqHz=1/86400, +f =1/86400, offset=20 + 273.15) "Mixed air temperature" annotation (Placement(transformation(extent={{-80,40},{-60,60}}))); Modelica.Blocks.Sources.Sine retAirTem( amplitude=4, - freqHz=1/86400, +f =1/86400, offset=21 + 273.15) "Return air temperature" annotation (Placement(transformation(extent={{-80,10},{-60,30}}))); Modelica.Blocks.Sources.Sine mixAirTemSet( amplitude=5, - freqHz=1/86400, +f =1/86400, offset=20 + 273.15) "Mixed air temperature setpoint" annotation (Placement(transformation(extent={{-80,70},{-60,90}}))); Modelica.Blocks.Sources.Sine minOutAirFra( - freqHz=1/86400, + f =1/86400, offset=0.2, amplitude=0.15) "Minimum outdoor air fraction" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); Modelica.Blocks.Sources.Sine outAirTem( - freqHz=1/86400, + f =1/86400, amplitude=6, offset=18 + 273.15) "Measured outdoor air temperature" annotation (Placement(transformation(extent={{-80,-60},{-60,-40}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Air/Systems/SingleZone/VAV/BaseClasses/Validation/ControllerHeatingFan.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Air/Systems/SingleZone/VAV/BaseClasses/Validation/ControllerHeatingFan.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Air/Systems/SingleZone/VAV/BaseClasses/Validation/ControllerHeatingFan.mo" 2022-03-10 09:57:40.156144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Air/Systems/SingleZone/VAV/BaseClasses/Validation/ControllerHeatingFan.mo" 2022-03-10 09:59:03.224154921 +0000 @@ -6,25 +6,25 @@ conHeaFan(minAirFlo=0.6) "Controller for heating and cooling" annotation (Placement(transformation(extent={{20,-10},{40,10}}))); + Modelica.Blocks.Sources.Sine zonHeaSet( - freqHz=1/86400, + f =1/86400, offset=20 + 273.15, amplitude=1) "Zone heating setpoint" annotation (Placement(transformation(extent={{-60,20},{-40,40}}))); Modelica.Blocks.Sources.Sine zonCooSet( - freqHz=1/86400, + f =1/86400, amplitude=2, offset=25 + 273.15) "Zone cooling setpoint" annotation (Placement(transformation(extent={{-60,-10},{-40,10}}))); Modelica.Blocks.Sources.Sine zonTem( amplitude=4, - freqHz=1/86400, +f =1/86400, offset=21 + 273.15) "Zone temperature" annotation (Placement(transformation(extent={{-60,-40},{-40,-20}}))); - equation connect(zonHeaSet.y, conHeaFan.TSetRooHea) annotation (Line(points={{-39,30},{ -20,30},{0,30},{0,6},{19,6}}, color={0,0,127})); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Air/Systems/SingleZone/VAV/ChillerDXHeatingEconomizer.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Air/Systems/SingleZone/VAV/ChillerDXHeatingEconomizer.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Air/Systems/SingleZone/VAV/ChillerDXHeatingEconomizer.mo" 2022-03-10 09:57:40.156144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Air/Systems/SingleZone/VAV/ChillerDXHeatingEconomizer.mo" 2022-03-10 09:59:03.124154908 +0000 @@ -7,30 +7,30 @@ replaceable package MediumW = Buildings.Media.Water "Medium model for water" annotation (choicesAllMatching = true); - parameter Modelica.SIunits.DimensionlessRatio COP_nominal = 5.5 + parameter Modelica.Units.SI.DimensionlessRatio COP_nominal = 5.5 "Nominal COP of the chiller"; - parameter Modelica.SIunits.Temperature TSupChi_nominal + parameter Modelica.Units.SI.Temperature TSupChi_nominal "Design value for chiller leaving water temperature"; - parameter Modelica.SIunits.MassFlowRate mAir_flow_nominal + parameter Modelica.Units.SI.MassFlowRate mAir_flow_nominal "Design airflow rate of system" annotation(Dialog(group="Air design")); - parameter Modelica.SIunits.Power QHea_flow_nominal(min=0) + parameter Modelica.Units.SI.Power QHea_flow_nominal(min=0) "Design capacity of heating coil" annotation(Dialog(group="Heating design")); parameter Real etaHea_nominal(min=0, max=1, unit="1") "Design heating efficiency of the heating coil" annotation(Dialog(group="Heating design")); - parameter Modelica.SIunits.Power QCoo_flow_nominal(max=0) + parameter Modelica.Units.SI.Power QCoo_flow_nominal(max=0) "Design capacity of cooling coil" annotation(Dialog(group="Cooling design")); - parameter Modelica.SIunits.PressureDifference dp_nominal( + parameter Modelica.Units.SI.PressureDifference dp_nominal( displayUnit="Pa") = 500 "Design pressure drop of flow leg with fan" annotation(Dialog(group="Air design")); - final parameter Modelica.SIunits.MassFlowRate mChiEva_flow_nominal= + final parameter Modelica.Units.SI.MassFlowRate mChiEva_flow_nominal= -QCoo_flow_nominal/Buildings.Utilities.Psychrometrics.Constants.cpWatLiq/4 "Design chilled water supply flow"; - final parameter Modelica.SIunits.MassFlowRate mChiCon_flow_nominal= + final parameter Modelica.Units.SI.MassFlowRate mChiCon_flow_nominal= -QCoo_flow_nominal*(1+1/COP_nominal)/Buildings.Utilities.Psychrometrics.Constants.cpAir/10 "Design condenser air flow"; @@ -276,12 +276,13 @@ annotation (Placement(transformation(extent={{40,-50},{20,-30}}))); protected + model IdealValve extends Modelica.Blocks.Icons.Block; replaceable package Medium = Modelica.Media.Interfaces.PartialMedium "Medium in the component" annotation (choicesAllMatching = true); - parameter Modelica.SIunits.MassFlowRate m_flow_nominal + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal "Design chilled water supply flow"; Modelica.Fluid.Interfaces.FluidPort_a port_1( redeclare package Medium = Medium) annotation (Placement(transformation(extent={{50,88}, @@ -366,7 +367,6 @@ fillColor={0,0,0}, fillPattern=FillPattern.Solid)})); end IdealValve; - equation connect(fanSup.port_b, totalRes.port_a) annotation (Line(points={{-10,40},{10,40}}, color={0,127,255})); connect(fanSup.P, PFan) annotation (Line(points={{-9,49},{-6,49},{-6,160},{212, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Air/Systems/SingleZone/VAV/Examples/BaseClasses/PartialOpenLoop.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Air/Systems/SingleZone/VAV/Examples/BaseClasses/PartialOpenLoop.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Air/Systems/SingleZone/VAV/Examples/BaseClasses/PartialOpenLoop.mo" 2022-03-10 09:57:40.156144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Air/Systems/SingleZone/VAV/Examples/BaseClasses/PartialOpenLoop.mo" 2022-03-10 09:59:02.980154889 +0000 @@ -6,7 +6,7 @@ "Buildings library air media package with CO2"; package MediumW = Buildings.Media.Water "Buildings library air media package"; - parameter Modelica.SIunits.Temperature TSupChi_nominal=279.15 + parameter Modelica.Units.SI.Temperature TSupChi_nominal=279.15 "Design value for chiller leaving water temperature"; Buildings.Air.Systems.SingleZone.VAV.ChillerDXHeatingEconomizer hvac( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Air/Systems/SingleZone/VAV/Examples/BaseClasses/Room.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Air/Systems/SingleZone/VAV/Examples/BaseClasses/Room.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Air/Systems/SingleZone/VAV/Examples/BaseClasses/Room.mo" 2022-03-10 09:57:40.156144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Air/Systems/SingleZone/VAV/Examples/BaseClasses/Room.mo" 2022-03-10 09:59:02.968154888 +0000 @@ -3,22 +3,22 @@ "BESTest Case 600 with fluid ports for air HVAC and internal load" replaceable package MediumA = Buildings.Media.Air "Medium model"; - parameter Modelica.SIunits.MassFlowRate mAir_flow_nominal + parameter Modelica.Units.SI.MassFlowRate mAir_flow_nominal "Design airflow rate of system"; - parameter Modelica.SIunits.Angle lat "Building latitude"; - parameter Modelica.SIunits.Angle S_= + parameter Modelica.Units.SI.Angle lat "Building latitude"; + 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 8.1.0/Air/Systems/SingleZone/VAV/Examples/ChillerDXHeatingEconomizer.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Air/Systems/SingleZone/VAV/Examples/ChillerDXHeatingEconomizer.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Air/Systems/SingleZone/VAV/Examples/ChillerDXHeatingEconomizer.mo" 2022-03-10 09:57:40.156144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Air/Systems/SingleZone/VAV/Examples/ChillerDXHeatingEconomizer.mo" 2022-03-10 09:59:02.928154883 +0000 @@ -5,7 +5,7 @@ extends Buildings.Air.Systems.SingleZone.VAV.Examples.BaseClasses.PartialOpenLoop( hvac(QCoo_flow_nominal=-10000)); - parameter Modelica.SIunits.Temperature TSupChi_nominal=279.15 + parameter Modelica.Units.SI.Temperature TSupChi_nominal=279.15 "Design value for chiller leaving water temperature"; Buildings.Air.Systems.SingleZone.VAV.BaseClasses.ControllerChillerDXHeatingEconomizer con( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Air/Systems/SingleZone/VAV/Examples/Guideline36.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Air/Systems/SingleZone/VAV/Examples/Guideline36.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Air/Systems/SingleZone/VAV/Examples/Guideline36.mo" 2022-03-10 09:57:40.156144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Air/Systems/SingleZone/VAV/Examples/Guideline36.mo" 2022-03-10 09:59:02.908154881 +0000 @@ -5,7 +5,7 @@ extends Buildings.Air.Systems.SingleZone.VAV.Examples.BaseClasses.PartialOpenLoop( hvac(QCoo_flow_nominal=-10000)); - parameter Modelica.SIunits.Temperature TSupChi_nominal=279.15 + parameter Modelica.Units.SI.Temperature TSupChi_nominal=279.15 "Design value for chiller leaving water temperature"; Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.SingleZone.VAV.Controller con( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/BaseClasses/Door.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/BaseClasses/Door.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/BaseClasses/Door.mo" 2022-03-10 09:57:40.156144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/BaseClasses/Door.mo" 2022-03-10 09:59:02.872154876 +0000 @@ -16,29 +16,29 @@ annotation (choices( choice(redeclare package Medium = Buildings.Media.Air "Moist air"))); - parameter Modelica.SIunits.Length wOpe=0.9 "Width of opening" + parameter Modelica.Units.SI.Length wOpe=0.9 "Width of opening" annotation (Dialog(group="Geometry")); - parameter Modelica.SIunits.Length hOpe=2.1 "Height of opening" + parameter Modelica.Units.SI.Length hOpe=2.1 "Height of opening" annotation (Dialog(group="Geometry")); - parameter Modelica.SIunits.PressureDifference dp_turbulent( + parameter Modelica.Units.SI.PressureDifference dp_turbulent( min=0, displayUnit="Pa") = 0.01 "Pressure difference where laminar and turbulent flow relation coincide" annotation(Dialog(tab="Advanced")); - Modelica.SIunits.VolumeFlowRate VAB_flow(nominal=0.001) + Modelica.Units.SI.VolumeFlowRate VAB_flow(nominal=0.001) "Volume flow rate from A to B if positive"; - Modelica.SIunits.VolumeFlowRate VBA_flow(nominal=0.001) + Modelica.Units.SI.VolumeFlowRate VBA_flow(nominal=0.001) "Volume flow rate from B to A if positive"; - input Modelica.SIunits.Velocity vAB(nominal=0.01) "Average velocity from A to B"; - input Modelica.SIunits.Velocity vBA(nominal=0.01) "Average velocity from B to A"; + input Modelica.Units.SI.Velocity vAB(nominal=0.01) "Average velocity from A to B"; + input Modelica.Units.SI.Velocity vBA(nominal=0.01) "Average velocity from B to A"; protected - final parameter Modelica.SIunits.Area AOpe = wOpe*hOpe "Open aperture area"; + final parameter Modelica.Units.SI.Area AOpe = wOpe*hOpe "Open aperture area"; - constant Real conTP = Buildings.Media.Air.dStp*Modelica.Media.IdealGases.Common.SingleGasesData.Air.R + constant Real conTP = Buildings.Media.Air.dStp* Modelica.Media.IdealGases.Common.SingleGasesData.Air.R_s "Conversion factor for converting temperature difference to pressure difference"; parameter Medium.ThermodynamicState sta_default=Medium.setState_pTX( @@ -46,14 +46,14 @@ 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"; - Modelica.SIunits.VolumeFlowRate VABp_flow(nominal=0.001) + Modelica.Units.SI.VolumeFlowRate VABp_flow(nominal=0.001) "Volume flow rate from A to B if positive due to static pressure difference"; - Modelica.SIunits.MassFlowRate mABt_flow(nominal=0.001) + Modelica.Units.SI.MassFlowRate mABt_flow(nominal=0.001) "Mass flow rate from A to B if positive due to buoyancy"; - equation // Net flow rate port_a1.m_flow = (rho_default * VABp_flow/2 + mABt_flow); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/BaseClasses/DoorDiscretized.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/BaseClasses/DoorDiscretized.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/BaseClasses/DoorDiscretized.mo" 2022-03-10 09:57:40.156144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/BaseClasses/DoorDiscretized.mo" 2022-03-10 09:59:02.860154874 +0000 @@ -5,27 +5,27 @@ parameter Integer nCom=10 "Number of compartments for the discretization"; - parameter Modelica.SIunits.PressureDifference dp_turbulent( + parameter Modelica.Units.SI.PressureDifference dp_turbulent( min=0, displayUnit="Pa") = 0.01 "Pressure difference where laminar and turbulent flow relation coincide. Recommended: 0.01"; - Modelica.SIunits.PressureDifference dpAB[nCom](each nominal=1) + Modelica.Units.SI.PressureDifference dpAB[nCom](each nominal=1) "Pressure difference between compartments"; - Modelica.SIunits.Velocity v[nCom](each nominal=0.01) + Modelica.Units.SI.Velocity v[nCom](each nominal=0.01) "Velocity in compartment from A to B"; - Modelica.SIunits.Velocity vTop "Velocity at top of opening from A to B"; - Modelica.SIunits.Velocity vBot "Velocity at bottom of opening from A to B"; + Modelica.Units.SI.Velocity vTop "Velocity at top of opening from A to B"; + Modelica.Units.SI.Velocity vBot "Velocity at bottom of opening from A to B"; protected - parameter Modelica.SIunits.Length dh=hOpe/nCom "Height of each compartment"; + parameter Modelica.Units.SI.Length dh=hOpe/nCom "Height of each compartment"; 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 Real hAg[nCom](each unit="m2/s2")= @@ -35,23 +35,23 @@ parameter Real hBg[nCom](each unit="m2/s2")= {Modelica.Constants.g_n*(hB - (i - 0.5)*dh) for i in 1:nCom} "Product g*h_i for each compartment"; - Modelica.SIunits.AbsolutePressure pA[nCom](each nominal=101325) + Modelica.Units.SI.AbsolutePressure pA[nCom](each nominal=101325) "Pressure in compartments of room A"; - Modelica.SIunits.AbsolutePressure pB[nCom](each nominal=101325) + Modelica.Units.SI.AbsolutePressure pB[nCom](each nominal=101325) "Pressure in compartments of room B"; - Modelica.SIunits.VolumeFlowRate dV_flow[nCom] + Modelica.Units.SI.VolumeFlowRate dV_flow[nCom] "Volume flow rate through compartment from A to B"; - Modelica.SIunits.VolumeFlowRate dVAB_flow[nCom] + Modelica.Units.SI.VolumeFlowRate dVAB_flow[nCom] "Volume flow rate through compartment from A to B if positive"; - Modelica.SIunits.VolumeFlowRate dVBA_flow[nCom] + Modelica.Units.SI.VolumeFlowRate dVBA_flow[nCom] "Volume flow rate through compartment from B to A if positive"; - Modelica.SIunits.VolumeFlowRate VZerCom_flow = VZer_flow/nCom + Modelica.Units.SI.VolumeFlowRate VZerCom_flow = VZer_flow/nCom "Small flow rate for regularization"; Real m(min=0.5, max=1) "Flow exponent, m=0.5 for turbulent, m=1 for laminar"; Real kVal "Flow coefficient for each compartment, k = V_flow/ dp^m"; - Modelica.SIunits.Area dA "Compartment area"; + Modelica.Units.SI.Area dA "Compartment area"; Real gaiFlo[nCom] "Gain to sum up the positive flows and set the negative to zero in a differentiable way"; equation dA = A/nCom; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/BaseClasses/Examples/PowerLaw.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/BaseClasses/Examples/PowerLaw.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/BaseClasses/Examples/PowerLaw.mo" 2022-03-10 09:57:40.156144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/BaseClasses/Examples/PowerLaw.mo" 2022-03-10 09:59:02.828154870 +0000 @@ -5,11 +5,11 @@ parameter Real m(min=0.5, max=1) = 0.5 "Flow exponent, m=0.5 for turbulent, m=1 for laminar"; - parameter Modelica.SIunits.PressureDifference dp_turbulent(min=0)=5 + parameter Modelica.Units.SI.PressureDifference dp_turbulent(min=0)=5 "Pressure difference where regularization starts"; - Modelica.SIunits.PressureDifference dp "Pressure difference"; - Modelica.SIunits.VolumeFlowRate V_flow "Volume flow rate"; + Modelica.Units.SI.PressureDifference dp "Pressure difference"; + Modelica.Units.SI.VolumeFlowRate V_flow "Volume flow rate"; equation dp = 10*(-1+2*time); V_flow = Buildings.Airflow.Multizone.BaseClasses.powerLaw( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/BaseClasses/Examples/PowerLawFixedM.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/BaseClasses/Examples/PowerLawFixedM.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/BaseClasses/Examples/PowerLawFixedM.mo" 2022-03-10 09:57:40.156144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/BaseClasses/Examples/PowerLawFixedM.mo" 2022-03-10 09:59:02.820154869 +0000 @@ -5,13 +5,13 @@ constant Real m(min=0.5, max=1) = 0.5 "Flow exponent, m=0.5 for turbulent, m=1 for laminar"; - parameter Modelica.SIunits.PressureDifference dp_turbulent(min=0)=5 + parameter Modelica.Units.SI.PressureDifference dp_turbulent(min=0)=5 "Pressure difference where regularization starts"; - Modelica.SIunits.PressureDifference dp "Pressure difference"; - Modelica.SIunits.VolumeFlowRate V_flow + Modelica.Units.SI.PressureDifference dp "Pressure difference"; + Modelica.Units.SI.VolumeFlowRate V_flow "Volume flow rate computed with model powerLaw"; - Modelica.SIunits.VolumeFlowRate VFixed_flow + Modelica.Units.SI.VolumeFlowRate VFixed_flow "Volume flow rate computed with model powerLawFixed"; constant Real gamma(min=1) = 1.5 diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/BaseClasses/Examples/WindPressureLowRise.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/BaseClasses/Examples/WindPressureLowRise.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/BaseClasses/Examples/WindPressureLowRise.mo" 2022-03-10 09:57:40.156144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/BaseClasses/Examples/WindPressureLowRise.mo" 2022-03-10 09:59:02.812154869 +0000 @@ -3,7 +3,7 @@ extends Modelica.Icons.Example; parameter Real Cp0 = 0.6 "Wind pressure coefficient for normal wind incidence angle"; - Modelica.SIunits.Angle incAng "Wind incidence angle (0: normal to wall)"; + Modelica.Units.SI.Angle incAng "Wind incidence angle (0: normal to wall)"; parameter Real G = Modelica.Math.log(0.5) "Natural logarithm of side ratio"; Real Cp "Wind pressure coefficient"; equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/BaseClasses/PowerLawResistance.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/BaseClasses/PowerLawResistance.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/BaseClasses/PowerLawResistance.mo" 2022-03-10 09:57:40.156144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/BaseClasses/PowerLawResistance.mo" 2022-03-10 09:59:02.808154868 +0000 @@ -14,14 +14,14 @@ parameter Boolean useDefaultProperties=true "Set to false to use density and viscosity based on actual medium state, rather than using default values" annotation(Evaluate=true, Dialog(tab="Advanced")); - parameter Modelica.SIunits.PressureDifference dp_turbulent(min=0, displayUnit="Pa") = 0.1 + parameter Modelica.Units.SI.PressureDifference dp_turbulent(min=0, displayUnit="Pa") = 0.1 "Pressure difference where laminar and turbulent flow relation coincide. Recommended = 0.1" annotation(Dialog(tab="Advanced")); - Modelica.SIunits.VolumeFlowRate V_flow + Modelica.Units.SI.VolumeFlowRate V_flow "Volume flow rate through the component"; - Modelica.SIunits.Velocity v(nominal=1) "Average velocity"; - Modelica.SIunits.Density rho "Fluid density at port_a"; + Modelica.Units.SI.Velocity v(nominal=1) "Average velocity"; + Modelica.Units.SI.Density rho "Fluid density at port_a"; protected constant Real gamma(min=1) = 1.5 @@ -34,9 +34,9 @@ p=Medium.p_default, X=Medium.X_default) "State of the medium at the medium default properties"; - parameter Modelica.SIunits.Density rho_default=Medium.density(sta_default) + parameter Modelica.Units.SI.Density rho_default=Medium.density(sta_default) "Density at the medium default properties"; - parameter Modelica.SIunits.DynamicViscosity dynVis_default= + parameter Modelica.Units.SI.DynamicViscosity dynVis_default= Medium.dynamicViscosity(sta_default) "Dynamic viscosity at the medium default properties"; @@ -50,7 +50,7 @@ "Polynomial coefficient for regularized implementation of flow resistance"; Medium.ThermodynamicState sta "State of the medium in the component"; - Modelica.SIunits.DynamicViscosity dynVis "Dynamic viscosity"; + Modelica.Units.SI.DynamicViscosity dynVis "Dynamic viscosity"; Real mExc(quantity="Mass", final unit="kg") "Air mass exchanged (for purpose of error control only)"; initial equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/BaseClasses/TwoWayFlowElement.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/BaseClasses/TwoWayFlowElement.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/BaseClasses/TwoWayFlowElement.mo" 2022-03-10 09:57:40.156144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/BaseClasses/TwoWayFlowElement.mo" 2022-03-10 09:59:02.796154866 +0000 @@ -16,34 +16,34 @@ annotation (choices( choice(redeclare package Medium = Buildings.Media.Air "Moist air"))); - parameter Modelica.SIunits.Velocity vZer=0.001 + parameter Modelica.Units.SI.Velocity vZer=0.001 "Minimum velocity to prevent zero flow. Recommended: 0.001"; - Modelica.SIunits.VolumeFlowRate VAB_flow(nominal=0.001) + Modelica.Units.SI.VolumeFlowRate VAB_flow(nominal=0.001) "Volume flow rate from A to B if positive"; - Modelica.SIunits.VolumeFlowRate VBA_flow(nominal=0.001) + Modelica.Units.SI.VolumeFlowRate VBA_flow(nominal=0.001) "Volume flow rate from B to A if positive"; - Modelica.SIunits.MassFlowRate mAB_flow(nominal=0.001) + Modelica.Units.SI.MassFlowRate mAB_flow(nominal=0.001) "Mass flow rate from A to B if positive"; - Modelica.SIunits.MassFlowRate mBA_flow(nominal=0.001) + Modelica.Units.SI.MassFlowRate mBA_flow(nominal=0.001) "Mass flow rate from B to A if positive"; - Modelica.SIunits.Velocity vAB(nominal=0.01) "Average velocity from A to B"; - Modelica.SIunits.Velocity vBA(nominal=0.01) "Average velocity from B to A"; + Modelica.Units.SI.Velocity vAB(nominal=0.01) "Average velocity from A to B"; + Modelica.Units.SI.Velocity vBA(nominal=0.01) "Average velocity from B to A"; - Modelica.SIunits.Density rho_a1_inflow + Modelica.Units.SI.Density rho_a1_inflow "Density of air flowing in from port_a1"; - Modelica.SIunits.Density rho_a2_inflow + Modelica.Units.SI.Density rho_a2_inflow "Density of air flowing in from port_a2"; - Modelica.SIunits.Area A "Face area"; + Modelica.Units.SI.Area A "Face area"; protected - Modelica.SIunits.VolumeFlowRate VZer_flow(fixed=false) + Modelica.Units.SI.VolumeFlowRate VZer_flow(fixed=false) "Minimum net volume flow rate to prevent zero flow"; - Modelica.SIunits.Mass mExcAB(start=0, fixed=true) + Modelica.Units.SI.Mass mExcAB(start=0, fixed=true) "Air mass exchanged (for purpose of error control only)"; - Modelica.SIunits.Mass mExcBA(start=0, fixed=true) + Modelica.Units.SI.Mass mExcBA(start=0, fixed=true) "Air mass exchanged (for purpose of error control only)"; Medium.MassFraction Xi_a1_inflow[Medium1.nXi] diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/BaseClasses/TwoWayFlowElementBuoyancy.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/BaseClasses/TwoWayFlowElementBuoyancy.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/BaseClasses/TwoWayFlowElementBuoyancy.mo" 2022-03-10 09:57:40.156144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/BaseClasses/TwoWayFlowElementBuoyancy.mo" 2022-03-10 09:59:02.784154865 +0000 @@ -3,18 +3,18 @@ "Flow resistance that uses the power law" extends Buildings.Airflow.Multizone.BaseClasses.TwoWayFlowElement; - parameter Modelica.SIunits.Length wOpe=0.9 "Width of opening" + + parameter Modelica.Units.SI.Length wOpe=0.9 "Width of opening" annotation (Dialog(group="Geometry")); - parameter Modelica.SIunits.Length hOpe=2.1 "Height of opening" + parameter Modelica.Units.SI.Length hOpe=2.1 "Height of opening" annotation (Dialog(group="Geometry")); - parameter Modelica.SIunits.Length hA=2.7/2 + parameter Modelica.Units.SI.Length hA=2.7/2 "Height of reference pressure zone A" annotation (Dialog(group="Geometry")); - parameter Modelica.SIunits.Length hB=2.7/2 + parameter Modelica.Units.SI.Length hB=2.7/2 "Height of reference pressure zone B" annotation (Dialog(group="Geometry")); - annotation (Documentation(info="

This is a partial model for models that describe the bi-directional diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/BaseClasses/powerLaw.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/BaseClasses/powerLaw.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/BaseClasses/powerLaw.mo" 2022-03-10 09:57:40.156144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/BaseClasses/powerLaw.mo" 2022-03-10 09:59:02.772154863 +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 8.1.0/Airflow/Multizone/BaseClasses/powerLawFixedM.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/BaseClasses/powerLawFixedM.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/BaseClasses/powerLawFixedM.mo" 2022-03-10 09:57:40.156144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/BaseClasses/powerLawFixedM.mo" 2022-03-10 09:59:02.764154862 +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 8.1.0/Airflow/Multizone/BaseClasses/windPressureLowRise.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/BaseClasses/windPressureLowRise.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/BaseClasses/windPressureLowRise.mo" 2022-03-10 09:57:40.156144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/BaseClasses/windPressureLowRise.mo" 2022-03-10 09:59:02.756154861 +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 8.1.0/Airflow/Multizone/DoorDiscretizedOperable.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/DoorDiscretizedOperable.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/DoorDiscretizedOperable.mo" 2022-03-10 09:57:40.156144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/DoorDiscretizedOperable.mo" 2022-03-10 09:59:02.724154858 +0000 @@ -3,7 +3,7 @@ "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 "Pressure drop at rating condition of closed door" annotation (Dialog(group="Rating conditions")); @@ -12,7 +12,7 @@ "Discharge coefficient at rating conditions of closed door" annotation (Dialog(group="Rating conditions")); - parameter Modelica.SIunits.Area LClo(min=0) + parameter Modelica.Units.SI.Area LClo(min=0) "Effective leakage area of closed door" annotation (Dialog(group="Closed door")); @@ -30,8 +30,8 @@ "Opening signal, 0=closed, 1=open" annotation (Placement(transformation(extent={{-120,-10},{-100,10}}), iconTransformation(extent={{-120,-10},{-100,10}}))); protected - parameter Modelica.SIunits.Area AOpe=wOpe*hOpe "Open aperture area"; - parameter Modelica.SIunits.Area AClo(fixed=false) "Closed aperture area"; + parameter Modelica.Units.SI.Area AOpe=wOpe*hOpe "Open aperture area"; + parameter Modelica.Units.SI.Area AClo(fixed=false) "Closed aperture area"; Real kOpe "Open aperture flow coefficient, k = V_flow/ dp^m"; Real kClo "Closed aperture flow coefficient, k = V_flow/ dp^m"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/DoorOpen.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/DoorOpen.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/DoorOpen.mo" 2022-03-10 09:57:40.156144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/DoorOpen.mo" 2022-03-10 09:59:02.648154848 +0000 @@ -29,7 +29,7 @@ sqrt(Modelica.Constants.g_n /(Medium.T_default*conTP) * hOpe) "Constant coefficient for buoyancy driven air flow rate"; - parameter Modelica.SIunits.MassFlowRate m_flow_turbulent= + parameter Modelica.Units.SI.MassFlowRate m_flow_turbulent= kVal * rho_default * sqrt(dp_turbulent) "Mass flow rate where regularization to laminar flow occurs for temperature-driven flow"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/DoorOperable.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/DoorOperable.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/DoorOperable.mo" 2022-03-10 09:57:40.156144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/DoorOperable.mo" 2022-03-10 09:59:02.632154845 +0000 @@ -11,14 +11,14 @@ parameter Real mOpe = 0.5 "Flow exponent for door of open door" annotation (Dialog(group="Open door")); - parameter Modelica.SIunits.Area LClo(min=0) + parameter Modelica.Units.SI.Area LClo(min=0) "Effective leakage area of closed door" annotation (Dialog(group="Closed door")); parameter Real mClo= 0.65 "Flow exponent for crack of closed door" annotation (Dialog(group="Closed door")); - parameter Modelica.SIunits.PressureDifference dpCloRat(min=0, + parameter Modelica.Units.SI.PressureDifference dpCloRat(min=0, displayUnit="Pa") = 4 "Pressure drop at rating condition of closed door" annotation (Dialog(group="Closed door rating conditions")); @@ -43,7 +43,7 @@ parameter Real d[2] = {1/8*m^2 - gamma - m + 15.0/8 for m in {mOpe, mClo}} "Polynomial coefficient for regularized implementation of flow resistance"; - parameter Modelica.SIunits.Area AClo = LClo * dpCloRat^(0.5-mClo) "Closed area"; + parameter Modelica.Units.SI.Area AClo = LClo * dpCloRat^(0.5-mClo) "Closed area"; parameter Real kVal[2]={ CDOpe *AOpe*sqrt(2/rho_default), CDCloRat*AClo*sqrt(2/rho_default)} @@ -53,14 +53,14 @@ sqrt(Modelica.Constants.g_n /(Medium.T_default*conTP) * hOpe) "Constant coefficient for buoyancy driven air flow rate"; - parameter Modelica.SIunits.MassFlowRate m_flow_turbulent= + parameter Modelica.Units.SI.MassFlowRate m_flow_turbulent= kVal[1] * rho_default * sqrt(dp_turbulent) "Mass flow rate where regularization to laminar flow occurs for temperature-driven flow"; - Modelica.SIunits.VolumeFlowRate VABpOpeClo_flow[2](each nominal=0.001) + Modelica.Units.SI.VolumeFlowRate VABpOpeClo_flow[2](each nominal=0.001) "Volume flow rate from A to B if positive due to static pressure difference"; - Modelica.SIunits.Area A "Current opening area"; + Modelica.Units.SI.Area A "Current opening area"; equation // Air flow rate due to static pressure difference VABpOpeClo_flow = Buildings.Airflow.Multizone.BaseClasses.powerLawFixedM( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/EffectiveAirLeakageArea.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/EffectiveAirLeakageArea.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/EffectiveAirLeakageArea.mo" 2022-03-10 09:57:40.156144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/EffectiveAirLeakageArea.mo" 2022-03-10 09:59:02.612154843 +0000 @@ -4,7 +4,7 @@ m=0.65, final k=L * CDRat * sqrt(2.0/rho_default) * dpRat^(0.5-m)); - parameter Modelica.SIunits.PressureDifference dpRat( + parameter Modelica.Units.SI.PressureDifference dpRat( min=0, displayUnit="Pa") = 4 "Pressure drop" annotation (Dialog(group="Rating conditions")); @@ -13,8 +13,8 @@ max=1) = 1 "Discharge coefficient" annotation (Dialog(group="Rating conditions")); - parameter Modelica.SIunits.Area L(min=0) "Effective leakage area"; + parameter Modelica.Units.SI.Area L(min=0) "Effective leakage area"; equation v = V_flow/L; annotation (Icon(graphics={ diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/Examples/ClosedDoors.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/Examples/ClosedDoors.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/Examples/ClosedDoors.mo" 2022-03-10 09:57:40.156144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/Examples/ClosedDoors.mo" 2022-03-10 09:59:02.564154838 +0000 @@ -28,7 +28,7 @@ Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow preHeaFlo "Prescribed heat flow rate boundary condition" annotation (Placement(transformation(extent={{4,40},{24,60}}))); - Modelica.Blocks.Sources.Sine sinBou(freqHz=1/3600) + Modelica.Blocks.Sources.Sine sinBou(f =1/3600) "Signal for heat flow rate boundary condition" annotation (Placement(transformation(extent={{-68,40},{-48,60}}))); Modelica.Blocks.Math.Gain gai(k=100) "Gain for heat flow boundary condition" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/Examples/OneEffectiveAirLeakageArea.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/Examples/OneEffectiveAirLeakageArea.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/Examples/OneEffectiveAirLeakageArea.mo" 2022-03-10 09:57:40.160144399 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/Examples/OneEffectiveAirLeakageArea.mo" 2022-03-10 09:59:02.540154835 +0000 @@ -22,7 +22,7 @@ Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow preHeaFlo "Prescribed heat flow rate boundary condition" annotation (Placement(transformation(extent={{0,20},{20,40}}))); - Modelica.Blocks.Sources.Sine heaFloBou(freqHz=1/3600) + Modelica.Blocks.Sources.Sine heaFloBou(f =1/3600) "Signal for heat flow rate boundary condition" annotation (Placement(transformation(extent={{-80,20},{-60,40}}))); Modelica.Blocks.Math.Gain gai(k=100) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/Examples/OneOpenDoor.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/Examples/OneOpenDoor.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/Examples/OneOpenDoor.mo" 2022-03-10 09:57:40.160144399 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/Examples/OneOpenDoor.mo" 2022-03-10 09:59:02.528154833 +0000 @@ -27,7 +27,7 @@ Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow preHeaFlo "Prescribed heat flow rate boundary condition" annotation (Placement(transformation(extent={{14,60},{34,80}}))); - Modelica.Blocks.Sources.Sine heaSou(freqHz=1/3600) + Modelica.Blocks.Sources.Sine heaSou(f =1/3600) "Signal for heat flow rate boundary condition" annotation (Placement( transformation(extent={{-60,60},{-40,80}}))); Modelica.Blocks.Math.Gain gai(k=100) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/Examples/ZonalFlow.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/Examples/ZonalFlow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/Examples/ZonalFlow.mo" 2022-03-10 09:57:40.160144399 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/Examples/ZonalFlow.mo" 2022-03-10 09:59:02.472154825 +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 8.1.0/Airflow/Multizone/MediumColumn.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/MediumColumn.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/MediumColumn.mo" 2022-03-10 09:57:40.160144399 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/MediumColumn.mo" 2022-03-10 09:59:02.460154824 +0000 @@ -7,7 +7,7 @@ annotation (choices( choice(redeclare package Medium = Buildings.Media.Air "Moist air"))); - 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); @@ -24,13 +24,13 @@ "Fluid connector b (positive design flow direction is from port_a to port_b)" annotation (Placement(transformation(extent={{10,-110},{-10,-90}}), iconTransformation(extent={{10,-110},{-10,-90}}))); - Modelica.SIunits.VolumeFlowRate V_flow + Modelica.Units.SI.VolumeFlowRate V_flow "Volume flow rate at inflowing port (positive when flow from port_a to port_b)"; - Modelica.SIunits.MassFlowRate m_flow + Modelica.Units.SI.MassFlowRate m_flow "Mass flow rate from port_a to port_b (m_flow > 0 is design flow direction)"; - Modelica.SIunits.PressureDifference dp(displayUnit="Pa") + Modelica.Units.SI.PressureDifference dp(displayUnit="Pa") "Pressure difference between port_a and port_b"; - Modelica.SIunits.Density rho "Density in medium column"; + Modelica.Units.SI.Density rho "Density in medium column"; protected Medium.ThermodynamicState sta_a=Medium.setState_phX( port_a.p, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/MediumColumnDynamic.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/MediumColumnDynamic.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/MediumColumnDynamic.mo" 2022-03-10 09:57:40.160144399 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/MediumColumnDynamic.mo" 2022-03-10 09:59:02.444154823 +0000 @@ -8,7 +8,7 @@ annotation (choices( choice(redeclare package Medium = Buildings.Media.Air "Moist air"))); - parameter Modelica.SIunits.Length h(min=0) = 3 "Height of shaft"; + parameter Modelica.Units.SI.Length h(min=0) = 3 "Height of shaft"; Modelica.Fluid.Interfaces.FluidPort_a port_a( redeclare final package Medium = Medium, @@ -22,7 +22,7 @@ "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}}))); - 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 8.1.0/Airflow/Multizone/Orifice.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/Orifice.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/Orifice.mo" 2022-03-10 09:57:40.160144399 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/Orifice.mo" 2022-03-10 09:59:02.428154820 +0000 @@ -4,7 +4,7 @@ m=0.5, k=CD*A*sqrt(2.0/rho_default)); - parameter Modelica.SIunits.Area A "Area of orifice" + parameter Modelica.Units.SI.Area A "Area of orifice" annotation (Dialog(group="Orifice characteristics")); parameter Real CD=0.65 "Discharge coefficient" annotation (Dialog(group="Orifice characteristics")); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/ZonalFlow_ACS.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/ZonalFlow_ACS.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/ZonalFlow_ACS.mo" 2022-03-10 09:57:40.160144399 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Airflow/Multizone/ZonalFlow_ACS.mo" 2022-03-10 09:59:02.252154797 +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 8.1.0/Applications/DataCenters/ChillerCooled/Controls/ChillerStage.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Controls/ChillerStage.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Controls/ChillerStage.mo" 2022-03-10 09:57:40.160144399 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Controls/ChillerStage.mo" 2022-03-10 09:59:02.220154793 +0000 @@ -2,16 +2,16 @@ model ChillerStage "Chiller staging control logic" extends Modelica.Blocks.Icons.Block; - parameter Modelica.SIunits.Time tWai "Waiting time"; - parameter Modelica.SIunits.Power QEva_nominal + parameter Modelica.Units.SI.Time tWai "Waiting time"; + parameter Modelica.Units.SI.Power QEva_nominal "Nominal cooling capaciaty(Negative means cooling)"; - parameter Modelica.SIunits.Power criPoiLoa = 0.55*QEva_nominal + parameter Modelica.Units.SI.Power criPoiLoa = 0.55*QEva_nominal "Critical point of cooling load for switching one chiller on or off"; - parameter Modelica.SIunits.Power dQ = 0.25*QEva_nominal + parameter Modelica.Units.SI.Power dQ = 0.25*QEva_nominal "Deadband for critical point of cooling load"; - parameter Modelica.SIunits.Temperature criPoiTem = 279.15 + parameter Modelica.Units.SI.Temperature criPoiTem = 279.15 "Critical point of temperature for switching one chiller on or off"; - parameter Modelica.SIunits.TemperatureDifference dT = 1 + parameter Modelica.Units.SI.TemperatureDifference dT = 1 "Deadband width for critical point of switching temperature"; Modelica.Blocks.Interfaces.IntegerInput cooMod @@ -45,12 +45,12 @@ extent={{-10,10},{10,-10}}, rotation=-90, origin={-50,10}))); - Modelica.StateGraph.InitialStep off(nIn=1) "Free cooling mode" + Modelica.StateGraph.InitialStep off(nOut = 1, nIn = 1) "Free cooling mode" annotation (Placement(transformation( extent={{-10,10},{10,-10}}, rotation=-90, origin={-50,70}))); - Modelica.StateGraph.StepWithSignal twoOn "Two chillers are commanded on" + Modelica.StateGraph.StepWithSignal twoOn(nIn = 1, nOut = 1) "Two chillers are commanded on" annotation (Placement(transformation( extent={{-10,10},{10,-10}}, rotation=-90, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Controls/ConstantSpeedPumpStage.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Controls/ConstantSpeedPumpStage.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Controls/ConstantSpeedPumpStage.mo" 2022-03-10 09:57:40.160144399 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Controls/ConstantSpeedPumpStage.mo" 2022-03-10 09:59:02.196154790 +0000 @@ -2,7 +2,7 @@ model ConstantSpeedPumpStage "Staging control for constant speed pumps" extends Modelica.Blocks.Icons.Block; - parameter Modelica.SIunits.Time tWai "Waiting time"; + parameter Modelica.Units.SI.Time tWai "Waiting time"; Modelica.Blocks.Interfaces.IntegerInput cooMod "Cooling mode - 0:off, 1: free cooling mode; 2: partially mechanical cooling; 3: fully mechanical cooling" @@ -32,12 +32,12 @@ extent={{-10,10},{10,-10}}, rotation=-90, origin={-40,10}))); - Modelica.StateGraph.InitialStep off(nIn=1) "Free cooling mode" + Modelica.StateGraph.InitialStep off(nOut = 1, nIn = 1) "Free cooling mode" annotation (Placement(transformation( extent={{-10,10},{10,-10}}, rotation=-90, origin={-40,70}))); - Modelica.StateGraph.StepWithSignal twoOn "Two chillers are commanded on" + Modelica.StateGraph.StepWithSignal twoOn(nIn = 1, nOut = 1) "Two chillers are commanded on" annotation (Placement(transformation( extent={{-10,10},{10,-10}}, rotation=-90, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Controls/CoolingMode.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Controls/CoolingMode.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Controls/CoolingMode.mo" 2022-03-10 09:57:40.160144399 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Controls/CoolingMode.mo" 2022-03-10 09:59:02.164154786 +0000 @@ -3,14 +3,14 @@ "Mode controller for integrated waterside economizer and chiller" extends Modelica.Blocks.Icons.Block; - parameter Modelica.SIunits.Time tWai "Waiting time"; - parameter Modelica.SIunits.TemperatureDifference deaBan1 + parameter Modelica.Units.SI.Time tWai "Waiting time"; + parameter Modelica.Units.SI.TemperatureDifference deaBan1 "Dead band width 1 for switching chiller on "; - parameter Modelica.SIunits.TemperatureDifference deaBan2 + parameter Modelica.Units.SI.TemperatureDifference deaBan2 "Dead band width 2 for switching waterside economizer off"; - parameter Modelica.SIunits.TemperatureDifference deaBan3 + parameter Modelica.Units.SI.TemperatureDifference deaBan3 "Dead band width 3 for switching waterside economizer on "; - parameter Modelica.SIunits.TemperatureDifference deaBan4 + parameter Modelica.Units.SI.TemperatureDifference deaBan4 "Dead band width 4 for switching chiller off"; Modelica.Blocks.Interfaces.RealInput TCHWRetWSE( @@ -54,12 +54,12 @@ extent={{-10,10},{10,-10}}, rotation=-90, origin={-10,8}))); - Modelica.StateGraph.InitialStepWithSignal freCoo(nIn=1) "Free cooling mode" + Modelica.StateGraph.InitialStepWithSignal freCoo(nOut = 1, nIn = 1) "Free cooling mode" annotation (Placement(transformation( extent={{-10,10},{10,-10}}, rotation=-90, origin={-10,70}))); - Modelica.StateGraph.StepWithSignal fulMecCoo "Fully mechanical cooling mode" + Modelica.StateGraph.StepWithSignal fulMecCoo(nIn = 1, nOut = 1) "Fully mechanical cooling mode" annotation (Placement(transformation( extent={{-10,10},{10,-10}}, rotation=-90, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Controls/CoolingModeNonIntegrated.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Controls/CoolingModeNonIntegrated.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Controls/CoolingModeNonIntegrated.mo" 2022-03-10 09:57:40.160144399 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Controls/CoolingModeNonIntegrated.mo" 2022-03-10 09:59:02.136154784 +0000 @@ -3,11 +3,11 @@ "Cooling mode controller in the chilled water system with a non-integrated waterside economizer" extends Modelica.Blocks.Icons.Block; - parameter Modelica.SIunits.TemperatureDifference deaBan + parameter Modelica.Units.SI.TemperatureDifference deaBan "Dead band width for switching waterside economizer off "; - parameter Modelica.SIunits.Temperature TSwi + parameter Modelica.Units.SI.Temperature TSwi "Temperature transition to free cooling mode"; - parameter Modelica.SIunits.Time tWai + parameter Modelica.Units.SI.Time tWai "Waiting time"; Modelica.Blocks.Interfaces.IntegerInput numOnChi @@ -34,13 +34,13 @@ "Cooling mode signal (1: free cooling mode, 3: fully mechanical cooling)" annotation (Placement(transformation(extent={{100,-10},{120,10}}))); - Modelica.StateGraph.InitialStepWithSignal freCoo(nIn=1) + Modelica.StateGraph.InitialStepWithSignal freCoo(nOut = 1, nIn = 1) "Free cooling mode" annotation (Placement(transformation( extent={{-10,10},{10,-10}}, rotation=-90, origin={-20,58}))); - Modelica.StateGraph.StepWithSignal fulMecCoo + Modelica.StateGraph.StepWithSignal fulMecCoo(nIn = 1, nOut = 1) "Fully mechanical cooling mode" annotation (Placement(transformation( extent={{-10,10},{10,-10}}, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Controls/CoolingTowerSpeed.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Controls/CoolingTowerSpeed.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Controls/CoolingTowerSpeed.mo" 2022-03-10 09:57:40.160144399 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Controls/CoolingTowerSpeed.mo" 2022-03-10 09:59:02.108154779 +0000 @@ -9,12 +9,12 @@ parameter Real k(min=0, unit="1") = 1 "Gain of controller" annotation(Dialog(tab="Controller")); - parameter Modelica.SIunits.Time Ti(min=Modelica.Constants.small)=0.5 + parameter Modelica.Units.SI.Time Ti(min=Modelica.Constants.small)=0.5 "Time constant of integrator block" annotation (Dialog(enable= (controllerType == Modelica.Blocks.Types.SimpleController.PI or controllerType == Modelica.Blocks.Types.SimpleController.PID),tab="Controller")); - parameter Modelica.SIunits.Time Td(min=0)=0.1 + parameter Modelica.Units.SI.Time Td(min=0)=0.1 "Time constant of derivative block" annotation (Dialog(enable= (controllerType == Modelica.Blocks.Types.SimpleController.PD or diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Controls/Reheat.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Controls/Reheat.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Controls/Reheat.mo" 2022-03-10 09:57:40.160144399 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Controls/Reheat.mo" 2022-03-10 09:59:02.092154778 +0000 @@ -5,11 +5,11 @@ "Switch point for valve signal"; parameter Real yValDeaBan(min=0, max=1, unit="1") "Deadband for valve signal"; - parameter Modelica.SIunits.TemperatureDifference dTSwi + parameter Modelica.Units.SI.TemperatureDifference dTSwi "Switch point for temperature difference"; - parameter Modelica.SIunits.TemperatureDifference dTDeaBan + parameter Modelica.Units.SI.TemperatureDifference dTDeaBan "Deadband for temperature difference"; - parameter Modelica.SIunits.Time tWai + parameter Modelica.Units.SI.Time tWai "Waiting time"; Modelica.Blocks.Interfaces.RealInput yVal( @@ -28,13 +28,13 @@ "On and off signal for the reheater" annotation (Placement(transformation(extent={{100,-10},{120,10}}))); - Modelica.StateGraph.InitialStepWithSignal off "Off" + Modelica.StateGraph.InitialStepWithSignal off(nIn = 1, nOut = 1) "Off" annotation (Placement( transformation( extent={{10,10},{-10,-10}}, rotation=180, origin={-50,30}))); - Modelica.StateGraph.StepWithSignal on "On" + Modelica.StateGraph.StepWithSignal on(nIn = 1, nOut = 1) "On" annotation (Placement( transformation( extent={{10,10},{-10,-10}}, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Controls/Validation/CoolingModeNonIntegrated.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Controls/Validation/CoolingModeNonIntegrated.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Controls/Validation/CoolingModeNonIntegrated.mo" 2022-03-10 09:57:40.160144399 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Controls/Validation/CoolingModeNonIntegrated.mo" 2022-03-10 09:59:02.052154773 +0000 @@ -17,7 +17,7 @@ annotation (Placement(transformation(extent={{-60,-40},{-40,-20}}))); Modelica.Blocks.Sources.Sine TWetBub( amplitude=4, - freqHz=1/300, +f =1/300, offset=273.15 + 8) "Wet bulb temperature" annotation (Placement(transformation(extent={{-60,20},{-40,40}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Controls/Validation/CoolingTowerSpeed.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Controls/Validation/CoolingTowerSpeed.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Controls/Validation/CoolingTowerSpeed.mo" 2022-03-10 09:57:40.160144399 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Controls/Validation/CoolingTowerSpeed.mo" 2022-03-10 09:59:02.044154771 +0000 @@ -9,7 +9,7 @@ annotation (Placement(transformation(extent={{-10,-10},{10,10}}))); Modelica.Blocks.Sources.Sine CHWST( amplitude=2, - freqHz=1/360, +f =1/360, offset=273.15 + 5) "Chilled water supply temperature" annotation (Placement(transformation(extent={{-60,-80},{-40,-60}}))); @@ -18,7 +18,7 @@ annotation (Placement(transformation(extent={{-60,70},{-40,90}}))); Modelica.Blocks.Sources.Sine CWST( amplitude=5, - freqHz=1/360, +f =1/360, offset=273.15 + 20) "Condenser water supply temperature" annotation (Placement(transformation(extent={{-60,-40},{-40,-20}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Controls/Validation/Reheat.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Controls/Validation/Reheat.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Controls/Validation/Reheat.mo" 2022-03-10 09:57:40.160144399 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Controls/Validation/Reheat.mo" 2022-03-10 09:59:02.032154769 +0000 @@ -12,13 +12,13 @@ Modelica.Blocks.Sources.Sine sig1( amplitude=0.3, offset=0.3, - freqHz=1/1200) +f =1/1200) "Signal 1" annotation (Placement(transformation(extent={{-80,40},{-60,60}}))); Modelica.Blocks.Sources.Sine sig2( amplitude=3, offset=273.15 + 15, - freqHz=1/1200, +f =1/1200, phase=1.0471975511966) "Signal 2" annotation (Placement(transformation(extent={{-80,-38},{-60,-18}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Controls/Validation/VariableSpeedPumpStage.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Controls/Validation/VariableSpeedPumpStage.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Controls/Validation/VariableSpeedPumpStage.mo" 2022-03-10 09:57:40.160144399 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Controls/Validation/VariableSpeedPumpStage.mo" 2022-03-10 09:59:02.024154769 +0000 @@ -2,7 +2,7 @@ model VariableSpeedPumpStage "Test the model ChillerWSE.Examples.BaseClasses.VariableSpeedPumpStageControl" extends Modelica.Icons.Example; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=100 "Nominal mass flowrate"; + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=100 "Nominal mass flowrate"; Buildings.Applications.DataCenters.ChillerCooled.Controls.VariableSpeedPumpStage varSpePumSta(tWai=30, m_flow_nominal=m_flow_nominal, @@ -16,7 +16,7 @@ annotation (Placement(transformation(extent={{-60,-30},{-40,-10}}))); Modelica.Blocks.Sources.Sine masFlo( offset=0.5*m_flow_nominal, - freqHz=1/360, +f =1/360, amplitude=0.5*m_flow_nominal) "Mass flowrate" annotation (Placement(transformation(extent={{-60,30},{-40,50}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Controls/VariableSpeedPumpStage.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Controls/VariableSpeedPumpStage.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Controls/VariableSpeedPumpStage.mo" 2022-03-10 09:57:40.160144399 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Controls/VariableSpeedPumpStage.mo" 2022-03-10 09:59:02.016154768 +0000 @@ -2,14 +2,14 @@ model VariableSpeedPumpStage "Staging control for variable speed pumps" extends Modelica.Blocks.Icons.Block; - parameter Modelica.SIunits.Time tWai "Waiting time"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal + parameter Modelica.Units.SI.Time tWai "Waiting time"; + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal "Nominal mass flow rate of the identical variable-speed pumps"; parameter Real minSpe(unit="1",min=0,max=1) = 0.05 "Minimum speed ratio required by variable speed pumps"; - parameter Modelica.SIunits.MassFlowRate criPoiFlo = 0.7*m_flow_nominal + parameter Modelica.Units.SI.MassFlowRate criPoiFlo = 0.7*m_flow_nominal "Critcal point of flowrate for switch pump on or off"; - parameter Modelica.SIunits.MassFlowRate deaBanFlo = 0.1*m_flow_nominal + parameter Modelica.Units.SI.MassFlowRate deaBanFlo = 0.1*m_flow_nominal "Deadband for critical point of flowrate"; parameter Real criPoiSpe = 0.5 "Critical point of speed signal for switching on or off"; @@ -42,13 +42,13 @@ extent={{-10,10},{10,-10}}, rotation=-90, origin={-50,10}))); - Modelica.StateGraph.InitialStep off(nIn=1) + Modelica.StateGraph.InitialStep off(nOut = 1, nIn = 1) "Free cooling mode" annotation (Placement(transformation( extent={{-10,10},{10,-10}}, rotation=-90, origin={-50,70}))); - Modelica.StateGraph.StepWithSignal twoOn + Modelica.StateGraph.StepWithSignal twoOn(nIn = 1, nOut = 1) "Two chillers are commanded on" annotation (Placement(transformation( extent={{-10,10},{10,-10}}, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/AHUParameters.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/AHUParameters.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/AHUParameters.mo" 2022-03-10 09:57:40.160144399 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/AHUParameters.mo" 2022-03-10 09:59:01.984154764 +0000 @@ -1,19 +1,19 @@ within Buildings.Applications.DataCenters.ChillerCooled.Equipment.BaseClasses; partial model AHUParameters "Essential parameters for air handling unit" - parameter Modelica.SIunits.ThermalConductance UA_nominal + parameter Modelica.Units.SI.ThermalConductance UA_nominal "Thermal conductance at nominal flow for sensible heat, used to compute time constant" annotation (Dialog(group="Cooling coil")); parameter Real r_nominal=2/3 "Ratio between air-side and water-side convective heat transfer coefficient" annotation (Dialog(group="Cooling coil")); - parameter Modelica.SIunits.Time tau1 = 20 "Time constant at nominal flow of medium 1" + parameter Modelica.Units.SI.Time tau1 = 20 "Time constant at nominal flow of medium 1" annotation (Dialog(group="Cooling coil", enable=not (energyDynamics==Modelica.Fluid.Types.Dynamics.SteadyState))); - parameter Modelica.SIunits.Time tau2 = 1 "Time constant at nominal flow of medium 2" + parameter Modelica.Units.SI.Time tau2 = 1 "Time constant at nominal flow of medium 2" annotation (Dialog(group="Cooling coil", enable=not (energyDynamics==Modelica.Fluid.Types.Dynamics.SteadyState))); - parameter Modelica.SIunits.Time tau_m(min=0) = 20 + parameter Modelica.Units.SI.Time tau_m(min=0) = 20 "Time constant of metal at nominal UA value" annotation(Dialog(tab="General", group="Cooling coil")); parameter Integer nEle(min=1) = 4 diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/FourPortResistanceChillerWSE.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/FourPortResistanceChillerWSE.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/FourPortResistanceChillerWSE.mo" 2022-03-10 09:57:40.160144399 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/FourPortResistanceChillerWSE.mo" 2022-03-10 09:59:01.900154753 +0000 @@ -10,11 +10,11 @@ "= 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_chi_nominal( + parameter Modelica.Units.SI.PressureDifference dp1_chi_nominal( min=0,displayUnit="Pa") "Pressure difference on medium 1 side in the chillers" annotation(Dialog(group = "Chiller")); - parameter Modelica.SIunits.PressureDifference dp1_wse_nominal( + parameter Modelica.Units.SI.PressureDifference dp1_wse_nominal( min=0,displayUnit="Pa") "Pressure difference on medium 1 side in the waterside economizer" annotation(Dialog(group = "Waterside economizer")); @@ -33,11 +33,11 @@ "= 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_chi_nominal( + parameter Modelica.Units.SI.PressureDifference dp2_chi_nominal( min=0,displayUnit="Pa") "Pressure difference on medium 2 side in the chillers" annotation(Dialog(group = "Chiller")); - parameter Modelica.SIunits.PressureDifference dp2_wse_nominal( + parameter Modelica.Units.SI.PressureDifference dp2_wse_nominal( min=0,displayUnit="Pa") "Pressure difference on medium 2 side in the waterside economizer" annotation(Dialog(group = "Waterside economizer")); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialChillerWSE.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialChillerWSE.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialChillerWSE.mo" 2022-03-10 09:57:40.160144399 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialChillerWSE.mo" 2022-03-10 09:59:01.888154752 +0000 @@ -35,7 +35,7 @@ annotation(Dialog(tab="Dynamics", group="Filtered opening",enable=use_inputFilter)); //WSE - parameter Modelica.SIunits.Efficiency eta(min=0,max=1)=0.8 + parameter Modelica.Units.SI.Efficiency eta(min=0,max=1)=0.8 "Heat exchange effectiveness" annotation(Dialog(group="Waterside economizer")); @@ -56,15 +56,15 @@ parameter Modelica.Fluid.Types.Dynamics massDynamics=energyDynamics "Type of mass balance: dynamic (3 initialization options) or steady state" annotation(Evaluate=true, Dialog(tab = "Dynamics", group="Equations")); - parameter Modelica.SIunits.Time tauChi1 = 30 + parameter Modelica.Units.SI.Time tauChi1 = 30 "Time constant at nominal flow in chillers" annotation (Dialog(tab = "Dynamics", group="Chiller", enable=not energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState)); - parameter Modelica.SIunits.Time tauChi2 = 30 + parameter Modelica.Units.SI.Time tauChi2 = 30 "Time constant at nominal flow in chillers" annotation (Dialog(tab = "Dynamics", group="Chiller", enable=not energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState)); - parameter Modelica.SIunits.Time tauWSE = 10 + parameter Modelica.Units.SI.Time tauWSE = 10 "Time constant at nominal flow for dynamic energy and momentum balance of the three-way valve" annotation(Dialog(tab="Dynamics", group="Waterside economizer", enable= use_controller and not energyDynamics == @@ -113,7 +113,7 @@ enable=Medium2.nC > 0)); // Temperature sensor - parameter Modelica.SIunits.Time tauSenT=1 + parameter Modelica.Units.SI.Time tauSenT=1 "Time constant at nominal flow rate (use tau=0 for steady-state sensor, but see user guide for potential problems)" annotation(Dialog(tab="Dynamics", group="Temperature Sensor", diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialChillerWSEInterface.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialChillerWSEInterface.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialChillerWSEInterface.mo" 2022-03-10 09:57:40.160144399 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialChillerWSEInterface.mo" 2022-03-10 09:59:01.848154746 +0000 @@ -4,16 +4,16 @@ extends Buildings.Fluid.Interfaces.PartialFourPort; // Nominal conditions - parameter Modelica.SIunits.MassFlowRate m1_flow_chi_nominal(min=0) + parameter Modelica.Units.SI.MassFlowRate m1_flow_chi_nominal(min=0) "Nominal mass flow rate on the medium 1 side in the chiller" annotation(Dialog(group = "Chiller")); - parameter Modelica.SIunits.MassFlowRate m2_flow_chi_nominal(min=0) + parameter Modelica.Units.SI.MassFlowRate m2_flow_chi_nominal(min=0) "Nominal mass flow rate on the medium 2 side in the chiller" annotation(Dialog(group = "Chiller")); - parameter Modelica.SIunits.MassFlowRate m1_flow_wse_nominal(min=0) + parameter Modelica.Units.SI.MassFlowRate m1_flow_wse_nominal(min=0) "Nominal mass flow rate on the medium 1 side in the waterside economizer" annotation(Dialog(group = "Waterside economizer")); - parameter Modelica.SIunits.MassFlowRate m2_flow_wse_nominal(min=0) + parameter Modelica.Units.SI.MassFlowRate m2_flow_wse_nominal(min=0) "Nominal mass flow rate on the medium 2 side in the waterside economizer" annotation(Dialog(group = "Waterside economizer")); @@ -43,12 +43,12 @@ iconTransformation(extent={{-132,60},{-100,92}}))); Medium1.MassFlowRate m1_flow = port_a1.m_flow "Mass flow rate from port_a1 to port_b1 (m1_flow > 0 is design flow direction)"; - Modelica.SIunits.PressureDifference dp1(displayUnit="Pa") = port_a1.p - port_b1.p + Modelica.Units.SI.PressureDifference dp1(displayUnit="Pa") = port_a1.p - port_b1.p "Pressure difference between port_a1 and port_b1"; Medium2.MassFlowRate m2_flow = port_a2.m_flow "Mass flow rate from port_a2 to port_b2 (m2_flow > 0 is design flow direction)"; - Modelica.SIunits.PressureDifference dp2(displayUnit="Pa") = port_a2.p - port_b2.p + Modelica.Units.SI.PressureDifference dp2(displayUnit="Pa") = port_a2.p - port_b2.p "Pressure difference between port_a2 and port_b2"; Medium1.ThermodynamicState sta_a1= diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialControllerInterface.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialControllerInterface.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialControllerInterface.mo" 2022-03-10 09:57:40.160144399 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialControllerInterface.mo" 2022-03-10 09:59:01.840154745 +0000 @@ -14,13 +14,13 @@ parameter Real k(min=0, unit="1") = 1 "Gain of controller" annotation(Dialog(tab="Controller",enable=use_controller)); - parameter Modelica.SIunits.Time Ti(min=Modelica.Constants.small)=0.5 + parameter Modelica.Units.SI.Time Ti(min=Modelica.Constants.small)=0.5 "Time constant of integrator block" annotation (Dialog(enable= (use_controller and (controllerType == Modelica.Blocks.Types.SimpleController.PI or controllerType == Modelica.Blocks.Types.SimpleController.PID)),tab="Controller")); - parameter Modelica.SIunits.Time Td(min=0)=0.1 + parameter Modelica.Units.SI.Time Td(min=0)=0.1 "Time constant of derivative block" annotation (Dialog(enable= use_controller and @@ -51,8 +51,8 @@ use_controller and (controllerType==.Modelica.Blocks.Types.SimpleController.PD or controllerType==.Modelica.Blocks.Types.SimpleController.PID),tab="Controller")); - parameter Modelica.Blocks.Types.InitPID initType= - Modelica.Blocks.Types.InitPID.DoNotUse_InitialIntegratorState + parameter Modelica.Blocks.Types.Init initType= + Modelica.Blocks.Types.Init.InitialState "Type of initialization (1: no init, 2: steady state, 3: initial state, 4: initial output)" annotation(Evaluate=true,Dialog(group="Initialization",tab="Controller",enable=use_controller)); parameter Real xi_start=0 diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialCoolingCoilHumidifyingHeating.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialCoolingCoilHumidifyingHeating.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialCoolingCoilHumidifyingHeating.mo" 2022-03-10 09:57:40.160144399 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialCoolingCoilHumidifyingHeating.mo" 2022-03-10 09:59:01.820154744 +0000 @@ -55,7 +55,7 @@ parameter Boolean use_inputFilterValve=true "= true, if opening is filtered with a 2nd order CriticalDamping filter for the water-side valve" annotation(Dialog(tab="Dynamics", group="Valve")); - parameter Modelica.SIunits.Time riseTimeValve=120 + parameter Modelica.Units.SI.Time riseTimeValve=120 "Rise time of the filter for the water-side valve (time to reach 99.6 % of an opening step)" annotation(Dialog(tab="Dynamics", group="Valve",enable=use_inputFilterValve)); parameter Modelica.Blocks.Types.Init initValve=Modelica.Blocks.Types.Init.InitialOutput @@ -70,13 +70,13 @@ parameter Boolean addPowerToMedium=true "Set to false to avoid any power (=heat and flow work) being added to medium (may give simpler equations)" annotation(Dialog(group="Fan")); - parameter Modelica.SIunits.Time tauFan = 1 + parameter Modelica.Units.SI.Time tauFan = 1 "Time constant at nominal flow (if energyDynamics <> SteadyState)" annotation (Dialog(tab = "Dynamics", group="Fan")); parameter Boolean use_inputFilterFan=true "= true, if speed is filtered with a 2nd order CriticalDamping filter" annotation(Dialog(tab="Dynamics", group="Fan")); - parameter Modelica.SIunits.Time riseTimeFan=30 + parameter Modelica.Units.SI.Time riseTimeFan=30 "Rise time of the filter (time to reach 99.6 % of the speed)" annotation(Dialog(tab="Dynamics", group="Fan",enable=use_inputFilterFan)); parameter Modelica.Blocks.Types.Init initFan=Modelica.Blocks.Types.Init.InitialOutput diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialHeatExchanger.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialHeatExchanger.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialHeatExchanger.mo" 2022-03-10 09:57:40.160144399 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialHeatExchanger.mo" 2022-03-10 09:59:01.788154740 +0000 @@ -14,14 +14,14 @@ constant Boolean homotopyInitialization = true "= true, use homotopy method" annotation(HideResult=true); - parameter Modelica.SIunits.Efficiency eta(min=0,max=1,start=0.8) + parameter Modelica.Units.SI.Efficiency eta(min=0,max=1,start=0.8) "constant effectiveness"; // Filter opening parameter Boolean use_inputFilter=true "= true, if opening is filtered with a 2nd order CriticalDamping filter" annotation(Dialog(tab="Dynamics", group="Filtered opening",enable=activate_ThrWayVal)); - 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=(activate_ThrWayVal and use_inputFilter))); @@ -33,7 +33,7 @@ "Initial value of output from the filter in the bypass valve" annotation(Dialog(tab="Dynamics", group="Filtered opening", enable=(activate_ThrWayVal and use_inputFilter))); - parameter Modelica.SIunits.PressureDifference dpValve_nominal( + parameter Modelica.Units.SI.PressureDifference dpValve_nominal( displayUnit="Pa", min=0, fixed=true)= 6000 @@ -42,13 +42,13 @@ enable=activate_ThrWayVal)); // Time constant - parameter Modelica.SIunits.Time tauThrWayVal=10 + parameter Modelica.Units.SI.Time tauThrWayVal=10 "Time constant at nominal flow for dynamic energy and momentum balance of the three-way valve" annotation(Dialog(tab="Dynamics", group="Nominal condition", enable=(activate_ThrWayVal and not energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState))); // Advanced - parameter Modelica.SIunits.Density rhoStd = Medium2.density_pTX(101325, 273.15+4, Medium2.X_default) + parameter Modelica.Units.SI.Density rhoStd = Medium2.density_pTX(101325, 273.15+4, Medium2.X_default) "Inlet density for which valve coefficients are defined" annotation(Dialog(group="Nominal condition", tab="Advanced",enable=activate_ThrWayVal)); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialParallelElectricEIR.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialParallelElectricEIR.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialParallelElectricEIR.mo" 2022-03-10 09:57:40.160144399 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialParallelElectricEIR.mo" 2022-03-10 09:59:01.748154733 +0000 @@ -5,11 +5,11 @@ val2(each final dpFixed_nominal=dp2_nominal), val1(each final dpFixed_nominal=dp1_nominal)); - parameter Modelica.SIunits.Time tau1 = 30 + parameter Modelica.Units.SI.Time tau1 = 30 "Time constant at nominal flow in chillers" annotation (Dialog(tab = "Dynamics", group="Nominal condition", enable=not energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState)); - parameter Modelica.SIunits.Time tau2 = 30 + parameter Modelica.Units.SI.Time tau2 = 30 "Time constant at nominal flow in chillers" annotation (Dialog(tab = "Dynamics", group="Nominal condition", enable=not energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState)); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialPumpParallel.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialPumpParallel.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialPumpParallel.mo" 2022-03-10 09:57:40.160144399 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialPumpParallel.mo" 2022-03-10 09:59:01.712154730 +0000 @@ -19,13 +19,13 @@ parameter Boolean addPowerToMedium=false "Set to false to avoid any power (=heat and flow work) being added to medium (may give simpler equations)" annotation(Dialog(group="Pump")); - parameter Modelica.SIunits.Time tau = 1 + parameter Modelica.Units.SI.Time tau = 1 "Time constant at nominal flow (if energyDynamics <> SteadyState)" annotation (Dialog(tab = "Dynamics", group="Pump")); parameter Boolean use_inputFilter=true "= true, if speed is filtered with a 2nd order CriticalDamping filter" annotation(Dialog(tab="Dynamics", group="Pump")); - parameter Modelica.SIunits.Time riseTimePump= 30 + parameter Modelica.Units.SI.Time riseTimePump= 30 "Rise time of the filter (time to reach 99.6 % of the speed)" annotation(Dialog(tab="Dynamics", group="Pump",enable=use_inputFilter)); parameter Modelica.Blocks.Types.Init init=Modelica.Blocks.Types.Init.InitialOutput @@ -37,7 +37,7 @@ // Valve parameters parameter Real l=0.0001 "Valve leakage, l=Kv(y=0)/Kv(y=1)" annotation(Dialog(group="Two-way valve")); - parameter Modelica.SIunits.Time riseTimeValve = 120 + parameter Modelica.Units.SI.Time riseTimeValve = 120 "Rise time of the filter (time to reach 99.6 % of the speed)" annotation(Dialog(tab="Dynamics", group="Valve",enable=use_inputFilter)); parameter Real[num] yValve_start = fill(0,num) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/SignalFilterParameters.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/SignalFilterParameters.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/SignalFilterParameters.mo" 2022-03-10 09:57:40.160144399 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/SignalFilterParameters.mo" 2022-03-10 09:59:01.676154725 +0000 @@ -5,7 +5,7 @@ parameter Boolean use_inputFilter=true "= true, if opening is filtered with a 2nd order CriticalDamping filter" annotation(Dialog(tab="Dynamics", group="Filtered opening")); - parameter Modelica.SIunits.Time riseTimeValve=120 + parameter Modelica.Units.SI.Time riseTimeValve=120 "Rise time of the filter (time to reach 99.6 % of an opening step)" annotation(Dialog(tab="Dynamics", group="Filtered opening",enable=use_inputFilter)); parameter Modelica.Blocks.Types.Init initValve=Modelica.Blocks.Types.Init.InitialOutput diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/ThreeWayValveParameters.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/ThreeWayValveParameters.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/ThreeWayValveParameters.mo" 2022-03-10 09:57:40.160144399 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/ThreeWayValveParameters.mo" 2022-03-10 09:59:01.668154724 +0000 @@ -3,7 +3,7 @@ "Model with parameters for a three-way valve" parameter Boolean activate_ThrWayVal "Activate the use of three-way valve: True-use three-way valve; False-not use the three-way valve"; - parameter Modelica.SIunits.PressureDifference dpThrWayVal_nominal( + parameter Modelica.Units.SI.PressureDifference dpThrWayVal_nominal( displayUnit="Pa", min=0, fixed=true)= 6000 diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/ValvesParameters.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/ValvesParameters.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/ValvesParameters.mo" 2022-03-10 09:57:40.160144399 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/ValvesParameters.mo" 2022-03-10 09:59:01.660154724 +0000 @@ -15,7 +15,7 @@ "Cv (US) flow coefficient [USG/min/(psi)^(1/2)]" annotation(Dialog(group = "Two-way valve", enable = (CvData==Buildings.Fluid.Types.CvTypes.Cv))); - parameter Modelica.SIunits.Area[numVal] Av( + parameter Modelica.Units.SI.Area[numVal] Av( each fixed= if CvData==Buildings.Fluid.Types.CvTypes.Av then true else false) "Av (metric) flow coefficient" annotation(Dialog(group = "Two-way valve", @@ -23,10 +23,10 @@ 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[numVal] m_flow_nominal + parameter Modelica.Units.SI.MassFlowRate[numVal] m_flow_nominal "Nominal mass flow rate" annotation(Dialog(group = "Two-way valve")); - parameter Modelica.SIunits.PressureDifference[numVal] dpValve_nominal( + parameter Modelica.Units.SI.PressureDifference[numVal] dpValve_nominal( each displayUnit="Pa", each min=0, each fixed= if CvData==Buildings.Fluid.Types.CvTypes.OpPoint then true else false)= @@ -35,7 +35,7 @@ CvData=Buildings.Fluid.Types.CvTypes.OpPoint" annotation(Dialog(group="Two-way valve", enable = (CvData==Buildings.Fluid.Types.CvTypes.OpPoint))); - parameter Modelica.SIunits.Density[numVal] rhoStd + parameter Modelica.Units.SI.Density[numVal] rhoStd "Inlet density for which valve coefficients are defined" annotation(Dialog(group="Two-way valve", tab="Advanced")); protected diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/CoolingCoilHumidifyingHeating.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/CoolingCoilHumidifyingHeating.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/CoolingCoilHumidifyingHeating.mo" 2022-03-10 09:57:40.160144399 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/CoolingCoilHumidifyingHeating.mo" 2022-03-10 09:59:01.648154722 +0000 @@ -14,24 +14,24 @@ annotation(Dialog(group="Valve")); // Parameters for electric heater - parameter Modelica.SIunits.Time tauEleHea = 10 + parameter Modelica.Units.SI.Time tauEleHea = 10 "Time constant at nominal flow for electric heater (if energyDynamics <> SteadyState)" annotation (Dialog(tab = "Dynamics", group="Electric heater", enable=not (energyDynamics==Modelica.Fluid.Types.Dynamics.SteadyState))); - parameter Modelica.SIunits.Efficiency etaHea = 1.0 + parameter Modelica.Units.SI.Efficiency etaHea = 1.0 "Efficiency of electrical heater" annotation (Dialog(group="Electric heater")); - parameter Modelica.SIunits.HeatFlowRate QHeaMax_flow(min=0) + parameter Modelica.Units.SI.HeatFlowRate QHeaMax_flow(min=0) "Nominal heating capacity of eletric heater,positive" annotation (Dialog(group="Electric heater")); // Parameters for humidifier - parameter Modelica.SIunits.MassFlowRate mWatMax_flow(min=0) + parameter Modelica.Units.SI.MassFlowRate mWatMax_flow(min=0) "Nominal humidification capacity for humidifier, positive for humidification" annotation (Dialog(tab="General",group="Humidifier")); - parameter Modelica.SIunits.Temperature THum = 293.15 + parameter Modelica.Units.SI.Temperature THum = 293.15 "Temperature of water that is added to the fluid stream by the humidifier" annotation (Dialog(group="Humidifier")); - parameter Modelica.SIunits.Time tauHum = 10 + parameter Modelica.Units.SI.Time tauHum = 10 "Time constant at nominal flow for humidifier(if energyDynamics <> SteadyState)" annotation (Dialog(tab = "Dynamics", group="Humidifier", enable=not (energyDynamics==Modelica.Fluid.Types.Dynamics.SteadyState))); @@ -41,11 +41,11 @@ "Switch point for valve signal"; parameter Real yValDeaBan(min=0, max=1, unit="1")=0.1 "Deadband for valve signal"; - parameter Modelica.SIunits.TemperatureDifference dTSwi=0 + parameter Modelica.Units.SI.TemperatureDifference dTSwi=0 "Switch point for temperature difference"; - parameter Modelica.SIunits.TemperatureDifference dTDeaBan=0.5 + parameter Modelica.Units.SI.TemperatureDifference dTDeaBan=0.5 "Deadband for temperature difference"; - parameter Modelica.SIunits.Time tWai=60 + parameter Modelica.Units.SI.Time tWai=60 "Waiting time"; Modelica.Blocks.Interfaces.RealOutput PHea( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/ElectricHeater.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/ElectricHeater.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/ElectricHeater.mo" 2022-03-10 09:57:40.160144399 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/ElectricHeater.mo" 2022-03-10 09:59:01.616154718 +0000 @@ -7,19 +7,19 @@ constant Boolean homotopyInitialization = true "= true, use homotopy method" annotation(HideResult=true); - parameter Modelica.SIunits.Efficiency eta(max=1) = 1 + parameter Modelica.Units.SI.Efficiency eta(max=1) = 1 "Effciency of electrical heater"; - parameter Modelica.SIunits.HeatFlowRate QMax_flow(min=0) = Modelica.Constants.inf + parameter Modelica.Units.SI.HeatFlowRate QMax_flow(min=0) = Modelica.Constants.inf "Maximum heat flow rate for heating (positive)" annotation (Evaluate=true); - parameter Modelica.SIunits.Temperature T_start=Medium.T_default + parameter Modelica.Units.SI.Temperature T_start=Medium.T_default "Start value of temperature" annotation(Dialog(tab = "Initialization")); // Dynamics parameter Modelica.Fluid.Types.Dynamics energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState "Type of energy balance: dynamic (3 initialization options) or steady state" annotation(Evaluate=true, Dialog(tab = "Dynamics", group="Equations")); - 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 or massDynamics not equal Modelica.Fluid.Types.Dynamics.SteadyState)" annotation(Dialog(tab = "Dynamics")); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/IntegratedPrimaryLoadSide.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/IntegratedPrimaryLoadSide.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/IntegratedPrimaryLoadSide.mo" 2022-03-10 09:57:40.160144399 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/IntegratedPrimaryLoadSide.mo" 2022-03-10 09:59:01.584154713 +0000 @@ -12,7 +12,7 @@ Medium2.density_pTX(101325, 273.15+4, Medium2.X_default)}); //Dynamics - parameter Modelica.SIunits.Time tauPump = 1 + parameter Modelica.Units.SI.Time tauPump = 1 "Time constant of fluid volume for nominal flow in pumps, used if energy or mass balance is dynamic" annotation (Dialog(tab = "Dynamics", group="Pump", enable=not energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState)); @@ -26,7 +26,7 @@ parameter Boolean addPowerToMedium = true "Set to false to avoid any power (=heat and flow work) being added to medium (may give simpler equations)" annotation (Dialog(group="Pump")); - parameter Modelica.SIunits.Time riseTimePump = 30 + parameter Modelica.Units.SI.Time riseTimePump = 30 "Rise time of the filter (time to reach 99.6 % of an opening step)" annotation(Dialog(tab="Dynamics", group="Filtered speed",enable=use_inputFilter)); parameter Modelica.Blocks.Types.Init initPum = initValve diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/IntegratedPrimarySecondary.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/IntegratedPrimarySecondary.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/IntegratedPrimarySecondary.mo" 2022-03-10 09:57:40.160144399 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/IntegratedPrimarySecondary.mo" 2022-03-10 09:59:01.488154701 +0000 @@ -13,7 +13,7 @@ Medium2.density_pTX(101325, 273.15+4, Medium2.X_default)}); // Dynamics - parameter Modelica.SIunits.Time tauPump = 1 + parameter Modelica.Units.SI.Time tauPump = 1 "Time constant of fluid volume for nominal flow in pumps, used if energy or mass balance is dynamic" annotation (Dialog(tab = "Dynamics", group="Pump", enable=not energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState)); @@ -21,7 +21,7 @@ //Pump parameter Integer numPum=numChi "Number of pumps" annotation(Dialog(group="Pump")); - parameter Modelica.SIunits.MassFlowRate m_flow_pum_nominal(min=0)=m2_flow_chi_nominal + parameter Modelica.Units.SI.MassFlowRate m_flow_pum_nominal(min=0)=m2_flow_chi_nominal "Nominal flow rate of the pump" annotation (Dialog(group="Pump")); replaceable parameter Buildings.Fluid.Movers.Data.Generic perPum[numPum] @@ -31,7 +31,7 @@ parameter Boolean addPowerToMedium=true "Set to false to avoid any power (=heat and flow work) being added to medium (may give simpler equations)" annotation (Dialog(group="Pump")); - parameter Modelica.SIunits.Time riseTimePump = 30 + parameter Modelica.Units.SI.Time riseTimePump = 30 "Rise time of the filter (time to reach 99.6 % of an opening step)" annotation(Dialog(tab="Dynamics", group="Filtered flowrate",enable=use_inputFilter)); parameter Modelica.Blocks.Types.Init initPum=initValve @@ -49,7 +49,7 @@ parameter Real lValPum=0.0001 "Valve leakage, l=Kv(y=0)/Kv(y=1)" annotation(Dialog(group="Pump")); - parameter Modelica.SIunits.PressureDifference dpValPum_nominal = 6000 + parameter Modelica.Units.SI.PressureDifference dpValPum_nominal = 6000 "Nominal differential pressure of the shutoff valves for primary pumps" annotation(Dialog(group="Pump")); //Valve diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/Validation/BaseClasses/PartialAirHandlerControl.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/Validation/BaseClasses/PartialAirHandlerControl.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/Validation/BaseClasses/PartialAirHandlerControl.mo" 2022-03-10 09:57:40.160144399 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/Validation/BaseClasses/PartialAirHandlerControl.mo" 2022-03-10 09:59:01.444154695 +0000 @@ -3,17 +3,17 @@ "Partial model for testing air hanlders with temperature and humidity control" package Medium1 = Buildings.Media.Water "Medium model for water"; package Medium2 = Buildings.Media.Air "Medium model for air"; - parameter Modelica.SIunits.MassFlowRate m1_flow_nominal(min=0)=2.9 + parameter Modelica.Units.SI.MassFlowRate m1_flow_nominal(min=0)=2.9 "Nominal mass flow rate"; - parameter Modelica.SIunits.MassFlowRate m2_flow_nominal(min=0)=3.3 + parameter Modelica.Units.SI.MassFlowRate m2_flow_nominal(min=0)=3.3 "Nominal mass flow rate"; - parameter Modelica.SIunits.Temperature T_a1_nominal=6 + 273.15 + parameter Modelica.Units.SI.Temperature T_a1_nominal=6 + 273.15 "Nominal water inlet temperature"; - parameter Modelica.SIunits.Temperature T_b1_nominal=11 + 273.15 + parameter Modelica.Units.SI.Temperature T_b1_nominal=11 + 273.15 "Nominal water outlet temperature"; - parameter Modelica.SIunits.Temperature T_a2_nominal=26 + 273.15 + parameter Modelica.Units.SI.Temperature T_a2_nominal=26 + 273.15 "Nominal air inlet temperature"; - parameter Modelica.SIunits.Temperature T_b2_nominal=12 + 273.15 + parameter Modelica.Units.SI.Temperature T_b2_nominal=12 + 273.15 "Nominal air outlet temperature"; Buildings.Fluid.Sources.Boundary_pT sin_2( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/Validation/BaseClasses/PartialAirHandlerMassFlow.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/Validation/BaseClasses/PartialAirHandlerMassFlow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/Validation/BaseClasses/PartialAirHandlerMassFlow.mo" 2022-03-10 09:57:40.160144399 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/Validation/BaseClasses/PartialAirHandlerMassFlow.mo" 2022-03-10 09:59:01.416154692 +0000 @@ -4,17 +4,17 @@ package Medium1 = Buildings.Media.Water "Medium model for water"; package Medium2 = Buildings.Media.Air "Medium model for air"; - parameter Modelica.SIunits.MassFlowRate m1_flow_nominal(min=0)=2.9 + parameter Modelica.Units.SI.MassFlowRate m1_flow_nominal(min=0)=2.9 "Nominal mass flow rate"; - parameter Modelica.SIunits.MassFlowRate m2_flow_nominal(min=0)=3.3 + parameter Modelica.Units.SI.MassFlowRate m2_flow_nominal(min=0)=3.3 "Nominal mass flow rate"; - parameter Modelica.SIunits.Temperature T_a1_nominal=6 + 273.15 + parameter Modelica.Units.SI.Temperature T_a1_nominal=6 + 273.15 "Nominal water inlet temperature"; - parameter Modelica.SIunits.Temperature T_b1_nominal=11 + 273.15 + parameter Modelica.Units.SI.Temperature T_b1_nominal=11 + 273.15 "Nominal water outlet temperature"; - parameter Modelica.SIunits.Temperature T_a2_nominal=26 + 273.15 + parameter Modelica.Units.SI.Temperature T_a2_nominal=26 + 273.15 "Nominal air inlet temperature"; - parameter Modelica.SIunits.Temperature T_b2_nominal=12 + 273.15 + parameter Modelica.Units.SI.Temperature T_b2_nominal=12 + 273.15 "Nominal air outlet temperature"; Buildings.Fluid.Sources.Boundary_pT sin_2( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/Validation/BaseClasses/PartialPlant.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/Validation/BaseClasses/PartialPlant.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/Validation/BaseClasses/PartialPlant.mo" 2022-03-10 09:57:40.160144399 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/Validation/BaseClasses/PartialPlant.mo" 2022-03-10 09:59:01.396154690 +0000 @@ -5,16 +5,16 @@ package MediumCHW = Buildings.Media.Water "Medium model"; package MediumCW = Buildings.Media.Water "Medium model"; - parameter Modelica.SIunits.MassFlowRate mCHW_flow_nominal=2567.1*1000/( + parameter Modelica.Units.SI.MassFlowRate mCHW_flow_nominal=2567.1*1000/( 4200*10) "Nominal mass flow rate at chilled water"; - parameter Modelica.SIunits.MassFlowRate mCW_flow_nominal=2567.1*1000/ ( + parameter Modelica.Units.SI.MassFlowRate mCW_flow_nominal=2567.1*1000/ ( 4200*8.5) "Nominal mass flow rate at condenser water"; - parameter Modelica.SIunits.PressureDifference dpCHW_nominal = 40000 + parameter Modelica.Units.SI.PressureDifference dpCHW_nominal = 40000 "Nominal pressure"; - parameter Modelica.SIunits.PressureDifference dpCW_nominal = 40000 + parameter Modelica.Units.SI.PressureDifference dpCW_nominal = 40000 "Nominal pressure"; parameter Integer numChi=1 "Number of chillers"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/Validation/CoolingCoilHumidifyingHeating_ClosedLoop.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/Validation/CoolingCoilHumidifyingHeating_ClosedLoop.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/Validation/CoolingCoilHumidifyingHeating_ClosedLoop.mo" 2022-03-10 09:57:40.160144399 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/Validation/CoolingCoilHumidifyingHeating_ClosedLoop.mo" 2022-03-10 09:59:01.384154688 +0000 @@ -12,7 +12,7 @@ offset=273.15 + 13, height=-6)); - parameter Modelica.SIunits.ThermalConductance UA_nominal=m2_flow_nominal*1006*(T_b2_nominal-T_a2_nominal)/ + parameter Modelica.Units.SI.ThermalConductance UA_nominal=m2_flow_nominal*1006*(T_b2_nominal-T_a2_nominal)/ Buildings.Fluid.HeatExchangers.BaseClasses.lmtd( T_a1_nominal, T_b1_nominal, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/Validation/CoolingCoilHumidifyingHeating_OpenLoop.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/Validation/CoolingCoilHumidifyingHeating_OpenLoop.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/Validation/CoolingCoilHumidifyingHeating_OpenLoop.mo" 2022-03-10 09:57:40.160144399 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/Validation/CoolingCoilHumidifyingHeating_OpenLoop.mo" 2022-03-10 09:59:01.372154686 +0000 @@ -4,7 +4,7 @@ extends Modelica.Icons.Example; extends Buildings.Applications.DataCenters.ChillerCooled.Equipment.Validation.BaseClasses.PartialAirHandlerMassFlow( sou_2(nPorts=1), relHum(k=0.5)); - parameter Modelica.SIunits.ThermalConductance UA_nominal=m2_flow_nominal*1006*(12-26)/ + parameter Modelica.Units.SI.ThermalConductance UA_nominal=m2_flow_nominal*1006*(12-26)/ Buildings.Fluid.HeatExchangers.BaseClasses.lmtd( T_a1_nominal, T_b1_nominal, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/Validation/ElectricChillerParallel.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/Validation/ElectricChillerParallel.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/Validation/ElectricChillerParallel.mo" 2022-03-10 09:57:40.160144399 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/Validation/ElectricChillerParallel.mo" 2022-03-10 09:59:01.360154685 +0000 @@ -5,16 +5,16 @@ package Medium1 = Buildings.Media.Water "Medium model"; package Medium2 = Buildings.Media.Water "Medium model"; - parameter Modelica.SIunits.Power P_nominal = -per1.QEva_flow_nominal/per1.COP_nominal + parameter Modelica.Units.SI.Power P_nominal = -per1.QEva_flow_nominal/per1.COP_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 = per1.mEva_flow_nominal + parameter Modelica.Units.SI.MassFlowRate mEva_flow_nominal = per1.mEva_flow_nominal "Nominal mass flow rate at evaporator"; - parameter Modelica.SIunits.MassFlowRate mCon_flow_nominal = per1.mCon_flow_nominal + parameter Modelica.Units.SI.MassFlowRate mCon_flow_nominal = per1.mCon_flow_nominal "Nominal mass flow rate at condenser"; parameter Buildings.Fluid.Chillers.Data.ElectricEIR.ElectricEIRChiller_McQuay_WSC_471kW_5_89COP_Vanes diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/Validation/HeatExchanger.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/Validation/HeatExchanger.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/Validation/HeatExchanger.mo" 2022-03-10 09:57:40.160144399 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/Validation/HeatExchanger.mo" 2022-03-10 09:59:01.336154681 +0000 @@ -4,13 +4,13 @@ extends Modelica.Icons.Example; package MediumW = Buildings.Media.Water "Medium model"; - parameter Modelica.SIunits.MassFlowRate m1_flow_nominal=1000 * 0.01035 + parameter Modelica.Units.SI.MassFlowRate m1_flow_nominal=1000 * 0.01035 "Nominal mass flow rate at evaporator"; - parameter Modelica.SIunits.MassFlowRate m2_flow_nominal=1000 * 0.01035 + parameter Modelica.Units.SI.MassFlowRate m2_flow_nominal=1000 * 0.01035 "Nominal mass flow rate at condenser"; - parameter Modelica.SIunits.Pressure dp1_nominal=60000 + parameter Modelica.Units.SI.Pressure dp1_nominal=60000 "Nominal pressure difference on medium 1 side"; - parameter Modelica.SIunits.Pressure dp2_nominal=60000 + parameter Modelica.Units.SI.Pressure dp2_nominal=60000 "Nominal pressure difference on medium 2 side"; Buildings.Applications.DataCenters.ChillerCooled.Equipment.HeatExchanger_TSet hex1( m1_flow_nominal=m1_flow_nominal, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/Validation/HeatExchanger_ResetController.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/Validation/HeatExchanger_ResetController.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/Validation/HeatExchanger_ResetController.mo" 2022-03-10 09:57:40.160144399 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/Validation/HeatExchanger_ResetController.mo" 2022-03-10 09:59:01.316154679 +0000 @@ -4,13 +4,13 @@ extends Modelica.Icons.Example; package MediumW = Buildings.Media.Water "Medium model"; - parameter Modelica.SIunits.MassFlowRate m1_flow_nominal=1000 * 0.01035 + parameter Modelica.Units.SI.MassFlowRate m1_flow_nominal=1000 * 0.01035 "Nominal mass flow rate at evaporator"; - parameter Modelica.SIunits.MassFlowRate m2_flow_nominal=1000 * 0.01035 + parameter Modelica.Units.SI.MassFlowRate m2_flow_nominal=1000 * 0.01035 "Nominal mass flow rate at condenser"; - parameter Modelica.SIunits.Pressure dp1_nominal=60000 + parameter Modelica.Units.SI.Pressure dp1_nominal=60000 "Nominal pressure difference on medium 1 side"; - parameter Modelica.SIunits.Pressure dp2_nominal=60000 + parameter Modelica.Units.SI.Pressure dp2_nominal=60000 "Nominal pressure difference on medium 2 side"; Buildings.Applications.DataCenters.ChillerCooled.Equipment.HeatExchanger_TSet hex1( m1_flow_nominal=m1_flow_nominal, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/Validation/PumpParallel.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/Validation/PumpParallel.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/Validation/PumpParallel.mo" 2022-03-10 09:57:40.160144399 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/Validation/PumpParallel.mo" 2022-03-10 09:59:01.244154671 +0000 @@ -4,7 +4,7 @@ package MediumW = Buildings.Media.Water "Medium model"; parameter Integer numPum=2 "The number of pumps"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=6000/3600*1.2 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=6000/3600*1.2 "Nominal mass flow rate"; parameter Real thr1=1E-4 "Threshold for shutoff valves in parallel 1"; parameter Real thr2=thr1*m_flow_nominal "Threshold for shutoff valves in parallel 2"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/Validation/WatersideEconomizer.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/Validation/WatersideEconomizer.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/Validation/WatersideEconomizer.mo" 2022-03-10 09:57:40.160144399 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/Validation/WatersideEconomizer.mo" 2022-03-10 09:59:01.228154668 +0000 @@ -6,16 +6,16 @@ package MediumCHW = Buildings.Media.Water "Medium model"; package MediumCW = Buildings.Media.Water "Medium model"; - parameter Modelica.SIunits.MassFlowRate mCHW_flow_nominal=2567.1*1000/( + parameter Modelica.Units.SI.MassFlowRate mCHW_flow_nominal=2567.1*1000/( 4200*10) "Nominal mass flow rate at chilled water"; - parameter Modelica.SIunits.MassFlowRate mCW_flow_nominal=2567.1*1000/ ( + parameter Modelica.Units.SI.MassFlowRate mCW_flow_nominal=2567.1*1000/ ( 4200*8.5) "Nominal mass flow rate at condenser water"; - parameter Modelica.SIunits.PressureDifference dpCHW_nominal = 40000 + parameter Modelica.Units.SI.PressureDifference dpCHW_nominal = 40000 "Nominal pressure"; - parameter Modelica.SIunits.PressureDifference dpCW_nominal = 40000 + parameter Modelica.Units.SI.PressureDifference dpCW_nominal = 40000 "Nominal pressure"; parameter Integer numChi=1 "Number of chillers"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/WatersideEconomizer.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/WatersideEconomizer.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/WatersideEconomizer.mo" 2022-03-10 09:57:40.160144399 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Equipment/WatersideEconomizer.mo" 2022-03-10 09:59:01.216154666 +0000 @@ -23,10 +23,10 @@ annotation(Dialog(tab="Dynamics",group="Filtered opening",enable=use_inputFilter)); // Heat exchanger - parameter Modelica.SIunits.Efficiency eta(start=0.8) "constant effectiveness"; + parameter Modelica.Units.SI.Efficiency eta(start=0.8) "constant effectiveness"; // Bypass valve parameters - parameter Modelica.SIunits.Time tauThrWayVal=10 + parameter Modelica.Units.SI.Time tauThrWayVal=10 "Time constant at nominal flow for dynamic energy and momentum balance of the three-way valve" annotation(Dialog(tab="Dynamics", group="Nominal condition", enable=use_controller and not energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState)); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Examples/BaseClasses/PartialDataCenter.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Examples/BaseClasses/PartialDataCenter.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Examples/BaseClasses/PartialDataCenter.mo" 2022-03-10 09:57:40.160144399 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/ChillerCooled/Examples/BaseClasses/PartialDataCenter.mo" 2022-03-10 09:59:01.184154662 +0000 @@ -6,24 +6,24 @@ // Chiller parameters parameter Integer numChi=2 "Number of chillers"; - parameter Modelica.SIunits.MassFlowRate m1_flow_chi_nominal= 34.7 + parameter Modelica.Units.SI.MassFlowRate m1_flow_chi_nominal= 34.7 "Nominal mass flow rate at condenser water in the chillers"; - parameter Modelica.SIunits.MassFlowRate m2_flow_chi_nominal= 18.3 + parameter Modelica.Units.SI.MassFlowRate m2_flow_chi_nominal= 18.3 "Nominal mass flow rate at evaporator water in the chillers"; - parameter Modelica.SIunits.PressureDifference dp1_chi_nominal = 46.2*1000 + parameter Modelica.Units.SI.PressureDifference dp1_chi_nominal = 46.2*1000 "Nominal pressure"; - parameter Modelica.SIunits.PressureDifference dp2_chi_nominal = 44.8*1000 + parameter Modelica.Units.SI.PressureDifference dp2_chi_nominal = 44.8*1000 "Nominal pressure"; - parameter Modelica.SIunits.Power QEva_nominal = m2_flow_chi_nominal*4200*(6.67-18.56) + parameter Modelica.Units.SI.Power QEva_nominal = m2_flow_chi_nominal*4200*(6.67-18.56) "Nominal cooling capaciaty(Negative means cooling)"; // WSE parameters - parameter Modelica.SIunits.MassFlowRate m1_flow_wse_nominal= 34.7 + parameter Modelica.Units.SI.MassFlowRate m1_flow_wse_nominal= 34.7 "Nominal mass flow rate at condenser water in the chillers"; - parameter Modelica.SIunits.MassFlowRate m2_flow_wse_nominal= 35.3 + parameter Modelica.Units.SI.MassFlowRate m2_flow_wse_nominal= 35.3 "Nominal mass flow rate at condenser water in the chillers"; - parameter Modelica.SIunits.PressureDifference dp1_wse_nominal = 33.1*1000 + parameter Modelica.Units.SI.PressureDifference dp1_wse_nominal = 33.1*1000 "Nominal pressure"; - parameter Modelica.SIunits.PressureDifference dp2_wse_nominal = 34.5*1000 + parameter Modelica.Units.SI.PressureDifference dp2_wse_nominal = 34.5*1000 "Nominal pressure"; parameter Buildings.Fluid.Movers.Data.Generic[numChi] perPumCW( @@ -32,28 +32,28 @@ V_flow=m1_flow_chi_nominal/1000*{0.2,0.6,1.0,1.2}, dp=(dp1_chi_nominal+60000+6000)*{1.2,1.1,1.0,0.6})) "Performance data for condenser water pumps"; - parameter Modelica.SIunits.Time tWai=1200 "Waiting time"; + parameter Modelica.Units.SI.Time tWai=1200 "Waiting time"; // AHU - parameter Modelica.SIunits.ThermalConductance UA_nominal=numChi*QEva_nominal/ + parameter Modelica.Units.SI.ThermalConductance UA_nominal=numChi*QEva_nominal/ Buildings.Fluid.HeatExchangers.BaseClasses.lmtd( 6.67, 11.56, 12, 25) "Thermal conductance at nominal flow for sensible heat, used to compute time constant"; - parameter Modelica.SIunits.MassFlowRate mAir_flow_nominal = 161.35 + parameter Modelica.Units.SI.MassFlowRate mAir_flow_nominal = 161.35 "Nominal air mass flowrate"; parameter Real yValMinAHU(min=0,max=1,unit="1")=0.1 "Minimum valve openning position"; // Set point - parameter Modelica.SIunits.Temperature TCHWSet = 273.15 + 8 + parameter Modelica.Units.SI.Temperature TCHWSet = 273.15 + 8 "Chilled water temperature setpoint"; - parameter Modelica.SIunits.Temperature TSupAirSet = TCHWSet + 10 + parameter Modelica.Units.SI.Temperature TSupAirSet = TCHWSet + 10 "Supply air temperature setpoint"; - parameter Modelica.SIunits.Temperature TRetAirSet = 273.15 + 25 + parameter Modelica.Units.SI.Temperature TRetAirSet = 273.15 + 25 "Supply air temperature setpoint"; - parameter Modelica.SIunits.Pressure dpSetPoi = 80000 + parameter Modelica.Units.SI.Pressure dpSetPoi = 80000 "Differential pressure setpoint"; replaceable Buildings.Applications.DataCenters.ChillerCooled.Equipment.BaseClasses.PartialChillerWSE chiWSE( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/DXCooled/Controls/AirsideEconomizer.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/DXCooled/Controls/AirsideEconomizer.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/DXCooled/Controls/AirsideEconomizer.mo" 2022-03-10 09:57:40.160144399 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/DXCooled/Controls/AirsideEconomizer.mo" 2022-03-10 09:59:00.992154639 +0000 @@ -4,7 +4,7 @@ parameter Real gai(min=Modelica.Constants.small) = 1 "Gain of controller" annotation(Dialog(group="Control")); - parameter Modelica.SIunits.Time Ti = 50 + parameter Modelica.Units.SI.Time Ti = 50 "Integrator time" annotation(Dialog(group="Control")); parameter Real minOAFra(min=0,max=1, final unit="1") diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/DXCooled/Controls/Compressor.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/DXCooled/Controls/Compressor.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/DXCooled/Controls/Compressor.mo" 2022-03-10 09:57:40.160144399 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/DXCooled/Controls/Compressor.mo" 2022-03-10 09:59:00.980154637 +0000 @@ -2,7 +2,7 @@ model Compressor "Controller for compressor speed" parameter Real k=0.5 "Gain of controller"; - parameter Modelica.SIunits.Time Ti=240 "Time constant of integrator block"; + parameter Modelica.Units.SI.Time Ti=240 "Time constant of integrator block"; parameter Real yMax=1 "Upper limit of output"; parameter Real yMin=0 "Lower limit of output"; parameter Boolean reverseActing=false diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/DXCooled/Controls/CoolingMode.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/DXCooled/Controls/CoolingMode.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/DXCooled/Controls/CoolingMode.mo" 2022-03-10 09:57:40.160144399 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/DXCooled/Controls/CoolingMode.mo" 2022-03-10 09:59:00.964154634 +0000 @@ -2,8 +2,8 @@ model CoolingMode "Controller for the DX cooling system with an airside economizer" - parameter Modelica.SIunits.Time tWai "Waiting time, set to avoid frequent switching"; - parameter Modelica.SIunits.TemperatureDifference dT(min=0.1) = 1.1 "Deadband"; + parameter Modelica.Units.SI.Time tWai "Waiting time, set to avoid frequent switching"; + parameter Modelica.Units.SI.TemperatureDifference dT(min=0.1) = 1.1 "Deadband"; Modelica.Blocks.Interfaces.RealInput TOutDryBul( final quantity="ThermodynamicTemperature", @@ -40,12 +40,12 @@ extent={{-10,10},{10,-10}}, rotation=-90, origin={0,8}))); - Modelica.StateGraph.InitialStepWithSignal freCoo(nIn=1) "Free cooling mode" + Modelica.StateGraph.InitialStepWithSignal freCoo(nOut = 1, nIn = 1) "Free cooling mode" annotation (Placement(transformation( extent={{-10,10},{10,-10}}, rotation=-90, origin={0,58}))); - Modelica.StateGraph.StepWithSignal fulMecCoo "Fully mechanical cooling mode" + Modelica.StateGraph.StepWithSignal fulMecCoo(nIn = 1, nOut = 1) "Fully mechanical cooling mode" annotation (Placement(transformation( extent={{-10,10},{10,-10}}, rotation=-90, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/DXCooled/Controls/Validation/AirsideEconomizer.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/DXCooled/Controls/Validation/AirsideEconomizer.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/DXCooled/Controls/Validation/AirsideEconomizer.mo" 2022-03-10 09:57:40.160144399 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/DXCooled/Controls/Validation/AirsideEconomizer.mo" 2022-03-10 09:59:00.944154632 +0000 @@ -5,7 +5,7 @@ extends Modelica.Icons.Example; replaceable package Medium = Buildings.Media.Air; - parameter Modelica.SIunits.MassFlowRate mA_flow_nominal=0.43 + parameter Modelica.Units.SI.MassFlowRate mA_flow_nominal=0.43 "Nominal air flowrate"; Buildings.Applications.DataCenters.DXCooled.Controls.AirsideEconomizer con( minOAFra= 0, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/DXCooled/Controls/Validation/Compressor.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/DXCooled/Controls/Validation/Compressor.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/DXCooled/Controls/Validation/Compressor.mo" 2022-03-10 09:57:40.160144399 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/DXCooled/Controls/Validation/Compressor.mo" 2022-03-10 09:59:00.928154631 +0000 @@ -11,7 +11,7 @@ annotation (Placement(transformation(extent={{-60,60},{-40,80}}))); Modelica.Blocks.Sources.Sine TSupMea( amplitude=2, - freqHz=1/120, +f =1/120, offset=291.15) "Measured supply air temperature" annotation (Placement(transformation(extent={{-60,10},{-40,30}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/DXCooled/Examples/DXCooledAirsideEconomizer.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/DXCooled/Examples/DXCooledAirsideEconomizer.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/DXCooled/Examples/DXCooledAirsideEconomizer.mo" 2022-03-10 09:57:40.160144399 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Applications/DataCenters/DXCooled/Examples/DXCooledAirsideEconomizer.mo" 2022-03-10 09:59:00.904154627 +0000 @@ -18,24 +18,24 @@ replaceable package Medium = Buildings.Media.Air "Medium model"; // Air temperatures at design conditions - parameter Modelica.SIunits.Temperature TASup_nominal = 286.15 + parameter Modelica.Units.SI.Temperature TASup_nominal = 286.15 "Nominal air temperature supplied to room"; - parameter Modelica.SIunits.Temperature TRooSet = 298.15 + parameter Modelica.Units.SI.Temperature TRooSet = 298.15 "Nominal room air temperature"; - parameter Modelica.SIunits.Temperature TAirSupSet = 291.13 + parameter Modelica.Units.SI.Temperature TAirSupSet = 291.13 "Nominal room air temperature"; ///////////////////////////////////////////////////////// // Cooling loads - parameter Modelica.SIunits.HeatFlowRate QRooInt_flow= + parameter Modelica.Units.SI.HeatFlowRate QRooInt_flow= 500000 "Internal heat gains of the room"; - parameter Modelica.SIunits.HeatFlowRate QRooC_flow_nominal= + parameter Modelica.Units.SI.HeatFlowRate QRooC_flow_nominal= -2*QRooInt_flow; //////////////////////////////////////////////////////////// // DX Coil - parameter Modelica.SIunits.MassFlowRate mA_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate mA_flow_nominal= QRooC_flow_nominal/1006/(TASup_nominal-TRooSet) "Nominal air mass flow rate"; - parameter Modelica.SIunits.HeatFlowRate QCoiC_flow_nominal= + parameter Modelica.Units.SI.HeatFlowRate QCoiC_flow_nominal= QRooC_flow_nominal "Cooling load of coil"; parameter Real minSpeFan = 0.2 diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/GroundTemperature/BaseClasses/surfaceTemperature.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/GroundTemperature/BaseClasses/surfaceTemperature.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/GroundTemperature/BaseClasses/surfaceTemperature.mo" 2022-03-10 09:57:40.160144399 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/GroundTemperature/BaseClasses/surfaceTemperature.mo" 2022-03-10 09:59:00.832154619 +0000 @@ -13,14 +13,14 @@ protected constant Integer Year=365 "Year period in days"; constant Integer secInDay = 24 * 60 * 60 "Seconds in a day"; - constant Modelica.SIunits.Angle pi = Modelica.Constants.pi; - constant Modelica.SIunits.Temperature TFre = 273.15 "Freezing temperature of water"; + constant Modelica.Units.SI.Angle pi = Modelica.Constants.pi; + constant Modelica.Units.SI.Temperature TFre = 273.15 "Freezing temperature of water"; constant Real freq = 2 * pi / Year "Year frequency in rad/days"; - parameter Modelica.SIunits.Temperature TAirDayMea[Year] = {cliCon.TSurMea + cliCon.TSurAmp / freq * ( + parameter Modelica.Units.SI.Temperature TAirDayMea[Year] = {cliCon.TSurMea + cliCon.TSurAmp / freq * ( cos(freq * (cliCon.sinPha / secInDay - day)) - cos(freq * (cliCon.sinPha / secInDay - (day + 1)))) for day in 1:Year} "Daily mean air temperature (surface = 0 from uncorrected climatic constants)"; - parameter Modelica.SIunits.Temperature TSurDayMea[Year] = { + parameter Modelica.Units.SI.Temperature TSurDayMea[Year] = { if TAirDayMea[day] > TFre then (TFre + (TAirDayMea[day] - TFre) * nFacTha) else (TFre + (TAirDayMea[day] - TFre) * nFacFre) @@ -28,13 +28,13 @@ parameter Real C1 = sum({TSurDayMea[day] * cos(freq * day) for day in 1:Year}); parameter Real C2 = sum({TSurDayMea[day] * sin(freq * day) for day in 1:Year}); - parameter Modelica.SIunits.Temperature corTSurMea = sum(TSurDayMea)/Year + + parameter Modelica.Units.SI.Temperature corTSurMea = sum(TSurDayMea)/Year "Mean annual surface temperature"; - parameter Modelica.SIunits.TemperatureDifference corTSurAmp = 2/Year .* (C1^2 + C2^2)^0.5 + parameter Modelica.Units.SI.TemperatureDifference corTSurAmp = 2/Year .* (C1^2 + C2^2)^0.5 "Surface temperature amplitude"; - parameter Modelica.SIunits.Duration corSinPha(displayUnit="d") = (Modelica.Math.atan(C2/C1) + pi/2)*secInDay/freq + parameter Modelica.Units.SI.Duration corSinPha(displayUnit="d") = (Modelica.Math.atan(C2/C1) + pi/2)*secInDay/freq "Phase lag of soil surface temperature"; - algorithm // Analytical mean by integrating undisturbed soil temperature formula corCliCon := ClimaticConstants.Generic( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/GroundTemperature/ClimaticConstants.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/GroundTemperature/ClimaticConstants.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/GroundTemperature/ClimaticConstants.mo" 2022-03-10 09:57:40.160144399 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/GroundTemperature/ClimaticConstants.mo" 2022-03-10 09:59:00.820154617 +0000 @@ -4,11 +4,11 @@ record Generic "Generic climatic constants" extends Modelica.Icons.Record; - parameter Modelica.SIunits.Temperature TSurMea + parameter Modelica.Units.SI.Temperature TSurMea "Mean annual surface temperature"; - parameter Modelica.SIunits.TemperatureDifference TSurAmp + parameter Modelica.Units.SI.TemperatureDifference TSurAmp "Surface temperature amplitude"; - parameter Modelica.SIunits.Duration sinPha(displayUnit="d") + parameter Modelica.Units.SI.Duration sinPha(displayUnit="d") "Phase lag of soil surface temperature"; end Generic; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/GroundTemperature/Examples/UndisturbedSoilTemperature.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/GroundTemperature/Examples/UndisturbedSoilTemperature.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/GroundTemperature/Examples/UndisturbedSoilTemperature.mo" 2022-03-10 09:57:40.160144399 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/GroundTemperature/Examples/UndisturbedSoilTemperature.mo" 2022-03-10 09:59:00.736154605 +0000 @@ -3,7 +3,7 @@ extends Modelica.Icons.Example; parameter Integer nSoi = 4 "Number of probed depths"; - parameter Modelica.SIunits.Length dep[nSoi] = {0,2,5,9} "Probed depths"; + parameter Modelica.Units.SI.Length dep[nSoi] = {0,2,5,9} "Probed depths"; Buildings.BoundaryConditions.GroundTemperature.UndisturbedSoilTemperature TSoi[nSoi](dep=dep, each cliCon=cliCon, each soiDat=soiDat) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/GroundTemperature/UndisturbedSoilTemperature.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/GroundTemperature/UndisturbedSoilTemperature.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/GroundTemperature/UndisturbedSoilTemperature.mo" 2022-03-10 09:57:40.160144399 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/GroundTemperature/UndisturbedSoilTemperature.mo" 2022-03-10 09:59:00.724154604 +0000 @@ -1,6 +1,6 @@ within Buildings.BoundaryConditions.GroundTemperature; model UndisturbedSoilTemperature "Undisturbed soil temperature" - parameter Modelica.SIunits.Length dep "Depth"; + parameter Modelica.Units.SI.Length dep "Depth"; parameter Boolean useNFac = false "= true, use n-factors to correct climatic constants"; @@ -20,15 +20,15 @@ replaceable parameter ClimaticConstants.Generic cliCon "Surface temperature climatic conditions"; - Modelica.SIunits.Temperature T + Modelica.Units.SI.Temperature T "Undisturbed soil temperature at depth dep"; protected - constant Modelica.SIunits.Angle pi = Modelica.Constants.pi; - constant Modelica.SIunits.Duration Year = 365.2422*24*60*60 + constant Modelica.Units.SI.Angle pi = Modelica.Constants.pi; + constant Modelica.Units.SI.Duration Year = 365.2422*24*60*60 "Annual period length"; - parameter Modelica.SIunits.Length corDep = if useCon + parameter Modelica.Units.SI.Length corDep = if useCon then dep + soiDat.k / hSur else dep "Convection-corrected depth"; @@ -37,9 +37,9 @@ else cliCon "n-factor corrected climatic constants"; - parameter Modelica.SIunits.ThermalDiffusivity + parameter Modelica.Units.SI.ThermalDiffusivity soiDif = soiDat.k / soiDat.c / soiDat.d "Soil diffusivity"; - parameter Modelica.SIunits.Duration + parameter Modelica.Units.SI.Duration timLag = corCliCon.sinPha "Start time of surface temperature sinusoid"; parameter Real pha = - corDep * (pi/soiDif/Year)^0.5 diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/SkyTemperature/BlackBody.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/SkyTemperature/BlackBody.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/SkyTemperature/BlackBody.mo" 2022-03-10 09:57:40.160144399 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/SkyTemperature/BlackBody.mo" 2022-03-10 09:59:00.704154601 +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 8.1.0/BoundaryConditions/SolarGeometry/BaseClasses/Examples/SolarAzimuth.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/SolarGeometry/BaseClasses/Examples/SolarAzimuth.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/SolarGeometry/BaseClasses/Examples/SolarAzimuth.mo" 2022-03-10 09:57:40.164144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/SolarGeometry/BaseClasses/Examples/SolarAzimuth.mo" 2022-03-10 09:59:00.632154593 +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 8.1.0/BoundaryConditions/SolarGeometry/BaseClasses/Examples/WallSolarAzimuth.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/SolarGeometry/BaseClasses/Examples/WallSolarAzimuth.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/SolarGeometry/BaseClasses/Examples/WallSolarAzimuth.mo" 2022-03-10 09:57:40.164144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/SolarGeometry/BaseClasses/Examples/WallSolarAzimuth.mo" 2022-03-10 09:59:00.616154590 +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 8.1.0/BoundaryConditions/SolarGeometry/BaseClasses/IncidenceAngle.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/SolarGeometry/BaseClasses/IncidenceAngle.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/SolarGeometry/BaseClasses/IncidenceAngle.mo" 2022-03-10 09:57:40.164144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/SolarGeometry/BaseClasses/IncidenceAngle.mo" 2022-03-10 09:59:00.600154589 +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="deg") + parameter Modelica.Units.SI.Angle lat "Latitude"; + parameter Modelica.Units.SI.Angle azi(displayUnit="deg") "Surface azimuth. azi=-90 degree if surface outward unit normal points toward east; azi=0 if it points toward south"; - parameter Modelica.SIunits.Angle til(displayUnit="deg") + parameter Modelica.Units.SI.Angle til(displayUnit="deg") "Surface tilt. til=90 degree for walls; til=0 for ceilings; til=180 for roof"; Modelica.Blocks.Interfaces.RealInput solHouAng(quantity="Angle", unit="rad") "Solar hour angle" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/SolarGeometry/BaseClasses/SolarAzimuth.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/SolarGeometry/BaseClasses/SolarAzimuth.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/SolarGeometry/BaseClasses/SolarAzimuth.mo" 2022-03-10 09:57:40.164144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/SolarGeometry/BaseClasses/SolarAzimuth.mo" 2022-03-10 09:59:00.592154588 +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}}))); @@ -22,8 +22,8 @@ Real tmp "cos(solAzi) before data validity check"; Real solAziTem "Temporary variable for solar azimuth"; - constant Modelica.SIunits.Time day=86400 "Number of seconds in a day"; - constant Modelica.SIunits.Angle polarCircle = 1.1617 + constant Modelica.Units.SI.Time day=86400 "Number of seconds in a day"; + constant Modelica.Units.SI.Angle polarCircle = 1.1617 "Latitude of polar circle (66 degree 33 min 44 sec)"; final parameter Boolean outsidePolarCircle = lat < polarCircle and lat > -polarCircle "Flag, true if latitude is outside polar region"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/SolarGeometry/BaseClasses/WallSolarAzimuth.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/SolarGeometry/BaseClasses/WallSolarAzimuth.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/SolarGeometry/BaseClasses/WallSolarAzimuth.mo" 2022-03-10 09:57:40.164144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/SolarGeometry/BaseClasses/WallSolarAzimuth.mo" 2022-03-10 09:59:00.580154587 +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 8.1.0/BoundaryConditions/SolarGeometry/BaseClasses/ZenithAngle.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/SolarGeometry/BaseClasses/ZenithAngle.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/SolarGeometry/BaseClasses/ZenithAngle.mo" 2022-03-10 09:57:40.164144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/SolarGeometry/BaseClasses/ZenithAngle.mo" 2022-03-10 09:59:00.572154585 +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 8.1.0/BoundaryConditions/SolarGeometry/Examples/ProjectedShadowLength.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/SolarGeometry/Examples/ProjectedShadowLength.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/SolarGeometry/Examples/ProjectedShadowLength.mo" 2022-03-10 09:57:40.164144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/SolarGeometry/Examples/ProjectedShadowLength.mo" 2022-03-10 09:59:00.544154581 +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 8.1.0/BoundaryConditions/SolarGeometry/IncidenceAngle.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/SolarGeometry/IncidenceAngle.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/SolarGeometry/IncidenceAngle.mo" 2022-03-10 09:57:40.164144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/SolarGeometry/IncidenceAngle.mo" 2022-03-10 09:59:00.532154580 +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 8.1.0/BoundaryConditions/SolarGeometry/ProjectedShadowLength.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/SolarGeometry/ProjectedShadowLength.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/SolarGeometry/ProjectedShadowLength.mo" 2022-03-10 09:57:40.164144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/SolarGeometry/ProjectedShadowLength.mo" 2022-03-10 09:59:00.516154579 +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( absFilNam) "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( absFilNam) "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(absFilNam) "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 8.1.0/BoundaryConditions/SolarGeometry/ZenithAngle.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/SolarGeometry/ZenithAngle.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/SolarGeometry/ZenithAngle.mo" 2022-03-10 09:57:40.164144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/SolarGeometry/ZenithAngle.mo" 2022-03-10 09:59:00.488154574 +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 8.1.0/BoundaryConditions/SolarIrradiation/BaseClasses/DiffuseIsotropic.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/SolarIrradiation/BaseClasses/DiffuseIsotropic.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/SolarIrradiation/BaseClasses/DiffuseIsotropic.mo" 2022-03-10 09:57:40.164144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/SolarIrradiation/BaseClasses/DiffuseIsotropic.mo" 2022-03-10 09:59:00.404154564 +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 8.1.0/BoundaryConditions/SolarIrradiation/BaseClasses/DiffusePerez.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/SolarIrradiation/BaseClasses/DiffusePerez.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/SolarIrradiation/BaseClasses/DiffusePerez.mo" 2022-03-10 09:57:40.164144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/SolarIrradiation/BaseClasses/DiffusePerez.mo" 2022-03-10 09:59:00.396154564 +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 8.1.0/BoundaryConditions/SolarIrradiation/BaseClasses/PartialSolarIrradiation.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/SolarIrradiation/BaseClasses/PartialSolarIrradiation.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/SolarIrradiation/BaseClasses/PartialSolarIrradiation.mo" 2022-03-10 09:57:40.164144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/SolarIrradiation/BaseClasses/PartialSolarIrradiation.mo" 2022-03-10 09:59:00.344154556 +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 8.1.0/BoundaryConditions/SolarIrradiation/BaseClasses/SkyClearness.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/SolarIrradiation/BaseClasses/SkyClearness.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/SolarIrradiation/BaseClasses/SkyClearness.mo" 2022-03-10 09:57:40.164144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/SolarIrradiation/BaseClasses/SkyClearness.mo" 2022-03-10 09:59:00.328154555 +0000 @@ -20,13 +20,13 @@ annotation (Placement(transformation(extent={{100,-10},{120,10}}))); // Set hSmall so that hSmall + deltaX < 1E-4. See info section. protected - constant Modelica.SIunits.Irradiance hSmall = 0.5e-4 + constant Modelica.Units.SI.Irradiance hSmall = 0.5e-4 "Small radiation for regularization"; - constant Modelica.SIunits.Irradiance deltaX = hSmall/2 + constant Modelica.Units.SI.Irradiance deltaX = hSmall/2 "Small radiation for regularization"; constant Real k = 5.534e-6*(180/Modelica.Constants.pi)^3 "Constant factor"; Real tmp1 "Intermediate variable"; - Modelica.SIunits.Irradiance HDifHorBou + Modelica.Units.SI.Irradiance HDifHorBou "Diffuse horizontal irradiation, bounded away from zero"; equation tmp1 = k*zen^3; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/SolarIrradiation/DiffusePerez.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/SolarIrradiation/DiffusePerez.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/SolarIrradiation/DiffusePerez.mo" 2022-03-10 09:57:40.164144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/SolarIrradiation/DiffusePerez.mo" 2022-03-10 09:59:00.296154551 +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 8.1.0/BoundaryConditions/SolarIrradiation/DirectTiltedSurface.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/SolarIrradiation/DirectTiltedSurface.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/SolarIrradiation/DirectTiltedSurface.mo" 2022-03-10 09:57:40.164144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/SolarIrradiation/DirectTiltedSurface.mo" 2022-03-10 09:59:00.264154547 +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"; Modelica.Blocks.Interfaces.RealOutput inc( final quantity="Angle", diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/SolarIrradiation/Examples/DiffusePerez.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/SolarIrradiation/Examples/DiffusePerez.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/SolarIrradiation/Examples/DiffusePerez.mo" 2022-03-10 09:57:40.164144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/SolarIrradiation/Examples/DiffusePerez.mo" 2022-03-10 09:59:00.240154543 +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.Utilities.Files.loadResource("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 8.1.0/BoundaryConditions/SolarIrradiation/Examples/DirectTiltedSurface.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/SolarIrradiation/Examples/DirectTiltedSurface.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/SolarIrradiation/Examples/DirectTiltedSurface.mo" 2022-03-10 09:57:40.164144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/SolarIrradiation/Examples/DirectTiltedSurface.mo" 2022-03-10 09:59:00.228154541 +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.Utilities.Files.loadResource("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 8.1.0/BoundaryConditions/Validation/BESTEST/WD100.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/Validation/BESTEST/WD100.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/Validation/BESTEST/WD100.mo" 2022-03-10 09:57:40.164144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/Validation/BESTEST/WD100.mo" 2022-03-10 09:59:00.200154539 +0000 @@ -2,11 +2,11 @@ model WD100 "Test model for BESTEST weather data: base case" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Angle lat=0.6952170009469 + parameter Modelica.Units.SI.Angle lat=0.6952170009469 "Latitude angle"; parameter Real rho=0 "Ground reflectance"; - parameter Modelica.SIunits.Length alt=1650 + parameter Modelica.Units.SI.Length alt=1650 "Altitude"; WeatherData.ReaderTMY3 weaDatHHorIR( pAtmSou=Buildings.BoundaryConditions.Types.DataSource.File, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/Validation/IsotropicAndPerezDiffuseRadiation.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/Validation/IsotropicAndPerezDiffuseRadiation.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/Validation/IsotropicAndPerezDiffuseRadiation.mo" 2022-03-10 09:57:40.164144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/Validation/IsotropicAndPerezDiffuseRadiation.mo" 2022-03-10 09:59:00.140154530 +0000 @@ -7,13 +7,13 @@ final unit="W/m2") "Radiation per unit area using Perez Model" annotation (Placement(transformation(extent={{100,-50},{120,-30}}))); - parameter Modelica.SIunits.Angle til( + parameter Modelica.Units.SI.Angle til( displayUnit="deg") "Surface tilt angle"; - parameter Modelica.SIunits.Angle lat( + parameter Modelica.Units.SI.Angle lat( displayUnit="deg") "Latitude angle"; - parameter Modelica.SIunits.Angle azi( + parameter Modelica.Units.SI.Angle azi( displayUnit="deg") "Azimuth angle"; parameter Real rho=0.2 diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/WeatherData/BaseClasses/CheckBlackBodySkyTemperature.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/WeatherData/BaseClasses/CheckBlackBodySkyTemperature.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/WeatherData/BaseClasses/CheckBlackBodySkyTemperature.mo" 2022-03-10 09:57:40.164144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/WeatherData/BaseClasses/CheckBlackBodySkyTemperature.mo" 2022-03-10 09:59:00.048154520 +0000 @@ -3,9 +3,9 @@ "Check the validity of the black-body sky temperature data" extends Modelica.Blocks.Icons.Block; - 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"; Modelica.Blocks.Interfaces.RealInput TIn( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/WeatherData/BaseClasses/CheckDewPointTemperature.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/WeatherData/BaseClasses/CheckDewPointTemperature.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/WeatherData/BaseClasses/CheckDewPointTemperature.mo" 2022-03-10 09:57:40.164144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/WeatherData/BaseClasses/CheckDewPointTemperature.mo" 2022-03-10 09:59:00.040154517 +0000 @@ -13,11 +13,11 @@ displayUnit="degC") "Dew point 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 TDewPoi = TIn; assert(noEvent(TIn > TMin and TIn < TMax), "In " + getInstanceName() + diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/WeatherData/BaseClasses/CheckDryBulbTemperature.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/WeatherData/BaseClasses/CheckDryBulbTemperature.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/WeatherData/BaseClasses/CheckDryBulbTemperature.mo" 2022-03-10 09:57:40.164144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/WeatherData/BaseClasses/CheckDryBulbTemperature.mo" 2022-03-10 09:59:00.028154516 +0000 @@ -13,11 +13,11 @@ displayUnit="degC") "Dry bulb 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 TDryBul = TIn; assert(noEvent(TIn > TMin and TIn < TMax), "In " + getInstanceName() + diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/WeatherData/BaseClasses/CheckPressure.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/WeatherData/BaseClasses/CheckPressure.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/WeatherData/BaseClasses/CheckPressure.mo" 2022-03-10 09:57:40.164144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/WeatherData/BaseClasses/CheckPressure.mo" 2022-03-10 09:59:00.020154515 +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 pAtm = PIn; assert(noEvent(PIn > PMin and PIn < PMax), "In " + getInstanceName() + diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/WeatherData/BaseClasses/ConvertTime.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/WeatherData/BaseClasses/ConvertTime.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/WeatherData/BaseClasses/ConvertTime.mo" 2022-03-10 09:57:40.164144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/WeatherData/BaseClasses/ConvertTime.mo" 2022-03-10 09:59:00.012154515 +0000 @@ -3,8 +3,8 @@ "Converts the simulation time to calendar time in scale of 1 year (365 days), or a multiple of a year" extends Modelica.Blocks.Icons.Block; - parameter Modelica.SIunits.Time weaDatStaTim(displayUnit="d") "Start time of weather data"; - parameter Modelica.SIunits.Time weaDatEndTim(displayUnit="d") "End time of weather data"; + parameter Modelica.Units.SI.Time weaDatStaTim(displayUnit="d") "Start time of weather data"; + parameter Modelica.Units.SI.Time weaDatEndTim(displayUnit="d") "End time of weather data"; Modelica.Blocks.Interfaces.RealInput modTim( final quantity="Time", @@ -16,14 +16,14 @@ annotation (Placement(transformation(extent={{100,-10},{120,10}}))); protected - constant Modelica.SIunits.Time shiftSolarRad=1800 "Number of seconds for the shift for solar radiation calculation"; - parameter Modelica.SIunits.Time lenWea = weaDatEndTim-weaDatStaTim "Length of weather data"; + constant Modelica.Units.SI.Time shiftSolarRad=1800 "Number of seconds for the shift for solar radiation calculation"; + parameter Modelica.Units.SI.Time lenWea = weaDatEndTim-weaDatStaTim "Length of weather data"; parameter Boolean canRepeatWeatherFile = abs(mod(lenWea, 365*24*3600)) < 1E-2 "=true, if the weather file can be repeated, since it has the length of a year or a multiple of it"; - discrete Modelica.SIunits.Time tNext(start=0, fixed=true) "Start time of next period"; + discrete Modelica.Units.SI.Time tNext(start=0, fixed=true) "Start time of next period"; equation when {initial(), canRepeatWeatherFile and modTim > pre(tNext)} then // simulation time stamp went over the end time of the weather file diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/WeatherData/BaseClasses/Examples/GetHeaderElement.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/WeatherData/BaseClasses/Examples/GetHeaderElement.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/WeatherData/BaseClasses/Examples/GetHeaderElement.mo" 2022-03-10 09:57:40.164144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/WeatherData/BaseClasses/Examples/GetHeaderElement.mo" 2022-03-10 09:58:59.948154507 +0000 @@ -1,11 +1,11 @@ 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"; parameter String filNam = Modelica.Utilities.Files.loadResource("modelica://Buildings/Resources/weatherdata/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.mos") diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/WeatherData/BaseClasses/Examples/GetTimeSpanTMY3.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/WeatherData/BaseClasses/Examples/GetTimeSpanTMY3.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/WeatherData/BaseClasses/Examples/GetTimeSpanTMY3.mo" 2022-03-10 09:57:40.164144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/WeatherData/BaseClasses/Examples/GetTimeSpanTMY3.mo" 2022-03-10 09:58:59.940154505 +0000 @@ -7,13 +7,13 @@ "Name of weather data file"; parameter String tabNam = "tab1" "Name of table on weather file"; - parameter Modelica.SIunits.Time[2] timeSpan(each fixed=false) + parameter Modelica.Units.SI.Time[2] timeSpan(each fixed=false) "Start time, end time of weather data"; protected - constant Modelica.SIunits.Time endTim = 365*24*3600.; - constant Modelica.SIunits.Time staTim = 0.; + constant Modelica.Units.SI.Time endTim = 365*24*3600.; + constant Modelica.Units.SI.Time staTim = 0.; initial equation timeSpan = Buildings.BoundaryConditions.WeatherData.BaseClasses.getTimeSpanTMY3( filNam, tabNam); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/WeatherData/BaseClasses/Examples/GetTimeSpanTMY3LongHeader.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/WeatherData/BaseClasses/Examples/GetTimeSpanTMY3LongHeader.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/WeatherData/BaseClasses/Examples/GetTimeSpanTMY3LongHeader.mo" 2022-03-10 09:57:40.164144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/WeatherData/BaseClasses/Examples/GetTimeSpanTMY3LongHeader.mo" 2022-03-10 09:58:59.936154505 +0000 @@ -7,7 +7,7 @@ "modelica://Buildings/Resources/Data/BoundaryConditions/WeatherData/BaseClasses/Examples/weatherWithLongHeader.mos") "Name of weather data file"; - final parameter Modelica.SIunits.Time[2] timeSpan= + final parameter Modelica.Units.SI.Time[2] timeSpan= Buildings.BoundaryConditions.WeatherData.BaseClasses.getTimeSpanTMY3(filNam, "tab1") "Start time, end time of weather data"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/WeatherData/BaseClasses/LocalCivilTime.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/WeatherData/BaseClasses/LocalCivilTime.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/WeatherData/BaseClasses/LocalCivilTime.mo" 2022-03-10 09:57:40.164144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/WeatherData/BaseClasses/LocalCivilTime.mo" 2022-03-10 09:58:59.872154497 +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 8.1.0/BoundaryConditions/WeatherData/BaseClasses/SourceSelectorRadiation.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/WeatherData/BaseClasses/SourceSelectorRadiation.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/WeatherData/BaseClasses/SourceSelectorRadiation.mo" 2022-03-10 09:57:40.164144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/WeatherData/BaseClasses/SourceSelectorRadiation.mo" 2022-03-10 09:58:59.784154486 +0000 @@ -86,7 +86,7 @@ protected constant Real epsCos = 1e-6 "Small value to avoid division by 0"; - constant Modelica.SIunits.HeatFlux solCon = 1367.7 "Solar constant"; + constant Modelica.Units.SI.HeatFlux solCon = 1367.7 "Solar constant"; // Conditional connectors Modelica.Blocks.Interfaces.RealInput HGloHor_in_internal( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/WeatherData/BaseClasses/getLatitudeTMY3.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/WeatherData/BaseClasses/getLatitudeTMY3.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/WeatherData/BaseClasses/getLatitudeTMY3.mo" 2022-03-10 09:57:40.164144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/WeatherData/BaseClasses/getLatitudeTMY3.mo" 2022-03-10 09:58:59.744154480 +0000 @@ -5,7 +5,7 @@ annotation (Dialog( loadSelector(filter="Weather files (*.mos)", caption= "Select weather file"))); - output Modelica.SIunits.Angle lat "Latitude from the weather file"; + output Modelica.Units.SI.Angle lat "Latitude from the weather file"; protected Integer nexInd "Next index, used for error handling"; String element "String representation of the returned element"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/WeatherData/BaseClasses/getLongitudeTMY3.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/WeatherData/BaseClasses/getLongitudeTMY3.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/WeatherData/BaseClasses/getLongitudeTMY3.mo" 2022-03-10 09:57:40.164144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/WeatherData/BaseClasses/getLongitudeTMY3.mo" 2022-03-10 09:58:59.736154479 +0000 @@ -5,7 +5,7 @@ annotation (Dialog( loadSelector(filter="Weather files (*.mos)", caption= "Select weather file"))); - output Modelica.SIunits.Angle lon "Longitude from the weather file"; + output Modelica.Units.SI.Angle lon "Longitude from the weather file"; protected Integer nexInd "Next index, used for error handling"; String element "String representation of the returned element"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/WeatherData/BaseClasses/getTimeSpanTMY3.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/WeatherData/BaseClasses/getTimeSpanTMY3.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/WeatherData/BaseClasses/getTimeSpanTMY3.mo" 2022-03-10 09:57:40.164144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/WeatherData/BaseClasses/getTimeSpanTMY3.mo" 2022-03-10 09:58:59.732154480 +0000 @@ -5,7 +5,7 @@ input String filNam "Name of weather data file"; input String tabNam "Name of table on weather file"; - output Modelica.SIunits.Time[2] timeSpan "Start time, end time of weather data"; + output Modelica.Units.SI.Time[2] timeSpan "Start time, end time of weather data"; external "C" getTimeSpan(filNam, tabNam, timeSpan) annotation ( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/WeatherData/BaseClasses/getTimeZoneTMY3.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/WeatherData/BaseClasses/getTimeZoneTMY3.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/WeatherData/BaseClasses/getTimeZoneTMY3.mo" 2022-03-10 09:57:40.164144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/WeatherData/BaseClasses/getTimeZoneTMY3.mo" 2022-03-10 09:58:59.724154477 +0000 @@ -5,7 +5,7 @@ annotation (Dialog( loadSelector(filter="Weather files (*.mos)", caption= "Select weather file"))); - output Modelica.SIunits.Time timZon "Time zone from the weather file"; + output Modelica.Units.SI.Time timZon "Time zone from the weather file"; protected Integer nexInd "Next index, used for error handling"; String element "String representation of the returned element"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/WeatherData/ReaderTMY3.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/WeatherData/ReaderTMY3.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/WeatherData/ReaderTMY3.mo" 2022-03-10 09:57:40.164144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/WeatherData/ReaderTMY3.mo" 2022-03-10 09:58:59.704154475 +0000 @@ -18,7 +18,7 @@ parameter Buildings.BoundaryConditions.Types.DataSource pAtmSou=Buildings.BoundaryConditions.Types.DataSource.Parameter "Atmospheric pressure" annotation (Evaluate=true, HideResult=true, Dialog(tab="Data source")); - parameter Modelica.SIunits.Pressure pAtm=101325 + parameter Modelica.Units.SI.Pressure pAtm=101325 "Atmospheric pressure (used if pAtmSou=Parameter)" annotation (Dialog(tab="Data source")); Modelica.Blocks.Interfaces.RealInput pAtm_in( @@ -34,7 +34,7 @@ parameter Buildings.BoundaryConditions.Types.DataSource TDryBulSou=Buildings.BoundaryConditions.Types.DataSource.File "Dry bulb temperature" annotation (Evaluate=true, HideResult=true, Dialog(tab="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(tab="Data source")); Modelica.Blocks.Interfaces.RealInput TDryBul_in( @@ -49,7 +49,7 @@ parameter Buildings.BoundaryConditions.Types.DataSource TDewPoiSou=Buildings.BoundaryConditions.Types.DataSource.File "Dew point temperature" annotation (Evaluate=true, HideResult=true, Dialog(tab="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(tab="Data source")); Modelica.Blocks.Interfaces.RealInput TDewPoi_in( @@ -63,7 +63,7 @@ // Black body sky temperature parameter Buildings.BoundaryConditions.Types.DataSource TBlaSkySou=Buildings.BoundaryConditions.Types.DataSource.File "Black-body sky temperature" annotation (Evaluate=true, HideResult=true, Dialog(tab="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(tab="Data source")); Modelica.Blocks.Interfaces.RealInput TBlaSky_in( @@ -94,7 +94,7 @@ // Wind speed parameter Buildings.BoundaryConditions.Types.DataSource winSpeSou=Buildings.BoundaryConditions.Types.DataSource.File "Wind speed" annotation (Evaluate=true, HideResult=true, Dialog(tab="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(tab="Data source")); Modelica.Blocks.Interfaces.RealInput winSpe_in( @@ -108,7 +108,7 @@ // Wind direction parameter Buildings.BoundaryConditions.Types.DataSource winDirSou=Buildings.BoundaryConditions.Types.DataSource.File "Wind direction" annotation (Evaluate=true, HideResult=true, Dialog(tab="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(tab="Data source")); Modelica.Blocks.Interfaces.RealInput winDir_in( @@ -122,7 +122,7 @@ // Infrared horizontal radiation parameter Buildings.BoundaryConditions.Types.DataSource HInfHorSou=Buildings.BoundaryConditions.Types.DataSource.File "Infrared horizontal radiation" annotation (Evaluate=true, HideResult=true, Dialog(tab="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(tab="Data source")); Modelica.Blocks.Interfaces.RealInput HInfHor_in( @@ -222,18 +222,18 @@ Evaluate=true, Dialog(tab="Advanced", group="Sky temperature")); - 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"; protected - final parameter Modelica.SIunits.Time[2] timeSpan= + final parameter Modelica.Units.SI.Time[2] timeSpan= Buildings.BoundaryConditions.WeatherData.BaseClasses.getTimeSpanTMY3(filNam, "tab1") "Start time, end time of weather data"; @@ -424,12 +424,13 @@ "Check black body sky temperature" annotation (Placement(transformation(extent={{240,-140},{260,-120}}))); + // 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", @@ -473,7 +474,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", @@ -513,7 +514,6 @@ ")); end Longitude; - equation connect(modTim.y, add30Min.u2) annotation (Line(points={{-139,0},{-128,0},{-128, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/WeatherData/Validation/ReaderTMY3HDirNor.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/WeatherData/Validation/ReaderTMY3HDirNor.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/WeatherData/Validation/ReaderTMY3HDirNor.mo" 2022-03-10 09:57:40.164144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/BoundaryConditions/WeatherData/Validation/ReaderTMY3HDirNor.mo" 2022-03-10 09:58:59.580154459 +0000 @@ -9,14 +9,14 @@ annotation (Placement(transformation(extent={{68,-10},{88,10}}))); protected Modelica.Blocks.Sources.Sine HGloHor1( - freqHz=1/86400, + f =1/86400, startTime=25200, offset=0, amplitude=100) "Horizontal global radiation" annotation (Placement(transformation(extent={{-88,-30},{-68,-10}}))); Modelica.Blocks.Sources.Sine HGloHor( - freqHz=1/86400, + f =1/86400, startTime=68428, offset=0, amplitude=100) "Horizontal global radiation" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/Continuous/Examples/LimPID.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/Continuous/Examples/LimPID.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/Continuous/Examples/LimPID.mo" 2022-03-10 09:57:40.164144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/Continuous/Examples/LimPID.mo" 2022-03-10 09:58:59.532154453 +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) @@ -35,7 +35,7 @@ Td=1, yMax=1, yMin=-1, - initType=Modelica.Blocks.Types.InitPID.InitialState) + initType=Modelica.Blocks.Types.Init.InitialState) annotation (Placement(transformation(extent={{-20,70},{0,90}}))); Buildings.Utilities.Diagnostics.AssertEquality assertEquality1( threShold=1e-3) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/Continuous/Examples/NumberOfRequests.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/Continuous/Examples/NumberOfRequests.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/Continuous/Examples/NumberOfRequests.mo" 2022-03-10 09:57:40.164144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/Continuous/Examples/NumberOfRequests.mo" 2022-03-10 09:58:59.504154449 +0000 @@ -6,7 +6,7 @@ nin=2, threShold=0, kind=0) annotation (Placement(transformation(extent={{0,20},{20,40}}))); - Modelica.Blocks.Sources.Sine sine(freqHz=2) + Modelica.Blocks.Sources.Sine sine(f =2) annotation (Placement(transformation(extent={{-60,-20},{-40,0}}))); Modelica.Blocks.Sources.Pulse pulse(period=0.35) annotation (Placement(transformation(extent={{-60,20},{-40,40}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/Continuous/Examples/PIDHysteresis.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/Continuous/Examples/PIDHysteresis.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/Continuous/Examples/PIDHysteresis.mo" 2022-03-10 09:57:40.164144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/Continuous/Examples/PIDHysteresis.mo" 2022-03-10 09:58:59.488154448 +0000 @@ -24,7 +24,7 @@ Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow Q_flow annotation (Placement(transformation(extent={{16,20},{36,40}}))); Modelica.Blocks.Sources.Sine sine( - freqHz=1/86400, + f =1/86400, offset=273.15, amplitude=20, phase=-1.5707963267949, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/Continuous/Examples/PIDHysteresisTimer.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/Continuous/Examples/PIDHysteresisTimer.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/Continuous/Examples/PIDHysteresisTimer.mo" 2022-03-10 09:57:40.164144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/Continuous/Examples/PIDHysteresisTimer.mo" 2022-03-10 09:58:59.468154446 +0000 @@ -25,7 +25,7 @@ Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow Q_flow annotation (Placement(transformation(extent={{16,20},{36,40}}))); Modelica.Blocks.Sources.Sine sine( - freqHz=1/86400, + f =1/86400, offset=273.15, amplitude=20, phase=-1.5707963267949) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/Continuous/Examples/SignalRanker.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/Continuous/Examples/SignalRanker.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/Continuous/Examples/SignalRanker.mo" 2022-03-10 09:57:40.164144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/Continuous/Examples/SignalRanker.mo" 2022-03-10 09:58:59.444154442 +0000 @@ -2,7 +2,7 @@ model SignalRanker "Example model for signal ranker" extends Modelica.Icons.Example; Modelica.Blocks.Sources.Sine sine( - freqHz = 2, + f = 2, startTime=0.025) "Sine source" annotation (Placement(transformation(extent={{-60,-20},{-40,0}}))); @@ -12,7 +12,7 @@ Buildings.Controls.Continuous.SignalRanker sigRan(nin=3) "Signal ranker" 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) "Exponential sine source" annotation (Placement(transformation(extent={{-60,60},{-40,80}}))); equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/Continuous/LimPID.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/Continuous/LimPID.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/Continuous/LimPID.mo" 2022-03-10 09:57:40.164144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/Continuous/LimPID.mo" 2022-03-10 09:58:59.368154432 +0000 @@ -9,11 +9,11 @@ parameter Modelica.Blocks.Types.SimpleController controllerType= Modelica.Blocks.Types.SimpleController.PI "Type of controller"; parameter Real k(min=0) = 1 "Gain of controller"; - parameter Modelica.SIunits.Time Ti(min=Modelica.Constants.small)=0.5 + parameter Modelica.Units.SI.Time Ti(min=Modelica.Constants.small)=0.5 "Time constant of Integrator block" annotation (Dialog(enable= controllerType == Modelica.Blocks.Types.SimpleController.PI or controllerType == Modelica.Blocks.Types.SimpleController.PID)); - parameter Modelica.SIunits.Time Td(min=0)=0.1 + parameter Modelica.Units.SI.Time Td(min=0)=0.1 "Time constant of Derivative block" annotation (Dialog(enable= controllerType == Modelica.Blocks.Types.SimpleController.PD or controllerType == Modelica.Blocks.Types.SimpleController.PID)); @@ -31,7 +31,7 @@ "The higher Nd, the more ideal the derivative block" annotation(Dialog(enable=controllerType==.Modelica.Blocks.Types.SimpleController.PD or controllerType==.Modelica.Blocks.Types.SimpleController.PID)); - parameter Modelica.Blocks.Types.InitPID initType= Modelica.Blocks.Types.InitPID.DoNotUse_InitialIntegratorState + parameter Modelica.Blocks.Types.Init initType= Modelica.Blocks.Types.Init.InitialState "Type of initialization (1: no init, 2: steady state, 3: initial state, 4: initial output)" annotation(Evaluate=true, Dialog(group="Initialization")); @@ -93,12 +93,9 @@ final y_reset=y_reset, final k=unitTime/Ti, final y_start=xi_start, - final initType=if initType == Modelica.Blocks.Types.InitPID.SteadyState then + final initType=if initType == Modelica.Blocks.Types.Init.SteadyState then Modelica.Blocks.Types.Init.SteadyState - else if initType == Modelica.Blocks.Types.InitPID.InitialState - or initType == Modelica.Blocks.Types.InitPID.DoNotUse_InitialIntegratorState - then Modelica.Blocks.Types.Init.InitialState - else Modelica.Blocks.Types.Init.NoInit) if + else if initType == Modelica.Blocks.Types.Init.InitialState or initType == Modelica.Blocks.Types.Init.InitialState then Modelica.Blocks.Types.Init.InitialState else Modelica.Blocks.Types.Init.NoInit) if with_I "Integral term" annotation (Placement(transformation(extent={{-40,-60},{-20,-40}}))); @@ -106,15 +103,10 @@ final k=Td/unitTime, final T=max([Td/Nd,1.e-14]), final x_start=xd_start, - final initType=if initType == Modelica.Blocks.Types.InitPID.SteadyState or - initType == Modelica.Blocks.Types.InitPID.InitialOutput + final initType=if initType == Modelica.Blocks.Types.Init.SteadyState or initType == Modelica.Blocks.Types.Init.InitialOutput then Modelica.Blocks.Types.Init.SteadyState - else - if initType == Modelica.Blocks.Types.InitPID.InitialState then - Modelica.Blocks.Types.Init.InitialState - else - Modelica.Blocks.Types.Init.NoInit) if with_D "Derivative term" + else if initType == Modelica.Blocks.Types.Init.InitialState then Modelica.Blocks.Types.Init.InitialState else Modelica.Blocks.Types.Init.NoInit) if with_D "Derivative term" annotation (Placement( transformation(extent={{-40,-10},{-20,10}}))); @@ -125,7 +117,7 @@ annotation (Placement(transformation(extent={{0,-10},{20,10}}))); protected - constant Modelica.SIunits.Time unitTime=1 annotation (HideResult=true); + constant Modelica.Units.SI.Time unitTime=1 annotation (HideResult=true); final parameter Real revAct = if reverseActing then 1 else -1 "Switch for sign for reverse or direct acting controller"; @@ -278,14 +270,14 @@ initial equation - if initType==Modelica.Blocks.Types.InitPID.InitialOutput then + if initType== Modelica.Blocks.Types.Init.InitialOutput then gainPID.y = y_start; end if; equation assert(yMax >= yMin, "LimPID: Limits must be consistent. However, yMax (=" + String(yMax) + ") < yMin (=" + String(yMin) + ")"); - if initType == Modelica.Blocks.Types.InitPID.InitialOutput and (y_start < yMin or y_start > yMax) then + if initType == Modelica.Blocks.Types.Init.InitialOutput and (y_start < yMin or y_start > yMax) then Modelica.Utilities.Streams.error("LimPID: Start value y_start (=" + String(y_start) + ") is outside of the limits of yMin (=" + String(yMin) +") and yMax (=" + String(yMax) + ")"); end if; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/Continuous/OffTimer.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/Continuous/OffTimer.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/Continuous/OffTimer.mo" 2022-03-10 09:57:40.164144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/Continuous/OffTimer.mo" 2022-03-10 09:58:59.308154424 +0000 @@ -9,7 +9,7 @@ annotation (Placement(transformation(extent={{100,-10},{120,10}}))); protected - discrete Modelica.SIunits.Time entryTime "Time instant when u became true"; + discrete Modelica.Units.SI.Time entryTime "Time instant when u became true"; initial equation pre(entryTime) = time; equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/Continuous/PIDHysteresis.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/Continuous/PIDHysteresis.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/Continuous/PIDHysteresis.mo" 2022-03-10 09:57:40.164144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/Continuous/PIDHysteresis.mo" 2022-03-10 09:58:59.300154424 +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 for reverse acting, or false for direct acting control action" annotation (Dialog(group="Set point tracking")); - parameter Modelica.Blocks.Types.InitPID initType=Modelica.Blocks.Types.InitPID.DoNotUse_InitialIntegratorState + parameter Modelica.Blocks.Types.Init initType=Modelica.Blocks.Types.Init.InitialState "Type of initialization (1: no init, 2: steady state, 3: initial state, 4: initial output)" annotation (Dialog(group="Initialization")); parameter Real xi_start=0 diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/Continuous/PIDHysteresisTimer.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/Continuous/PIDHysteresisTimer.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/Continuous/PIDHysteresisTimer.mo" 2022-03-10 09:57:40.164144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/Continuous/PIDHysteresisTimer.mo" 2022-03-10 09:58:59.280154421 +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 for reverse acting, or false for direct acting control action" annotation (Dialog(group="Set point tracking")); - parameter Modelica.Blocks.Types.InitPID initType=Modelica.Blocks.Types.InitPID.DoNotUse_InitialIntegratorState + parameter Modelica.Blocks.Types.Init initType=Modelica.Blocks.Types.Init.InitialState "Type of initialization (1: no init, 2: steady state, 3: initial state, 4: initial output)" annotation (Dialog(group="Initialization")); parameter Real xi_start=0 diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/Continuous/Validation/LimPIDReset.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/Continuous/Validation/LimPIDReset.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/Continuous/Validation/LimPIDReset.mo" 2022-03-10 09:57:40.164144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/Continuous/Validation/LimPIDReset.mo" 2022-03-10 09:58:59.244154416 +0000 @@ -3,7 +3,7 @@ "Test model for PID controller with optional intgerator reset" extends Modelica.Icons.Example; - Modelica.Blocks.Sources.Sine setPoi(freqHz=1) "Set point signal" + Modelica.Blocks.Sources.Sine setPoi(f =1) "Set point signal" annotation (Placement(transformation(extent={{-40,-20},{-20,0}}))); Buildings.Controls.Continuous.LimPID limPIDPar( yMax=1, @@ -14,13 +14,13 @@ Td=10, k=0.2, controllerType=Modelica.Blocks.Types.SimpleController.PID, - initType=Modelica.Blocks.Types.InitPID.InitialOutput, + initType=Modelica.Blocks.Types.Init.InitialOutput, y_start=0.3) "PId controller with integrator reset to a parameter value" annotation (Placement(transformation(extent={{20,-20},{40,0}}))); Modelica.Blocks.Sources.Constant mea(k=0.5) "Measured signal" annotation (Placement(transformation(extent={{-40,-50},{-20,-30}}))); Buildings.Controls.Continuous.LimPID limPIDDef( - initType=Modelica.Blocks.Types.InitPID.InitialState, + initType=Modelica.Blocks.Types.Init.InitialState, Td=10, k=1, Ti=1, @@ -44,14 +44,14 @@ k=0.2, Ti=20, controllerType=Modelica.Blocks.Types.SimpleController.PID, - initType=Modelica.Blocks.Types.InitPID.InitialOutput, + initType=Modelica.Blocks.Types.Init.InitialOutput, y_start=0.3) "PId controller with integrator reset to an input value" annotation (Placement(transformation(extent={{20,-80},{40,-60}}))); Modelica.Blocks.Sources.Constant conRes(k=0.9) "Signal to which integrator will be reset to" annotation (Placement(transformation(extent={{-40,-90},{-20,-70}}))); Modelica.Blocks.Continuous.LimPID limPIDOri( - initType=Modelica.Blocks.Types.InitPID.InitialState, + initType=Modelica.Blocks.Types.Init.InitialState, Td=10, k=1, Ti=1, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/DemandResponse/BaseClasses/NormalOperation.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/DemandResponse/BaseClasses/NormalOperation.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/DemandResponse/BaseClasses/NormalOperation.mo" 2022-03-10 09:57:40.164144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/DemandResponse/BaseClasses/NormalOperation.mo" 2022-03-10 09:58:59.208154413 +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 8.1.0/Controls/DemandResponse/BaseClasses/PartialDemandResponse.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/DemandResponse/BaseClasses/PartialDemandResponse.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/DemandResponse/BaseClasses/PartialDemandResponse.mo" 2022-03-10 09:57:40.164144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/DemandResponse/BaseClasses/PartialDemandResponse.mo" 2022-03-10 09:58:59.204154412 +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 8.1.0/Controls/DemandResponse/BaseClasses/ShedOperation.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/DemandResponse/BaseClasses/ShedOperation.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/DemandResponse/BaseClasses/ShedOperation.mo" 2022-03-10 09:57:40.164144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/DemandResponse/BaseClasses/ShedOperation.mo" 2022-03-10 09:58:59.196154412 +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 8.1.0/Controls/DemandResponse/Client.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/DemandResponse/Client.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/DemandResponse/Client.mo" 2022-03-10 09:57:40.164144400 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/DemandResponse/Client.mo" 2022-03-10 09:58:59.192154410 +0000 @@ -2,9 +2,9 @@ model Client "Demand response client" 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(nIn=0) + Modelica.StateGraph.InitialStep initialStep(nOut = 1, nIn = 0) 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 8.1.0/Controls/OBC/CDL/Continuous/Validation/MovingMean.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/OBC/CDL/Continuous/Validation/MovingMean.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/OBC/CDL/Continuous/Validation/MovingMean.mo" 2022-03-10 09:57:40.172144401 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/OBC/CDL/Continuous/Validation/MovingMean.mo" 2022-03-10 09:58:56.112154021 +0000 @@ -2,7 +2,7 @@ model MovingMean "Validation model for the MovingMean block" Modelica.Blocks.Sources.Sine sinInpNoDel( - freqHz=1/80) + f =1/80) "Start from zero second" annotation (Placement(transformation(extent={{-90,50},{-70,70}}))); Buildings.Controls.OBC.CDL.Continuous.MovingMean movingMean_1( @@ -26,7 +26,7 @@ "Moving average with 500 s sliding window" annotation (Placement(transformation(extent={{-40,-70},{-20,-50}}))); Modelica.Blocks.Sources.Sine sinInp50sDel( - freqHz=1/80, + f =1/80, startTime=50) "Start from 50 seconds" annotation (Placement(transformation(extent={{0,50},{20,70}}))); @@ -39,7 +39,7 @@ "Moving average with 200 s sliding window" annotation (Placement(transformation(extent={{60,20},{80,40}}))); Modelica.Blocks.Sources.Sine sinInp100sDel( - freqHz=1/80, + f =1/80, startTime=100) "Start from 100 seconds" annotation (Placement(transformation(extent={{0,-30},{20,-10}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/OBC/CDL/Continuous/Validation/MovingMean_nonZeroStart.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/OBC/CDL/Continuous/Validation/MovingMean_nonZeroStart.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/OBC/CDL/Continuous/Validation/MovingMean_nonZeroStart.mo" 2022-03-10 09:57:40.172144401 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/OBC/CDL/Continuous/Validation/MovingMean_nonZeroStart.mo" 2022-03-10 09:58:56.096154018 +0000 @@ -2,7 +2,7 @@ model MovingMean_nonZeroStart "Validation model for the MovingMean block" Modelica.Blocks.Sources.Sine sinInpNoDel( - freqHz=1/80) + f =1/80) "Start from zero second" annotation (Placement(transformation(extent={{-90,50},{-70,70}}))); Buildings.Controls.OBC.CDL.Continuous.MovingMean movingMean_1( @@ -26,7 +26,7 @@ "Moving average with 500 s sliding window" annotation (Placement(transformation(extent={{-40,-70},{-20,-50}}))); Modelica.Blocks.Sources.Sine sinInp50sDel( - freqHz=1/80, + f =1/80, startTime=50) "Start from 50 seconds" annotation (Placement(transformation(extent={{0,50},{20,70}}))); @@ -39,7 +39,7 @@ "Moving average with 200 s sliding window" annotation (Placement(transformation(extent={{60,20},{80,40}}))); Modelica.Blocks.Sources.Sine sinInp100sDel( - freqHz=1/80, + f =1/80, startTime=100) "Start from 100 seconds" annotation (Placement(transformation(extent={{0,-30},{20,-10}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/OBC/CDL/Logical/TrueFalseHold.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/OBC/CDL/Logical/TrueFalseHold.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/OBC/CDL/Logical/TrueFalseHold.mo" 2022-03-10 09:57:40.176144402 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/OBC/CDL/Logical/TrueFalseHold.mo" 2022-03-10 09:58:54.764153851 +0000 @@ -29,7 +29,7 @@ "Root of state graph" annotation (Placement(transformation(extent={{-160,100},{-140,120}}))); Modelica.StateGraph.StepWithSignal outputFalse( - nIn=2) + nOut = 1, nIn = 2) "State for which the block outputs false" annotation (Placement(transformation(extent={{-60,10},{-40,30}}))); Modelica.StateGraph.TransitionWithSignal toTrue @@ -39,7 +39,7 @@ "Negation of input" annotation (Placement(transformation(extent={{-140,60},{-120,80}}))); Modelica.StateGraph.StepWithSignal outputTrue( - nIn=2) + nOut = 1, nIn = 2) "State with true output signal" annotation (Placement(transformation(extent={{0,10},{20,30}}))); Modelica.StateGraph.TransitionWithSignal toFalse diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/OBC/CDL/Logical/TrueHoldWithReset.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/OBC/CDL/Logical/TrueHoldWithReset.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/OBC/CDL/Logical/TrueHoldWithReset.mo" 2022-03-10 09:57:40.176144402 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/OBC/CDL/Logical/TrueHoldWithReset.mo" 2022-03-10 09:58:54.740153847 +0000 @@ -20,10 +20,10 @@ final delayTime=duration) "Delay for the on signal" annotation (Placement(transformation(extent={{10,10},{30,30}}))); - Modelica.StateGraph.InitialStep initialStep + Modelica.StateGraph.InitialStep initialStep(nIn = 1, nOut = 1) "Initial step" annotation (Placement(transformation(extent={{-80,50},{-60,70}}))); - Modelica.StateGraph.StepWithSignal outputTrue + Modelica.StateGraph.StepWithSignal outputTrue(nIn = 1, nOut = 1) "Holds the output at true" annotation (Placement(transformation(extent={{-10,50},{10,70}}))); Modelica.StateGraph.TransitionWithSignal toOutputTrue diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/Predictors/BaseClasses/Examples/SampleStart.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/Predictors/BaseClasses/Examples/SampleStart.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/Predictors/BaseClasses/Examples/SampleStart.mo" 2022-03-10 09:57:40.180144402 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/Predictors/BaseClasses/Examples/SampleStart.mo" 2022-03-10 09:58:53.048153632 +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 8.1.0/Controls/Predictors/BaseClasses/partialBaselinePrediction.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/Predictors/BaseClasses/partialBaselinePrediction.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/Predictors/BaseClasses/partialBaselinePrediction.mo" 2022-03-10 09:57:40.180144402 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/Predictors/BaseClasses/partialBaselinePrediction.mo" 2022-03-10 09:58:53.040153632 +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 8.1.0/Controls/Predictors/BaseClasses/sampleStart.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/Predictors/BaseClasses/sampleStart.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/Predictors/BaseClasses/sampleStart.mo" 2022-03-10 09:57:40.180144402 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/Predictors/BaseClasses/sampleStart.mo" 2022-03-10 09:58:53.032153631 +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 8.1.0/Controls/Predictors/BaseClasses/weatherRegression.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/Predictors/BaseClasses/weatherRegression.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/Predictors/BaseClasses/weatherRegression.mo" 2022-03-10 09:57:40.180144402 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/Predictors/BaseClasses/weatherRegression.mo" 2022-03-10 09:58:53.028153630 +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 8.1.0/Controls/Predictors/ElectricalLoad.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/Predictors/ElectricalLoad.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/Predictors/ElectricalLoad.mo" 2022-03-10 09:57:40.180144402 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/Predictors/ElectricalLoad.mo" 2022-03-10 09:58:53.020153630 +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 8.1.0/Controls/Predictors/Validation/BaseClasses/PartialSimpleTestCase.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/Predictors/Validation/BaseClasses/PartialSimpleTestCase.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/Predictors/Validation/BaseClasses/PartialSimpleTestCase.mo" 2022-03-10 09:57:40.180144402 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/Predictors/Validation/BaseClasses/PartialSimpleTestCase.mo" 2022-03-10 09:58:52.896153613 +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 8.1.0/Controls/Predictors/Validation/SineInput.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/Predictors/Validation/SineInput.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/Predictors/Validation/SineInput.mo" 2022-03-10 09:57:40.180144402 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/Predictors/Validation/SineInput.mo" 2022-03-10 09:58:52.860153608 +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 8.1.0/Controls/SetPoints/OccupancySchedule.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/SetPoints/OccupancySchedule.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/SetPoints/OccupancySchedule.mo" 2022-03-10 09:57:40.180144402 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/SetPoints/OccupancySchedule.mo" 2022-03-10 09:58:52.816153603 +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,15 +21,15 @@ final parameter Integer nRow = size(occupancy,1) "Number of rows in the schedule"; - discrete Modelica.SIunits.Time tOcc "Time when next occupancy starts"; - discrete Modelica.SIunits.Time tNonOcc "Time when next non-occupancy starts"; - discrete Modelica.SIunits.Time tNext "Time of next switch in schedule"; + discrete Modelica.Units.SI.Time tOcc "Time when next occupancy starts"; + discrete Modelica.Units.SI.Time tNonOcc "Time when next non-occupancy starts"; + discrete Modelica.Units.SI.Time tNext "Time of next switch in schedule"; function getOutput "Get the next occupancy or non-occupancy outputs" extends Modelica.Icons.Function; - input Modelica.SIunits.Time t "Current model time"; - input Modelica.SIunits.Time period "Periodicity"; + input Modelica.Units.SI.Time t "Current model time"; + input Modelica.Units.SI.Time period "Periodicity"; input Real occupancy[nRow] "Occupancy table, each entry switching occupancy on or off"; input Boolean firstEntryOccupied @@ -37,12 +37,12 @@ input Integer nRow "Number of rows in the schedule"; - 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"; output Boolean occupied "Outputs true if occupied at current time"; - output Modelica.SIunits.Time tNext "Time of next switch in schedule"; + output Modelica.Units.SI.Time tNext "Time of next switch in schedule"; protected Integer iPerSta "Counter for the period in which the next occupancy starts"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/SetPoints/SupplyReturnTemperatureReset.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/SetPoints/SupplyReturnTemperatureReset.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/SetPoints/SupplyReturnTemperatureReset.mo" 2022-03-10 09:57:40.180144402 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/SetPoints/SupplyReturnTemperatureReset.mo" 2022-03-10 09:58:52.788153599 +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 8.1.0/Controls/SetPoints/Table.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/SetPoints/Table.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/SetPoints/Table.mo" 2022-03-10 09:57:40.180144402 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/SetPoints/Table.mo" 2022-03-10 09:58:52.772153597 +0000 @@ -16,7 +16,7 @@ size(table,1) "Number of rows"; final parameter Real[nRow,2] offsetVector = [zeros(nRow), offset*ones(nRow)] "Vector to take offset of output signal into account"; - Modelica.Blocks.Tables.CombiTable1D tab( + Modelica.Blocks.Tables.CombiTable1Dv tab( tableOnFile=false, final table= (if constantExtrapolation then cat(1, [table[1,1]-1, table[1,2]], diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/Sources/DayType.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/Sources/DayType.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/Sources/DayType.mo" 2022-03-10 09:57:40.180144402 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Controls/Sources/DayType.mo" 2022-03-10 09:58:52.716153591 +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 8.1.0/Electrical/AC/Interfaces/PowerOutput.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/Interfaces/PowerOutput.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/Interfaces/PowerOutput.mo" 2022-03-10 09:57:40.184144402 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/Interfaces/PowerOutput.mo" 2022-03-10 09:58:52.664153583 +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 8.1.0/Electrical/AC/OnePhase/Conversion/ACACConverter.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/OnePhase/Conversion/ACACConverter.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/OnePhase/Conversion/ACACConverter.mo" 2022-03-10 09:57:40.184144402 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/OnePhase/Conversion/ACACConverter.mo" 2022-03-10 09:58:52.624153579 +0000 @@ -22,11 +22,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 8.1.0/Electrical/AC/OnePhase/Conversion/ACACTransformer.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/OnePhase/Conversion/ACACTransformer.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/OnePhase/Conversion/ACACTransformer.mo" 2022-03-10 09:57:40.184144402 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/OnePhase/Conversion/ACACTransformer.mo" 2022-03-10 09:58:52.540153569 +0000 @@ -12,11 +12,11 @@ constrainedby Interfaces.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)"; @@ -27,52 +27,52 @@ 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"; - 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"; 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.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 8.1.0/Electrical/AC/OnePhase/Conversion/ACACTransformerFull.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/OnePhase/Conversion/ACACTransformerFull.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/OnePhase/Conversion/ACACTransformerFull.mo" 2022-03-10 09:57:40.184144402 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/OnePhase/Conversion/ACACTransformerFull.mo" 2022-03-10 09:58:52.516153565 +0000 @@ -12,13 +12,13 @@ constrainedby Interfaces.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) @@ -40,45 +40,45 @@ 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"; - 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"; 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.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.SIunits.Angle theRef "Absolute angle of rotating reference system"; + Modelica.Units.SI.AngularVelocity omega "Angular velocity"; + Modelica.Units.SI.Current Im[2] "Magnetization current"; + Modelica.Units.SI.Angle theRef "Absolute angle of rotating reference system"; 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 8.1.0/Electrical/AC/OnePhase/Conversion/ACDCConverter.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/OnePhase/Conversion/ACDCConverter.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/OnePhase/Conversion/ACDCConverter.mo" 2022-03-10 09:57:40.184144402 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/OnePhase/Conversion/ACDCConverter.mo" 2022-03-10 09:58:52.468153559 +0000 @@ -14,15 +14,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](each start=0)= + Modelica.Units.SI.Power P_n[2](each start=0)= PhaseSystem_n.phasePowers_vi(terminal_n.v, terminal_n.i) "Power transmitted at pin n (primary)"; equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/OnePhase/Lines/Examples/ACLine_L.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/OnePhase/Lines/Examples/ACLine_L.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/OnePhase/Lines/Examples/ACLine_L.mo" 2022-03-10 09:57:40.184144402 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/OnePhase/Lines/Examples/ACLine_L.mo" 2022-03-10 09:58:52.356153546 +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 8.1.0/Electrical/AC/OnePhase/Lines/Examples/ACLine_RL.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/OnePhase/Lines/Examples/ACLine_RL.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/OnePhase/Lines/Examples/ACLine_RL.mo" 2022-03-10 09:57:40.184144402 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/OnePhase/Lines/Examples/ACLine_RL.mo" 2022-03-10 09:58:52.332153542 +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 8.1.0/Electrical/AC/OnePhase/Lines/Network.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/OnePhase/Lines/Network.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/OnePhase/Lines/Network.mo" 2022-03-10 09:57:40.184144402 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/OnePhase/Lines/Network.mo" 2022-03-10 09:58:52.300153538 +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 8.1.0/Electrical/AC/OnePhase/Lines/TwoPortInductance.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/OnePhase/Lines/TwoPortInductance.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/OnePhase/Lines/TwoPortInductance.mo" 2022-03-10 09:57:40.184144402 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/OnePhase/Lines/TwoPortInductance.mo" 2022-03-10 09:58:52.296153537 +0000 @@ -14,10 +14,10 @@ "Type of model (e.g., steady state, dynamic, prescribed power consumption, etc.)" annotation (Evaluate=true, Dialog(group="Modeling assumption")); protected - Modelica.SIunits.AngularVelocity omega - "Frequency of the quasi-stationary sine waves"; - Modelica.SIunits.Angle theRef "Absolute angle of rotating reference system"; + Modelica.Units.SI.AngularVelocity omega + "Frequency of the quasi-stationary sine waves"; + Modelica.Units.SI.Angle theRef "Absolute angle of rotating reference system"; equation theRef = PhaseSystem_p.thetaRef(terminal_p.theta); omega = der(theRef); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/OnePhase/Lines/TwoPortRL.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/OnePhase/Lines/TwoPortRL.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/OnePhase/Lines/TwoPortRL.mo" 2022-03-10 09:57:40.184144402 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/OnePhase/Lines/TwoPortRL.mo" 2022-03-10 09:58:52.288153537 +0000 @@ -8,7 +8,7 @@ redeclare replaceable Interfaces.Terminal_n terminal_n, redeclare replaceable 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,12 +18,12 @@ "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"; - Modelica.SIunits.Angle theRef "Absolute angle of rotating reference system"; - + Modelica.Units.SI.Angle theRef "Absolute angle of rotating reference system"; initial equation if mode==Buildings.Electrical.Types.Load.FixedZ_dynamic then i_p = i_start; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/OnePhase/Lines/TwoPortRLC.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/OnePhase/Lines/TwoPortRLC.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/OnePhase/Lines/TwoPortRLC.mo" 2022-03-10 09:57:40.184144402 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/OnePhase/Lines/TwoPortRLC.mo" 2022-03-10 09:58:52.272153534 +0000 @@ -8,7 +8,7 @@ redeclare package PhaseSystem = PhaseSystem_n), redeclare replaceable 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,14 +18,14 @@ "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"; - Modelica.SIunits.Angle theRef "Absolute angle of rotating reference system"; - + Modelica.Units.SI.Angle theRef "Absolute angle of rotating reference system"; initial equation if C > 0 and mode == Buildings.Electrical.Types.Load.FixedZ_dynamic then Vc = Vc_start; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/OnePhase/Loads/Capacitive.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/OnePhase/Loads/Capacitive.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/OnePhase/Loads/Capacitive.mo" 2022-03-10 09:57:40.184144402 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/OnePhase/Loads/Capacitive.mo" 2022-03-10 09:58:52.244153531 +0000 @@ -6,7 +6,7 @@ V_nominal(start = 110)); protected - Modelica.SIunits.Angle theRef "Absolute angle of rotating reference system"; + Modelica.Units.SI.Angle theRef "Absolute angle of rotating reference system"; initial equation if mode == Buildings.Electrical.Types.Load.FixedZ_dynamic then diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/OnePhase/Loads/Impedance.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/OnePhase/Loads/Impedance.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/OnePhase/Loads/Impedance.mo" 2022-03-10 09:57:40.184144402 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/OnePhase/Loads/Impedance.mo" 2022-03-10 09:58:52.112153514 +0000 @@ -5,10 +5,10 @@ redeclare replaceable Interfaces.Terminal_n terminal); protected - Modelica.SIunits.Angle theRef "Absolute angle of rotating reference system"; - Modelica.SIunits.AngularVelocity omega + Modelica.Units.SI.Angle theRef "Absolute angle of rotating reference system"; + 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 theRef = PhaseSystem.thetaRef(terminal.theta); omega = der(theRef); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/OnePhase/Loads/Inductive.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/OnePhase/Loads/Inductive.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/OnePhase/Loads/Inductive.mo" 2022-03-10 09:57:40.184144402 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/OnePhase/Loads/Inductive.mo" 2022-03-10 09:58:52.108153513 +0000 @@ -6,7 +6,7 @@ V_nominal(start = 110)); protected - Modelica.SIunits.Angle theRef "Absolute angle of rotating reference system"; + Modelica.Units.SI.Angle theRef "Absolute angle of rotating reference system"; initial equation if mode == Buildings.Electrical.Types.Load.FixedZ_dynamic then diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/OnePhase/Sensors/Probe.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/OnePhase/Sensors/Probe.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/OnePhase/Sensors/Probe.mo" 2022-03-10 09:57:40.184144402 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/OnePhase/Sensors/Probe.mo" 2022-03-10 09:58:52.048153506 +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 8.1.0/Electrical/AC/OnePhase/Sources/Examples/VariablePowerSource.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/OnePhase/Sources/Examples/VariablePowerSource.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/OnePhase/Sources/Examples/VariablePowerSource.mo" 2022-03-10 09:57:40.184144402 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/OnePhase/Sources/Examples/VariablePowerSource.mo" 2022-03-10 09:58:52.012153501 +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 8.1.0/Electrical/AC/OnePhase/Sources/FixedVoltage.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/OnePhase/Sources/FixedVoltage.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/OnePhase/Sources/FixedVoltage.mo" 2022-03-10 09:57:40.184144402 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/OnePhase/Sources/FixedVoltage.mo" 2022-03-10 09:58:51.992153499 +0000 @@ -3,11 +3,11 @@ extends Buildings.Electrical.Interfaces.Source( redeclare package PhaseSystem = PhaseSystems.OnePhase, redeclare replaceable 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 8.1.0/Electrical/AC/OnePhase/Sources/Generator.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/OnePhase/Sources/Generator.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/OnePhase/Sources/Generator.mo" 2022-03-10 09:57:40.184144402 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/OnePhase/Sources/Generator.mo" 2022-03-10 09:58:51.980153497 +0000 @@ -3,10 +3,10 @@ extends Buildings.Electrical.Interfaces.Source( redeclare package PhaseSystem = PhaseSystems.OnePhase, redeclare replaceable 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 8.1.0/Electrical/AC/OnePhase/Sources/Grid.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/OnePhase/Sources/Grid.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/OnePhase/Sources/Grid.mo" 2022-03-10 09:57:40.184144402 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/OnePhase/Sources/Grid.mo" 2022-03-10 09:58:51.968153495 +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 positive, or fed to grid if negative" annotation (Placement(transformation(extent={{100,-10},{120,10}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/OnePhase/Storage/Battery.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/OnePhase/Storage/Battery.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/OnePhase/Storage/Battery.mo" 2022-03-10 09:57:40.184144402 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/OnePhase/Storage/Battery.mo" 2022-03-10 09:58:51.924153490 +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="kW.h") + parameter Modelica.Units.SI.Energy EMax(min=0, displayUnit="kW.h") "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 8.1.0/Electrical/AC/ThreePhasesBalanced/Lines/Examples/ACLine_L.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesBalanced/Lines/Examples/ACLine_L.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesBalanced/Lines/Examples/ACLine_L.mo" 2022-03-10 09:57:40.184144402 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesBalanced/Lines/Examples/ACLine_L.mo" 2022-03-10 09:58:51.704153462 +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 8.1.0/Electrical/AC/ThreePhasesBalanced/Lines/Examples/ACLine_RL.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesBalanced/Lines/Examples/ACLine_RL.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesBalanced/Lines/Examples/ACLine_RL.mo" 2022-03-10 09:57:40.184144402 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesBalanced/Lines/Examples/ACLine_RL.mo" 2022-03-10 09:58:51.680153460 +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 8.1.0/Electrical/AC/ThreePhasesBalanced/Lines/Network.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesBalanced/Lines/Network.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesBalanced/Lines/Network.mo" 2022-03-10 09:57:40.184144402 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesBalanced/Lines/Network.mo" 2022-03-10 09:58:51.652153455 +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 8.1.0/Electrical/AC/ThreePhasesBalanced/Loads/Examples/ThreePhases.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesBalanced/Loads/Examples/ThreePhases.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesBalanced/Loads/Examples/ThreePhases.mo" 2022-03-10 09:57:40.184144402 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesBalanced/Loads/Examples/ThreePhases.mo" 2022-03-10 09:58:51.592153449 +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 8.1.0/Electrical/AC/ThreePhasesBalanced/Loads/Impedance.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesBalanced/Loads/Impedance.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesBalanced/Loads/Impedance.mo" 2022-03-10 09:57:40.184144402 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesBalanced/Loads/Impedance.mo" 2022-03-10 09:58:51.500153436 +0000 @@ -11,11 +11,11 @@ __Dymola_radioButtons=true)); protected - Modelica.SIunits.Angle theRef "Absolute angle of rotating reference system"; - Modelica.SIunits.AngularVelocity omega - "Frequency of the quasi-stationary sine waves"; - Modelica.SIunits.Reactance X(start = 1) "Complex component of the impedance"; + Modelica.Units.SI.Angle theRef "Absolute angle of rotating reference system"; + Modelica.Units.SI.AngularVelocity omega + "Frequency of the quasi-stationary sine waves"; + Modelica.Units.SI.Reactance X(start = 1) "Complex component of the impedance"; equation theRef = PhaseSystem.thetaRef(terminal.theta); omega = der(theRef); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesBalanced/Sources/Examples/VariablePowerSource.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesBalanced/Sources/Examples/VariablePowerSource.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesBalanced/Sources/Examples/VariablePowerSource.mo" 2022-03-10 09:57:40.184144402 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesBalanced/Sources/Examples/VariablePowerSource.mo" 2022-03-10 09:58:51.356153418 +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 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACConverter.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACConverter.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACConverter.mo" 2022-03-10 09:57:40.184144402 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACConverter.mo" 2022-03-10 09:58:51.284153409 +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 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformer.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformer.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformer.mo" 2022-03-10 09:57:40.184144402 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformer.mo" 2022-03-10 09:58:51.272153407 +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 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerDD.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerDD.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerDD.mo" 2022-03-10 09:57:40.184144402 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerDD.mo" 2022-03-10 09:58:51.256153406 +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 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerFull.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerFull.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerFull.mo" 2022-03-10 09:57:40.184144402 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerFull.mo" 2022-03-10 09:58:51.240153403 +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 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerStepDownDY.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerStepDownDY.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerStepDownDY.mo" 2022-03-10 09:57:40.184144402 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerStepDownDY.mo" 2022-03-10 09:58:51.216153400 +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 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerStepDownYD.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerStepDownYD.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerStepDownYD.mo" 2022-03-10 09:57:40.184144402 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerStepDownYD.mo" 2022-03-10 09:58:51.100153386 +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 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerStepUpDY.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerStepUpDY.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerStepUpDY.mo" 2022-03-10 09:57:40.184144402 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerStepUpDY.mo" 2022-03-10 09:58:51.076153383 +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 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerStepUpYD.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerStepUpYD.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerStepUpYD.mo" 2022-03-10 09:57:40.184144402 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerStepUpYD.mo" 2022-03-10 09:58:51.060153382 +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 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/Examples/BaseClasses/TransformerExample.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/Examples/BaseClasses/TransformerExample.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/Examples/BaseClasses/TransformerExample.mo" 2022-03-10 09:57:40.184144402 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Conversion/Examples/BaseClasses/TransformerExample.mo" 2022-03-10 09:58:50.984153372 +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 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_L.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_L.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_L.mo" 2022-03-10 09:57:40.188144404 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_L.mo" 2022-03-10 09:58:50.680153332 +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 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_L_N.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_L_N.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_L_N.mo" 2022-03-10 09:57:40.188144404 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_L_N.mo" 2022-03-10 09:58:50.660153330 +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 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_RL.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_RL.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_RL.mo" 2022-03-10 09:57:40.188144404 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_RL.mo" 2022-03-10 09:58:50.616153324 +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 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_RLC.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_RLC.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_RLC.mo" 2022-03-10 09:57:40.188144404 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_RLC.mo" 2022-03-10 09:58:50.608153323 +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 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_RLC_N.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_RLC_N.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_RLC_N.mo" 2022-03-10 09:57:40.188144404 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_RLC_N.mo" 2022-03-10 09:58:50.588153321 +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 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_RL_N.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_RL_N.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_RL_N.mo" 2022-03-10 09:57:40.188144404 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_RL_N.mo" 2022-03-10 09:58:50.572153319 +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 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/Network.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/Network.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/Network.mo" 2022-03-10 09:57:40.188144404 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/Network.mo" 2022-03-10 09:58:50.528153313 +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 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/Network_N.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/Network_N.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/Network_N.mo" 2022-03-10 09:57:40.188144404 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/Network_N.mo" 2022-03-10 09:58:50.520153312 +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 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortInductance.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortInductance.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortInductance.mo" 2022-03-10 09:57:40.188144404 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortInductance.mo" 2022-03-10 09:58:50.512153312 +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 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortInductance_N.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortInductance_N.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortInductance_N.mo" 2022-03-10 09:57:40.188144404 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortInductance_N.mo" 2022-03-10 09:58:50.432153301 +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 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortMatrixRL.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortMatrixRL.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortMatrixRL.mo" 2022-03-10 09:57:40.188144404 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortMatrixRL.mo" 2022-03-10 09:58:50.420153299 +0000 @@ -2,61 +2,61 @@ 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"; - Modelica.SIunits.Current i1[2]( + Modelica.Units.SI.Current i1[2]( each stateSelect = StateSelect.prefer) = terminal_n.phase[1].i "Current in line 1"; - Modelica.SIunits.Current i2[2]( + Modelica.Units.SI.Current i2[2]( each stateSelect = StateSelect.prefer) = terminal_n.phase[2].i "Current in line 2"; - Modelica.SIunits.Current i3[2]( + Modelica.Units.SI.Current i3[2]( 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"; - protected function productAC1p = Buildings.Electrical.PhaseSystems.OnePhase.product "Product between complex quantities"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortMatrixRLC.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortMatrixRLC.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortMatrixRLC.mo" 2022-03-10 09:57:40.188144404 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortMatrixRLC.mo" 2022-03-10 09:58:50.400153297 +0000 @@ -2,67 +2,67 @@ 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"; - 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"; @@ -70,17 +70,17 @@ 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"; - equation // Link the connectors to propagate the overdetermined variable diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortMatrixRLC_N.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortMatrixRLC_N.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortMatrixRLC_N.mo" 2022-03-10 09:57:40.188144404 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortMatrixRLC_N.mo" 2022-03-10 09:58:50.368153293 +0000 @@ -2,103 +2,103 @@ 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"; - 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"; @@ -106,14 +106,14 @@ 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]( 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]( each stateSelect = StateSelect.prefer) "Shunt current on side p"; - Modelica.SIunits.Current Ish_n[4,2]( + Modelica.Units.SI.Current Ish_n[4,2]( each stateSelect = StateSelect.prefer) "Shunt current on side n"; - equation // Link the connectors to propagate the overdetermined variable diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortMatrixRL_N.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortMatrixRL_N.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortMatrixRL_N.mo" 2022-03-10 09:57:40.188144404 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortMatrixRL_N.mo" 2022-03-10 09:58:50.316153287 +0000 @@ -2,86 +2,86 @@ 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"; - Modelica.SIunits.Current i1[2]( + Modelica.Units.SI.Current i1[2]( each stateSelect = StateSelect.prefer) = terminal_n.phase[1].i "Current in line 1"; - Modelica.SIunits.Current i2[2]( + Modelica.Units.SI.Current i2[2]( each stateSelect = StateSelect.prefer) = terminal_n.phase[2].i "Current in line 2"; - Modelica.SIunits.Current i3[2]( + Modelica.Units.SI.Current i3[2]( each stateSelect = StateSelect.prefer) = terminal_n.phase[3].i "Current in line 3"; - Modelica.SIunits.Current i4[2]( + Modelica.Units.SI.Current i4[2]( 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"; - protected function productAC1p = Buildings.Electrical.PhaseSystems.OnePhase.product "Product between complex quantities"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortRL.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortRL.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortRL.mo" 2022-03-10 09:57:40.188144404 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortRL.mo" 2022-03-10 09:58:50.296153285 +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 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortRLC.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortRLC.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortRLC.mo" 2022-03-10 09:57:40.188144404 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortRLC.mo" 2022-03-10 09:58:50.272153281 +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 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortRLC_N.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortRLC_N.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortRLC_N.mo" 2022-03-10 09:57:40.188144404 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortRLC_N.mo" 2022-03-10 09:58:50.248153278 +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 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortRL_N.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortRL_N.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortRL_N.mo" 2022-03-10 09:57:40.188144404 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortRL_N.mo" 2022-03-10 09:58:50.216153274 +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 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortResistance.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortResistance.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortResistance.mo" 2022-03-10 09:57:40.188144404 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortResistance.mo" 2022-03-10 09:58:50.196153271 +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 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortResistance_N.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortResistance_N.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortResistance_N.mo" 2022-03-10 09:57:40.188144404 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortResistance_N.mo" 2022-03-10 09:58:50.184153270 +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 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Loads/BaseClasses/BaseImpedance.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Loads/BaseClasses/BaseImpedance.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Loads/BaseClasses/BaseImpedance.mo" 2022-03-10 09:57:40.188144404 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Loads/BaseClasses/BaseImpedance.mo" 2022-03-10 09:58:50.156153267 +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 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Loads/BaseClasses/BaseLoadCtrl.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Loads/BaseClasses/BaseLoadCtrl.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Loads/BaseClasses/BaseLoadCtrl.mo" 2022-03-10 09:57:40.188144404 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Loads/BaseClasses/BaseLoadCtrl.mo" 2022-03-10 09:58:50.132153264 +0000 @@ -13,12 +13,12 @@ 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")); parameter Boolean voltageCtrl = false "This flag enables the voltage control" @@ -26,7 +26,7 @@ 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 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Loads/Examples/LoadCtrl.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Loads/Examples/LoadCtrl.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Loads/Examples/LoadCtrl.mo" 2022-03-10 09:57:40.188144404 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Loads/Examples/LoadCtrl.mo" 2022-03-10 09:58:49.956153241 +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 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Loads/Examples/Loads.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Loads/Examples/Loads.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Loads/Examples/Loads.mo" 2022-03-10 09:57:40.188144404 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Loads/Examples/Loads.mo" 2022-03-10 09:58:49.948153241 +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 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Sensors/BaseClasses/GeneralizedProbe.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Sensors/BaseClasses/GeneralizedProbe.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Sensors/BaseClasses/GeneralizedProbe.mo" 2022-03-10 09:57:40.188144404 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Sensors/BaseClasses/GeneralizedProbe.mo" 2022-03-10 09:58:49.848153228 +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 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Sources/BaseClasses/BaseUnbalancedPV.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Sources/BaseClasses/BaseUnbalancedPV.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Sources/BaseClasses/BaseUnbalancedPV.mo" 2022-03-10 09:57:40.188144404 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Sources/BaseClasses/BaseUnbalancedPV.mo" 2022-03-10 09:58:49.780153219 +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 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Sources/FixedVoltage.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Sources/FixedVoltage.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Sources/FixedVoltage.mo" 2022-03-10 09:57:40.188144404 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Sources/FixedVoltage.mo" 2022-03-10 09:58:49.608153198 +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 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Sources/FixedVoltage_N.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Sources/FixedVoltage_N.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Sources/FixedVoltage_N.mo" 2022-03-10 09:57:40.188144404 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Sources/FixedVoltage_N.mo" 2022-03-10 09:58:49.596153195 +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 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Sources/Grid.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Sources/Grid.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Sources/Grid.mo" 2022-03-10 09:57:40.188144404 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Sources/Grid.mo" 2022-03-10 09:58:49.584153194 +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 positive, or fed to grid if negative" annotation (Placement(transformation(extent={{100,-10},{120,10}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Sources/Grid_N.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Sources/Grid_N.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Sources/Grid_N.mo" 2022-03-10 09:57:40.188144404 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Sources/Grid_N.mo" 2022-03-10 09:58:49.560153191 +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 positive, or fed to grid if negative" annotation (Placement(transformation(extent={{100,-10},{120,10}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Sources/PVsimpleOriented.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Sources/PVsimpleOriented.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Sources/PVsimpleOriented.mo" 2022-03-10 09:57:40.188144404 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Sources/PVsimpleOriented.mo" 2022-03-10 09:58:49.532153188 +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 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Sources/PVsimpleOriented_N.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Sources/PVsimpleOriented_N.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Sources/PVsimpleOriented_N.mo" 2022-03-10 09:57:40.188144404 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Sources/PVsimpleOriented_N.mo" 2022-03-10 09:58:49.520153186 +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 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Validation/IEEETests/Test4NodesFeeder/BaseClasses/IEEE4.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Validation/IEEETests/Test4NodesFeeder/BaseClasses/IEEE4.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Validation/IEEETests/Test4NodesFeeder/BaseClasses/IEEE4.mo" 2022-03-10 09:57:40.188144404 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/AC/ThreePhasesUnbalanced/Validation/IEEETests/Test4NodesFeeder/BaseClasses/IEEE4.mo" 2022-03-10 09:58:49.356153165 +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 8.1.0/Electrical/DC/Conversion/DCDCConverter.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/DC/Conversion/DCDCConverter.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/DC/Conversion/DCDCConverter.mo" 2022-03-10 09:57:40.188144404 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/DC/Conversion/DCDCConverter.mo" 2022-03-10 09:58:49.216153148 +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 8.1.0/Electrical/DC/Lines/Examples/DCLines.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/DC/Lines/Examples/DCLines.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/DC/Lines/Examples/DCLines.mo" 2022-03-10 09:57:40.192144403 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/DC/Lines/Examples/DCLines.mo" 2022-03-10 09:58:49.160153140 +0000 @@ -5,7 +5,7 @@ parameter Boolean linearLoads = false "Flag that selects between linearized or nonlinear load models"; parameter Real L = 10 "Length 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 8.1.0/Electrical/DC/Lines/TwoPortRCLine.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/DC/Lines/TwoPortRCLine.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/DC/Lines/TwoPortRCLine.mo" 2022-03-10 09:57:40.192144403 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/DC/Lines/TwoPortRCLine.mo" 2022-03-10 09:58:49.104153133 +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 8.1.0/Electrical/DC/Loads/Conductor.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/DC/Loads/Conductor.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/DC/Loads/Conductor.mo" 2022-03-10 09:57:40.192144403 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/DC/Loads/Conductor.mo" 2022-03-10 09:58:49.024153123 +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 8.1.0/Electrical/DC/Loads/Resistor.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/DC/Loads/Resistor.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/DC/Loads/Resistor.mo" 2022-03-10 09:57:40.192144403 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/DC/Loads/Resistor.mo" 2022-03-10 09:58:48.984153118 +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 8.1.0/Electrical/DC/Sources/BaseClasses/WindCorrection.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/DC/Sources/BaseClasses/WindCorrection.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/DC/Sources/BaseClasses/WindCorrection.mo" 2022-03-10 09:57:40.192144403 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/DC/Sources/BaseClasses/WindCorrection.mo" 2022-03-10 09:58:48.948153113 +0000 @@ -1,8 +1,8 @@ within Buildings.Electrical.DC.Sources.BaseClasses; block WindCorrection "Block for wind correction" extends Modelica.Blocks.Icons.Block; - parameter Modelica.SIunits.Height h "Height over ground"; - parameter Modelica.SIunits.Height hRef + 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 8.1.0/Electrical/DC/Sources/ConstantVoltage.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/DC/Sources/ConstantVoltage.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/DC/Sources/ConstantVoltage.mo" 2022-03-10 09:57:40.192144403 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/DC/Sources/ConstantVoltage.mo" 2022-03-10 09:58:48.940153112 +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 8.1.0/Electrical/DC/Sources/Examples/VoltageSource.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/DC/Sources/Examples/VoltageSource.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/DC/Sources/Examples/VoltageSource.mo" 2022-03-10 09:57:40.192144403 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/DC/Sources/Examples/VoltageSource.mo" 2022-03-10 09:58:48.916153109 +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 8.1.0/Electrical/DC/Storage/BaseClasses/Charge.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/DC/Storage/BaseClasses/Charge.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/DC/Storage/BaseClasses/Charge.mo" 2022-03-10 09:57:40.192144403 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/DC/Storage/BaseClasses/Charge.mo" 2022-03-10 09:58:48.868153104 +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="kW.h") + parameter Modelica.Units.SI.Energy EMax(min=0, displayUnit="kW.h") "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 8.1.0/Electrical/DC/Storage/Battery.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/DC/Storage/Battery.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/DC/Storage/Battery.mo" 2022-03-10 09:57:40.192144403 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/DC/Storage/Battery.mo" 2022-03-10 09:58:48.864153103 +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="kW.h") + parameter Modelica.Units.SI.Energy EMax(min=0, displayUnit="kW.h") "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 8.1.0/Electrical/DC/Storage/Examples/Battery.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/DC/Storage/Examples/Battery.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/DC/Storage/Examples/Battery.mo" 2022-03-10 09:57:40.192144403 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/DC/Storage/Examples/Battery.mo" 2022-03-10 09:58:48.780153093 +0000 @@ -45,7 +45,7 @@ extent={{-10,-10},{10,10}}, rotation=90, origin={120,-60}))); - Modelica.StateGraph.InitialStep off "Off state" annotation (Placement( + Modelica.StateGraph.InitialStep off(nIn = 1, nOut = 1) "Off state" annotation (Placement( transformation( extent={{-10,-10},{10,10}}, origin={-130,80}))); @@ -53,16 +53,16 @@ Placement(transformation( extent={{-10,-10},{10,10}}, origin={-100,80}))); - Modelica.StateGraph.StepWithSignal charge "State to charge battery" + Modelica.StateGraph.StepWithSignal charge(nIn = 1, nOut = 1) "State to charge battery" annotation (Placement(transformation(extent={{-80,70},{-60,90}}))); Modelica.StateGraph.TransitionWithSignal toHold "Transition to hold" annotation (Placement(transformation(extent={{-50,70},{-30,90}}))); - Modelica.StateGraph.Step hold "Battery charge is hold" + Modelica.StateGraph.Step hold(nIn = 1, nOut = 1) "Battery charge is hold" annotation (Placement(transformation(extent={{-20,70},{0,90}}))); Modelica.StateGraph.TransitionWithSignal toDischarge "Transition to discharge" annotation (Placement(transformation(extent={{10,70},{30,90}}))); - Modelica.StateGraph.StepWithSignal discharge "State to discharge battery" + Modelica.StateGraph.StepWithSignal discharge(nIn = 1, nOut = 1) "State to discharge battery" annotation (Placement(transformation(extent={{40,70},{60,90}}))); Modelica.StateGraph.TransitionWithSignal toOff "Transition to off" annotation (Placement(transformation(extent={{70,70},{90,90}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/Examples/RenewableSources.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/Examples/RenewableSources.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/Examples/RenewableSources.mo" 2022-03-10 09:57:40.192144403 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/Examples/RenewableSources.mo" 2022-03-10 09:58:48.748153089 +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 8.1.0/Electrical/Interfaces/CapacitiveLoad.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/Interfaces/CapacitiveLoad.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/Interfaces/CapacitiveLoad.mo" 2022-03-10 09:57:40.192144403 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/Interfaces/CapacitiveLoad.mo" 2022-03-10 09:58:48.604153070 +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 8.1.0/Electrical/Interfaces/Impedance.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/Interfaces/Impedance.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/Interfaces/Impedance.mo" 2022-03-10 09:57:40.192144403 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/Interfaces/Impedance.mo" 2022-03-10 09:58:48.592153068 +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 8.1.0/Electrical/Interfaces/InductiveLoad.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/Interfaces/InductiveLoad.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/Interfaces/InductiveLoad.mo" 2022-03-10 09:57:40.192144403 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/Interfaces/InductiveLoad.mo" 2022-03-10 09:58:48.576153067 +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 8.1.0/Electrical/Interfaces/Load.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/Interfaces/Load.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/Interfaces/Load.mo" 2022-03-10 09:57:40.192144403 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/Interfaces/Load.mo" 2022-03-10 09:58:48.568153065 +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[:](each start=0) = terminal.i + Modelica.Units.SI.Current i[:](each start=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(start=0) + Modelica.Units.SI.Power P(start=0) "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 8.1.0/Electrical/Interfaces/PartialConversion.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/Interfaces/PartialConversion.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/Interfaces/PartialConversion.mo" 2022-03-10 09:57:40.192144403 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/Interfaces/PartialConversion.mo" 2022-03-10 09:58:48.544153062 +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 8.1.0/Electrical/Interfaces/PartialPV.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/Interfaces/PartialPV.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/Interfaces/PartialPV.mo" 2022-03-10 09:57:40.192144403 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/Interfaces/PartialPV.mo" 2022-03-10 09:58:48.540153062 +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 8.1.0/Electrical/Interfaces/PartialPVOriented.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/Interfaces/PartialPVOriented.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/Interfaces/PartialPVOriented.mo" 2022-03-10 09:57:40.192144403 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/Interfaces/PartialPVOriented.mo" 2022-03-10 09:58:48.528153060 +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 8.1.0/Electrical/Interfaces/PartialPvBase.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/Interfaces/PartialPvBase.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/Interfaces/PartialPvBase.mo" 2022-03-10 09:57:40.192144403 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/Interfaces/PartialPvBase.mo" 2022-03-10 09:58:48.504153057 +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 8.1.0/Electrical/Interfaces/PartialWindTurbineBase.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/Interfaces/PartialWindTurbineBase.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/Interfaces/PartialWindTurbineBase.mo" 2022-03-10 09:57:40.192144403 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/Interfaces/PartialWindTurbineBase.mo" 2022-03-10 09:58:48.484153055 +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 8.1.0/Electrical/Interfaces/Source.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/Interfaces/Source.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/Interfaces/Source.mo" 2022-03-10 09:57:40.192144403 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/Interfaces/Source.mo" 2022-03-10 09:58:48.472153053 +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 8.1.0/Electrical/Interfaces/VariableVoltageSource.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/Interfaces/VariableVoltageSource.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/Interfaces/VariableVoltageSource.mo" 2022-03-10 09:57:40.192144403 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/Interfaces/VariableVoltageSource.mo" 2022-03-10 09:58:48.460153051 +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 8.1.0/Electrical/PhaseSystems/PartialPhaseSystem.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/PhaseSystems/PartialPhaseSystem.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/PhaseSystems/PartialPhaseSystem.mo" 2022-03-10 09:57:40.192144403 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/PhaseSystems/PartialPhaseSystem.mo" 2022-03-10 09:58:48.436153048 +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 8.1.0/Electrical/PhaseSystems/package.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/PhaseSystems/package.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/PhaseSystems/package.mo" 2022-03-10 09:57:40.192144403 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/PhaseSystems/package.mo" 2022-03-10 09:58:48.452153051 +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 8.1.0/Electrical/Transmission/BaseClasses/BaseCable.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/Transmission/BaseClasses/BaseCable.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/Transmission/BaseClasses/BaseCable.mo" 2022-03-10 09:57:40.192144403 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Electrical/Transmission/BaseClasses/BaseCable.mo" 2022-03-10 09:58:48.332153035 +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="

")); + end kinematicViscosity; annotation(preferredView="info", Documentation(info=" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Media/Water.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Media/Water.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Media/Water.mo" 2022-03-10 09:57:40.256144413 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Media/Water.mo" 2022-03-10 09:58:17.384149116 +0000 @@ -18,7 +18,7 @@ annotation (Evaluate=true, Dialog(tab="Advanced")); final parameter Boolean standardOrderComponents=true "If true, and reducedX = true, the last element of X will be computed from the other ones"; - Modelica.SIunits.Density d=d_const "Density of medium"; + Modelica.Units.SI.Density d=d_const "Density of medium"; Temperature T(stateSelect= if preferredMediumStates then StateSelect.prefer else StateSelect.default) "Temperature of medium"; @@ -26,34 +26,34 @@ InputMassFraction[nXi] Xi=fill(0, 0) "Structurally independent mass fractions"; InputSpecificEnthalpy h "Specific enthalpy of medium"; - Modelica.SIunits.SpecificInternalEnergy u + Modelica.Units.SI.SpecificInternalEnergy u "Specific internal energy of medium"; - Modelica.SIunits.MassFraction[nX] X={1} + Modelica.Units.SI.MassFraction[nX] X={1} "Mass fractions (= (component mass)/total mass m_i/m)"; - final Modelica.SIunits.SpecificHeatCapacity R=0 + final Modelica.Units.SI.SpecificHeatCapacity R=0 "Gas constant (of mixture if applicable)"; - final Modelica.SIunits.MolarMass MM=MM_const + final Modelica.Units.SI.MolarMass MM=MM_const "Molar mass (of mixture or single fluid)"; ThermodynamicState state "Thermodynamic state record for optional functions"; - Modelica.SIunits.Conversions.NonSIunits.Temperature_degC T_degC= - Modelica.SIunits.Conversions.to_degC(T) + + Modelica.Units.NonSI.Temperature_degC T_degC= + Modelica.Units.Conversions.to_degC(T) "Temperature of medium in [degC]"; - Modelica.SIunits.Conversions.NonSIunits.Pressure_bar p_bar= - Modelica.SIunits.Conversions.to_bar(p) + Modelica.Units.NonSI.Pressure_bar p_bar= + Modelica.Units.Conversions.to_bar(p) "Absolute pressure of medium in [bar]"; // Local connector definition, used for equation balancing check - connector InputAbsolutePressure = input Modelica.SIunits.AbsolutePressure + connector InputAbsolutePressure = input Modelica.Units.SI.AbsolutePressure "Pressure as input signal connector"; - connector InputSpecificEnthalpy = input Modelica.SIunits.SpecificEnthalpy + connector InputSpecificEnthalpy = input Modelica.Units.SI.SpecificEnthalpy "Specific enthalpy as input signal connector"; - connector InputMassFraction = input Modelica.SIunits.MassFraction + connector InputMassFraction = input Modelica.Units.SI.MassFraction "Mass fraction as input signal connector"; - equation h = cp_const*(T-reference_T); u = h; @@ -119,8 +119,8 @@ function enthalpyOfLiquid "Return the specific enthalpy of liquid" extends Modelica.Icons.Function; - input Modelica.SIunits.Temperature T "Temperature"; - output Modelica.SIunits.SpecificEnthalpy h "Specific enthalpy"; + input Modelica.Units.SI.Temperature T "Temperature"; + output Modelica.Units.SI.SpecificEnthalpy h "Specific enthalpy"; algorithm h := cp_const*(T-reference_T); annotation ( @@ -141,6 +141,7 @@ ")); + end enthalpyOfLiquid; annotation(Documentation(info="

diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/Controls/OBC/CDL/Continuous/Derivative.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/Controls/OBC/CDL/Continuous/Derivative.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/Controls/OBC/CDL/Continuous/Derivative.mo" 2022-03-10 09:57:40.256144413 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/Controls/OBC/CDL/Continuous/Derivative.mo" 2022-03-10 09:58:17.196149093 +0000 @@ -3,7 +3,7 @@ extends Modelica.Icons.ObsoleteModel; parameter Real k(unit="1") = 1 "Gains"; - parameter Modelica.SIunits.Time T(min=1E-60)=0.01 + parameter Modelica.Units.SI.Time T(min=1E-60)=0.01 "Time constant (T>0 required)"; parameter Real x_start=0 "Initial or guess value of state" annotation (Dialog(group="Initialization")); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/Controls/OBC/CDL/Continuous/HysteresisWithHold.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/Controls/OBC/CDL/Continuous/HysteresisWithHold.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/Controls/OBC/CDL/Continuous/HysteresisWithHold.mo" 2022-03-10 09:57:40.256144413 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/Controls/OBC/CDL/Continuous/HysteresisWithHold.mo" 2022-03-10 09:58:17.172149090 +0000 @@ -6,10 +6,10 @@ parameter Real uLow "if y=true and uuHigh, switch to y=true"; - parameter Modelica.SIunits.Time trueHoldDuration + parameter Modelica.Units.SI.Time trueHoldDuration "true hold duration"; - parameter Modelica.SIunits.Time falseHoldDuration = trueHoldDuration + parameter Modelica.Units.SI.Time falseHoldDuration = trueHoldDuration "false hold duration"; Buildings.Controls.OBC.CDL.Interfaces.RealInput u "Real input signal" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/Controls/OBC/CDL/Continuous/LimPID.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/Controls/OBC/CDL/Continuous/LimPID.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/Controls/OBC/CDL/Continuous/LimPID.mo" 2022-03-10 09:57:40.256144413 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/Controls/OBC/CDL/Continuous/LimPID.mo" 2022-03-10 09:58:17.132149084 +0000 @@ -7,12 +7,12 @@ Buildings.Controls.OBC.CDL.Types.SimpleController.PI "Type of controller"; parameter Real k( min=0) = 1 "Gain of controller"; - parameter Modelica.SIunits.Time Ti(min=Buildings.Controls.OBC.CDL.Constants.small) = 0.5 + parameter Modelica.Units.SI.Time Ti(min=Buildings.Controls.OBC.CDL.Constants.small) = 0.5 "Time constant of integrator block" annotation (Dialog(enable= controllerType == Buildings.Controls.OBC.CDL.Types.SimpleController.PI or controllerType == Buildings.Controls.OBC.CDL.Types.SimpleController.PID)); - parameter Modelica.SIunits.Time Td( + parameter Modelica.Units.SI.Time Td( min=0) = 0.1 "Time constant of derivative block" annotation (Dialog(enable= diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/Controls/OBC/CDL/Continuous/Validation/HysteresisWithHold.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/Controls/OBC/CDL/Continuous/Validation/HysteresisWithHold.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/Controls/OBC/CDL/Continuous/Validation/HysteresisWithHold.mo" 2022-03-10 09:57:40.256144413 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/Controls/OBC/CDL/Continuous/Validation/HysteresisWithHold.mo" 2022-03-10 09:58:17.012149069 +0000 @@ -2,7 +2,7 @@ model HysteresisWithHold "Validation model for the HysteresisWithHold block" Modelica.Blocks.Sources.Sine pulse1( amplitude = 0.2, - freqHz = 1/360) "Generate sine wave signal" +f = 1/360) "Generate sine wave signal" annotation (Placement(transformation(extent={{-40,-10},{-20,10}}))); Buildings.Obsolete.Controls.OBC.CDL.Continuous.HysteresisWithHold noHold( trueHoldDuration = 0, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/Controls/OBC/CDL/Discrete/MovingMean.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/Controls/OBC/CDL/Discrete/MovingMean.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/Controls/OBC/CDL/Discrete/MovingMean.mo" 2022-03-10 09:57:40.256144413 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/Controls/OBC/CDL/Discrete/MovingMean.mo" 2022-03-10 09:58:16.860149049 +0000 @@ -4,7 +4,7 @@ parameter Integer n(min=2) "Number of samples over which the input is averaged"; - parameter Modelica.SIunits.Time samplePeriod(min=1E-3) + parameter Modelica.Units.SI.Time samplePeriod(min=1E-3) "Sampling period of component"; Buildings.Controls.OBC.CDL.Interfaces.RealInput u "Continuous input signal" @@ -13,7 +13,7 @@ annotation (Placement(transformation(extent={{100,-20},{140,20}}))); protected - parameter Modelica.SIunits.Time t0(fixed=false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(fixed=false) "First sample time instant"; Boolean sampleTrigger "Trigger samples at each sampling instant"; Integer iSample(start=0, fixed=true) "Sample numbering in the simulation"; Integer counter(start=0, fixed=true) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/Controls/OBC/CDL/Logical/Timer.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/Controls/OBC/CDL/Logical/Timer.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/Controls/OBC/CDL/Logical/Timer.mo" 2022-03-10 09:57:40.256144413 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/Controls/OBC/CDL/Logical/Timer.mo" 2022-03-10 09:58:16.712149031 +0000 @@ -19,8 +19,8 @@ annotation (Placement(transformation(extent={{100,-20},{140,20}}))); protected - discrete Modelica.SIunits.Time entryTime "Time instant when u became true"; - discrete Modelica.SIunits.Time yAcc "Accumulated time up to last change to true"; + discrete Modelica.Units.SI.Time entryTime "Time instant when u became true"; + discrete Modelica.Units.SI.Time yAcc "Accumulated time up to last change to true"; Buildings.Controls.OBC.CDL.Interfaces.BooleanInput reset_internal( final start=false, final fixed=true) "Internal connector"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/Controls/OBC/CDL/Psychrometrics/TDewPoi_TDryBulPhi.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/Controls/OBC/CDL/Psychrometrics/TDewPoi_TDryBulPhi.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/Controls/OBC/CDL/Psychrometrics/TDewPoi_TDryBulPhi.mo" 2022-03-10 09:57:40.256144413 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/Controls/OBC/CDL/Psychrometrics/TDewPoi_TDryBulPhi.mo" 2022-03-10 09:58:16.672149027 +0000 @@ -25,7 +25,7 @@ annotation (Placement(transformation(extent={{100,-20},{140,20}}))); protected - Modelica.SIunits.Pressure p_w(displayUnit="Pa") "Water vapor pressure"; + Modelica.Units.SI.Pressure p_w(displayUnit="Pa") "Water vapor pressure"; constant Real C14=6.54 "Constant used in the equation"; constant Real C15=14.526 "Constant used in the equation"; constant Real C16=0.7389 "Constant used in the equation"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/Controls/OBC/CDL/Psychrometrics/TWetBul_TDryBulPhi.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/Controls/OBC/CDL/Psychrometrics/TWetBul_TDryBulPhi.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/Controls/OBC/CDL/Psychrometrics/TWetBul_TDryBulPhi.mo" 2022-03-10 09:57:40.256144413 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/Controls/OBC/CDL/Psychrometrics/TWetBul_TDryBulPhi.mo" 2022-03-10 09:58:16.656149024 +0000 @@ -28,7 +28,7 @@ annotation (Placement(transformation(extent={{100,-20},{140,20}}))); 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"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/Controls/OBC/CDL/Psychrometrics/h_TDryBulPhi.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/Controls/OBC/CDL/Psychrometrics/h_TDryBulPhi.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/Controls/OBC/CDL/Psychrometrics/h_TDryBulPhi.mo" 2022-03-10 09:57:40.256144413 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/Controls/OBC/CDL/Psychrometrics/h_TDryBulPhi.mo" 2022-03-10 09:58:16.600149017 +0000 @@ -23,9 +23,9 @@ annotation (Placement(transformation(extent={{100,-20},{140,20}}))); protected - Modelica.SIunits.Conversions.NonSIunits.Temperature_degC TDryBul_degC + Modelica.Units.NonSI.Temperature_degC TDryBul_degC "Dry bulb temperature in degree Celsius"; - Modelica.SIunits.Pressure p_w(displayUnit="Pa") "Water vapor pressure"; + Modelica.Units.SI.Pressure p_w(displayUnit="Pa") "Water vapor pressure"; Real w(final unit="1", nominal=0.01) "Water vapor mass fraction in kg per kg dry air"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/Examples/BaseClasses/HeatingCoolingHotWater3Clusters.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/Examples/BaseClasses/HeatingCoolingHotWater3Clusters.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/Examples/BaseClasses/HeatingCoolingHotWater3Clusters.mo" 2022-03-10 09:57:40.256144413 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/Examples/BaseClasses/HeatingCoolingHotWater3Clusters.mo" 2022-03-10 09:58:16.544149009 +0000 @@ -3,14 +3,14 @@ "Load models for Buildings.Obsolete.DistrictHeatingCooling.Examples.HeatingCoolingHotWater3Clusters" package Medium = Buildings.Media.Water "Fluid in the pipes"; - parameter Modelica.SIunits.Temperature TChiSup_nominal = 273.15 + 16 + parameter Modelica.Units.SI.Temperature TChiSup_nominal = 273.15 + 16 "Chilled water leaving temperature at the evaporator" annotation (Dialog(group="Nominal conditions")); - parameter Modelica.SIunits.Temperature THeaSup_nominal = 273.15+30 + parameter Modelica.Units.SI.Temperature THeaSup_nominal = 273.15+30 "Supply temperature space heating system at TOut_nominal" annotation (Dialog(group="Nominal conditions")); - parameter Modelica.SIunits.Temperature THeaRet_nominal = 273.15+25 + parameter Modelica.Units.SI.Temperature THeaRet_nominal = 273.15+25 "Return temperature space heating system at TOut_nominal" annotation (Dialog(group="Nominal conditions")); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/Examples/BaseClasses/SubStationBoundaryCondition.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/Examples/BaseClasses/SubStationBoundaryCondition.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/Examples/BaseClasses/SubStationBoundaryCondition.mo" 2022-03-10 09:57:40.256144413 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/Examples/BaseClasses/SubStationBoundaryCondition.mo" 2022-03-10 09:58:16.432148996 +0000 @@ -4,7 +4,7 @@ extends Buildings.BaseClasses.BaseIcon; replaceable package Medium = Modelica.Media.Interfaces.PartialMedium annotation (choicesAllMatching=true); - parameter Modelica.SIunits.TemperatureDifference dTApp(min=0) = 2 + parameter Modelica.Units.SI.TemperatureDifference dTApp(min=0) = 2 "Approach temperature"; parameter Boolean warmSide "Set to true if these are the boundary conditions for the warm side inlet"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/Examples/HeatingCoolingHotWater3Clusters.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/Examples/HeatingCoolingHotWater3Clusters.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/Examples/HeatingCoolingHotWater3Clusters.mo" 2022-03-10 09:57:40.256144413 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/Examples/HeatingCoolingHotWater3Clusters.mo" 2022-03-10 09:58:16.412148993 +0000 @@ -7,18 +7,18 @@ extends Modelica.Icons.Example; package Medium = Buildings.Media.Water "Fluid in the pipes"; - parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal = 2.5E6 + parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal = 2.5E6 "Nominal heat flow rate, positive for heating, negative for cooling"; - parameter Modelica.SIunits.Temperature TSetHeaLea = 273.15+12 + parameter Modelica.Units.SI.Temperature TSetHeaLea = 273.15+12 "Set point for leaving fluid temperature warm supply" annotation(Dialog(group="Design parameter")); - parameter Modelica.SIunits.Temperature TSetCooLea = 273.15+16 + parameter Modelica.Units.SI.Temperature TSetCooLea = 273.15+16 "Set point for leaving fluid temperature cold supply" annotation(Dialog(group="Design parameter")); - parameter Modelica.SIunits.TemperatureDifference dT_nominal( + parameter Modelica.Units.SI.TemperatureDifference dT_nominal( min=0.5, displayUnit="K") = TSetCooLea-TSetHeaLea "Temperature difference between warm and cold pipe" @@ -27,7 +27,7 @@ parameter Real R_nominal(unit="Pa/m") = 100 "Pressure drop per meter at nominal flow rate"; - final parameter Modelica.SIunits.MassFlowRate m_flow_nominal = Q_flow_nominal/4200/dT_nominal + final parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = Q_flow_nominal/4200/dT_nominal "Nominal mass flow rate"; Plants.HeatingCoolingCarnot_T pla( redeclare package Medium = Medium, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/Examples/IdealSystem3Clusters.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/Examples/IdealSystem3Clusters.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/Examples/IdealSystem3Clusters.mo" 2022-03-10 09:57:40.256144413 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/Examples/IdealSystem3Clusters.mo" 2022-03-10 09:58:16.284148977 +0000 @@ -4,24 +4,24 @@ extends Modelica.Icons.Example; package Medium = Buildings.Media.Water "Fluid in the pipes"; - parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal = 3*2E6 + parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal = 3*2E6 "Nominal heat flow rate, positive for heating, negative for cooling"; - parameter Modelica.SIunits.Temperature TSetHeaLea = 273.15+8 + parameter Modelica.Units.SI.Temperature TSetHeaLea = 273.15+8 "Set point for leaving fluid temperature warm supply" annotation(Dialog(group="Design parameter")); - parameter Modelica.SIunits.Temperature TSetCooLea = 273.15+14 + parameter Modelica.Units.SI.Temperature TSetCooLea = 273.15+14 "Set point for leaving fluid temperature cold supply" annotation(Dialog(group="Design parameter")); - parameter Modelica.SIunits.TemperatureDifference dT_nominal( + parameter Modelica.Units.SI.TemperatureDifference dT_nominal( min=0.5, displayUnit="K") = TSetCooLea-TSetHeaLea "Temperature difference between warm and cold pipe" annotation(Dialog(group="Design parameter")); - final parameter Modelica.SIunits.MassFlowRate m_flow_nominal = Q_flow_nominal/4200/dT_nominal + final parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = Q_flow_nominal/4200/dT_nominal "Nominal mass flow rate"; Plants.Ideal_T pla( redeclare package Medium = Medium, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/Plants/HeatingCoolingCarnot_T.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/Plants/HeatingCoolingCarnot_T.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/Plants/HeatingCoolingCarnot_T.mo" 2022-03-10 09:57:40.256144413 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/Plants/HeatingCoolingCarnot_T.mo" 2022-03-10 09:58:16.200148967 +0000 @@ -6,12 +6,12 @@ final allowFlowReversal = true, final dp(start=0)); - parameter Modelica.SIunits.TemperatureDifference dTEva_nominal=-10 + parameter Modelica.Units.SI.TemperatureDifference dTEva_nominal=-10 "Temperature difference evaporator outlet-inlet of heat pump"; - parameter Modelica.SIunits.TemperatureDifference dTCon_nominal=10 + parameter Modelica.Units.SI.TemperatureDifference dTCon_nominal=10 "Temperature difference condenser outlet-inlet of chiller"; - parameter Modelica.SIunits.Pressure dp_nominal(displayUnit="Pa")=30000 + parameter Modelica.Units.SI.Pressure dp_nominal(displayUnit="Pa")=30000 "Pressure difference at nominal flow rate" annotation(Dialog(group="Design parameter")); @@ -54,7 +54,7 @@ Buildings.Media.Air "Medium model for the heat sink" annotation (choicesAllMatching = true); - parameter Modelica.SIunits.TemperatureDifference dTSin = 2 + parameter Modelica.Units.SI.TemperatureDifference dTSin = 2 "Temperature difference over heat source or sink"; final parameter Medium.ThermodynamicState staSin_default = Medium.setState_pTX( @@ -62,7 +62,7 @@ p=MediumSin.p_default, X=MediumSin.X_default[1:MediumSin.nXi]) "Medium state at default properties"; - final parameter Modelica.SIunits.SpecificHeatCapacity cpSin_default= + final parameter Modelica.Units.SI.SpecificHeatCapacity cpSin_default= Medium.specificHeatCapacityCp(staSin_default) "Specific heat capacity of the fluid"; @@ -70,7 +70,7 @@ T=Medium.T_default, p=Medium.p_default, X=Medium.X_default[1:Medium.nXi]) "Medium state at default properties"; - final parameter Modelica.SIunits.SpecificHeatCapacity cp_default= + final parameter Modelica.Units.SI.SpecificHeatCapacity cp_default= Medium.specificHeatCapacityCp(sta_default) "Specific heat capacity of the fluid"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/Plants/Ideal_T.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/Plants/Ideal_T.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/Plants/Ideal_T.mo" 2022-03-10 09:57:40.256144413 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/Plants/Ideal_T.mo" 2022-03-10 09:58:15.992148940 +0000 @@ -6,7 +6,7 @@ final allowFlowReversal = true, final dp(start=0)); - parameter Modelica.SIunits.Pressure dp_nominal(displayUnit="Pa")=30000 + parameter Modelica.Units.SI.Pressure dp_nominal(displayUnit="Pa")=30000 "Pressure difference at nominal flow rate" annotation(Dialog(group="Design parameter")); @@ -26,7 +26,7 @@ T=Medium.T_default, p=Medium.p_default, X=Medium.X_default[1:Medium.nXi]) "Medium state at default properties"; - final parameter Modelica.SIunits.SpecificHeatCapacity cp_default= + final parameter Modelica.Units.SI.SpecificHeatCapacity cp_default= Medium.specificHeatCapacityCp(sta_default) "Specific heat capacity of the fluid"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/Plants/LakeWaterHeatExchanger_T.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/Plants/LakeWaterHeatExchanger_T.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/Plants/LakeWaterHeatExchanger_T.mo" 2022-03-10 09:57:40.256144413 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/Plants/LakeWaterHeatExchanger_T.mo" 2022-03-10 09:58:15.976148937 +0000 @@ -14,21 +14,21 @@ parameter Boolean disableHeatExchanger = false "Set to true to disable the heat exchanger"; - parameter Modelica.SIunits.TemperatureDifference TApp( + parameter Modelica.Units.SI.TemperatureDifference TApp( min=0, displayUnit="K") = 0.5 "Approach temperature difference"; - 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) = 1000 "Nominal pressure drop of fully open valve" annotation(Dialog(group="Nominal condition")); - parameter Modelica.SIunits.PressureDifference dpHex_nominal( + parameter Modelica.Units.SI.PressureDifference dpHex_nominal( displayUnit="Pa", min=0) "Pressure drop of heat exchanger pipe and other resistances in the heat exchanger flow leg that are in series with the valve" @@ -222,13 +222,12 @@ {50,76},{50,72}}, color={0,0,127})); protected model Controller "Controller for bay water heat exchanger" - parameter Modelica.SIunits.MassFlowRate m_flow_nominal + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal "Nominal mass flow rate" annotation(Dialog(group = "Nominal condition")); Modelica.Blocks.Nonlinear.Limiter limTem( uMax=1, uMin=0, - limitsAtInit=false, strict=true) "Signal limiter for switching valve" annotation (Placement(transformation(extent={{20,60},{40,80}}))); @@ -254,7 +253,6 @@ Modelica.Blocks.Nonlinear.Limiter limFlo( uMax=1, uMin=0, - limitsAtInit=false, strict=true) "Signal limiter for switching valve" annotation (Placement(transformation(extent={{20,120},{40,140}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/Plants/Validation/LakeWaterHeatExchanger_T_Heating.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/Plants/Validation/LakeWaterHeatExchanger_T_Heating.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/Plants/Validation/LakeWaterHeatExchanger_T_Heating.mo" 2022-03-10 09:57:40.256144413 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/Plants/Validation/LakeWaterHeatExchanger_T_Heating.mo" 2022-03-10 09:58:15.856148922 +0000 @@ -4,7 +4,7 @@ extends Modelica.Icons.Example; package Medium = Buildings.Media.Water "Fluid in the pipes"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 100 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 100 "Nominal mass flow rate"; Obsolete.DistrictHeatingCooling.Plants.LakeWaterHeatExchanger_T hex(redeclare package Medium = Medium, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/Plants/Validation/Plant_Carnot_T_ClosedLoop.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/Plants/Validation/Plant_Carnot_T_ClosedLoop.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/Plants/Validation/Plant_Carnot_T_ClosedLoop.mo" 2022-03-10 09:57:40.256144413 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/Plants/Validation/Plant_Carnot_T_ClosedLoop.mo" 2022-03-10 09:58:15.828148919 +0000 @@ -4,28 +4,28 @@ extends Modelica.Icons.Example; package Medium = Buildings.Media.Water "Fluid in the pipes"; - parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal = 10E3 + parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal = 10E3 "Nominal heat flow rate, positive for heating, negative for cooling"; - parameter Modelica.SIunits.Temperature TSetHeaLea = 273.15+8 + parameter Modelica.Units.SI.Temperature TSetHeaLea = 273.15+8 "Set point for leaving fluid temperature warm supply" annotation(Dialog(group="Design parameter")); - parameter Modelica.SIunits.Temperature TSetCooLea = 273.15+14 + parameter Modelica.Units.SI.Temperature TSetCooLea = 273.15+14 "Set point for leaving fluid temperature cold supply" annotation(Dialog(group="Design parameter")); - parameter Modelica.SIunits.Pressure dp_nominal(displayUnit="Pa")=30000 + parameter Modelica.Units.SI.Pressure dp_nominal(displayUnit="Pa")=30000 "Pressure difference at nominal flow rate" annotation(Dialog(group="Design parameter")); - parameter Modelica.SIunits.TemperatureDifference dT_nominal( + parameter Modelica.Units.SI.TemperatureDifference dT_nominal( min=0.5, displayUnit="K") = TSetCooLea-TSetHeaLea "Temperature difference between warm and cold pipe" annotation(Dialog(group="Design parameter")); - final parameter Modelica.SIunits.MassFlowRate m_flow_nominal = Q_flow_nominal/4200/dT_nominal + final parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = Q_flow_nominal/4200/dT_nominal "Nominal mass flow rate"; Obsolete.DistrictHeatingCooling.Plants.HeatingCoolingCarnot_T pla( redeclare package Medium = Medium, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/Plants/Validation/Plant_T.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/Plants/Validation/Plant_T.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/Plants/Validation/Plant_T.mo" 2022-03-10 09:57:40.256144413 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/Plants/Validation/Plant_T.mo" 2022-03-10 09:58:15.796148915 +0000 @@ -3,28 +3,28 @@ extends Modelica.Icons.Example; package Medium = Buildings.Media.Water "Fluid in the pipes"; - parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal = 1E6 + parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal = 1E6 "Nominal heat flow rate, positive for heating, negative for cooling"; - parameter Modelica.SIunits.Temperature TSetHeaLea = 273.15+8 + parameter Modelica.Units.SI.Temperature TSetHeaLea = 273.15+8 "Set point for leaving fluid temperature warm supply" annotation(Dialog(group="Design parameter")); - parameter Modelica.SIunits.Temperature TSetCooLea = 273.15+14 + parameter Modelica.Units.SI.Temperature TSetCooLea = 273.15+14 "Set point for leaving fluid temperature cold supply" annotation(Dialog(group="Design parameter")); - parameter Modelica.SIunits.Pressure dp_nominal(displayUnit="Pa")=30000 + parameter Modelica.Units.SI.Pressure dp_nominal(displayUnit="Pa")=30000 "Pressure difference at nominal flow rate" annotation(Dialog(group="Design parameter")); - parameter Modelica.SIunits.TemperatureDifference dT_nominal( + parameter Modelica.Units.SI.TemperatureDifference dT_nominal( min=0.5, displayUnit="K") = TSetCooLea-TSetHeaLea "Temperature difference between warm and cold pipe" annotation(Dialog(group="Design parameter")); - final parameter Modelica.SIunits.MassFlowRate m_flow_nominal = Q_flow_nominal/4200/dT_nominal + final parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = Q_flow_nominal/4200/dT_nominal "Nominal mass flow rate"; Obsolete.DistrictHeatingCooling.Plants.Ideal_T pla( redeclare package Medium = Medium, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/Plants/Validation/Plant_T_ClosedLoop.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/Plants/Validation/Plant_T_ClosedLoop.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/Plants/Validation/Plant_T_ClosedLoop.mo" 2022-03-10 09:57:40.256144413 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/Plants/Validation/Plant_T_ClosedLoop.mo" 2022-03-10 09:58:15.776148913 +0000 @@ -4,28 +4,28 @@ extends Modelica.Icons.Example; package Medium = Buildings.Media.Water "Fluid in the pipes"; - parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal = 10E3 + parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal = 10E3 "Nominal heat flow rate, positive for heating, negative for cooling"; - parameter Modelica.SIunits.Temperature TSetHeaLea = 273.15+8 + parameter Modelica.Units.SI.Temperature TSetHeaLea = 273.15+8 "Set point for leaving fluid temperature warm supply" annotation(Dialog(group="Design parameter")); - parameter Modelica.SIunits.Temperature TSetCooLea = 273.15+14 + parameter Modelica.Units.SI.Temperature TSetCooLea = 273.15+14 "Set point for leaving fluid temperature cold supply" annotation(Dialog(group="Design parameter")); - parameter Modelica.SIunits.Pressure dp_nominal(displayUnit="Pa")=30000 + parameter Modelica.Units.SI.Pressure dp_nominal(displayUnit="Pa")=30000 "Pressure difference at nominal flow rate" annotation(Dialog(group="Design parameter")); - parameter Modelica.SIunits.TemperatureDifference dT_nominal( + parameter Modelica.Units.SI.TemperatureDifference dT_nominal( min=0.5, displayUnit="K") = TSetCooLea-TSetHeaLea "Temperature difference between warm and cold pipe" annotation(Dialog(group="Design parameter")); - final parameter Modelica.SIunits.MassFlowRate m_flow_nominal = Q_flow_nominal/4200/dT_nominal + final parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = Q_flow_nominal/4200/dT_nominal "Nominal mass flow rate"; Obsolete.DistrictHeatingCooling.Plants.Ideal_T pla( redeclare package Medium = Medium, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/SubStations/BaseClasses/HeatingOrCooling.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/SubStations/BaseClasses/HeatingOrCooling.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/SubStations/BaseClasses/HeatingOrCooling.mo" 2022-03-10 09:57:40.256144413 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/SubStations/BaseClasses/HeatingOrCooling.mo" 2022-03-10 09:58:15.736148907 +0000 @@ -5,7 +5,7 @@ final dp(start=0), final allowFlowReversal=false); - parameter Modelica.SIunits.Pressure dp_nominal(displayUnit="Pa")=30000 + parameter Modelica.Units.SI.Pressure dp_nominal(displayUnit="Pa")=30000 "Pressure difference at nominal flow rate" annotation(Dialog(group="Design parameter")); @@ -16,7 +16,7 @@ parameter Real deltaM=0.1 "Fraction of nominal flow rate where flow transitions to laminar" annotation (Dialog(tab="Flow resistance")); - 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")); parameter Modelica.Fluid.Types.Dynamics energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState @@ -31,7 +31,7 @@ T=Medium.T_default, p=Medium.p_default, X=Medium.X_default[1:Medium.nXi]) "Medium state at default properties"; - final parameter Modelica.SIunits.SpecificHeatCapacity cp_default= + final parameter Modelica.Units.SI.SpecificHeatCapacity cp_default= Medium.specificHeatCapacityCp(sta_default) "Specific heat capacity of the fluid"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/SubStations/Cooling.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/SubStations/Cooling.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/SubStations/Cooling.mo" 2022-03-10 09:57:40.256144413 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/SubStations/Cooling.mo" 2022-03-10 09:58:15.716148905 +0000 @@ -4,13 +4,13 @@ Buildings.Obsolete.DistrictHeatingCooling.SubStations.BaseClasses.HeatingOrCooling( final m_flow_nominal = -Q_flow_nominal/cp_default/dTHex, mPum_flow(final k=-1/(cp_default*dTHex))); - parameter Modelica.SIunits.TemperatureDifference dTHex( + parameter Modelica.Units.SI.TemperatureDifference dTHex( min=0.5, displayUnit="K") = 4 "Temperature difference over the heat exchanger (positive)" annotation(Dialog(group="Design parameter")); - parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal(max=0) + parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal(max=0) "Nominal heat flow rate added to medium (Q_flow_nominal <= 0)"; Modelica.Blocks.Interfaces.RealInput Q_flow( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/SubStations/Heating.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/SubStations/Heating.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/SubStations/Heating.mo" 2022-03-10 09:57:40.256144413 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/SubStations/Heating.mo" 2022-03-10 09:58:15.700148904 +0000 @@ -5,13 +5,13 @@ final m_flow_nominal = -Q_flow_nominal/cp_default/dTHex, mPum_flow(final k=-1/(cp_default*dTHex))); - parameter Modelica.SIunits.TemperatureDifference dTHex( + parameter Modelica.Units.SI.TemperatureDifference dTHex( max=-0.5, displayUnit="K") = -4 "Temperature difference over the heat exchanger (negative)" annotation(Dialog(group="Design parameter")); - parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal( + parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal( min=0) "Nominal heat flow rate added to medium (Q_flow_nominal > 0)"; Modelica.Blocks.Interfaces.RealInput Q_flow( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/SubStations/VaporCompression/HeatingCoolingHotwaterTimeSeries_dT.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/SubStations/VaporCompression/HeatingCoolingHotwaterTimeSeries_dT.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/SubStations/VaporCompression/HeatingCoolingHotwaterTimeSeries_dT.mo" 2022-03-10 09:57:40.256144413 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/SubStations/VaporCompression/HeatingCoolingHotwaterTimeSeries_dT.mo" 2022-03-10 09:58:15.632148894 +0000 @@ -10,24 +10,24 @@ parameter Real gaiHea(min=0) = gaiCoo "Gain to scale heating load"; parameter Real gaiHotWat(min=0) = gaiHea "Gain to scale hot water load"; - parameter Modelica.SIunits.Temperature TColMin = 273.15+8 + parameter Modelica.Units.SI.Temperature TColMin = 273.15+8 "Minimum temperature of district cold water supply"; - parameter Modelica.SIunits.Temperature THotMax = 273.15+18 + parameter Modelica.Units.SI.Temperature THotMax = 273.15+18 "Maximum temperature of district hot water supply"; - parameter Modelica.SIunits.TemperatureDifference dTCooCon_nominal( + parameter Modelica.Units.SI.TemperatureDifference dTCooCon_nominal( min=0.5, displayUnit="K") = 4 "Temperature difference condenser of the chiller (positive)" annotation(Dialog(group="Design parameter")); - parameter Modelica.SIunits.TemperatureDifference dTHeaEva_nominal( + parameter Modelica.Units.SI.TemperatureDifference dTHeaEva_nominal( max=-0.5, displayUnit="K") = -4 "Temperature difference evaporator of the heat pump for space heating (negative)" annotation(Dialog(group="Design parameter")); - parameter Modelica.SIunits.TemperatureDifference dTCooEva_nominal=-4 + parameter Modelica.Units.SI.TemperatureDifference dTCooEva_nominal=-4 "Temperature difference evaporator of the chiller"; parameter String filNam "Name of data file with heating and cooling load" @@ -35,53 +35,53 @@ loadSelector(filter="Load file (*.mos)", caption="Select load file"))); - parameter Modelica.SIunits.HeatFlowRate QCoo_flow_nominal(max=-Modelica.Constants.eps)= gaiCoo * + parameter Modelica.Units.SI.HeatFlowRate QCoo_flow_nominal(max=-Modelica.Constants.eps)= gaiCoo * Buildings.Experimental.DHC.Loads.BaseClasses.getPeakLoad( string="#Peak space cooling load", filNam=filNam) "Design heat flow rate" annotation(Dialog(group="Design parameter")); - parameter Modelica.SIunits.HeatFlowRate QHea_flow_nominal(min=Modelica.Constants.eps)= gaiHea * + parameter Modelica.Units.SI.HeatFlowRate QHea_flow_nominal(min=Modelica.Constants.eps)= gaiHea * Buildings.Experimental.DHC.Loads.BaseClasses.getPeakLoad( string="#Peak space heating load", filNam=filNam) "Design heat flow rate" annotation(Dialog(group="Design parameter")); - parameter Modelica.SIunits.HeatFlowRate QHotWat_flow_nominal(min=Modelica.Constants.eps)= gaiHotWat * + parameter Modelica.Units.SI.HeatFlowRate QHotWat_flow_nominal(min=Modelica.Constants.eps)= gaiHotWat * Buildings.Experimental.DHC.Loads.BaseClasses.getPeakLoad( string="#Peak water heating load", filNam=filNam) "Design heat flow rate for domestic hot water" annotation(Dialog(group="Design parameter")); - parameter Modelica.SIunits.Temperature TChiSup_nominal = 273.15 + 16 + parameter Modelica.Units.SI.Temperature TChiSup_nominal = 273.15 + 16 "Chilled water leaving temperature at the evaporator" annotation (Dialog(group="Nominal conditions")); - parameter Modelica.SIunits.Temperature THeaSup_nominal = 273.15+30 + parameter Modelica.Units.SI.Temperature THeaSup_nominal = 273.15+30 "Supply temperature space heating system at TOut_nominal" annotation (Dialog(group="Nominal conditions")); - parameter Modelica.SIunits.Temperature THeaRet_nominal = 273.15+25 + parameter Modelica.Units.SI.Temperature THeaRet_nominal = 273.15+25 "Return temperature space heating system at TOut_nominal" annotation (Dialog(group="Nominal conditions")); - parameter Modelica.SIunits.Temperature TOut_nominal + parameter Modelica.Units.SI.Temperature TOut_nominal "Outside design temperature for heating" annotation (Dialog(group="Nominal conditions")); - parameter Modelica.SIunits.TemperatureDifference dTHotWatCon_nominal(min=0)=60-40 + parameter Modelica.Units.SI.TemperatureDifference dTHotWatCon_nominal(min=0)=60-40 "Temperature difference condenser of hot water heat pump"; - parameter Modelica.SIunits.Pressure dp_nominal(displayUnit="Pa")=30000 + parameter Modelica.Units.SI.Pressure dp_nominal(displayUnit="Pa")=30000 "Pressure difference at nominal flow rate (for each flow leg)" annotation(Dialog(group="Design parameter")); - final parameter Modelica.SIunits.MassFlowRate mCooCon_flow_nominal(min=0)= + final parameter Modelica.Units.SI.MassFlowRate mCooCon_flow_nominal(min=0)= -QCoo_flow_nominal/cp_default/dTCooCon_nominal "Design mass flow rate for cooling at district side" annotation(Dialog(group="Design parameter")); - final parameter Modelica.SIunits.MassFlowRate mHeaEva_flow_nominal(min=0)= + final parameter Modelica.Units.SI.MassFlowRate mHeaEva_flow_nominal(min=0)= -QHea_flow_nominal/cp_default/dTHeaEva_nominal "Design mass flow rate for space heating at district side" annotation(Dialog(group="Design parameter")); - final parameter Modelica.SIunits.MassFlowRate mHotWatEva_flow_nominal(min=0)= + final parameter Modelica.Units.SI.MassFlowRate mHotWatEva_flow_nominal(min=0)= QHotWat_flow_nominal/cp_default/dTHotWatCon_nominal "Design mass flow rate for domestic hot water at district side" annotation(Dialog(group="Design parameter")); @@ -175,7 +175,7 @@ noEvent(actualStream(chi.port_b1.Xi_outflow))) if show_T "Medium properties in port_b1 of chiller outlet"; - constant Modelica.SIunits.SpecificHeatCapacity cp_default=4184 + constant Modelica.Units.SI.SpecificHeatCapacity cp_default=4184 "Specific heat capacity of the fluid"; Buildings.Fluid.HeatPumps.Carnot_TCon heaPum( @@ -265,7 +265,7 @@ T=Medium.T_default, p=Medium.p_default, X=Medium.X_default[1:Medium.nXi]) "Medium state at default properties"; - final parameter Modelica.SIunits.SpecificHeatCapacity cp_default_check= + final parameter Modelica.Units.SI.SpecificHeatCapacity cp_default_check= Medium.specificHeatCapacityCp(sta_default) "Specific heat capacity of the fluid"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/Validation/HeatingCoolingHotWaterSmall.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/Validation/HeatingCoolingHotWaterSmall.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/Validation/HeatingCoolingHotWaterSmall.mo" 2022-03-10 09:57:40.256144413 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/Validation/HeatingCoolingHotWaterSmall.mo" 2022-03-10 09:58:15.480148875 +0000 @@ -4,18 +4,18 @@ extends Modelica.Icons.Example; package Medium = Buildings.Media.Water "Fluid in the pipes"; - parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal = 6E5 + parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal = 6E5 "Nominal heat flow rate, positive for heating, negative for cooling"; - parameter Modelica.SIunits.Temperature TSetHeaLea = 273.15+12 + parameter Modelica.Units.SI.Temperature TSetHeaLea = 273.15+12 "Set point for leaving fluid temperature warm supply" annotation(Dialog(group="Design parameter")); - parameter Modelica.SIunits.Temperature TSetCooLea = 273.15+16 + parameter Modelica.Units.SI.Temperature TSetCooLea = 273.15+16 "Set point for leaving fluid temperature cold supply" annotation(Dialog(group="Design parameter")); - parameter Modelica.SIunits.TemperatureDifference dT_nominal( + parameter Modelica.Units.SI.TemperatureDifference dT_nominal( min=0.5, displayUnit="K") = TSetCooLea-TSetHeaLea "Temperature difference between warm and cold pipe" @@ -24,7 +24,7 @@ parameter Real R_nominal(unit="Pa/m") = 100 "Pressure drop per meter at nominal flow rate"; - final parameter Modelica.SIunits.MassFlowRate m_flow_nominal = Q_flow_nominal/4200/dT_nominal + final parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = Q_flow_nominal/4200/dT_nominal "Nominal mass flow rate"; Plants.HeatingCoolingCarnot_T pla( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/Validation/IdealSmallSystem.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/Validation/IdealSmallSystem.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/Validation/IdealSmallSystem.mo" 2022-03-10 09:57:40.256144413 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/DistrictHeatingCooling/Validation/IdealSmallSystem.mo" 2022-03-10 09:58:15.444148870 +0000 @@ -3,24 +3,24 @@ extends Modelica.Icons.Example; package Medium = Buildings.Media.Water "Fluid in the pipes"; - parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal = 0.5E6 + parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal = 0.5E6 "Nominal heat flow rate, positive for heating, negative for cooling"; - parameter Modelica.SIunits.Temperature TSetHeaLea = 273.15+8 + parameter Modelica.Units.SI.Temperature TSetHeaLea = 273.15+8 "Set point for leaving fluid temperature warm supply" annotation(Dialog(group="Design parameter")); - parameter Modelica.SIunits.Temperature TSetCooLea = 273.15+14 + parameter Modelica.Units.SI.Temperature TSetCooLea = 273.15+14 "Set point for leaving fluid temperature cold supply" annotation(Dialog(group="Design parameter")); - parameter Modelica.SIunits.TemperatureDifference dT_nominal( + parameter Modelica.Units.SI.TemperatureDifference dT_nominal( min=0.5, displayUnit="K") = TSetCooLea-TSetHeaLea "Temperature difference between warm and cold pipe" annotation(Dialog(group="Design parameter")); - final parameter Modelica.SIunits.MassFlowRate m_flow_nominal = Q_flow_nominal/4200/dT_nominal + final parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = Q_flow_nominal/4200/dT_nominal "Nominal mass flow rate"; parameter Real R_nominal(unit="Pa/m") = 100 diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/Examples/VAVReheat/BaseClasses/VAVBranch.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/Examples/VAVReheat/BaseClasses/VAVBranch.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/Examples/VAVReheat/BaseClasses/VAVBranch.mo" 2022-03-10 09:57:40.256144413 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/Examples/VAVReheat/BaseClasses/VAVBranch.mo" 2022-03-10 09:58:15.272148849 +0000 @@ -9,9 +9,9 @@ parameter Boolean allowFlowReversal=true "= false to simplify equations, assuming, but not enforcing, no flow reversal"; - 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"; Buildings.Fluid.Actuators.Dampers.PressureIndependent vav( redeclare package Medium = MediumA, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/Utilities/IO/Python27/Examples/KalmanFilter.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/Utilities/IO/Python27/Examples/KalmanFilter.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/Utilities/IO/Python27/Examples/KalmanFilter.mo" 2022-03-10 09:57:40.256144413 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/Utilities/IO/Python27/Examples/KalmanFilter.mo" 2022-03-10 09:58:15.176148837 +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 8.1.0/Obsolete/Utilities/IO/Python27/Examples/SimpleRoom.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/Utilities/IO/Python27/Examples/SimpleRoom.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/Utilities/IO/Python27/Examples/SimpleRoom.mo" 2022-03-10 09:57:40.256144413 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Obsolete/Utilities/IO/Python27/Examples/SimpleRoom.mo" 2022-03-10 09:58:15.160148834 +0000 @@ -2,7 +2,7 @@ model SimpleRoom "Simple room model implemented in Python that outputs the temperature and the energy" extends Modelica.Icons.Example; - Modelica.Blocks.Sources.Clock clock + Modelica.Blocks.Sources.ContinuousClock clock annotation (Placement(transformation(extent={{-80,-10},{-60,10}}))); Real_Real pyt( @@ -28,7 +28,7 @@ amplitude=5, offset=283.15, y(unit="K", displayUnit="degC"), - freqHz=1/86400, +f =1/86400, phase=-1.5707963267949) "Ambient temperature" annotation (Placement(transformation(extent={{-80,30},{-60,50}}))); equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/BaseClasses/Validation/BinaryVariableGeneration.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/BaseClasses/Validation/BinaryVariableGeneration.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/BaseClasses/Validation/BinaryVariableGeneration.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/BaseClasses/Validation/BinaryVariableGeneration.mo" 2022-03-10 09:58:15.004148816 +0000 @@ -6,7 +6,7 @@ Real p "Time-varying real number as input"; output Real y "Output"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; initial equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/BaseClasses/Validation/ExponentialVariableGeneration.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/BaseClasses/Validation/ExponentialVariableGeneration.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/BaseClasses/Validation/ExponentialVariableGeneration.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/BaseClasses/Validation/ExponentialVariableGeneration.mo" 2022-03-10 09:58:14.992148814 +0000 @@ -6,7 +6,7 @@ Real mu "Time-varying real number as input"; output Real y "Output"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; initial equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/BaseClasses/Validation/Linear1D.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/BaseClasses/Validation/Linear1D.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/BaseClasses/Validation/Linear1D.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/BaseClasses/Validation/Linear1D.mo" 2022-03-10 09:58:14.984148812 +0000 @@ -8,7 +8,7 @@ Real x "Time-varying real number as input"; output Real y "Output"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; initial equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/BaseClasses/Validation/Logit1D.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/BaseClasses/Validation/Logit1D.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/BaseClasses/Validation/Logit1D.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/BaseClasses/Validation/Logit1D.mo" 2022-03-10 09:58:14.976148811 +0000 @@ -8,7 +8,7 @@ Real x "Time-varying real number as input"; output Real y "Output"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; initial equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/BaseClasses/Validation/Logit1DQuadratic.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/BaseClasses/Validation/Logit1DQuadratic.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/BaseClasses/Validation/Logit1DQuadratic.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/BaseClasses/Validation/Logit1DQuadratic.mo" 2022-03-10 09:58:14.968148811 +0000 @@ -10,7 +10,7 @@ Real x "Time-varying real number as input"; output Real y "Output"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; initial equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/BaseClasses/Validation/Logit2D.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/BaseClasses/Validation/Logit2D.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/BaseClasses/Validation/Logit2D.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/BaseClasses/Validation/Logit2D.mo" 2022-03-10 09:58:14.960148810 +0000 @@ -10,7 +10,7 @@ Real x2 "Time-varying real number as input"; output Real y "Output"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; initial equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/BaseClasses/Validation/Weibull1DOFF.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/BaseClasses/Validation/Weibull1DOFF.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/BaseClasses/Validation/Weibull1DOFF.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/BaseClasses/Validation/Weibull1DOFF.mo" 2022-03-10 09:58:14.840148795 +0000 @@ -11,7 +11,7 @@ Real x "Time-varying real number as input"; output Real y "Output"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; initial equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/BaseClasses/Validation/Weibull1DON.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/BaseClasses/Validation/Weibull1DON.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/BaseClasses/Validation/Weibull1DON.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/BaseClasses/Validation/Weibull1DON.mo" 2022-03-10 09:58:14.828148793 +0000 @@ -11,7 +11,7 @@ Real x "Time-varying real number as input"; output Real y "Output"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; initial equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/BaseClasses/Validation/WeibullVariableGeneration.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/BaseClasses/Validation/WeibullVariableGeneration.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/BaseClasses/Validation/WeibullVariableGeneration.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/BaseClasses/Validation/WeibullVariableGeneration.mo" 2022-03-10 09:58:14.820148791 +0000 @@ -9,7 +9,7 @@ output Real y "Output"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; initial equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Blinds/Haldi2008BlindsTIn.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Blinds/Haldi2008BlindsTIn.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Blinds/Haldi2008BlindsTIn.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Blinds/Haldi2008BlindsTIn.mo" 2022-03-10 09:58:14.704148777 +0000 @@ -5,7 +5,7 @@ parameter Real A(final unit="1/K") = 0.425 "Slope of indoor temperature"; parameter Real B(final unit="1") = -11.37 "Intercept"; parameter Integer seed = 20 "Seed for the random number generator"; - parameter Modelica.SIunits.Time samplePeriod = 120 "Sample period"; + parameter Modelica.Units.SI.Time samplePeriod = 120 "Sample period"; Modelica.Blocks.Interfaces.RealInput TIn( final unit="K", @@ -27,7 +27,7 @@ final max=1) "The probability of lowering the blinds"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; output Boolean sampleTrigger "True, if sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Blinds/Haldi2008BlindsTOut.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Blinds/Haldi2008BlindsTOut.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Blinds/Haldi2008BlindsTOut.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Blinds/Haldi2008BlindsTOut.mo" 2022-03-10 09:58:14.684148775 +0000 @@ -5,7 +5,7 @@ parameter Real A(final unit="1/K") = 0.139 "Slope of outdoor temperature"; parameter Real B(final unit="1") = -3.54 "Intercept"; parameter Integer seed = 20 "Seed for the random number generator"; - parameter Modelica.SIunits.Time samplePeriod = 120 "Sample period"; + parameter Modelica.Units.SI.Time samplePeriod = 120 "Sample period"; Modelica.Blocks.Interfaces.RealInput TOut( final unit="K", @@ -27,7 +27,7 @@ final max=1) "The probability of lowering the blinds"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; output Boolean sampleTrigger "True, if sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Blinds/Inkarojrit2008BlindsSolarIntensity.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Blinds/Inkarojrit2008BlindsSolarIntensity.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Blinds/Inkarojrit2008BlindsSolarIntensity.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Blinds/Inkarojrit2008BlindsSolarIntensity.mo" 2022-03-10 09:58:14.672148773 +0000 @@ -9,7 +9,7 @@ seven-point scale, 1 for least sensitive, 7 for most sensitive" annotation(Dialog(tab = "Advanced")); parameter Integer seed = 10 "Seed for the random number generator"; - parameter Modelica.SIunits.Time samplePeriod = 120 "Sample period"; + parameter Modelica.Units.SI.Time samplePeriod = 120 "Sample period"; Modelica.Blocks.Interfaces.RealInput H(unit="W/m2") "Solar intensity" annotation (Placement(transformation(extent={{-140,-80},{-100,-40}}), @@ -30,7 +30,7 @@ final max=1) "The probability of keeping the blinds on"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; output Boolean sampleTrigger "True, if sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Blinds/Newsham1994BlindsSolarIntensity.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Blinds/Newsham1994BlindsSolarIntensity.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Blinds/Newsham1994BlindsSolarIntensity.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Blinds/Newsham1994BlindsSolarIntensity.mo" 2022-03-10 09:58:14.664148772 +0000 @@ -3,7 +3,7 @@ "A model to predict occupants' blinds behavior with solar intensity" extends Modelica.Blocks.Icons.DiscreteBlock; parameter Real HSet = 233 "Threshold for moving blinds up or down"; - parameter Modelica.SIunits.Time samplePeriod = 120 "Sample period"; + parameter Modelica.Units.SI.Time samplePeriod = 120 "Sample period"; Modelica.Blocks.Interfaces.RealInput H(unit="W/m2") "Solar intensity at the room-side of the window" annotation (Placement(transformation(extent={{-140,-80},{-100,-40}}), @@ -19,7 +19,7 @@ annotation (Placement(transformation(extent={{100,-10},{120,10}}))); protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; output Boolean sampleTrigger "True, if sample time instant"; initial equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Blinds/Validation/Haldi2008BlindsTIn.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Blinds/Validation/Haldi2008BlindsTIn.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Blinds/Validation/Haldi2008BlindsTIn.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Blinds/Validation/Haldi2008BlindsTIn.mo" 2022-03-10 09:58:14.648148769 +0000 @@ -9,7 +9,7 @@ Modelica.Blocks.Sources.Sine TIn( amplitude=15, offset=293, - freqHz=0.001, +f =0.001, y(unit="K", displayUnit="degC")) "Indoor temperature" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Blinds/Validation/Haldi2008BlindsTOut.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Blinds/Validation/Haldi2008BlindsTOut.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Blinds/Validation/Haldi2008BlindsTOut.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Blinds/Validation/Haldi2008BlindsTOut.mo" 2022-03-10 09:58:14.640148769 +0000 @@ -9,7 +9,7 @@ Modelica.Blocks.Sources.Sine TOut( amplitude=15, offset=293, - freqHz=0.001, +f =0.001, y(unit="K", displayUnit="degC")) "Outdoor temperature" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Blinds/Validation/Inkarojrit2008BlindsSolarIntensity.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Blinds/Validation/Inkarojrit2008BlindsSolarIntensity.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Blinds/Validation/Inkarojrit2008BlindsSolarIntensity.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Blinds/Validation/Inkarojrit2008BlindsSolarIntensity.mo" 2022-03-10 09:58:14.628148767 +0000 @@ -9,7 +9,7 @@ Modelica.Blocks.Sources.Sine H( amplitude=250, offset=300, - freqHz=0.001, +f =0.001, y(unit="W/m2")) "Solar intensity at the window" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); Buildings.Occupants.Office.Blinds.Inkarojrit2008BlindsSolarIntensity bli(LSen= 1) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Blinds/Validation/Newsham1994BlindsSolarIntensity.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Blinds/Validation/Newsham1994BlindsSolarIntensity.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Blinds/Validation/Newsham1994BlindsSolarIntensity.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Blinds/Validation/Newsham1994BlindsSolarIntensity.mo" 2022-03-10 09:58:14.616148765 +0000 @@ -9,7 +9,7 @@ Modelica.Blocks.Sources.Sine H( amplitude=250, offset=300, - freqHz=0.001, +f =0.001, y(unit="W/m2")) "Solar intensity at the window" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); Buildings.Occupants.Office.Blinds.Newsham1994BlindsSolarIntensity bli "Tested blinds model" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Blinds/Validation/Zhang2012BlindsSolarAltitude.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Blinds/Validation/Zhang2012BlindsSolarAltitude.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Blinds/Validation/Zhang2012BlindsSolarAltitude.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Blinds/Validation/Zhang2012BlindsSolarAltitude.mo" 2022-03-10 09:58:14.608148765 +0000 @@ -9,7 +9,7 @@ Modelica.Blocks.Sources.Sine SA( amplitude=30*3.14159/180, offset=35*3.14159/180, - freqHz=0.001, +f =0.001, y(unit="1")) "Solar altitude" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); Buildings.Occupants.Office.Blinds.Zhang2012BlindsSolarAltitude bli "Tested blinds model" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Blinds/Validation/Zhang2012BlindsSolarIntensity.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Blinds/Validation/Zhang2012BlindsSolarIntensity.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Blinds/Validation/Zhang2012BlindsSolarIntensity.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Blinds/Validation/Zhang2012BlindsSolarIntensity.mo" 2022-03-10 09:58:14.592148762 +0000 @@ -9,7 +9,7 @@ Modelica.Blocks.Sources.Sine H( amplitude=250, offset=300, - freqHz=0.001, +f =0.001, y(unit="W/m2")) "Solar intensity at the window" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); Buildings.Occupants.Office.Blinds.Zhang2012BlindsSolarIntensity bli "Tested blinds model" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Blinds/Zhang2012BlindsSolarAltitude.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Blinds/Zhang2012BlindsSolarAltitude.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Blinds/Zhang2012BlindsSolarAltitude.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Blinds/Zhang2012BlindsSolarAltitude.mo" 2022-03-10 09:58:14.580148761 +0000 @@ -7,7 +7,7 @@ parameter Real BUp = -3.446 "Intercept for blinds up"; parameter Real BDown = -3.424 "Intercept for blinds down"; parameter Integer seed = 10 "Seed for the random number generator"; - parameter Modelica.SIunits.Time samplePeriod = 120 "Sample period"; + parameter Modelica.Units.SI.Time samplePeriod = 120 "Sample period"; Modelica.Blocks.Interfaces.RealInput solarAltitude( unit="rad") "Solar Altitude" annotation (Placement(transformation(extent={{-140,-80},{-100,-40}}), @@ -32,7 +32,7 @@ final max=1) "The probability of blinds down"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; output Boolean sampleTrigger "True, if sample time instant"; Boolean isOpen "Blind state as a boolean"; Real curSeed "Current value for seed as a real-valued variable"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Blinds/Zhang2012BlindsSolarIntensity.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Blinds/Zhang2012BlindsSolarIntensity.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Blinds/Zhang2012BlindsSolarIntensity.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Blinds/Zhang2012BlindsSolarIntensity.mo" 2022-03-10 09:58:14.560148758 +0000 @@ -7,7 +7,7 @@ parameter Real BUp = -3.33 "Intercept for blinds up"; parameter Real BDown = -3.17 "Intercept for blinds down"; parameter Integer seed = 10 "Seed for the random number generator"; - parameter Modelica.SIunits.Time samplePeriod = 120 "Sample period"; + parameter Modelica.Units.SI.Time samplePeriod = 120 "Sample period"; Modelica.Blocks.Interfaces.RealInput H( unit="W/m2") "Solar intensity" annotation (Placement(transformation(extent={{-140,-80},{-100,-40}}), @@ -32,7 +32,7 @@ final max=1) "The probability of blinds down"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; output Boolean sampleTrigger "True, if sample time instant"; Boolean isOpen "Blind state as a boolean"; Real curSeed "Current value for seed as a real-valued variable"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Lighting/Gunay2016Light.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Lighting/Gunay2016Light.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Lighting/Gunay2016Light.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Lighting/Gunay2016Light.mo" 2022-03-10 09:58:14.536148755 +0000 @@ -6,7 +6,7 @@ parameter Real AInter = -0.002 "Slope of logistic regression intermediate"; parameter Real BInter = -3.9 "Intercept of logistic regression intermediate"; parameter Integer seed = 30 "Seed for the random number generator"; - parameter Modelica.SIunits.Time samplePeriod = 120 "Sample period"; + parameter Modelica.Units.SI.Time samplePeriod = 120 "Sample period"; Modelica.Blocks.Interfaces.RealInput ill "Illuminance on the working planein units of lux" annotation ( @@ -28,7 +28,7 @@ final max=1) "Intermediate robability of switch on the lighting"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; output Boolean sampleTrigger "True, if sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Lighting/Hunt1979Light.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Lighting/Hunt1979Light.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Lighting/Hunt1979Light.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Lighting/Hunt1979Light.mo" 2022-03-10 09:58:14.520148753 +0000 @@ -6,7 +6,7 @@ parameter Real CArriv = 1.0361 "Upon arrival"; parameter Real MArriv = 1.8223 "Upon arrival"; parameter Integer seed = 30 "Seed for the random number generator"; - parameter Modelica.SIunits.Time samplePeriod = 120 "Sample period"; + parameter Modelica.Units.SI.Time samplePeriod = 120 "Sample period"; Modelica.Blocks.Interfaces.RealInput ill "Illuminance on the working planein units of lux" annotation ( Placement(transformation(extent={{-140,-80},{-100,-40}}), @@ -23,7 +23,7 @@ max=1) "Probability of switch on the lighting upon arrival"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; output Boolean sampleTrigger "True, if sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Lighting/Love1998Light1.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Lighting/Love1998Light1.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Lighting/Love1998Light1.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Lighting/Love1998Light1.mo" 2022-03-10 09:58:14.504148751 +0000 @@ -4,7 +4,7 @@ parameter Real B = 5.85 "Intercept for logistic regression"; parameter Real M = -11.9 "Slope for logistic regression"; parameter Integer seed = 30 "Seed for the random number generator"; - parameter Modelica.SIunits.Time samplePeriod = 120 "Sample period"; + parameter Modelica.Units.SI.Time samplePeriod = 120 "Sample period"; Modelica.Blocks.Interfaces.RealInput ill "Daylight illuminance level on the deskin units of lux" annotation ( Placement(transformation(extent={{-140,-80},{-100,-40}}), @@ -21,7 +21,7 @@ final max=1) "Probability of switch on the lighting"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; output Boolean sampleTrigger "True, if sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Lighting/Love1998Light2.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Lighting/Love1998Light2.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Lighting/Love1998Light2.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Lighting/Love1998Light2.mo" 2022-03-10 09:58:14.488148750 +0000 @@ -4,7 +4,7 @@ parameter Real B = 7.19 "Intercept for logistic regression"; parameter Real M = -17.06 "Slope for logistic regression"; parameter Integer seed = 30 "Seed for the random number generator"; - parameter Modelica.SIunits.Time samplePeriod = 120 "Sample period"; + parameter Modelica.Units.SI.Time samplePeriod = 120 "Sample period"; Modelica.Blocks.Interfaces.RealInput ill "Daylight illuminance level on the deskin units of lux" annotation ( Placement(transformation(extent={{-140,-80},{-100,-40}}), @@ -21,7 +21,7 @@ final max=1) "Probability of switch on the lighting"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; output Boolean sampleTrigger "True, if sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Lighting/Reinhart2003Light.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Lighting/Reinhart2003Light.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Lighting/Reinhart2003Light.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Lighting/Reinhart2003Light.mo" 2022-03-10 09:58:14.472148747 +0000 @@ -10,7 +10,7 @@ parameter Real CInter = 0.017 "intermediate"; parameter Real MInter = 2.41 "intermediate"; parameter Integer seed = 30 "Seed for the random number generator"; - parameter Modelica.SIunits.Time samplePeriod = 120 "Sample period"; + parameter Modelica.Units.SI.Time samplePeriod = 120 "Sample period"; Modelica.Blocks.Interfaces.RealInput ill "Illuminance on the working planein units of lux" annotation ( Placement(transformation(extent={{-140,-80},{-100,-40}}), @@ -31,7 +31,7 @@ final max=1) "Intermediate robability of switch on the lighting"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; output Boolean sampleTrigger "True, if sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Lighting/Validation/Gunay2016Light.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Lighting/Validation/Gunay2016Light.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Lighting/Validation/Gunay2016Light.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Lighting/Validation/Gunay2016Light.mo" 2022-03-10 09:58:14.444148744 +0000 @@ -5,7 +5,7 @@ Modelica.Blocks.Sources.Sine ill( amplitude=200, offset=250, - freqHz=0.001) "Illuminance at working planein units of lux" +f =0.001) "Illuminance at working planein units of lux" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); Buildings.Occupants.Office.Lighting.Gunay2016Light lig "Tested lighting model" annotation (Placement(transformation(extent={{-10,-10},{10,10}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Lighting/Validation/Hunt1979Light.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Lighting/Validation/Hunt1979Light.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Lighting/Validation/Hunt1979Light.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Lighting/Validation/Hunt1979Light.mo" 2022-03-10 09:58:14.428148741 +0000 @@ -5,7 +5,7 @@ Modelica.Blocks.Sources.Sine ill( amplitude=200, offset=250, - freqHz=0.001) "Minimum illuminance at working plane" +f =0.001) "Minimum illuminance at working plane" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); Buildings.Occupants.Office.Lighting.Hunt1979Light lig "Tested lighting model" annotation (Placement(transformation(extent={{-10,-10},{10,10}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Lighting/Validation/Love1998Light1.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Lighting/Validation/Love1998Light1.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Lighting/Validation/Love1998Light1.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Lighting/Validation/Love1998Light1.mo" 2022-03-10 09:58:14.288148724 +0000 @@ -4,7 +4,7 @@ Modelica.Blocks.Sources.Sine ill( offset=250, - freqHz=0.001, +f =0.001, amplitude=200) "Daylight illuminance level on the deskin units of lux" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Lighting/Validation/Love1998Light2.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Lighting/Validation/Love1998Light2.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Lighting/Validation/Love1998Light2.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Lighting/Validation/Love1998Light2.mo" 2022-03-10 09:58:14.276148722 +0000 @@ -5,7 +5,7 @@ Modelica.Blocks.Sources.Sine ill( amplitude=200, offset=250, - freqHz=0.001) "Daylight illuminance level on the deskin units of lux" +f =0.001) "Daylight illuminance level on the deskin units of lux" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); Buildings.Occupants.Office.Lighting.Love1998Light2 lig "Tested lighting model" annotation (Placement(transformation(extent={{-10,-10},{10,10}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Lighting/Validation/Reinhart2003Light.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Lighting/Validation/Reinhart2003Light.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Lighting/Validation/Reinhart2003Light.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Lighting/Validation/Reinhart2003Light.mo" 2022-03-10 09:58:14.268148721 +0000 @@ -5,7 +5,7 @@ Modelica.Blocks.Sources.Sine ill( amplitude=200, offset=250, - freqHz=0.001) "Minimum illuminance at working plane" +f =0.001) "Minimum illuminance at working plane" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); Buildings.Occupants.Office.Lighting.Reinhart2003Light lig "Tested lighting model" annotation (Placement(transformation(extent={{-10,-10},{10,10}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Occupancy/Wang2005Occupancy.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Occupancy/Wang2005Occupancy.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Occupancy/Wang2005Occupancy.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Occupancy/Wang2005Occupancy.mo" 2022-03-10 09:58:14.240148719 +0000 @@ -3,8 +3,8 @@ "A model to predict Occupancy of a single person office" extends Modelica.Blocks.Icons.DiscreteBlock; - parameter Modelica.SIunits.Time one_mu(displayUnit="min") = 4368 "Mean occupancy duration"; - parameter Modelica.SIunits.Time zero_mu(displayUnit="min") = 2556 "Mean vacancy duration"; + parameter Modelica.Units.SI.Time one_mu(displayUnit="min") = 4368 "Mean occupancy duration"; + parameter Modelica.Units.SI.Time zero_mu(displayUnit="min") = 2556 "Mean vacancy duration"; parameter Integer seed = 10 "Seed for the random number generator"; Modelica.Blocks.Interfaces.BooleanOutput occ(start=true, fixed=true) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Haldi2008WindowsTIn.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Haldi2008WindowsTIn.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Haldi2008WindowsTIn.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Haldi2008WindowsTIn.mo" 2022-03-10 09:58:14.224148716 +0000 @@ -4,7 +4,7 @@ parameter Real A = 0.22 "Slope of the logistic relation"; parameter Real B = -5.64 "Intercept of the logistic relation"; parameter Integer seed = 30 "Seed for the random number generator"; - parameter Modelica.SIunits.Time samplePeriod = 120 "Sample period"; + parameter Modelica.Units.SI.Time samplePeriod = 120 "Sample period"; Modelica.Blocks.Interfaces.RealInput TIn( final unit="K", @@ -22,7 +22,7 @@ max=1) "Probability of window opened"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; output Boolean sampleTrigger "True, if sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Haldi2008WindowsTOut.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Haldi2008WindowsTOut.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Haldi2008WindowsTOut.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Haldi2008WindowsTOut.mo" 2022-03-10 09:58:14.212148714 +0000 @@ -4,7 +4,7 @@ parameter Real A = 0.049 "Slope of the logistic relation"; parameter Real B = -1.12 "Intercept of the logistic relation"; parameter Integer seed = 30 "Seed for the random number generator"; - parameter Modelica.SIunits.Time samplePeriod = 120 "Sample period"; + parameter Modelica.Units.SI.Time samplePeriod = 120 "Sample period"; Modelica.Blocks.Interfaces.RealInput TOut( final unit="K", @@ -22,7 +22,7 @@ max=1) "Probability of window opened"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; output Boolean sampleTrigger "True, if sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; initial equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Haldi2009WindowsTInTout.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Haldi2009WindowsTInTout.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Haldi2009WindowsTInTout.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Haldi2009WindowsTInTout.mo" 2022-03-10 09:58:14.200148713 +0000 @@ -8,7 +8,7 @@ parameter Real ACloseOut = -0.065 "Slope of outdoor temp of the logistic relation for the closing probability"; parameter Real BClose = -4.14 "Intercept of the logistic relation for the closing probability"; parameter Integer seed = 10 "Seed for the random number generator"; - parameter Modelica.SIunits.Time samplePeriod = 120 "Sample period"; + parameter Modelica.Units.SI.Time samplePeriod = 120 "Sample period"; Modelica.Blocks.Interfaces.RealInput TIn( final unit="K", @@ -35,7 +35,7 @@ max=1) "Probability of closing windows"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; output Boolean sampleTrigger "True, if sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Herkel2008WindowsCompletelyOpen.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Herkel2008WindowsCompletelyOpen.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Herkel2008WindowsCompletelyOpen.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Herkel2008WindowsCompletelyOpen.mo" 2022-03-10 09:58:14.180148710 +0000 @@ -5,7 +5,7 @@ parameter Real A = 0.08 "Slope of the logistic relation"; parameter Real B = -4.05 "Intercept of the logistic relation"; parameter Integer seed = 3 "Seed for the random number generator"; - parameter Modelica.SIunits.Time samplePeriod = 120 "Sample period"; + parameter Modelica.Units.SI.Time samplePeriod = 120 "Sample period"; Modelica.Blocks.Interfaces.RealInput TOut( final unit="K", @@ -23,7 +23,7 @@ max=1) "Probability of window opened"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; output Boolean sampleTrigger "True, if sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; initial equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Herkel2008WindowsSmall.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Herkel2008WindowsSmall.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Herkel2008WindowsSmall.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Herkel2008WindowsSmall.mo" 2022-03-10 09:58:14.168148709 +0000 @@ -4,7 +4,7 @@ parameter Real A = 0.16 "Slope of the logistic relation"; parameter Real B = -2.99 "Intercept of the logistic relation"; parameter Integer seed = 30 "Seed for the random number generator"; - parameter Modelica.SIunits.Time samplePeriod = 120 "Sample period"; + parameter Modelica.Units.SI.Time samplePeriod = 120 "Sample period"; Modelica.Blocks.Interfaces.RealInput TOut( final unit="K", @@ -22,7 +22,7 @@ max=1) "Probability of window opened"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; output Boolean sampleTrigger "True, if sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; initial equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Herkel2008WindowsTiltedOpen.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Herkel2008WindowsTiltedOpen.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Herkel2008WindowsTiltedOpen.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Herkel2008WindowsTiltedOpen.mo" 2022-03-10 09:58:14.156148707 +0000 @@ -5,7 +5,7 @@ parameter Real A = 0.08 "Slope of the logistic relation"; parameter Real B = -3.13 "Intercept of the logistic relation"; parameter Integer seed = 30 "Seed for the random number generator"; - parameter Modelica.SIunits.Time samplePeriod = 120 "Sample period"; + parameter Modelica.Units.SI.Time samplePeriod = 120 "Sample period"; Modelica.Blocks.Interfaces.RealInput TOut( final unit="K", @@ -23,7 +23,7 @@ max=1) "Probability of window opened"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; output Boolean sampleTrigger "True, if sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; initial equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Rijal2007WindowsTInTOutTComf.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Rijal2007WindowsTInTOutTComf.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Rijal2007WindowsTInTOutTComf.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Rijal2007WindowsTInTOutTComf.mo" 2022-03-10 09:58:14.144148705 +0000 @@ -5,7 +5,7 @@ parameter Real AOut = 0.166 "Slope of the outdoor temperature in the logistic relation"; parameter Real B = -6.4 "Intercept of the logistic relation"; parameter Integer seed = 3 "Seed for the random number generator"; - parameter Modelica.SIunits.Time samplePeriod = 120 "Sample period"; + parameter Modelica.Units.SI.Time samplePeriod = 120 "Sample period"; Modelica.Blocks.Interfaces.RealInput TIn( final unit="K", @@ -34,7 +34,7 @@ max=1) "Probability of window opened"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; output Boolean sampleTrigger "True, if sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Validation/Haldi2008WindowsTIn.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Validation/Haldi2008WindowsTIn.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Validation/Haldi2008WindowsTIn.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Validation/Haldi2008WindowsTIn.mo" 2022-03-10 09:58:14.116148702 +0000 @@ -8,7 +8,7 @@ Modelica.Blocks.Sources.Sine TIn( amplitude=15, offset=288, - freqHz=0.001, +f =0.001, y(unit="K", displayUnit="degC")) "Indoor air temperature" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Validation/Haldi2008WindowsTOut.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Validation/Haldi2008WindowsTOut.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Validation/Haldi2008WindowsTOut.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Validation/Haldi2008WindowsTOut.mo" 2022-03-10 09:58:14.108148702 +0000 @@ -8,7 +8,7 @@ Modelica.Blocks.Sources.Sine TOut( amplitude=15, offset=288, - freqHz=0.001, +f =0.001, y(unit="K", displayUnit="degC")) "Outdoor air temperature" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Validation/Haldi2009WindowsTInTout.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Validation/Haldi2009WindowsTInTout.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Validation/Haldi2009WindowsTInTout.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Validation/Haldi2009WindowsTInTout.mo" 2022-03-10 09:58:14.096148700 +0000 @@ -7,13 +7,13 @@ annotation (Placement(transformation(extent={{-80,50},{-60,70}}))); Modelica.Blocks.Sources.Sine TIn( amplitude=10, - freqHz=0.0007, +f =0.0007, y(unit="K", displayUnit="degC"), offset=298) "Indoor air temperature" annotation (Placement(transformation(extent={{-80,0},{-60,20}}))); Modelica.Blocks.Sources.Sine TOut( - freqHz=0.001, + f =0.001, y(unit="K", displayUnit="degC"), offset=298, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Validation/Herkel2008WindowsCompletelyOpen.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Validation/Herkel2008WindowsCompletelyOpen.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Validation/Herkel2008WindowsCompletelyOpen.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Validation/Herkel2008WindowsCompletelyOpen.mo" 2022-03-10 09:58:14.076148698 +0000 @@ -8,7 +8,7 @@ Modelica.Blocks.Sources.Sine TOut( amplitude=15, offset=288, - freqHz=0.001, +f =0.001, y(unit="K", displayUnit="degC")) "Outdoor air temperature" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Validation/Herkel2008WindowsSmall.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Validation/Herkel2008WindowsSmall.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Validation/Herkel2008WindowsSmall.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Validation/Herkel2008WindowsSmall.mo" 2022-03-10 09:58:14.052148695 +0000 @@ -8,7 +8,7 @@ Modelica.Blocks.Sources.Sine TOut( amplitude=15, offset=288, - freqHz=0.001, +f =0.001, y(unit="K", displayUnit="degC")) "Outdoor air temperature" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Validation/Herkel2008WindowsTiltedOpen.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Validation/Herkel2008WindowsTiltedOpen.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Validation/Herkel2008WindowsTiltedOpen.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Validation/Herkel2008WindowsTiltedOpen.mo" 2022-03-10 09:58:14.036148692 +0000 @@ -8,7 +8,7 @@ Modelica.Blocks.Sources.Sine TOut( amplitude=15, offset=288, - freqHz=0.001, +f =0.001, y(unit="K", displayUnit="degC")) "Outdoor air temperature" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Validation/Rijal2007WindowsTInTOutTComf.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Validation/Rijal2007WindowsTInTOutTComf.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Validation/Rijal2007WindowsTInTOutTComf.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Validation/Rijal2007WindowsTInTOutTComf.mo" 2022-03-10 09:58:14.024148690 +0000 @@ -7,13 +7,13 @@ annotation (Placement(transformation(extent={{-80,30},{-60,50}}))); Modelica.Blocks.Sources.Sine TIn( amplitude=10, - freqHz=0.0007, +f =0.0007, y(unit="K", displayUnit="degC"), offset=298) "Indoor air temperature" annotation (Placement(transformation(extent={{-80,0},{-60,20}}))); Modelica.Blocks.Sources.Sine TOut( - freqHz=0.001, + f =0.001, y(unit="K", displayUnit="degC"), offset=298, @@ -22,7 +22,7 @@ Modelica.Blocks.Sources.Sine TComf( amplitude=2, offset=298, - freqHz=0.0005, +f =0.0005, y(unit="K", displayUnit="degC")) "Comfort air temperature" annotation (Placement(transformation(extent={{-80,-70},{-60,-50}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Validation/Yun2008WindowsTIn.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Validation/Yun2008WindowsTIn.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Validation/Yun2008WindowsTIn.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Validation/Yun2008WindowsTIn.mo" 2022-03-10 09:58:14.012148689 +0000 @@ -8,7 +8,7 @@ Modelica.Blocks.Sources.Sine TIn( amplitude=15, offset=288, - freqHz=0.001, +f =0.001, y(unit="K", displayUnit="degC")) "Indoor air temperature" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Validation/Yun2008WindowsTOut.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Validation/Yun2008WindowsTOut.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Validation/Yun2008WindowsTOut.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Validation/Yun2008WindowsTOut.mo" 2022-03-10 09:58:14.000148688 +0000 @@ -8,7 +8,7 @@ Modelica.Blocks.Sources.Sine TOut( amplitude=15, offset=288, - freqHz=0.001, +f =0.001, y(unit="K", displayUnit="degC")) "Outdoor air temperature" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Validation/Zhang2012WindowsAll.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Validation/Zhang2012WindowsAll.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Validation/Zhang2012WindowsAll.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Validation/Zhang2012WindowsAll.mo" 2022-03-10 09:58:13.992148686 +0000 @@ -8,7 +8,7 @@ Modelica.Blocks.Sources.Sine TOut( amplitude=15, offset=288, - freqHz=0.001, +f =0.001, y(unit="K", displayUnit="degC")) "Outdoor air temperature" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Validation/Zhang2012WindowsEast.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Validation/Zhang2012WindowsEast.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Validation/Zhang2012WindowsEast.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Validation/Zhang2012WindowsEast.mo" 2022-03-10 09:58:13.980148685 +0000 @@ -8,7 +8,7 @@ Modelica.Blocks.Sources.Sine TOut( amplitude=15, offset=288, - freqHz=0.001, +f =0.001, y(unit="K", displayUnit="degC")) "Outdoor air temperature" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Validation/Zhang2012WindowsNorth.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Validation/Zhang2012WindowsNorth.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Validation/Zhang2012WindowsNorth.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Validation/Zhang2012WindowsNorth.mo" 2022-03-10 09:58:13.968148684 +0000 @@ -8,7 +8,7 @@ Modelica.Blocks.Sources.Sine TOut( amplitude=15, offset=288, - freqHz=0.001, +f =0.001, y(unit="K", displayUnit="degC")) "Outdoor air temperature" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Validation/Zhang2012WindowsSouth.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Validation/Zhang2012WindowsSouth.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Validation/Zhang2012WindowsSouth.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Validation/Zhang2012WindowsSouth.mo" 2022-03-10 09:58:13.952148681 +0000 @@ -8,7 +8,7 @@ Modelica.Blocks.Sources.Sine TOut( amplitude=15, offset=288, - freqHz=0.001, +f =0.001, y(unit="K", displayUnit="degC")) "Outdoor air temperature" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Validation/Zhang2012WindowsWest.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Validation/Zhang2012WindowsWest.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Validation/Zhang2012WindowsWest.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Validation/Zhang2012WindowsWest.mo" 2022-03-10 09:58:13.940148680 +0000 @@ -8,7 +8,7 @@ Modelica.Blocks.Sources.Sine TOut( amplitude=15, offset=288, - freqHz=0.001, +f =0.001, y(unit="K", displayUnit="degC")) "Outdoor air temperature" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Yun2008WindowsTIn.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Yun2008WindowsTIn.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Yun2008WindowsTIn.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Yun2008WindowsTIn.mo" 2022-03-10 09:58:13.928148678 +0000 @@ -6,7 +6,7 @@ parameter Real AClose = -0.007 "Slope of the logistic relation for closing the window"; parameter Real BClose = -0.209 "Intercept of the logistic relation for closing the window"; parameter Integer seed = 30 "Seed for the random number generator"; - parameter Modelica.SIunits.Time samplePeriod = 120 "Sample period"; + parameter Modelica.Units.SI.Time samplePeriod = 120 "Sample period"; Modelica.Blocks.Interfaces.RealInput TIn( final unit="K", @@ -28,7 +28,7 @@ max=1) "Probability of closing the window"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; output Boolean sampleTrigger "True, if sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Yun2008WindowsTOut.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Yun2008WindowsTOut.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Yun2008WindowsTOut.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Yun2008WindowsTOut.mo" 2022-03-10 09:58:13.912148677 +0000 @@ -6,7 +6,7 @@ parameter Real AClose = 0 "Slope of the logistic relation for closing the window"; parameter Real BClose = -0.040 "Intercept of the logistic relation for closing the window"; parameter Integer seed = 30 "Seed for the random number generator"; - parameter Modelica.SIunits.Time samplePeriod = 120 "Sample period"; + parameter Modelica.Units.SI.Time samplePeriod = 120 "Sample period"; Modelica.Blocks.Interfaces.RealInput TOut( final unit="K", @@ -28,7 +28,7 @@ max=1) "Probability of closing the window"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; output Boolean sampleTrigger "True, if sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; initial equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Zhang2012WindowsAll.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Zhang2012WindowsAll.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Zhang2012WindowsAll.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Zhang2012WindowsAll.mo" 2022-03-10 09:58:13.892148673 +0000 @@ -4,7 +4,7 @@ parameter Real A = 0.10 "Slope of the logistic relation"; parameter Real B = -4.01 "Intercept of the logistic relation"; parameter Integer seed = 30 "Seed for the random number generator"; - parameter Modelica.SIunits.Time samplePeriod = 120 "Sample period"; + parameter Modelica.Units.SI.Time samplePeriod = 120 "Sample period"; Modelica.Blocks.Interfaces.RealInput TOut( final unit="K", @@ -22,7 +22,7 @@ max=1) "Probability of window opened"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; output Boolean sampleTrigger "True, if sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Zhang2012WindowsEast.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Zhang2012WindowsEast.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Zhang2012WindowsEast.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Zhang2012WindowsEast.mo" 2022-03-10 09:58:13.868148672 +0000 @@ -4,7 +4,7 @@ parameter Real A = 0.09 "Slope of the logistic relation"; parameter Real B = -3.72 "Intercept of the logistic relation"; parameter Integer seed = 50 "Seed for the random number generator"; - parameter Modelica.SIunits.Time samplePeriod = 120 "Sample period"; + parameter Modelica.Units.SI.Time samplePeriod = 120 "Sample period"; Modelica.Blocks.Interfaces.RealInput TOut( final unit="K", @@ -22,7 +22,7 @@ max=1) "Probability of window opened"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; output Boolean sampleTrigger "True, if sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Zhang2012WindowsNorth.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Zhang2012WindowsNorth.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Zhang2012WindowsNorth.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Zhang2012WindowsNorth.mo" 2022-03-10 09:58:13.732148653 +0000 @@ -4,7 +4,7 @@ parameter Real A = 0.12 "Slope of the logistic relation"; parameter Real B = -4.38 "Intercept of the logistic relation"; parameter Integer seed = 30 "Seed for the random number generator"; - parameter Modelica.SIunits.Time samplePeriod = 120 "Sample period"; + parameter Modelica.Units.SI.Time samplePeriod = 120 "Sample period"; Modelica.Blocks.Interfaces.RealInput TOut( final unit="K", @@ -22,7 +22,7 @@ max=1) "Probability of window opened"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; output Boolean sampleTrigger "True, if sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; initial equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Zhang2012WindowsSouth.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Zhang2012WindowsSouth.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Zhang2012WindowsSouth.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Zhang2012WindowsSouth.mo" 2022-03-10 09:58:13.716148652 +0000 @@ -4,7 +4,7 @@ parameter Real A = 0.10 "Slope of the logistic relation"; parameter Real B = -3.64 "Intercept of the logistic relation"; parameter Integer seed = 30 "Seed for the random number generator"; - parameter Modelica.SIunits.Time samplePeriod = 120 "Sample period"; + parameter Modelica.Units.SI.Time samplePeriod = 120 "Sample period"; Modelica.Blocks.Interfaces.RealInput TOut( final unit="K", @@ -22,7 +22,7 @@ max=1) "Probability of window opened"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; output Boolean sampleTrigger "True, if sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Zhang2012WindowsWest.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Zhang2012WindowsWest.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Zhang2012WindowsWest.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Office/Windows/Zhang2012WindowsWest.mo" 2022-03-10 09:58:13.700148649 +0000 @@ -4,7 +4,7 @@ parameter Real A = 0.12 "Slope of the logistic relation"; parameter Real B = -4.77 "Intercept of the logistic relation"; parameter Integer seed = 50 "Seed for the random number generator"; - parameter Modelica.SIunits.Time samplePeriod = 120 "Sample period"; + parameter Modelica.Units.SI.Time samplePeriod = 120 "Sample period"; Modelica.Blocks.Interfaces.RealInput TOut( final unit="K", @@ -22,7 +22,7 @@ max=1) "Probability of window opened"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; output Boolean sampleTrigger "True, if sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; initial equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Residential/AirConditioning/Ren2014ACBedroom.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Residential/AirConditioning/Ren2014ACBedroom.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Residential/AirConditioning/Ren2014ACBedroom.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Residential/AirConditioning/Ren2014ACBedroom.mo" 2022-03-10 09:58:13.680148647 +0000 @@ -8,7 +8,7 @@ parameter Real L2 = 42.86 "Normalization factor for turning on the AC of the Weibull Distribution"; parameter Real k1 = 1.73 "Shape factor for turning off the AC of the Weibull Distribution"; parameter Real k2 = 1.80 "Shape factor for turning on the AC of the Weibull Distribution"; - parameter Modelica.SIunits.Time samplePeriod = 120 "Sample period"; + parameter Modelica.Units.SI.Time samplePeriod = 120 "Sample period"; parameter Integer seed = 10 "Seed for random number generator"; Modelica.Blocks.Interfaces.RealInput TIn( @@ -33,7 +33,7 @@ final max=1) "Probability of turning off the AC"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; output Boolean sampleTrigger "True, if sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Residential/AirConditioning/Ren2014ACLivingroom.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Residential/AirConditioning/Ren2014ACLivingroom.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Residential/AirConditioning/Ren2014ACLivingroom.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Residential/AirConditioning/Ren2014ACLivingroom.mo" 2022-03-10 09:58:13.664148645 +0000 @@ -8,7 +8,7 @@ parameter Real L2 = 15.87 "Normalization factor for turning on the AC of the Weibull Distribution"; parameter Real k1 = 1.30 "Shape factor for turning off the AC of the Weibull Distribution"; parameter Real k2 = 2.22 "Shape factor for turning on the AC of the Weibull Distribution"; - parameter Modelica.SIunits.Time samplePeriod = 120 "Sample period"; + parameter Modelica.Units.SI.Time samplePeriod = 120 "Sample period"; parameter Integer seed = 10 "Seed for random number generator"; Modelica.Blocks.Interfaces.RealInput TIn( @@ -32,7 +32,7 @@ max=1) "Probability of turning off the AC"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; output Boolean sampleTrigger "True, if sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Residential/AirConditioning/Validation/Ren2014ACBedroom.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Residential/AirConditioning/Validation/Ren2014ACBedroom.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Residential/AirConditioning/Validation/Ren2014ACBedroom.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Residential/AirConditioning/Validation/Ren2014ACBedroom.mo" 2022-03-10 09:58:13.640148643 +0000 @@ -8,7 +8,7 @@ Modelica.Blocks.Sources.Sine Tin( amplitude=10, offset=303, - freqHz=0.001, +f =0.001, y(unit="K", displayUnit="degC")) "Indoor air temperature" annotation (Placement(transformation(extent={{-80,-26},{-60,-6}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Residential/AirConditioning/Validation/Ren2014ACLivingroom.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Residential/AirConditioning/Validation/Ren2014ACLivingroom.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Residential/AirConditioning/Validation/Ren2014ACLivingroom.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Residential/AirConditioning/Validation/Ren2014ACLivingroom.mo" 2022-03-10 09:58:13.628148641 +0000 @@ -8,7 +8,7 @@ Modelica.Blocks.Sources.Sine Tin( amplitude=10, offset=303, - freqHz=0.001, +f =0.001, y(unit="K", displayUnit="degC")) "Indoor air temperature" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Residential/Heating/Nicol2001HeatingEU.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Residential/Heating/Nicol2001HeatingEU.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Residential/Heating/Nicol2001HeatingEU.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Residential/Heating/Nicol2001HeatingEU.mo" 2022-03-10 09:58:13.612148638 +0000 @@ -4,7 +4,7 @@ parameter Real A(final unit="1/K") = -0.32 "Slope of the logistic relation"; parameter Real B(final unit="1") = 2.72 "Intercept of the logistic relation"; parameter Integer seed = 10 "Seed for the random number generator"; - parameter Modelica.SIunits.Time samplePeriod = 120 "Sample period"; + parameter Modelica.Units.SI.Time samplePeriod = 120 "Sample period"; Modelica.Blocks.Interfaces.RealInput TOut( final unit="K", @@ -22,7 +22,7 @@ final max=1) "Probability of heating being on"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; output Boolean sampleTrigger "True, if sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Residential/Heating/Nicol2001HeatingPakistan.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Residential/Heating/Nicol2001HeatingPakistan.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Residential/Heating/Nicol2001HeatingPakistan.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Residential/Heating/Nicol2001HeatingPakistan.mo" 2022-03-10 09:58:13.604148637 +0000 @@ -4,7 +4,7 @@ parameter Real A(final unit="1/K") = -0.345 "Slope of the logistic relation"; parameter Real B(final unit="1") = 2.73 "Intercept of the logistic relation"; parameter Integer seed = 10 "Seed for the random number generator"; - parameter Modelica.SIunits.Time samplePeriod = 120 "Sample period"; + parameter Modelica.Units.SI.Time samplePeriod = 120 "Sample period"; Modelica.Blocks.Interfaces.RealInput TOut( final unit="K", @@ -23,7 +23,7 @@ final max=1) "Probability of heating being on"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; output Boolean sampleTrigger "True, if sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Residential/Heating/Nicol2001HeatingUK.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Residential/Heating/Nicol2001HeatingUK.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Residential/Heating/Nicol2001HeatingUK.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Residential/Heating/Nicol2001HeatingUK.mo" 2022-03-10 09:58:13.588148635 +0000 @@ -4,7 +4,7 @@ parameter Real A(final unit="1/K") = -0.514 "Slope of the logistic relation"; parameter Real B(final unit="1") = 5.28 "Intercept of the logistic relation"; parameter Integer seed = 10 "Seed for the random number generator"; - parameter Modelica.SIunits.Time samplePeriod = 120 "Sample period"; + parameter Modelica.Units.SI.Time samplePeriod = 120 "Sample period"; Modelica.Blocks.Interfaces.RealInput TOut( final unit="K", @@ -23,7 +23,7 @@ final max=1) "Probability of heating being on"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; output Boolean sampleTrigger "True, if sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Residential/Heating/Validation/Nicol2001HeatingEU.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Residential/Heating/Validation/Nicol2001HeatingEU.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Residential/Heating/Validation/Nicol2001HeatingEU.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Residential/Heating/Validation/Nicol2001HeatingEU.mo" 2022-03-10 09:58:13.572148634 +0000 @@ -8,7 +8,7 @@ Modelica.Blocks.Sources.Sine TOut( amplitude=15, offset=288, - freqHz=0.001, +f =0.001, y(unit="K", displayUnit="degC")) "Outdoor air temperature" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Residential/Heating/Validation/Nicol2001HeatingPakistan.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Residential/Heating/Validation/Nicol2001HeatingPakistan.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Residential/Heating/Validation/Nicol2001HeatingPakistan.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Residential/Heating/Validation/Nicol2001HeatingPakistan.mo" 2022-03-10 09:58:13.560148632 +0000 @@ -8,7 +8,7 @@ Modelica.Blocks.Sources.Sine TOut( amplitude=15, offset=288, - freqHz=0.001, +f =0.001, y(unit="K", displayUnit="degC")) "Outdoor air temperature" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Residential/Heating/Validation/Nicol2001HeatingUK.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Residential/Heating/Validation/Nicol2001HeatingUK.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Residential/Heating/Validation/Nicol2001HeatingUK.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Residential/Heating/Validation/Nicol2001HeatingUK.mo" 2022-03-10 09:58:13.548148630 +0000 @@ -8,7 +8,7 @@ Modelica.Blocks.Sources.Sine TOut( amplitude=15, offset=288, - freqHz=0.001, +f =0.001, y(unit="K", displayUnit="degC")) "Outdoor air temperature" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Residential/Windows/Nicol2001WindowsEU.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Residential/Windows/Nicol2001WindowsEU.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Residential/Windows/Nicol2001WindowsEU.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Residential/Windows/Nicol2001WindowsEU.mo" 2022-03-10 09:58:13.524148627 +0000 @@ -4,7 +4,7 @@ parameter Real A(final unit="1/K") = 0.104 "Slope of the logistic relation"; parameter Real B(final unit="1") = -2.31 "Intercept of the logistic relation"; parameter Integer seed = 30 "Seed for the random number generator"; - parameter Modelica.SIunits.Time samplePeriod = 120 "Sample period"; + parameter Modelica.Units.SI.Time samplePeriod = 120 "Sample period"; Modelica.Blocks.Interfaces.RealInput TOut( final unit="K", @@ -22,7 +22,7 @@ max=1) "Probability of window opened"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; output Boolean sampleTrigger "True, if sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; initial equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Residential/Windows/Nicol2001WindowsPakistan.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Residential/Windows/Nicol2001WindowsPakistan.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Residential/Windows/Nicol2001WindowsPakistan.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Residential/Windows/Nicol2001WindowsPakistan.mo" 2022-03-10 09:58:13.504148624 +0000 @@ -4,7 +4,7 @@ parameter Real A(final unit="1/K") = 0.118 "Slope of the logistic relation"; parameter Real B(final unit="1") = -3.73 "Intercept of the logistic relation"; parameter Integer seed = 5 "Seed for the random number generator"; - parameter Modelica.SIunits.Time samplePeriod = 120 "Sample period"; + parameter Modelica.Units.SI.Time samplePeriod = 120 "Sample period"; Modelica.Blocks.Interfaces.RealInput TOut( final unit="K", @@ -22,7 +22,7 @@ max=1) "Probability of window opened"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; output Boolean sampleTrigger "True, if sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; initial equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Residential/Windows/Nicol2001WindowsUK.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Residential/Windows/Nicol2001WindowsUK.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Residential/Windows/Nicol2001WindowsUK.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Residential/Windows/Nicol2001WindowsUK.mo" 2022-03-10 09:58:13.480148621 +0000 @@ -4,7 +4,7 @@ parameter Real A(final unit="1/K") = 0.169 "Slope of the logistic relation"; parameter Real B(final unit="1") = -2.65 "Intercept of the logistic relation"; parameter Integer seed = 30 "Seed for the random number generator"; - parameter Modelica.SIunits.Time samplePeriod = 120 "Sample period"; + parameter Modelica.Units.SI.Time samplePeriod = 120 "Sample period"; Modelica.Blocks.Interfaces.RealInput TOut( final unit="K", @@ -22,7 +22,7 @@ max=1) "Probability of window opened"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; output Boolean sampleTrigger "True, if sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; initial equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Residential/Windows/Validation/Nicol2001WindowsEU.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Residential/Windows/Validation/Nicol2001WindowsEU.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Residential/Windows/Validation/Nicol2001WindowsEU.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Residential/Windows/Validation/Nicol2001WindowsEU.mo" 2022-03-10 09:58:13.456148618 +0000 @@ -8,7 +8,7 @@ Modelica.Blocks.Sources.Sine TOut( amplitude=15, offset=288, - freqHz=0.001, +f =0.001, y(unit="K", displayUnit="degC")) "Outdoor air temperature" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Residential/Windows/Validation/Nicol2001WindowsPakistan.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Residential/Windows/Validation/Nicol2001WindowsPakistan.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Residential/Windows/Validation/Nicol2001WindowsPakistan.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Residential/Windows/Validation/Nicol2001WindowsPakistan.mo" 2022-03-10 09:58:13.444148618 +0000 @@ -8,7 +8,7 @@ Modelica.Blocks.Sources.Sine TOut( amplitude=15, offset=288, - freqHz=0.001, +f =0.001, y(unit="K", displayUnit="degC")) "Outdoor air temperature" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Residential/Windows/Validation/Nicol2001WindowsUK.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Residential/Windows/Validation/Nicol2001WindowsUK.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Residential/Windows/Validation/Nicol2001WindowsUK.mo" 2022-03-10 09:57:40.260144412 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Occupants/Residential/Windows/Validation/Nicol2001WindowsUK.mo" 2022-03-10 09:58:13.436148616 +0000 @@ -8,7 +8,7 @@ Modelica.Blocks.Sources.Sine TOut( amplitude=15, offset=288, - freqHz=0.001, +f =0.001, y(unit="K", displayUnit="degC")) "Outdoor air temperature" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/CFDAirHeatMassBalance.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/CFDAirHeatMassBalance.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/CFDAirHeatMassBalance.mo" 2022-03-10 09:57:41.224144535 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/CFDAirHeatMassBalance.mo" 2022-03-10 09:58:13.384148609 +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 @@ -63,23 +63,23 @@ origin={180,-250}))); protected - parameter Modelica.SIunits.Time startTime(fixed=false) + parameter Modelica.Units.SI.Time startTime(fixed=false) "First sample time instant."; // Values that are used for yFixed parameter Real yFixed[kSen + nSen](each fixed=false) "Values used for yFixed in CFDExchange"; - parameter Modelica.SIunits.HeatFlowRate Q_flow_fixed[kSurBou + nSurBou]= + 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]= + 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]= + 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")); @@ -90,7 +90,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, @@ -261,6 +261,7 @@ final parameter Integer nSur=kSurBou + nSurBou "Number of surfaces"; protected + function assignSurfaceIdentifier input Integer nConExt(min=0) "Number of exterior constructions"; @@ -290,34 +291,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.ThermalZones.Detailed.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.ThermalZones.Detailed.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.ThermalZones.Detailed.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.ThermalZones.Detailed.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.ThermalZones.Detailed.Types.CFDBoundaryConditions bouConSurBou[nSurBou] "Boundary condition"; @@ -373,7 +374,6 @@ til=tilSurBou[i], bouCon=bouConSurBou[i]) for i in 1:nSurBou}); end assignSurfaceIdentifier; - public Modelica.Blocks.Math.Add QTotCon_flow "Total sensible convective heat flow rate added to the room" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/CFDExchange.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/CFDExchange.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/CFDExchange.mo" 2022-03-10 09:57:41.224144535 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/CFDExchange.mo" 2022-03-10 09:58:12.936148552 +0000 @@ -34,7 +34,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"; CFDThread CFDThre = CFDThread() "Allocate memory for cosimulation variables via constructor and send stop command to FFD via destructor"; @@ -54,7 +54,7 @@ "Number of sensors that are connected to CFD output"; final parameter Integer nPorts=size(portName, 1) "Number of fluid ports for the HVAC inlet and outlets"; - discrete Modelica.SIunits.Time modTimRea(fixed=false) + discrete Modelica.Units.SI.Time modTimRea(fixed=false) "Current model time received from CFD"; discrete Integer retVal(start=0, fixed=true) "Return value from CFD"; @@ -64,8 +64,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.ThermalZones.Detailed.Types.CFDBoundaryConditions[nSur] bouCon "Type of boundary condition"; input Integer nPorts(min=0) @@ -85,7 +85,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 @@ -124,14 +124,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 8.1.0/ThermalZones/Detailed/BaseClasses/CFDFluidInterface.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/CFDFluidInterface.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/CFDFluidInterface.mo" 2022-03-10 09:57:41.224144535 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/CFDFluidInterface.mo" 2022-03-10 09:58:12.896148548 +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 8.1.0/ThermalZones/Detailed/BaseClasses/CFDSurfaceIdentifier.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/CFDSurfaceIdentifier.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/CFDSurfaceIdentifier.mo" 2022-03-10 09:57:41.224144535 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/CFDSurfaceIdentifier.mo" 2022-03-10 09:58:12.868148544 +0000 @@ -2,8 +2,8 @@ record CFDSurfaceIdentifier "Data record to identify surfaces in the CFD code" extends Modelica.Icons.Record; String name "Name of the surface"; - Modelica.SIunits.Area A "Area of the surface"; - Modelica.SIunits.Angle til "Tilt of the surface"; + Modelica.Units.SI.Area A "Area of the surface"; + Modelica.Units.SI.Angle til "Tilt of the surface"; Buildings.ThermalZones.Detailed.Types.CFDBoundaryConditions bouCon "Boundary condition used in the CFD simulation"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/Examples/HeatGain.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/Examples/HeatGain.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/Examples/HeatGain.mo" 2022-03-10 09:57:41.224144535 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/Examples/HeatGain.mo" 2022-03-10 09:58:12.796148535 +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.ThermalZones.Detailed.BaseClasses.HeatGain heatGain( AFlo=AFlo) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/ExteriorBoundaryConditions.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/ExteriorBoundaryConditions.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/ExteriorBoundaryConditions.mo" 2022-03-10 09:57:41.228144535 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/ExteriorBoundaryConditions.mo" 2022-03-10 09:58:12.704148523 +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 8.1.0/ThermalZones/Detailed/BaseClasses/ExteriorBoundaryConditionsWithWindow.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/ExteriorBoundaryConditionsWithWindow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/ExteriorBoundaryConditionsWithWindow.mo" 2022-03-10 09:57:41.228144535 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/ExteriorBoundaryConditionsWithWindow.mo" 2022-03-10 09:58:12.664148518 +0000 @@ -5,7 +5,7 @@ final AOpa=conPar[:].AOpa, redeclare Buildings.ThermalZones.Detailed.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 8.1.0/ThermalZones/Detailed/BaseClasses/HeatGain.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/HeatGain.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/HeatGain.mo" 2022-03-10 09:57:41.228144535 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/HeatGain.mo" 2022-03-10 09:58:12.600148510 +0000 @@ -2,7 +2,7 @@ model HeatGain "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 sensible and latent heat input into room (positive if heat gain)" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/InfraredRadiationExchange.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/InfraredRadiationExchange.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/InfraredRadiationExchange.mo" 2022-03-10 09:57:41.228144535 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/InfraredRadiationExchange.mo" 2022-03-10 09:58:12.584148508 +0000 @@ -40,9 +40,9 @@ each min=0, each max=1, each fixed=false) "Reflectivity of opaque surfaces"; - final parameter Modelica.SIunits.Area AOpa[nOpa](each fixed=false) + final parameter Modelica.Units.SI.Area AOpa[nOpa](each fixed=false) "Surface area of opaque surfaces"; - final parameter Modelica.SIunits.Area A[nTot](each fixed=false) + final parameter Modelica.Units.SI.Area A[nTot](each fixed=false) "Surface areas"; final parameter Real kOpa[nOpa](each unit="W/K4", each fixed=false) "Product sigma*epsilon*A for opaque surfaces"; @@ -53,40 +53,40 @@ each max=1, each fixed=false) "View factor from surface i to j"; - parameter Modelica.SIunits.Time t0(fixed=false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(fixed=false) "First sample time instant"; Buildings.HeatTransfer.Interfaces.RadiosityInflow JInConExtWin_internal[ NConExtWin](start=AConExtWinGla*0.8*Modelica.Constants.sigma*293.15^4, each fixed=sampleModel and nConExtWin > 0) "Incoming radiosity that connects to non-frame part of the window"; - Modelica.SIunits.HeatFlowRate J[nTot]( + Modelica.Units.SI.HeatFlowRate J[nTot]( each max=0, start=-A .* 0.8*Modelica.Constants.sigma*293.15^4, fixed={sampleModel and (i <= nOpa or i > nOpa + nWin) for i in 1:nTot}, 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]( each 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"; - 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](each start=0, each fixed= + Modelica.Units.SI.HeatFlowRate Q_flow[nTot](each start=0, each fixed= sampleModel) "Heat flow rate at surfaces"; - parameter Modelica.SIunits.Temperature T0=293.15 + 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(start=0, fixed=sampleModel) + Modelica.Units.SI.HeatFlowRate sumEBal(start=0, fixed=sampleModel) "Sum of energy balance, should be zero"; initial equation assert(homotopyInitialization, "In " + getInstanceName() + diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/MixedAirHeatMassBalance.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/MixedAirHeatMassBalance.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/MixedAirHeatMassBalance.mo" 2022-03-10 09:57:41.228144535 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/MixedAirHeatMassBalance.mo" 2022-03-10 09:58:12.532148501 +0000 @@ -7,14 +7,14 @@ constant Boolean homotopyInitialization = true "= true, use homotopy method" annotation(HideResult=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")); 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))); @@ -115,7 +115,7 @@ // Latent and convective sensible heat gains protected - constant Modelica.SIunits.SpecificEnergy h_fg= + constant Modelica.Units.SI.SpecificEnergy h_fg= Buildings.Media.Air.enthalpyOfCondensingGas(273.15+37) "Latent heat of water vapor"; Modelica.Blocks.Math.Gain mWat_flow( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/Overhang.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/Overhang.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/Overhang.mo" 2022-03-10 09:57:41.228144535 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/Overhang.mo" 2022-03-10 09:58:12.480148495 +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 8.1.0/ThermalZones/Detailed/BaseClasses/ParameterConstruction.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/ParameterConstruction.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/ParameterConstruction.mo" 2022-03-10 09:57:41.228144535 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/ParameterConstruction.mo" 2022-03-10 09:58:12.472148495 +0000 @@ -2,7 +2,7 @@ record ParameterConstruction "Record for exterior constructions that have no window" extends Buildings.ThermalZones.Detailed.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 8.1.0/ThermalZones/Detailed/BaseClasses/ParameterConstructionWithWindow.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/ParameterConstructionWithWindow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/ParameterConstructionWithWindow.mo" 2022-03-10 09:57:41.228144535 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/ParameterConstructionWithWindow.mo" 2022-03-10 09:58:12.456148492 +0000 @@ -3,17 +3,17 @@ "Record for exterior constructions that have a window" extends Buildings.ThermalZones.Detailed.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 8.1.0/ThermalZones/Detailed/BaseClasses/PartialAirHeatMassBalance.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/PartialAirHeatMassBalance.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/PartialAirHeatMassBalance.mo" 2022-03-10 09:57:41.228144535 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/PartialAirHeatMassBalance.mo" 2022-03-10 09:58:12.340148478 +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 @@ -103,19 +103,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 8.1.0/ThermalZones/Detailed/BaseClasses/PartialParameterConstruction.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/PartialParameterConstruction.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/PartialParameterConstruction.mo" 2022-03-10 09:57:41.228144535 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/PartialParameterConstruction.mo" 2022-03-10 09:58:12.312148473 +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 8.1.0/ThermalZones/Detailed/BaseClasses/PartialSurfaceInterface.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/PartialSurfaceInterface.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/PartialSurfaceInterface.mo" 2022-03-10 09:57:41.228144535 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/PartialSurfaceInterface.mo" 2022-03-10 09:58:12.300148472 +0000 @@ -36,25 +36,25 @@ -230},{251,-210}}))); protected final parameter String instanceName = getInstanceName() "Name of the instance"; - 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 8.1.0/ThermalZones/Detailed/BaseClasses/PartialSurfaceInterfaceRadiative.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/PartialSurfaceInterfaceRadiative.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/PartialSurfaceInterfaceRadiative.mo" 2022-03-10 09:57:41.228144535 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/PartialSurfaceInterfaceRadiative.mo" 2022-03-10 09:58:12.276148470 +0000 @@ -4,26 +4,26 @@ extends Buildings.ThermalZones.Detailed.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 8.1.0/ThermalZones/Detailed/BaseClasses/RadiationTemperature.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/RadiationTemperature.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/RadiationTemperature.mo" 2022-03-10 09:57:41.228144535 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/RadiationTemperature.mo" 2022-03-10 09:58:12.256148467 +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](each min=0, each 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](each fixed=false) + final parameter Modelica.Units.SI.Area epsAOpa[NOpa](each fixed=false) "Product of area times absorptivity of opaque surfaces"; - final parameter Modelica.SIunits.Area epsAGla[NWin](each fixed=false) + final parameter Modelica.Units.SI.Area epsAGla[NWin](each fixed=false) "Product of area times absorptivity of window surfaces"; - final parameter Modelica.SIunits.Area epsASha[NWin](each fixed=false) + final parameter Modelica.Units.SI.Area epsASha[NWin](each fixed=false) "Product of area times absorptivity of window shade"; - final parameter Modelica.SIunits.Area epsTauASha[NWin](each fixed=false) + final parameter Modelica.Units.SI.Area epsTauASha[NWin](each 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 8.1.0/ThermalZones/Detailed/BaseClasses/RoomHeatMassBalance.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/RoomHeatMassBalance.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/RoomHeatMassBalance.mo" 2022-03-10 09:57:41.228144535 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/RoomHeatMassBalance.mo" 2022-03-10 09:58:12.228148463 +0000 @@ -23,10 +23,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}, @@ -100,18 +100,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=(intConMod == 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=(extConMod == 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 sampleModel = false "Set to true to time-sample the model, which can give shorter simulation time if there is already time sampling in the system model" @@ -284,11 +284,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[NConExtWin]= + final parameter Modelica.Units.SI.TransmissionCoefficient tauIRSha_glass[NConExtWin]= datConExtWin.glaSys.shade.tauIR_b "Infrared transmissivity of shade for radiation coming from the glass" annotation (Dialog(group="Shading")); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/SideFins.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/SideFins.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/SideFins.mo" 2022-03-10 09:57:41.228144535 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/SideFins.mo" 2022-03-10 09:58:11.768148404 +0000 @@ -1,13 +1,13 @@ within Buildings.ThermalZones.Detailed.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 8.1.0/ThermalZones/Detailed/BaseClasses/SkyRadiationExchange.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/SkyRadiationExchange.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/SkyRadiationExchange.mo" 2022-03-10 09:57:41.228144535 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/SkyRadiationExchange.mo" 2022-03-10 09:58:11.760148404 +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 8.1.0/ThermalZones/Detailed/BaseClasses/SolarRadiationExchange.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/SolarRadiationExchange.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/SolarRadiationExchange.mo" 2022-03-10 09:57:41.228144535 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/SolarRadiationExchange.mo" 2022-03-10 09:58:11.736148400 +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.RealInput JInDifConExtWin[NConExtWin](each unit="W") @@ -49,7 +49,7 @@ "Outgoing solar radiation that strikes window per unit area" annotation (Placement(transformation(extent={{240,110},{260,130}}))); - Modelica.SIunits.HeatFlowRate JOutConExtWin[NConExtWin] + Modelica.Units.SI.HeatFlowRate JOutConExtWin[NConExtWin] "Outgoing solar radiation that strikes the window"; protected @@ -57,7 +57,7 @@ "Intermediate variable for gain for direct solar radiation distribution"; final parameter Real kDir2(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"; @@ -69,8 +69,8 @@ "Solar absorptivity"; final parameter Real tau[NTot](each min=0, each max=1, each fixed=false) "Solar transmissivity"; - final parameter Modelica.SIunits.Area AFlo(fixed=false) "Total floor area"; - final parameter Modelica.SIunits.Area A[NTot](each fixed=false) "Surface areas"; + final parameter Modelica.Units.SI.Area AFlo(fixed=false) "Total floor area"; + final parameter Modelica.Units.SI.Area A[NTot](each fixed=false) "Surface areas"; final parameter Real kDif[NTot]( each unit="1", each fixed=false) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/cfdExchangeData.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/cfdExchangeData.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/cfdExchangeData.mo" 2022-03-10 09:57:41.228144535 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/cfdExchangeData.mo" 2022-03-10 09:58:11.700148396 +0000 @@ -2,13 +2,13 @@ function cfdExchangeData "Exchange data between CFD and Modelica" extends Modelica.Icons.Function; 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 8.1.0/ThermalZones/Detailed/BaseClasses/cfdStartCosimulation.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/cfdStartCosimulation.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/cfdStartCosimulation.mo" 2022-03-10 09:57:41.228144535 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/BaseClasses/cfdStartCosimulation.mo" 2022-03-10 09:58:11.680148393 +0000 @@ -3,8 +3,8 @@ extends Modelica.Icons.Function; 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.ThermalZones.Detailed.Types.CFDBoundaryConditions[nSur] bouCon "Type of boundary condition"; input Integer nPorts(min=0) @@ -21,7 +21,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 8.1.0/ThermalZones/Detailed/CFD.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/CFD.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/CFD.mo" 2022-03-10 09:57:41.228144535 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/CFD.mo" 2022-03-10 09:58:11.640148388 +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 8.1.0/ThermalZones/Detailed/Constructions/BaseClasses/PartialConstruction.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/Constructions/BaseClasses/PartialConstruction.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/Constructions/BaseClasses/PartialConstruction.mo" 2022-03-10 09:57:41.228144535 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/Constructions/BaseClasses/PartialConstruction.mo" 2022-03-10 09:58:11.596148383 +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 8.1.0/ThermalZones/Detailed/Constructions/ConstructionWithWindow.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/Constructions/ConstructionWithWindow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/Constructions/ConstructionWithWindow.mo" 2022-03-10 09:57:41.228144535 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/Constructions/ConstructionWithWindow.mo" 2022-03-10 09:58:11.564148379 +0000 @@ -7,15 +7,15 @@ constant Boolean homotopyInitialization = true "= true, use homotopy method" annotation(HideResult=true); - 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 8.1.0/ThermalZones/Detailed/Constructions/Examples/ExteriorWallTwoWindows.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/Constructions/Examples/ExteriorWallTwoWindows.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/Constructions/Examples/ExteriorWallTwoWindows.mo" 2022-03-10 09:57:41.228144535 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/Constructions/Examples/ExteriorWallTwoWindows.mo" 2022-03-10 09:58:11.492148371 +0000 @@ -3,16 +3,16 @@ "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"; - final parameter Modelica.SIunits.Area AFra[:]= fFra .* AWin "Frame area"; - final parameter Modelica.SIunits.Area AGla[:] = AWin .- AFra "Glass area"; + final parameter Modelica.Units.SI.Area AFra[:]= fFra .* AWin "Frame area"; + final parameter Modelica.Units.SI.Area AGla[:] = AWin .- AFra "Glass area"; parameter Boolean linearizeRadiation = false "Set to true to linearize emissive power"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/Constructions/Examples/ExteriorWallWithWindow.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/Constructions/Examples/ExteriorWallWithWindow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/Constructions/Examples/ExteriorWallWithWindow.mo" 2022-03-10 09:57:41.228144535 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/Constructions/Examples/ExteriorWallWithWindow.mo" 2022-03-10 09:58:11.304148347 +0000 @@ -1,16 +1,16 @@ within Buildings.ThermalZones.Detailed.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"; - final parameter Modelica.SIunits.Area AFra = fFra * AWin "Frame area"; - final parameter Modelica.SIunits.Area AGla = AWin-AFra "Glass area"; + final parameter Modelica.Units.SI.Area AFra = fFra * AWin "Frame area"; + final parameter Modelica.Units.SI.Area AGla = AWin-AFra "Glass area"; parameter Boolean linearizeRadiation = false "Set to true to linearize emissive power"; parameter HeatTransfer.Data.GlazingSystems.DoubleClearAir13Clear glaSys( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/Examples/Controls/ElectrochromicWindow.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/Examples/Controls/ElectrochromicWindow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/Examples/Controls/ElectrochromicWindow.mo" 2022-03-10 09:57:41.228144535 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/Examples/Controls/ElectrochromicWindow.mo" 2022-03-10 09:58:11.240148339 +0000 @@ -1,13 +1,13 @@ within Buildings.ThermalZones.Detailed.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( @@ -34,8 +34,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}}))); @@ -49,8 +48,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 8.1.0/ThermalZones/Detailed/Examples/ElectroChromicWindow.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/Examples/ElectroChromicWindow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/Examples/ElectroChromicWindow.mo" 2022-03-10 09:57:41.228144535 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/Examples/ElectroChromicWindow.mo" 2022-03-10 09:58:11.204148333 +0000 @@ -4,9 +4,9 @@ extends Modelica.Icons.Example; replaceable 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 Modelica.SIunits.Area AFlo=13.94 "Floor area"; + parameter Modelica.Units.SI.Area AFlo=13.94 "Floor area"; parameter Integer nConExtWin=1 "Number of constructions with a window"; parameter Integer nConExt=0 "Number of constructions without a window"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/Examples/MixedAirCO2.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/Examples/MixedAirCO2.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/Examples/MixedAirCO2.mo" 2022-03-10 09:57:41.228144535 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/Examples/MixedAirCO2.mo" 2022-03-10 09:58:11.000148308 +0000 @@ -12,7 +12,7 @@ amplitude=5, startTime=43200)); - parameter Modelica.SIunits.MassFlowRate mOut_flow = 47*2/3600*1.2 + parameter Modelica.Units.SI.MassFlowRate mOut_flow = 47*2/3600*1.2 "Typical outside air mass flow rate, unless increased by controller"; Modelica.Blocks.Math.Gain gaiCO2(k=8.18E-6) "CO2 emission per person" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/Examples/MixedAirFreeResponse.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/Examples/MixedAirFreeResponse.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/Examples/MixedAirFreeResponse.mo" 2022-03-10 09:57:41.228144535 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/Examples/MixedAirFreeResponse.mo" 2022-03-10 09:58:10.976148304 +0000 @@ -72,13 +72,13 @@ parameter String weaFil = Modelica.Utilities.Files.loadResource("modelica://Buildings/Resources/weatherdata/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.mos") "Weather data file"; - parameter Modelica.SIunits.Angle lat = Buildings.BoundaryConditions.WeatherData.BaseClasses.getLatitudeTMY3(weaFil) "Latitude"; - parameter Modelica.SIunits.Volume VRoo = 4555.7 "Room volum"; - parameter Modelica.SIunits.Height hRoo = 2.74 "Room height"; - parameter Modelica.SIunits.Length hWin = 1.5 "Height of windows"; + parameter Modelica.Units.SI.Angle lat = Buildings.BoundaryConditions.WeatherData.BaseClasses.getLatitudeTMY3(weaFil) "Latitude"; + parameter Modelica.Units.SI.Volume VRoo = 4555.7 "Room volum"; + parameter Modelica.Units.SI.Height hRoo = 2.74 "Room height"; + parameter Modelica.Units.SI.Length hWin = 1.5 "Height of windows"; parameter Real winWalRat(min=0.01,max=0.99) = 0.33 "Window to wall ratio for exterior walls"; - parameter Modelica.SIunits.Area AFlo = VRoo/hRoo "Floor area"; + parameter Modelica.Units.SI.Area AFlo = VRoo/hRoo "Floor area"; Buildings.ThermalZones.Detailed.MixedAir roo( redeclare package Medium = Medium, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/Validation/BESTEST/Cases6xx/Case600FF.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/Validation/BESTEST/Cases6xx/Case600FF.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/Validation/BESTEST/Cases6xx/Case600FF.mo" 2022-03-10 09:57:41.228144535 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/Validation/BESTEST/Cases6xx/Case600FF.mo" 2022-03-10 09:58:09.976148179 +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 8.1.0/ThermalZones/Detailed/Validation/BaseClasses/SingleZoneFloor.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/Validation/BaseClasses/SingleZoneFloor.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/Validation/BaseClasses/SingleZoneFloor.mo" 2022-03-10 09:57:41.232144535 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/Validation/BaseClasses/SingleZoneFloor.mo" 2022-03-10 09:58:09.548148124 +0000 @@ -2,10 +2,10 @@ model SingleZoneFloor "Model of a building floor as a single zone" replaceable package Medium = Modelica.Media.Interfaces.PartialMedium "Medium model for air" annotation (choicesAllMatching=true); - parameter Modelica.SIunits.Angle lat "Latitude"; - parameter Modelica.SIunits.Volume VRoo = 4555.7 "Room volum"; - parameter Modelica.SIunits.Height hRoo = 2.74 "Room height"; - parameter Modelica.SIunits.Length hWin = 1.5 "Height of windows"; + parameter Modelica.Units.SI.Angle lat "Latitude"; + parameter Modelica.Units.SI.Volume VRoo = 4555.7 "Room volum"; + parameter Modelica.Units.SI.Height hRoo = 2.74 "Room height"; + parameter Modelica.Units.SI.Length hWin = 1.5 "Height of windows"; parameter Real winWalRat(min=0.01,max=0.99) = 0.33 "Window to wall ratio for exterior walls"; @@ -186,20 +186,20 @@ annotation (Placement(transformation(extent={{-120,-100},{-100,-80}}))); protected - parameter Modelica.SIunits.Angle S_= Buildings.Types.Azimuth.S + + parameter Modelica.Units.SI.Angle S_= Buildings.Types.Azimuth.S "Azimuth for south walls"; - parameter Modelica.SIunits.Angle E_= Buildings.Types.Azimuth.E + parameter Modelica.Units.SI.Angle E_= Buildings.Types.Azimuth.E "Azimuth for east walls"; - parameter Modelica.SIunits.Angle W_= Buildings.Types.Azimuth.W + parameter Modelica.Units.SI.Angle W_= Buildings.Types.Azimuth.W "Azimuth for west walls"; - parameter Modelica.SIunits.Angle N_= Buildings.Types.Azimuth.N + parameter Modelica.Units.SI.Angle N_= Buildings.Types.Azimuth.N "Azimuth for north walls"; - parameter Modelica.SIunits.Angle F_= Buildings.Types.Tilt.Floor + parameter Modelica.Units.SI.Angle F_= Buildings.Types.Tilt.Floor "Tilt for floor"; - parameter Modelica.SIunits.Angle Z_= Buildings.Types.Tilt.Wall + parameter Modelica.Units.SI.Angle Z_= Buildings.Types.Tilt.Wall "Tilt for wall"; - parameter Modelica.SIunits.Area AFlo = VRoo/hRoo "Floor area"; - + parameter Modelica.Units.SI.Area AFlo = VRoo/hRoo "Floor area"; equation connect(flo.weaBus, weaBus) annotation (Line( points={{21.9,-18.1},{21.9,184},{-166,184},{-166,86}}, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/Validation/BaseClasses/SingleZoneFloorHeater.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/Validation/BaseClasses/SingleZoneFloorHeater.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/Validation/BaseClasses/SingleZoneFloorHeater.mo" 2022-03-10 09:57:41.232144535 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/Validation/BaseClasses/SingleZoneFloorHeater.mo" 2022-03-10 09:58:09.496148118 +0000 @@ -5,9 +5,9 @@ replaceable package Medium = Modelica.Media.Interfaces.PartialMedium "Medium model for air" annotation (choicesAllMatching=true); - parameter Modelica.SIunits.Volume VRoo + parameter Modelica.Units.SI.Volume VRoo "Room air volume"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal "Nominal mass flowrate"; Buildings.Controls.OBC.CDL.Interfaces.RealInput TSetRoo( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/Validation/Initialization/MixedAir.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/Validation/Initialization/MixedAir.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/Validation/Initialization/MixedAir.mo" 2022-03-10 09:57:41.232144535 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/Validation/Initialization/MixedAir.mo" 2022-03-10 09:58:09.476148114 +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 8.1.0/ThermalZones/Detailed/Validation/LBNL_71T/RoomB/ElectroChromicWindow.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/Validation/LBNL_71T/RoomB/ElectroChromicWindow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/Validation/LBNL_71T/RoomB/ElectroChromicWindow.mo" 2022-03-10 09:57:41.232144535 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/Validation/LBNL_71T/RoomB/ElectroChromicWindow.mo" 2022-03-10 09:58:09.436148109 +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"; @@ -199,7 +199,7 @@ annotation (Placement(transformation(extent={{36,-102},{60,-78}}))); Controls.Continuous.LimPID conHea( Td=60, - initType=Modelica.Blocks.Types.InitPID.InitialState, + initType=Modelica.Blocks.Types.Init.InitialState, yMin=-1, k=5, Ti=30) "Controller for heating" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/Validation/SingleZoneFloorWithHeating.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/Validation/SingleZoneFloorWithHeating.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/Validation/SingleZoneFloorWithHeating.mo" 2022-03-10 09:57:41.232144535 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/Detailed/Validation/SingleZoneFloorWithHeating.mo" 2022-03-10 09:58:09.356148099 +0000 @@ -3,26 +3,26 @@ "Validation model for SingleZoneFloor with heating and control" extends Modelica.Icons.Example; package Medium = Buildings.Media.Air "Buildings library air media package"; - parameter Modelica.SIunits.Angle lat=41.98*3.14159/180 + parameter Modelica.Units.SI.Angle lat=41.98*3.14159/180 "Latitude of site location"; - parameter Modelica.SIunits.Area AFloCor=flo.cor.AFlo "Floor area corridor"; - parameter Modelica.SIunits.Area AFloSou=flo.sou.AFlo "Floor area south"; - parameter Modelica.SIunits.Area AFloNor=flo.nor.AFlo "Floor area north"; - parameter Modelica.SIunits.Area AFloEas=flo.eas.AFlo "Floor area east"; - parameter Modelica.SIunits.Area AFloWes=flo.wes.AFlo "Floor area west"; + parameter Modelica.Units.SI.Area AFloCor=flo.cor.AFlo "Floor area corridor"; + parameter Modelica.Units.SI.Area AFloSou=flo.sou.AFlo "Floor area south"; + parameter Modelica.Units.SI.Area AFloNor=flo.nor.AFlo "Floor area north"; + parameter Modelica.Units.SI.Area AFloEas=flo.eas.AFlo "Floor area east"; + parameter Modelica.Units.SI.Area AFloWes=flo.wes.AFlo "Floor area west"; - parameter Modelica.SIunits.Volume VRooCor=AFloCor*flo.hRoo + parameter Modelica.Units.SI.Volume VRooCor=AFloCor*flo.hRoo "Room volume corridor"; - parameter Modelica.SIunits.Volume VRooSou=AFloSou*flo.hRoo + parameter Modelica.Units.SI.Volume VRooSou=AFloSou*flo.hRoo "Room volume south"; - parameter Modelica.SIunits.Volume VRooNor=AFloNor*flo.hRoo + parameter Modelica.Units.SI.Volume VRooNor=AFloNor*flo.hRoo "Room volume north"; - parameter Modelica.SIunits.Volume VRooEas=AFloEas*flo.hRoo + parameter Modelica.Units.SI.Volume VRooEas=AFloEas*flo.hRoo "Room volume east"; - parameter Modelica.SIunits.Volume VRooWes=AFloWes*flo.hRoo + parameter Modelica.Units.SI.Volume VRooWes=AFloWes*flo.hRoo "Room volume west"; - parameter Modelica.SIunits.Volume VRoo=VRooSou+VRooEas+VRooNor+VRooWes+VRooCor + parameter Modelica.Units.SI.Volume VRoo=VRooSou+VRooEas+VRooNor+VRooWes+VRooCor "Total floor volume"; Buildings.Examples.VAVReheat.BaseClasses.Floor flo( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/BaseClasses/PartialEnergyPlusObject.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/BaseClasses/PartialEnergyPlusObject.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/BaseClasses/PartialEnergyPlusObject.mo" 2022-03-10 09:57:41.232144535 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/BaseClasses/PartialEnergyPlusObject.mo" 2022-03-10 09:58:09.016148057 +0000 @@ -27,7 +27,7 @@ final parameter Buildings.ThermalZones.EnergyPlus.Types.LogLevels logLevel=building.logLevel "LogLevels of EnergyPlus output" annotation (Dialog(tab="Debug")); - parameter Modelica.SIunits.Time startTime( + parameter Modelica.Units.SI.Time startTime( fixed=false) "Simulation start time"; function round diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/BaseClasses/SpawnExternalObject.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/BaseClasses/SpawnExternalObject.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/BaseClasses/SpawnExternalObject.mo" 2022-03-10 09:57:41.232144535 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/BaseClasses/SpawnExternalObject.mo" 2022-03-10 09:58:09.004148055 +0000 @@ -7,7 +7,7 @@ extends Modelica.Icons.Function; input Integer objectType "Type of the object (1: ThermalZone, 2: Schedule, 3: Actuator, 4: Surface)"; - input Modelica.SIunits.Time startTime + input Modelica.Units.SI.Time startTime "Start time of the simulation"; input String modelicaNameBuilding "Name of this Modelica building instance that connects to this thermal zone"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/BaseClasses/ThermalZoneAdapter.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/BaseClasses/ThermalZoneAdapter.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/BaseClasses/ThermalZoneAdapter.mo" 2022-03-10 09:57:41.232144535 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/BaseClasses/ThermalZoneAdapter.mo" 2022-03-10 09:58:08.956148048 +0000 @@ -28,10 +28,10 @@ annotation (Dialog(tab="Debug")); parameter Integer nFluPor "Number of fluid ports (Set to 2 for one inlet and one outlet)"; - final parameter Modelica.SIunits.Area AFlo( + final parameter Modelica.Units.SI.Area AFlo( fixed=false) "Floor area"; - final parameter Modelica.SIunits.Volume V( + final parameter Modelica.Units.SI.Volume V( fixed=false) "Zone volume"; final parameter Real mSenFac( @@ -92,7 +92,7 @@ fixed=false, start=0) "Total number of Spawn objects in building"; - parameter Modelica.SIunits.MassFlowRate m_flow_small( + parameter Modelica.Units.SI.MassFlowRate m_flow_small( fixed=false) "Small mass flow rate used to avoid TAveInlet = 0"; Buildings.ThermalZones.EnergyPlus.BaseClasses.SpawnExternalObject adapter=Buildings.ThermalZones.EnergyPlus.BaseClasses.SpawnExternalObject( @@ -132,34 +132,34 @@ // This has been removed due to numerical noise, // see https://github.com/lbl-srg/modelica-buildings/issues/2358#issuecomment-819578850 ////////// - parameter Modelica.SIunits.Time startTime( + parameter Modelica.Units.SI.Time startTime( fixed=false) "Simulation start time"; Real yEP[nY] "Output of exchange function"; - Modelica.SIunits.Time tNext( + Modelica.Units.SI.Time tNext( start=startTime, fixed=true) "Next sampling time"; //Modelica.SIunits.Time tNextEP(start=startTime-1, fixed=true) "Next sampling time requested from EnergyPlus"; // constant Real dT_dtMax(unit="K/s") = 0.000001 "Bound on temperature derivative to reduce or increase time step"; // Modelica.SIunits.Time dtMax(displayUnit="min", start=600, fixed=true) "Maximum time step before next sampling"; - discrete Modelica.SIunits.Time tLast( + discrete Modelica.Units.SI.Time tLast( fixed=true, start=startTime) "Last time of data exchange"; - discrete Modelica.SIunits.Time dtLast + discrete Modelica.Units.SI.Time dtLast "Time step since the last synchronization"; - discrete Modelica.SIunits.MassFlowRate mInlet_flow + discrete Modelica.Units.SI.MassFlowRate mInlet_flow "Time averaged inlet mass flow rate"; - discrete Modelica.SIunits.Temperature TAveInlet + discrete Modelica.Units.SI.Temperature TAveInlet "Time averaged inlet temperature"; - discrete Modelica.SIunits.Temperature TRooLast + discrete Modelica.Units.SI.Temperature TRooLast "Room air temperature at last sampling"; // discrete Real dQCon_flow_dT( // final unit="W/K") // "Derivative dQCon_flow / dT"; - discrete Modelica.SIunits.HeatFlowRate QConLast_flow( + discrete Modelica.Units.SI.HeatFlowRate QConLast_flow( fixed=false, start=0) "Convective sensible heat to be added to zone air if T = TRooLast"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/BaseClasses/Validation/FMUZoneAdapterZones1.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/BaseClasses/Validation/FMUZoneAdapterZones1.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/BaseClasses/Validation/FMUZoneAdapterZones1.mo" 2022-03-10 09:57:41.232144535 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/BaseClasses/Validation/FMUZoneAdapterZones1.mo" 2022-03-10 09:58:08.912148043 +0000 @@ -10,7 +10,7 @@ parameter String weaName=Modelica.Utilities.Files.loadResource( "modelica://Buildings/Resources/weatherdata/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.mos") "Name of the weather file"; - parameter Modelica.SIunits.HeatCapacity CZon=6*6*2.7*1.2*1006 + parameter Modelica.Units.SI.HeatCapacity CZon=6*6*2.7*1.2*1006 "Heat capacity of zone air"; inner Building building( idfName=Modelica.Utilities.Files.loadResource( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/BaseClasses/Validation/FMUZoneAdapterZones2.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/BaseClasses/Validation/FMUZoneAdapterZones2.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/BaseClasses/Validation/FMUZoneAdapterZones2.mo" 2022-03-10 09:57:41.232144535 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/BaseClasses/Validation/FMUZoneAdapterZones2.mo" 2022-03-10 09:58:08.892148040 +0000 @@ -10,7 +10,7 @@ parameter String weaName=Modelica.Utilities.Files.loadResource( "modelica://Buildings/Resources/weatherdata/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.mos") "Name of the weather file"; - parameter Modelica.SIunits.HeatCapacity CZon=6*6*2.7*1.2*1006 + parameter Modelica.Units.SI.HeatCapacity CZon=6*6*2.7*1.2*1006 "Heat capacity of zone air"; inner Building building( idfName=Modelica.Utilities.Files.loadResource( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/BaseClasses/Validation/FMUZoneAdapterZones3.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/BaseClasses/Validation/FMUZoneAdapterZones3.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/BaseClasses/Validation/FMUZoneAdapterZones3.mo" 2022-03-10 09:57:41.232144535 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/BaseClasses/Validation/FMUZoneAdapterZones3.mo" 2022-03-10 09:58:08.860148036 +0000 @@ -10,7 +10,7 @@ parameter String weaName=Modelica.Utilities.Files.loadResource( "modelica://Buildings/Resources/weatherdata/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.mos") "Name of the weather file"; - parameter Modelica.SIunits.HeatCapacity CZon=6*6*2.7*1.2*1006 + parameter Modelica.Units.SI.HeatCapacity CZon=6*6*2.7*1.2*1006 "Heat capacity of zone air"; inner Building building( idfName=Modelica.Utilities.Files.loadResource( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/AirHeating.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/AirHeating.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/AirHeating.mo" 2022-03-10 09:57:41.232144535 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/AirHeating.mo" 2022-03-10 09:58:08.660148011 +0000 @@ -13,13 +13,13 @@ computeWetBulbTemperature=false) "Building model" annotation (Placement(transformation(extent={{-80,20},{-60,40}}))); - constant Modelica.SIunits.Volume VRoo=453.138 + constant Modelica.Units.SI.Volume VRoo=453.138 "Room volume"; - constant Modelica.SIunits.Area AFlo=185.834 + constant Modelica.Units.SI.Area AFlo=185.834 "Floor area of the whole floor of the building"; - parameter Modelica.SIunits.MassFlowRate mOut_flow_nominal=0.3*VRoo*1.2/3600 + parameter Modelica.Units.SI.MassFlowRate mOut_flow_nominal=0.3*VRoo*1.2/3600 "Outdoor air mass flow rate, assuming constant infiltration air flow rate"; - parameter Modelica.SIunits.MassFlowRate mRec_flow_nominal=8*VRoo*1.2/3600 + parameter Modelica.Units.SI.MassFlowRate mRec_flow_nominal=8*VRoo*1.2/3600 "Nominal mass flow rate for recirculated air"; Buildings.ThermalZones.EnergyPlus.ThermalZone zon( redeclare package Medium=Medium, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/RadiantHeatingCooling.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/RadiantHeatingCooling.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/RadiantHeatingCooling.mo" 2022-03-10 09:57:41.232144535 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/RadiantHeatingCooling.mo" 2022-03-10 09:58:08.584148001 +0000 @@ -6,15 +6,15 @@ "modelica://Buildings/Resources/Data/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse_TwoSpeed_ZoneAirBalance/SingleFamilyHouse_TwoSpeed_ZoneAirBalance_aboveSoil.idf"))); package MediumW=Buildings.Media.Water "Water medium"; - constant Modelica.SIunits.Area AFlo=185.8 + constant Modelica.Units.SI.Area AFlo=185.8 "Floor area"; - parameter Modelica.SIunits.HeatFlowRate QHea_flow_nominal=7500 + parameter Modelica.Units.SI.HeatFlowRate QHea_flow_nominal=7500 "Nominal heat flow rate for heating"; - parameter Modelica.SIunits.MassFlowRate mHea_flow_nominal=QHea_flow_nominal/4200/10 + parameter Modelica.Units.SI.MassFlowRate mHea_flow_nominal=QHea_flow_nominal/4200/10 "Design water mass flow rate for heating"; - parameter Modelica.SIunits.HeatFlowRate QCoo_flow_nominal=-5000 + parameter Modelica.Units.SI.HeatFlowRate QCoo_flow_nominal=-5000 "Nominal heat flow rate for cooling"; - parameter Modelica.SIunits.MassFlowRate mCoo_flow_nominal=-QCoo_flow_nominal/4200/5 + parameter Modelica.Units.SI.MassFlowRate mCoo_flow_nominal=-QCoo_flow_nominal/4200/5 "Design water mass flow rate for heating"; parameter HeatTransfer.Data.OpaqueConstructions.Generic layFloSoi(nLay=4, material={Buildings.HeatTransfer.Data.Solids.Concrete(x=0.08), diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/RadiantHeatingWithGroundHeatTransfer.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/RadiantHeatingWithGroundHeatTransfer.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/RadiantHeatingWithGroundHeatTransfer.mo" 2022-03-10 09:57:41.232144535 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/RadiantHeatingWithGroundHeatTransfer.mo" 2022-03-10 09:58:08.532147995 +0000 @@ -4,11 +4,11 @@ extends Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse.Unconditioned; package MediumW=Buildings.Media.Water "Water medium"; - constant Modelica.SIunits.Area AFlo=185.8 + constant Modelica.Units.SI.Area AFlo=185.8 "Floor area"; - parameter Modelica.SIunits.HeatFlowRate QHea_flow_nominal=12000 + parameter Modelica.Units.SI.HeatFlowRate QHea_flow_nominal=12000 "Nominal heat flow rate for heating"; - parameter Modelica.SIunits.MassFlowRate mHea_flow_nominal=QHea_flow_nominal/4200/10 + parameter Modelica.Units.SI.MassFlowRate mHea_flow_nominal=QHea_flow_nominal/4200/10 "Design water mass flow rate for heating"; parameter HeatTransfer.Data.OpaqueConstructions.Generic layFlo( nLay=3, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/ShadeControl.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/ShadeControl.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/ShadeControl.mo" 2022-03-10 09:57:41.232144535 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/ShadeControl.mo" 2022-03-10 09:58:08.496147990 +0000 @@ -12,7 +12,7 @@ showWeatherData=true) "Building model" annotation (Placement(transformation(extent={{-168,10},{-148,30}}))); - parameter Modelica.SIunits.MassFlowRate m_flow_nominal[:]=0.3*1.2/3600*{113.3,113.3,169.9} + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal[:]=0.3*1.2/3600*{113.3,113.3,169.9} "Design mass flow rate"; Modelica.Blocks.Sources.Constant qIntGai[3]( each k=0) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/Unconditioned.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/Unconditioned.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/Unconditioned.mo" 2022-03-10 09:57:41.232144535 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/Unconditioned.mo" 2022-03-10 09:58:08.448147985 +0000 @@ -14,9 +14,9 @@ computeWetBulbTemperature=false) "Building model" annotation (Placement(transformation(extent={{-80,-90},{-60,-70}}))); - parameter Modelica.SIunits.Volume VRoo=453.1 + parameter Modelica.Units.SI.Volume VRoo=453.1 "Room volume"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=VRoo*1.2*0.3/3600 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=VRoo*1.2*0.3/3600 "Nominal mass flow rate"; Buildings.ThermalZones.EnergyPlus.ThermalZone zon( redeclare package Medium=Medium, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/Examples/SmallOffice/BaseClasses/Floor.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/Examples/SmallOffice/BaseClasses/Floor.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/Examples/SmallOffice/BaseClasses/Floor.mo" 2022-03-10 09:57:41.232144535 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/Examples/SmallOffice/BaseClasses/Floor.mo" 2022-03-10 09:58:08.400147978 +0000 @@ -29,7 +29,7 @@ leaEas( s=18.46/27.69)); - final parameter Modelica.SIunits.Area AFlo=AFloCor+AFloSou+AFloNor+AFloEas+AFloWes + final parameter Modelica.Units.SI.Area AFlo=AFloCor+AFloSou+AFloNor+AFloEas+AFloWes "Total floor area"; Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a heaPorSou "Heat port to air volume South" @@ -46,15 +46,15 @@ Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a heaPorCor "Heat port to air volume corridor" annotation (Placement(transformation(extent={{106,36},{126,56}}),iconTransformation(extent={{130,38},{150,58}}))); - Modelica.SIunits.Temperature TAirCor=cor.TAir + Modelica.Units.SI.Temperature TAirCor=cor.TAir "Air temperature corridor"; - Modelica.SIunits.Temperature TAirSou=sou.TAir + Modelica.Units.SI.Temperature TAirSou=sou.TAir "Air temperature south zone"; - Modelica.SIunits.Temperature TAirNor=nor.TAir + Modelica.Units.SI.Temperature TAirNor=nor.TAir "Air temperature north zone"; - Modelica.SIunits.Temperature TAirEas=eas.TAir + Modelica.Units.SI.Temperature TAirEas=eas.TAir "Air temperature east zone"; - Modelica.SIunits.Temperature TAirWes=wes.TAir + Modelica.Units.SI.Temperature TAirWes=wes.TAir "Air temperature west zone"; ThermalZone sou( redeclare package Medium=Medium, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/Examples/SmallOffice/BaseClasses/IdealHeaterCooler.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/Examples/SmallOffice/BaseClasses/IdealHeaterCooler.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/Examples/SmallOffice/BaseClasses/IdealHeaterCooler.mo" 2022-03-10 09:57:41.232144535 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/Examples/SmallOffice/BaseClasses/IdealHeaterCooler.mo" 2022-03-10 09:58:08.316147968 +0000 @@ -2,7 +2,7 @@ model IdealHeaterCooler "Model of ideal heater or cooler" extends Modelica.Blocks.Icons.Block; - parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal + parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal "Maximum heat flow rate (positive for heating; negative for cooling)"; parameter Buildings.Controls.OBC.CDL.Types.SimpleController controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PI "Type of controller" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/Examples/SmallOffice/Unconditioned.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/Examples/SmallOffice/Unconditioned.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/Examples/SmallOffice/Unconditioned.mo" 2022-03-10 09:57:41.232144535 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/Examples/SmallOffice/Unconditioned.mo" 2022-03-10 09:58:08.240147959 +0000 @@ -7,7 +7,7 @@ parameter String weaName=Modelica.Utilities.Files.loadResource( "modelica://Buildings/Resources/weatherdata/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.mos") "Name of the weather file"; - final parameter Modelica.SIunits.MassFlowRate mOut_flow[4]=0.3/3600*{flo.VRooSou,flo.VRooEas,flo.VRooNor,flo.VRooWes}*1.2 + final parameter Modelica.Units.SI.MassFlowRate mOut_flow[4]=0.3/3600*{flo.VRooSou,flo.VRooEas,flo.VRooNor,flo.VRooWes}*1.2 "Outside air infiltration for each exterior room"; BoundaryConditions.WeatherData.ReaderTMY3 weaDat( filNam=weaName, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/OpaqueConstruction.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/OpaqueConstruction.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/OpaqueConstruction.mo" 2022-03-10 09:57:41.232144535 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/OpaqueConstruction.mo" 2022-03-10 09:58:08.216147955 +0000 @@ -5,7 +5,7 @@ extends Buildings.ThermalZones.EnergyPlus.BaseClasses.Synchronize.ObjectSynchronizer; parameter String surfaceName "Surface unique name in the EnergyPlus idf file"; - final parameter Modelica.SIunits.Area A( + final parameter Modelica.Units.SI.Area A( final fixed=false, min=1E-10) "Surface area"; @@ -15,9 +15,9 @@ Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_b heaPorBac "Heat port for back surface" annotation (Placement(transformation(extent={{90,-10},{110,10}}),iconTransformation(extent={{88,-10},{108,10}}))); - Modelica.SIunits.HeatFlux qFro_flow + Modelica.Units.SI.HeatFlux qFro_flow "Heat flow rate at front surface per unit area"; - Modelica.SIunits.HeatFlux qBac_flow + Modelica.Units.SI.HeatFlux qBac_flow "Heat flow rate at front surface per unit area"; protected @@ -74,25 +74,25 @@ ////////// Real yEP[nY] "Output of exchange function"; - Modelica.SIunits.Time tNext( + Modelica.Units.SI.Time tNext( start=startTime, fixed=true) "Next sampling time"; - discrete Modelica.SIunits.Time tLast( + discrete Modelica.Units.SI.Time tLast( fixed=true, start=startTime) "Last time of data exchange"; - discrete Modelica.SIunits.Time dtLast + discrete Modelica.Units.SI.Time dtLast "Time step since the last synchronization"; - discrete Modelica.SIunits.Temperature TFroLast + discrete Modelica.Units.SI.Temperature TFroLast "Front surface temperature at last sampling"; - discrete Modelica.SIunits.Temperature TBacLast + discrete Modelica.Units.SI.Temperature TBacLast "Back surface temperature at last sampling"; - discrete Modelica.SIunits.HeatFlowRate QFroLast_flow( + discrete Modelica.Units.SI.HeatFlowRate QFroLast_flow( fixed=false, start=0) "Surface heat flow rate at front if T = TLast"; - discrete Modelica.SIunits.HeatFlowRate QBacLast_flow( + discrete Modelica.Units.SI.HeatFlowRate QBacLast_flow( fixed=false, start=0) "Surface heat flow rate at back if T = TLast"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/OutputVariable.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/OutputVariable.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/OutputVariable.mo" 2022-03-10 09:57:41.232144535 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/OutputVariable.mo" 2022-03-10 09:58:08.180147950 +0000 @@ -69,7 +69,7 @@ "Class to communicate with EnergyPlus"; Real yEP[nY] "Output of exchange function"; - Modelica.SIunits.Time tNext( + Modelica.Units.SI.Time tNext( start=startTime, fixed=true) "Next sampling time"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/ThermalZone.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/ThermalZone.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/ThermalZone.mo" 2022-03-10 09:57:41.232144535 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/ThermalZone.mo" 2022-03-10 09:58:08.024147931 +0000 @@ -42,9 +42,9 @@ Medium.nC) "Nominal value of zone air trace substances. (Set to typical order of magnitude.)" annotation (Dialog(tab="Initialization",enable=Medium.nC > 0)); - final parameter Modelica.SIunits.Volume V=fmuZon.V + final parameter Modelica.Units.SI.Volume V=fmuZon.V "Zone volume"; - final parameter Modelica.SIunits.Area AFlo=fmuZon.AFlo + final parameter Modelica.Units.SI.Area AFlo=fmuZon.AFlo "Floor area"; final parameter Real mSenFac( min=1)=fmuZon.mSenFac @@ -80,10 +80,10 @@ annotation (Placement(transformation(extent={{200,-130},{220,-110}}),iconTransformation(extent={{200,90},{220,110}}))); protected - constant Modelica.SIunits.SpecificEnergy h_fg=Medium.enthalpyOfCondensingGas( + constant Modelica.Units.SI.SpecificEnergy h_fg=Medium.enthalpyOfCondensingGas( 273.15+37) "Latent heat of water vapor"; - final parameter Modelica.SIunits.MassFlowRate m_flow_nominal=V*3/3600 + final parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=V*3/3600 "Nominal mass flow rate (used for regularization)"; Buildings.ThermalZones.EnergyPlus.BaseClasses.ThermalZoneAdapter fmuZon( final modelicaNameBuilding=modelicaNameBuilding, @@ -143,7 +143,7 @@ annotation (Placement(transformation(extent={{-40,30},{-20,50}}))); final parameter String substanceName="CO2" "Name of trace substance"; - final parameter Modelica.SIunits.MolarMass MM=Modelica.Media.IdealGases.Common.SingleGasesData.CO2.MM + final parameter Modelica.Units.SI.MolarMass MM=Modelica.Media.IdealGases.Common.SingleGasesData.CO2.MM "Molar mass of the trace substance"; Modelica.Blocks.Routing.Replicator QPeaRep( nout=Medium.nC) if use_C_flow diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/Validation/ThermalZone/InternalGain.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/Validation/ThermalZone/InternalGain.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/Validation/ThermalZone/InternalGain.mo" 2022-03-10 09:57:41.232144535 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/Validation/ThermalZone/InternalGain.mo" 2022-03-10 09:58:07.780147899 +0000 @@ -33,11 +33,11 @@ model OneZoneWithGainExposed "Internal model for building with one thermal zone" extends Modelica.Blocks.Icons.Block; - parameter Modelica.SIunits.HeatFlux qRad_flow + parameter Modelica.Units.SI.HeatFlux qRad_flow "Radiative internal heat gain"; - parameter Modelica.SIunits.HeatFlux qSen_flow + parameter Modelica.Units.SI.HeatFlux qSen_flow "Convective sensible internal heat gain"; - parameter Modelica.SIunits.HeatFlux qLat_flow + parameter Modelica.Units.SI.HeatFlux qLat_flow "Latent internal heat gain"; Examples.SingleFamilyHouse.Unconditioned bui( m_flow_nominal=bui.VRoo*10*0.3/3600, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/Validation/ThermalZone/RefBldgSmallOffice.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/Validation/ThermalZone/RefBldgSmallOffice.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/Validation/ThermalZone/RefBldgSmallOffice.mo" 2022-03-10 09:57:41.232144535 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/Validation/ThermalZone/RefBldgSmallOffice.mo" 2022-03-10 09:58:07.748147896 +0000 @@ -66,24 +66,24 @@ extrapolation=Modelica.Blocks.Types.Extrapolation.HoldLastPoint) "Data reader with results from EnergyPlus" annotation (Placement(transformation(extent={{-80,-120},{-60,-100}}))); - Modelica.SIunits.Temperature TOutEP=datRea.y[1]+273.15 + Modelica.Units.SI.Temperature TOutEP=datRea.y[1]+273.15 "Outside air temperature of EnergyPlus simulation"; Real relHumEP( unit="1")=datRea.y[2]/100 "Outside air relative humidity of EnergyPlus simulation"; - Modelica.SIunits.Temperature TAttEP=datRea.y[3]+273.15 + + Modelica.Units.SI.Temperature TAttEP=datRea.y[3]+273.15 "Attic air temperature of EnergyPlus simulation"; - Modelica.SIunits.Temperature TCorEP=datRea.y[4]+273.15 + Modelica.Units.SI.Temperature TCorEP=datRea.y[4]+273.15 "Core zone air temperature of EnergyPlus simulation"; - Modelica.SIunits.Temperature TSouEP=datRea.y[5]+273.15 + Modelica.Units.SI.Temperature TSouEP=datRea.y[5]+273.15 "South zone air temperature of EnergyPlus simulation"; - Modelica.SIunits.Temperature TEasEP=datRea.y[6]+273.15 + Modelica.Units.SI.Temperature TEasEP=datRea.y[6]+273.15 "East zone air temperature of EnergyPlus simulation"; - Modelica.SIunits.Temperature TNorEP=datRea.y[7]+273.15 + Modelica.Units.SI.Temperature TNorEP=datRea.y[7]+273.15 "North zone air temperature of EnergyPlus simulation"; - Modelica.SIunits.Temperature TWesEP=datRea.y[8]+273.15 + Modelica.Units.SI.Temperature TWesEP=datRea.y[8]+273.15 "West zone air temperature of EnergyPlus simulation"; - equation connect(qRadGai_flow.y,mul.u1[1]) annotation (Line(points={{-59,40},{-40,40},{-40,7},{-30,7}},color={0,0,127},smooth=Smooth.None)); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/Validation/ThermalZone/TwoIdenticalZones.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/Validation/ThermalZone/TwoIdenticalZones.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/Validation/ThermalZone/TwoIdenticalZones.mo" 2022-03-10 09:57:41.232144535 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/Validation/ThermalZone/TwoIdenticalZones.mo" 2022-03-10 09:58:07.720147891 +0000 @@ -50,7 +50,7 @@ "Medium model"; parameter String zoneName="" "Name of the thermal zone"; - parameter Modelica.SIunits.MassFlowRate mOut_flow=0.3/3600*zon.V*Buildings.Media.Air.dStp + parameter Modelica.Units.SI.MassFlowRate mOut_flow=0.3/3600*zon.V*Buildings.Media.Air.dStp "Outside air mass flow rate with 0.3 ACH"; Modelica.Blocks.Sources.Constant qConGai_flow( k=0) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/ZoneSurface.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/ZoneSurface.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/ZoneSurface.mo" 2022-03-10 09:57:41.232144535 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/EnergyPlus/ZoneSurface.mo" 2022-03-10 09:58:07.504147864 +0000 @@ -5,7 +5,7 @@ extends Buildings.ThermalZones.EnergyPlus.BaseClasses.Synchronize.ObjectSynchronizer; parameter String surfaceName "Surface unique name in the EnergyPlus idf file"; - final parameter Modelica.SIunits.Area A( + final parameter Modelica.Units.SI.Area A( final fixed=false, min=1E-10) "Surface area"; @@ -80,19 +80,19 @@ ////////// Real yEP[nY] "Output of exchange function"; - Modelica.SIunits.Time tNext( + Modelica.Units.SI.Time tNext( start=startTime, fixed=true) "Next sampling time"; - discrete Modelica.SIunits.Time tLast( + discrete Modelica.Units.SI.Time tLast( fixed=true, start=startTime) "Last time of data exchange"; - discrete Modelica.SIunits.Time dtLast + discrete Modelica.Units.SI.Time dtLast "Time step since the last synchronization"; - discrete Modelica.SIunits.Temperature TLast + discrete Modelica.Units.SI.Temperature TLast "Surface temperature at last sampling"; - discrete Modelica.SIunits.HeatFlowRate QLast_flow( + discrete Modelica.Units.SI.HeatFlowRate QLast_flow( fixed=false, start=0) "Surface heat flow rate if T = TLast"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/ReducedOrder/EquivalentAirTemperature/BaseClasses/PartialVDI6007.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/ReducedOrder/EquivalentAirTemperature/BaseClasses/PartialVDI6007.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/ReducedOrder/EquivalentAirTemperature/BaseClasses/PartialVDI6007.mo" 2022-03-10 09:57:41.232144535 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/ReducedOrder/EquivalentAirTemperature/BaseClasses/PartialVDI6007.mo" 2022-03-10 09:58:07.476147862 +0000 @@ -2,30 +2,30 @@ partial model PartialVDI6007 "Partial model for equivalent air temperature as defined in VDI 6007 Part 1" - parameter Modelica.SIunits.Emissivity aExt + parameter Modelica.Units.SI.Emissivity aExt "Coefficient of absorption of exterior walls (outdoor)"; parameter Integer n "Number of orientations (without ground)"; parameter Real wfWall[n](each final unit="1") "Weight factors of the walls"; parameter Real wfWin[n](each final unit="1") "Weight factors of the windows"; parameter Real wfGro(unit="1") "Weight factor of the ground (0 if not considered)"; - parameter Modelica.SIunits.Temperature TGro + parameter Modelica.Units.SI.Temperature TGro "Temperature of the ground in contact with floor plate"; - parameter Modelica.SIunits.CoefficientOfHeatTransfer hConWallOut + parameter Modelica.Units.SI.CoefficientOfHeatTransfer hConWallOut "Exterior walls convective coefficient of heat transfer (outdoor)"; - parameter Modelica.SIunits.CoefficientOfHeatTransfer hRad + parameter Modelica.Units.SI.CoefficientOfHeatTransfer hRad "Coefficient of heat transfer for linearized radiation"; parameter Boolean withLongwave=true "Set to true to include longwave radiation exchange" annotation(choices(checkBox = true)); - Modelica.SIunits.Temperature TEqWall[n] "Equivalent wall temperature"; - Modelica.SIunits.Temperature TEqWin[n] "Equivalent window temperature"; - Modelica.SIunits.TemperatureDifference delTEqLW + Modelica.Units.SI.Temperature TEqWall[n] "Equivalent wall temperature"; + Modelica.Units.SI.Temperature TEqWin[n] "Equivalent window temperature"; + Modelica.Units.SI.TemperatureDifference delTEqLW "Equivalent long wave temperature"; - Modelica.SIunits.TemperatureDifference delTEqLWWin + Modelica.Units.SI.TemperatureDifference delTEqLWWin "Equivalent long wave temperature for windows"; - Modelica.SIunits.TemperatureDifference delTEqSW[n] + Modelica.Units.SI.TemperatureDifference delTEqSW[n] "Equivalent short wave temperature"; Modelica.Blocks.Interfaces.RealInput HSol[n]( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/ReducedOrder/EquivalentAirTemperature/VDI6007WithWindow.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/ReducedOrder/EquivalentAirTemperature/VDI6007WithWindow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/ReducedOrder/EquivalentAirTemperature/VDI6007WithWindow.mo" 2022-03-10 09:57:41.232144535 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/ReducedOrder/EquivalentAirTemperature/VDI6007WithWindow.mo" 2022-03-10 09:58:07.432147856 +0000 @@ -3,7 +3,7 @@ "Equivalent air temperature as defined in VDI 6007 Part 1 with modifications" extends BaseClasses.PartialVDI6007; - parameter Modelica.SIunits.CoefficientOfHeatTransfer hConWinOut + parameter Modelica.Units.SI.CoefficientOfHeatTransfer hConWinOut "Windows' convective coefficient of heat transfer (outdoor)"; Modelica.Blocks.Interfaces.RealOutput TEqAirWin(final unit="K") diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/ReducedOrder/Examples/SimpleRoomFourElementsTraceSubstance.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/ReducedOrder/Examples/SimpleRoomFourElementsTraceSubstance.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/ReducedOrder/Examples/SimpleRoomFourElementsTraceSubstance.mo" 2022-03-10 09:57:41.232144535 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/ReducedOrder/Examples/SimpleRoomFourElementsTraceSubstance.mo" 2022-03-10 09:58:07.372147847 +0000 @@ -48,7 +48,7 @@ p=Medium.p_default, X=Medium.X_default[1:Medium.nXi]) "Medium state at default values"; - 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"; equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/ReducedOrder/RC/BaseClasses/ExteriorWall.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/ReducedOrder/RC/BaseClasses/ExteriorWall.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/ReducedOrder/RC/BaseClasses/ExteriorWall.mo" 2022-03-10 09:57:41.236144537 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/ReducedOrder/RC/BaseClasses/ExteriorWall.mo" 2022-03-10 09:58:07.256147833 +0000 @@ -2,19 +2,19 @@ model ExteriorWall "Exterior wall consisting of variable number of RC elements" parameter Integer n(min = 1) "Number of RC-elements"; - parameter Modelica.SIunits.ThermalResistance RExt[n]( + parameter Modelica.Units.SI.ThermalResistance RExt[n]( each min=Modelica.Constants.small) "Vector of resistors, from port_a to port_b" annotation(Dialog(group="Thermal mass")); - parameter Modelica.SIunits.ThermalResistance RExtRem( + parameter Modelica.Units.SI.ThermalResistance RExtRem( min=Modelica.Constants.small) "Resistance of remaining resistor RExtRem between capacitor n and port_b" annotation(Dialog(group="Thermal mass")); - parameter Modelica.SIunits.HeatCapacity CExt[n]( + parameter Modelica.Units.SI.HeatCapacity CExt[n]( each min=Modelica.Constants.small) "Vector of heat capacities, from port_a to port_b" annotation(Dialog(group="Thermal mass")); - parameter Modelica.SIunits.Temperature T_start + parameter Modelica.Units.SI.Temperature T_start "Initial temperature of capacities" annotation(Dialog(group="Thermal mass")); Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a port_a "interior port" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/ReducedOrder/RC/BaseClasses/InteriorWall.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/ReducedOrder/RC/BaseClasses/InteriorWall.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/ReducedOrder/RC/BaseClasses/InteriorWall.mo" 2022-03-10 09:57:41.236144537 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/ReducedOrder/RC/BaseClasses/InteriorWall.mo" 2022-03-10 09:58:07.228147830 +0000 @@ -2,15 +2,15 @@ model InteriorWall "Interior wall consisting of variable number of RC elements" parameter Integer n(min = 1) "Number of RC-elements"; - parameter Modelica.SIunits.ThermalResistance RInt[n]( + parameter Modelica.Units.SI.ThermalResistance RInt[n]( each min=Modelica.Constants.small) "Vector of resistors, from port to capacitor" annotation(Dialog(group="Thermal mass")); - parameter Modelica.SIunits.HeatCapacity CInt[n]( + parameter Modelica.Units.SI.HeatCapacity CInt[n]( each min=Modelica.Constants.small) "Vector of heat capacitors, from port to center" annotation(Dialog(group="Thermal mass")); - parameter Modelica.SIunits.Temperature T_start + parameter Modelica.Units.SI.Temperature T_start "Initial temperature of capacities" annotation(Dialog(group="Thermal mass")); Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a port_a "interior port" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/ReducedOrder/RC/BaseClasses/splitFacVal.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/ReducedOrder/RC/BaseClasses/splitFacVal.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/ReducedOrder/RC/BaseClasses/splitFacVal.mo" 2022-03-10 09:57:41.236144537 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/ReducedOrder/RC/BaseClasses/splitFacVal.mo" 2022-03-10 09:58:07.192147826 +0000 @@ -5,12 +5,12 @@ input Integer nRow "Number of rows"; input Integer nCol "Number of columns"; - input Modelica.SIunits.Area[:] AArray "Vector of areas"; - input Modelica.SIunits.Area[nCol] AExt "Vector of exterior wall areas"; - input Modelica.SIunits.Area[nCol] AWin "Vector of window areas"; + input Modelica.Units.SI.Area[:] AArray "Vector of areas"; + input Modelica.Units.SI.Area[nCol] AExt "Vector of exterior wall areas"; + input Modelica.Units.SI.Area[nCol] AWin "Vector of window areas"; output Real[nRow,nCol] splitFacValues "Split factor values for ThermSplitter"; protected - Modelica.SIunits.Area ATot=sum(AArray) "Total area"; + Modelica.Units.SI.Area ATot=sum(AArray) "Total area"; Integer j=1 "Row counter"; Integer k=1 "Column counter"; Integer l=1 "AArray counter"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/ReducedOrder/RC/FourElements.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/ReducedOrder/RC/FourElements.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/ReducedOrder/RC/FourElements.mo" 2022-03-10 09:57:41.236144537 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/ReducedOrder/RC/FourElements.mo" 2022-03-10 09:58:07.176147823 +0000 @@ -3,22 +3,22 @@ interior walls, floor plate and roof" extends ThreeElements(AArray={ATotExt,ATotWin,AInt,AFloor,ARoof}); - parameter Modelica.SIunits.Area ARoof "Area of roof" + parameter Modelica.Units.SI.Area ARoof "Area of roof" annotation(Dialog(group="Roof")); - parameter Modelica.SIunits.CoefficientOfHeatTransfer hConRoof + parameter Modelica.Units.SI.CoefficientOfHeatTransfer hConRoof "Convective coefficient of heat transfer of roof (indoor)" annotation(Dialog(group="Roof")); parameter Integer nRoof(min = 1) "Number of RC-elements of roof" annotation(Dialog(group="Roof")); - parameter Modelica.SIunits.ThermalResistance RRoof[nRoof]( + parameter Modelica.Units.SI.ThermalResistance RRoof[nRoof]( each min=Modelica.Constants.small) "Vector of resistances of roof, from inside to outside" annotation(Dialog(group="Roof")); - parameter Modelica.SIunits.ThermalResistance RRoofRem( + parameter Modelica.Units.SI.ThermalResistance RRoofRem( min=Modelica.Constants.small) "Resistance of remaining resistor RRoofRem between capacity n and outside" annotation(Dialog(group="Roof")); - parameter Modelica.SIunits.HeatCapacity CRoof[nRoof]( + parameter Modelica.Units.SI.HeatCapacity CRoof[nRoof]( each min=Modelica.Constants.small) "Vector of heat capacities of roof, from inside to outside" annotation(Dialog(group="Roof")); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/ReducedOrder/RC/OneElement.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/ReducedOrder/RC/OneElement.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/ReducedOrder/RC/OneElement.mo" 2022-03-10 09:57:41.236144537 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/ReducedOrder/RC/OneElement.mo" 2022-03-10 09:58:07.128147818 +0000 @@ -2,9 +2,9 @@ model OneElement "Thermal Zone with one element for exterior walls" extends Buildings.Fluid.Interfaces.LumpedVolumeDeclarations; - parameter Modelica.SIunits.Volume VAir "Air volume of the zone" + parameter Modelica.Units.SI.Volume VAir "Air volume of the zone" annotation(Dialog(group="Thermal zone")); - parameter Modelica.SIunits.CoefficientOfHeatTransfer hRad + parameter Modelica.Units.SI.CoefficientOfHeatTransfer hRad "Coefficient of heat transfer for linearized radiation exchange between walls" annotation(Dialog(group="Thermal zone")); parameter Integer nOrientations(min=1) "Number of orientations" @@ -12,18 +12,18 @@ parameter Integer nPorts=0 "Number of fluid ports" annotation(Evaluate=true, Dialog(connectorSizing=true, tab="General",group="Ports")); - parameter Modelica.SIunits.Area AWin[nOrientations] + parameter Modelica.Units.SI.Area AWin[nOrientations] "Vector of areas of windows by orientations" annotation(Dialog(group="Windows")); - parameter Modelica.SIunits.Area ATransparent[nOrientations] "Vector of areas of transparent (solar radiation transmittend) elements by + parameter Modelica.Units.SI.Area ATransparent[nOrientations] "Vector of areas of transparent (solar radiation transmittend) elements by orientations" annotation(Dialog(group="Windows")); - parameter Modelica.SIunits.CoefficientOfHeatTransfer hConWin + parameter Modelica.Units.SI.CoefficientOfHeatTransfer hConWin "Convective coefficient of heat transfer of windows (indoor)" annotation(Dialog(group="Windows")); - parameter Modelica.SIunits.ThermalResistance RWin "Resistor for windows" + parameter Modelica.Units.SI.ThermalResistance RWin "Resistor for windows" annotation(Dialog(group="Windows")); - parameter Modelica.SIunits.TransmissionCoefficient gWin + parameter Modelica.Units.SI.TransmissionCoefficient gWin "Total energy transmittance of windows" annotation(Dialog(group="Windows")); parameter Real ratioWinConRad @@ -32,23 +32,23 @@ parameter Boolean indoorPortWin = false "Additional heat port at indoor surface of windows" annotation(Dialog(group="Windows"),choices(checkBox = true)); - parameter Modelica.SIunits.Area AExt[nOrientations] + parameter Modelica.Units.SI.Area AExt[nOrientations] "Vector of areas of exterior walls by orientations" annotation(Dialog(group="Exterior walls")); - parameter Modelica.SIunits.CoefficientOfHeatTransfer hConExt + parameter Modelica.Units.SI.CoefficientOfHeatTransfer hConExt "Convective coefficient of heat transfer of exterior walls (indoor)" annotation(Dialog(group="Exterior walls")); parameter Integer nExt(min = 1) "Number of RC-elements of exterior walls" annotation(Dialog(group="Exterior walls")); - parameter Modelica.SIunits.ThermalResistance RExt[nExt]( + parameter Modelica.Units.SI.ThermalResistance RExt[nExt]( each min=Modelica.Constants.small) "Vector of resistances of exterior walls, from inside to outside" annotation(Dialog(group="Exterior walls")); - parameter Modelica.SIunits.ThermalResistance RExtRem( + parameter Modelica.Units.SI.ThermalResistance RExtRem( min=Modelica.Constants.small) "Resistance of remaining resistor RExtRem between capacity n and outside" annotation(Dialog(group="Exterior walls")); - parameter Modelica.SIunits.HeatCapacity CExt[nExt]( + parameter Modelica.Units.SI.HeatCapacity CExt[nExt]( each min=Modelica.Constants.small) "Vector of heat capacities of exterior walls, from inside to outside" annotation(Dialog(group="Exterior walls")); @@ -201,14 +201,14 @@ annotation (Placement(transformation(extent={{-280,70},{-240,110}}), iconTransformation(extent={{-260,90},{-240,110}}))); protected - constant Modelica.SIunits.SpecificEnergy h_fg= + constant Modelica.Units.SI.SpecificEnergy h_fg= Buildings.Media.Air.enthalpyOfCondensingGas(273.15+37) "Latent heat of water vapor"; - parameter Modelica.SIunits.Area ATot=sum(AArray) "Sum of wall surface areas"; - parameter Modelica.SIunits.Area ATotExt=sum(AExt) + parameter Modelica.Units.SI.Area ATot=sum(AArray) "Sum of wall surface areas"; + parameter Modelica.Units.SI.Area ATotExt=sum(AExt) "Sum of exterior wall surface areas"; - parameter Modelica.SIunits.Area ATotWin=sum(AWin) + parameter Modelica.Units.SI.Area ATotWin=sum(AWin) "Sum of window surface areas"; - parameter Modelica.SIunits.Area[:] AArray = {ATotExt, ATotWin} + parameter Modelica.Units.SI.Area[:] AArray = {ATotExt, ATotWin} "List of all wall surface areas"; parameter Integer dimension = sum({if A>0 then 1 else 0 for A in AArray}) "Number of non-zero wall surface areas"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/ReducedOrder/RC/ThreeElements.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/ReducedOrder/RC/ThreeElements.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/ReducedOrder/RC/ThreeElements.mo" 2022-03-10 09:57:41.236144537 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/ReducedOrder/RC/ThreeElements.mo" 2022-03-10 09:58:07.036147805 +0000 @@ -3,22 +3,22 @@ interior walls and floor plate" extends TwoElements(AArray={ATotExt,ATotWin,AInt,AFloor}); - parameter Modelica.SIunits.Area AFloor "Area of floor plate" + parameter Modelica.Units.SI.Area AFloor "Area of floor plate" annotation(Dialog(group="Floor plate")); - parameter Modelica.SIunits.CoefficientOfHeatTransfer hConFloor + parameter Modelica.Units.SI.CoefficientOfHeatTransfer hConFloor "Convective coefficient of heat transfer of floor plate (indoor)" annotation(Dialog(group="Floor plate")); parameter Integer nFloor(min = 1) "Number of RC-elements of floor plate" annotation(Dialog(group="Floor plate")); - parameter Modelica.SIunits.ThermalResistance RFloor[nFloor]( + parameter Modelica.Units.SI.ThermalResistance RFloor[nFloor]( each min=Modelica.Constants.small) "Vector of resistances of floor plate, from inside to outside" annotation(Dialog(group="Floor plate")); - parameter Modelica.SIunits.ThermalResistance RFloorRem( + parameter Modelica.Units.SI.ThermalResistance RFloorRem( min=Modelica.Constants.small) "Resistance of remaining resistor RFloorRem between capacity n and outside" annotation(Dialog(group="Floor plate")); - parameter Modelica.SIunits.HeatCapacity CFloor[nFloor]( + parameter Modelica.Units.SI.HeatCapacity CFloor[nFloor]( each min=Modelica.Constants.small) "Vector of heat capacities of floor plate, from inside to outside" annotation(Dialog(group="Floor plate")); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/ReducedOrder/RC/TwoElements.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/ReducedOrder/RC/TwoElements.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/ReducedOrder/RC/TwoElements.mo" 2022-03-10 09:57:41.236144537 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/ReducedOrder/RC/TwoElements.mo" 2022-03-10 09:58:06.916147790 +0000 @@ -3,18 +3,18 @@ "Thermal Zone with two elements for exterior and interior walls" extends OneElement(AArray={ATotExt,ATotWin,AInt}); - parameter Modelica.SIunits.Area AInt "Area of interior walls" + parameter Modelica.Units.SI.Area AInt "Area of interior walls" annotation(Dialog(group="Interior walls")); - parameter Modelica.SIunits.CoefficientOfHeatTransfer hConInt + parameter Modelica.Units.SI.CoefficientOfHeatTransfer hConInt "Convective coefficient of heat transfer of interior walls (indoor)" annotation(Dialog(group="Interior walls")); parameter Integer nInt(min = 1) "Number of RC-elements of interior walls" annotation(Dialog(group="Interior walls")); - parameter Modelica.SIunits.ThermalResistance RInt[nInt]( + parameter Modelica.Units.SI.ThermalResistance RInt[nInt]( each min=Modelica.Constants.small) "Vector of resistances of interior walls, from port to center" annotation(Dialog(group="Interior walls")); - parameter Modelica.SIunits.HeatCapacity CInt[nInt]( + parameter Modelica.Units.SI.HeatCapacity CInt[nInt]( each min=Modelica.Constants.small) "Vector of heat capacities of interior walls, from port to center" annotation(Dialog(group="Interior walls")); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/ReducedOrder/SolarGain/BaseClasses/PartialCorrectionG.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/ReducedOrder/SolarGain/BaseClasses/PartialCorrectionG.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/ReducedOrder/SolarGain/BaseClasses/PartialCorrectionG.mo" 2022-03-10 09:57:41.236144537 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/ReducedOrder/SolarGain/BaseClasses/PartialCorrectionG.mo" 2022-03-10 09:58:06.852147782 +0000 @@ -3,7 +3,7 @@ "Partial model for correction of the solar gain factor" parameter Integer n(min = 1) "Vector size for input and output"; - parameter Modelica.SIunits.CoefficientOfHeatTransfer UWin + parameter Modelica.Units.SI.CoefficientOfHeatTransfer UWin "Thermal transmission coefficient of whole window"; Modelica.Blocks.Interfaces.RealInput HSkyDifTil[n]( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/ReducedOrder/SolarGain/CorrectionGDoublePane.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/ReducedOrder/SolarGain/CorrectionGDoublePane.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/ReducedOrder/SolarGain/CorrectionGDoublePane.mo" 2022-03-10 09:57:41.236144537 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/ReducedOrder/SolarGain/CorrectionGDoublePane.mo" 2022-03-10 09:58:06.836147779 +0000 @@ -2,7 +2,7 @@ model CorrectionGDoublePane "Double pane window solar correction" extends BaseClasses.PartialCorrectionG; - import con = Modelica.SIunits.Conversions; + import con = Modelica.Units.Conversions; // Parameters for the transmission correction factor based on VDI 6007 Part 3 // A0 to A6 are experimental constants VDI 6007 Part 3 page 20 @@ -20,65 +20,65 @@ "Constant 5 to calculate reference transmission"; parameter Real A6=4.74*10^(-12) "Constant 6 to calculate reference transmission"; - parameter Modelica.SIunits.TransmissionCoefficient g_dir0=0.7537 + parameter Modelica.Units.SI.TransmissionCoefficient g_dir0=0.7537 "Reference vertical parallel transmission coefficient for direct radiation for double pane window"; - parameter Modelica.SIunits.TransmissionCoefficient Ta_diff = 0.84 + parameter Modelica.Units.SI.TransmissionCoefficient Ta_diff = 0.84 "Energetic degree of transmission for diffuse radiation for uniformly overcast sky"; - parameter Modelica.SIunits.TransmissionCoefficient Tai_diff=0.903 + parameter Modelica.Units.SI.TransmissionCoefficient Tai_diff=0.903 "Pure degree of transmission for diffuse radiation"; - parameter Modelica.SIunits.TransmissionCoefficient Ta1_diff= Ta_diff*Tai_diff + parameter Modelica.Units.SI.TransmissionCoefficient Ta1_diff= Ta_diff*Tai_diff "Degreee of transmission for single pane window"; - parameter Modelica.SIunits.ReflectionCoefficient rho_T1_diff=1-(Ta_diff) + parameter Modelica.Units.SI.ReflectionCoefficient rho_T1_diff=1-(Ta_diff) "Part of degree of transmission for single pane window related to Ta1_diff"; - parameter Modelica.SIunits.ReflectionCoefficient rho_11_diff=rho_T1_diff/ + parameter Modelica.Units.SI.ReflectionCoefficient rho_11_diff=rho_T1_diff/ (2-(rho_T1_diff)) "Part of degree of transmission for single pane window related to rho_T1_diff"; - parameter Modelica.SIunits.ReflectionCoefficient rho_1_diff= rho_11_diff+ + parameter Modelica.Units.SI.ReflectionCoefficient rho_1_diff= rho_11_diff+ (((1-rho_11_diff)*Tai_diff)^2*rho_11_diff)/(1-(rho_11_diff*Tai_diff)^2) "Degree of reflection for single pane window"; - parameter Modelica.SIunits.ReflectionCoefficient XN2_diff=1-rho_1_diff^2 + parameter Modelica.Units.SI.ReflectionCoefficient XN2_diff=1-rho_1_diff^2 "Calculation factor to simplify equations"; - parameter Modelica.SIunits.TransmissionCoefficient Ta2_diff=(Ta1_diff^2)/ + parameter Modelica.Units.SI.TransmissionCoefficient Ta2_diff=(Ta1_diff^2)/ XN2_diff "Energetic dregree of transmission for second pane"; - parameter Modelica.SIunits.Emissivity a1_diff=1-Ta1_diff-rho_1_diff + parameter Modelica.Units.SI.Emissivity a1_diff=1-Ta1_diff-rho_1_diff "Degree of absorption for single pane window"; - parameter Modelica.SIunits.CoefficientOfHeatTransfer Q21_diff= + parameter Modelica.Units.SI.CoefficientOfHeatTransfer Q21_diff= a1_diff*(1+(Ta1_diff*rho_1_diff/XN2_diff))*UWin/25 "Coefficient of heat transfer for exterior pane of double pane window"; - parameter Modelica.SIunits.CoefficientOfHeatTransfer Q22_diff= + parameter Modelica.Units.SI.CoefficientOfHeatTransfer Q22_diff= a1_diff*(Ta1_diff/XN2_diff)*(1-(UWin/7.7)) "Coefficient of heat transfer for interior pane of double pane window"; - parameter Modelica.SIunits.CoefficientOfHeatTransfer Qsek2_diff= + parameter Modelica.Units.SI.CoefficientOfHeatTransfer Qsek2_diff= Q21_diff+Q22_diff "Overall coefficient of heat transfer for double pane window"; - parameter Modelica.SIunits.TransmissionCoefficient CorG_diff= + parameter Modelica.Units.SI.TransmissionCoefficient CorG_diff= (Ta2_diff+Qsek2_diff)/g_dir0 "Transmission coefficient correction factor for diffuse radiation"; - parameter Modelica.SIunits.TransmissionCoefficient CorG_gr= + parameter Modelica.Units.SI.TransmissionCoefficient CorG_gr= (Ta2_diff+Qsek2_diff)/g_dir0 "Transmission coefficient correction factor for irradiations from ground"; //Calculating the correction factor for direct solar radiation - Modelica.SIunits.TransmissionCoefficient[n] Ta_dir + Modelica.Units.SI.TransmissionCoefficient[n] Ta_dir "Energetic degree of transmission for direct radiation"; - Modelica.SIunits.TransmissionCoefficient[n] Tai_dir + Modelica.Units.SI.TransmissionCoefficient[n] Tai_dir "Pure degree of transmission for direct radiation"; - Modelica.SIunits.TransmissionCoefficient[n] Ta1_dir + Modelica.Units.SI.TransmissionCoefficient[n] Ta1_dir "Pure degree of transmission for single pane window"; - Modelica.SIunits.ReflectionCoefficient[n] rho_T1_dir + Modelica.Units.SI.ReflectionCoefficient[n] rho_T1_dir "Part of degree of transmission for single pane window related to Ta1_dir"; - Modelica.SIunits.ReflectionCoefficient[n] rho_11_dir + Modelica.Units.SI.ReflectionCoefficient[n] rho_11_dir "Part of degree of transmission for single pane window related to T1_dir"; - Modelica.SIunits.ReflectionCoefficient[n] rho_1_dir + Modelica.Units.SI.ReflectionCoefficient[n] rho_1_dir "Degree of reflection for single pane window"; - Modelica.SIunits.ReflectionCoefficient[n] XN2_dir + Modelica.Units.SI.ReflectionCoefficient[n] XN2_dir "Calculation factor to simplify equations"; - Modelica.SIunits.TransmissionCoefficient[n] Ta2_dir + Modelica.Units.SI.TransmissionCoefficient[n] Ta2_dir "Energetic dregree of transmission for second pane"; - Modelica.SIunits.Emissivity[n] a1_dir + Modelica.Units.SI.Emissivity[n] a1_dir "Degree of absorption for single pane window"; Real[n] Q21_dir "Coefficient of heat transfer for exterior pane of double pane window"; @@ -86,9 +86,9 @@ "Coefficient of heat transfer for interior pane of double pane window"; Real[n] Qsek2_dir "Overall coefficient of heat transfer for double pane window"; - Modelica.SIunits.TransmissionCoefficient[n] CorG_dir - "Transmission coefficient correction factor for direct radiation"; + Modelica.Units.SI.TransmissionCoefficient[n] CorG_dir + "Transmission coefficient correction factor for direct radiation"; equation for i in 1:n loop Ta_dir[i]= (((((A6*con.to_deg(inc[i])+A5)*con.to_deg(inc[i])+A4)*con.to_deg(inc[i])+A3)* diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/ReducedOrder/Validation/VDI6007/BaseClasses/VerifyDifferenceThreePeriods.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/ReducedOrder/Validation/VDI6007/BaseClasses/VerifyDifferenceThreePeriods.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/ReducedOrder/Validation/VDI6007/BaseClasses/VerifyDifferenceThreePeriods.mo" 2022-03-10 09:57:41.236144537 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/ThermalZones/ReducedOrder/Validation/VDI6007/BaseClasses/VerifyDifferenceThreePeriods.mo" 2022-03-10 09:58:06.756147770 +0000 @@ -2,17 +2,17 @@ block VerifyDifferenceThreePeriods "Assert when condition is violated" extends Buildings.Utilities.Diagnostics.BaseClasses.PartialInputCheck( message="Inputs differ by more than threShold.\n Check output 'satisfied' for when violation(s) happened."); - parameter Modelica.SIunits.Time endTime = 0 + parameter Modelica.Units.SI.Time endTime = 0 "Start time for deactivating the assert (period one)"; - parameter Modelica.SIunits.Time startTime2 = 0 + parameter Modelica.Units.SI.Time startTime2 = 0 "Start time for activating the assert (period two)"; - parameter Modelica.SIunits.Time endTime2 = 0 + parameter Modelica.Units.SI.Time endTime2 = 0 "Start time for deactivating the assert (period two)"; - parameter Modelica.SIunits.Time startTime3 = 0 + parameter Modelica.Units.SI.Time startTime3 = 0 "Start time for activating the assert (period three)"; - parameter Modelica.SIunits.Time endTime3 = 0 + parameter Modelica.Units.SI.Time endTime3 = 0 "Start time for deactivating the assert (period three)"; - parameter Modelica.SIunits.Time tau(min=1) = 60 "Time constant for filtering signal"; + parameter Modelica.Units.SI.Time tau(min=1) = 60 "Time constant for filtering signal"; Modelica.Blocks.Interfaces.BooleanOutput satisfied(start=true, fixed=true) annotation (Placement(transformation(extent={{100,-70},{120,-50}}))); @@ -22,15 +22,15 @@ iconTransformation(extent={{100,42},{140,82}}))); protected - parameter Modelica.SIunits.Time t1(fixed=false) + parameter Modelica.Units.SI.Time t1(fixed=false) "Simulation end time period one"; - parameter Modelica.SIunits.Time t3(fixed=false) + parameter Modelica.Units.SI.Time t3(fixed=false) "Simulation end time period two"; - parameter Modelica.SIunits.Time t5(fixed=false) + parameter Modelica.Units.SI.Time t5(fixed=false) "Simulation end time period three"; - parameter Modelica.SIunits.Time t2(fixed=false) + parameter Modelica.Units.SI.Time t2(fixed=false) "Simulation start time period two"; - parameter Modelica.SIunits.Time t4(fixed=false) + parameter Modelica.Units.SI.Time t4(fixed=false) "Simulation start time period three"; Integer nFai "Number of test violations"; Real diffExa "Exact, non-filtered value of the difference between the inputs"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Types/Azimuth/package.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Types/Azimuth/package.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Types/Azimuth/package.mo" 2022-03-10 09:57:41.236144537 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Types/Azimuth/package.mo" 2022-03-10 09:58:06.204147699 +0000 @@ -2,21 +2,21 @@ package Azimuth "List of possible constant values for surface azimuth" extends Modelica.Icons.TypesPackage; - 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 SW = +Modelica.Constants.pi/4 + constant Modelica.Units.SI.Angle SW = +Modelica.Constants.pi/4 "Azimuth for an exterior wall whose outer surface faces south-west"; - 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"; - constant Modelica.SIunits.Angle NW = +Modelica.Constants.pi*3/4 + constant Modelica.Units.SI.Angle NW = +Modelica.Constants.pi*3/4 "Azimuth for an exterior wall whose outer surface faces north-west"; - 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 NE = -Modelica.Constants.pi*3/4 + constant Modelica.Units.SI.Angle NE = -Modelica.Constants.pi*3/4 "Azimuth for an exterior wall whose outer surface faces north-east"; - 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 SE = -Modelica.Constants.pi/4 + constant Modelica.Units.SI.Angle SE = -Modelica.Constants.pi/4 "Azimuth for an exterior wall whose outer surface faces south-east"; annotation(preferredView="info", diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Types/Tilt/package.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Types/Tilt/package.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Types/Tilt/package.mo" 2022-03-10 09:57:41.236144537 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Types/Tilt/package.mo" 2022-03-10 09:58:06.188147698 +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 8.1.0/Utilities/Comfort/Fanger.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Comfort/Fanger.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Comfort/Fanger.mo" 2022-03-10 09:57:41.236144537 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Comfort/Fanger.mo" 2022-03-10 09:58:05.688147635 +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(start=273.15+40) "Surface temperature of clothing"; - Modelica.SIunits.Temperature TSki( + Modelica.Units.SI.Temperature TOpe "Operative temperature"; + Modelica.Units.SI.Temperature TClo(start=273.15+40) "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 diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Diagnostics/BaseClasses/PartialInputCheck.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Diagnostics/BaseClasses/PartialInputCheck.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Diagnostics/BaseClasses/PartialInputCheck.mo" 2022-03-10 09:57:41.236144537 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Diagnostics/BaseClasses/PartialInputCheck.mo" 2022-03-10 09:58:05.452147604 +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 8.1.0/Utilities/Diagnostics/Validation/CheckEquality.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Diagnostics/Validation/CheckEquality.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Diagnostics/Validation/CheckEquality.mo" 2022-03-10 09:57:41.236144537 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Diagnostics/Validation/CheckEquality.mo" 2022-03-10 09:58:05.432147602 +0000 @@ -7,7 +7,7 @@ annotation (Placement(transformation(extent={{20,10},{40,30}}))); Modelica.Blocks.Sources.Constant con(k=0.1) "Input" annotation (Placement(transformation(extent={{-60,30},{-40,50}}))); - Modelica.Blocks.Sources.Sine sin1(freqHz=1, amplitude=0.03) + Modelica.Blocks.Sources.Sine sin1(f =1, amplitude=0.03) "Input" annotation (Placement(transformation(extent={{-60,-10},{-40,10}}))); Modelica.Blocks.Math.Add add "Adder to offset the sin input signal" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/IO/BCVTB/BCVTB.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/IO/BCVTB/BCVTB.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/IO/BCVTB/BCVTB.mo" 2022-03-10 09:57:41.236144537 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/IO/BCVTB/BCVTB.mo" 2022-03-10 09:58:05.408147599 +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 8.1.0/Utilities/IO/BCVTB/BaseClasses/FluidInterface.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/IO/BCVTB/BaseClasses/FluidInterface.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/IO/BCVTB/BaseClasses/FluidInterface.mo" 2022-03-10 09:57:41.236144537 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/IO/BCVTB/BaseClasses/FluidInterface.mo" 2022-03-10 09:58:05.364147593 +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 8.1.0/Utilities/IO/BCVTB/BaseClasses/exchangeReals.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/IO/BCVTB/BaseClasses/exchangeReals.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/IO/BCVTB/BaseClasses/exchangeReals.mo" 2022-03-10 09:57:41.236144537 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/IO/BCVTB/BaseClasses/exchangeReals.mo" 2022-03-10 09:58:05.320147587 +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 8.1.0/Utilities/IO/BCVTB/Examples/MoistAir.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/IO/BCVTB/Examples/MoistAir.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/IO/BCVTB/Examples/MoistAir.mo" 2022-03-10 09:57:41.236144537 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/IO/BCVTB/Examples/MoistAir.mo" 2022-03-10 09:58:05.300147585 +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.PressureDrop dp1( redeclare package Medium = Medium, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/IO/BCVTB/Examples/TwoRooms.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/IO/BCVTB/Examples/TwoRooms.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/IO/BCVTB/Examples/TwoRooms.mo" 2022-03-10 09:57:41.236144537 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/IO/BCVTB/Examples/TwoRooms.mo" 2022-03-10 09:58:05.236147577 +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 8.1.0/Utilities/IO/BCVTB/From_degC.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/IO/BCVTB/From_degC.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/IO/BCVTB/From_degC.mo" 2022-03-10 09:57:41.236144537 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/IO/BCVTB/From_degC.mo" 2022-03-10 09:58:05.212147574 +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 8.1.0/Utilities/IO/BCVTB/To_degC.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/IO/BCVTB/To_degC.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/IO/BCVTB/To_degC.mo" 2022-03-10 09:57:41.236144537 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/IO/BCVTB/To_degC.mo" 2022-03-10 09:58:05.184147571 +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 8.1.0/Utilities/IO/FLEXLAB/CalBayComm.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/IO/FLEXLAB/CalBayComm.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/IO/FLEXLAB/CalBayComm.mo" 2022-03-10 09:57:41.236144537 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/IO/FLEXLAB/CalBayComm.mo" 2022-03-10 09:58:05.144147566 +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 8.1.0/Utilities/IO/Files/BaseClasses/FileWriter.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/IO/Files/BaseClasses/FileWriter.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/IO/Files/BaseClasses/FileWriter.mo" 2022-03-10 09:57:41.236144537 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/IO/Files/BaseClasses/FileWriter.mo" 2022-03-10 09:58:05.108147561 +0000 @@ -7,7 +7,7 @@ annotation(Evaluate=true, Dialog(connectorSizing=true)); parameter String fileName = getInstanceName() + ".csv" "File name, including extension"; - parameter Modelica.SIunits.Time samplePeriod + parameter Modelica.Units.SI.Time samplePeriod "Sample period: equidistant interval for which the inputs are saved"; parameter String delimiter = "\t" "Delimiter for csv file" @@ -29,7 +29,7 @@ parameter Boolean isCombiTimeTable = false "=true, if CombiTimeTable header should be prepended upon destruction" annotation(Evaluate=true); - parameter Modelica.SIunits.Time t0(fixed=false) + parameter Modelica.Units.SI.Time t0(fixed=false) "First sample time instant"; parameter String insNam = getInstanceName() "Instance name"; Buildings.Utilities.IO.Files.BaseClasses.FileWriterObject filWri= diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/IO/Files/Examples/BaseClasses/PartialCSV.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/IO/Files/Examples/BaseClasses/PartialCSV.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/IO/Files/Examples/BaseClasses/PartialCSV.mo" 2022-03-10 09:57:41.236144537 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/IO/Files/Examples/BaseClasses/PartialCSV.mo" 2022-03-10 09:58:04.880147533 +0000 @@ -1,7 +1,7 @@ within Buildings.Utilities.IO.Files.Examples.BaseClasses; model PartialCSV "Base model for CSV reader and writer example" extends Modelica.Icons.Example; - Modelica.Blocks.Sources.Cosine cos(freqHz=0.345) "Cosine" + Modelica.Blocks.Sources.Cosine cos(f =0.345) "Cosine" annotation (Placement(transformation(extent={{-80,20},{-60,40}}))); Modelica.Blocks.Sources.Step step(startTime=5) "Step function" annotation (Placement(transformation(extent={{-80,-40},{-60,-20}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/IO/Files/Examples/JSONWriter.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/IO/Files/Examples/JSONWriter.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/IO/Files/Examples/JSONWriter.mo" 2022-03-10 09:57:41.236144537 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/IO/Files/Examples/JSONWriter.mo" 2022-03-10 09:58:04.856147529 +0000 @@ -25,7 +25,7 @@ offset=1) "Ramp signal" annotation (Placement(transformation(extent={{-80,20},{-60,40}}))); Modelica.Blocks.Sources.Constant const(k=2) "Constant signal" annotation (Placement(transformation(extent={{-80,-10},{-60,10}}))); - Modelica.Blocks.Sources.Cosine cosine(amplitude=1, freqHz=12) "Cosine signal" + Modelica.Blocks.Sources.Cosine cosine(amplitude=1, f =12) "Cosine signal" annotation (Placement(transformation(extent={{-80,-40},{-60,-20}}))); Buildings.Utilities.IO.Files.JSONWriter jsonWriterOneVar(nin=1, fileName="TerminalOutput.json") "Single variable output" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/IO/Files/Examples/Printer.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/IO/Files/Examples/Printer.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/IO/Files/Examples/Printer.mo" 2022-03-10 09:57:41.236144537 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/IO/Files/Examples/Printer.mo" 2022-03-10 09:58:04.840147527 +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 8.1.0/Utilities/IO/Files/JSONWriter.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/IO/Files/JSONWriter.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/IO/Files/JSONWriter.mo" 2022-03-10 09:57:41.236144537 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/IO/Files/JSONWriter.mo" 2022-03-10 09:58:04.816147525 +0000 @@ -12,7 +12,7 @@ Buildings.Utilities.IO.Files.BaseClasses.OutputTime.Terminal "Time when results are written to file" annotation(Evaluate=true); - parameter Modelica.SIunits.Time customTime = 0 + parameter Modelica.Units.SI.Time customTime = 0 "Custom time when results are stored, used if outputTime=Custom only" annotation(Dialog(enable=outputTime==Buildings.Utilities.IO.Files.BaseClasses.OutputTime.Custom)); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/IO/Python36/Examples/KalmanFilter.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/IO/Python36/Examples/KalmanFilter.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/IO/Python36/Examples/KalmanFilter.mo" 2022-03-10 09:57:41.236144537 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/IO/Python36/Examples/KalmanFilter.mo" 2022-03-10 09:58:04.768147518 +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 "Addition of signals before sending it to the Kalman filter" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/IO/Python36/Examples/SimpleRoom.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/IO/Python36/Examples/SimpleRoom.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/IO/Python36/Examples/SimpleRoom.mo" 2022-03-10 09:57:41.236144537 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/IO/Python36/Examples/SimpleRoom.mo" 2022-03-10 09:58:04.748147515 +0000 @@ -28,7 +28,7 @@ amplitude=5, offset=283.15, y(unit="K", displayUnit="degC"), - freqHz=1/86400, +f =1/86400, phase=-1.5707963267949) "Ambient temperature" annotation (Placement(transformation(extent={{-80,30},{-60,50}}))); equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Math/Examples/SmoothBlocks.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Math/Examples/SmoothBlocks.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Math/Examples/SmoothBlocks.mo" 2022-03-10 09:57:41.240144536 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Math/Examples/SmoothBlocks.mo" 2022-03-10 09:58:04.040147426 +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 8.1.0/Utilities/Math/Examples/SmoothLimit.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Math/Examples/SmoothLimit.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Math/Examples/SmoothLimit.mo" 2022-03-10 09:57:41.240144536 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Math/Examples/SmoothLimit.mo" 2022-03-10 09:58:03.996147421 +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 8.1.0/Utilities/Math/Examples/Splice.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Math/Examples/Splice.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Math/Examples/Splice.mo" 2022-03-10 09:57:41.240144536 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Math/Examples/Splice.mo" 2022-03-10 09:58:03.984147419 +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 8.1.0/Utilities/Math/Examples/VectorFunctions.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Math/Examples/VectorFunctions.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Math/Examples/VectorFunctions.mo" 2022-03-10 09:57:41.240144536 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Math/Examples/VectorFunctions.mo" 2022-03-10 09:58:03.968147416 +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 8.1.0/Utilities/Plotters/BaseClasses/PartialPlotter.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Plotters/BaseClasses/PartialPlotter.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Plotters/BaseClasses/PartialPlotter.mo" 2022-03-10 09:57:41.240144536 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Plotters/BaseClasses/PartialPlotter.mo" 2022-03-10 09:58:02.704147256 +0000 @@ -7,7 +7,7 @@ parameter String fileName = plotConfiguration.fileName "Name of html file"; - parameter Modelica.SIunits.Time samplePeriod(min=1E-3) = plotConfiguration.samplePeriod + parameter Modelica.Units.SI.Time samplePeriod(min=1E-3) = plotConfiguration.samplePeriod "Sample period of component" annotation(Dialog(group="Activation")); @@ -27,7 +27,7 @@ "Set to true to enable an input that allows activating and deactivating the plotting" annotation(Dialog(group="Activation")); - parameter Modelica.SIunits.Time activationDelay(min=0)=plotConfiguration.activationDelay + parameter Modelica.Units.SI.Time activationDelay(min=0)=plotConfiguration.activationDelay "Time that needs to elapse to enable plotting after activate becomes true" annotation(Dialog(group="Activation")); @@ -42,7 +42,7 @@ iconTransformation(extent={{-140,60},{-100,100}}))); Boolean active "Flag, true if plots record data"; protected - parameter Modelica.SIunits.Time t0(fixed=false) + parameter Modelica.Units.SI.Time t0(fixed=false) "First sample time instant"; parameter String insNam = Modelica.Utilities.Strings.replace( getInstanceName(), ".", "_") @@ -59,7 +59,7 @@ Modelica.Blocks.Interfaces.BooleanInput activate_internal "Internal connector to activate plots"; - discrete Modelica.SIunits.Time tActivateLast "Time when plotter was the last time activated"; + discrete Modelica.Units.SI.Time tActivateLast "Time when plotter was the last time activated"; output Boolean sampleTrigger "True, if sample time instant"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Plotters/Configuration.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Plotters/Configuration.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Plotters/Configuration.mo" 2022-03-10 09:57:41.240144536 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Plotters/Configuration.mo" 2022-03-10 09:58:02.656147251 +0000 @@ -1,7 +1,7 @@ within Buildings.Utilities.Plotters; model Configuration "Configuration for plotters" extends Modelica.Blocks.Icons.Block; - parameter Modelica.SIunits.Time samplePeriod(min=1E-3) + parameter Modelica.Units.SI.Time samplePeriod(min=1E-3) "Sample period of component"; parameter String fileName = Modelica.Utilities.Files.fullPathName("plots.html") "Name of html file"; @@ -14,7 +14,7 @@ "Set to true to enable an input that allows activating and deactivating the plotting" annotation(Dialog(group="Activation")); - parameter Modelica.SIunits.Time activationDelay(min=0)=0 + parameter Modelica.Units.SI.Time activationDelay(min=0)=0 "Time that needs to elapse to enable plotting after activate becomes true" annotation(Dialog( group="Activation", @@ -29,7 +29,7 @@ protected Modelica.Blocks.Interfaces.BooleanInput activate_internal "Internal connector to activate plots"; - discrete Modelica.SIunits.Time tActivateLast "Time when plotter was the last time activated"; + discrete Modelica.Units.SI.Time tActivateLast "Time when plotter was the last time activated"; initial equation tActivateLast = time-2*activationDelay; equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Plotters/Examples/BaseClasses/CoolingCoilValve.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Plotters/Examples/BaseClasses/CoolingCoilValve.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Plotters/Examples/BaseClasses/CoolingCoilValve.mo" 2022-03-10 09:57:41.240144536 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Plotters/Examples/BaseClasses/CoolingCoilValve.mo" 2022-03-10 09:58:02.624147247 +0000 @@ -13,11 +13,11 @@ "Unit converter for controller gains from the ALC control logic" annotation(Evaluate=true, Dialog(tab="Advanced", group="Parameters")); - parameter Modelica.SIunits.Temperature TOutCooCut = 50 * (5/9) - 32 * (5/9) + 273.15 + parameter Modelica.Units.SI.Temperature TOutCooCut = 50 * (5/9) - 32 * (5/9) + 273.15 "Recorded outdoor air temperature cooling threshold" annotation(Evaluate=true, Dialog(group="Enable")); - parameter Modelica.SIunits.Temperature TOutDelta = 2 * (5/9) - 32 * (5/9) + 273.15 + parameter Modelica.Units.SI.Temperature TOutDelta = 2 * (5/9) - 32 * (5/9) + 273.15 "Recorded outdoor air temperature cooling threshold hysteresis delta" annotation(Evaluate=true, Dialog(group="Enable")); @@ -29,15 +29,15 @@ "Recorded fan feedback threshold hysteresis delta" annotation(Evaluate=true, Dialog(group="Enable")); - parameter Modelica.SIunits.Temperature TSupHighLim = 50 * (5/9) - 32 * (5/9) + 273.15 + parameter Modelica.Units.SI.Temperature TSupHighLim = 50 * (5/9) - 32 * (5/9) + 273.15 "Recorded minimum supply air temperature for defining the upper limit of the valve position" annotation(Evaluate=true, Dialog(group="Controller")); - parameter Modelica.SIunits.Temperature TSupHigLim = 42 * (5/9) - 32 * (5/9) + 273.15 + parameter Modelica.Units.SI.Temperature TSupHigLim = 42 * (5/9) - 32 * (5/9) + 273.15 "Recorded maximum supply air temperature for defining the upper limit of the valve position" annotation(Evaluate=true, Dialog(group="Controller")); - parameter Modelica.SIunits.Time interval(min = 1) = 15 + parameter Modelica.Units.SI.Time interval(min = 1) = 15 "Recorded interval at which integration part of the output gets updated" annotation(Evaluate=true, Dialog(group="Controller")); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/BaseClasses/HumidityRatioVaporPressure.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/BaseClasses/HumidityRatioVaporPressure.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/BaseClasses/HumidityRatioVaporPressure.mo" 2022-03-10 09:57:41.240144536 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/BaseClasses/HumidityRatioVaporPressure.mo" 2022-03-10 09:58:02.200147192 +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 8.1.0/Utilities/Psychrometrics/Constants.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Constants.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Constants.mo" 2022-03-10 09:57:41.240144536 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Constants.mo" 2022-03-10 09:58:02.188147192 +0000 @@ -1,15 +1,15 @@ within Buildings.Utilities.Psychrometrics; package Constants "Library of constants for psychometric functions" extends Modelica.Icons.Package; - constant Modelica.SIunits.Temperature T_ref = 273.15 + constant Modelica.Units.SI.Temperature T_ref = 273.15 "Reference temperature for psychrometric calculations"; - constant Modelica.SIunits.SpecificHeatCapacity cpAir=1006 + constant Modelica.Units.SI.SpecificHeatCapacity cpAir=1006 "Specific heat capacity of air"; - constant Modelica.SIunits.SpecificHeatCapacity cpSte=1860 + constant Modelica.Units.SI.SpecificHeatCapacity cpSte=1860 "Specific heat capacity of water vapor"; - constant Modelica.SIunits.SpecificHeatCapacity cpWatLiq = 4184 + constant Modelica.Units.SI.SpecificHeatCapacity cpWatLiq = 4184 "Specific heat capacity of liquid water"; - constant Modelica.SIunits.SpecificEnthalpy h_fg = 2501014.5 + constant Modelica.Units.SI.SpecificEnthalpy h_fg = 2501014.5 "Enthalpy of evaporation of water at the reference temperature"; constant Real k_mair = 0.6219647130774989 "Ratio of molar weights"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Examples/TWetBul_TDryBulPhi.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Examples/TWetBul_TDryBulPhi.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Examples/TWetBul_TDryBulPhi.mo" 2022-03-10 09:57:41.240144536 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Examples/TWetBul_TDryBulPhi.mo" 2022-03-10 09:58:02.084147178 +0000 @@ -33,7 +33,7 @@ protected block Assertions extends Modelica.Blocks.Icons.Block; - constant Modelica.SIunits.Temperature dT_max=0.1 + constant Modelica.Units.SI.Temperature dT_max=0.1 "Maximum allowed deviation with reference result"; Modelica.Blocks.Interfaces.RealInput phi "Relative humidity" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/BaseClasses/Examples/DewPointTemperatureDerivativeCheck.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/BaseClasses/Examples/DewPointTemperatureDerivativeCheck.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/BaseClasses/Examples/DewPointTemperatureDerivativeCheck.mo" 2022-03-10 09:57:41.240144536 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/BaseClasses/Examples/DewPointTemperatureDerivativeCheck.mo" 2022-03-10 09:58:02.012147170 +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 8.1.0/Utilities/Psychrometrics/Functions/BaseClasses/Examples/DewPointTemperatureDerivativeCheck_amb.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/BaseClasses/Examples/DewPointTemperatureDerivativeCheck_amb.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/BaseClasses/Examples/DewPointTemperatureDerivativeCheck_amb.mo" 2022-03-10 09:57:41.240144536 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/BaseClasses/Examples/DewPointTemperatureDerivativeCheck_amb.mo" 2022-03-10 09:58:01.996147166 +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 8.1.0/Utilities/Psychrometrics/Functions/BaseClasses/Examples/InverseDewPointTemperatureDerivativeCheck_amb.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/BaseClasses/Examples/InverseDewPointTemperatureDerivativeCheck_amb.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/BaseClasses/Examples/InverseDewPointTemperatureDerivativeCheck_amb.mo" 2022-03-10 09:57:41.240144536 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/BaseClasses/Examples/InverseDewPointTemperatureDerivativeCheck_amb.mo" 2022-03-10 09:58:01.984147165 +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 8.1.0/Utilities/Psychrometrics/Functions/BaseClasses/Examples/SaturationPressureDerivativeCheck.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/BaseClasses/Examples/SaturationPressureDerivativeCheck.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/BaseClasses/Examples/SaturationPressureDerivativeCheck.mo" 2022-03-10 09:57:41.240144536 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/BaseClasses/Examples/SaturationPressureDerivativeCheck.mo" 2022-03-10 09:58:01.976147164 +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 8.1.0/Utilities/Psychrometrics/Functions/BaseClasses/Examples/WaterVaporPressureDerivativeCheck.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/BaseClasses/Examples/WaterVaporPressureDerivativeCheck.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/BaseClasses/Examples/WaterVaporPressureDerivativeCheck.mo" 2022-03-10 09:57:41.240144536 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/BaseClasses/Examples/WaterVaporPressureDerivativeCheck.mo" 2022-03-10 09:58:01.964147162 +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 8.1.0/Utilities/Psychrometrics/Functions/BaseClasses/der_TDewPoi_pW_amb.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/BaseClasses/der_TDewPoi_pW_amb.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/BaseClasses/der_TDewPoi_pW_amb.mo" 2022-03-10 09:57:41.240144536 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/BaseClasses/der_TDewPoi_pW_amb.mo" 2022-03-10 09:58:01.948147162 +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 8.1.0/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_TDewPoi.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_TDewPoi.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_TDewPoi.mo" 2022-03-10 09:57:41.240144536 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_TDewPoi.mo" 2022-03-10 09:58:01.932147158 +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 8.1.0/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_TDewPoi_amb.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_TDewPoi_amb.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_TDewPoi_amb.mo" 2022-03-10 09:57:41.240144536 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_TDewPoi_amb.mo" 2022-03-10 09:58:01.916147158 +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 8.1.0/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_X.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_X.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_X.mo" 2022-03-10 09:57:41.240144536 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_X.mo" 2022-03-10 09:58:01.900147154 +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 8.1.0/Utilities/Psychrometrics/Functions/BaseClasses/der_saturationPressureLiquid.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/BaseClasses/der_saturationPressureLiquid.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/BaseClasses/der_saturationPressureLiquid.mo" 2022-03-10 09:57:41.240144536 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/BaseClasses/der_saturationPressureLiquid.mo" 2022-03-10 09:58:01.892147154 +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 8.1.0/Utilities/Psychrometrics/Functions/BaseClasses/der_sublimationPressureIce.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/BaseClasses/der_sublimationPressureIce.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/BaseClasses/der_sublimationPressureIce.mo" 2022-03-10 09:57:41.240144536 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/BaseClasses/der_sublimationPressureIce.mo" 2022-03-10 09:58:01.880147153 +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 8.1.0/Utilities/Psychrometrics/Functions/Examples/Density_pTX.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/Examples/Density_pTX.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/Examples/Density_pTX.mo" 2022-03-10 09:57:41.240144536 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/Examples/Density_pTX.mo" 2022-03-10 09:58:01.864147150 +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 8.1.0/Utilities/Psychrometrics/Functions/Examples/SaturationPressure.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/Examples/SaturationPressure.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/Examples/SaturationPressure.mo" 2022-03-10 09:57:41.240144536 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/Examples/SaturationPressure.mo" 2022-03-10 09:58:01.844147147 +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 8.1.0/Utilities/Psychrometrics/Functions/Examples/X_pSatpphi.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/Examples/X_pSatpphi.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/Examples/X_pSatpphi.mo" 2022-03-10 09:57:41.240144536 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/Examples/X_pSatpphi.mo" 2022-03-10 09:58:01.816147145 +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 8.1.0/Utilities/Psychrometrics/Functions/Examples/pW_TDewPoi.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/Examples/pW_TDewPoi.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/Examples/pW_TDewPoi.mo" 2022-03-10 09:57:41.240144536 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/Examples/pW_TDewPoi.mo" 2022-03-10 09:58:01.796147142 +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 8.1.0/Utilities/Psychrometrics/Functions/Examples/pW_TDewPoi_comparison.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/Examples/pW_TDewPoi_comparison.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/Examples/pW_TDewPoi_comparison.mo" 2022-03-10 09:57:41.240144536 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/Examples/pW_TDewPoi_comparison.mo" 2022-03-10 09:58:01.692147128 +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 8.1.0/Utilities/Psychrometrics/Functions/Examples/pW_X.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/Examples/pW_X.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/Examples/pW_X.mo" 2022-03-10 09:57:41.240144536 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/Examples/pW_X.mo" 2022-03-10 09:58:01.680147126 +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 8.1.0/Utilities/Psychrometrics/Functions/Examples/phi_pTX.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/Examples/phi_pTX.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/Examples/phi_pTX.mo" 2022-03-10 09:57:41.240144536 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/Examples/phi_pTX.mo" 2022-03-10 09:58:01.672147126 +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"; Real X_inv "Inverse computation of mass fraction"; constant Real convT(unit="1/s") = 0.999 "Conversion factor"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/TDewPoi_pW.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/TDewPoi_pW.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/TDewPoi_pW.mo" 2022-03-10 09:57:41.240144536 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/TDewPoi_pW.mo" 2022-03-10 09:58:01.660147124 +0000 @@ -3,22 +3,22 @@ "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 + function pW_TDewPoi_inversion "Internal function to solve eps=f(NTU, Z) for NTU for cross flow unmixed" extends Modelica.Math.Nonlinear.Interfaces.partialScalarFunction; - 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"; algorithm y :=Buildings.Utilities.Psychrometrics.Functions.pW_TDewPoi(T=u) - p_w; end pW_TDewPoi_inversion; - algorithm T := Modelica.Math.Nonlinear.solveOneNonlinearEquation( f=function pW_TDewPoi_inversion(p_w=p_w), diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/TDewPoi_pW_amb.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/TDewPoi_pW_amb.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/TDewPoi_pW_amb.mo" 2022-03-10 09:57:41.240144536 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/TDewPoi_pW_amb.mo" 2022-03-10 09:58:01.652147124 +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 8.1.0/Utilities/Psychrometrics/Functions/X_pSatpphi.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/X_pSatpphi.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/X_pSatpphi.mo" 2022-03-10 09:57:41.240144536 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/X_pSatpphi.mo" 2022-03-10 09:58:01.640147122 +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 8.1.0/Utilities/Psychrometrics/Functions/X_pTphi.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/X_pTphi.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/X_pTphi.mo" 2022-03-10 09:57:41.240144536 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/X_pTphi.mo" 2022-03-10 09:58:01.628147120 +0000 @@ -2,12 +2,12 @@ function X_pTphi "Absolute humidity for given pressure, dry bulb temperature and relative humidity" extends Modelica.Icons.Function; - input Modelica.SIunits.Pressure p "Absolute pressure of the medium"; - input Modelica.SIunits.Temperature T "Dry bulb temperature"; + input Modelica.Units.SI.Pressure p "Absolute pressure of the medium"; + input Modelica.Units.SI.Temperature T "Dry bulb temperature"; input Real phi(unit="1") "Relative humidity"; - output Modelica.SIunits.MassFraction X_w - "Water vapor mass fraction per unit mass total air"; + output Modelica.Units.SI.MassFraction X_w + "Water vapor mass fraction per unit mass total air"; algorithm X_w:=phi/((p/saturationPressure(T)-phi) / Buildings.Utilities.Psychrometrics.Constants.k_mair + phi); annotation ( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/X_pW.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/X_pW.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/X_pW.mo" 2022-03-10 09:57:41.240144536 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/X_pW.mo" 2022-03-10 09:58:01.620147120 +0000 @@ -1,17 +1,17 @@ within Buildings.Utilities.Psychrometrics.Functions; function X_pW "Mass fraction 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 8.1.0/Utilities/Psychrometrics/Functions/density_pTX.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/density_pTX.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/density_pTX.mo" 2022-03-10 09:57:41.244144537 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/density_pTX.mo" 2022-03-10 09:58:01.608147118 +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 8.1.0/Utilities/Psychrometrics/Functions/pW_TDewPoi.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/pW_TDewPoi.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/pW_TDewPoi.mo" 2022-03-10 09:57:41.244144537 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/pW_TDewPoi.mo" 2022-03-10 09:58:01.596147117 +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 8.1.0/Utilities/Psychrometrics/Functions/pW_TDewPoi_amb.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/pW_TDewPoi_amb.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/pW_TDewPoi_amb.mo" 2022-03-10 09:57:41.244144537 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/pW_TDewPoi_amb.mo" 2022-03-10 09:58:01.584147114 +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 8.1.0/Utilities/Psychrometrics/Functions/pW_X.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/pW_X.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/pW_X.mo" 2022-03-10 09:57:41.244144537 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/pW_X.mo" 2022-03-10 09:58:01.576147114 +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 8.1.0/Utilities/Psychrometrics/Functions/phi_pTX.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/phi_pTX.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/phi_pTX.mo" 2022-03-10 09:57:41.244144537 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/phi_pTX.mo" 2022-03-10 09:58:01.568147112 +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 8.1.0/Utilities/Psychrometrics/Functions/saturationPressure.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/saturationPressure.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/saturationPressure.mo" 2022-03-10 09:57:41.244144537 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/saturationPressure.mo" 2022-03-10 09:58:01.560147111 +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 8.1.0/Utilities/Psychrometrics/Functions/saturationPressureLiquid.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/saturationPressureLiquid.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/saturationPressureLiquid.mo" 2022-03-10 09:57:41.244144537 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/saturationPressureLiquid.mo" 2022-03-10 09:58:01.548147110 +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 8.1.0/Utilities/Psychrometrics/Functions/sublimationPressureIce.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/sublimationPressureIce.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/sublimationPressureIce.mo" 2022-03-10 09:57:41.244144537 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/Functions/sublimationPressureIce.mo" 2022-03-10 09:58:01.536147108 +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 8.1.0/Utilities/Psychrometrics/TWetBul_TDryBulPhi.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/TWetBul_TDryBulPhi.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/TWetBul_TDryBulPhi.mo" 2022-03-10 09:57:41.244144537 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/TWetBul_TDryBulPhi.mo" 2022-03-10 09:58:01.464147099 +0000 @@ -32,15 +32,15 @@ annotation (Placement(transformation(extent={{100,-10},{120,10}}))); protected - Modelica.SIunits.Conversions.NonSIunits.Temperature_degC TDryBul_degC + Modelica.Units.NonSI.Temperature_degC TDryBul_degC "Dry bulb temperature in degree Celsius"; Real rh_per(min=0) "Relative humidity in percentage"; - Modelica.SIunits.MassFraction XiDryBul + + Modelica.Units.SI.MassFraction XiDryBul "Water vapor mass fraction at dry bulb state"; - Modelica.SIunits.MassFraction XiSat "Water vapor mass fraction at saturation"; - Modelica.SIunits.MassFraction XiSatRefIn + Modelica.Units.SI.MassFraction XiSat "Water vapor mass fraction at saturation"; + Modelica.Units.SI.MassFraction XiSatRefIn "Water vapor mass fraction at saturation, referenced to inlet mass flow rate"; - equation if approximateWetBulb then TDryBul_degC = TDryBul - 273.15; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/TWetBul_TDryBulXi.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/TWetBul_TDryBulXi.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/TWetBul_TDryBulXi.mo" 2022-03-10 09:57:41.244144537 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/TWetBul_TDryBulXi.mo" 2022-03-10 09:58:01.440147096 +0000 @@ -31,14 +31,14 @@ annotation (Placement(transformation(extent={{-120,-10},{-100,10}}))); protected - Modelica.SIunits.Conversions.NonSIunits.Temperature_degC TDryBul_degC + Modelica.Units.NonSI.Temperature_degC TDryBul_degC "Dry bulb temperature in degree Celsius"; Real rh_per(min=0) "Relative humidity in percentage"; - Modelica.SIunits.MassFraction XiSat(start=0.01, + Modelica.Units.SI.MassFraction XiSat(start=0.01, nominal=0.01) "Water vapor mass fraction at saturation"; - Modelica.SIunits.MassFraction XiSatRefIn + Modelica.Units.SI.MassFraction XiSatRefIn "Water vapor mass fraction at saturation, referenced to inlet mass flow rate"; parameter Integer iWat = sum({( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/X_pTphi.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/X_pTphi.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/X_pTphi.mo" 2022-03-10 09:57:41.244144537 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/X_pTphi.mo" 2022-03-10 09:58:01.404147091 +0000 @@ -16,7 +16,7 @@ "Steam mass fraction" annotation (Placement(transformation(extent={{100,-10},{120,10}}))); protected - Modelica.SIunits.AbsolutePressure pSat "Saturation pressure"; + Modelica.Units.SI.AbsolutePressure pSat "Saturation pressure"; parameter Integer i_w = sum({( if Modelica.Utilities.Strings.isEqual( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/X_pW.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/X_pW.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/X_pW.mo" 2022-03-10 09:57:41.244144537 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/X_pW.mo" 2022-03-10 09:58:01.396147090 +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 8.1.0/Utilities/Psychrometrics/hSat_pTSat.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/hSat_pTSat.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/hSat_pTSat.mo" 2022-03-10 09:57:41.244144537 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/hSat_pTSat.mo" 2022-03-10 09:58:01.384147089 +0000 @@ -31,7 +31,7 @@ constant Integer watIdx = 1 "Index of water"; constant Integer othIdx = 2 "Index of other species"; constant Real phiSat(min=0, max=1) = 1 "Saturation relative humidity"; - Modelica.SIunits.AbsolutePressure pSat + Modelica.Units.SI.AbsolutePressure pSat "Saturation pressure of water vapor in air at TSat"; Real XSat[2] "Mass fractions of water and air in moist air at saturation"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/pW_X.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/pW_X.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/pW_X.mo" 2022-03-10 09:57:41.244144537 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Psychrometrics/pW_X.mo" 2022-03-10 09:58:01.356147086 +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 8.1.0/Utilities/Time/CalendarTime.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Time/CalendarTime.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Time/CalendarTime.mo" 2022-03-10 09:57:41.244144537 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/Utilities/Time/CalendarTime.mo" 2022-03-10 09:58:01.324147082 +0000 @@ -10,10 +10,10 @@ parameter Boolean outputUnixTimeStamp = false "= true, to output the unix time stamp (using GMT reference)" annotation(Dialog(group="Unix time stamp")); - parameter Modelica.SIunits.Time timZon(displayUnit="h") = 0 + parameter Modelica.Units.SI.Time timZon(displayUnit="h") = 0 "The local time zone, for computing the unix time stamp only" annotation(Dialog(enable=outputUnixTimeStamp,group="Unix time stamp")); - parameter Modelica.SIunits.Time offset(displayUnit="h") = 0 + parameter Modelica.Units.SI.Time offset(displayUnit="h") = 0 "Offset that is added to 'time', may be used for computing time in different time zones" annotation(Dialog(tab="Advanced")); @@ -49,7 +49,7 @@ final constant Integer firstYear = 2010 "First year that is supported, i.e. the first year in timeStampsNewYear[:]"; final constant Integer lastYear = firstYear + size(timeStampsNewYear,1) - 1; - constant Modelica.SIunits.Time timeStampsNewYear[22] = { + constant Modelica.Units.SI.Time timeStampsNewYear[22] = { 1262304000.0, 1293840000.0, 1325376000.0, 1356998400.0, 1388534400.0, 1420070400.0, 1451606400.0, 1483228800.0, 1514764800.0, @@ -69,7 +69,7 @@ "List of leap years starting from firstYear (2010), up to and including 2030"; final constant Integer dayInMonth[12] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31} "Number of days in each month"; - parameter Modelica.SIunits.Time timOff(fixed=false) "Time offset"; + parameter Modelica.Units.SI.Time timOff(fixed=false) "Time offset"; // final parameters since the user may wrongly assume that this model shifts the // actual time of the simulation final constant Integer monthRef(min=1, max=12) = 1 "Month when time = 0" @@ -81,9 +81,9 @@ discrete Real epochLastMonth "Unix time stamp of the beginning of the current month"; - final parameter Modelica.SIunits.Time hourSampleStart(fixed=false) + final parameter Modelica.Units.SI.Time hourSampleStart(fixed=false) "Time when the sampling every hour starts"; - final parameter Modelica.SIunits.Time daySampleStart(fixed=false) + final parameter Modelica.Units.SI.Time daySampleStart(fixed=false) "Time when the sampling every day starts"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/openmodelica.metadata.json" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/openmodelica.metadata.json" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/openmodelica.metadata.json" 2022-03-10 09:57:41.244144537 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/openmodelica.metadata.json" 2022-03-10 09:59:03.364154938 +0000 @@ -1 +1 @@ -{"convertFromVersion":["7.0.0", "7.0.1"], "path":"Buildings", "sha":"8a5db0ce3a7c54803e0abc2c01b28f7c18e81b09", "support":"support", "uses":{"Modelica":"3.2.3"}, "version":"8.1.0", "zipfile":"https://github.com/lbl-srg/modelica-buildings/archive/8a5db0ce3a7c54803e0abc2c01b28f7c18e81b09.zip"} +{"convertFromVersion": ["7.0.0", "7.0.1"], "path": "Buildings", "sha": "8a5db0ce3a7c54803e0abc2c01b28f7c18e81b09", "support": "support", "uses": {"Modelica": "4.0.0"}, "version": "8.1.0", "zipfile": "https://github.com/lbl-srg/modelica-buildings/archive/8a5db0ce3a7c54803e0abc2c01b28f7c18e81b09.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 8.1.0/package.mo" "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/package.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 8.1.0/package.mo" 2022-03-10 09:57:41.244144537 +0000 +++ "converted-libraries/.openmodelica/libraries/Buildings 8.1.0/package.mo" 2022-03-10 09:58:06.164147695 +0000 @@ -9813,7 +9813,7 @@ version="8.1.0", versionDate="2021-06-08", dateModified="2021-12-09", -uses(Modelica(version="3.2.3")), +uses(Modelica(version= "4.0.0")), conversion( from(version={"7.0.0", "7.0.1"}, script="modelica://Buildings/Resources/Scripts/Dymola/ConvertBuildings_from_7_to_8.1.0.mos")),