This is a partial model for models that describe the bi-directional diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Airflow/Multizone/BaseClasses/powerLaw.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Airflow/Multizone/BaseClasses/powerLaw.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Airflow/Multizone/BaseClasses/powerLaw.mo" 2021-11-24 08:09:20.787367093 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Airflow/Multizone/BaseClasses/powerLaw.mo" 2021-11-24 08:10:56.339079964 +0000 @@ -1,13 +1,13 @@ within BuildingSystems.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/BuildingSystems 2.0.0-master/Airflow/Multizone/BaseClasses/powerLawFixedM.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Airflow/Multizone/BaseClasses/powerLawFixedM.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Airflow/Multizone/BaseClasses/powerLawFixedM.mo" 2021-11-24 08:09:20.787367093 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Airflow/Multizone/BaseClasses/powerLawFixedM.mo" 2021-11-24 08:10:56.331079989 +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/BuildingSystems 2.0.0-master/Airflow/Multizone/BaseClasses/windPressureLowRise.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Airflow/Multizone/BaseClasses/windPressureLowRise.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Airflow/Multizone/BaseClasses/windPressureLowRise.mo" 2021-11-24 08:09:20.787367093 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Airflow/Multizone/BaseClasses/windPressureLowRise.mo" 2021-11-24 08:10:56.323080012 +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/BuildingSystems 2.0.0-master/Airflow/Multizone/DoorDiscretizedOperable.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Airflow/Multizone/DoorDiscretizedOperable.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Airflow/Multizone/DoorDiscretizedOperable.mo" 2021-11-24 08:09:20.787367093 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Airflow/Multizone/DoorDiscretizedOperable.mo" 2021-11-24 08:10:56.307080061 +0000 @@ -3,7 +3,7 @@ "Door model using discretization along height coordinate" extends BuildingSystems.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/BuildingSystems 2.0.0-master/Airflow/Multizone/DoorOpen.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Airflow/Multizone/DoorOpen.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Airflow/Multizone/DoorOpen.mo" 2021-11-24 08:09:20.787367093 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Airflow/Multizone/DoorOpen.mo" 2021-11-24 08:10:56.295080096 +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/BuildingSystems 2.0.0-master/Airflow/Multizone/DoorOperable.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Airflow/Multizone/DoorOperable.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Airflow/Multizone/DoorOperable.mo" 2021-11-24 08:09:20.787367093 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Airflow/Multizone/DoorOperable.mo" 2021-11-24 08:10:56.283080133 +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 = BuildingSystems.Airflow.Multizone.BaseClasses.powerLawFixedM( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Airflow/Multizone/EffectiveAirLeakageArea.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Airflow/Multizone/EffectiveAirLeakageArea.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Airflow/Multizone/EffectiveAirLeakageArea.mo" 2021-11-24 08:09:20.787367093 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Airflow/Multizone/EffectiveAirLeakageArea.mo" 2021-11-24 08:10:56.247080240 +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/BuildingSystems 2.0.0-master/Airflow/Multizone/Examples/ClosedDoors.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Airflow/Multizone/Examples/ClosedDoors.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Airflow/Multizone/Examples/ClosedDoors.mo" 2021-11-24 08:09:20.787367093 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Airflow/Multizone/Examples/ClosedDoors.mo" 2021-11-24 08:10:56.203080373 +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/BuildingSystems 2.0.0-master/Airflow/Multizone/Examples/OneEffectiveAirLeakageArea.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Airflow/Multizone/Examples/OneEffectiveAirLeakageArea.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Airflow/Multizone/Examples/OneEffectiveAirLeakageArea.mo" 2021-11-24 08:09:20.787367093 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Airflow/Multizone/Examples/OneEffectiveAirLeakageArea.mo" 2021-11-24 08:10:56.179080445 +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/BuildingSystems 2.0.0-master/Airflow/Multizone/Examples/OneOpenDoor.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Airflow/Multizone/Examples/OneOpenDoor.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Airflow/Multizone/Examples/OneOpenDoor.mo" 2021-11-24 08:09:20.787367093 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Airflow/Multizone/Examples/OneOpenDoor.mo" 2021-11-24 08:10:56.163080493 +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/BuildingSystems 2.0.0-master/Airflow/Multizone/Examples/ZonalFlow.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Airflow/Multizone/Examples/ZonalFlow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Airflow/Multizone/Examples/ZonalFlow.mo" 2021-11-24 08:09:20.787367093 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Airflow/Multizone/Examples/ZonalFlow.mo" 2021-11-24 08:10:56.095080697 +0000 @@ -2,8 +2,8 @@ model ZonalFlow "Model with prescribed air exchange between two volumes" extends Modelica.Icons.Example; package Medium = BuildingSystems.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"; BuildingSystems.Fluid.MixingVolumes.MixingVolume rooA( V=volA, redeclare package Medium = Medium, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Airflow/Multizone/MediumColumn.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Airflow/Multizone/MediumColumn.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Airflow/Multizone/MediumColumn.mo" 2021-11-24 08:09:20.787367093 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Airflow/Multizone/MediumColumn.mo" 2021-11-24 08:10:56.079080745 +0000 @@ -7,7 +7,7 @@ annotation (choices( choice(redeclare package Medium = BuildingSystems.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 BuildingSystems.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/BuildingSystems 2.0.0-master/Airflow/Multizone/MediumColumnDynamic.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Airflow/Multizone/MediumColumnDynamic.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Airflow/Multizone/MediumColumnDynamic.mo" 2021-11-24 08:09:20.787367093 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Airflow/Multizone/MediumColumnDynamic.mo" 2021-11-24 08:10:56.031080889 +0000 @@ -8,7 +8,7 @@ annotation (choices( choice(redeclare package Medium = BuildingSystems.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/BuildingSystems 2.0.0-master/Airflow/Multizone/Orifice.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Airflow/Multizone/Orifice.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Airflow/Multizone/Orifice.mo" 2021-11-24 08:09:20.787367093 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Airflow/Multizone/Orifice.mo" 2021-11-24 08:10:56.015080937 +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/BuildingSystems 2.0.0-master/Airflow/Multizone/ZonalFlow_ACS.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Airflow/Multizone/ZonalFlow_ACS.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Airflow/Multizone/ZonalFlow_ACS.mo" 2021-11-24 08:09:20.787367093 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Airflow/Multizone/ZonalFlow_ACS.mo" 2021-11-24 08:10:55.919081225 +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/BuildingSystems 2.0.0-master/Applications/AirConditioningSystems/PhotovoltaicCoolingSystem.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Applications/AirConditioningSystems/PhotovoltaicCoolingSystem.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Applications/AirConditioningSystems/PhotovoltaicCoolingSystem.mo" 2021-11-24 08:09:20.787367093 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Applications/AirConditioningSystems/PhotovoltaicCoolingSystem.mo" 2021-11-24 08:10:55.895081298 +0000 @@ -3,9 +3,9 @@ "Photovoltaic cooling system" extends Modelica.Icons.Example; package Medium = BuildingSystems.Media.Water; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 0.5 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 0.5 "Nominal mass flow rate"; - parameter Modelica.SIunits.MassFlowRate m_flow = 0.5 + parameter Modelica.Units.SI.MassFlowRate m_flow = 0.5 "Mass flow rate in the cold water production and consumption loop"; BuildingSystems.Technologies.Photovoltaics.PVModules.PVModuleSimpleMPP pvField( redeclare BuildingSystems.Technologies.Photovoltaics.Data.PhotovoltaicModules.TSM230PC05 pvModuleData, @@ -199,10 +199,10 @@ Modelica.Blocks.Math.BooleanToReal booleanToReal1( realTrue=m_flow) annotation (Placement(transformation(extent={{24,-22},{16,-14}}))); - Modelica.SIunits.Energy EGrid( + Modelica.Units.SI.Energy EGrid( start=0.0) "Integrates the electricity taken from the grid"; - Modelica.SIunits.Energy EPVField( + Modelica.Units.SI.Energy EPVField( start=0.0) "Integrates the electricity generated by the PV field"; equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Applications/DistrictSimulation/BaseClasses.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Applications/DistrictSimulation/BaseClasses.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Applications/DistrictSimulation/BaseClasses.mo" 2021-11-24 08:09:20.787367093 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Applications/DistrictSimulation/BaseClasses.mo" 2021-11-24 08:10:55.759081706 +0000 @@ -8,10 +8,10 @@ parameter Modelica.Media.Interfaces.Types.Temperature T_start = 273.15 + 90.0 "Initial conditions of the supply side"; // Different Variables uses to facilitate results check - Modelica.SIunits.Heat Q_DHN_I "Energy loss in DHN part I"; - Modelica.SIunits.Heat Q_DHN_II "Energy loss in DHN part II"; - Modelica.SIunits.Heat Q_DHN_III "Energy loss in DHN part III"; - Modelica.SIunits.Heat Q_DHN "Total energy loss in DHN"; + Modelica.Units.SI.Heat Q_DHN_I "Energy loss in DHN part I"; + Modelica.Units.SI.Heat Q_DHN_II "Energy loss in DHN part II"; + Modelica.Units.SI.Heat Q_DHN_III "Energy loss in DHN part III"; + Modelica.Units.SI.Heat Q_DHN "Total energy loss in DHN"; //Boundary: Modelica.Thermal.HeatTransfer.Components.ThermalCollector thermalCollectorDHN(m=71) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Applications/DistrictSimulation/HCBC.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Applications/DistrictSimulation/HCBC.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Applications/DistrictSimulation/HCBC.mo" 2021-11-24 08:09:20.787367093 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Applications/DistrictSimulation/HCBC.mo" 2021-11-24 08:10:54.383085836 +0000 @@ -2,7 +2,7 @@ model HCBC "Model including buildings of the university campus Berlin-Charlottenburg (HCBC) without DHN" extends Modelica.Icons.Example; - Modelica.SIunits.Heat Q_district(displayUnit="kWh") + Modelica.Units.SI.Heat Q_district(displayUnit="kWh") "Heating load of all buildings"; model Building "Building model with four capacities used in conjunction with parameter maps for campus simulations" @@ -176,41 +176,41 @@ parameter String name = "" annotation (Dialog(group = "General information")); // Geometry related input parameters - parameter Modelica.SIunits.Length thickness = 1 + parameter Modelica.Units.SI.Length thickness = 1 annotation (Dialog(group = "Geometry related input")); parameter Integer nFloors = 1 annotation (Dialog(group = "Geometry related input")); - parameter Modelica.SIunits.Length heightBui = 1 + parameter Modelica.Units.SI.Length heightBui = 1 annotation (Dialog(group = "Geometry related input")); - parameter Modelica.SIunits.Volume VBui = 1 + parameter Modelica.Units.SI.Volume VBui = 1 annotation (Dialog(group = "Geometry related input")); - parameter Modelica.SIunits.Area ABuiGro = 1 + parameter Modelica.Units.SI.Area ABuiGro = 1 annotation (Dialog(group = "Geometry related input")); - parameter Modelica.SIunits.Area AWal1 = 1 + parameter Modelica.Units.SI.Area AWal1 = 1 annotation (Dialog(group = "Geometry related input")); - parameter Modelica.SIunits.Area AWal2 = 1 + parameter Modelica.Units.SI.Area AWal2 = 1 annotation (Dialog(group = "Geometry related input")); - parameter Modelica.SIunits.Area AWal3 = 1 + parameter Modelica.Units.SI.Area AWal3 = 1 annotation (Dialog(group = "Geometry related input")); - parameter Modelica.SIunits.Area AWal4 = 1 + parameter Modelica.Units.SI.Area AWal4 = 1 annotation (Dialog(group = "Geometry related input")); - parameter Modelica.SIunits.Conversions.NonSIunits.Angle_deg angleDegAziWin1 = 0 + parameter Modelica.Units.NonSI.Angle_deg angleDegAziWin1 = 0 annotation (Dialog(group = "Geometry related input")); - parameter Modelica.SIunits.Conversions.NonSIunits.Angle_deg angleDegAziWin2 = 0 + parameter Modelica.Units.NonSI.Angle_deg angleDegAziWin2 = 0 annotation (Dialog(group = "Geometry related input")); - parameter Modelica.SIunits.Conversions.NonSIunits.Angle_deg angleDegAziWin3 = 0 + parameter Modelica.Units.NonSI.Angle_deg angleDegAziWin3 = 0 annotation (Dialog(group = "Geometry related input")); - parameter Modelica.SIunits.Conversions.NonSIunits.Angle_deg angleDegAziWin4 = 0 + parameter Modelica.Units.NonSI.Angle_deg angleDegAziWin4 = 0 annotation (Dialog(group = "Geometry related input")); // Heat flow rate heating/cooling - parameter Modelica.SIunits.HeatFlowRate Q_flowHea = 100000 + parameter Modelica.Units.SI.HeatFlowRate Q_flowHea = 100000 annotation (Dialog(group = "Heat flow rate heating/cooling")); - parameter Modelica.SIunits.HeatFlowRate Q_flowCoo = -100000 + parameter Modelica.Units.SI.HeatFlowRate Q_flowCoo = -100000 annotation (Dialog(group = "Heat flow rate heating/cooling")); // Optimization input parameters - parameter Modelica.SIunits.Temp_K TSetHea = 273.15+20 + parameter Modelica.Units.SI.Temperature TSetHea = 273.15+20 annotation (Dialog(group = "Optimization parameters")); - parameter Modelica.SIunits.Temp_K TSetCoo = 273.15+24 + parameter Modelica.Units.SI.Temperature TSetCoo = 273.15+24 annotation (Dialog(group = "Optimization parameters")); parameter BuildingSystems.Types.AirchangeRate airchange = 0.5 annotation (Dialog(group = "Optimization parameters")); @@ -220,68 +220,68 @@ annotation (Dialog(group = "Optimization parameters")); parameter BuildingSystems.Types.VolumeHeatCapacity VHCBas = 1000000 annotation (Dialog(group = "Optimization parameters")); - parameter Modelica.SIunits.CoefficientOfHeatTransfer envelopeU = 1.2 + parameter Modelica.Units.SI.CoefficientOfHeatTransfer envelopeU = 1.2 annotation (Dialog(group = "Optimization parameters")); - parameter Modelica.SIunits.CoefficientOfHeatTransfer innerU = 1.2 + parameter Modelica.Units.SI.CoefficientOfHeatTransfer innerU = 1.2 annotation (Dialog(group = "Optimization parameters")); - parameter Modelica.SIunits.CoefficientOfHeatTransfer baseU = 1.2 + parameter Modelica.Units.SI.CoefficientOfHeatTransfer baseU = 1.2 annotation (Dialog(group = "Optimization parameters")); - parameter Modelica.SIunits.CoefficientOfHeatTransfer windowU = 3.0 + parameter Modelica.Units.SI.CoefficientOfHeatTransfer windowU = 3.0 annotation (Dialog(group = "Optimization parameters")); parameter Real ratio = 0.3 annotation (Dialog(group = "Optimization parameters")); // Derived from previous parameters - parameter Modelica.SIunits.SpecificHeatCapacity cOut = sqrt(VHCOut) + parameter Modelica.Units.SI.SpecificHeatCapacity cOut = sqrt(VHCOut) annotation (Dialog(group = "Derived model parametrization")); - parameter Modelica.SIunits.Density rhoOut = sqrt(VHCOut) + parameter Modelica.Units.SI.Density rhoOut = sqrt(VHCOut) annotation (Dialog(group = "Derived model parametrization")); - parameter Modelica.SIunits.SpecificHeatCapacity cInn = sqrt(VHCInn) + parameter Modelica.Units.SI.SpecificHeatCapacity cInn = sqrt(VHCInn) annotation (Dialog(group = "Derived model parametrization")); - parameter Modelica.SIunits.Density rhoInn = sqrt(VHCInn) + parameter Modelica.Units.SI.Density rhoInn = sqrt(VHCInn) annotation (Dialog(group = "Derived model parametrization")); - parameter Modelica.SIunits.SpecificHeatCapacity cBas = sqrt(VHCBas) + parameter Modelica.Units.SI.SpecificHeatCapacity cBas = sqrt(VHCBas) annotation (Dialog(group = "Derived model parametrization")); - parameter Modelica.SIunits.Density rhoBas = sqrt(VHCBas) + parameter Modelica.Units.SI.Density rhoBas = sqrt(VHCBas) annotation (Dialog(group = "Derived model parametrization")); - parameter Modelica.SIunits.ThermalConductivity lambdaOut = envelopeU * thickness + parameter Modelica.Units.SI.ThermalConductivity lambdaOut = envelopeU * thickness annotation (Dialog(group = "Derived model parametrization")); - parameter Modelica.SIunits.ThermalConductivity lambdaInn = innerU * thickness + parameter Modelica.Units.SI.ThermalConductivity lambdaInn = innerU * thickness annotation (Dialog(group = "Derived model parametrization")); - parameter Modelica.SIunits.ThermalConductivity lambdaBas = baseU * thickness + parameter Modelica.Units.SI.ThermalConductivity lambdaBas = baseU * thickness annotation (Dialog(group = "Derived model parametrization")); - parameter Modelica.SIunits.Length heightWin1 = sqrt(ratio) * heightBui + parameter Modelica.Units.SI.Length heightWin1 = sqrt(ratio) * heightBui annotation (Dialog(group = "Derived model parametrization")); - parameter Modelica.SIunits.Length widthWin1 = sqrt(ratio) * AWal1 / heightBui + parameter Modelica.Units.SI.Length widthWin1 = sqrt(ratio) * AWal1 / heightBui annotation (Dialog(group = "Derived model parametrization")); - parameter Modelica.SIunits.Length heightWin2 = sqrt(ratio) * heightBui + parameter Modelica.Units.SI.Length heightWin2 = sqrt(ratio) * heightBui annotation (Dialog(group = "Derived model parametrization")); - parameter Modelica.SIunits.Length widthWin2 = sqrt(ratio) * AWal2 / heightBui + parameter Modelica.Units.SI.Length widthWin2 = sqrt(ratio) * AWal2 / heightBui annotation (Dialog(group = "Derived model parametrization")); - parameter Modelica.SIunits.Length heightWin3 = sqrt(ratio) * heightBui + parameter Modelica.Units.SI.Length heightWin3 = sqrt(ratio) * heightBui annotation (Dialog(group = "Derived model parametrization")); - parameter Modelica.SIunits.Length widthWin3 = sqrt(ratio) * AWal3 / heightBui + parameter Modelica.Units.SI.Length widthWin3 = sqrt(ratio) * AWal3 / heightBui annotation (Dialog(group = "Derived model parametrization")); - parameter Modelica.SIunits.Length heightWin4 = sqrt(ratio) * heightBui + parameter Modelica.Units.SI.Length heightWin4 = sqrt(ratio) * heightBui annotation (Dialog(group = "Derived model parametrization")); - parameter Modelica.SIunits.Length widthWin4 = sqrt(ratio) * AWal4 / heightBui + parameter Modelica.Units.SI.Length widthWin4 = sqrt(ratio) * AWal4 / heightBui annotation (Dialog(group = "Derived model parametrization")); - parameter Modelica.SIunits.Area AHul = ratio * (AWal1 + AWal2 + AWal3 + AWal4) + ABuiGro + parameter Modelica.Units.SI.Area AHul = ratio * (AWal1 + AWal2 + AWal3 + AWal4) + ABuiGro annotation (Dialog(group = "Derived model parametrization")); - parameter Modelica.SIunits.Length heightOutCap = sqrt(AHul) + parameter Modelica.Units.SI.Length heightOutCap = sqrt(AHul) annotation (Dialog(group = "Derived model parametrization")); - parameter Modelica.SIunits.Length widthOutCap = sqrt(AHul) + parameter Modelica.Units.SI.Length widthOutCap = sqrt(AHul) annotation (Dialog(group = "Derived model parametrization")); - parameter Modelica.SIunits.Length heightInnCap = lengthBasCap * sqrt(nFloors) + parameter Modelica.Units.SI.Length heightInnCap = lengthBasCap * sqrt(nFloors) annotation (Dialog(group = "Derived model parametrization")); - parameter Modelica.SIunits.Length widthInnCap = widthBasCap * sqrt(nFloors) + parameter Modelica.Units.SI.Length widthInnCap = widthBasCap * sqrt(nFloors) annotation (Dialog(group = "Derived model parametrization")); - parameter Modelica.SIunits.Length lengthBasCap = sqrt(ABuiGro) + parameter Modelica.Units.SI.Length lengthBasCap = sqrt(ABuiGro) annotation (Dialog(group = "Derived model parametrization")); - parameter Modelica.SIunits.Length widthBasCap = sqrt(ABuiGro) + parameter Modelica.Units.SI.Length widthBasCap = sqrt(ABuiGro) annotation (Dialog(group = "Derived model parametrization")); - parameter Modelica.SIunits.Volume VZon = VBui + parameter Modelica.Units.SI.Volume VZon = VBui annotation (Dialog(group = "Derived model parametrization")); - parameter Modelica.SIunits.Length heightZon = heightBui + parameter Modelica.Units.SI.Length heightZon = heightBui annotation (Dialog(group = "Derived model parametrization")); end ParameterMap; @@ -1722,8 +1722,8 @@ Modelica.Blocks.Sources.Constant set_airchange37( k=building44.parameterMap.airchange) annotation (Placement(transformation(extent={{94,-314},{86,-306}}))); - Modelica.SIunits.HeatFlowRate Q_flowHea; - Modelica.SIunits.HeatFlowRate Q_flowCoo; + Modelica.Units.SI.HeatFlowRate Q_flowHea; + Modelica.Units.SI.HeatFlowRate Q_flowCoo; Modelica.Thermal.HeatTransfer.Sources.FixedTemperature groundBuilding45(T=283.15) annotation (Placement(transformation(extent={{-10,-320},{-2,-312}}))); Modelica.Thermal.HeatTransfer.Sources.FixedTemperature groundBuilding44(T=283.15) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Applications/DistrictSimulation/HCBC_DHN.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Applications/DistrictSimulation/HCBC_DHN.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Applications/DistrictSimulation/HCBC_DHN.mo" 2021-11-24 08:09:20.787367093 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Applications/DistrictSimulation/HCBC_DHN.mo" 2021-11-24 08:10:53.699087890 +0000 @@ -117,9 +117,9 @@ st5(m_flow_nominal=st5.m_flow_nominalHeating,Q_nominal=parameterMap5.Q_flowHea), st14(m_flow_nominal=st14.m_flow_nominalHeating,Q_nominal=parameterMap14.Q_flowHea), st8(m_flow_nominal=st8.m_flow_nominalHeating,Q_nominal=parameterMap8.Q_flowHea)); - Modelica.SIunits.Heat Q_buildings(displayUnit="kWh") + Modelica.Units.SI.Heat Q_buildings(displayUnit="kWh") "Heat extracted from the DHN and delivered to the buildings"; - Modelica.SIunits.Heat Q_buildings_effective(displayUnit="kWh") + Modelica.Units.SI.Heat Q_buildings_effective(displayUnit="kWh") "Effective heat that warm up the building (Q_buildings*efficiency)"; BuildingSystems.Technologies.DistrictHeatingNetworks.EnergyProductionUnits.Central central( redeclare package Medium = Medium, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Applications/HeatingSystems/HeatPumpHeatingSystem.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Applications/HeatingSystems/HeatPumpHeatingSystem.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Applications/HeatingSystems/HeatPumpHeatingSystem.mo" 2021-11-24 08:09:20.787367093 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Applications/HeatingSystems/HeatPumpHeatingSystem.mo" 2021-11-24 08:10:53.655088022 +0000 @@ -4,7 +4,7 @@ extends Modelica.Icons.Example; package Medium1 = BuildingSystems.Media.Water; package Medium2 = BuildingSystems.Media.Air; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal= 0.1; + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal= 0.1; BuildingSystems.Buildings.Ambience ambience( nSurfaces=building.nSurfacesAmbience, redeclare block WeatherData = BuildingSystems.Climate.WeatherDataMeteonorm.Germany_Berlin_Meteonorm_ASCII) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Applications/HeatingSystems/SolarHeatingSystem.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Applications/HeatingSystems/SolarHeatingSystem.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Applications/HeatingSystems/SolarHeatingSystem.mo" 2021-11-24 08:09:20.787367093 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Applications/HeatingSystems/SolarHeatingSystem.mo" 2021-11-24 08:10:53.627088106 +0000 @@ -9,7 +9,7 @@ property_T=293.15, T_max = 273.15+200.0); - parameter Modelica.SIunits.MassFlowRate m_flow_nominal= 0.1; + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal= 0.1; BuildingSystems.Buildings.Ambience ambience( nSurfaces=building.nSurfacesAmbience, redeclare block WeatherData = BuildingSystems.Climate.WeatherDataMeteonorm.Germany_Berlin_Meteonorm_ASCII) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Applications/HeatingSystems/WaterHeatingSystem.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Applications/HeatingSystems/WaterHeatingSystem.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Applications/HeatingSystems/WaterHeatingSystem.mo" 2021-11-24 08:09:20.787367093 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Applications/HeatingSystems/WaterHeatingSystem.mo" 2021-11-24 08:10:53.579088250 +0000 @@ -3,7 +3,7 @@ "Water heating system" extends Modelica.Icons.Example; package Medium = BuildingSystems.Media.Water; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal= 0.1; + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal= 0.1; BuildingSystems.Buildings.Ambience ambience( nSurfaces=building.nSurfacesAmbience, redeclare block WeatherData = BuildingSystems.Climate.WeatherDataMeteonorm.Germany_Berlin_Meteonorm_ASCII) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Applications/SolarThermalSystems/SolarThermalSystem1.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Applications/SolarThermalSystems/SolarThermalSystem1.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Applications/SolarThermalSystems/SolarThermalSystem1.mo" 2021-11-24 08:09:20.787367093 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Applications/SolarThermalSystems/SolarThermalSystem1.mo" 2021-11-24 08:10:53.487088526 +0000 @@ -7,7 +7,7 @@ X_a=0.40, property_T=293.15); - parameter Modelica.SIunits.MassFlowRate m_flow_nominal= 0.01; + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal= 0.01; BuildingSystems.Climate.WeatherData.WeatherDataReader weatherData( redeclare block WeatherData = BuildingSystems.Climate.WeatherDataMeteonorm.Egypt_ElGouna_Meteonorm_ASCII) "time IrrDir IrrDif TAirAmb" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Applications/SolarThermalSystems/SolarThermalSystem2.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Applications/SolarThermalSystems/SolarThermalSystem2.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Applications/SolarThermalSystems/SolarThermalSystem2.mo" 2021-11-24 08:09:20.787367093 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Applications/SolarThermalSystems/SolarThermalSystem2.mo" 2021-11-24 08:10:53.459088610 +0000 @@ -7,7 +7,7 @@ X_a=0.40, property_T=293.15); - parameter Modelica.SIunits.MassFlowRate m_flow_nominal= 0.01; + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal= 0.01; BuildingSystems.Climate.WeatherData.WeatherDataReader weatherData( redeclare block WeatherData = BuildingSystems.Climate.WeatherDataMeteonorm.Egypt_ElGouna_Meteonorm_ASCII) "time IrrDir IrrDif TAirAmb" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/SkyTemperature/BlackBody.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/SkyTemperature/BlackBody.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/SkyTemperature/BlackBody.mo" 2021-11-24 08:09:20.791367081 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/SkyTemperature/BlackBody.mo" 2021-11-24 08:10:52.339091973 +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 == BuildingSystems.BoundaryConditions.Types.SkyTemperatureCalculation.TemperaturesAndSkyCover then diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/SolarGeometry/BaseClasses/Examples/SolarAzimuth.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/SolarGeometry/BaseClasses/Examples/SolarAzimuth.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/SolarGeometry/BaseClasses/Examples/SolarAzimuth.mo" 2021-11-24 08:09:20.791367081 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/SolarGeometry/BaseClasses/Examples/SolarAzimuth.mo" 2021-11-24 08:10:52.231092297 +0000 @@ -1,7 +1,7 @@ within BuildingSystems.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"; BuildingSystems.BoundaryConditions.SolarGeometry.BaseClasses.SolarHourAngle solHouAng "Solar hour angle" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/SolarGeometry/BaseClasses/Examples/WallSolarAzimuth.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/SolarGeometry/BaseClasses/Examples/WallSolarAzimuth.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/SolarGeometry/BaseClasses/Examples/WallSolarAzimuth.mo" 2021-11-24 08:09:20.791367081 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/SolarGeometry/BaseClasses/Examples/WallSolarAzimuth.mo" 2021-11-24 08:10:52.187092429 +0000 @@ -17,7 +17,7 @@ BuildingSystems.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/BuildingSystems 2.0.0-master/BoundaryConditions/SolarGeometry/BaseClasses/IncidenceAngle.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/SolarGeometry/BaseClasses/IncidenceAngle.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/SolarGeometry/BaseClasses/IncidenceAngle.mo" 2021-11-24 08:09:20.791367081 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/SolarGeometry/BaseClasses/IncidenceAngle.mo" 2021-11-24 08:10:52.167092489 +0000 @@ -1,10 +1,10 @@ within BuildingSystems.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/BuildingSystems 2.0.0-master/BoundaryConditions/SolarGeometry/BaseClasses/SolarAzimuth.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/SolarGeometry/BaseClasses/SolarAzimuth.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/SolarGeometry/BaseClasses/SolarAzimuth.mo" 2021-11-24 08:09:20.791367081 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/SolarGeometry/BaseClasses/SolarAzimuth.mo" 2021-11-24 08:10:52.159092513 +0000 @@ -1,7 +1,7 @@ within BuildingSystems.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/BuildingSystems 2.0.0-master/BoundaryConditions/SolarGeometry/BaseClasses/WallSolarAzimuth.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/SolarGeometry/BaseClasses/WallSolarAzimuth.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/SolarGeometry/BaseClasses/WallSolarAzimuth.mo" 2021-11-24 08:09:20.791367081 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/SolarGeometry/BaseClasses/WallSolarAzimuth.mo" 2021-11-24 08:10:52.143092561 +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/BuildingSystems 2.0.0-master/BoundaryConditions/SolarGeometry/BaseClasses/ZenithAngle.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/SolarGeometry/BaseClasses/ZenithAngle.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/SolarGeometry/BaseClasses/ZenithAngle.mo" 2021-11-24 08:09:20.791367081 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/SolarGeometry/BaseClasses/ZenithAngle.mo" 2021-11-24 08:10:52.139092573 +0000 @@ -1,7 +1,7 @@ within BuildingSystems.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/BuildingSystems 2.0.0-master/BoundaryConditions/SolarGeometry/IncidenceAngle.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/SolarGeometry/IncidenceAngle.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/SolarGeometry/IncidenceAngle.mo" 2021-11-24 08:09:20.791367081 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/SolarGeometry/IncidenceAngle.mo" 2021-11-24 08:10:52.099092693 +0000 @@ -1,9 +1,9 @@ within BuildingSystems.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/BuildingSystems 2.0.0-master/BoundaryConditions/SolarGeometry/ZenithAngle.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/SolarGeometry/ZenithAngle.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/SolarGeometry/ZenithAngle.mo" 2021-11-24 08:09:20.791367081 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/SolarGeometry/ZenithAngle.mo" 2021-11-24 08:10:52.087092729 +0000 @@ -1,7 +1,7 @@ within BuildingSystems.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/BuildingSystems 2.0.0-master/BoundaryConditions/SolarIrradiation/BaseClasses/DiffuseIsotropic.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/SolarIrradiation/BaseClasses/DiffuseIsotropic.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/SolarIrradiation/BaseClasses/DiffuseIsotropic.mo" 2021-11-24 08:09:20.791367081 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/SolarIrradiation/BaseClasses/DiffuseIsotropic.mo" 2021-11-24 08:10:52.015092945 +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/BuildingSystems 2.0.0-master/BoundaryConditions/SolarIrradiation/BaseClasses/DiffusePerez.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/SolarIrradiation/BaseClasses/DiffusePerez.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/SolarIrradiation/BaseClasses/DiffusePerez.mo" 2021-11-24 08:09:20.791367081 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/SolarIrradiation/BaseClasses/DiffusePerez.mo" 2021-11-24 08:10:52.003092982 +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/BuildingSystems 2.0.0-master/BoundaryConditions/SolarIrradiation/BaseClasses/PartialSolarIrradiation.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/SolarIrradiation/BaseClasses/PartialSolarIrradiation.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/SolarIrradiation/BaseClasses/PartialSolarIrradiation.mo" 2021-11-24 08:09:20.791367081 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/SolarIrradiation/BaseClasses/PartialSolarIrradiation.mo" 2021-11-24 08:10:51.931093198 +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/BuildingSystems 2.0.0-master/BoundaryConditions/SolarIrradiation/BaseClasses/SkyClearness.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/SolarIrradiation/BaseClasses/SkyClearness.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/SolarIrradiation/BaseClasses/SkyClearness.mo" 2021-11-24 08:09:20.791367081 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/SolarIrradiation/BaseClasses/SkyClearness.mo" 2021-11-24 08:10:51.915093245 +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/BuildingSystems 2.0.0-master/BoundaryConditions/SolarIrradiation/DiffusePerez.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/SolarIrradiation/DiffusePerez.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/SolarIrradiation/DiffusePerez.mo" 2021-11-24 08:09:20.791367081 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/SolarIrradiation/DiffusePerez.mo" 2021-11-24 08:10:51.891093318 +0000 @@ -5,8 +5,8 @@ BuildingSystems.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/BuildingSystems 2.0.0-master/BoundaryConditions/SolarIrradiation/DirectTiltedSurface.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/SolarIrradiation/DirectTiltedSurface.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/SolarIrradiation/DirectTiltedSurface.mo" 2021-11-24 08:09:20.791367081 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/SolarIrradiation/DirectTiltedSurface.mo" 2021-11-24 08:10:51.863093402 +0000 @@ -3,8 +3,8 @@ extends BuildingSystems.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/BuildingSystems 2.0.0-master/BoundaryConditions/SolarIrradiation/Examples/DiffusePerez.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/SolarIrradiation/Examples/DiffusePerez.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/SolarIrradiation/Examples/DiffusePerez.mo" 2021-11-24 08:09:20.791367081 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/SolarIrradiation/Examples/DiffusePerez.mo" 2021-11-24 08:10:51.827093510 +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"; BuildingSystems.BoundaryConditions.WeatherData.ReaderTMY3 weaDat(filNam= Modelica.Utilities.Files.loadResource("modelica://BuildingSystems/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/BuildingSystems 2.0.0-master/BoundaryConditions/SolarIrradiation/Examples/DirectTiltedSurface.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/SolarIrradiation/Examples/DirectTiltedSurface.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/SolarIrradiation/Examples/DirectTiltedSurface.mo" 2021-11-24 08:09:20.791367081 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/SolarIrradiation/Examples/DirectTiltedSurface.mo" 2021-11-24 08:10:51.783093642 +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"; BuildingSystems.BoundaryConditions.WeatherData.ReaderTMY3 weaDat(filNam= Modelica.Utilities.Files.loadResource("modelica://BuildingSystems/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/BuildingSystems 2.0.0-master/BoundaryConditions/Validation/BESTEST/WD100.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/Validation/BESTEST/WD100.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/Validation/BESTEST/WD100.mo" 2021-11-24 08:09:20.791367081 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/Validation/BESTEST/WD100.mo" 2021-11-24 08:10:51.747093750 +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=BuildingSystems.BoundaryConditions.Types.DataSource.File, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/Validation/IsotropicAndPerezDiffuseRadiation.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/Validation/IsotropicAndPerezDiffuseRadiation.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/Validation/IsotropicAndPerezDiffuseRadiation.mo" 2021-11-24 08:09:20.791367081 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/Validation/IsotropicAndPerezDiffuseRadiation.mo" 2021-11-24 08:10:51.683093942 +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/BuildingSystems 2.0.0-master/BoundaryConditions/WeatherData/BaseClasses/CheckBlackBodySkyTemperature.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/WeatherData/BaseClasses/CheckBlackBodySkyTemperature.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/WeatherData/BaseClasses/CheckBlackBodySkyTemperature.mo" 2021-11-24 08:09:20.791367081 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/WeatherData/BaseClasses/CheckBlackBodySkyTemperature.mo" 2021-11-24 08:10:51.643094062 +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/BuildingSystems 2.0.0-master/BoundaryConditions/WeatherData/BaseClasses/CheckDewPointTemperature.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/WeatherData/BaseClasses/CheckDewPointTemperature.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/WeatherData/BaseClasses/CheckDewPointTemperature.mo" 2021-11-24 08:09:20.791367081 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/WeatherData/BaseClasses/CheckDewPointTemperature.mo" 2021-11-24 08:10:51.627094110 +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/BuildingSystems 2.0.0-master/BoundaryConditions/WeatherData/BaseClasses/CheckDryBulbTemperature.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/WeatherData/BaseClasses/CheckDryBulbTemperature.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/WeatherData/BaseClasses/CheckDryBulbTemperature.mo" 2021-11-24 08:09:20.791367081 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/WeatherData/BaseClasses/CheckDryBulbTemperature.mo" 2021-11-24 08:10:51.615094146 +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/BuildingSystems 2.0.0-master/BoundaryConditions/WeatherData/BaseClasses/CheckPressure.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/WeatherData/BaseClasses/CheckPressure.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/WeatherData/BaseClasses/CheckPressure.mo" 2021-11-24 08:09:20.791367081 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/WeatherData/BaseClasses/CheckPressure.mo" 2021-11-24 08:10:51.599094194 +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/BuildingSystems 2.0.0-master/BoundaryConditions/WeatherData/BaseClasses/ConvertTime.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/WeatherData/BaseClasses/ConvertTime.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/WeatherData/BaseClasses/ConvertTime.mo" 2021-11-24 08:09:20.791367081 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/WeatherData/BaseClasses/ConvertTime.mo" 2021-11-24 08:10:51.587094231 +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/BuildingSystems 2.0.0-master/BoundaryConditions/WeatherData/BaseClasses/Examples/GetHeaderElement.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/WeatherData/BaseClasses/Examples/GetHeaderElement.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/WeatherData/BaseClasses/Examples/GetHeaderElement.mo" 2021-11-24 08:09:20.791367081 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/WeatherData/BaseClasses/Examples/GetHeaderElement.mo" 2021-11-24 08:10:51.483094542 +0000 @@ -1,11 +1,11 @@ within BuildingSystems.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://BuildingSystems/Resources/weatherdata/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.mos") diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/WeatherData/BaseClasses/Examples/GetTimeSpanTMY3.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/WeatherData/BaseClasses/Examples/GetTimeSpanTMY3.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/WeatherData/BaseClasses/Examples/GetTimeSpanTMY3.mo" 2021-11-24 08:09:20.791367081 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/WeatherData/BaseClasses/Examples/GetTimeSpanTMY3.mo" 2021-11-24 08:10:51.475094567 +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 = BuildingSystems.BoundaryConditions.WeatherData.BaseClasses.getTimeSpanTMY3( filNam, tabNam); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/WeatherData/BaseClasses/Examples/GetTimeSpanTMY3LongHeader.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/WeatherData/BaseClasses/Examples/GetTimeSpanTMY3LongHeader.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/WeatherData/BaseClasses/Examples/GetTimeSpanTMY3LongHeader.mo" 2021-11-24 08:09:20.791367081 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/WeatherData/BaseClasses/Examples/GetTimeSpanTMY3LongHeader.mo" 2021-11-24 08:10:51.467094591 +0000 @@ -7,7 +7,7 @@ "modelica://BuildingSystems/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= BuildingSystems.BoundaryConditions.WeatherData.BaseClasses.getTimeSpanTMY3(filNam, "tab1") "Start time, end time of weather data"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/WeatherData/BaseClasses/LocalCivilTime.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/WeatherData/BaseClasses/LocalCivilTime.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/WeatherData/BaseClasses/LocalCivilTime.mo" 2021-11-24 08:09:20.795367068 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/WeatherData/BaseClasses/LocalCivilTime.mo" 2021-11-24 08:10:51.399094795 +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/BuildingSystems 2.0.0-master/BoundaryConditions/WeatherData/BaseClasses/SourceSelectorRadiation.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/WeatherData/BaseClasses/SourceSelectorRadiation.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/WeatherData/BaseClasses/SourceSelectorRadiation.mo" 2021-11-24 08:09:20.795367068 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/WeatherData/BaseClasses/SourceSelectorRadiation.mo" 2021-11-24 08:10:51.327095011 +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/BuildingSystems 2.0.0-master/BoundaryConditions/WeatherData/BaseClasses/getLatitudeTMY3.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/WeatherData/BaseClasses/getLatitudeTMY3.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/WeatherData/BaseClasses/getLatitudeTMY3.mo" 2021-11-24 08:09:20.795367068 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/WeatherData/BaseClasses/getLatitudeTMY3.mo" 2021-11-24 08:10:51.299095095 +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/BuildingSystems 2.0.0-master/BoundaryConditions/WeatherData/BaseClasses/getLongitudeTMY3.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/WeatherData/BaseClasses/getLongitudeTMY3.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/WeatherData/BaseClasses/getLongitudeTMY3.mo" 2021-11-24 08:09:20.795367068 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/WeatherData/BaseClasses/getLongitudeTMY3.mo" 2021-11-24 08:10:51.291095119 +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/BuildingSystems 2.0.0-master/BoundaryConditions/WeatherData/BaseClasses/getTimeSpanTMY3.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/WeatherData/BaseClasses/getTimeSpanTMY3.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/WeatherData/BaseClasses/getTimeSpanTMY3.mo" 2021-11-24 08:09:20.795367068 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/WeatherData/BaseClasses/getTimeSpanTMY3.mo" 2021-11-24 08:10:51.287095131 +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/BuildingSystems 2.0.0-master/BoundaryConditions/WeatherData/BaseClasses/getTimeZoneTMY3.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/WeatherData/BaseClasses/getTimeZoneTMY3.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/WeatherData/BaseClasses/getTimeZoneTMY3.mo" 2021-11-24 08:09:20.795367068 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/WeatherData/BaseClasses/getTimeZoneTMY3.mo" 2021-11-24 08:10:51.279095155 +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/BuildingSystems 2.0.0-master/BoundaryConditions/WeatherData/ReaderTMY3.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/WeatherData/ReaderTMY3.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/WeatherData/ReaderTMY3.mo" 2021-11-24 08:09:20.795367068 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/WeatherData/ReaderTMY3.mo" 2021-11-24 08:10:51.255095227 +0000 @@ -18,7 +18,7 @@ parameter BuildingSystems.BoundaryConditions.Types.DataSource pAtmSou=BuildingSystems.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 BuildingSystems.BoundaryConditions.Types.DataSource TDryBulSou=BuildingSystems.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 BuildingSystems.BoundaryConditions.Types.DataSource TDewPoiSou=BuildingSystems.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 BuildingSystems.BoundaryConditions.Types.DataSource TBlaSkySou=BuildingSystems.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 BuildingSystems.BoundaryConditions.Types.DataSource winSpeSou=BuildingSystems.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 BuildingSystems.BoundaryConditions.Types.DataSource winDirSou=BuildingSystems.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 BuildingSystems.BoundaryConditions.Types.DataSource HInfHorSou=BuildingSystems.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")= BuildingSystems.BoundaryConditions.WeatherData.BaseClasses.getLongitudeTMY3( filNam) "Longitude"; - final parameter Modelica.SIunits.Angle lat(displayUnit="deg")= + final parameter Modelica.Units.SI.Angle lat(displayUnit="deg")= BuildingSystems.BoundaryConditions.WeatherData.BaseClasses.getLatitudeTMY3( filNam) "Latitude"; - final parameter Modelica.SIunits.Time timZon(displayUnit="h")= + final parameter Modelica.Units.SI.Time timZon(displayUnit="h")= BuildingSystems.BoundaryConditions.WeatherData.BaseClasses.getTimeZoneTMY3(filNam) "Time zone"; protected - final parameter Modelica.SIunits.Time[2] timeSpan= + final parameter Modelica.Units.SI.Time[2] timeSpan= BuildingSystems.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/BuildingSystems 2.0.0-master/BoundaryConditions/WeatherData/Validation/ReaderTMY3HDirNor.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/WeatherData/Validation/ReaderTMY3HDirNor.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/WeatherData/Validation/ReaderTMY3HDirNor.mo" 2021-11-24 08:09:20.795367068 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/BoundaryConditions/WeatherData/Validation/ReaderTMY3HDirNor.mo" 2021-11-24 08:10:51.067095791 +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/BuildingSystems 2.0.0-master/Buildings/Airvolumes/AirElements/AirElementHygroThermal.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Airvolumes/AirElements/AirElementHygroThermal.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Airvolumes/AirElements/AirElementHygroThermal.mo" 2021-11-24 08:09:20.795367068 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Airvolumes/AirElements/AirElementHygroThermal.mo" 2021-11-24 08:10:51.031095900 +0000 @@ -4,25 +4,25 @@ extends BuildingSystems.Buildings.BaseClasses.AirElementGeneral; ///////////// CONSTANT /////////////////////// ///////////// PARAMETER ////////////////////// - parameter Modelica.SIunits.MassFraction x_start=0.005 + parameter Modelica.Units.SI.MassFraction x_start=0.005 "Start air moisture" annotation (Dialog(tab="Initialization")); - parameter Modelica.SIunits.Mass mH2OLiq_start = 0.0 + parameter Modelica.Units.SI.Mass mH2OLiq_start = 0.0 "Start liquid water mass"; // ///////////////// SOURCES /////////////////////// // Source, Heatsource, moisture source - parameter Modelica.SIunits.MassFlowRate moistureSourcesMflow = 0; - parameter Modelica.SIunits.SpecificEnthalpy moistureSource_h = cAir * T_start; + parameter Modelica.Units.SI.MassFlowRate moistureSourcesMflow = 0; + parameter Modelica.Units.SI.SpecificEnthalpy moistureSource_h = cAir * T_start; /////////////////////////////////////////////////////// ///////////// VARIABLES ////////////////////// - Modelica.SIunits.Mass mAir(start = dx*dy*dz * rho_nominal) + Modelica.Units.SI.Mass mAir(start = dx*dy*dz * rho_nominal) "Mass of dry air"; - Modelica.SIunits.Mass mH2OAir(start = x_start * dx*dy*dz * rho_nominal, fixed = true) + Modelica.Units.SI.Mass mH2OAir(start = x_start * dx*dy*dz * rho_nominal, fixed = true) "Mass of water vapor in the air"; - Modelica.SIunits.Mass mH2OLiq(start = mH2OLiq_start, fixed = true) + Modelica.Units.SI.Mass mH2OLiq(start = mH2OLiq_start, fixed = true) "Mass of liquid water"; - Modelica.SIunits.InternalEnergy U=U_start + Modelica.Units.SI.InternalEnergy U=U_start "Internal energy of the air volume"; ///*****************************************************************/// equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Airvolumes/AirElements/AirElementThermal.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Airvolumes/AirElements/AirElementThermal.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Airvolumes/AirElements/AirElementThermal.mo" 2021-11-24 08:09:20.795367068 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Airvolumes/AirElements/AirElementThermal.mo" 2021-11-24 08:10:51.019095935 +0000 @@ -6,13 +6,13 @@ ///////////// PARAMETER ///////////////////// ///////////// VARIABLES /////////////////// - Modelica.SIunits.Mass mAir = mAir_start + Modelica.Units.SI.Mass mAir = mAir_start "Mass of dry air of the air volume"; - Modelica.SIunits.Mass mH2OAir = mH2OAir_start + Modelica.Units.SI.Mass mH2OAir = mH2OAir_start "Mass of water vapor in the air of the air volume"; - Modelica.SIunits.Mass mH2OLiq = mH2OLiq_start + Modelica.Units.SI.Mass mH2OLiq = mH2OLiq_start "Mass of liquid water of the air volume"; - Modelica.SIunits.InternalEnergy U=U_start + Modelica.Units.SI.InternalEnergy U=U_start "Internal energy of the air volume"; ///*****************************************************************/// equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Airvolumes/AirElements/FluidProp.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Airvolumes/AirElements/FluidProp.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Airvolumes/AirElements/FluidProp.mo" 2021-11-24 08:09:20.795367068 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Airvolumes/AirElements/FluidProp.mo" 2021-11-24 08:10:51.015095948 +0000 @@ -1,12 +1,12 @@ within BuildingSystems.Buildings.Airvolumes.AirElements; record FluidProp "Fluid properties for the air element" - Modelica.SIunits.Temp_K T; - Modelica.SIunits.Pressure p; - Modelica.SIunits.Density rho; - Modelica.SIunits.SpecificEnthalpy h; + Modelica.Units.SI.Temperature T; + Modelica.Units.SI.Pressure p; + Modelica.Units.SI.Density rho; + Modelica.Units.SI.SpecificEnthalpy h; // Absolut Moisture - Modelica.SIunits.MassFraction x; + Modelica.Units.SI.MassFraction x; annotation ( Documentation(info="
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Airvolumes/AirvolumeMixed.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Airvolumes/AirvolumeMixed.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Airvolumes/AirvolumeMixed.mo" 2021-11-24 08:09:20.795367068 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Airvolumes/AirvolumeMixed.mo" 2021-11-24 08:10:50.995096007 +0000 @@ -1,164 +1,117 @@ within BuildingSystems.Buildings.Airvolumes; -model AirvolumeMixed - "Ideal-mixed air volume model for moist air" - extends BuildingSystems.Buildings.BaseClasses.AirvolumeGeneral( - redeclare final package Medium = BuildingSystems.Media.Air, - final nAirElements = 1); - parameter Integer nAirpaths = 0 - "Number of air paths" - annotation(Evaluate=true, Dialog(connectorSizing=true, tab="General",group="Ports")); - parameter Integer nHeatSources = 0 - "Number of heat convective sources" - annotation(Evaluate=true, Dialog(connectorSizing=true, tab="General",group="Ports")); - parameter Integer nMoistureSources = 0 - "Number of moisture sources" - annotation(Evaluate=true, Dialog(connectorSizing=true, tab="General",group="Ports")); - BuildingSystems.Types.RelativeHumidity phi - "Relative humidity of the air"; - Modelica.SIunits.Mass mH2OLiq( - start = mH2OLiq_start) - "Liquid water mass"; - parameter Modelica.SIunits.Mass mH2OLiq_start = 0.0 - "Liquid water mass (start value)" - annotation (Dialog(tab="Initialization")); - Modelica.Fluid.Vessels.BaseClasses.VesselFluidPorts_b airpathPorts[nAirpaths]( - redeclare each final package Medium=Medium) - "Flow ports of the air paths" - annotation (Placement(transformation(extent={{-40,-10},{40,10}},origin={0,-80},rotation=180), - iconTransformation(extent={{-40,-90},{40,-70}}))); - BuildingSystems.Interfaces.HeatPorts heatSourcesPorts[nHeatSources] - "Heat ports of the convective heat sources" - annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=90,origin={-80,40}), - iconTransformation(extent={{-40,-10},{40,10}},rotation=90,origin={-80,40}))); - BuildingSystems.Interfaces.MoisturePorts moistureSourcesPorts[nMoistureSources] - "Moisture ports of the moisture sources" - annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=270,origin={-80,-40}), - iconTransformation(extent={{-40,-10},{40,10}},rotation=90,origin={-80,-40}))); - parameter BuildingSystems.Buildings.Types.DataSource TSou = - BuildingSystems.Buildings.Types.DataSource.Calculation - "Data source for air temperature" - annotation (Evaluate=true, Dialog(tab="Advanced", group="Data source")); - parameter Modelica.SIunits.Temp_K T_constant = 293.15 - "Constant air temperature (used if TSou=Parameter)" - annotation (Dialog(tab="Advanced", group="Data source")); - BuildingSystems.Interfaces.Temp_KInput T_in - if TSou == BuildingSystems.Buildings.Types.DataSource.Input - "Prediscribed external air temperature (used if TSou=Input)" - annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=180,origin={80,40}), - iconTransformation(extent={{90,30},{70,50}}))); - parameter BuildingSystems.Buildings.Types.DataSource xSou = - BuildingSystems.Buildings.Types.DataSource.Calculation - "Data source for air moisture" - annotation (Evaluate=true, Dialog(tab="Advanced", group="Data source")); - parameter Modelica.SIunits.MassFraction x_constant = 0.005 - "Vonstant air moisture (used if xSou=Parameter)" - annotation (Dialog(tab="Advanced", group="Data source")); - BuildingSystems.Interfaces.Moisture_absInput x_in - if xSou == BuildingSystems.Buildings.Types.DataSource.Input - "Prediscribed external air moisture (used if xSou=Input)" - annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=180,origin={80,0}), - iconTransformation(extent={{90,-10},{70,10}}))); - constant Modelica.SIunits.Velocity vAir_constant = 0.0 - "Air velocity"; - constant Modelica.SIunits.Conversions.NonSIunits.Angle_deg angleDegAir_constant = 0.0 - "Direction of the air flow"; - BuildingSystems.Buildings.Airvolumes.MixingVolumeMoistAir air( - redeclare package Medium = Medium, - geometryType=geometryType, - V=V, - m_flow_nominal=0.1, - nPorts=nAirpaths, - T_start=T_start[1], - X_start={x_start[1],1-x_start[1]}, - energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial, - massDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial) - if TSou == BuildingSystems.Buildings.Types.DataSource.Calculation - "Mixed air volume of moist air" - annotation (Placement(transformation(extent={{-10,-10},{10,10}}))); - Modelica.Thermal.HeatTransfer.Sensors.TemperatureSensor senTem - if TSou == BuildingSystems.Buildings.Types.DataSource.Calculation - annotation (Placement(transformation(extent={{-10,-30},{-30,-10}}))); - Modelica.Blocks.Sources.RealExpression pAir( - y=air.p) - annotation (Placement(transformation(extent={{44,50},{64,70}}))); - Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow prescribedHeatFlow - annotation (Placement(transformation(extent={{-36,-6},{-24,6}}))); - Modelica.Blocks.Sources.RealExpression QSum_flow( - y=sum(toSurfacePorts.heatPort.Q_flow)+sum(heatSourcesPorts.Q_flow)) - annotation (Placement(transformation(extent={{-60,-10},{-40,10}}))); - Modelica.Blocks.Sources.RealExpression mWatSum_flow( - y=sum(toSurfacePorts.moisturePort.m_flow) // water vaper from moisture transfer of surfaces - + (-0.5 * Modelica.Math.tanh(100.0*(phi-1.0)) + 0.5) * sum(moistureSourcesPorts.m_flow) // water vapor from moisture sources - + BuildingSystems.Utilities.SmoothFunctions.softcut(1.0-phi,0.0,1.0,0.001) * mH2OLiq) // evaporated water from liquid reservoir - annotation (Placement(transformation(extent={{-40,10},{-20,30}}))); + +model AirvolumeMixed "Ideal-mixed air volume model for moist air" + extends BuildingSystems.Buildings.BaseClasses.AirvolumeGeneral(redeclare final package Medium = BuildingSystems.Media.Air, final nAirElements = 1); + parameter Integer nAirpaths = 0 "Number of air paths" annotation( + Evaluate = true, + Dialog(connectorSizing = true, tab = "General", group = "Ports")); + parameter Integer nHeatSources = 0 "Number of heat convective sources" annotation( + Evaluate = true, + Dialog(connectorSizing = true, tab = "General", group = "Ports")); + parameter Integer nMoistureSources = 0 "Number of moisture sources" annotation( + Evaluate = true, + Dialog(connectorSizing = true, tab = "General", group = "Ports")); + BuildingSystems.Types.RelativeHumidity phi "Relative humidity of the air"; + Modelica.Units.SI.Mass mH2OLiq(start = mH2OLiq_start) "Liquid water mass"; + parameter Modelica.Units.SI.Mass mH2OLiq_start = 0.0 "Liquid water mass (start value)" annotation( + Dialog(tab = "Initialization")); + Modelica.Fluid.Vessels.BaseClasses.VesselFluidPorts_b airpathPorts[nAirpaths](redeclare each final package Medium = Medium) "Flow ports of the air paths" annotation( + Placement(transformation(extent = {{-40, -10}, {40, 10}}, origin = {0, -80}, rotation = 180), iconTransformation(extent = {{-40, -90}, {40, -70}}))); + BuildingSystems.Interfaces.HeatPorts heatSourcesPorts[nHeatSources] "Heat ports of the convective heat sources" annotation( + Placement(transformation(extent = {{-10, -10}, {10, 10}}, rotation = 90, origin = {-80, 40}), iconTransformation(extent = {{-40, -10}, {40, 10}}, rotation = 90, origin = {-80, 40}))); + BuildingSystems.Interfaces.MoisturePorts moistureSourcesPorts[nMoistureSources] "Moisture ports of the moisture sources" annotation( + Placement(transformation(extent = {{-10, -10}, {10, 10}}, rotation = 270, origin = {-80, -40}), iconTransformation(extent = {{-40, -10}, {40, 10}}, rotation = 90, origin = {-80, -40}))); + parameter BuildingSystems.Buildings.Types.DataSource TSou = BuildingSystems.Buildings.Types.DataSource.Calculation "Data source for air temperature" annotation( + Evaluate = true, + Dialog(tab = "Advanced", group = "Data source")); + parameter Modelica.Units.SI.Temperature T_constant = 293.15 "Constant air temperature (used if TSou=Parameter)" annotation( + Dialog(tab = "Advanced", group = "Data source")); + BuildingSystems.Interfaces.Temp_KInput T_in if TSou == BuildingSystems.Buildings.Types.DataSource.Input "Prediscribed external air temperature (used if TSou=Input)" annotation( + Placement(transformation(extent = {{-10, -10}, {10, 10}}, rotation = 180, origin = {80, 40}), iconTransformation(extent = {{90, 30}, {70, 50}}))); + parameter BuildingSystems.Buildings.Types.DataSource xSou = BuildingSystems.Buildings.Types.DataSource.Calculation "Data source for air moisture" annotation( + Evaluate = true, + Dialog(tab = "Advanced", group = "Data source")); + parameter Modelica.Units.SI.MassFraction x_constant = 0.005 "Vonstant air moisture (used if xSou=Parameter)" annotation( + Dialog(tab = "Advanced", group = "Data source")); + BuildingSystems.Interfaces.Moisture_absInput x_in if xSou == BuildingSystems.Buildings.Types.DataSource.Input "Prediscribed external air moisture (used if xSou=Input)" annotation( + Placement(transformation(extent = {{-10, -10}, {10, 10}}, rotation = 180, origin = {80, 0}), iconTransformation(extent = {{90, -10}, {70, 10}}))); + constant Modelica.Units.SI.Velocity vAir_constant = 0.0 "Air velocity"; + constant Modelica.Units.NonSI.Angle_deg angleDegAir_constant = 0.0 "Direction of the air flow"; + BuildingSystems.Buildings.Airvolumes.MixingVolumeMoistAir air(redeclare package Medium = Medium, geometryType = geometryType, V = V, m_flow_nominal = 0.1, nPorts = nAirpaths, T_start = T_start[1], X_start = {x_start[1], 1 - x_start[1]}, energyDynamics = Modelica.Fluid.Types.Dynamics.FixedInitial, massDynamics = Modelica.Fluid.Types.Dynamics.FixedInitial) if TSou == BuildingSystems.Buildings.Types.DataSource.Calculation "Mixed air volume of moist air" annotation( + Placement(transformation(extent = {{-10, -10}, {10, 10}}))); + Modelica.Thermal.HeatTransfer.Sensors.TemperatureSensor senTem if TSou == BuildingSystems.Buildings.Types.DataSource.Calculation annotation( + Placement(transformation(extent = {{-10, -30}, {-30, -10}}))); + Modelica.Blocks.Sources.RealExpression pAir(y = air.p) annotation( + Placement(transformation(extent = {{44, 50}, {64, 70}}))); + Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow prescribedHeatFlow annotation( + Placement(transformation(extent = {{-36, -6}, {-24, 6}}))); + Modelica.Blocks.Sources.RealExpression QSum_flow(y = sum(toSurfacePorts.heatPort.Q_flow) + sum(heatSourcesPorts.Q_flow)) annotation( + Placement(transformation(extent = {{-60, -10}, {-40, 10}}))); + Modelica.Blocks.Sources.RealExpression mWatSum_flow(y = sum(toSurfacePorts.moisturePort.m_flow) + ((-0.5 * Modelica.Math.tanh(100.0 * (phi - 1.0))) + 0.5) * sum(moistureSourcesPorts.m_flow) + BuildingSystems.Utilities.SmoothFunctions.softcut(1.0 - phi, 0.0, 1.0, 0.001) * mH2OLiq) annotation( + Placement(transformation(extent = {{-40, 10}, {-20, 30}}))); + // water vaper from moisture transfer of surfaces + // water vapor from moisture sources + // evaporated water from liquid reservoir equation - // Select source for air temperature +// Select source for air temperature if TSou == BuildingSystems.Buildings.Types.DataSource.Parameter then T[1] = T_constant; elseif TSou == BuildingSystems.Buildings.Types.DataSource.Calculation then - connect(T[1], senTem.T) - annotation (Line(points={{-30,-20},{-40,-20},{-40,-40},{60,-40},{60,20},{80,20}}, color={0,0,127})); + connect(T[1], senTem.T) annotation( + Line(points = {{-30, -20}, {-40, -20}, {-40, -40}, {60, -40}, {60, 20}, {80, 20}}, color = {0, 0, 127})); else connect(T[1], T_in); end if; - - // Select source for air moisture +// Select source for air moisture if xSou == BuildingSystems.Buildings.Types.DataSource.Parameter then x[1] = x_constant; elseif TSou == BuildingSystems.Buildings.Types.DataSource.Calculation then - connect(x[1], air.X_w) - annotation (Line(points={{12,-4},{50,-4},{50,-20},{80,-20}},color={0,0,127})); + connect(x[1], air.X_w) annotation( + Line(points = {{12, -4}, {50, -4}, {50, -20}, {80, -20}}, color = {0, 0, 127})); else connect(x[1], x_in); end if; - - // Boundary conditions for heat sources of the air volume +// Boundary conditions for heat sources of the air volume for i in 1:nHeatSources loop heatSourcesPorts[i].T = T[1]; end for; - - // Boundary conditions for moisture sources of the air volume +// Boundary conditions for moisture sources of the air volume for i in 1:nMoistureSources loop moistureSourcesPorts[i].x = x[1]; end for; - - // Boundary conditions for all surfaces of the air volume +// Boundary conditions for all surfaces of the air volume for i in 1:nSurfaces loop toSurfacePorts[i].heatPort.T = T[1]; toSurfacePorts[i].moisturePort.x = x[1]; toSurfacePorts[i].angleDegAir = angleDegAir_constant; toSurfacePorts[i].vAir = vAir_constant; end for; - - phi = BuildingSystems.Utilities.Psychrometrics.Functions.phi_pTX(100000,T[1],x[1]); - - // Mass balance of liquid water - der(mH2OLiq) = (1.0 - (-0.5 * Modelica.Math.tanh(100.0*(phi-1.0)) + 0.5)) * sum(moistureSourcesPorts.m_flow) // water vapor surplus from moisture sources if relative moisture becomes close to 1 - - BuildingSystems.Utilities.SmoothFunctions.softcut(1.0-phi,0.0,1.0,0.001) * mH2OLiq; // evaporated water which leaves the liquid reservoir - - connect(V_in, air.V_in) - annotation (Line(points={{-80,0},{-64,0},{-64,10},{-20,10},{-20,4},{-12,4}},color={0,0,127})); - connect(air.ports, airpathPorts) - annotation (Line(points={{0,-10},{-4.44089e-16,-10},{-4.44089e-16,-80}}, color={0,127,255})); - connect(air.heatPort, prescribedHeatFlow.port) - annotation (Line(points={{-10,0},{-24,0}}, color={191,0,0})); - connect(prescribedHeatFlow.Q_flow, QSum_flow.y) - annotation (Line(points={{-36,0},{-39,0}}, color={0,0,127})); - connect(mWatSum_flow.y, air.mWat_flow) - annotation (Line(points={{-19,20},{-16,20},{-16,8},{-12,8}}, color={0,0,127})); - connect(senTem.port, air.heatPort) - annotation (Line(points={{-10,-20},{-10,0}}, color={191,0,0})); - connect(pAir.y, p[1]) - annotation (Line(points={{65,60},{80,60}}, color={0,0,127})); - - annotation (Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100}, {100,100}}), graphics={ - Text(extent={{-18,71},{50,5}},lineColor={255,128,0},lineThickness=0.5,fillColor={255,128,0},fillPattern=FillPattern.Solid,textString="D"), - Text(extent={{-52,71},{16,5}},lineColor={255,128,0},lineThickness=0.5,fillColor={255,128,0},fillPattern=FillPattern.Solid,textString="0")}), -Documentation(info=" + phi = BuildingSystems.Utilities.Psychrometrics.Functions.phi_pTX(100000, T[1], x[1]); +// Mass balance of liquid water + der(mH2OLiq) = (1.0 - ((-0.5 * Modelica.Math.tanh(100.0 * (phi - 1.0))) + 0.5)) * sum(moistureSourcesPorts.m_flow) - BuildingSystems.Utilities.SmoothFunctions.softcut(1.0 - phi, 0.0, 1.0, 0.001) * mH2OLiq; +// water vapor surplus from moisture sources if relative moisture becomes close to 1 +// evaporated water which leaves the liquid reservoir + connect(V_in, air.V_in) annotation( + Line(points = {{-80, 0}, {-64, 0}, {-64, 10}, {-20, 10}, {-20, 4}, {-12, 4}}, color = {0, 0, 127})); + connect(air.ports, airpathPorts) annotation( + Line(points = {{0, -10}, {-4.44089e-16, -10}, {-4.44089e-16, -80}}, color = {0, 127, 255})); + connect(air.heatPort, prescribedHeatFlow.port) annotation( + Line(points = {{-10, 0}, {-24, 0}}, color = {191, 0, 0})); + connect(prescribedHeatFlow.Q_flow, QSum_flow.y) annotation( + Line(points = {{-36, 0}, {-39, 0}}, color = {0, 0, 127})); + connect(mWatSum_flow.y, air.mWat_flow) annotation( + Line(points = {{-19, 20}, {-16, 20}, {-16, 8}, {-12, 8}}, color = {0, 0, 127})); + connect(senTem.port, air.heatPort) annotation( + Line(points = {{-10, -20}, {-10, 0}}, color = {191, 0, 0})); + connect(pAir.y, p[1]) annotation( + Line(points = {{65, 60}, {80, 60}}, color = {0, 0, 127})); + annotation( + Icon(coordinateSystem(preserveAspectRatio = false, extent = {{-100, -100}, {100, 100}}), graphics = {Text(extent = {{-18, 71}, {50, 5}}, lineColor = {255, 128, 0}, lineThickness = 0.5, fillColor = {255, 128, 0}, fillPattern = FillPattern.Solid, textString = "D"), Text(extent = {{-52, 71}, {16, 5}}, lineColor = {255, 128, 0}, lineThickness = 0.5, fillColor = {255, 128, 0}, fillPattern = FillPattern.Solid, textString = "0")}), + Documentation(info = "
This is a model of an ideal-mixed air volume for moist air.
-", revisions=" +", revisions = "This is a model which calculates the outside climate boundary conditions of one ore more buildings.
@@ -339,7 +238,7 @@ Under BuildingSystems.Resources.Scripts.WeatherDataConverter you will find a short guide, which describes a Python based generation of NetCDF files, which can be read by this component. -", revisions=" +", revisions = "diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/BaseClasses/PartialMixingVolume.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/BaseClasses/PartialMixingVolume.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/BaseClasses/PartialMixingVolume.mo" 2021-11-24 08:09:20.795367068 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/BaseClasses/PartialMixingVolume.mo" 2021-11-24 08:10:50.187098433 +0000 @@ -7,7 +7,7 @@ parameter BuildingSystems.Buildings.Types.GeometryType geometryType = BuildingSystems.Buildings.Types.GeometryType.Fixed "Fixed (default) or flexible geometry" annotation (Evaluate=true, Dialog(tab = "General", group = "Volume geometry")); - parameter Modelica.SIunits.Volume V + parameter Modelica.Units.SI.Volume V "Volume (if geometryType == Fixed)" annotation(Dialog(tab="General",group="Volume geometry")); output BuildingSystems.Interfaces.VolumeOutput V_internal @@ -32,13 +32,13 @@ constant Boolean simplify_mWat_flow = true "Set to true to cause port_a.m_flow + port_b.m_flow = 0 even if mWat_flow is non-zero"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal(min=0) + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal(min=0) "Nominal mass flow rate" annotation(Dialog(group = "Nominal condition")); // Port definitions parameter Integer nPorts=0 "Number of ports" annotation(Evaluate=true, Dialog(connectorSizing=true, tab="General",group="Ports")); - parameter Modelica.SIunits.MassFlowRate m_flow_small(min=0) = 1E-4*abs(m_flow_nominal) + parameter Modelica.Units.SI.MassFlowRate m_flow_small(min=0) = 1E-4*abs(m_flow_nominal) "Small mass flow rate for regularization of zero flow" annotation(Dialog(tab = "Advanced")); parameter Boolean allowFlowReversal = true @@ -54,10 +54,10 @@ "Temperature of the fluid"; Modelica.Blocks.Interfaces.RealOutput U(unit="J") "Internal energy of the component"; - Modelica.SIunits.Pressure p = if nPorts > 0 then ports[1].p else p_start + Modelica.Units.SI.Pressure p = if nPorts > 0 then ports[1].p else p_start "Pressure of the fluid"; Modelica.Blocks.Interfaces.RealOutput m(unit="kg") "Mass of the component"; - Modelica.SIunits.MassFraction Xi[Medium.nXi] = XiOut_internal + Modelica.Units.SI.MassFraction Xi[Medium.nXi] = XiOut_internal "Species concentration of the fluid"; Modelica.Blocks.Interfaces.RealOutput mXi[Medium.nXi](each unit="kg") "Species mass of the component"; @@ -96,14 +96,14 @@ annotation (Placement(transformation(extent={{60,0},{80,20}}))); // Density at start values, used to compute initial values and start guesses - parameter Modelica.SIunits.Density rho_start=Medium.density( + parameter Modelica.Units.SI.Density rho_start=Medium.density( state=state_start) "Density, used to compute start and guess values"; final parameter Medium.ThermodynamicState state_default = Medium.setState_pTX( T=Medium.T_default, p=Medium.p_default, X=Medium.X_default[1:Medium.nXi]) "Medium state at default values"; // Density at medium default values, used to compute the size of control volumes - final parameter Modelica.SIunits.Density rho_default=Medium.density( + final parameter Modelica.Units.SI.Density rho_default=Medium.density( state=state_default) "Density, used to compute fluid mass"; final parameter Medium.ThermodynamicState state_start = Medium.setState_pTX( T=T_start, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/BaseClasses/RadiationDistribution.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/BaseClasses/RadiationDistribution.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/BaseClasses/RadiationDistribution.mo" 2021-11-24 08:09:20.795367068 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/BaseClasses/RadiationDistribution.mo" 2021-11-24 08:10:50.159098518 +0000 @@ -15,7 +15,7 @@ parameter Boolean geometricViewFactors= false "true: use of geometric view factors, false: use of surface area weighted view factors" annotation(HideResult = true); - Modelica.SIunits.Area ATotal + Modelica.Units.SI.Area ATotal "Total surface area of the thermal zone"; BuildingSystems.Buildings.Interfaces.SurfaceToSurfacesPorts toSurfacePorts[nSurfaces] "Interface to the surfaces of the thermal zone" @@ -23,12 +23,12 @@ BuildingSystems.Interfaces.HeatPorts heatSourcesPorts[nHeatSources] "Interface to the internal heat sources of the thermal zone" annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=180,origin={0,58}), iconTransformation(extent={{-40,68},{40,88}}))); - Modelica.SIunits.HeatFlowRate Q_flow_Sw + Modelica.Units.SI.HeatFlowRate Q_flow_Sw "Total short radiation gains of the thermal zone"; BuildingSystems.Interfaces.Temp_KOutput TSurfMean "Mean temperatures of all surfaces" annotation (Placement(transformation(extent={{70,-10},{90,10}}), iconTransformation(extent={{70,-10},{90,10}}))); - protected Modelica.SIunits.HeatFlux J[nSurfaces](each start = 0.0) + protected Modelica.Units.SI.HeatFlux J[nSurfaces](each start = 0.0) "Radiosity of each surface"; initial equation if not geometricViewFactors then diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/BaseClasses/SurfaceGeneral.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/BaseClasses/SurfaceGeneral.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/BaseClasses/SurfaceGeneral.mo" 2021-11-24 08:09:20.795367068 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/BaseClasses/SurfaceGeneral.mo" 2021-11-24 08:10:50.135098590 +0000 @@ -4,7 +4,7 @@ Buildings.Interfaces.SurfaceToConstructionPort toConstructionPort "Port to the construction" annotation (Placement(transformation(extent={{-16,-10},{4,10}}), iconTransformation(extent={{-16,-10},{4,10}}))); - Modelica.SIunits.Area ASur + Modelica.Units.SI.Area ASur "Surface area"; equation toConstructionPort.A = ASur; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/BaseClasses/TriangularConstructionGeneral.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/BaseClasses/TriangularConstructionGeneral.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/BaseClasses/TriangularConstructionGeneral.mo" 2021-11-24 08:09:20.795367068 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/BaseClasses/TriangularConstructionGeneral.mo" 2021-11-24 08:10:50.127098614 +0000 @@ -40,7 +40,7 @@ parameter BuildingSystems.Buildings.Types.CoordinateType coordinateType = BuildingSystems.Buildings.Types.CoordinateType.Local "Local (default) or global" annotation (Evaluate=true, Dialog(tab = "Geometry", group = "Coordinates")); - parameter Modelica.SIunits.Length verticesLocal[3,2] = {{0.0,0.0},{0.0,1.0},{0.5,1.0}} + parameter Modelica.Units.SI.Length verticesLocal[3,2] = {{0.0,0.0},{0.0,1.0},{0.5,1.0}} "Local 2D vertices (if geometryType == Fixed and coordinateType == Local)" annotation(Dialog(tab = "Geometry", group = "Coordinates")); output BuildingSystems.Interfaces.LengthOutput verticesLocal_internal[3,2] @@ -51,7 +51,7 @@ "Local 2D vertices from input" annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0, origin={-30,-36}), iconTransformation(extent={{10,-10},{-10,10}},rotation=180,origin={-20,-20}))); - parameter Modelica.SIunits.Length verticesGlobal[3,3] = {{0.0,0.0,0.0},{0.0,1.0,0.0},{0.5,1.0,0.0}} + parameter Modelica.Units.SI.Length verticesGlobal[3,3] = {{0.0,0.0,0.0},{0.0,1.0,0.0},{0.5,1.0,0.0}} "Global 3D vertices (if geometryType == Fixed and coordinateType == Global)" annotation(Dialog(tab = "Geometry", group = "Coordinates")); output BuildingSystems.Interfaces.LengthOutput verticesGlobal_internal[3,3] @@ -62,7 +62,7 @@ "Global 3D vertices from input" annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0, origin={-30,-46}), iconTransformation(extent={{10,-10},{-10,10}},rotation=180,origin={-20,-40}))); - parameter Modelica.SIunits.Conversions.NonSIunits.Angle_deg angleDegAzi = 0.0 + parameter Modelica.Units.NonSI.Angle_deg angleDegAzi = 0.0 "Azimuth angle (if geometryType == Fixed and coordinateType = Local) -> south: 0 deg, east: -90 deg, west +90 deg, north: 180 deg" annotation(Dialog(tab = "Geometry", group = "Orientation")); output BuildingSystems.Interfaces.Angle_degOutput angleDegAzi_internal @@ -74,7 +74,7 @@ "Azimuth angle from input" annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=0, origin={30,-46}), iconTransformation(extent={{-10,-10},{10,10}},rotation=180,origin={22,-40}))); - parameter Modelica.SIunits.Conversions.NonSIunits.Angle_deg angleDegTil = 90.0 + parameter Modelica.Units.NonSI.Angle_deg angleDegTil = 90.0 "Tilt angle (if geometryType == Fixed and coordinateType = Local) -> bottom: 0 deg, perpendicular: 90 deg, ceiling: 180 deg" annotation(Dialog(tab = "Geometry", group = "Orientation")); output BuildingSystems.Interfaces.Angle_degOutput angleDegTil_internal @@ -86,7 +86,7 @@ "Tilt angle from input" annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=0, origin={30,-36}), iconTransformation(extent={{-10,-10},{10,10}},rotation=180,origin={22,-20}))); - parameter Modelica.SIunits.Length position[3] = {0.0,0.0,0.0} + parameter Modelica.Units.SI.Length position[3] = {0.0,0.0,0.0} "Position (if geometryType == Fixed and coordinateType == Local)" annotation(Dialog(tab = "Geometry", group = "General")); output BuildingSystems.Interfaces.LengthOutput position_internal[3] @@ -102,16 +102,16 @@ parameter BuildingSystems.Types.Absorptance abs_2 = 0.5 "Short-wave absorptance side 2" annotation(Dialog(tab = "General", group = "Surfaces")); - parameter Modelica.SIunits.Emissivity epsilon_1 = 0.9 + parameter Modelica.Units.SI.Emissivity epsilon_1 = 0.9 "Long-wave emittance side 1" annotation(Dialog(tab = "General", group = "Surfaces")); - parameter Modelica.SIunits.Emissivity epsilon_2 = 0.9 + parameter Modelica.Units.SI.Emissivity epsilon_2 = 0.9 "Long-wave emittance side 2" annotation(Dialog(tab = "General", group = "Surfaces")); - Modelica.SIunits.Area ASur + Modelica.Units.SI.Area ASur "Surface area"; protected - parameter Modelica.SIunits.Length thickness + parameter Modelica.Units.SI.Length thickness "Total thickness of the construction"; equation if geometryType == BuildingSystems.Buildings.Types.GeometryType.Fixed then diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/BaseClasses/WallHygroThermalGeneral.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/BaseClasses/WallHygroThermalGeneral.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/BaseClasses/WallHygroThermalGeneral.mo" 2021-11-24 08:09:20.795367068 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/BaseClasses/WallHygroThermalGeneral.mo" 2021-11-24 08:10:50.083098746 +0000 @@ -3,7 +3,7 @@ "General hygro-hermal wall model" extends BuildingSystems.Buildings.BaseClasses.WallGeneral( thickness = sum(constructionData.thickness[i] for i in 1:constructionData.nLayers)); - parameter Modelica.SIunits.Temp_K T_start[constructionData.nLayers]={293.15 for i in 1:constructionData.nLayers} + parameter Modelica.Units.SI.Temperature T_start[constructionData.nLayers]={293.15 for i in 1:constructionData.nLayers} "Start temperature of each layer" annotation (Dialog(tab="Initialization")); parameter BuildingSystems.Types.RelativeHumidity phi_start[constructionData.nLayers]={0.5 for i in 1:constructionData.nLayers} @@ -12,14 +12,14 @@ replaceable parameter BuildingSystems.Buildings.Data.Constructions.OpaqueHygroThermalConstruction constructionData "Data of the hygro-thermal construction" annotation(HideResult=true, Dialog(tab ="General",group="Construction"),choicesAllMatching=true); - final parameter Modelica.SIunits.SurfaceCoefficientOfHeatTransfer alphaIns = 7.692 + + final parameter Modelica.Units.SI.SurfaceCoefficientOfHeatTransfer alphaIns = 7.692 "Heat transfer coefficient (convection + radiation) inside of the wall"; // after German DIN 4701 Teil2 tabular 16" - final parameter Modelica.SIunits.SurfaceCoefficientOfHeatTransfer alphaAmb = 25.0 + final parameter Modelica.Units.SI.SurfaceCoefficientOfHeatTransfer alphaAmb = 25.0 "Heat transfer coefficient (convection + radiation) outside of the wall"; // after german DIN 4701 Teil2 tabular 16" - final parameter Modelica.SIunits.CoefficientOfHeatTransfer UVal = + final parameter Modelica.Units.SI.CoefficientOfHeatTransfer UVal = 1.0/(1.0/alphaIns+sum(constructionData.thickness[i]/constructionData.material[i].lambdaDry for i in 1:constructionData.nLayers)+1.0/alphaAmb) "U-value of the wall construction under standard conditions"; - annotation ( Documentation(info="
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/BaseClasses/WallThermalGeneral.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/BaseClasses/WallThermalGeneral.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/BaseClasses/WallThermalGeneral.mo" 2021-11-24 08:09:20.795367068 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/BaseClasses/WallThermalGeneral.mo" 2021-11-24 08:10:50.067098794 +0000 @@ -14,17 +14,17 @@ replaceable parameter BuildingSystems.Buildings.Data.Constructions.OpaqueThermalConstruction constructionData "Data of the thermal construction" annotation(Dialog(tab = "General", group = "Construction"), choicesAllMatching=true); - parameter Modelica.SIunits.Temp_K T_start[constructionData.nLayers]={293.15 for i in 1:constructionData.nLayers} + + parameter Modelica.Units.SI.Temperature T_start[constructionData.nLayers]={293.15 for i in 1:constructionData.nLayers} "Start temperature of each layer" annotation (Dialog(tab="Initialization")); - final parameter Modelica.SIunits.SurfaceCoefficientOfHeatTransfer alphaIns = 7.692 + final parameter Modelica.Units.SI.SurfaceCoefficientOfHeatTransfer alphaIns = 7.692 "Heat transfer coefficient (convection + radiation) inside of the wall"; // after German DIN 4701 Teil2 tabular 16" - final parameter Modelica.SIunits.SurfaceCoefficientOfHeatTransfer alphaAmb = 25.0 + final parameter Modelica.Units.SI.SurfaceCoefficientOfHeatTransfer alphaAmb = 25.0 "Heat transfer coefficient (convection + radiation) outside of the wall"; // after german DIN 4701 Teil2 tabular 16" - final parameter Modelica.SIunits.CoefficientOfHeatTransfer UVal = + final parameter Modelica.Units.SI.CoefficientOfHeatTransfer UVal = 1.0/(1.0/alphaIns+sum(constructionData.thickness[i]/constructionData.material[i].lambda for i in 1:constructionData.nLayers)+1.0/alphaAmb) "U-value of the wall construction under standard conditions"; - annotation ( Documentation(info="
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/BaseClasses/WallThermalTriangularGeneral.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/BaseClasses/WallThermalTriangularGeneral.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/BaseClasses/WallThermalTriangularGeneral.mo" 2021-11-24 08:09:20.795367068 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/BaseClasses/WallThermalTriangularGeneral.mo" 2021-11-24 08:10:50.059098818 +0000 @@ -14,17 +14,17 @@ replaceable parameter BuildingSystems.Buildings.Data.Constructions.OpaqueThermalConstruction constructionData "Data of the thermal construction" annotation(Dialog(tab = "General", group = "Construction"), choicesAllMatching=true); - parameter Modelica.SIunits.Temp_K T_start[constructionData.nLayers]={293.15 for i in 1:constructionData.nLayers} + + parameter Modelica.Units.SI.Temperature T_start[constructionData.nLayers]={293.15 for i in 1:constructionData.nLayers} "Start temperature of each layer" annotation (Dialog(tab="Initialization")); - final parameter Modelica.SIunits.SurfaceCoefficientOfHeatTransfer alphaIns = 7.692 + final parameter Modelica.Units.SI.SurfaceCoefficientOfHeatTransfer alphaIns = 7.692 "Heat transfer coefficient (convection + radiation) inside of the wall"; // after German DIN 4701 Teil2 tabular 16" - final parameter Modelica.SIunits.SurfaceCoefficientOfHeatTransfer alphaAmb = 25.0 + final parameter Modelica.Units.SI.SurfaceCoefficientOfHeatTransfer alphaAmb = 25.0 "Heat transfer coefficient (convection + radiation) outside of the wall"; // after german DIN 4701 Teil2 tabular 16" - final parameter Modelica.SIunits.CoefficientOfHeatTransfer UVal = + final parameter Modelica.Units.SI.CoefficientOfHeatTransfer UVal = 1.0/(1.0/alphaIns+sum(constructionData.thickness[i]/constructionData.material[i].lambda for i in 1:constructionData.nLayers)+1.0/alphaAmb) "U-value of the wall construction under standard conditions"; - annotation ( Documentation(info="
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/BaseClasses/WindowGeneral.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/BaseClasses/WindowGeneral.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/BaseClasses/WindowGeneral.mo" 2021-11-24 08:09:20.795367068 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/BaseClasses/WindowGeneral.mo" 2021-11-24 08:10:49.995099010 +0000 @@ -39,7 +39,7 @@ parameter Boolean calcEmbrasure = false "true: shadowing effect of embrasure is considered" annotation(Dialog(tab = "Shadowing", group = "Shadowing embrasure")); - parameter Modelica.SIunits.Length depthEmbrasure = 0.0 + parameter Modelica.Units.SI.Length depthEmbrasure = 0.0 "Depth of the embrasure (if calcEmbrasure == true)" annotation(Dialog(tab = "Shadowing", group = "Shadowing embrasure")); // Ventilation @@ -49,7 +49,7 @@ parameter Integer nCom=10 "Number of compartments for the discretization" annotation(Dialog(tab = "Air change", group = "Air change calculation")); - parameter Modelica.SIunits.Area LClo(min=0)=0.001 + parameter Modelica.Units.SI.Area LClo(min=0)=0.001 "Effective leakage area of closed window" annotation(Dialog(tab = "Air change", group = "Air change calculation")); // Advanced parameters @@ -64,7 +64,7 @@ "Temperature on surface side 2" annotation (Placement(transformation(extent={{-10,-10},{10,10}},origin={46,10}), iconTransformation(extent={{10,30},{30,50}}))); - parameter Modelica.SIunits.Temp_K T_start=293.15 + parameter Modelica.Units.SI.Temperature T_start=293.15 "Start temperature of the window" annotation (Dialog(tab="Initialization")); BuildingSystems.HAM.HeatConduction.HeatConduction1D heatTransfer( @@ -137,19 +137,19 @@ protected Modelica.Blocks.Interfaces.RealInput GSC_internal "Shading coefficient"; - constant Modelica.SIunits.SurfaceCoefficientOfHeatTransfer alphaInsDIN4701 = 7.692 + constant Modelica.Units.SI.SurfaceCoefficientOfHeatTransfer alphaInsDIN4701 = 7.692 "Heat transfer coefficient (convection + radiation) inside of the construction"; // after German DIN 4701 Teil2 tabular 16" - constant Modelica.SIunits.SurfaceCoefficientOfHeatTransfer alphaAmbDIN4701 = 25.0 + constant Modelica.Units.SI.SurfaceCoefficientOfHeatTransfer alphaAmbDIN4701 = 25.0 "Heat transfer coefficient (convection + radiation) outside of the construction"; // after german DIN 4701 Teil2 tabular 16" - constant Modelica.SIunits.Density rhoWin = 2000.0 + constant Modelica.Units.SI.Density rhoWin = 2000.0 "Mean Density of the window construction"; - constant Modelica.SIunits.SpecificHeatCapacity cWin = 1000.0 + constant Modelica.Units.SI.SpecificHeatCapacity cWin = 1000.0 "Specific heat capacity of the window construction"; - final parameter Modelica.SIunits.Length thicknessPan = sum(constructionData.thickness) + final parameter Modelica.Units.SI.Length thicknessPan = sum(constructionData.thickness) "Total thickness of all panes"; - final parameter Modelica.SIunits.CoefficientOfHeatTransfer UWin = + final parameter Modelica.Units.SI.CoefficientOfHeatTransfer UWin = 1.0/(-1.0/alphaAmbDIN4701-1.0/alphaInsDIN4701 +1.0/((1.0-framePortion)*constructionData.UValGla+framePortion*constructionData.UValFra)) "Mean heat transfer coefficient of the window construction without the heat transfer on the surfaces"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/BaseClasses/ZoneTemplateGeneral.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/BaseClasses/ZoneTemplateGeneral.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/BaseClasses/ZoneTemplateGeneral.mo" 2021-11-24 08:09:20.795367068 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/BaseClasses/ZoneTemplateGeneral.mo" 2021-11-24 08:10:49.967099094 +0000 @@ -8,7 +8,7 @@ BuildingSystems.Buildings.Types.GeometryType.Fixed "Fixed (default) or flexible geometry" annotation (Evaluate=true, Dialog(tab = "Geometry", group = "Zone geometry")); - parameter Modelica.SIunits.Volume V = 1.0 + parameter Modelica.Units.SI.Volume V = 1.0 "Air volume of the zone (if geometryType == Fixed)" annotation(Dialog(tab="Geometry",group="Zone geometry")); input BuildingSystems.Interfaces.VolumeInput V_in( @@ -16,7 +16,7 @@ "Air volume of the zone from input" annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0, origin={-110,0}), iconTransformation(extent={{10,-10},{-10,10}},rotation=180,origin={-110,0}))); - parameter Modelica.SIunits.Length position[3] = {0.0,0.0,0.0} + parameter Modelica.Units.SI.Length position[3] = {0.0,0.0,0.0} "Position (if geometryType == Fixed)" annotation(Dialog(tab = "Geometry", group = "Zone geometry")); input BuildingSystems.Interfaces.LengthInput position_in[3] @@ -28,13 +28,13 @@ "Position" annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=180,origin={110,20}), iconTransformation(extent={{-10,-10},{10,10}},rotation=0,origin={110,50}))); - parameter Modelica.SIunits.Length height = 1.0 + parameter Modelica.Units.SI.Length height = 1.0 "Vertical height of the zone" annotation(Dialog(tab="General",group="Air change")); parameter BuildingSystems.HAM.ConvectiveHeatTransfer.Types.Convection convectionOnSurfaces = BuildingSystems.HAM.ConvectiveHeatTransfer.Types.Convection.const "Type of convection calculation of the zone surfaces" annotation(Dialog(tab="Advanced",group="Convection model on building facades")); - parameter Modelica.SIunits.SurfaceCoefficientOfHeatTransfer alphaConstant = 1.0 + parameter Modelica.Units.SI.SurfaceCoefficientOfHeatTransfer alphaConstant = 1.0 "Convective heat transfer coefficient for simplified calculations" annotation(Dialog(tab="Advanced",group="Convection model on building facades")); parameter Integer nMoistureSources = 0 @@ -92,7 +92,7 @@ "Overall number of surfaces of the zone"; parameter Integer nAirpathsInternal = if prescribedAirchange then 2 else + nAirpaths "Overall number of air paths of the zone"; - constant Modelica.SIunits.Density rho_nominal = 1.2 + constant Modelica.Units.SI.Density rho_nominal = 1.2 "Air density under nominal conditions"; equation if geometryType == BuildingSystems.Buildings.Types.GeometryType.Fixed then diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/BuildingTemplates/Building1Zone0D.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/BuildingTemplates/Building1Zone0D.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/BuildingTemplates/Building1Zone0D.mo" 2021-11-24 08:09:20.795367068 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/BuildingTemplates/Building1Zone0D.mo" 2021-11-24 08:10:49.943099166 +0000 @@ -13,51 +13,51 @@ surfacesToAmbience(nSurfaces=nWindows+1), surfacesToSolids(nSurfaces=nSurfacesSolid)); - parameter Modelica.SIunits.Length height = 3.0 + parameter Modelica.Units.SI.Length height = 3.0 "Height of the building" annotation (Evaluate=false, Dialog(tab = "General", group = "Geometry building")); parameter Integer nWindows = 1 "Number of windows" annotation(Dialog(tab="Constructions",group="Windows")); - parameter Modelica.SIunits.Area AAmb = 1.0 + parameter Modelica.Units.SI.Area AAmb = 1.0 "Surface area of the building constructions with air contact to the environment" annotation(Evaluate=false, Dialog(tab="Constructions",group="Ambience constructions")); - parameter Modelica.SIunits.Area AInn = 1.0 + parameter Modelica.Units.SI.Area AInn = 1.0 "Surface area of both sides of the internal building constructions" annotation(Evaluate=false, Dialog(tab="Constructions",group="Inner constructions")); - parameter Modelica.SIunits.Area AGro = 1.0 + parameter Modelica.Units.SI.Area AGro = 1.0 "Surface area of the building constructions with contact to the ground" annotation(Evaluate=false, Dialog(tab="Constructions",group="Ground constructions")); - parameter Modelica.SIunits.Area AWin[nWindows] = {1.0} + parameter Modelica.Units.SI.Area AWin[nWindows] = {1.0} "Area of each window" annotation(Evaluate=false, Dialog(tab="Constructions",group="Windows")); - parameter Modelica.SIunits.Conversions.NonSIunits.Angle_deg angleDegAziWin[nWindows] = fill(0.0,nWindows) + parameter Modelica.Units.NonSI.Angle_deg angleDegAziWin[nWindows] = fill(0.0,nWindows) "Azimuth angle of each window" annotation(Evaluate=false, Dialog(tab = "General", group = "Geometry windows")); - parameter Modelica.SIunits.Conversions.NonSIunits.Angle_deg angleDegTilWin[nWindows] = fill(90.0,nWindows) + parameter Modelica.Units.NonSI.Angle_deg angleDegTilWin[nWindows] = fill(90.0,nWindows) "Tilt angle of each window" annotation(Evaluate=false, Dialog(tab = "General", group = "Geometry windows")); - parameter Modelica.SIunits.Volume VAir = 1.0 + parameter Modelica.Units.SI.Volume VAir = 1.0 "Inner (Air) volume of the building"; - parameter Modelica.SIunits.HeatCapacity CAmb = 1.0 + parameter Modelica.Units.SI.HeatCapacity CAmb = 1.0 "Total heat capacity of the building envelope" annotation(Evaluate=false, Dialog(tab="Constructions",group="Ambience constructions")); - parameter Modelica.SIunits.HeatCapacity CInn = 1.0 + parameter Modelica.Units.SI.HeatCapacity CInn = 1.0 "Total heat capacity of the internal building construction" annotation(Evaluate=false, Dialog(tab="Constructions",group="Inner constructions")); - parameter Modelica.SIunits.HeatCapacity CGro = 1.0 + parameter Modelica.Units.SI.HeatCapacity CGro = 1.0 "Total heat capacity of the building groundplate" annotation(Evaluate=false, Dialog(tab="Constructions",group="Ground constructions")); - parameter Modelica.SIunits.CoefficientOfHeatTransfer UValAmb = 1.0 + parameter Modelica.Units.SI.CoefficientOfHeatTransfer UValAmb = 1.0 "Mean heat loss coefficient of the building envelope" annotation(Evaluate=false, Dialog(tab="Constructions",group="Ambience constructions")); - parameter Modelica.SIunits.CoefficientOfHeatTransfer UValGro = 1.0 + parameter Modelica.Units.SI.CoefficientOfHeatTransfer UValGro = 1.0 "Mean heat loss coefficient of the building groundplate" annotation(Evaluate=false, Dialog(tab="Constructions",group="Ground constructions")); - parameter Modelica.SIunits.CoefficientOfHeatTransfer UValInn = 1.0 + parameter Modelica.Units.SI.CoefficientOfHeatTransfer UValInn = 1.0 "Mean heat loss coefficient of internal building construction" annotation(Evaluate=false, Dialog(tab="Constructions",group="Inner constructions")); - parameter Modelica.SIunits.CoefficientOfHeatTransfer UValWin[nWindows] = fill(1.0,nWindows) + parameter Modelica.Units.SI.CoefficientOfHeatTransfer UValWin[nWindows] = fill(1.0,nWindows) "Heat loss coefficient of each window" annotation(Evaluate=false, Dialog(tab="Constructions",group="Windows")); parameter Real gWin[nWindows](each unit = "1") = fill(0.6,nWindows) @@ -141,13 +141,13 @@ "Transparent constructions in contact to the ambience" annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=180,origin={-40,20}))); - final parameter Modelica.SIunits.SurfaceCoefficientOfHeatTransfer alphaIns = 7.692 + + final parameter Modelica.Units.SI.SurfaceCoefficientOfHeatTransfer alphaIns = 7.692 "Heat transfer coefficient (convection + radiation) inside of the building"; // after German DIN 4701 Teil2 tabular 16" - final parameter Modelica.SIunits.SurfaceCoefficientOfHeatTransfer alphaAmb = 25.0 + final parameter Modelica.Units.SI.SurfaceCoefficientOfHeatTransfer alphaAmb = 25.0 "Heat transfer coefficient (convection + radiation) outside of the building"; // after german DIN 4701 Teil2 tabular 16" - final parameter Modelica.SIunits.SurfaceCoefficientOfHeatTransfer alphaGro = 100.0 + final parameter Modelica.Units.SI.SurfaceCoefficientOfHeatTransfer alphaGro = 100.0 "Heat transfer coefficient (conduction) to the ground"; - equation connect(zone.TAir, TAir[1]) annotation (Line( points={{11,-3},{11,-30},{88,-30},{88,-70},{190,-70}}, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/BuildingTemplates/Building1Zone0DDistrict.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/BuildingTemplates/Building1Zone0DDistrict.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/BuildingTemplates/Building1Zone0DDistrict.mo" 2021-11-24 08:09:20.795367068 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/BuildingTemplates/Building1Zone0DDistrict.mo" 2021-11-24 08:10:49.915099250 +0000 @@ -31,16 +31,16 @@ parameter Integer id = 1 "Building ID" annotation (Dialog(tab = "General")); - parameter Modelica.SIunits.Length length = 10.0 + parameter Modelica.Units.SI.Length length = 10.0 "Length of the building" annotation (Evaluate=false, Dialog(tab = "General", group = "Geometry building")); - parameter Modelica.SIunits.Length width = 10.0 + parameter Modelica.Units.SI.Length width = 10.0 "Width of the building" annotation (Evaluate=false, Dialog(tab = "General", group = "Geometry building")); - parameter Modelica.SIunits.Length thicknessFac = 0.4 + parameter Modelica.Units.SI.Length thicknessFac = 0.4 "Mean thickness of the facade opaque construction" annotation (Evaluate=false, Dialog(tab = "General", group = "Geometry building")); - parameter Modelica.SIunits.Length thicknessSla = 0.3 + parameter Modelica.Units.SI.Length thicknessSla = 0.3 "Mean thickness of the slab construction between the floors" annotation (Evaluate=false, Dialog(tab = "General", group = "Geometry building")); parameter Real fAreaAdjBld = 0.0 @@ -49,16 +49,16 @@ parameter Real f_W_BGF = 0.75 "Relation living area (Wohnflaeche) to gross floor area (Bruttogrundflaeche)" annotation (Evaluate=false, Dialog(tab = "General", group = "Geometry building")); - final parameter Modelica.SIunits.Area ARoo = + final parameter Modelica.Units.SI.Area ARoo = (length-thicknessFac)*(width-thicknessFac) "Roof area of the building"; - final parameter Modelica.SIunits.Area AFac = + final parameter Modelica.Units.SI.Area AFac = (2.0*(length-thicknessFac)+2.0*(width-thicknessFac))*heightSto*nSto*(1.0-fAreaAdjBld)-sum(AWin) "Opaque facade area of the building"; - parameter Modelica.SIunits.CoefficientOfHeatTransfer UValFac = 1.0 + parameter Modelica.Units.SI.CoefficientOfHeatTransfer UValFac = 1.0 "Mean heat loss coefficient of the opaque building facade" annotation (Evaluate=false, Dialog(tab="Constructions", group="Ambience constructions")); - parameter Modelica.SIunits.CoefficientOfHeatTransfer UValRoo = 1.0 + parameter Modelica.Units.SI.CoefficientOfHeatTransfer UValRoo = 1.0 "Mean heat loss coefficient of the building roof" annotation (Evaluate=false, Dialog(tab="Constructions", group="Roof constructions")); parameter BuildingSystems.Buildings.Types.ThermalBuildingCapacity conAmb = BuildingSystems.Buildings.Types.ThermalBuildingCapacity.Medium @@ -70,13 +70,13 @@ parameter BuildingSystems.Buildings.Types.ThermalBuildingCapacity conInn = BuildingSystems.Buildings.Types.ThermalBuildingCapacity.Medium "Thermal capacity inner building construction" annotation (Evaluate=true, Dialog(tab="Constructions", group="Thermal building capacity")); - parameter Modelica.SIunits.Length heightSto = 3.0 + parameter Modelica.Units.SI.Length heightSto = 3.0 "Brutto height of one storey" annotation(Evaluate=false, Dialog(tab = "General", group = "Geometry building")); parameter Real nSto = 2.0 "Number of storeys" annotation(Evaluate=false, Dialog(tab = "General", group = "Geometry building")); - final parameter Modelica.SIunits.Area AFloorSpace = width*length*nSto + final parameter Modelica.Units.SI.Area AFloorSpace = width*length*nSto "Floor space area of the building"; parameter Real fWin = 0.3 "Window percentage of the facades" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/BuildingTemplates/Building1Zone1DBox.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/BuildingTemplates/Building1Zone1DBox.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/BuildingTemplates/Building1Zone1DBox.mo" 2021-11-24 08:09:20.795367068 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/BuildingTemplates/Building1Zone1DBox.mo" 2021-11-24 08:10:49.899099298 +0000 @@ -81,7 +81,7 @@ parameter Boolean InteriorWalls = true "True: Interior walls are present, false: Interior walls are absent" annotation(Dialog(tab = "Opaque constructions", group = "Interior constructions")); - parameter Modelica.SIunits.Area AInteriorWalls = 1.0 + parameter Modelica.Units.SI.Area AInteriorWalls = 1.0 "Surface area of one side of the interior walls" annotation(Dialog(tab="Opaque constructions",group="Interior constructions")); replaceable parameter BuildingSystems.Buildings.Data.Constructions.OpaqueThermalConstruction constructionWallsInterior @@ -90,7 +90,7 @@ parameter Boolean InteriorCeilings = true "True: Interior ceilings are present, false: Interior ceilings are absent" annotation(Dialog(tab = "Opaque constructions", group = "Interior constructions")); - parameter Modelica.SIunits.Area AInteriorCeilings = 1.0 + parameter Modelica.Units.SI.Area AInteriorCeilings = 1.0 "Surface area of one side of the interior ceilings" annotation(Dialog(tab="Opaque constructions",group="Interior constructions")); replaceable parameter BuildingSystems.Buildings.Data.Constructions.OpaqueThermalConstruction constructionCeilingsInterior @@ -100,50 +100,50 @@ BuildingSystems.Buildings.Types.ThermalBoundaryCondition.Ambience "Thermal boundary condition wall1" annotation(Dialog(tab = "Opaque constructions", group = "Thermal boundary conditions")); - parameter Modelica.SIunits.Temp_K TWall1_constant = 293.15 + parameter Modelica.Units.SI.Temperature TWall1_constant = 293.15 "Constant temperature on the outer surface of wall1 (used if BCWall1=Constant)" annotation (Dialog(tab = "Opaque constructions", group = "Thermal boundary conditions")); parameter BuildingSystems.Buildings.Types.ThermalBoundaryCondition BCWall2= BuildingSystems.Buildings.Types.ThermalBoundaryCondition.Ambience "Thermal boundary condition wall2" annotation(Dialog(tab = "Opaque constructions", group = "Thermal boundary conditions")); - parameter Modelica.SIunits.Temp_K TWall2_constant = 293.15 + parameter Modelica.Units.SI.Temperature TWall2_constant = 293.15 "Constant temperature on the outer surface of wall2 (used if BCWall2=Constant)" annotation (Dialog(tab = "Opaque constructions", group = "Thermal boundary conditions")); parameter BuildingSystems.Buildings.Types.ThermalBoundaryCondition BCWall3= BuildingSystems.Buildings.Types.ThermalBoundaryCondition.Ambience "Thermal boundary condition wall3" annotation(Dialog(tab = "Opaque constructions", group = "Thermal boundary conditions")); - parameter Modelica.SIunits.Temp_K TWall3_constant = 293.15 + parameter Modelica.Units.SI.Temperature TWall3_constant = 293.15 "Constant temperature on the outer surface of wall3 (used if BCWall3=Constant)" annotation (Dialog(tab = "Opaque constructions", group = "Thermal boundary conditions")); parameter BuildingSystems.Buildings.Types.ThermalBoundaryCondition BCWall4= BuildingSystems.Buildings.Types.ThermalBoundaryCondition.Ambience "Thermal boundary condition wall4" annotation(Dialog(tab = "Opaque constructions", group = "Thermal boundary conditions")); - parameter Modelica.SIunits.Temp_K TWall4_constant = 293.15 + parameter Modelica.Units.SI.Temperature TWall4_constant = 293.15 "Constant temperature on the outer surface of wall4 (used if BCWall4=Constant)" annotation (Dialog(tab = "Opaque constructions", group = "Thermal boundary conditions")); parameter BuildingSystems.Buildings.Types.ThermalBoundaryCondition BCCeiling= BuildingSystems.Buildings.Types.ThermalBoundaryCondition.Ambience "Thermal boundary condition ceiling" annotation(Dialog(tab = "Opaque constructions", group = "Thermal boundary conditions")); - parameter Modelica.SIunits.Temp_K TCeiling_constant = 293.15 + parameter Modelica.Units.SI.Temperature TCeiling_constant = 293.15 "Constant temperature on the outer surface of ceiling (used if BCCeiling=Constant)" annotation (Dialog(tab = "Opaque constructions", group = "Thermal boundary conditions")); - parameter Modelica.SIunits.Length width = 10.0 + parameter Modelica.Units.SI.Length width = 10.0 "Width of the building (inner space)" annotation(Dialog(tab="General",group="Geometry")); - parameter Modelica.SIunits.Length length = 10.0 + parameter Modelica.Units.SI.Length length = 10.0 "Length of the building (inner space)" annotation(Dialog(tab="General",group="Geometry")); - parameter Modelica.SIunits.Length height = 2.8 + parameter Modelica.Units.SI.Length height = 2.8 "Height of the building (inner space)" annotation(Dialog(tab="General",group="Geometry")); - parameter Modelica.SIunits.Length widthWindow1 = 0.0 + parameter Modelica.Units.SI.Length widthWindow1 = 0.0 "Width of window1" annotation(Dialog(tab= "Transparent constructions",group = "window1 (included in constructionWall1)")); - parameter Modelica.SIunits.Length heightWindow1 = 0.0 + parameter Modelica.Units.SI.Length heightWindow1 = 0.0 "Height of window1" annotation(Dialog(tab= "Transparent constructions",group = "window1 (included in constructionWall1)")); parameter Real framePortionWindow1 = 0.2 @@ -164,10 +164,10 @@ "Shading coefficient window1" annotation (Placement(transformation(extent={{-10,-10},{10,10}},origin={-98,-12}), iconTransformation(extent={{-8,-8},{8,8}},rotation=270,origin={-60,54}))); - parameter Modelica.SIunits.Length widthWindow2 = 0.0 + parameter Modelica.Units.SI.Length widthWindow2 = 0.0 "Width of window2" annotation(Dialog(tab= "Transparent constructions",group = "window2 (included in constructionWall2)")); - parameter Modelica.SIunits.Length heightWindow2 = 0.0 + parameter Modelica.Units.SI.Length heightWindow2 = 0.0 "Height of window2" annotation(Dialog(tab= "Transparent constructions",group = "window2 (included in constructionWall2)")); parameter Real framePortionWindow2 = 0.2 @@ -189,10 +189,10 @@ annotation (Placement(transformation(extent={{-10,-10},{10,10}},origin={8,52}, rotation=-90), iconTransformation(extent={{-8,-8},{8,8}},rotation=270,origin={-30,54}))); - parameter Modelica.SIunits.Length widthWindow3 = 0.0 + parameter Modelica.Units.SI.Length widthWindow3 = 0.0 "Width of window3" annotation(Dialog(tab= "Transparent constructions",group = "window3 (included in constructionWall3)")); - parameter Modelica.SIunits.Length heightWindow3 = 0.0 + parameter Modelica.Units.SI.Length heightWindow3 = 0.0 "Height of window3" annotation(Dialog(tab= "Transparent constructions",group = "window3 (included in constructionWall3)")); parameter Real framePortionWindow3 = 0.2 @@ -213,10 +213,10 @@ "Shading coefficient window3" annotation (Placement(transformation(extent={{10,-10},{-10,10}},origin={76,10}), iconTransformation(extent={{-8,-8},{8,8}},rotation=270,origin={0,54}))); - parameter Modelica.SIunits.Length widthWindow4 = 0.0 + parameter Modelica.Units.SI.Length widthWindow4 = 0.0 "Width of window4" annotation(Dialog(tab= "Transparent constructions",group = "window4 (included in constructionWall4)")); - parameter Modelica.SIunits.Length heightWindow4 = 0.0 + parameter Modelica.Units.SI.Length heightWindow4 = 0.0 "Height of window4" annotation(Dialog(tab= "Transparent constructions",group = "window4 (included in constructionWall4)")); parameter Real framePortionWindow4 = 0.2 @@ -237,43 +237,43 @@ "Shading coefficient window4" annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=90,origin={0,-64}), iconTransformation(extent={{-8,-8},{8,8}},rotation=270,origin={30,54}))); - parameter Modelica.SIunits.Temp_K TWall1_start = 293.15 + parameter Modelica.Units.SI.Temperature TWall1_start = 293.15 "Start temperature of each layer of wall1" annotation (Dialog(tab="Initialization",group = "Opaque constructions")); - parameter Modelica.SIunits.Temp_K TWall2_start = 293.15 + parameter Modelica.Units.SI.Temperature TWall2_start = 293.15 "Start temperature of each layer of wall2" annotation (Dialog(tab="Initialization",group = "Opaque constructions")); - parameter Modelica.SIunits.Temp_K TWall3_start = 293.15 + parameter Modelica.Units.SI.Temperature TWall3_start = 293.15 "Start temperature of each layer of wall3" annotation (Dialog(tab="Initialization",group = "Opaque constructions")); - parameter Modelica.SIunits.Temp_K TWall4_start = 293.15 + parameter Modelica.Units.SI.Temperature TWall4_start = 293.15 "Start temperature of each layer of wall4" annotation (Dialog(tab="Initialization",group = "Opaque constructions")); - parameter Modelica.SIunits.Temp_K TCeiling_start = 293.15 + parameter Modelica.Units.SI.Temperature TCeiling_start = 293.15 "Start temperature of each layer of ceiling" annotation (Dialog(tab="Initialization",group = "Opaque constructions")); - parameter Modelica.SIunits.Temp_K TBottom_start = 293.15 + parameter Modelica.Units.SI.Temperature TBottom_start = 293.15 "Start temperature of each layer of bottom" annotation (Dialog(tab="Initialization",group = "Opaque constructions")); - parameter Modelica.SIunits.Temp_K TWallsInterior_start = 293.15 + parameter Modelica.Units.SI.Temperature TWallsInterior_start = 293.15 "Start temperature of each layer of interior walls" annotation (Dialog(tab="Initialization",group = "Opaque constructions")); - parameter Modelica.SIunits.Temp_K TCeilingsInterior_start = 293.15 + parameter Modelica.Units.SI.Temperature TCeilingsInterior_start = 293.15 "Start temperature of each layer of interior ceilings" annotation (Dialog(tab="Initialization",group = "Opaque constructions")); - parameter Modelica.SIunits.Temp_K TWindow1_start = 293.15 + parameter Modelica.Units.SI.Temperature TWindow1_start = 293.15 "Start temperature of each layer of window1" annotation (Dialog(tab="Initialization",group = "Transparent constructions")); - parameter Modelica.SIunits.Temp_K TWindow2_start = 293.15 + parameter Modelica.Units.SI.Temperature TWindow2_start = 293.15 "Start temperature of each layer of window2" annotation (Dialog(tab="Initialization",group = "Transparent constructions")); - parameter Modelica.SIunits.Temp_K TWindow3_start = 293.15 + parameter Modelica.Units.SI.Temperature TWindow3_start = 293.15 "Start temperature of each layer of window3" annotation (Dialog(tab="Initialization",group = "Transparent constructions")); - parameter Modelica.SIunits.Temp_K TWindow4_start = 293.15 + parameter Modelica.Units.SI.Temperature TWindow4_start = 293.15 "Start temperature of each layer of window4" annotation (Dialog(tab="Initialization",group = "Transparent constructions")); - parameter Modelica.SIunits.Temp_K TAir_start = 293.15 + parameter Modelica.Units.SI.Temperature TAir_start = 293.15 "Start temperature of indoor air temperature" annotation (Dialog(tab="Initialization")); parameter Real clo = 0.5 @@ -285,7 +285,7 @@ Modelica.Blocks.Interfaces.RealInput wme = 0.0 "External work" annotation(HideResult = true, Dialog(tab="Advanced",group="Thermal comfort (PMV and PPD calculation)")); - parameter Modelica.SIunits.Velocity vAir = 0.1 + parameter Modelica.Units.SI.Velocity vAir = 0.1 "Mean relative air velocity in the area of user presence" annotation(HideResult = true, Dialog(tab="Advanced",group="Thermal comfort (PMV and PPD calculation)")); parameter BuildingSystems.Buildings.Types.NumericalResolution numResWall1= diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/BuildingTemplates/Building1Zone1DCylinder.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/BuildingTemplates/Building1Zone1DCylinder.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/BuildingTemplates/Building1Zone1DCylinder.mo" 2021-11-24 08:09:20.795367068 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/BuildingTemplates/Building1Zone1DCylinder.mo" 2021-11-24 08:10:49.795099610 +0000 @@ -34,10 +34,10 @@ parameter Integer nSeg(min=3) = 3 "Number of wall segments of the cylinder" annotation(Dialog(tab="Geometry",group="Building")); - parameter Modelica.SIunits.Length diameter = 1.0 + parameter Modelica.Units.SI.Length diameter = 1.0 "Diameter of the building (inner space)" annotation(Dialog(tab="Geometry",group="Building")); - parameter Modelica.SIunits.Length height = 2.8 + parameter Modelica.Units.SI.Length height = 2.8 "Height of the building (inner space)" annotation(Dialog(tab="Geometry",group="Building")); replaceable BuildingSystems.Buildings.Constructions.Walls.WallThermal1DNodes wall[nSeg]( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/BuildingTemplates/Building1Zone1DDistrict.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/BuildingTemplates/Building1Zone1DDistrict.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/BuildingTemplates/Building1Zone1DDistrict.mo" 2021-11-24 08:09:20.795367068 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/BuildingTemplates/Building1Zone1DDistrict.mo" 2021-11-24 08:10:49.775099670 +0000 @@ -7,11 +7,11 @@ final InteriorWalls=true, final AInteriorCeilings = if nSto > 1 then 2.0 * length*width * (nSto-1) else 0.0, final AInteriorWalls = (2.0 * integer(width/sqrt(ARoom) +0.5) * length + 2.0 * integer(length/sqrt(ARoom)+0.5) * width) * nSto); - parameter Modelica.SIunits.Length heightSto = 3.0 + parameter Modelica.Units.SI.Length heightSto = 3.0 "Height of one storey"; parameter Real nSto = 2.0 "Number of storeys"; - parameter Modelica.SIunits.Area ARoom = 4.0 * 4.0 + parameter Modelica.Units.SI.Area ARoom = 4.0 * 4.0 "Mean floor area of a room"; parameter Integer id = 1 "Building ID" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Comfort/Examples/ThermalComfort_DIN_EN_ISO_7730_Dynamic.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Comfort/Examples/ThermalComfort_DIN_EN_ISO_7730_Dynamic.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Comfort/Examples/ThermalComfort_DIN_EN_ISO_7730_Dynamic.mo" 2021-11-24 08:09:20.795367068 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Comfort/Examples/ThermalComfort_DIN_EN_ISO_7730_Dynamic.mo" 2021-11-24 08:10:49.759099719 +0000 @@ -7,13 +7,13 @@ Modelica.Blocks.Sources.Sine TAir( offset=293.15, amplitude=12.0, - freqHz=1.0/3600.0, +f =1.0/3600.0, startTime=0.0) "Air temperature" annotation (Placement(transformation(extent={{-74,68},{-66,76}}))); Modelica.Blocks.Sources.Sine Tr( offset=293.15, - freqHz=1.0/3600.0, +f =1.0/3600.0, startTime=0.0, amplitude=14.0) "Mean radiant temperature" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Comfort/Functions/PMV_DIN_EN_ISO_7730.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Comfort/Functions/PMV_DIN_EN_ISO_7730.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Comfort/Functions/PMV_DIN_EN_ISO_7730.mo" 2021-11-24 08:09:20.795367068 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Comfort/Functions/PMV_DIN_EN_ISO_7730.mo" 2021-11-24 08:10:49.731099802 +0000 @@ -1,13 +1,13 @@ within BuildingSystems.Buildings.Comfort.Functions; function PMV_DIN_EN_ISO_7730 "Calculates the PMV index accordung to DIN EN ISO 7730" - input Modelica.SIunits.Temp_K TAir + input Modelica.Units.SI.Temperature TAir "Air temperature"; - input Modelica.SIunits.Temp_K Tr + input Modelica.Units.SI.Temperature Tr "Mean radiatiant temperature"; - input Modelica.SIunits.Temp_K Tcl + input Modelica.Units.SI.Temperature Tcl "Clothing surface temperature"; - input Modelica.SIunits.MassFraction xAir + input Modelica.Units.SI.MassFraction xAir "Absolute air moisture"; input Real M(unit="W/m2") "Metabolism rate"; @@ -15,16 +15,16 @@ "Effective mechanical power"; input Real fcl "Clothing surface area factor"; - input Modelica.SIunits.CoefficientOfHeatTransfer hc + input Modelica.Units.SI.CoefficientOfHeatTransfer hc "Convective heat transfer coefficient"; output Real PMV "Predicted mean vote"; protected Real HL1, HL2, HL3, HL4, HL5, HL6, TS "Helping variables"; - Modelica.SIunits.Pressure p + Modelica.Units.SI.Pressure p "Water vapour partial pressure"; - constant Modelica.SIunits.Pressure pAir = 101300.0 + constant Modelica.Units.SI.Pressure pAir = 101300.0 "Air pressure"; algorithm p := BuildingSystems.Utilities.MoistAirFunctions.p(xAir,pAir); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Comfort/ThermalComfort_DIN_EN_ISO_7730.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Comfort/ThermalComfort_DIN_EN_ISO_7730.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Comfort/ThermalComfort_DIN_EN_ISO_7730.mo" 2021-11-24 08:09:20.795367068 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Comfort/ThermalComfort_DIN_EN_ISO_7730.mo" 2021-11-24 08:10:49.695099911 +0000 @@ -37,7 +37,7 @@ "Predicted percentage dissatisfied" annotation (Placement(transformation(extent={{80,20},{100,40}}), iconTransformation(extent={{80,20},{100,40}}))); - Modelica.SIunits.Temp_K Tcl = tcl + 273.15 + Modelica.Units.SI.Temperature Tcl = tcl + 273.15 "Clothing surface temperature"; Real M(unit="W/m2") "Metabolic rate"; @@ -46,12 +46,12 @@ protected Real fcl "Clothing surface area factor"; - Modelica.SIunits.CoefficientOfHeatTransfer hc + Modelica.Units.SI.CoefficientOfHeatTransfer hc "Convective heat transfer coefficient"; - Modelica.SIunits.ThermalInsulance Icl + Modelica.Units.SI.ThermalInsulance Icl "Thermal insulation for clothing"; Real hcf, hcn; - Modelica.SIunits.Temp_C tcl + Modelica.Units.NonSI.Temperature_degC tcl "Clothing surface temperature"; equation M = met * 58.15; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Constructions/Doors/Door.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Constructions/Doors/Door.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Constructions/Doors/Door.mo" 2021-11-24 08:09:20.795367068 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Constructions/Doors/Door.mo" 2021-11-24 08:10:49.667099995 +0000 @@ -35,7 +35,7 @@ parameter Integer nCom=10 "Number of compartments for the discretization" annotation(Dialog(tab = "General", group = "Air change calculation")); - parameter Modelica.SIunits.Area LClo(min=0)=0.001 + parameter Modelica.Units.SI.Area LClo(min=0)=0.001 "Effective leakage area of closed door" annotation(Dialog(tab = "General", group = "Air change calculation")); BuildingSystems.Airflow.Multizone.DoorDiscretizedOperable ope( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Constructions/Examples/WallThermal1DNodesFlexGeo.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Constructions/Examples/WallThermal1DNodesFlexGeo.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Constructions/Examples/WallThermal1DNodesFlexGeo.mo" 2021-11-24 08:09:20.795367068 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Constructions/Examples/WallThermal1DNodesFlexGeo.mo" 2021-11-24 08:10:49.587100235 +0000 @@ -27,13 +27,13 @@ annotation (Placement(transformation(extent={{-50,-10},{-30,10}}))); Modelica.Blocks.Sources.Sine width( amplitude=0.5, - freqHz=1/86400, +f =1/86400, startTime=0, offset=2) annotation (Placement(transformation(extent={{-16,18},{-10,24}}))); Modelica.Blocks.Sources.Sine height( amplitude=0.5, - freqHz=1/86400, +f =1/86400, offset=1, startTime=0) annotation (Placement(transformation(extent={{-16,28},{-10,34}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Constructions/Examples/WallThermalTriangular1DNodesFlexGeo.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Constructions/Examples/WallThermalTriangular1DNodesFlexGeo.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Constructions/Examples/WallThermalTriangular1DNodesFlexGeo.mo" 2021-11-24 08:09:20.795367068 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Constructions/Examples/WallThermalTriangular1DNodesFlexGeo.mo" 2021-11-24 08:10:49.555100331 +0000 @@ -32,7 +32,7 @@ Modelica.Blocks.Sources.Constant angleDegAzi( k=0.0) annotation (Placement(transformation(extent={{16,28},{10,34}}))); - Modelica.Blocks.Sources.Sine x1(amplitude=0.25, freqHz=1/3600) + Modelica.Blocks.Sources.Sine x1(amplitude=0.25, f =1/3600) annotation (Placement(transformation(extent={{-34,32},{-28,38}}))); Modelica.Blocks.Sources.Constant x2(k=1.0) annotation (Placement( transformation( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Constructions/Examples/WindowWithAirpathsFlexGeo.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Constructions/Examples/WindowWithAirpathsFlexGeo.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Constructions/Examples/WindowWithAirpathsFlexGeo.mo" 2021-11-24 08:09:20.795367068 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Constructions/Examples/WindowWithAirpathsFlexGeo.mo" 2021-11-24 08:10:49.515100451 +0000 @@ -41,7 +41,7 @@ annotation (Placement(transformation(extent={{-8,-20},{-2,-14}}))); Modelica.Blocks.Sources.Sine height( amplitude=0.5, - freqHz=1/86400, +f =1/86400, offset=1, startTime=0) annotation (Placement(transformation(extent={{-16,32},{-10,38}}))); @@ -53,7 +53,7 @@ annotation (Placement(transformation(extent={{16,22},{10,28}}))); Modelica.Blocks.Sources.Sine width( amplitude=0.5, - freqHz=1/86400, +f =1/86400, startTime=0, offset=2) annotation (Placement(transformation(extent={{-16,22},{-10,28}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Constructions/Shadowing/Embrasure.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Constructions/Shadowing/Embrasure.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Constructions/Shadowing/Embrasure.mo" 2021-11-24 08:09:20.795367068 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Constructions/Shadowing/Embrasure.mo" 2021-11-24 08:10:49.451100643 +0000 @@ -2,7 +2,7 @@ model Embrasure "Model of an embrasure" extends BuildingSystems.Buildings.BaseClasses.ShadowingElementGeneral; - parameter Modelica.SIunits.Length depth = 0.0 + parameter Modelica.Units.SI.Length depth = 0.0 "Depth of the embrasure"; equation SC = BuildingSystems.Buildings.Constructions.Shadowing.Functions.embrasure( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Constructions/Shadowing/Functions/embrasure.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Constructions/Shadowing/Functions/embrasure.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Constructions/Shadowing/Functions/embrasure.mo" 2021-11-24 08:09:20.795367068 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Constructions/Shadowing/Functions/embrasure.mo" 2021-11-24 08:10:49.423100727 +0000 @@ -2,17 +2,17 @@ function embrasure "Calculates the shadowing coefficent of an embrasure" extends Modelica.Icons.Function; - input Modelica.SIunits.Length height + input Modelica.Units.SI.Length height "Height of the embrasure"; - input Modelica.SIunits.Length width + input Modelica.Units.SI.Length width "Width of the embrasure"; - input Modelica.SIunits.Length depth + input Modelica.Units.SI.Length depth "Depth of the embrasure"; - input Modelica.SIunits.Conversions.NonSIunits.Angle_deg angleDegAzi + input Modelica.Units.NonSI.Angle_deg angleDegAzi "Azimuth angle of the embrasure: south: 0 deg, east: -90 deg, west +90 deg, north: 180 deg"; - input Modelica.SIunits.Conversions.NonSIunits.Angle_deg angleDegAziSun + input Modelica.Units.NonSI.Angle_deg angleDegAziSun "Azimuth angle of the sun: south: 0 deg, east: -90 deg, west +90 deg, north: 180 deg"; - input Modelica.SIunits.Conversions.NonSIunits.Angle_deg angleDegHeightSun + input Modelica.Units.NonSI.Angle_deg angleDegHeightSun "Height angle of the sun"; output Real SC "Shading coefficient"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Constructions/Shadowing/Functions/overhang.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Constructions/Shadowing/Functions/overhang.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Constructions/Shadowing/Functions/overhang.mo" 2021-11-24 08:09:20.795367068 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Constructions/Shadowing/Functions/overhang.mo" 2021-11-24 08:10:49.419100740 +0000 @@ -2,17 +2,17 @@ function overhang "Calculates the shadowing coefficent of an overhang" extends Modelica.Icons.Function; - input Modelica.SIunits.Length height + input Modelica.Units.SI.Length height "Height of the opening"; - input Modelica.SIunits.Length heightOH + input Modelica.Units.SI.Length heightOH "Height of the overhang"; - input Modelica.SIunits.Length depthOH + input Modelica.Units.SI.Length depthOH "Depth of the overhang"; - input Modelica.SIunits.Conversions.NonSIunits.Angle_deg angleDegAzi + input Modelica.Units.NonSI.Angle_deg angleDegAzi "Azimuth angle of the embrasure: south: 0 deg, east: -90 deg, west +90 deg, north: 180 deg"; - input Modelica.SIunits.Conversions.NonSIunits.Angle_deg angleDegAziSun + input Modelica.Units.NonSI.Angle_deg angleDegAziSun "Azimuth angle of the sun: south: 0 deg, east: -90 deg, west +90 deg, north: 180 deg"; - input Modelica.SIunits.Conversions.NonSIunits.Angle_deg angleDegHeightSun + input Modelica.Units.NonSI.Angle_deg angleDegHeightSun "Height angle of the sun"; output Real SC "Shading coefficient"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Constructions/Shadowing/Overhang.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Constructions/Shadowing/Overhang.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Constructions/Shadowing/Overhang.mo" 2021-11-24 08:09:20.795367068 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Constructions/Shadowing/Overhang.mo" 2021-11-24 08:10:49.411100763 +0000 @@ -2,9 +2,9 @@ model Overhang "Model of a horizontal overhang" extends BuildingSystems.Buildings.BaseClasses.ShadowingElementGeneral; - parameter Modelica.SIunits.Length depthOH = 0.0 + parameter Modelica.Units.SI.Length depthOH = 0.0 "Depth of the overhang"; - parameter Modelica.SIunits.Length heightOH = 0.0 + parameter Modelica.Units.SI.Length heightOH = 0.0 "Height of the overhang"; equation SC = BuildingSystems.Buildings.Constructions.Shadowing.Functions.overhang( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Constructions/Shadowing/OverhangElement.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Constructions/Shadowing/OverhangElement.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Constructions/Shadowing/OverhangElement.mo" 2021-11-24 08:09:20.795367068 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Constructions/Shadowing/OverhangElement.mo" 2021-11-24 08:10:49.403100787 +0000 @@ -12,11 +12,11 @@ Modelica.Blocks.Interfaces.RealOutput SC annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=-90,origin={0,-90}), iconTransformation(extent={{-10,-10},{10,10}},rotation=-90,origin={0,-90}))); - parameter Modelica.SIunits.Length depthOH = 0.0 + parameter Modelica.Units.SI.Length depthOH = 0.0 "Depth of the overhang"; - parameter Modelica.SIunits.Length heightOH = 0.0 + parameter Modelica.Units.SI.Length heightOH = 0.0 "Height of the overhang"; - parameter Modelica.SIunits.Length heightWin = 0.0 + parameter Modelica.Units.SI.Length heightWin = 0.0 "Height of the window"; equation connect(radiationPort_in, overhang.radiationPort_in) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Constructions/Walls/WallHygroThermal1DNodes.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Constructions/Walls/WallHygroThermal1DNodes.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Constructions/Walls/WallHygroThermal1DNodes.mo" 2021-11-24 08:09:20.795367068 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Constructions/Walls/WallHygroThermal1DNodes.mo" 2021-11-24 08:10:49.391100823 +0000 @@ -45,7 +45,7 @@ "Absolute moisture on surface side 2" annotation (Placement(transformation(extent={{-10,-10},{10,10}},origin={50,40}), iconTransformation(extent={{-10,-10},{10,10}},rotation=0,origin={30,60}))); - parameter Modelica.SIunits.Area AInnSur = 0.0 + parameter Modelica.Units.SI.Area AInnSur = 0.0 "Area of all enclosed surfaces (if geometryType == Fixed)" annotation(Dialog(tab = "General", group = "Geometry")); output BuildingSystems.Interfaces.AreaOutput AInnSur_internal diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Constructions/Walls/WallThermal1DNodes.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Constructions/Walls/WallThermal1DNodes.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Constructions/Walls/WallThermal1DNodes.mo" 2021-11-24 08:09:20.795367068 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Constructions/Walls/WallThermal1DNodes.mo" 2021-11-24 08:10:49.375100872 +0000 @@ -33,7 +33,7 @@ "Temperature on surface side 2" annotation (Placement(transformation(extent={{-10,-10},{10,10}},origin={50,40}), iconTransformation(extent={{20,30},{40,50}}))); - parameter Modelica.SIunits.Area AInnSur = 0.0 + parameter Modelica.Units.SI.Area AInnSur = 0.0 "Area of all enclosed surfaces (if geometryType == Fixed)" annotation(Dialog(tab = "Geometry", group = "General")); output BuildingSystems.Interfaces.AreaOutput AInnSur_internal diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Constructions/Windows/SlidingWindow.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Constructions/Windows/SlidingWindow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Constructions/Windows/SlidingWindow.mo" 2021-11-24 08:09:20.795367068 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Constructions/Windows/SlidingWindow.mo" 2021-11-24 08:10:49.327101016 +0000 @@ -8,7 +8,7 @@ final hOpe = height), radTra1to2(areaRatioUnglazed = widthOpen/width*y_internal), radTra2to1(areaRatioUnglazed = widthOpen/width*y_internal)); - parameter Modelica.SIunits.Length widthOpen = 0.5 + parameter Modelica.Units.SI.Length widthOpen = 0.5 "Max. width of the open part (full opened postion)" annotation(Dialog(tab = "General", group = "Geometry")); output Modelica.Blocks.Interfaces.RealOutput y_internal diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Data/AirpathCharacteristics/AirpathCharacteristicWindow.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Data/AirpathCharacteristics/AirpathCharacteristicWindow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Data/AirpathCharacteristics/AirpathCharacteristicWindow.mo" 2021-11-24 08:09:20.799367057 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Data/AirpathCharacteristics/AirpathCharacteristicWindow.mo" 2021-11-24 08:10:49.303101088 +0000 @@ -2,16 +2,16 @@ block AirpathCharacteristicWindow input BuildingSystems.Interfaces.Angle_degInput angleDegPanes "Tilt angle of the panes"; - parameter Modelica.SIunits.Length height + parameter Modelica.Units.SI.Length height "Height of the opening"; - parameter Modelica.SIunits.Length width + parameter Modelica.Units.SI.Length width "Width of the opening"; parameter BuildingSystems.Types.CoefficientOfAirChange aF "Joint coefficient"; output Modelica.Blocks.Interfaces.RealOutput k "Flow coefficient"; output Modelica.Blocks.Interfaces.RealOutput m; - constant Modelica.SIunits.Density rhoAir = 1.2 + constant Modelica.Units.SI.Density rhoAir = 1.2 "Mean air density"; protected Real kClosed, kOpen; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Data/AirpathCharacteristics/CdTiltedPane.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Data/AirpathCharacteristics/CdTiltedPane.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Data/AirpathCharacteristics/CdTiltedPane.mo" 2021-11-24 08:09:20.799367057 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Data/AirpathCharacteristics/CdTiltedPane.mo" 2021-11-24 08:10:49.271101184 +0000 @@ -1,11 +1,11 @@ within BuildingSystems.Buildings.Data.AirpathCharacteristics; function CdTiltedPane "Calculates the Cd value of a tilted pane" - input Modelica.SIunits.Length height + input Modelica.Units.SI.Length height "Height of the opening"; - input Modelica.SIunits.Length width + input Modelica.Units.SI.Length width "Width of the opening"; - input Modelica.SIunits.Conversions.NonSIunits.Angle_deg angleDegPanes + input Modelica.Units.NonSI.Angle_deg angleDegPanes "Tilt angle of the panes"; output Real value; algorithm diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Data/Constructions/TransparentConstruction.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Data/Constructions/TransparentConstruction.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Data/Constructions/TransparentConstruction.mo" 2021-11-24 08:09:20.799367057 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Data/Constructions/TransparentConstruction.mo" 2021-11-24 08:10:48.971102084 +0000 @@ -4,11 +4,11 @@ extends Modelica.Icons.Record; parameter Integer nPanes(min=1)=1 "Number of panes of the construction"; - parameter Modelica.SIunits.Length thickness[nPanes]={0.003} + parameter Modelica.Units.SI.Length thickness[nPanes]={0.003} "Thickness of each pane"; - parameter Modelica.SIunits.CoefficientOfHeatTransfer UValGla + parameter Modelica.Units.SI.CoefficientOfHeatTransfer UValGla "U-value of the glass construction"; - parameter Modelica.SIunits.CoefficientOfHeatTransfer UValFra + parameter Modelica.Units.SI.CoefficientOfHeatTransfer UValFra "U-value of the frame"; parameter Real g(unit = "1") "g-value of the transparent construction"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Examples/BuildingThermalMultiZone.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Examples/BuildingThermalMultiZone.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Examples/BuildingThermalMultiZone.mo" 2021-11-24 08:09:20.799367057 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Examples/BuildingThermalMultiZone.mo" 2021-11-24 08:10:48.831102505 +0000 @@ -57,7 +57,7 @@ useAirPaths = false, heatSources = true, nHeatSources = 13); - parameter Modelica.SIunits.Length heightRooms = 3.0 + parameter Modelica.Units.SI.Length heightRooms = 3.0 "Height of all rooms"; BuildingSystems.Buildings.Zones.ZoneTemplateAirvolumeMixed office1( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Functions/TAir.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Functions/TAir.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Functions/TAir.mo" 2021-11-24 08:09:20.799367057 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Functions/TAir.mo" 2021-11-24 08:10:47.715105856 +0000 @@ -1,15 +1,15 @@ within BuildingSystems.Buildings.Functions; function TAir "Height dependent air temperature" - input Modelica.SIunits.Temp_K TAirRef + input Modelica.Units.SI.Temperature TAirRef "Air temperature on reference height"; - input Modelica.SIunits.Height z + input Modelica.Units.SI.Height z "Height over ground"; - input Modelica.SIunits.Height zRefTAir + input Modelica.Units.SI.Height zRefTAir "Reference height air temperature measurement"; input Real gamma(unit = "K/m") "Temperature gradient of the planetary boundary layer in K/m"; - output Modelica.SIunits.Temp_K value "Height dependent air temperature"; + output Modelica.Units.SI.Temperature value "Height dependent air temperature"; algorithm // Vertical air temperature profile (assumption: polytrop atmosphere (linear decreasing air temperature) value := TAirRef - gamma * (z - zRefTAir); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Functions/TSky.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Functions/TSky.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Functions/TSky.mo" 2021-11-24 08:09:20.799367057 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Functions/TSky.mo" 2021-11-24 08:10:47.711105868 +0000 @@ -1,26 +1,26 @@ within BuildingSystems.Buildings.Functions; function TSky "Calculates the sky temperature" - input Modelica.SIunits.Temp_K TAirRef + input Modelica.Units.SI.Temperature TAirRef "Air temperature on reference height"; input Real timeS "Time in seconds"; input Real bSky "Clearness index of the sky: 0 (clear) to 1 (100 percent covered)"; - input Modelica.SIunits.MassFraction xAir + input Modelica.Units.SI.MassFraction xAir "Absolute air moisture"; - input Modelica.SIunits.Pressure pRef + input Modelica.Units.SI.Pressure pRef "Air pressure on reference height"; - input Modelica.SIunits.Pressure pGround + input Modelica.Units.SI.Pressure pGround "Air pressure on ground level"; - output Modelica.SIunits.Temp_K value + output Modelica.Units.SI.Temperature value "Sky temperature"; protected - Modelica.SIunits.MassFraction xAirSat + Modelica.Units.SI.MassFraction xAirSat "Absolute moisture of the saturated air"; Real epsLwSky "Long-wave radiation coefficient of the clear sky"; - Modelica.SIunits.Temp_C thetaDp + Modelica.Units.NonSI.Temperature_degC thetaDp "Dew point temperature"; algorithm xAirSat := BuildingSystems.Utilities.MoistAirFunctions.x_sat(pRef,BuildingSystems.Utilities.MoistAirFunctions.p_sat(TAirRef)); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Functions/pAir.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Functions/pAir.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Functions/pAir.mo" 2021-11-24 08:09:20.799367057 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Functions/pAir.mo" 2021-11-24 08:10:47.703105891 +0000 @@ -1,17 +1,17 @@ within BuildingSystems.Buildings.Functions; function pAir "Height dependent static air pressure" - input Modelica.SIunits.Pressure pAirRef + input Modelica.Units.SI.Pressure pAirRef "Static air pressure on reference height"; - input Modelica.SIunits.Temp_K TAirRef + input Modelica.Units.SI.Temperature TAirRef "Air temperature on reference height"; - input Modelica.SIunits.Height z + input Modelica.Units.SI.Height z "Height over ground"; - input Modelica.SIunits.Height zRefTAir + input Modelica.Units.SI.Height zRefTAir "Reference height air temperature measurement"; input Real gamma(unit = "K/m") "Temperature gradient of the planetary boundary layer in K/m"; - output Modelica.SIunits.Pressure value + output Modelica.Units.SI.Pressure value "Height dependent static air pressure"; protected constant Real RAir = 288.0 diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Functions/vWind.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Functions/vWind.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Functions/vWind.mo" 2021-11-24 08:09:20.799367057 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Functions/vWind.mo" 2021-11-24 08:10:47.695105915 +0000 @@ -1,15 +1,15 @@ within BuildingSystems.Buildings.Functions; function vWind "Height dependent wind speed" - input Modelica.SIunits.Velocity vWindRef + input Modelica.Units.SI.Velocity vWindRef "Wind speed on reference height"; - input Modelica.SIunits.Height z + input Modelica.Units.SI.Height z "Height over ground"; - input Modelica.SIunits.Height zRefvWind + input Modelica.Units.SI.Height zRefvWind "Reference height for wind measurement"; input Real P "Roughness exponent for wind profil calculation"; - output Modelica.SIunits.Velocity value + output Modelica.Units.SI.Velocity value "Height dependent wind speed"; algorithm // Vertical wind speed profile: diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Geometries/BaseClasses/GeometryCircle.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Geometries/BaseClasses/GeometryCircle.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Geometries/BaseClasses/GeometryCircle.mo" 2021-11-24 08:09:20.799367057 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Geometries/BaseClasses/GeometryCircle.mo" 2021-11-24 08:10:47.675105975 +0000 @@ -6,12 +6,12 @@ BuildingSystems.Buildings.Geometries.BaseClasses.Vertex3D vertex[nVertices]; parameter Integer nSeg(min=3) "Number of vertices, which represent the circle"; - parameter Modelica.SIunits.Length diameter = 1.0 + parameter Modelica.Units.SI.Length diameter = 1.0 "Diameter of the circle"; - Modelica.SIunits.Length zMean + Modelica.Units.SI.Length zMean "Mean vertical position"; - Modelica.SIunits.Conversions.NonSIunits.Angle_deg angleDegAzi + Modelica.Units.NonSI.Angle_deg angleDegAzi "Azimuth angle"; - Modelica.SIunits.Conversions.NonSIunits.Angle_deg angleDegTil + Modelica.Units.NonSI.Angle_deg angleDegTil "Tilt angle"; end GeometryCircle; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Geometries/BaseClasses/GeometryPolygon.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Geometries/BaseClasses/GeometryPolygon.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Geometries/BaseClasses/GeometryPolygon.mo" 2021-11-24 08:09:20.799367057 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Geometries/BaseClasses/GeometryPolygon.mo" 2021-11-24 08:10:47.671105988 +0000 @@ -1,18 +1,18 @@ within BuildingSystems.Buildings.Geometries.BaseClasses; record GeometryPolygon "3D representation of a polygon" - Modelica.SIunits.Length vertex1[3]; - Modelica.SIunits.Length vertex2[3]; - Modelica.SIunits.Length vertex3[3]; - Modelica.SIunits.Length vertex4[3]; - Modelica.SIunits.Length width + Modelica.Units.SI.Length vertex1[3]; + Modelica.Units.SI.Length vertex2[3]; + Modelica.Units.SI.Length vertex3[3]; + Modelica.Units.SI.Length vertex4[3]; + Modelica.Units.SI.Length width "Width of the rectangle"; - Modelica.SIunits.Length height + Modelica.Units.SI.Length height "Height of the rectangle"; - Modelica.SIunits.Length zMean + Modelica.Units.SI.Length zMean "Mean vertical position"; - Modelica.SIunits.Conversions.NonSIunits.Angle_deg angleDegAzi + Modelica.Units.NonSI.Angle_deg angleDegAzi "Azimuth angle"; - Modelica.SIunits.Conversions.NonSIunits.Angle_deg angleDegTil + Modelica.Units.NonSI.Angle_deg angleDegTil "Tilt angle"; end GeometryPolygon; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Geometries/BaseClasses/Vertex3D.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Geometries/BaseClasses/Vertex3D.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Geometries/BaseClasses/Vertex3D.mo" 2021-11-24 08:09:20.799367057 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Geometries/BaseClasses/Vertex3D.mo" 2021-11-24 08:10:47.663106012 +0000 @@ -1,7 +1,7 @@ within BuildingSystems.Buildings.Geometries.BaseClasses; record Vertex3D "3D representation of a vertex" - Modelica.SIunits.Length x; - Modelica.SIunits.Length y; - Modelica.SIunits.Length z; + Modelica.Units.SI.Length x; + Modelica.Units.SI.Length y; + Modelica.Units.SI.Length z; end Vertex3D; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Geometries/Functions/rotateVector.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Geometries/Functions/rotateVector.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Geometries/Functions/rotateVector.mo" 2021-11-24 08:09:20.799367057 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Geometries/Functions/rotateVector.mo" 2021-11-24 08:10:47.655106035 +0000 @@ -1,13 +1,13 @@ within BuildingSystems.Buildings.Geometries.Functions; function rotateVector "Calculates the coordinates of a rotated 3D vector" - input Modelica.SIunits.Length v[3] + input Modelica.Units.SI.Length v[3] "Original vector"; - input Modelica.SIunits.Length axis[3] + input Modelica.Units.SI.Length axis[3] "Vector of the rotation axis"; - input Modelica.SIunits.Angle theta + input Modelica.Units.SI.Angle theta "Rotation angle"; - output Modelica.SIunits.Length vr[3] + output Modelica.Units.SI.Length vr[3] "Rotated vector"; protected Real x, a, b, c, d; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Interfaces/SurfaceToAirPortGeneral.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Interfaces/SurfaceToAirPortGeneral.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Interfaces/SurfaceToAirPortGeneral.mo" 2021-11-24 08:09:20.799367057 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Interfaces/SurfaceToAirPortGeneral.mo" 2021-11-24 08:10:47.567106300 +0000 @@ -5,11 +5,11 @@ "Port for heat transfer"; BuildingSystems.Interfaces.MoisturePort moisturePort "Port for moisture transfer"; - Modelica.SIunits.Velocity vAir + + Modelica.Units.SI.Velocity vAir "Air velocity"; - Modelica.SIunits.Conversions.NonSIunits.Angle_deg angleDegAir + Modelica.Units.NonSI.Angle_deg angleDegAir "Direction of air motion (0 to 360 deg)"; - annotation ( Documentation(info="
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Interfaces/SurfaceToConstructionPortGeneral.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Interfaces/SurfaceToConstructionPortGeneral.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Interfaces/SurfaceToConstructionPortGeneral.mo" 2021-11-24 08:09:20.799367057 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Interfaces/SurfaceToConstructionPortGeneral.mo" 2021-11-24 08:10:47.527106420 +0000 @@ -11,9 +11,9 @@ "Radiation port for outgoing short wave radiation"; BuildingSystems.Interfaces.RadiationPort radiationPort_in "Radiation port for incoming short wave radiation"; - Modelica.SIunits.Area A + Modelica.Units.SI.Area A "Surface area"; - Modelica.SIunits.Emissivity epsilon + Modelica.Units.SI.Emissivity epsilon "Long-wave emittance of the surface"; BuildingSystems.Types.Absorptance abs "Short-wave absorptance of the surface"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Interfaces/SurfaceToSurfacesPortGeneral.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Interfaces/SurfaceToSurfacesPortGeneral.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Interfaces/SurfaceToSurfacesPortGeneral.mo" 2021-11-24 08:09:20.799367057 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Interfaces/SurfaceToSurfacesPortGeneral.mo" 2021-11-24 08:10:47.507106480 +0000 @@ -9,14 +9,14 @@ "Radiation port for outgoing short wave radiation"; BuildingSystems.Interfaces.RadiationPort radiationPort_in "Radiation port for incoming short wave radiation"; - Modelica.SIunits.Area A "Surface area"; - Modelica.SIunits.Conversions.NonSIunits.Angle_deg angleDegAzi + Modelica.Units.SI.Area A "Surface area"; + Modelica.Units.NonSI.Angle_deg angleDegAzi "Azimuth angle of the surface"; - Modelica.SIunits.Conversions.NonSIunits.Angle_deg angleDegTil + Modelica.Units.NonSI.Angle_deg angleDegTil "Tilt angle of the surface"; - Modelica.SIunits.Length zMean + Modelica.Units.SI.Length zMean "Mean vertical position of the surface"; - Modelica.SIunits.Emissivity epsilon + Modelica.Units.SI.Emissivity epsilon "Long-wave emittance of the surface"; BuildingSystems.Types.Absorptance abs "Short-wave absorptance of the surface"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Surfaces/SurfaceToAir.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Surfaces/SurfaceToAir.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Surfaces/SurfaceToAir.mo" 2021-11-24 08:09:20.799367057 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Surfaces/SurfaceToAir.mo" 2021-11-24 08:10:47.487106540 +0000 @@ -10,23 +10,23 @@ abs=abs) "Port to other surfaces" annotation (Placement(transformation(extent={{-4,30},{16,50}}), iconTransformation(extent={{-4,30},{16,50}}))); - Modelica.SIunits.SurfaceCoefficientOfHeatTransfer alpha + Modelica.Units.SI.SurfaceCoefficientOfHeatTransfer alpha "Convective heat transfer coefficient"; BuildingSystems.Types.MoistureTransferCoefficient beta "Convective moisture transfer coefficient"; - Modelica.SIunits.Temp_K T( + Modelica.Units.SI.Temperature T( start=293.15) "Temperature"; - Modelica.SIunits.MassFraction x( + Modelica.Units.SI.MassFraction x( start = 0.005) "Absolute moisture"; - Modelica.SIunits.Emissivity epsilon + Modelica.Units.SI.Emissivity epsilon "Long-wave emittance"; BuildingSystems.Types.Absorptance abs "Short-wave absorptance"; parameter BuildingSystems.HAM.ConvectiveHeatTransfer.Types.Convection convectionOnSurface = BuildingSystems.HAM.ConvectiveHeatTransfer.Types.Convection.const "Type of convection calculation of the surface"; - parameter Modelica.SIunits.SurfaceCoefficientOfHeatTransfer alphaConstant = 3.0 + parameter Modelica.Units.SI.SurfaceCoefficientOfHeatTransfer alphaConstant = 3.0 "Convective heat transfer coefficient for simplified calculations"; equation toConstructionPort.abs = toSurfacesPort.abs; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Zones/Examples/Airvolume3D1x1x1.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Zones/Examples/Airvolume3D1x1x1.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Zones/Examples/Airvolume3D1x1x1.mo" 2021-11-24 08:09:20.799367057 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Zones/Examples/Airvolume3D1x1x1.mo" 2021-11-24 08:10:47.395106816 +0000 @@ -37,9 +37,9 @@ } ); - parameter Modelica.SIunits.Length length = 3.0; - parameter Modelica.SIunits.Length width = 3.0; - parameter Modelica.SIunits.Length height = 3.0; + parameter Modelica.Units.SI.Length length = 3.0; + parameter Modelica.Units.SI.Length width = 3.0; + parameter Modelica.Units.SI.Length height = 3.0; BuildingSystems.Buildings.Airvolumes.AirElements.AirElementThermal airEle111( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Zones/Examples/Airvolume3D3x3x3.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Zones/Examples/Airvolume3D3x3x3.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Zones/Examples/Airvolume3D3x3x3.mo" 2021-11-24 08:09:20.799367057 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Zones/Examples/Airvolume3D3x3x3.mo" 2021-11-24 08:10:47.387106840 +0000 @@ -229,9 +229,9 @@ } ); - parameter Modelica.SIunits.Length length = 3.0; - parameter Modelica.SIunits.Length width = 3.0; - parameter Modelica.SIunits.Length height = 3.0; + parameter Modelica.Units.SI.Length length = 3.0; + parameter Modelica.Units.SI.Length width = 3.0; + parameter Modelica.Units.SI.Length height = 3.0; BuildingSystems.Buildings.Airvolumes.AirElements.AirElementThermal airEle111( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Zones/ZoneTemplateAirvolume3D.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Zones/ZoneTemplateAirvolume3D.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Zones/ZoneTemplateAirvolume3D.mo" 2021-11-24 08:09:20.799367057 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Zones/ZoneTemplateAirvolume3D.mo" 2021-11-24 08:10:46.915108257 +0000 @@ -6,10 +6,10 @@ parameter Integer nAirElements(min=1) = 1 "Number of air elements, which are included in the air volume" annotation(Dialog(tab="General")); - parameter Modelica.SIunits.Temp_K T_start = 293.15 + parameter Modelica.Units.SI.Temperature T_start = 293.15 "Start air temperature of the zone" annotation (Dialog(tab="Initialization")); - parameter Modelica.SIunits.MassFraction x_start = 0.005 + parameter Modelica.Units.SI.MassFraction x_start = 0.005 "Start air moisture of the zone" annotation (Dialog(tab="Initialization")); output BuildingSystems.Interfaces.Temp_KOutput TAir[nAirElements] diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Zones/ZoneTemplateAirvolumeMixed.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Zones/ZoneTemplateAirvolumeMixed.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Zones/ZoneTemplateAirvolumeMixed.mo" 2021-11-24 08:09:20.799367057 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Buildings/Zones/ZoneTemplateAirvolumeMixed.mo" 2021-11-24 08:10:46.903108294 +0000 @@ -4,10 +4,10 @@ extends BuildingSystems.Buildings.BaseClasses.ZoneTemplateGeneral( redeclare final package Medium = BuildingSystems.Media.Air, nHeatSourcesTotal = if calcIdealLoads then nHeatSources + 2 else nHeatSources); - parameter Modelica.SIunits.HeatFlowRate Q_flow_heatingMax = Modelica.Constants.inf + parameter Modelica.Units.SI.HeatFlowRate Q_flow_heatingMax = Modelica.Constants.inf "Maximal power for ideal heating" annotation(Dialog(tab="General",group="Ideal heating and cooling")); - parameter Modelica.SIunits.HeatFlowRate Q_flow_coolingMax = -Modelica.Constants.inf + parameter Modelica.Units.SI.HeatFlowRate Q_flow_coolingMax = -Modelica.Constants.inf "Maximal power for ideal cooling" annotation(Dialog(tab="General",group="Ideal heating and cooling")); parameter Real radiationportionIdealHeating = 0.5 @@ -16,7 +16,7 @@ parameter Real radiationportionIdealCooling = 0.5 "Radiation portion of the ideal cooling" annotation(Dialog(tab="General",group="Ideal heating and cooling")); - parameter Modelica.SIunits.Length heightAirpath[nAirpathsInternal]=fill(0.0,nAirpathsInternal) + parameter Modelica.Units.SI.Length heightAirpath[nAirpathsInternal]=fill(0.0,nAirpathsInternal) "Vertical height of each air path in the zone" annotation(Dialog(tab="General",group="Air change")); parameter Boolean heatSources = false @@ -51,13 +51,13 @@ Modelica.Blocks.Interfaces.RealInput wme = 0.0 "External work" annotation(HideResult = true, Dialog(tab="Advanced",group="Thermal comfort")); - parameter Modelica.SIunits.Velocity vAir = 0.1 + parameter Modelica.Units.SI.Velocity vAir = 0.1 "Mean relative air velocity in the area of user presence" annotation(HideResult = true, Dialog(tab="Advanced",group="Thermal comfort")); - parameter Modelica.SIunits.Temp_K T_start = 293.15 + parameter Modelica.Units.SI.Temperature T_start = 293.15 "Start air temperature of the zone" annotation (Dialog(tab="Initialization")); - parameter Modelica.SIunits.MassFraction x_start = 0.005 + parameter Modelica.Units.SI.MassFraction x_start = 0.005 "Start air moisture of the zone" annotation (Dialog(tab="Initialization")); output BuildingSystems.Interfaces.HeatFlowRateOutput Q_flow_heating if calcIdealLoads @@ -113,7 +113,7 @@ BuildingSystems.Buildings.Types.DataSource.Calculation "Data source for air temperature" annotation (Evaluate=true, Dialog(tab="Advanced", group="Data source")); - parameter Modelica.SIunits.Temp_K TAir_constant = 293.15 + parameter Modelica.Units.SI.Temperature TAir_constant = 293.15 "Constant air temperature (used if TAirSou=Parameter)" annotation (Dialog(tab="Advanced", group="Data source")); BuildingSystems.Interfaces.Temp_KInput TAir_in if @@ -125,7 +125,7 @@ BuildingSystems.Buildings.Types.DataSource.Calculation "Data source for air moisture" annotation (Evaluate=true, Dialog(tab="Advanced", group="Data source")); - parameter Modelica.SIunits.MassFraction xAir_constant = 0.005 + parameter Modelica.Units.SI.MassFraction xAir_constant = 0.005 "Constant air moisture (used if xAirSou=Parameter)" annotation (Dialog(tab="Advanced", group="Data source")); BuildingSystems.Interfaces.Moisture_absInput xAir_in if diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Climate/SolarRadiationTransformers/SolarRadiationTransformerGeneral.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Climate/SolarRadiationTransformers/SolarRadiationTransformerGeneral.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Climate/SolarRadiationTransformers/SolarRadiationTransformerGeneral.mo" 2021-11-24 08:09:20.799367057 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Climate/SolarRadiationTransformers/SolarRadiationTransformerGeneral.mo" 2021-11-24 08:10:46.791108630 +0000 @@ -12,7 +12,7 @@ annotation (Placement(transformation(extent={{-20,-20},{20,20}},rotation=270,origin={30,88}),iconTransformation(extent={{-14,-14},{14,14}},rotation=270,origin={40,76}))); parameter Real rhoAmb = 0.2 "Reflection factor of the ambience"; - parameter Modelica.SIunits.Conversions.NonSIunits.Angle_deg angleDegL = 0 + parameter Modelica.Units.NonSI.Angle_deg angleDegL = 0 "Grad correction winter-/summer time"; parameter Boolean OneAxisTracking = false "True: tilt angle is tracked to the sun position; false: no axis tracking"; @@ -25,9 +25,9 @@ BuildingSystems.Interfaces.RadiationPort radiationPort "Radiation port to the tilted surface" annotation (Placement(transformation(extent={{70,-10},{90,10}}),iconTransformation(extent={{70,-10},{90,10}}))); - Modelica.SIunits.RadiantEnergyFluenceRate IrrTotHor + Modelica.Units.SI.RadiantEnergyFluenceRate IrrTotHor "Solar total radiation of horizontal surface"; - Modelica.SIunits.RadiantEnergyFluenceRate IrrTotTil + Modelica.Units.SI.RadiantEnergyFluenceRate IrrTotTil "Solar total radiation of tilted surface"; input BuildingSystems.Interfaces.Angle_degInput angleDegAzi "Azimuth angle of the surface" @@ -45,7 +45,7 @@ protected BuildingSystems.Interfaces.Angle_degOutput angleDegTil_internal "Tilt angle of the surface"; - Modelica.SIunits.Angle angleZen + Modelica.Units.SI.Angle angleZen "Zenith angle"; Real cosAngleAzi "Cosinus of the azimuth angle"; @@ -55,11 +55,11 @@ "Cosinus of the tilt angle"; Real cosAngleZen "Cosinus of the zenith angle"; - Modelica.SIunits.Angle angleDec + Modelica.Units.SI.Angle angleDec "Declination angle of the sun"; - Modelica.SIunits.Angle angleHr + Modelica.Units.SI.Angle angleHr "Hour angle of the sun"; - Modelica.SIunits.RadiantEnergyFluenceRate IrrDirNor + Modelica.Units.SI.RadiantEnergyFluenceRate IrrDirNor "Direct normal solar irradiance"; Real sinAngleAzi "Sinus of the azimuth angle"; @@ -87,7 +87,7 @@ "Transformation factor deg to rad"; constant Real radDeg = 180.0/Modelica.Constants.pi "Transformation factor rad to deg"; - constant Modelica.SIunits.Angle polarCircle = 1.1617 + constant Modelica.Units.SI.Angle polarCircle = 1.1617 "Latitude of polar circle (66 degree 33 min 44 sec)"; Boolean outsidePolarCircle = latitudeDeg*degRad < polarCircle and latitudeDeg*degRad > -polarCircle "Flag, true if latitude is outside polar region"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Climate/Sources/RadiationFixed.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Climate/Sources/RadiationFixed.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Climate/Sources/RadiationFixed.mo" 2021-11-24 08:09:20.799367057 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Climate/Sources/RadiationFixed.mo" 2021-11-24 08:10:46.759108726 +0000 @@ -8,11 +8,11 @@ angleDegAziSun = 0.0, angleDegHeightSun = 0.0) annotation (Placement(transformation(extent={{50,-10},{70,10}}), iconTransformation(extent={{50,-10},{70,10}}))); - parameter Modelica.SIunits.RadiantEnergyFluenceRate IrrDir_constant = 0.0 + parameter Modelica.Units.SI.RadiantEnergyFluenceRate IrrDir_constant = 0.0 "Constant area specific direct solar radiation"; - parameter Modelica.SIunits.RadiantEnergyFluenceRate IrrDif_constant = 0.0 + parameter Modelica.Units.SI.RadiantEnergyFluenceRate IrrDif_constant = 0.0 "Conatant area specific diffuse solar radiation"; - parameter Modelica.SIunits.Conversions.NonSIunits.Angle_deg angleDegInc_constant = 0.0 + parameter Modelica.Units.NonSI.Angle_deg angleDegInc_constant = 0.0 "Constant incident angle of the direct solar radiation"; annotation (Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,100}}), graphics={ Rectangle(extent={{-60,60},{60,-60}},lineColor={230,230,230},fillColor={230,230,230},fillPattern= FillPattern.Solid), diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Climate/WeatherData/BaseClasses/WeatherDataFileGeneral.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Climate/WeatherData/BaseClasses/WeatherDataFileGeneral.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Climate/WeatherData/BaseClasses/WeatherDataFileGeneral.mo" 2021-11-24 08:09:20.799367057 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Climate/WeatherData/BaseClasses/WeatherDataFileGeneral.mo" 2021-11-24 08:10:46.731108810 +0000 @@ -2,21 +2,21 @@ partial block WeatherDataFileGeneral "Template for weather data files" parameter String info=""; - parameter Modelica.SIunits.Conversions.NonSIunits.Angle_deg latitudeDeg + parameter Modelica.Units.NonSI.Angle_deg latitudeDeg "Latitude"; - parameter Modelica.SIunits.Conversions.NonSIunits.Angle_deg longitudeDeg + parameter Modelica.Units.NonSI.Angle_deg longitudeDeg "Longitude"; - parameter Modelica.SIunits.Conversions.NonSIunits.Angle_deg longitudeDeg_0 + parameter Modelica.Units.NonSI.Angle_deg longitudeDeg_0 "longitude_0"; - Modelica.SIunits.RadiantEnergyFluenceRate IrrDirHor + Modelica.Units.SI.RadiantEnergyFluenceRate IrrDirHor "Solar beam radiation of horizontal surface"; - Modelica.SIunits.RadiantEnergyFluenceRate IrrDifHor + Modelica.Units.SI.RadiantEnergyFluenceRate IrrDifHor "Solar diffuse radiation of horizontal surface"; - Modelica.SIunits.Temp_C tAirRef + Modelica.Units.NonSI.Temperature_degC tAirRef "Air temperature"; - Modelica.SIunits.Velocity vWindRef + Modelica.Units.SI.Velocity vWindRef "Wind speed on reference height"; - Modelica.SIunits.Conversions.NonSIunits.Angle_deg angleDegWindRef + Modelica.Units.NonSI.Angle_deg angleDegWindRef "Angle of wind direction on reference height"; BuildingSystems.Types.RelativeHumidity phiAir "Relative humidity"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Climate/WeatherData/WeatherDataReader.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Climate/WeatherData/WeatherDataReader.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Climate/WeatherData/WeatherDataReader.mo" 2021-11-24 08:09:20.799367057 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Climate/WeatherData/WeatherDataReader.mo" 2021-11-24 08:10:46.715108858 +0000 @@ -61,21 +61,21 @@ "Cloud cover of the sky" annotation (Placement(transformation(extent={{-86,-80},{-66,-60}}), iconTransformation(extent={{10,-10},{-10,10}},rotation=90,origin={70,-110}))); - Modelica.SIunits.Pressure pGround= + Modelica.Units.SI.Pressure pGround= pAirRef * ((TAirRef - gamma * (0.0 - zRefTAir)) / TAirRef)^(Modelica.Constants.g_n / (gamma * RAir)) "Air pressure on ground level"; - parameter Modelica.SIunits.Pressure pAirRef = 100000.0 + parameter Modelica.Units.SI.Pressure pAirRef = 100000.0 "Static air pressure on reference height" annotation(Dialog(tab = "General", group = "Location")); parameter Real gamma(unit = "K/m") = 0.01 "Temperature gradient of the planetary boundary layer" annotation(Dialog(tab = "General", group = "Location")); - parameter Modelica.SIunits.Length zRefTAir = 2.0 // Standard value of TRY - "Reference height air temperature measurement" + + parameter Modelica.Units.SI.Length zRefTAir = 2.0 "Reference height air temperature measurement" annotation(Dialog(tab = "General", group = "Location")); + // Standard value of TRY constant Real RAir(unit="J/(kg.K)") = 288.0 "Gas constant dry air"; - annotation (defaultComponentName="weaDat",Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,100}}), graphics={ Rectangle(extent={{-100,100},{100,-100}},lineColor={170,213,255},fillColor={170,213,255},fillPattern = FillPattern.Solid), Ellipse(extent={{-90,-2},{-8,-46}},lineColor={0,128,255},fillColor={0,128,255},fillPattern = FillPattern.Solid), diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Controls/Continuous/Examples/LimPID.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Controls/Continuous/Examples/LimPID.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Controls/Continuous/Examples/LimPID.mo" 2021-11-24 08:09:20.971366538 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Controls/Continuous/Examples/LimPID.mo" 2021-11-24 08:10:45.923111236 +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}}))); BuildingSystems.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}}))); BuildingSystems.Utilities.Diagnostics.AssertEquality assertEquality1( threShold=1e-3) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Controls/Continuous/Examples/NumberOfRequests.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Controls/Continuous/Examples/NumberOfRequests.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Controls/Continuous/Examples/NumberOfRequests.mo" 2021-11-24 08:09:20.971366538 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Controls/Continuous/Examples/NumberOfRequests.mo" 2021-11-24 08:10:45.867111404 +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/BuildingSystems 2.0.0-master/Controls/Continuous/Examples/PIDHysteresis.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Controls/Continuous/Examples/PIDHysteresis.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Controls/Continuous/Examples/PIDHysteresis.mo" 2021-11-24 08:09:20.971366538 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Controls/Continuous/Examples/PIDHysteresis.mo" 2021-11-24 08:10:45.855111440 +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/BuildingSystems 2.0.0-master/Controls/Continuous/Examples/PIDHysteresisTimer.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Controls/Continuous/Examples/PIDHysteresisTimer.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Controls/Continuous/Examples/PIDHysteresisTimer.mo" 2021-11-24 08:09:20.971366538 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Controls/Continuous/Examples/PIDHysteresisTimer.mo" 2021-11-24 08:10:45.843111476 +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/BuildingSystems 2.0.0-master/Controls/Continuous/Examples/SignalRanker.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Controls/Continuous/Examples/SignalRanker.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Controls/Continuous/Examples/SignalRanker.mo" 2021-11-24 08:09:20.971366538 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Controls/Continuous/Examples/SignalRanker.mo" 2021-11-24 08:10:45.831111512 +0000 @@ -1,14 +1,14 @@ within BuildingSystems.Controls.Continuous.Examples; model SignalRanker "Example model for signal ranker" extends Modelica.Icons.Example; - Modelica.Blocks.Sources.Sine sine(freqHz=2) + Modelica.Blocks.Sources.Sine sine(f =2) annotation (Placement(transformation(extent={{-60,-20},{-40,0}}))); Modelica.Blocks.Sources.Pulse pulse(period=0.25) annotation (Placement(transformation(extent={{-60,20},{-40,40}}))); BuildingSystems.Controls.Continuous.SignalRanker sigRan( nin=3) annotation (Placement(transformation(extent={{-20,20},{0,40}}))); - Modelica.Blocks.Sources.ExpSine expSine(freqHz=10, damping=1) + Modelica.Blocks.Sources.ExpSine expSine(f =10, damping=1) annotation (Placement(transformation(extent={{-60,60},{-40,80}}))); equation connect(sine.y, sigRan.u[1]) annotation (Line(points={{-39,-10},{-32, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Controls/Continuous/LimPID.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Controls/Continuous/LimPID.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Controls/Continuous/LimPID.mo" 2021-11-24 08:09:20.971366538 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Controls/Continuous/LimPID.mo" 2021-11-24 08:10:45.823111536 +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/BuildingSystems 2.0.0-master/Controls/Continuous/OffTimer.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Controls/Continuous/OffTimer.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Controls/Continuous/OffTimer.mo" 2021-11-24 08:09:20.971366538 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Controls/Continuous/OffTimer.mo" 2021-11-24 08:10:45.719111848 +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/BuildingSystems 2.0.0-master/Controls/Continuous/PIDHysteresis.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Controls/Continuous/PIDHysteresis.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Controls/Continuous/PIDHysteresis.mo" 2021-11-24 08:09:20.971366538 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Controls/Continuous/PIDHysteresis.mo" 2021-11-24 08:10:45.711111872 +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/BuildingSystems 2.0.0-master/Controls/Continuous/PIDHysteresisTimer.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Controls/Continuous/PIDHysteresisTimer.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Controls/Continuous/PIDHysteresisTimer.mo" 2021-11-24 08:09:20.971366538 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Controls/Continuous/PIDHysteresisTimer.mo" 2021-11-24 08:10:45.695111920 +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/BuildingSystems 2.0.0-master/Controls/Continuous/Validation/LimPIDReset.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Controls/Continuous/Validation/LimPIDReset.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Controls/Continuous/Validation/LimPIDReset.mo" 2021-11-24 08:09:20.971366538 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Controls/Continuous/Validation/LimPIDReset.mo" 2021-11-24 08:10:45.655112041 +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}}))); BuildingSystems.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}}))); BuildingSystems.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/BuildingSystems 2.0.0-master/Controls/SetPoints/OccupancySchedule.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Controls/SetPoints/OccupancySchedule.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Controls/SetPoints/OccupancySchedule.mo" 2021-11-24 08:09:20.971366538 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Controls/SetPoints/OccupancySchedule.mo" 2021-11-24 08:10:45.543112377 +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/BuildingSystems 2.0.0-master/Controls/SetPoints/SupplyReturnTemperatureReset.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Controls/SetPoints/SupplyReturnTemperatureReset.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Controls/SetPoints/SupplyReturnTemperatureReset.mo" 2021-11-24 08:09:20.971366538 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Controls/SetPoints/SupplyReturnTemperatureReset.mo" 2021-11-24 08:10:45.515112461 +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/BuildingSystems 2.0.0-master/Controls/SetPoints/Table.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Controls/SetPoints/Table.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Controls/SetPoints/Table.mo" 2021-11-24 08:09:20.971366538 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Controls/SetPoints/Table.mo" 2021-11-24 08:10:45.491112533 +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/BuildingSystems 2.0.0-master/Fluid/Actuators/BaseClasses/ActuatorSignal.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Actuators/BaseClasses/ActuatorSignal.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Actuators/BaseClasses/ActuatorSignal.mo" 2021-11-24 08:09:20.971366538 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Actuators/BaseClasses/ActuatorSignal.mo" 2021-11-24 08:10:45.443112677 +0000 @@ -5,7 +5,7 @@ parameter Boolean use_inputFilter=true "= true, if opening is filtered with a 2nd order CriticalDamping filter" annotation(Dialog(tab="Dynamics", group="Filtered opening")); - parameter Modelica.SIunits.Time riseTime=120 + parameter Modelica.Units.SI.Time riseTime=120 "Rise time of the filter (time to reach 99.6 % of an opening step)" annotation(Dialog(tab="Dynamics", group="Filtered opening",enable=use_inputFilter)); parameter Integer order(min=1) = 2 "Order of filter" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Actuators/BaseClasses/PartialDamperExponential.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Actuators/BaseClasses/PartialDamperExponential.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Actuators/BaseClasses/PartialDamperExponential.mo" 2021-11-24 08:09:20.971366538 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Actuators/BaseClasses/PartialDamperExponential.mo" 2021-11-24 08:10:45.387112845 +0000 @@ -6,10 +6,10 @@ final m_flow_turbulent=if use_deltaM then deltaM * m_flow_nominal else eta_default*ReC*sqrt(A)*facRouDuc); extends BuildingSystems.Fluid.Actuators.BaseClasses.ActuatorSignal; - parameter Modelica.SIunits.PressureDifference dpDamper_nominal(displayUnit="Pa") + parameter Modelica.Units.SI.PressureDifference dpDamper_nominal(displayUnit="Pa") "Pressure drop of fully open damper at nominal mass flow rate" annotation(Dialog(group = "Nominal condition")); - parameter Modelica.SIunits.PressureDifference dpFixed_nominal(displayUnit="Pa") = 0 + parameter Modelica.Units.SI.PressureDifference dpFixed_nominal(displayUnit="Pa") = 0 "Pressure drop of duct and resistances other than the damper in series, at nominal mass flow rate" annotation(Dialog(group = "Nominal condition")); parameter Boolean use_deltaM = true @@ -17,10 +17,10 @@ parameter Real deltaM = 0.3 "Fraction of nominal mass flow rate where transition to turbulent occurs" annotation(Dialog(enable=use_deltaM)); - final parameter Modelica.SIunits.Velocity v_nominal= + final parameter Modelica.Units.SI.Velocity v_nominal= (2 / rho_default / k1 * dpDamper_nominal)^0.5 "Nominal face velocity"; - final parameter Modelica.SIunits.Area A=m_flow_nominal/rho_default/v_nominal + final parameter Modelica.Units.SI.Area A=m_flow_nominal/rho_default/v_nominal "Face area"; parameter Boolean roundDuct = false "Set to true for round duct, false for square cross section" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Actuators/BaseClasses/PartialThreeWayValve.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Actuators/BaseClasses/PartialThreeWayValve.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Actuators/BaseClasses/PartialThreeWayValve.mo" 2021-11-24 08:09:20.971366538 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Actuators/BaseClasses/PartialThreeWayValve.mo" 2021-11-24 08:10:45.363112917 +0000 @@ -38,7 +38,7 @@ constant Boolean homotopyInitialization = true "= true, use homotopy method" annotation(HideResult=true); - parameter Modelica.SIunits.PressureDifference dpFixed_nominal[2](each displayUnit="Pa", + parameter Modelica.Units.SI.PressureDifference dpFixed_nominal[2](each displayUnit="Pa", each min=0) = {0, 0} "Nominal pressure drop of pipes and other equipment in flow legs at port_1 and port_3" annotation(Dialog(group="Nominal condition")); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Actuators/BaseClasses/PartialTwoWayValve.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Actuators/BaseClasses/PartialTwoWayValve.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Actuators/BaseClasses/PartialTwoWayValve.mo" 2021-11-24 08:09:20.971366538 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Actuators/BaseClasses/PartialTwoWayValve.mo" 2021-11-24 08:10:45.339112990 +0000 @@ -10,7 +10,7 @@ rhoStd=Medium.density_pTX(101325, 273.15+4, Medium.X_default)); extends BuildingSystems.Fluid.Actuators.BaseClasses.ActuatorSignal; - parameter Modelica.SIunits.PressureDifference dpFixed_nominal(displayUnit="Pa", min=0) = 0 + parameter Modelica.Units.SI.PressureDifference dpFixed_nominal(displayUnit="Pa", min=0) = 0 "Pressure drop of pipe and other resistances that are in series" annotation(Dialog(group = "Nominal condition")); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Actuators/BaseClasses/ValveParameters.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Actuators/BaseClasses/ValveParameters.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Actuators/BaseClasses/ValveParameters.mo" 2021-11-24 08:09:20.971366538 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Actuators/BaseClasses/ValveParameters.mo" 2021-11-24 08:10:45.303113098 +0000 @@ -14,7 +14,7 @@ "Cv (US) flow coefficient [USG/min/(psi)^(1/2)]" annotation(Dialog(group = "Flow Coefficient", enable = (CvData==BuildingSystems.Fluid.Types.CvTypes.Cv))); - parameter Modelica.SIunits.Area Av( + parameter Modelica.Units.SI.Area Av( fixed= if CvData==BuildingSystems.Fluid.Types.CvTypes.Av then true else false) "Av (metric) flow coefficient" annotation(Dialog(group = "Flow Coefficient", @@ -23,10 +23,11 @@ parameter Real deltaM = 0.02 "Fraction of nominal flow rate where linearization starts, if y=1" annotation(Dialog(group="Pressure-flow linearization")); - parameter Modelica.SIunits.MassFlowRate m_flow_nominal + + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal "Nominal mass flow rate" annotation(Dialog(group = "Nominal condition")); - parameter Modelica.SIunits.PressureDifference dpValve_nominal( + parameter Modelica.Units.SI.PressureDifference dpValve_nominal( displayUnit="Pa", min=0, fixed= if CvData==BuildingSystems.Fluid.Types.CvTypes.OpPoint then true else false) @@ -34,10 +35,9 @@ annotation(Dialog(group="Nominal condition", enable = (CvData==BuildingSystems.Fluid.Types.CvTypes.OpPoint))); - parameter Modelica.SIunits.Density rhoStd + parameter Modelica.Units.SI.Density rhoStd "Inlet density for which valve coefficients are defined" annotation(Dialog(group="Nominal condition", tab="Advanced")); - protected parameter Real Kv_SI( min=0, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Actuators/Dampers/MixingBox.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Actuators/Dampers/MixingBox.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Actuators/Dampers/MixingBox.mo" 2021-11-24 08:09:20.971366538 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Actuators/Dampers/MixingBox.mo" 2021-11-24 08:10:45.163113518 +0000 @@ -22,33 +22,33 @@ parameter Real ReC=4000 "Reynolds number where transition to turbulent starts" annotation(Dialog(enable=not use_deltaM)); - parameter Modelica.SIunits.MassFlowRate mOut_flow_nominal + parameter Modelica.Units.SI.MassFlowRate mOut_flow_nominal "Mass flow rate outside air damper" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.PressureDifference dpDamOut_nominal(min=0, displayUnit="Pa") + parameter Modelica.Units.SI.PressureDifference dpDamOut_nominal(min=0, displayUnit="Pa") "Pressure drop of damper in outside air leg" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.PressureDifference dpFixOut_nominal(min=0, displayUnit="Pa")=0 + parameter Modelica.Units.SI.PressureDifference dpFixOut_nominal(min=0, displayUnit="Pa")=0 "Pressure drop of duct and other resistances in outside air leg" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.MassFlowRate mRec_flow_nominal + parameter Modelica.Units.SI.MassFlowRate mRec_flow_nominal "Mass flow rate recirculation air damper" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.PressureDifference dpDamRec_nominal(min=0, displayUnit="Pa") + parameter Modelica.Units.SI.PressureDifference dpDamRec_nominal(min=0, displayUnit="Pa") "Pressure drop of damper in recirculation air leg" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.PressureDifference dpFixRec_nominal(min=0, displayUnit="Pa")=0 + parameter Modelica.Units.SI.PressureDifference dpFixRec_nominal(min=0, displayUnit="Pa")=0 "Pressure drop of duct and other resistances in recirculation air leg" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.MassFlowRate mExh_flow_nominal + parameter Modelica.Units.SI.MassFlowRate mExh_flow_nominal "Mass flow rate exhaust air damper" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.PressureDifference dpDamExh_nominal(min=0, displayUnit="Pa") + parameter Modelica.Units.SI.PressureDifference dpDamExh_nominal(min=0, displayUnit="Pa") "Pressure drop of damper in exhaust air leg" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.PressureDifference dpFixExh_nominal(min=0, displayUnit="Pa")=0 + parameter Modelica.Units.SI.PressureDifference dpFixExh_nominal(min=0, displayUnit="Pa")=0 "Pressure drop of duct and other resistances in exhaust air leg" annotation (Dialog(group="Nominal condition")); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Actuators/Dampers/PressureIndependent.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Actuators/Dampers/PressureIndependent.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Actuators/Dampers/PressureIndependent.mo" 2021-11-24 08:09:20.975366528 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Actuators/Dampers/PressureIndependent.mo" 2021-11-24 08:10:45.139113590 +0000 @@ -46,17 +46,17 @@ "Parameter for avoiding unnecessary computations"; constant Real y2dd = 0 "Second derivative at second support point"; - Modelica.SIunits.MassFlowRate m_flow_set + Modelica.Units.SI.MassFlowRate m_flow_set "Requested mass flow rate"; - Modelica.SIunits.PressureDifference dp_min(displayUnit="Pa") + Modelica.Units.SI.PressureDifference dp_min(displayUnit="Pa") "Minimum pressure difference required for delivering requested mass flow rate"; - Modelica.SIunits.PressureDifference dp_x, dp_x1, dp_x2, dp_y2, dp_y1 + Modelica.Units.SI.PressureDifference dp_x, dp_x1, dp_x2, dp_y2, dp_y1 "Support points for interpolation flow functions"; - Modelica.SIunits.MassFlowRate m_flow_x, m_flow_x1, m_flow_x2, m_flow_y2, m_flow_y1 + Modelica.Units.SI.MassFlowRate m_flow_x, m_flow_x1, m_flow_x2, m_flow_y2, m_flow_y1 "Support points for interpolation flow functions"; - Modelica.SIunits.MassFlowRate m_flow_smooth + Modelica.Units.SI.MassFlowRate m_flow_smooth "Smooth interpolation result between two flow regimes"; - Modelica.SIunits.PressureDifference dp_smooth + Modelica.Units.SI.PressureDifference dp_smooth "Smooth interpolation result between two flow regimes"; Real y_actual_smooth(final unit="1") "Fractional opening computed based on m_flow_smooth and dp"; @@ -64,18 +64,18 @@ function basicFlowFunction_dp_m_flow "Inverse of flow function that computes that computes the square inverse of flow coefficient" extends Modelica.Icons.Function; - input Modelica.SIunits.MassFlowRate m_flow + input Modelica.Units.SI.MassFlowRate m_flow "Mass flow rate in design flow direction"; - input Modelica.SIunits.PressureDifference dp + input Modelica.Units.SI.PressureDifference dp "Pressure difference between port_a and port_b (= port_a.p - port_b.p)"; - input Modelica.SIunits.MassFlowRate m_flow_small + input Modelica.Units.SI.MassFlowRate m_flow_small "Minimum value of mass flow rate guarding against k=(0)/sqrt(dp)"; - input Modelica.SIunits.PressureDifference dp_small + input Modelica.Units.SI.PressureDifference dp_small "Minimum value of pressure drop guarding against k=m_flow/(0)"; output Real kSquInv "Square inverse of flow coefficient"; protected - Modelica.SIunits.PressureDifference dpPos= + Modelica.Units.SI.PressureDifference dpPos= BuildingSystems.Utilities.Math.Functions.smoothMax(dp, -dp, dp_small) "Regularized absolute value of pressure drop"; Real mSqu_flow = BuildingSystems.Utilities.Math.Functions.smoothMax( @@ -84,6 +84,7 @@ algorithm kSquInv := dpPos / mSqu_flow; annotation (smoothOrder=1); + end basicFlowFunction_dp_m_flow; function exponentialDamper_inv diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Actuators/Dampers/Validation/PressureIndependent.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Actuators/Dampers/Validation/PressureIndependent.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Actuators/Dampers/Validation/PressureIndependent.mo" 2021-11-24 08:09:20.975366528 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Actuators/Dampers/Validation/PressureIndependent.mo" 2021-11-24 08:10:45.099113710 +0000 @@ -4,10 +4,10 @@ extends Modelica.Icons.Example; package Medium = BuildingSystems.Media.Air "Medium model for air"; - parameter Modelica.SIunits.PressureDifference dp_nominal( + parameter Modelica.Units.SI.PressureDifference dp_nominal( displayUnit="Pa") = 10 "Damper nominal pressure drop"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=1 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1 "Damper nominal mass flow rate"; BuildingSystems.Fluid.Actuators.Dampers.Exponential damExp( redeclare final package Medium = Medium, @@ -50,7 +50,7 @@ Controls.Continuous.LimPID conPID(k=10, Ti=0.001, controllerType=Modelica.Blocks.Types.SimpleController.PID, - initType=Modelica.Blocks.Types.InitPID.InitialState) + initType=Modelica.Blocks.Types.Init.InitialState) "Discharge flow rate controller" annotation (Placement(transformation(extent={{-70,-70},{-50,-50}}))); Sensors.MassFlowRate senMasFlo( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Actuators/Motors/IdealMotor.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Actuators/Motors/IdealMotor.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Actuators/Motors/IdealMotor.mo" 2021-11-24 08:09:20.975366528 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Actuators/Motors/IdealMotor.mo" 2021-11-24 08:10:45.059113831 +0000 @@ -3,8 +3,8 @@ extends Modelica.Blocks.Interfaces.SISO; parameter Real delta(min=0, max=0.5) = 0.05 "Hysteresis"; - parameter Modelica.SIunits.Time tOpe(min=0) = 120 "Opening time"; - parameter Modelica.SIunits.Time tClo(min=0) = tOpe "Closing time"; + parameter Modelica.Units.SI.Time tOpe(min=0) = 120 "Opening time"; + parameter Modelica.Units.SI.Time tClo(min=0) = tOpe "Closing time"; parameter Real y_start(min=0, max=1) = 0.5 "Start position"; Modelica.Blocks.Logical.Hysteresis uppHys(final uLow=0, uHigh=delta, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Actuators/Valves/TwoWayPressureIndependent.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Actuators/Valves/TwoWayPressureIndependent.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Actuators/Valves/TwoWayPressureIndependent.mo" 2021-11-24 08:09:20.975366528 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Actuators/Valves/TwoWayPressureIndependent.mo" 2021-11-24 08:10:44.847114467 +0000 @@ -18,19 +18,19 @@ "Parameter for avoiding unnecessary computations"; constant Real y2dd = 0 "Second derivative at second support point"; - Modelica.SIunits.MassFlowRate m_flow_set + + Modelica.Units.SI.MassFlowRate m_flow_set "Requested mass flow rate"; - Modelica.SIunits.PressureDifference dp_min(displayUnit="Pa") + Modelica.Units.SI.PressureDifference dp_min(displayUnit="Pa") "Minimum pressure difference required for delivering requested mass flow rate"; - Modelica.SIunits.PressureDifference dp_x, dp_x1, dp_x2, dp_y2, dp_y1 + Modelica.Units.SI.PressureDifference dp_x, dp_x1, dp_x2, dp_y2, dp_y1 "Support points for interpolation flow functions"; - Modelica.SIunits.MassFlowRate m_flow_x, m_flow_x1, m_flow_x2, m_flow_y2, m_flow_y1 + Modelica.Units.SI.MassFlowRate m_flow_x, m_flow_x1, m_flow_x2, m_flow_y2, m_flow_y1 "Support points for interpolation flow functions"; - Modelica.SIunits.MassFlowRate m_flow_smooth + Modelica.Units.SI.MassFlowRate m_flow_smooth "Smooth interpolation result between two flow regimes"; - Modelica.SIunits.PressureDifference dp_smooth + Modelica.Units.SI.PressureDifference dp_smooth "Smooth interpolation result between two flow regimes"; - equation m_flow_set = m_flow_nominal*phi; kVal = Kv_SI; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Actuators/Valves/TwoWayTable.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Actuators/Valves/TwoWayTable.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Actuators/Valves/TwoWayTable.mo" 2021-11-24 08:09:20.975366528 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Actuators/Valves/TwoWayTable.mo" 2021-11-24 08:10:44.827114527 +0000 @@ -11,7 +11,7 @@ // 1/k^2, the flowCharacteristics.phi[1] must not be zero. // We therefore set a lower bound. protected - Modelica.Blocks.Tables.CombiTable1D phiLooUp( + Modelica.Blocks.Tables.CombiTable1Dv phiLooUp( final tableOnFile=false, final table=[flowCharacteristics.y, cat( 1, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Actuators/Valves/Validation/ThreeWayValveParameterization.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Actuators/Valves/Validation/ThreeWayValveParameterization.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Actuators/Valves/Validation/ThreeWayValveParameterization.mo" 2021-11-24 08:09:20.975366528 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Actuators/Valves/Validation/ThreeWayValveParameterization.mo" 2021-11-24 08:10:44.779114671 +0000 @@ -4,9 +4,9 @@ extends Modelica.Icons.Example; package Medium = BuildingSystems.Media.Water "Medium in the component"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 0.4 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 0.4 "Design mass flow rate"; - parameter Modelica.SIunits.PressureDifference dp_nominal = 4500 + parameter Modelica.Units.SI.PressureDifference dp_nominal = 4500 "Design pressure drop"; parameter Real Kv_SI = m_flow_nominal/sqrt(dp_nominal) @@ -16,10 +16,10 @@ "Kv (metric) flow coefficient [m3/h/(bar)^(1/2)]"; parameter Real Cv = Kv_SI/(rhoStd*0.0631/1000/sqrt(6895)) "Cv (US) flow coefficient [USG/min/(psi)^(1/2)]"; - parameter Modelica.SIunits.Area Av = Kv_SI/sqrt(rhoStd) + parameter Modelica.Units.SI.Area Av = Kv_SI/sqrt(rhoStd) "Av (metric) flow coefficient"; - parameter Modelica.SIunits.Density rhoStd= + parameter Modelica.Units.SI.Density rhoStd= Medium.density_pTX(101325, 273.15+4, Medium.X_default) "Standard density"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Actuators/Valves/Validation/TwoWayValveParameterization.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Actuators/Valves/Validation/TwoWayValveParameterization.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Actuators/Valves/Validation/TwoWayValveParameterization.mo" 2021-11-24 08:09:20.975366528 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Actuators/Valves/Validation/TwoWayValveParameterization.mo" 2021-11-24 08:10:44.751114755 +0000 @@ -6,9 +6,9 @@ package Medium = BuildingSystems.Media.Water; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 0.4 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 0.4 "Design mass flow rate"; - parameter Modelica.SIunits.PressureDifference dp_nominal = 4500 + parameter Modelica.Units.SI.PressureDifference dp_nominal = 4500 "Design pressure drop"; parameter Real Kv_SI = m_flow_nominal/sqrt(dp_nominal) @@ -18,10 +18,10 @@ "Kv (metric) flow coefficient [m3/h/(bar)^(1/2)]"; parameter Real Cv = Kv_SI/(rhoStd*0.0631/1000/sqrt(6895)) "Cv (US) flow coefficient [USG/min/(psi)^(1/2)]"; - parameter Modelica.SIunits.Area Av = Kv_SI/sqrt(rhoStd) + parameter Modelica.Units.SI.Area Av = Kv_SI/sqrt(rhoStd) "Av (metric) flow coefficient"; - parameter Modelica.SIunits.Density rhoStd= + parameter Modelica.Units.SI.Density rhoStd= Medium.density_pTX(101325, 273.15+4, Medium.X_default) "Standard density"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_dp_DerivativeCheck.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_dp_DerivativeCheck.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_dp_DerivativeCheck.mo" 2021-11-24 08:09:20.975366528 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_dp_DerivativeCheck.mo" 2021-11-24 08:10:44.715114863 +0000 @@ -6,12 +6,12 @@ constant Real gain = 2 "Gain for computing the mass flow rate"; parameter Real k = 0.35 "Flow coefficient"; - parameter Modelica.SIunits.MassFlowRate m_flow_turbulent = 0.36 + parameter Modelica.Units.SI.MassFlowRate m_flow_turbulent = 0.36 "Mass flow rate where transition to turbulent flow occurs"; - Modelica.SIunits.MassFlowRate m_flow "Mass flow rate"; - Modelica.SIunits.MassFlowRate m_flow_comp "Comparison value for m_flow"; - Modelica.SIunits.PressureDifference dp "Pressure drop"; - Modelica.SIunits.MassFlowRate err "Integration error"; + Modelica.Units.SI.MassFlowRate m_flow "Mass flow rate"; + Modelica.Units.SI.MassFlowRate m_flow_comp "Comparison value for m_flow"; + Modelica.Units.SI.PressureDifference dp "Pressure drop"; + Modelica.Units.SI.MassFlowRate err "Integration error"; initial equation m_flow = m_flow_comp; equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_dp_DerivativeCheck2.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_dp_DerivativeCheck2.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_dp_DerivativeCheck2.mo" 2021-11-24 08:09:20.975366528 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_dp_DerivativeCheck2.mo" 2021-11-24 08:10:44.707114887 +0000 @@ -4,16 +4,16 @@ extends Modelica.Icons.Example; parameter Real k = 0.35 "Flow coefficient"; - parameter Modelica.SIunits.MassFlowRate m_flow_turbulent = 0.36 + parameter Modelica.Units.SI.MassFlowRate m_flow_turbulent = 0.36 "Mass flow rate where transition to turbulent flow occurs"; - Modelica.SIunits.MassFlowRate m_flow "Mass flow rate"; - Modelica.SIunits.MassFlowRate m_flow_comp "Comparison value for m_flow"; + Modelica.Units.SI.MassFlowRate m_flow "Mass flow rate"; + Modelica.Units.SI.MassFlowRate m_flow_comp "Comparison value for m_flow"; Real der_m_flow(unit="kg/s2") "1st order derivative of mass flow rate"; Real der_m_flow_comp(unit="kg/s2") "2nd order derivative of comparison value for m_flow"; - Modelica.SIunits.PressureDifference dp "Pressure drop"; - Modelica.SIunits.MassFlowRate err_m_flow "Integration error for m_flow"; + Modelica.Units.SI.PressureDifference dp "Pressure drop"; + Modelica.Units.SI.MassFlowRate err_m_flow "Integration error for m_flow"; Real err_der_m_flow(unit="kg/s2") "Integration error for der_m_flow"; initial equation m_flow = m_flow_comp; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_m_flow_DerivativeCheck.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_m_flow_DerivativeCheck.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_m_flow_DerivativeCheck.mo" 2021-11-24 08:09:20.975366528 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_m_flow_DerivativeCheck.mo" 2021-11-24 08:10:44.695114923 +0000 @@ -6,12 +6,12 @@ constant Real gain = 0.5 "Gain for computing the mass flow rate"; parameter Real k = 0.35 "Flow coefficient"; - parameter Modelica.SIunits.MassFlowRate m_flow_turbulent = 0.36 + parameter Modelica.Units.SI.MassFlowRate m_flow_turbulent = 0.36 "Mass flow rate where transition to turbulent flow occurs"; - Modelica.SIunits.MassFlowRate m_flow "Mass flow rate"; - Modelica.SIunits.PressureDifference dp "Pressure drop"; - Modelica.SIunits.PressureDifference dp_comp "Comparison value for dp"; - Modelica.SIunits.PressureDifference err "Integration error"; + Modelica.Units.SI.MassFlowRate m_flow "Mass flow rate"; + Modelica.Units.SI.PressureDifference dp "Pressure drop"; + Modelica.Units.SI.PressureDifference dp_comp "Comparison value for dp"; + Modelica.Units.SI.PressureDifference err "Integration error"; initial equation dp = dp_comp; equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_m_flow_DerivativeCheck2.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_m_flow_DerivativeCheck2.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_m_flow_DerivativeCheck2.mo" 2021-11-24 08:09:20.975366528 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_m_flow_DerivativeCheck2.mo" 2021-11-24 08:10:44.691114935 +0000 @@ -9,17 +9,17 @@ threShold=1e-3) "Block for checking integration error"; parameter Real k = 0.35 "Flow coefficient"; - parameter Modelica.SIunits.MassFlowRate m_flow_turbulent = 0.36 + parameter Modelica.Units.SI.MassFlowRate m_flow_turbulent = 0.36 "Mass flow rate where transition to turbulent flow occurs"; - Modelica.SIunits.PressureDifference dp "Pressure drop"; - Modelica.SIunits.PressureDifference dp_comp "Comparison value for dp"; + Modelica.Units.SI.PressureDifference dp "Pressure drop"; + Modelica.Units.SI.PressureDifference dp_comp "Comparison value for dp"; Real der_dp(unit="Pa/s") "1st order derivative of pressure drop"; Real der_dp_comp(unit="Pa/s") "2nd order derivative of comparison value for pressure drop"; - Modelica.SIunits.MassFlowRate m_flow "Mass flow rate"; + Modelica.Units.SI.MassFlowRate m_flow "Mass flow rate"; - Modelica.SIunits.PressureDifference err_dp "Integration error for dp"; + Modelica.Units.SI.PressureDifference err_dp "Integration error for dp"; Real err_der_dp(unit="Pa/s") "Integration error for der_dp"; initial equation dp = dp_comp; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/BaseClasses/FlowModels/Validation/InverseFlowFunctions.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/BaseClasses/FlowModels/Validation/InverseFlowFunctions.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/BaseClasses/FlowModels/Validation/InverseFlowFunctions.mo" 2021-11-24 08:09:20.975366528 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/BaseClasses/FlowModels/Validation/InverseFlowFunctions.mo" 2021-11-24 08:10:44.683114959 +0000 @@ -1,15 +1,15 @@ within BuildingSystems.Fluid.BaseClasses.FlowModels.Validation; model InverseFlowFunctions "Test model for flow function and its inverse" extends Modelica.Icons.Example; - Modelica.SIunits.MassFlowRate m_flow; - Modelica.SIunits.PressureDifference dp(displayUnit="Pa") "Pressure difference"; - Modelica.SIunits.PressureDifference dpCalc(displayUnit="Pa") + Modelica.Units.SI.MassFlowRate m_flow; + Modelica.Units.SI.PressureDifference dp(displayUnit="Pa") "Pressure difference"; + Modelica.Units.SI.PressureDifference dpCalc(displayUnit="Pa") "Pressure difference computed by the flow functions"; - Modelica.SIunits.Pressure deltaDp(displayUnit="Pa") + Modelica.Units.SI.Pressure deltaDp(displayUnit="Pa") "Pressure difference between input and output to the functions"; - Modelica.SIunits.Time dTime= 2; + Modelica.Units.SI.Time dTime= 2; parameter Real k = 0.5; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 1 "Nominal flow rate"; + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 1 "Nominal flow rate"; equation dp = (time-0.5)/dTime * 20; m_flow=FlowModels.basicFlowFunction_dp(dp=dp, k=k, m_flow_turbulent=m_flow_nominal*0.3); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/BaseClasses/FlowModels/Validation/InvertingBasicFlowFunction_dp.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/BaseClasses/FlowModels/Validation/InvertingBasicFlowFunction_dp.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/BaseClasses/FlowModels/Validation/InvertingBasicFlowFunction_dp.mo" 2021-11-24 08:09:20.975366528 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/BaseClasses/FlowModels/Validation/InvertingBasicFlowFunction_dp.mo" 2021-11-24 08:10:44.675114983 +0000 @@ -4,11 +4,11 @@ extends Modelica.Icons.Example; parameter Real k = 0.5 "Flow coefficient"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 1.5 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 1.5 "Nominal mass flow rate"; - Modelica.SIunits.MassFlowRate m_flow "Mass flow rate"; - Modelica.SIunits.PressureDifference dp(displayUnit="Pa", start=0) "Pressure difference"; + Modelica.Units.SI.MassFlowRate m_flow "Mass flow rate"; + Modelica.Units.SI.PressureDifference dp(displayUnit="Pa", start=0) "Pressure difference"; equation m_flow = 4*(time-0.5); m_flow = FlowModels.basicFlowFunction_dp(dp=dp, k=k, m_flow_turbulent=m_flow_nominal*0.3); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/BaseClasses/FlowModels/Validation/InvertingBasicFlowFunction_m_flow.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/BaseClasses/FlowModels/Validation/InvertingBasicFlowFunction_m_flow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/BaseClasses/FlowModels/Validation/InvertingBasicFlowFunction_m_flow.mo" 2021-11-24 08:09:20.975366528 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/BaseClasses/FlowModels/Validation/InvertingBasicFlowFunction_m_flow.mo" 2021-11-24 08:10:44.667115008 +0000 @@ -4,11 +4,11 @@ extends Modelica.Icons.Example; parameter Real k = 0.5 "Flow coefficient"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 0.5 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 0.5 "Nominal mass flow rate"; - Modelica.SIunits.MassFlowRate m_flow(start=0) "Mass flow rate"; - Modelica.SIunits.PressureDifference dp(displayUnit="Pa") "Pressure difference"; + Modelica.Units.SI.MassFlowRate m_flow(start=0) "Mass flow rate"; + Modelica.Units.SI.PressureDifference dp(displayUnit="Pa") "Pressure difference"; equation dp = 4*(time-0.5); dp = FlowModels.basicFlowFunction_m_flow(m_flow=m_flow, k=k, m_flow_turbulent=m_flow_nominal*0.3); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp.mo" 2021-11-24 08:09:20.975366528 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp.mo" 2021-11-24 08:10:44.663115019 +0000 @@ -2,16 +2,16 @@ function basicFlowFunction_dp "Function that computes mass flow rate for given pressure drop" - input Modelica.SIunits.PressureDifference dp(displayUnit="Pa") + input Modelica.Units.SI.PressureDifference dp(displayUnit="Pa") "Pressure difference between port_a and port_b (= port_a.p - port_b.p)"; input Real k(min=0, unit="") "Flow coefficient, k=m_flow/sqrt(dp), with unit=(kg.m)^(1/2)"; - input Modelica.SIunits.MassFlowRate m_flow_turbulent(min=0) + input Modelica.Units.SI.MassFlowRate m_flow_turbulent(min=0) "Mass flow rate where transition to turbulent flow occurs"; - output Modelica.SIunits.MassFlowRate m_flow + output Modelica.Units.SI.MassFlowRate m_flow "Mass flow rate in design flow direction"; protected - Modelica.SIunits.PressureDifference dp_turbulent = (m_flow_turbulent/k)^2 + Modelica.Units.SI.PressureDifference dp_turbulent = (m_flow_turbulent/k)^2 "Pressure where flow changes to turbulent"; Real dpNorm=dp/dp_turbulent "Normalised pressure difference"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp_der.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp_der.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp_der.mo" 2021-11-24 08:09:20.975366528 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp_der.mo" 2021-11-24 08:10:44.651115055 +0000 @@ -3,18 +3,18 @@ "1st derivative of function that computes mass flow rate for given pressure drop" extends Modelica.Icons.Function; - input Modelica.SIunits.PressureDifference dp(displayUnit="Pa") + input Modelica.Units.SI.PressureDifference dp(displayUnit="Pa") "Pressure difference between port_a and port_b (= port_a.p - port_b.p)"; input Real k(min=0, unit="") "Flow coefficient, k=m_flow/sqrt(dp), with unit=(kg.m)^(1/2)"; - input Modelica.SIunits.MassFlowRate m_flow_turbulent(min=0) + input Modelica.Units.SI.MassFlowRate m_flow_turbulent(min=0) "Mass flow rate where transition to turbulent flow occurs"; input Real dp_der "Derivative of pressure difference between port_a and port_b (= port_a.p - port_b.p)"; output Real m_flow_der(unit="kg/s2") "Derivative of mass flow rate in design flow direction"; protected - Modelica.SIunits.PressureDifference dp_turbulent = (m_flow_turbulent/k)^2 + Modelica.Units.SI.PressureDifference dp_turbulent = (m_flow_turbulent/k)^2 "Pressure where flow changes to turbulent"; Real dpNormSq=(dp/dp_turbulent)^2 "Square of normalised pressure difference"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp_der2.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp_der2.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp_der2.mo" 2021-11-24 08:09:20.975366528 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp_der2.mo" 2021-11-24 08:10:44.643115080 +0000 @@ -3,11 +3,11 @@ "2nd derivative of flow function2nd derivative of function that computes mass flow rate for given pressure drop" extends Modelica.Icons.Function; - input Modelica.SIunits.PressureDifference dp(displayUnit="Pa") + input Modelica.Units.SI.PressureDifference dp(displayUnit="Pa") "Pressure difference between port_a and port_b (= port_a.p - port_b.p)"; input Real k(min=0, unit="") "Flow coefficient, k=m_flow/sqrt(dp), with unit=(kg.m)^(1/2)"; - input Modelica.SIunits.MassFlowRate m_flow_turbulent(min=0) + input Modelica.Units.SI.MassFlowRate m_flow_turbulent(min=0) "Mass flow rate where transition to turbulent flow occurs"; input Real dp_der "1st derivative of pressure difference between port_a and port_b (= port_a.p - port_b.p)"; @@ -16,7 +16,7 @@ output Real m_flow_der2 "2nd derivative of mass flow rate in design flow direction"; protected - Modelica.SIunits.PressureDifference dp_turbulent = (m_flow_turbulent/k)^2 + Modelica.Units.SI.PressureDifference dp_turbulent = (m_flow_turbulent/k)^2 "Pressure where flow changes to turbulent"; Real dpNorm=dp/dp_turbulent "Normalised pressure difference"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow.mo" 2021-11-24 08:09:20.975366528 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow.mo" 2021-11-24 08:10:44.639115092 +0000 @@ -2,16 +2,16 @@ function basicFlowFunction_m_flow "Function that computes pressure drop for given mass flow rate" - input Modelica.SIunits.MassFlowRate m_flow + input Modelica.Units.SI.MassFlowRate m_flow "Mass flow rate in design flow direction"; input Real k(unit="") "Flow coefficient, k=m_flow/sqrt(dp), with unit=(kg.m)^(1/2)"; - input Modelica.SIunits.MassFlowRate m_flow_turbulent(min=0) + input Modelica.Units.SI.MassFlowRate m_flow_turbulent(min=0) "Mass flow rate where transition to turbulent flow occurs"; - output Modelica.SIunits.PressureDifference dp(displayUnit="Pa") + output Modelica.Units.SI.PressureDifference dp(displayUnit="Pa") "Pressure difference between port_a and port_b (= port_a.p - port_b.p)"; protected - Modelica.SIunits.PressureDifference dp_turbulent = (m_flow_turbulent/k)^2 + Modelica.Units.SI.PressureDifference dp_turbulent = (m_flow_turbulent/k)^2 "Pressure where flow changes to turbulent"; Real m_flowNorm = m_flow/m_flow_turbulent "Normalised mass flow rate"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow_der.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow_der.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow_der.mo" 2021-11-24 08:09:20.975366528 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow_der.mo" 2021-11-24 08:10:44.627115127 +0000 @@ -3,18 +3,18 @@ "1st derivative of function that computes pressure drop for given mass flow rate" extends Modelica.Icons.Function; - input Modelica.SIunits.MassFlowRate m_flow + input Modelica.Units.SI.MassFlowRate m_flow "Mass flow rate in design flow direction"; input Real k(unit="") "Flow coefficient, k=m_flow/sqrt(dp), with unit=(kg.m)^(1/2)"; - input Modelica.SIunits.MassFlowRate m_flow_turbulent(min=0) + input Modelica.Units.SI.MassFlowRate m_flow_turbulent(min=0) "Mass flow rate where transition to turbulent flow occurs"; input Real m_flow_der(unit="kg/s2") "Derivative of mass flow rate in design flow direction"; output Real dp_der "Derivative of pressure difference between port_a and port_b (= port_a.p - port_b.p)"; protected - Modelica.SIunits.PressureDifference dp_turbulent = (m_flow_turbulent/k)^2 + Modelica.Units.SI.PressureDifference dp_turbulent = (m_flow_turbulent/k)^2 "Pressure where flow changes to turbulent"; Real m_flowNormSq = (m_flow/m_flow_turbulent)^2 "Square of normalised mass flow rate"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow_der2.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow_der2.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow_der2.mo" 2021-11-24 08:09:20.975366528 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow_der2.mo" 2021-11-24 08:10:44.591115236 +0000 @@ -3,11 +3,11 @@ "2nd derivative of function that computes pressure drop for given mass flow rate" extends Modelica.Icons.Function; - input Modelica.SIunits.MassFlowRate m_flow + input Modelica.Units.SI.MassFlowRate m_flow "Mass flow rate in design flow direction"; input Real k(unit="") "Flow coefficient, k=m_flow/sqrt(dp), with unit=(kg.m)^(1/2)"; - input Modelica.SIunits.MassFlowRate m_flow_turbulent(min=0) + input Modelica.Units.SI.MassFlowRate m_flow_turbulent(min=0) "Mass flow rate where transition to turbulent flow occurs"; input Real m_flow_der(unit="kg/s2") "1st derivative of mass flow rate in design flow direction"; @@ -16,7 +16,7 @@ output Real dp_der2 "2nd derivative of pressure difference between port_a and port_b (= port_a.p - port_b.p)"; protected - Modelica.SIunits.PressureDifference dp_turbulent = (m_flow_turbulent/k)^2 + Modelica.Units.SI.PressureDifference dp_turbulent = (m_flow_turbulent/k)^2 "Pressure where flow changes to turbulent"; Real m_flowNorm = m_flow/m_flow_turbulent "Normalised mass flow rate"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/BaseClasses/PartialResistance.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/BaseClasses/PartialResistance.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/BaseClasses/PartialResistance.mo" 2021-11-24 08:09:20.975366528 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/BaseClasses/PartialResistance.mo" 2021-11-24 08:10:44.571115296 +0000 @@ -16,7 +16,7 @@ "= true, use m_flow = f(dp) else dp = f(m_flow)" annotation (Evaluate=true, Dialog(tab="Advanced")); - parameter Modelica.SIunits.PressureDifference dp_nominal(displayUnit="Pa") + parameter Modelica.Units.SI.PressureDifference dp_nominal(displayUnit="Pa") "Pressure drop at nominal mass flow rate" annotation(Dialog(group = "Nominal condition")); @@ -24,18 +24,18 @@ "= true, use linear relation between m_flow and dp for any flow rate" annotation(Evaluate=true, Dialog(tab="Advanced")); - parameter Modelica.SIunits.MassFlowRate m_flow_turbulent(min=0) + parameter Modelica.Units.SI.MassFlowRate m_flow_turbulent(min=0) "Turbulent flow if |m_flow| >= m_flow_turbulent"; protected parameter Medium.ThermodynamicState sta_default= Medium.setState_pTX(T=Medium.T_default, p=Medium.p_default, X=Medium.X_default); - parameter Modelica.SIunits.DynamicViscosity eta_default=Medium.dynamicViscosity(sta_default) + parameter Modelica.Units.SI.DynamicViscosity eta_default=Medium.dynamicViscosity(sta_default) "Dynamic viscosity, used to compute transition to turbulent flow regime"; - final parameter Modelica.SIunits.MassFlowRate m_flow_nominal_pos = abs(m_flow_nominal) + final parameter Modelica.Units.SI.MassFlowRate m_flow_nominal_pos = abs(m_flow_nominal) "Absolute value of nominal flow rate"; - final parameter Modelica.SIunits.PressureDifference dp_nominal_pos(displayUnit="Pa") = abs(dp_nominal) + final parameter Modelica.Units.SI.PressureDifference dp_nominal_pos(displayUnit="Pa") = abs(dp_nominal) "Absolute value of nominal pressure difference"; initial equation assert(homotopyInitialization, "In " + getInstanceName() + diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/BaseClasses/PartialThreeWayResistance.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/BaseClasses/PartialThreeWayResistance.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/BaseClasses/PartialThreeWayResistance.mo" 2021-11-24 08:09:20.975366528 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/BaseClasses/PartialThreeWayResistance.mo" 2021-11-24 08:10:44.555115343 +0000 @@ -26,11 +26,11 @@ "Third port, can be either inlet or outlet" annotation (Placement(transformation(extent={{-10,-110},{10,-90}}))); - parameter Modelica.SIunits.Time tau=10 + parameter Modelica.Units.SI.Time tau=10 "Time constant at nominal flow for dynamic energy and momentum balance" annotation(Dialog(tab="Dynamics", group="Nominal condition", enable=not energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState)); - parameter Modelica.SIunits.MassFlowRate mDyn_flow_nominal + parameter Modelica.Units.SI.MassFlowRate mDyn_flow_nominal "Nominal mass flow rate for dynamic momentum and energy balance" annotation(Dialog(tab="Dynamics", group="Equations", enable=not energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState)); @@ -50,7 +50,7 @@ parameter Boolean verifyFlowReversal = false "=true, to assert that the flow does not reverse when portFlowDirection_* does not equal Bidirectional" annotation(Dialog(tab="Advanced")); - parameter Modelica.SIunits.MassFlowRate m_flow_small + parameter Modelica.Units.SI.MassFlowRate m_flow_small "Small mass flow rate for checking flow reversal" annotation(Dialog(tab="Advanced",enable=verifyFlowReversal)); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Chillers/BaseClasses/Carnot.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Chillers/BaseClasses/Carnot.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Chillers/BaseClasses/Carnot.mo" 2021-11-24 08:09:20.975366528 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Chillers/BaseClasses/Carnot.mo" 2021-11-24 08:10:44.503115500 +0000 @@ -7,17 +7,17 @@ constant Boolean homotopyInitialization = true "= true, use homotopy method" annotation(HideResult=true); - parameter Modelica.SIunits.HeatFlowRate QEva_flow_nominal(max=0) + parameter Modelica.Units.SI.HeatFlowRate QEva_flow_nominal(max=0) "Nominal cooling heat flow rate (QEva_flow_nominal < 0)" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.HeatFlowRate QCon_flow_nominal(min=0) + parameter Modelica.Units.SI.HeatFlowRate QCon_flow_nominal(min=0) "Nominal heating flow rate" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.TemperatureDifference dTEva_nominal( + parameter Modelica.Units.SI.TemperatureDifference dTEva_nominal( final max=0) = -10 "Temperature difference evaporator outlet-inlet" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.TemperatureDifference dTCon_nominal( + parameter Modelica.Units.SI.TemperatureDifference dTCon_nominal( final min=0) = 10 "Temperature difference condenser outlet-inlet" annotation (Dialog(group="Nominal condition")); @@ -35,10 +35,10 @@ "Coefficient of performance at TEva_nominal and TCon_nominal, used if use_eta_Carnot_nominal = false" annotation (Dialog(group="Efficiency", enable=not use_eta_Carnot_nominal)); - parameter Modelica.SIunits.Temperature TCon_nominal = 303.15 + parameter Modelica.Units.SI.Temperature TCon_nominal = 303.15 "Condenser temperature used to compute COP_nominal if use_eta_Carnot_nominal=false" annotation (Dialog(group="Efficiency", enable=not use_eta_Carnot_nominal)); - parameter Modelica.SIunits.Temperature TEva_nominal = 278.15 + parameter Modelica.Units.SI.Temperature TEva_nominal = 278.15 "Evaporator temperature used to compute COP_nominal if use_eta_Carnot_nominal=false" annotation (Dialog(group="Efficiency", enable=not use_eta_Carnot_nominal)); @@ -46,18 +46,18 @@ "Coefficients for efficiency curve (need p(a=a, yPL=1)=1)" annotation (Dialog(group="Efficiency")); - parameter Modelica.SIunits.Pressure dp1_nominal(displayUnit="Pa") + parameter Modelica.Units.SI.Pressure dp1_nominal(displayUnit="Pa") "Pressure difference over condenser" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.Pressure dp2_nominal(displayUnit="Pa") + parameter Modelica.Units.SI.Pressure dp2_nominal(displayUnit="Pa") "Pressure difference over evaporator" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.TemperatureDifference TAppCon_nominal(min=0) = if cp1_default < 1500 then 5 else 2 + parameter Modelica.Units.SI.TemperatureDifference TAppCon_nominal(min=0) = if cp1_default < 1500 then 5 else 2 "Temperature difference between refrigerant and working fluid outlet in condenser" annotation (Dialog(group="Efficiency")); - parameter Modelica.SIunits.TemperatureDifference TAppEva_nominal(min=0) = if cp2_default < 1500 then 5 else 2 + parameter Modelica.Units.SI.TemperatureDifference TAppEva_nominal(min=0) = if cp2_default < 1500 then 5 else 2 "Temperature difference between refrigerant and working fluid outlet in evaporator" annotation (Dialog(group="Efficiency")); @@ -82,17 +82,17 @@ "Fraction of nominal flow rate where flow transitions to laminar" annotation (Dialog(tab="Flow resistance", group="Evaporator")); - parameter Modelica.SIunits.Time tau1=60 + parameter Modelica.Units.SI.Time tau1=60 "Time constant at nominal flow rate (used if energyDynamics1 <> Modelica.Fluid.Types.Dynamics.SteadyState)" annotation (Dialog(tab="Dynamics", group="Condenser")); - parameter Modelica.SIunits.Time tau2=60 + parameter Modelica.Units.SI.Time tau2=60 "Time constant at nominal flow rate (used if energyDynamics2 <> Modelica.Fluid.Types.Dynamics.SteadyState)" annotation (Dialog(tab="Dynamics", group="Evaporator")); - parameter Modelica.SIunits.Temperature T1_start=Medium1.T_default + parameter Modelica.Units.SI.Temperature T1_start=Medium1.T_default "Initial or guess value of set point" annotation (Dialog(tab="Dynamics", group="Condenser")); - parameter Modelica.SIunits.Temperature T2_start=Medium2.T_default + parameter Modelica.Units.SI.Temperature T2_start=Medium2.T_default "Initial or guess value of set point" annotation (Dialog(tab="Dynamics", group="Evaporator")); @@ -136,11 +136,11 @@ x2=TConAct - TEvaAct, deltaX=0.25) "Carnot efficiency"; - Modelica.SIunits.Temperature TConAct(start=TCon_nominal + TAppCon_nominal)= + Modelica.Units.SI.Temperature TConAct(start=TCon_nominal + TAppCon_nominal)= Medium1.temperature(staB1) + QCon_flow/QCon_flow_nominal*TAppCon_nominal "Condenser temperature used to compute efficiency, taking into account pinch temperature between fluid and refrigerant"; - Modelica.SIunits.Temperature TEvaAct(start=TEva_nominal - TAppEva_nominal)= + Modelica.Units.SI.Temperature TEvaAct(start=TEva_nominal - TAppEva_nominal)= Medium2.temperature(staB2) - QEva_flow/QEva_flow_nominal*TAppEva_nominal "Evaporator temperature used to compute efficiency, taking into account pinch temperature between fluid and refrigerant"; @@ -162,22 +162,22 @@ "Flag, true if etaPL should be computed as it depends on yPL" annotation(Evaluate=true); - final parameter Modelica.SIunits.Temperature TUseAct_nominal= + final parameter Modelica.Units.SI.Temperature TUseAct_nominal= if COP_is_for_cooling then TEva_nominal - TAppEva_nominal else TCon_nominal + TAppCon_nominal "Nominal evaporator temperature for chiller or condenser temperature for heat pump, taking into account pinch temperature between fluid and refrigerant"; - Modelica.SIunits.Temperature TUseAct=if COP_is_for_cooling then TEvaAct else TConAct + Modelica.Units.SI.Temperature TUseAct=if COP_is_for_cooling then TEvaAct else TConAct "Temperature of useful heat (evaporator for chiller, condenser for heat pump), taking into account pinch temperature between fluid and refrigerant"; - final parameter Modelica.SIunits.SpecificHeatCapacity cp1_default= + final parameter Modelica.Units.SI.SpecificHeatCapacity cp1_default= Medium1.specificHeatCapacityCp(Medium1.setState_pTX( p = Medium1.p_default, T = Medium1.T_default, X = Medium1.X_default)) "Specific heat capacity of medium 1 at default medium state"; - final parameter Modelica.SIunits.SpecificHeatCapacity cp2_default= + final parameter Modelica.Units.SI.SpecificHeatCapacity cp2_default= Medium2.specificHeatCapacityCp(Medium2.setState_pTX( p = Medium2.p_default, T = Medium2.T_default, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Chillers/BaseClasses/PartialCarnot_y.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Chillers/BaseClasses/PartialCarnot_y.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Chillers/BaseClasses/PartialCarnot_y.mo" 2021-11-24 08:09:20.975366528 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Chillers/BaseClasses/PartialCarnot_y.mo" 2021-11-24 08:10:44.451115656 +0000 @@ -29,7 +29,7 @@ final homotopyInitialization=homotopyInitialization, final Q_flow_nominal=QEva_flow_nominal)); - parameter Modelica.SIunits.Power P_nominal(min=0) + parameter Modelica.Units.SI.Power P_nominal(min=0) "Nominal compressor power (at y=1)" annotation (Dialog(group="Nominal condition")); @@ -38,9 +38,9 @@ annotation (Placement(transformation(extent={{-140,70},{-100,110}}))); protected - Modelica.SIunits.HeatFlowRate QCon_flow_internal(start=QCon_flow_nominal)= + Modelica.Units.SI.HeatFlowRate QCon_flow_internal(start=QCon_flow_nominal)= P - QEva_flow_internal "Condenser heat input"; - Modelica.SIunits.HeatFlowRate QEva_flow_internal(start=QEva_flow_nominal)= + Modelica.Units.SI.HeatFlowRate QEva_flow_internal(start=QEva_flow_nominal)= if COP_is_for_cooling then -COP * P else (1-COP)*P "Evaporator heat input"; Modelica.Blocks.Sources.RealExpression yEva_flow_in( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Chillers/Carnot_TEva.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Chillers/Carnot_TEva.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Chillers/Carnot_TEva.mo" 2021-11-24 08:09:20.975366528 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Chillers/Carnot_TEva.mo" 2021-11-24 08:10:44.427115728 +0000 @@ -26,7 +26,7 @@ final energyDynamics=energyDynamics, final homotopyInitialization=homotopyInitialization)); - parameter Modelica.SIunits.HeatFlowRate QEva_flow_min( + parameter Modelica.Units.SI.HeatFlowRate QEva_flow_min( max=0) = -Modelica.Constants.inf "Maximum heat flow rate for cooling (negative)"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Chillers/Examples/Carnot_TEva.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Chillers/Examples/Carnot_TEva.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Chillers/Examples/Carnot_TEva.mo" 2021-11-24 08:09:20.975366528 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Chillers/Examples/Carnot_TEva.mo" 2021-11-24 08:10:44.371115896 +0000 @@ -5,14 +5,14 @@ package Medium1 = BuildingSystems.Media.Water "Medium model"; package Medium2 = BuildingSystems.Media.Water "Medium model"; - parameter Modelica.SIunits.TemperatureDifference dTEva_nominal=-10 + parameter Modelica.Units.SI.TemperatureDifference dTEva_nominal=-10 "Temperature difference evaporator outlet-inlet"; - parameter Modelica.SIunits.TemperatureDifference dTCon_nominal=10 + parameter Modelica.Units.SI.TemperatureDifference dTCon_nominal=10 "Temperature difference condenser outlet-inlet"; parameter Real COPc_nominal = 3 "Chiller COP"; - parameter Modelica.SIunits.HeatFlowRate QEva_flow_nominal = -100E3 + parameter Modelica.Units.SI.HeatFlowRate QEva_flow_nominal = -100E3 "Evaporator heat flow rate"; - parameter Modelica.SIunits.MassFlowRate m2_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate m2_flow_nominal= QEva_flow_nominal/dTEva_nominal/4200 "Nominal mass flow rate at chilled water side"; @@ -68,7 +68,7 @@ Modelica.Blocks.Math.Add QCon_flow(k2=-1) "Condenser heat flow rate" annotation (Placement(transformation(extent={{48,-50},{68,-30}}))); - final parameter Modelica.SIunits.SpecificHeatCapacity cp1_default= + final parameter Modelica.Units.SI.SpecificHeatCapacity cp1_default= Medium1.specificHeatCapacityCp(Medium1.setState_pTX( Medium1.p_default, Medium1.T_default, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Chillers/Examples/Carnot_y.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Chillers/Examples/Carnot_y.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Chillers/Examples/Carnot_y.mo" 2021-11-24 08:09:20.975366528 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Chillers/Examples/Carnot_y.mo" 2021-11-24 08:10:44.359115932 +0000 @@ -4,18 +4,18 @@ package Medium1 = BuildingSystems.Media.Water "Medium model"; package Medium2 = BuildingSystems.Media.Water "Medium model"; - parameter Modelica.SIunits.Power P_nominal=10E3 + parameter Modelica.Units.SI.Power P_nominal=10E3 "Nominal compressor power (at y=1)"; - parameter Modelica.SIunits.TemperatureDifference dTEva_nominal=-10 + parameter Modelica.Units.SI.TemperatureDifference dTEva_nominal=-10 "Temperature difference evaporator outlet-inlet"; - parameter Modelica.SIunits.TemperatureDifference dTCon_nominal=10 + parameter Modelica.Units.SI.TemperatureDifference dTCon_nominal=10 "Temperature difference condenser outlet-inlet"; parameter Real COPc_nominal = 3 "Chiller COP"; - parameter Modelica.SIunits.MassFlowRate m2_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate m2_flow_nominal= -P_nominal*COPc_nominal/dTEva_nominal/4200 "Nominal mass flow rate at chilled water side"; - parameter Modelica.SIunits.MassFlowRate m1_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate m1_flow_nominal= m2_flow_nominal*(COPc_nominal+1)/COPc_nominal "Nominal mass flow rate at condenser water wide"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Chillers/Validation/CarnotVerifyCOP.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Chillers/Validation/CarnotVerifyCOP.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Chillers/Validation/CarnotVerifyCOP.mo" 2021-11-24 08:09:20.975366528 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Chillers/Validation/CarnotVerifyCOP.mo" 2021-11-24 08:10:44.339115992 +0000 @@ -7,32 +7,32 @@ parameter Real COP_nominal = 3 "Coefficient of performance"; - parameter Modelica.SIunits.Temperature TCon_nominal = 273.15+30 + parameter Modelica.Units.SI.Temperature TCon_nominal = 273.15+30 "Nominal condensor temperature"; - parameter Modelica.SIunits.Temperature TEva_nominal = 273.15 + 5 + parameter Modelica.Units.SI.Temperature TEva_nominal = 273.15 + 5 "Nominal evaporator temperature"; - parameter Modelica.SIunits.HeatFlowRate QEva_flow_nominal=-10E3 + parameter Modelica.Units.SI.HeatFlowRate QEva_flow_nominal=-10E3 "Nominal evaporator heat flow rate (QEva_flow_nominal < 0)"; - parameter Modelica.SIunits.HeatFlowRate QCon_flow_nominal=-QEva_flow_nominal * (1+1/COP_nominal) + parameter Modelica.Units.SI.HeatFlowRate QCon_flow_nominal=-QEva_flow_nominal * (1+1/COP_nominal) "Nominal condenser heat flow rate (QCon_flow_nominal > 0)"; - parameter Modelica.SIunits.TemperatureDifference dTEva_nominal=-10 + parameter Modelica.Units.SI.TemperatureDifference dTEva_nominal=-10 "Temperature difference evaporator outlet-inlet"; - parameter Modelica.SIunits.TemperatureDifference dTCon_nominal=10 + parameter Modelica.Units.SI.TemperatureDifference dTCon_nominal=10 "Temperature difference condenser outlet-inlet"; - parameter Modelica.SIunits.MassFlowRate mCon_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate mCon_flow_nominal= QCon_flow_nominal/cp_default/dTCon_nominal "Nominal mass flow rate at condenser"; - parameter Modelica.SIunits.MassFlowRate mEva_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate mEva_flow_nominal= QEva_flow_nominal/cp_default/dTEva_nominal "Nominal mass flow rate of evaporator"; - final parameter Modelica.SIunits.SpecificHeatCapacity cp_default= + final parameter Modelica.Units.SI.SpecificHeatCapacity cp_default= Medium.specificHeatCapacityCp(Medium.setState_pTX( p = Medium.p_default, T = Medium.T_default, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Chillers/Validation/CarnotVerifyEtaCarnot.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Chillers/Validation/CarnotVerifyEtaCarnot.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Chillers/Validation/CarnotVerifyEtaCarnot.mo" 2021-11-24 08:09:20.975366528 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Chillers/Validation/CarnotVerifyEtaCarnot.mo" 2021-11-24 08:10:44.311116076 +0000 @@ -8,42 +8,42 @@ parameter Real etaCarnot_nominal=0.315046 "Carnot effectiveness (=COP/COP_Carnot) used if use_eta_Carnot_nominal = true"; - parameter Modelica.SIunits.TemperatureDifference TAppCon_nominal=2 + parameter Modelica.Units.SI.TemperatureDifference TAppCon_nominal=2 "Temperature difference between refrigerant and working fluid outlet in condenser"; - parameter Modelica.SIunits.TemperatureDifference TAppEva_nominal=2 + parameter Modelica.Units.SI.TemperatureDifference TAppEva_nominal=2 "Temperature difference between refrigerant and working fluid outlet in evaporator"; parameter Real COP_nominal = etaCarnot_nominal * (TEva_nominal-TAppEva_nominal)/ (TCon_nominal + TAppCon_nominal - (TEva_nominal-TAppEva_nominal)) "Coefficient of performance"; - parameter Modelica.SIunits.Temperature TCon_nominal = 273.15+30 + parameter Modelica.Units.SI.Temperature TCon_nominal = 273.15+30 "Nominal condensor temperature"; - parameter Modelica.SIunits.Temperature TEva_nominal = 273.15 + 5 + parameter Modelica.Units.SI.Temperature TEva_nominal = 273.15 + 5 "Nominal evaporator temperature"; - parameter Modelica.SIunits.HeatFlowRate QEva_flow_nominal=-10E3 + parameter Modelica.Units.SI.HeatFlowRate QEva_flow_nominal=-10E3 "Nominal evaporator heat flow rate (QEva_flow_nominal < 0)"; - parameter Modelica.SIunits.HeatFlowRate QCon_flow_nominal=-QEva_flow_nominal * (1+1/COP_nominal) + parameter Modelica.Units.SI.HeatFlowRate QCon_flow_nominal=-QEva_flow_nominal * (1+1/COP_nominal) "Nominal condenser heat flow rate (QCon_flow_nominal > 0)"; - parameter Modelica.SIunits.TemperatureDifference dTEva_nominal=-10 + parameter Modelica.Units.SI.TemperatureDifference dTEva_nominal=-10 "Temperature difference evaporator outlet-inlet"; - parameter Modelica.SIunits.TemperatureDifference dTCon_nominal=10 + parameter Modelica.Units.SI.TemperatureDifference dTCon_nominal=10 "Temperature difference condenser outlet-inlet"; - parameter Modelica.SIunits.MassFlowRate mCon_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate mCon_flow_nominal= QCon_flow_nominal/cp_default/dTCon_nominal "Nominal mass flow rate at condenser"; - parameter Modelica.SIunits.MassFlowRate mEva_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate mEva_flow_nominal= QEva_flow_nominal/cp_default/dTEva_nominal "Nominal mass flow rate of evaporator"; - final parameter Modelica.SIunits.SpecificHeatCapacity cp_default= + final parameter Modelica.Units.SI.SpecificHeatCapacity cp_default= Medium.specificHeatCapacityCp(Medium.setState_pTX( p = Medium.p_default, T = Medium.T_default, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Chillers/Validation/Carnot_TEva_2ndLaw.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Chillers/Validation/Carnot_TEva_2ndLaw.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Chillers/Validation/Carnot_TEva_2ndLaw.mo" 2021-11-24 08:09:20.975366528 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Chillers/Validation/Carnot_TEva_2ndLaw.mo" 2021-11-24 08:10:44.287116148 +0000 @@ -5,18 +5,18 @@ package Medium = BuildingSystems.Media.Water "Medium model"; - parameter Modelica.SIunits.TemperatureDifference dTEva_nominal=-4 + parameter Modelica.Units.SI.TemperatureDifference dTEva_nominal=-4 "Temperature difference evaporator outlet-inlet"; - parameter Modelica.SIunits.TemperatureDifference dTCon_nominal=4 + parameter Modelica.Units.SI.TemperatureDifference dTCon_nominal=4 "Temperature difference condenser outlet-inlet"; parameter Real COPc_nominal = 3 "Chiller COP"; - parameter Modelica.SIunits.HeatFlowRate QEva_flow_nominal = -100E3 + parameter Modelica.Units.SI.HeatFlowRate QEva_flow_nominal = -100E3 "Evaporator heat flow rate"; - final parameter Modelica.SIunits.MassFlowRate m2_flow_nominal= + final parameter Modelica.Units.SI.MassFlowRate m2_flow_nominal= QEva_flow_nominal/dTEva_nominal/4200 "Nominal mass flow rate at chilled water side"; - final parameter Modelica.SIunits.MassFlowRate m1_flow_nominal= + final parameter Modelica.Units.SI.MassFlowRate m1_flow_nominal= -m2_flow_nominal/dTCon_nominal*dTEva_nominal "Nominal mass flow rate at condeser water side"; @@ -56,15 +56,15 @@ replaceable package Medium2 = Modelica.Media.Interfaces.PartialMedium "Medium model"; - parameter Modelica.SIunits.TemperatureDifference dTEva_nominal + parameter Modelica.Units.SI.TemperatureDifference dTEva_nominal "Temperature difference evaporator outlet-inlet"; - parameter Modelica.SIunits.TemperatureDifference dTCon_nominal + parameter Modelica.Units.SI.TemperatureDifference dTCon_nominal "Temperature difference condenser outlet-inlet"; - parameter Modelica.SIunits.HeatFlowRate QEva_flow_nominal + parameter Modelica.Units.SI.HeatFlowRate QEva_flow_nominal "Evaporator heat flow rate"; - parameter Modelica.SIunits.MassFlowRate m1_flow_nominal + parameter Modelica.Units.SI.MassFlowRate m1_flow_nominal "Nominal mass flow rate at condeser water side"; - parameter Modelica.SIunits.MassFlowRate m2_flow_nominal + parameter Modelica.Units.SI.MassFlowRate m2_flow_nominal "Nominal mass flow rate at chilled water side"; BuildingSystems.Fluid.Sources.MassFlowSource_T sou1( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Chillers/Validation/Carnot_TEva_reverseFlow.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Chillers/Validation/Carnot_TEva_reverseFlow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Chillers/Validation/Carnot_TEva_reverseFlow.mo" 2021-11-24 08:09:20.975366528 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Chillers/Validation/Carnot_TEva_reverseFlow.mo" 2021-11-24 08:10:44.243116280 +0000 @@ -5,17 +5,17 @@ package Medium1 = BuildingSystems.Media.Water "Medium model"; package Medium2 = BuildingSystems.Media.Water "Medium model"; - parameter Modelica.SIunits.TemperatureDifference dTEva_nominal=-10 + parameter Modelica.Units.SI.TemperatureDifference dTEva_nominal=-10 "Temperature difference evaporator inlet-outlet"; - parameter Modelica.SIunits.TemperatureDifference dTCon_nominal=10 + parameter Modelica.Units.SI.TemperatureDifference dTCon_nominal=10 "Temperature difference condenser outlet-inlet"; parameter Real COPc_nominal = 3 "Chiller COP"; - parameter Modelica.SIunits.HeatFlowRate QEva_flow_nominal = -100E3 + parameter Modelica.Units.SI.HeatFlowRate QEva_flow_nominal = -100E3 "Evaporator heat flow rate"; - parameter Modelica.SIunits.MassFlowRate m2_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate m2_flow_nominal= QEva_flow_nominal/dTEva_nominal/4200 "Nominal mass flow rate at chilled water side"; - parameter Modelica.SIunits.MassFlowRate m1_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate m1_flow_nominal= m2_flow_nominal*(COPc_nominal+1)/COPc_nominal "Nominal mass flow rate at condenser water wide"; @@ -71,7 +71,7 @@ Modelica.Blocks.Math.Add QCon_flow(k2=-1) "Condenser heat flow rate" annotation (Placement(transformation(extent={{40,-50},{60,-30}}))); - final parameter Modelica.SIunits.SpecificHeatCapacity cp1_default= + final parameter Modelica.Units.SI.SpecificHeatCapacity cp1_default= Medium1.specificHeatCapacityCp(Medium1.setState_pTX( Medium1.p_default, Medium1.T_default, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Delays/DelayFirstOrder.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Delays/DelayFirstOrder.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Delays/DelayFirstOrder.mo" 2021-11-24 08:09:20.975366528 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Delays/DelayFirstOrder.mo" 2021-11-24 08:10:44.219116352 +0000 @@ -4,11 +4,11 @@ extends BuildingSystems.Fluid.MixingVolumes.MixingVolume(final V=V_nominal, final mSenFac=1); - parameter Modelica.SIunits.Time tau = 60 "Time constant at nominal flow" + parameter Modelica.Units.SI.Time tau = 60 "Time constant at nominal flow" annotation (Dialog(tab="Dynamics", group="Nominal condition")); protected - parameter Modelica.SIunits.Volume V_nominal = m_flow_nominal*tau/rho_default + parameter Modelica.Units.SI.Volume V_nominal = m_flow_nominal*tau/rho_default "Volume of delay element"; annotation ( Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},{100, 100}}), graphics={ Text( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Examples/FlowSystem/Basic.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Examples/FlowSystem/Basic.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Examples/FlowSystem/Basic.mo" 2021-11-24 08:09:20.975366528 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Examples/FlowSystem/Basic.mo" 2021-11-24 08:10:44.163116520 +0000 @@ -109,7 +109,7 @@ Modelica.Blocks.Sources.Sine sine( amplitude=0.5, offset=0.5, - freqHz=0.001) +f =0.001) "Valve control signal" annotation (Placement(transformation(extent={{-140,20},{-120,40}}))); BuildingSystems.Fluid.Actuators.Valves.ThreeWayLinear valSouth( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Examples/Performance/Example1v2.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Examples/Performance/Example1v2.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Examples/Performance/Example1v2.mo" 2021-11-24 08:09:20.975366528 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Examples/Performance/Example1v2.mo" 2021-11-24 08:10:44.043116881 +0000 @@ -1,7 +1,7 @@ within BuildingSystems.Fluid.Examples.Performance; model Example1v2 "Example 1 model with mixing volume" extends BuildingSystems.Fluid.Examples.Performance.BaseClasses.Example1; - parameter Modelica.SIunits.Time tau=10 "Time constant at nominal flow"; + parameter Modelica.Units.SI.Time tau=10 "Time constant at nominal flow"; Fluid.Delays.DelayFirstOrder[nRes.k] vol( redeclare each package Medium = Medium, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Examples/Performance/Example2.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Examples/Performance/Example2.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Examples/Performance/Example2.mo" 2021-11-24 08:09:20.975366528 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Examples/Performance/Example2.mo" 2021-11-24 08:10:44.035116905 +0000 @@ -3,9 +3,9 @@ extends Modelica.Icons.Example; package Medium = Modelica.Media.Water.ConstantPropertyLiquidWater; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=1 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1 "Nominal mass flow rate"; - parameter Modelica.SIunits.PressureDifference dp_nominal=1 + parameter Modelica.Units.SI.PressureDifference dp_nominal=1 "Pressure drop at nominal mass flow rate"; Fluid.Movers.FlowControlled_dp pump_dp( redeclare package Medium = Medium, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Examples/Performance/Example3.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Examples/Performance/Example3.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Examples/Performance/Example3.mo" 2021-11-24 08:09:20.975366528 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Examples/Performance/Example3.mo" 2021-11-24 08:10:44.027116929 +0000 @@ -4,9 +4,9 @@ extends Modelica.Icons.Example; package Medium = Modelica.Media.Water.ConstantPropertyLiquidWater; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=1 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1 "Nominal mass flow rate"; - parameter Modelica.SIunits.PressureDifference dp_nominal=1 + parameter Modelica.Units.SI.PressureDifference dp_nominal=1 "Pressure drop at nominal mass flow rate"; Fluid.Movers.FlowControlled_m_flow pump( redeclare package Medium = Medium, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Examples/Performance/Example4.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Examples/Performance/Example4.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Examples/Performance/Example4.mo" 2021-11-24 08:09:20.975366528 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Examples/Performance/Example4.mo" 2021-11-24 08:10:43.979117073 +0000 @@ -6,7 +6,7 @@ parameter Boolean allowFlowReversal=false "= false to simplify equations, assuming, but not enforcing, no flow reversal"; - Modelica.SIunits.MassFlowRate m_condens = min(0, -vol.ports[1].m_flow*(bou.X[1] - xSat.X[1])) + Modelica.Units.SI.MassFlowRate m_condens = min(0, -vol.ports[1].m_flow*(bou.X[1] - xSat.X[1])) "Water vapor mass flow rate"; Fluid.MixingVolumes.MixingVolumeMoistAir vol( nPorts=2, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Examples/Performance/PressureDrop/ParallelDp.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Examples/Performance/PressureDrop/ParallelDp.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Examples/Performance/PressureDrop/ParallelDp.mo" 2021-11-24 08:09:20.975366528 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Examples/Performance/PressureDrop/ParallelDp.mo" 2021-11-24 08:10:43.907117289 +0000 @@ -4,9 +4,9 @@ extends Modelica.Icons.Example; package Medium = BuildingSystems.Media.Air; parameter Integer nRes(min=2) = 10 "Number of resistances"; - parameter Modelica.SIunits.PressureDifference dp_nominal=1 + parameter Modelica.Units.SI.PressureDifference dp_nominal=1 "Pressure drop at nominal mass flow rate"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=1 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1 "Nominal mass flow rate"; Sources.Boundary_pT sou( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Examples/Performance/PressureDrop/ParallelFlow.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Examples/Performance/PressureDrop/ParallelFlow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Examples/Performance/PressureDrop/ParallelFlow.mo" 2021-11-24 08:09:20.975366528 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Examples/Performance/PressureDrop/ParallelFlow.mo" 2021-11-24 08:10:43.875117385 +0000 @@ -4,9 +4,9 @@ extends Modelica.Icons.Example; package Medium = BuildingSystems.Media.Air; parameter Integer nRes(min=2) = 10 "Number of resistances"; - parameter Modelica.SIunits.PressureDifference dp_nominal=1 + parameter Modelica.Units.SI.PressureDifference dp_nominal=1 "Pressure drop at nominal mass flow rate"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=1 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1 "Nominal mass flow rate"; Sources.MassFlowSource_T sou( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Examples/Performance/PressureDrop/SeriesDp.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Examples/Performance/PressureDrop/SeriesDp.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Examples/Performance/PressureDrop/SeriesDp.mo" 2021-11-24 08:09:20.975366528 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Examples/Performance/PressureDrop/SeriesDp.mo" 2021-11-24 08:10:43.859117434 +0000 @@ -4,9 +4,9 @@ extends Modelica.Icons.Example; package Medium = BuildingSystems.Media.Air; parameter Integer nRes(min=2) = 10 "Number of resistances"; - parameter Modelica.SIunits.PressureDifference dp_nominal=1 + parameter Modelica.Units.SI.PressureDifference dp_nominal=1 "Pressure drop at nominal mass flow rate"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=1 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1 "Nominal mass flow rate"; Sources.Boundary_pT sou( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Examples/Performance/PressureDrop/SeriesFlow.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Examples/Performance/PressureDrop/SeriesFlow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Examples/Performance/PressureDrop/SeriesFlow.mo" 2021-11-24 08:09:20.975366528 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Examples/Performance/PressureDrop/SeriesFlow.mo" 2021-11-24 08:10:43.843117481 +0000 @@ -4,9 +4,9 @@ extends Modelica.Icons.Example; package Medium = BuildingSystems.Media.Air; parameter Integer nRes(min=2) = 10 "Number of resistances"; - parameter Modelica.SIunits.PressureDifference dp_nominal=1 + parameter Modelica.Units.SI.PressureDifference dp_nominal=1 "Pressure drop at nominal mass flow rate"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=1 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1 "Nominal mass flow rate"; Sources.MassFlowSource_T sou( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Examples/Performance/PressureDrop/SeriesParallelDp.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Examples/Performance/PressureDrop/SeriesParallelDp.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Examples/Performance/PressureDrop/SeriesParallelDp.mo" 2021-11-24 08:09:20.975366528 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Examples/Performance/PressureDrop/SeriesParallelDp.mo" 2021-11-24 08:10:43.827117530 +0000 @@ -4,9 +4,9 @@ extends Modelica.Icons.Example; package Medium = BuildingSystems.Media.Air; parameter Integer nRes(min=2) = 10 "Number of resistances"; - parameter Modelica.SIunits.PressureDifference dp_nominal=1 + parameter Modelica.Units.SI.PressureDifference dp_nominal=1 "Pressure drop at nominal mass flow rate"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=1 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1 "Nominal mass flow rate"; Sources.Boundary_pT sou( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Examples/Performance/PressureDrop/SeriesParallelFlow.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Examples/Performance/PressureDrop/SeriesParallelFlow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Examples/Performance/PressureDrop/SeriesParallelFlow.mo" 2021-11-24 08:09:20.975366528 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Examples/Performance/PressureDrop/SeriesParallelFlow.mo" 2021-11-24 08:10:43.811117578 +0000 @@ -4,9 +4,9 @@ extends Modelica.Icons.Example; package Medium = BuildingSystems.Media.Air; parameter Integer nRes(min=2) = 10 "Number of resistances"; - parameter Modelica.SIunits.PressureDifference dp_nominal=1 + parameter Modelica.Units.SI.PressureDifference dp_nominal=1 "Pressure drop at nominal mass flow rate"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=1 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1 "Nominal mass flow rate"; Sources.MassFlowSource_T sou( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Examples/SimpleHouse.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Examples/SimpleHouse.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Examples/SimpleHouse.mo" 2021-11-24 08:09:20.975366528 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Examples/SimpleHouse.mo" 2021-11-24 08:10:43.759117734 +0000 @@ -6,18 +6,18 @@ package MediumAir = BuildingSystems.Media.Air; package MediumWater = BuildingSystems.Media.Water; - parameter Modelica.SIunits.Area A_wall = 100 "Wall area"; - parameter Modelica.SIunits.Area A_win = 5 "Window area"; + parameter Modelica.Units.SI.Area A_wall = 100 "Wall area"; + parameter Modelica.Units.SI.Area A_win = 5 "Window area"; parameter Real g_win(min=0, max=1, unit="1") = 0.3 "Solar heat gain coefficient of window"; - parameter Modelica.SIunits.Volume V_zone = A_wall*3 "Wall area"; - parameter Modelica.SIunits.HeatFlowRate QHea_nominal = 700 + parameter Modelica.Units.SI.Volume V_zone = A_wall*3 "Wall area"; + parameter Modelica.Units.SI.HeatFlowRate QHea_nominal = 700 "Nominal capacity of heating system"; - parameter Modelica.SIunits.MassFlowRate mWat_flow_nominal=QHea_nominal/10/4200 + parameter Modelica.Units.SI.MassFlowRate mWat_flow_nominal=QHea_nominal/10/4200 "Nominal mass flow rate for water loop"; - parameter Modelica.SIunits.MassFlowRate mAir_flow_nominal=V_zone*2*1.2/3600 + parameter Modelica.Units.SI.MassFlowRate mAir_flow_nominal=V_zone*2*1.2/3600 "Nominal mass flow rate for air loop"; - parameter Modelica.SIunits.PressureDifference dpAir_nominal=200 + parameter Modelica.Units.SI.PressureDifference dpAir_nominal=200 "Pressure drop at nominal mass flow rate for air loop"; parameter Boolean allowFlowReversal=false "= false because flow will not reverse in these circuits"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/Adaptors/Examples/ThermalZoneHVACNoExhaust.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/Adaptors/Examples/ThermalZoneHVACNoExhaust.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/Adaptors/Examples/ThermalZoneHVACNoExhaust.mo" 2021-11-24 08:09:20.975366528 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/Adaptors/Examples/ThermalZoneHVACNoExhaust.mo" 2021-11-24 08:10:43.703117901 +0000 @@ -10,12 +10,12 @@ "Adaptor for an HVAC system that is exposed through an FMI interface" annotation (Placement(transformation(extent={{20,0},{40,20}}))); - parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal = 30*6*6 + parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal = 30*6*6 "Nominal heat loss of the room"; - parameter Modelica.SIunits.Volume VRoo = 6*6*2.7 "Room volume"; + parameter Modelica.Units.SI.Volume VRoo = 6*6*2.7 "Room volume"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=VRoo*2*1.2/3600 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=VRoo*2*1.2/3600 "Nominal mass flow rate"; BuildingSystems.Fluid.FMI.Adaptors.ThermalZone con( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/ExportContainers/Examples/FMUs/Fan.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/ExportContainers/Examples/FMUs/Fan.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/ExportContainers/Examples/FMUs/Fan.mo" 2021-11-24 08:09:20.975366528 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/ExportContainers/Examples/FMUs/Fan.mo" 2021-11-24 08:10:43.467118611 +0000 @@ -8,9 +8,9 @@ false, energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState)); - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=0.01 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=0.01 "Nominal mass flow rate"; - parameter Modelica.SIunits.PressureDifference dp_nominal(displayUnit="Pa")=500 + parameter Modelica.Units.SI.PressureDifference dp_nominal(displayUnit="Pa")=500 "Pressure drop at nominal mass flow rate"; Modelica.Blocks.Interfaces.RealInput dp_in(min=0, final unit="Pa") diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/ExportContainers/Examples/FMUs/HVACZone.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/ExportContainers/Examples/FMUs/HVACZone.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/ExportContainers/Examples/FMUs/HVACZone.mo" 2021-11-24 08:09:20.979366516 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/ExportContainers/Examples/FMUs/HVACZone.mo" 2021-11-24 08:10:43.415118767 +0000 @@ -17,40 +17,40 @@ ///////////////////////////////////////////////////////// // Air temperatures at design conditions - parameter Modelica.SIunits.Temperature TASup_nominal = 273.15+18 + parameter Modelica.Units.SI.Temperature TASup_nominal = 273.15+18 "Nominal air temperature supplied to room"; - parameter Modelica.SIunits.Temperature TRooSet = 273.15+24 + parameter Modelica.Units.SI.Temperature TRooSet = 273.15+24 "Nominal room air temperature"; - parameter Modelica.SIunits.Temperature TOut_nominal = 273.15+30 + parameter Modelica.Units.SI.Temperature TOut_nominal = 273.15+30 "Design outlet air temperature"; - parameter Modelica.SIunits.Temperature THeaRecLvg= + parameter Modelica.Units.SI.Temperature THeaRecLvg= TOut_nominal - eps*(TOut_nominal-TRooSet) "Air temperature leaving the heat recovery"; ///////////////////////////////////////////////////////// // Cooling loads and air mass flow rates parameter Real UA(unit="W/K") = 10E3 "Average UA-value of the room"; - parameter Modelica.SIunits.HeatFlowRate QRooInt_flow= + parameter Modelica.Units.SI.HeatFlowRate QRooInt_flow= 1000 "Internal heat gains of the room"; - parameter Modelica.SIunits.HeatFlowRate QRooC_flow_nominal= + parameter Modelica.Units.SI.HeatFlowRate QRooC_flow_nominal= -QRooInt_flow-UA/30*(TOut_nominal-TRooSet) "Nominal cooling load of the room"; - parameter Modelica.SIunits.MassFlowRate mA_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate mA_flow_nominal= 1.3*QRooC_flow_nominal/1006/(TASup_nominal-TRooSet) "Nominal air mass flow rate, increased by factor 1.3 to allow for recovery after temperature setback"; - parameter Modelica.SIunits.TemperatureDifference dTFan = 2 + parameter Modelica.Units.SI.TemperatureDifference dTFan = 2 "Estimated temperature raise across fan that needs to be made up by the cooling coil"; - parameter Modelica.SIunits.HeatFlowRate QCoiC_flow_nominal=4* + parameter Modelica.Units.SI.HeatFlowRate QCoiC_flow_nominal=4* (QRooC_flow_nominal + mA_flow_nominal*(TASup_nominal-THeaRecLvg-dTFan)*1006) "Cooling load of coil, taking into account economizer, and increased due to latent heat removal"; ///////////////////////////////////////////////////////// // Water temperatures and mass flow rates - parameter Modelica.SIunits.Temperature TWSup_nominal = 273.15+16 + parameter Modelica.Units.SI.Temperature TWSup_nominal = 273.15+16 "Water supply temperature"; - parameter Modelica.SIunits.Temperature TWRet_nominal = 273.15+12 + parameter Modelica.Units.SI.Temperature TWRet_nominal = 273.15+12 "Water return temperature"; - parameter Modelica.SIunits.MassFlowRate mW_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate mW_flow_nominal= QCoiC_flow_nominal/(TWRet_nominal-TWSup_nominal)/4200 "Nominal water mass flow rate"; ///////////////////////////////////////////////////////// diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/ExportContainers/Examples/FMUs/HVACZones.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/ExportContainers/Examples/FMUs/HVACZones.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/ExportContainers/Examples/FMUs/HVACZones.mo" 2021-11-24 08:09:20.979366516 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/ExportContainers/Examples/FMUs/HVACZones.mo" 2021-11-24 08:10:43.387118851 +0000 @@ -20,40 +20,40 @@ ///////////////////////////////////////////////////////// // Air temperatures at design conditions - parameter Modelica.SIunits.Temperature TASup_nominal = 273.15+18 + parameter Modelica.Units.SI.Temperature TASup_nominal = 273.15+18 "Nominal air temperature supplied to room"; - parameter Modelica.SIunits.Temperature TRooSet = 273.15+24 + parameter Modelica.Units.SI.Temperature TRooSet = 273.15+24 "Nominal room air temperature"; - parameter Modelica.SIunits.Temperature TOut_nominal = 273.15+30 + parameter Modelica.Units.SI.Temperature TOut_nominal = 273.15+30 "Design outlet air temperature"; - parameter Modelica.SIunits.Temperature THeaRecLvg= + parameter Modelica.Units.SI.Temperature THeaRecLvg= TOut_nominal - eps*(TOut_nominal-TRooSet) "Air temperature leaving the heat recovery"; ///////////////////////////////////////////////////////// // Cooling loads and air mass flow rates parameter Real UA(unit="W/K") = 10E3 "Average UA-value of the room"; - parameter Modelica.SIunits.HeatFlowRate QRooInt_flow= + parameter Modelica.Units.SI.HeatFlowRate QRooInt_flow= 1000 "Internal heat gains of the room"; - parameter Modelica.SIunits.HeatFlowRate QRooC_flow_nominal= + parameter Modelica.Units.SI.HeatFlowRate QRooC_flow_nominal= -QRooInt_flow-UA/30*(TOut_nominal-TRooSet) "Nominal cooling load of the room"; - parameter Modelica.SIunits.MassFlowRate mA_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate mA_flow_nominal= 1.3*QRooC_flow_nominal/1006/(TASup_nominal-TRooSet) "Nominal air mass flow rate, increased by factor 1.3 to allow for recovery after temperature setback"; - parameter Modelica.SIunits.TemperatureDifference dTFan = 2 + parameter Modelica.Units.SI.TemperatureDifference dTFan = 2 "Estimated temperature raise across fan that needs to be made up by the cooling coil"; - parameter Modelica.SIunits.HeatFlowRate QCoiC_flow_nominal=4* + parameter Modelica.Units.SI.HeatFlowRate QCoiC_flow_nominal=4* (QRooC_flow_nominal + mA_flow_nominal*(TASup_nominal-THeaRecLvg-dTFan)*1006) "Cooling load of coil, taking into account economizer, and increased due to latent heat removal"; ///////////////////////////////////////////////////////// // Water temperatures and mass flow rates - parameter Modelica.SIunits.Temperature TWSup_nominal = 273.15+16 + parameter Modelica.Units.SI.Temperature TWSup_nominal = 273.15+16 "Water supply temperature"; - parameter Modelica.SIunits.Temperature TWRet_nominal = 273.15+12 + parameter Modelica.Units.SI.Temperature TWRet_nominal = 273.15+12 "Water return temperature"; - parameter Modelica.SIunits.MassFlowRate mW_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate mW_flow_nominal= QCoiC_flow_nominal/(TWRet_nominal-TWSup_nominal)/4200 "Nominal water mass flow rate"; ///////////////////////////////////////////////////////// diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/ExportContainers/Examples/FMUs/HeaterCooler_u.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/ExportContainers/Examples/FMUs/HeaterCooler_u.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/ExportContainers/Examples/FMUs/HeaterCooler_u.mo" 2021-11-24 08:09:20.979366516 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/ExportContainers/Examples/FMUs/HeaterCooler_u.mo" 2021-11-24 08:10:43.359118935 +0000 @@ -10,11 +10,11 @@ massDynamics=Modelica.Fluid.Types.Dynamics.SteadyState, energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState)); - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=0.01 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=0.01 "Nominal mass flow rate"; - parameter Modelica.SIunits.PressureDifference dp_nominal(displayUnit="Pa")=0 + parameter Modelica.Units.SI.PressureDifference dp_nominal(displayUnit="Pa")=0 "Pressure"; - parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal=100 + parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal=100 "Heat flow rate at u=1, positive for heating"; Modelica.Blocks.Interfaces.RealInput u(min=0, max=1, unit="1") "Control input" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/ExportContainers/Examples/FMUs/Heater_T.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/ExportContainers/Examples/FMUs/Heater_T.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/ExportContainers/Examples/FMUs/Heater_T.mo" 2021-11-24 08:09:20.979366516 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/ExportContainers/Examples/FMUs/Heater_T.mo" 2021-11-24 08:10:43.347118971 +0000 @@ -9,13 +9,13 @@ final QMax_flow=QMax_flow, final energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState)); - parameter Modelica.SIunits.HeatFlowRate QMax_flow=Modelica.Constants.inf + parameter Modelica.Units.SI.HeatFlowRate QMax_flow=Modelica.Constants.inf "Maximum heat flow rate for heating (positive)"; - parameter Modelica.SIunits.HeatFlowRate QMin_flow=-Modelica.Constants.inf + parameter Modelica.Units.SI.HeatFlowRate QMin_flow=-Modelica.Constants.inf "Maximum heat flow rate for cooling (negative)"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=0.01 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=0.01 "Nominal mass flow rate"; - parameter Modelica.SIunits.PressureDifference dp_nominal(displayUnit="Pa")=0 + parameter Modelica.Units.SI.PressureDifference dp_nominal(displayUnit="Pa")=0 "Pressure"; Modelica.Blocks.Interfaces.RealInput TSet(unit="K", displayUnit="degC") diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/ExportContainers/Examples/FMUs/Humidifier_u.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/ExportContainers/Examples/FMUs/Humidifier_u.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/ExportContainers/Examples/FMUs/Humidifier_u.mo" 2021-11-24 08:09:20.979366516 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/ExportContainers/Examples/FMUs/Humidifier_u.mo" 2021-11-24 08:10:43.339118995 +0000 @@ -10,13 +10,13 @@ massDynamics=Modelica.Fluid.Types.Dynamics.SteadyState, final energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState)); - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=0.01 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=0.01 "Nominal mass flow rate"; - parameter Modelica.SIunits.PressureDifference dp_nominal(displayUnit="Pa")=0 + parameter Modelica.Units.SI.PressureDifference dp_nominal(displayUnit="Pa")=0 "Pressure"; - parameter Modelica.SIunits.MassFlowRate mWat_flow_nominal=0.01*0.005 + parameter Modelica.Units.SI.MassFlowRate mWat_flow_nominal=0.01*0.005 "Water mass flow rate at u=1, positive for humidification"; Modelica.Blocks.Interfaces.RealInput u(min=0, max=1, unit="1") diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/ExportContainers/Examples/FMUs/MixingVolume.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/ExportContainers/Examples/FMUs/MixingVolume.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/ExportContainers/Examples/FMUs/MixingVolume.mo" 2021-11-24 08:09:20.979366516 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/ExportContainers/Examples/FMUs/MixingVolume.mo" 2021-11-24 08:10:43.295119127 +0000 @@ -3,10 +3,10 @@ extends BuildingSystems.Fluid.FMI.ExportContainers.PartialTwoPort( redeclare package Medium = BuildingSystems.Media.Air); - parameter Modelica.SIunits.Volume V=1 "Volume"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=0.01 - "Nominal mass flow rate"; + parameter Modelica.Units.SI.Volume V=1 "Volume"; + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=0.01 + "Nominal mass flow rate"; protected BuildingSystems.Fluid.FMI.Adaptors.Inlet bouIn( redeclare final package Medium=Medium, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/ExportContainers/Examples/FMUs/PressureDrop.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/ExportContainers/Examples/FMUs/PressureDrop.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/ExportContainers/Examples/FMUs/PressureDrop.mo" 2021-11-24 08:09:20.979366516 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/ExportContainers/Examples/FMUs/PressureDrop.mo" 2021-11-24 08:10:43.283119163 +0000 @@ -6,9 +6,9 @@ BuildingSystems.Fluid.FixedResistances.PressureDrop com(final m_flow_nominal= m_flow_nominal, final dp_nominal=if use_p_in then dp_nominal else 0)); - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=0.01 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=0.01 "Nominal mass flow rate"; - parameter Modelica.SIunits.PressureDifference dp_nominal(displayUnit="Pa")=100 + parameter Modelica.Units.SI.PressureDifference dp_nominal(displayUnit="Pa")=100 "Pressure drop at nominal mass flow rate"; annotation ( Documentation(info=" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/ExportContainers/Examples/FMUs/ResistanceVolume.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/ExportContainers/Examples/FMUs/ResistanceVolume.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/ExportContainers/Examples/FMUs/ResistanceVolume.mo" 2021-11-24 08:09:20.979366516 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/ExportContainers/Examples/FMUs/ResistanceVolume.mo" 2021-11-24 08:10:43.275119187 +0000 @@ -4,10 +4,10 @@ extends BuildingSystems.Fluid.FMI.ExportContainers.PartialTwoPort( redeclare package Medium = BuildingSystems.Media.Air); - parameter Modelica.SIunits.Volume V=1 "Volume"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=0.01 + parameter Modelica.Units.SI.Volume V=1 "Volume"; + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=0.01 "Nominal mass flow rate"; - parameter Modelica.SIunits.PressureDifference dp_nominal=100 + parameter Modelica.Units.SI.PressureDifference dp_nominal=100 "Nominal pressure drop"; Modelica.Blocks.Sources.RealExpression dpCom(y=res.port_a.p - res.port_b.p) if diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/ExportContainers/Examples/FMUs/ThermalZone.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/ExportContainers/Examples/FMUs/ThermalZone.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/ExportContainers/Examples/FMUs/ThermalZone.mo" 2021-11-24 08:09:20.979366516 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/ExportContainers/Examples/FMUs/ThermalZone.mo" 2021-11-24 08:10:43.255119247 +0000 @@ -7,25 +7,25 @@ replaceable package MediumA = BuildingSystems.Media.Air "Medium for air"; - parameter Modelica.SIunits.Volume V=6*10*3 "Room volume"; + parameter Modelica.Units.SI.Volume V=6*10*3 "Room volume"; ///////////////////////////////////////////////////////// // Air temperatures at design conditions - parameter Modelica.SIunits.Temperature TASup_nominal = 273.15+18 + parameter Modelica.Units.SI.Temperature TASup_nominal = 273.15+18 "Nominal air temperature supplied to room"; - parameter Modelica.SIunits.Temperature TRooSet = 273.15+24 + parameter Modelica.Units.SI.Temperature TRooSet = 273.15+24 "Nominal room air temperature"; - parameter Modelica.SIunits.Temperature TOut_nominal = 273.15+30 + parameter Modelica.Units.SI.Temperature TOut_nominal = 273.15+30 "Design outlet air temperature"; ///////////////////////////////////////////////////////// // Cooling loads and air mass flow rates - parameter Modelica.SIunits.HeatFlowRate QRooInt_flow= + parameter Modelica.Units.SI.HeatFlowRate QRooInt_flow= 1000 "Internal heat gains of the room"; - parameter Modelica.SIunits.HeatFlowRate QRooC_flow_nominal= + parameter Modelica.Units.SI.HeatFlowRate QRooC_flow_nominal= -QRooInt_flow-10E3/30*(TOut_nominal-TRooSet) "Nominal cooling load of the room"; - parameter Modelica.SIunits.MassFlowRate mA_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate mA_flow_nominal= 1.3*QRooC_flow_nominal/1006/(TASup_nominal-TRooSet) "Nominal air mass flow rate, increased by factor 1.3 to allow for recovery after temperature setback"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/ExportContainers/Examples/FMUs/ThermalZones.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/ExportContainers/Examples/FMUs/ThermalZones.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/ExportContainers/Examples/FMUs/ThermalZones.mo" 2021-11-24 08:09:20.979366516 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/ExportContainers/Examples/FMUs/ThermalZones.mo" 2021-11-24 08:10:43.235119307 +0000 @@ -8,25 +8,25 @@ replaceable package MediumA = BuildingSystems.Media.Air "Medium for air"; - parameter Modelica.SIunits.Volume V=6*10*3 "Room volume"; + parameter Modelica.Units.SI.Volume V=6*10*3 "Room volume"; ///////////////////////////////////////////////////////// // Air temperatures at design conditions - parameter Modelica.SIunits.Temperature TASup_nominal = 273.15+18 + parameter Modelica.Units.SI.Temperature TASup_nominal = 273.15+18 "Nominal air temperature supplied to room"; - parameter Modelica.SIunits.Temperature TRooSet = 273.15+24 + parameter Modelica.Units.SI.Temperature TRooSet = 273.15+24 "Nominal room air temperature"; - parameter Modelica.SIunits.Temperature TOut_nominal = 273.15+30 + parameter Modelica.Units.SI.Temperature TOut_nominal = 273.15+30 "Design outlet air temperature"; ///////////////////////////////////////////////////////// // Cooling loads and air mass flow rates - parameter Modelica.SIunits.HeatFlowRate QRooInt_flow= + parameter Modelica.Units.SI.HeatFlowRate QRooInt_flow= 1000 "Internal heat gains of the room"; - parameter Modelica.SIunits.HeatFlowRate QRooC_flow_nominal= + parameter Modelica.Units.SI.HeatFlowRate QRooC_flow_nominal= -QRooInt_flow-10E3/30*(TOut_nominal-TRooSet) "Nominal cooling load of the room"; - parameter Modelica.SIunits.MassFlowRate mA_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate mA_flow_nominal= 1.3*QRooC_flow_nominal/1006/(TASup_nominal-TRooSet) "Nominal air mass flow rate, increased by factor 1.3 to allow for recovery after temperature setback"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/ExportContainers/Validation/FMUs/ThermalZoneAir1.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/ExportContainers/Validation/FMUs/ThermalZoneAir1.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/ExportContainers/Validation/FMUs/ThermalZoneAir1.mo" 2021-11-24 08:09:20.979366516 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/ExportContainers/Validation/FMUs/ThermalZoneAir1.mo" 2021-11-24 08:10:43.055119847 +0000 @@ -4,25 +4,25 @@ redeclare package Medium = BuildingSystems.Media.Air, nPorts = 2); - parameter Modelica.SIunits.Volume V=6*10*3 "Room volume"; + parameter Modelica.Units.SI.Volume V=6*10*3 "Room volume"; ///////////////////////////////////////////////////////// // Air temperatures at design conditions - parameter Modelica.SIunits.Temperature TASup_nominal = 273.15+18 + parameter Modelica.Units.SI.Temperature TASup_nominal = 273.15+18 "Nominal air temperature supplied to room"; - parameter Modelica.SIunits.Temperature TRooSet = 273.15+24 + parameter Modelica.Units.SI.Temperature TRooSet = 273.15+24 "Nominal room air temperature"; - parameter Modelica.SIunits.Temperature TOut_nominal = 273.15+30 + parameter Modelica.Units.SI.Temperature TOut_nominal = 273.15+30 "Design outlet air temperature"; ///////////////////////////////////////////////////////// // Cooling loads and air mass flow rates - parameter Modelica.SIunits.HeatFlowRate QRooInt_flow= + parameter Modelica.Units.SI.HeatFlowRate QRooInt_flow= 1000 "Internal heat gains of the room"; - parameter Modelica.SIunits.HeatFlowRate QRooC_flow_nominal= + parameter Modelica.Units.SI.HeatFlowRate QRooC_flow_nominal= -QRooInt_flow-10E3/30*(TOut_nominal-TRooSet) "Nominal cooling load of the room"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal= 1.3*QRooC_flow_nominal/1006/(TASup_nominal-TRooSet) "Nominal air mass flow rate, increased by factor 1.3 to allow for recovery after temperature setback"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/FlowSplitter_u.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/FlowSplitter_u.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/FlowSplitter_u.mo" 2021-11-24 08:09:20.979366516 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/FlowSplitter_u.mo" 2021-11-24 08:10:42.967120112 +0000 @@ -13,7 +13,7 @@ X_a=0.40) "Propylene glycol water, 40% mass fraction"))); - parameter Modelica.SIunits.MassFlowRate m_flow_nominal[nout]( + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal[nout]( each min=0) "Nominal mass flow rate for each outlet"; parameter Boolean allowFlowReversal = true "= true to allow flow reversal, false restricts to design direction (inlet -> outlet)" @@ -41,7 +41,7 @@ annotation (Placement(transformation(extent={{-140,60},{-100,100}}), iconTransformation(extent={{-120,70},{-100,90}}))); protected - final parameter Modelica.SIunits.MassFlowRate mAve_flow_nominal= + final parameter Modelica.Units.SI.MassFlowRate mAve_flow_nominal= sum(m_flow_nominal)/nout "Average nominal mass flow rate"; protected BuildingSystems.Fluid.FMI.Interfaces.FluidProperties bacPro_internal( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/Interfaces/MassFractionConnector.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/Interfaces/MassFractionConnector.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/Interfaces/MassFractionConnector.mo" 2021-11-24 08:09:20.979366516 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/Interfaces/MassFractionConnector.mo" 2021-11-24 08:10:42.935120208 +0000 @@ -1,6 +1,6 @@ within BuildingSystems.Fluid.FMI.Interfaces; connector MassFractionConnector = - Modelica.SIunits.MassFraction + Modelica.Units.SI.MassFraction "Connector for mass fraction of water vapor per kg total mass" annotation ( defaultComponentName="X_w", diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/Interfaces/PressureInput.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/Interfaces/PressureInput.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/Interfaces/PressureInput.mo" 2021-11-24 08:09:20.979366516 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/Interfaces/PressureInput.mo" 2021-11-24 08:10:42.923120244 +0000 @@ -1,6 +1,6 @@ within BuildingSystems.Fluid.FMI.Interfaces; connector PressureInput = - input Modelica.SIunits.AbsolutePressure(displayUnit="Pa") + input Modelica.Units.SI.AbsolutePressure(displayUnit="Pa") "Connector for pressure input" annotation ( defaultComponentName="p", diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/Interfaces/PressureOutput.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/Interfaces/PressureOutput.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/Interfaces/PressureOutput.mo" 2021-11-24 08:09:20.979366516 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/Interfaces/PressureOutput.mo" 2021-11-24 08:10:42.915120268 +0000 @@ -1,6 +1,6 @@ within BuildingSystems.Fluid.FMI.Interfaces; connector PressureOutput = - output Modelica.SIunits.AbsolutePressure(displayUnit="Pa") + output Modelica.Units.SI.AbsolutePressure(displayUnit="Pa") "Connector for pressure output" annotation ( defaultComponentName="p", diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/Validation/FlowSplitter_u.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/Validation/FlowSplitter_u.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/Validation/FlowSplitter_u.mo" 2021-11-24 08:09:20.979366516 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/Validation/FlowSplitter_u.mo" 2021-11-24 08:10:42.879120376 +0000 @@ -3,7 +3,7 @@ extends Modelica.Icons.Example; package Medium = BuildingSystems.Media.Air "Medium model"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=0.1 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=0.1 "Nominal mass flow rate"; parameter Boolean use_p_in = false diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/Validation/HeaterFan.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/Validation/HeaterFan.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/Validation/HeaterFan.mo" 2021-11-24 08:09:20.979366516 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/Validation/HeaterFan.mo" 2021-11-24 08:10:42.867120412 +0000 @@ -4,11 +4,11 @@ extends Modelica.Icons.Example; package Medium = BuildingSystems.Media.Air "Medium model"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=Q_flow_nominal/1000/10 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=Q_flow_nominal/1000/10 "Nominal mass flow rate"; - parameter Modelica.SIunits.PressureDifference dp_nominal(displayUnit="Pa")=2000 + parameter Modelica.Units.SI.PressureDifference dp_nominal(displayUnit="Pa")=2000 "Pressure"; - parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal = 1000 + parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal = 1000 "Heat flow rate at u=1, positive for heating"; parameter Boolean use_p_in = true diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/Validation/HeaterFanPressureDriven.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/Validation/HeaterFanPressureDriven.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/Validation/HeaterFanPressureDriven.mo" 2021-11-24 08:09:20.979366516 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/Validation/HeaterFanPressureDriven.mo" 2021-11-24 08:10:42.815120568 +0000 @@ -4,11 +4,11 @@ extends Modelica.Icons.Example; package Medium = BuildingSystems.Media.Air "Medium model"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=Q_flow_nominal/1000/10 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=Q_flow_nominal/1000/10 "Nominal mass flow rate"; - parameter Modelica.SIunits.PressureDifference dp_nominal(displayUnit="Pa")=2000 + parameter Modelica.Units.SI.PressureDifference dp_nominal(displayUnit="Pa")=2000 "Pressure"; - parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal = 1000 + parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal = 1000 "Heat flow rate at u=1, positive for heating"; constant Boolean use_p_in = true diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/Validation/HeaterFan_noReverseFlow.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/Validation/HeaterFan_noReverseFlow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/Validation/HeaterFan_noReverseFlow.mo" 2021-11-24 08:09:20.979366516 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FMI/Validation/HeaterFan_noReverseFlow.mo" 2021-11-24 08:10:42.791120641 +0000 @@ -11,11 +11,11 @@ "= true to use a pressure from connector, false to output Medium.p_default" annotation(Evaluate=true); - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=Q_flow_nominal/1000/10 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=Q_flow_nominal/1000/10 "Nominal mass flow rate"; - parameter Modelica.SIunits.PressureDifference dp_nominal(displayUnit="Pa")=2000 + parameter Modelica.Units.SI.PressureDifference dp_nominal(displayUnit="Pa")=2000 "Pressure"; - parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal = 1000 + parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal = 1000 "Heat flow rate at u=1, positive for heating"; ExportContainers.Examples.FMUs.Fan floMac( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/BaseClasses/PlugFlow.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/BaseClasses/PlugFlow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/BaseClasses/PlugFlow.mo" 2021-11-24 08:09:20.979366516 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/BaseClasses/PlugFlow.mo" 2021-11-24 08:10:42.763120724 +0000 @@ -3,27 +3,27 @@ "Lossless pipe model with spatialDistribution plug flow implementation" extends BuildingSystems.Fluid.Interfaces.PartialTwoPort; - parameter Modelica.SIunits.Length dh + parameter Modelica.Units.SI.Length dh "Hydraulic diameter (assuming a round cross section area)"; - parameter Modelica.SIunits.Length length(min=0) "Pipe length"; - final parameter Modelica.SIunits.Area A=Modelica.Constants.pi*(dh/2)^2 + parameter Modelica.Units.SI.Length length(min=0) "Pipe length"; + final parameter Modelica.Units.SI.Area A=Modelica.Constants.pi*(dh/2)^2 "Cross-sectional area of pipe"; parameter Medium.MassFlowRate m_flow_small "Small mass flow rate for regularization of zero flow" annotation(Dialog(tab = "Advanced")); - parameter Modelica.SIunits.Temperature T_start_in=Medium.T_default + parameter Modelica.Units.SI.Temperature T_start_in=Medium.T_default "Initial temperature in pipe at inlet" annotation (Dialog(group="Initialization")); - parameter Modelica.SIunits.Temperature T_start_out=Medium.T_default + parameter Modelica.Units.SI.Temperature T_start_out=Medium.T_default "Initial temperature in pipe at outlet" annotation (Dialog(group="Initialization")); - Modelica.SIunits.Length x + Modelica.Units.SI.Length x "Spatial coordinate for spatialDistribution operator"; - Modelica.SIunits.Velocity v "Flow velocity of medium in pipe"; + Modelica.Units.SI.Velocity v "Flow velocity of medium in pipe"; - Modelica.SIunits.VolumeFlowRate V_flow= + Modelica.Units.SI.VolumeFlowRate V_flow= port_a.m_flow/Modelica.Fluid.Utilities.regStep(port_a.m_flow, Medium.density( Medium.setState_phX( @@ -40,13 +40,13 @@ protected - parameter Modelica.SIunits.SpecificEnthalpy h_ini_in=Medium.specificEnthalpy( + parameter Modelica.Units.SI.SpecificEnthalpy h_ini_in=Medium.specificEnthalpy( Medium.setState_pTX( T=T_start_in, p=Medium.p_default, X=Medium.X_default)) "For initialization of spatialDistribution inlet"; - parameter Modelica.SIunits.SpecificEnthalpy h_ini_out=Medium.specificEnthalpy( + parameter Modelica.Units.SI.SpecificEnthalpy h_ini_out=Medium.specificEnthalpy( Medium.setState_pTX( T=T_start_out, p=Medium.p_default, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/BaseClasses/PlugFlowCore.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/BaseClasses/PlugFlowCore.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/BaseClasses/PlugFlowCore.mo" 2021-11-24 08:09:20.979366516 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/BaseClasses/PlugFlowCore.mo" 2021-11-24 08:10:42.747120773 +0000 @@ -6,23 +6,23 @@ constant Boolean homotopyInitialization = true "= true, use homotopy method" annotation(HideResult=true); - parameter Modelica.SIunits.Length dh + parameter Modelica.Units.SI.Length dh "Hydraulic diameter (assuming a round cross section area)"; - parameter Modelica.SIunits.Velocity v_nominal + parameter Modelica.Units.SI.Velocity v_nominal "Velocity at m_flow_nominal (used to compute default value for hydraulic diameter dh)" annotation(Dialog(group="Nominal condition")); - parameter Modelica.SIunits.Length length(min=0) "Pipe length"; + parameter Modelica.Units.SI.Length length(min=0) "Pipe length"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal(min=0) + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal(min=0) "Nominal mass flow rate" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.MassFlowRate m_flow_small(min=0) = 1E-4*abs( + parameter Modelica.Units.SI.MassFlowRate m_flow_small(min=0) = 1E-4*abs( m_flow_nominal) "Small mass flow rate for regularization of zero flow" annotation (Dialog(tab="Advanced")); - parameter Modelica.SIunits.Height roughness=2.5e-5 + parameter Modelica.Units.SI.Height roughness=2.5e-5 "Average height of surface asperities (default: smooth steel pipe)" annotation (Dialog(group="Geometry")); @@ -39,18 +39,18 @@ parameter Boolean from_dp=false "= true, use m_flow = f(dp) else dp = f(m_flow)" annotation (Evaluate=true, Dialog(tab="Advanced")); - parameter Modelica.SIunits.Length thickness(min=0) "Pipe wall thickness"; + parameter Modelica.Units.SI.Length thickness(min=0) "Pipe wall thickness"; - parameter Modelica.SIunits.Temperature T_start_in=Medium.T_default + parameter Modelica.Units.SI.Temperature T_start_in=Medium.T_default "Initialization temperature at pipe inlet" annotation (Dialog(tab="Initialization")); - parameter Modelica.SIunits.Temperature T_start_out=Medium.T_default + parameter Modelica.Units.SI.Temperature T_start_out=Medium.T_default "Initialization temperature at pipe outlet" annotation (Dialog(tab="Initialization")); parameter Boolean initDelay=false "Initialize delay for a constant mass flow rate if true, otherwise start from 0" annotation (Dialog(tab="Initialization")); - parameter Modelica.SIunits.MassFlowRate m_flow_start=0 + parameter Modelica.Units.SI.MassFlowRate m_flow_start=0 annotation (Dialog(tab="Initialization", enable=initDelay)); parameter Real ReC=4000 @@ -128,13 +128,13 @@ annotation (Placement(transformation(extent={{-10,90},{10,110}}))); protected - parameter Modelica.SIunits.Density rho_default=Medium.density_pTX( + + parameter Modelica.Units.SI.Density rho_default=Medium.density_pTX( p=Medium.p_default, T=Medium.T_default, X=Medium.X_default) "Default density (e.g., rho_liquidWater = 995, rho_air = 1.2)" annotation (Dialog(group="Advanced")); - initial equation assert(homotopyInitialization, "In " + getInstanceName() + ": The constant homotopyInitialization has been modified from its default value. This constant will be removed in future releases.", diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/BaseClasses/PlugFlowHeatLoss.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/BaseClasses/PlugFlowHeatLoss.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/BaseClasses/PlugFlowHeatLoss.mo" 2021-11-24 08:09:20.979366516 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/BaseClasses/PlugFlowHeatLoss.mo" 2021-11-24 08:10:42.715120868 +0000 @@ -11,11 +11,11 @@ parameter Real R(unit="(m.K)/W") "Thermal resistance per unit length from fluid to boundary temperature"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal "Nominal mass flow rate"; - parameter Modelica.SIunits.Temperature T_start + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal "Nominal mass flow rate"; + parameter Modelica.Units.SI.Temperature T_start "Initial output temperature"; - final parameter Modelica.SIunits.Time tau_char=R*C "Characteristic delay time"; + final parameter Modelica.Units.SI.Time tau_char=R*C "Characteristic delay time"; Modelica.Blocks.Interfaces.RealInput tau(unit="s") "Time delay at pipe level" annotation (Placement(transformation( @@ -26,21 +26,21 @@ "Heat port to connect environment (negative if heat is lost to ambient)" annotation (Placement(transformation(extent={{-10,90},{10,110}}))); - Modelica.SIunits.Temperature T_a_inflow(start=T_start) + Modelica.Units.SI.Temperature T_a_inflow(start=T_start) "Temperature at port_a for inflowing fluid"; - Modelica.SIunits.Temperature T_b_outflow(start=T_start) + Modelica.Units.SI.Temperature T_b_outflow(start=T_start) "Temperature at port_b for outflowing fluid"; - Modelica.SIunits.Temperature TAmb=heatPort.T "Environment temperature"; + Modelica.Units.SI.Temperature TAmb=heatPort.T "Environment temperature"; protected parameter Medium.ThermodynamicState sta_default=Medium.setState_pTX( T=Medium.T_default, p=Medium.p_default, X=Medium.X_default) "Default medium state"; - parameter Modelica.SIunits.SpecificHeatCapacity cp_default= + + parameter Modelica.Units.SI.SpecificHeatCapacity cp_default= Medium.specificHeatCapacityCp(state=sta_default) "Heat capacity of medium"; - equation dp = 0; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/BaseClasses/PlugFlowTransportDelay.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/BaseClasses/PlugFlowTransportDelay.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/BaseClasses/PlugFlowTransportDelay.mo" 2021-11-24 08:09:20.979366516 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/BaseClasses/PlugFlowTransportDelay.mo" 2021-11-24 08:10:42.707120892 +0000 @@ -1,34 +1,34 @@ within BuildingSystems.Fluid.FixedResistances.BaseClasses; model PlugFlowTransportDelay "Delay time for given normalized velocity" - parameter Modelica.SIunits.Length length "Pipe length"; - parameter Modelica.SIunits.Length dh + parameter Modelica.Units.SI.Length length "Pipe length"; + parameter Modelica.Units.SI.Length dh "Hydraulic diameter (assuming a round cross section area)"; - parameter Modelica.SIunits.Density rho "Standard density of fluid"; + parameter Modelica.Units.SI.Density rho "Standard density of fluid"; parameter Boolean initDelay=false "Initialize delay for a constant m_flow_start if true, otherwise start from 0" annotation (Dialog(group="Initialization")); - parameter Modelica.SIunits.MassFlowRate m_flow_start=0 + parameter Modelica.Units.SI.MassFlowRate m_flow_start=0 "Initialization of mass flow rate to calculate initial time delay" annotation (Dialog(group="Initialization", enable=initDelay)); - parameter Modelica.SIunits.MassFlowRate m_flow_nominal(min=0) + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal(min=0) "Nominal mass flow rate" annotation (Dialog(group="Nominal condition")); - final parameter Modelica.SIunits.Time t_in_start= + final parameter Modelica.Units.SI.Time t_in_start= if initDelay and (abs(m_flow_start) > 1E-10*m_flow_nominal) then min(length/m_flow_start*(rho*dh^2/4*Modelica.Constants.pi), 0) else 0 "Initial value of input time at inlet"; - final parameter Modelica.SIunits.Time t_out_start= + final parameter Modelica.Units.SI.Time t_out_start= if initDelay and (abs(m_flow_start) > 1E-10*m_flow_nominal) then min(-length/m_flow_start*(rho*dh^2/4*Modelica.Constants.pi), 0) else 0 "Initial value of input time at outlet"; - Modelica.SIunits.Time time_out_rev "Reverse flow direction output time"; - Modelica.SIunits.Time time_out_des "Design flow direction output time"; + Modelica.Units.SI.Time time_out_rev "Reverse flow direction output time"; + Modelica.Units.SI.Time time_out_des "Design flow direction output time"; Real x(start=0) "Spatial coordinate for spatialDistribution operator"; - Modelica.SIunits.Frequency u "Normalized fluid velocity (1/s)"; + Modelica.Units.SI.Frequency u "Normalized fluid velocity (1/s)"; Modelica.Blocks.Interfaces.RealInput m_flow "Mass flow of fluid" annotation ( Placement(transformation(extent={{-140,-20},{-100,20}}), @@ -41,8 +41,8 @@ annotation (Placement(transformation(extent={{100,30},{120,50}}))); protected - parameter Modelica.SIunits.Time t0(fixed = false) "Start time of the simulation"; + parameter Modelica.Units.SI.Time t0(fixed = false) "Start time of the simulation"; initial equation x = 0; t0 = time; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/BaseClasses/Validation/PlugFlowCore.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/BaseClasses/Validation/PlugFlowCore.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/BaseClasses/Validation/PlugFlowCore.mo" 2021-11-24 08:09:20.979366516 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/BaseClasses/Validation/PlugFlowCore.mo" 2021-11-24 08:10:42.687120952 +0000 @@ -4,16 +4,16 @@ replaceable package Medium = BuildingSystems.Media.Water "Medium in pipes" annotation ( choicesAllMatching=true); - parameter Modelica.SIunits.Length dh=0.1 + parameter Modelica.Units.SI.Length dh=0.1 "Hydraulic diameter (assuming a round cross section area)"; - parameter Modelica.SIunits.Length dIns = 0.05 + parameter Modelica.Units.SI.Length dIns = 0.05 "Thickness of pipe insulation"; - parameter Modelica.SIunits.ThermalConductivity kIns= 0.028 + parameter Modelica.Units.SI.ThermalConductivity kIns= 0.028 "Heat conductivity of pipe insulation"; - parameter Modelica.SIunits.SpecificHeatCapacity cPip=500 + parameter Modelica.Units.SI.SpecificHeatCapacity cPip=500 "Specific heat of pipe wall material. 2300 for PE, 500 for steel"; - parameter Modelica.SIunits.Density rhoPip=8000 + parameter Modelica.Units.SI.Density rhoPip=8000 "Density of pipe wall material. 930 for PE, 8000 for steel"; parameter Real R=1/(kIns*2*Modelica.Constants.pi/ @@ -23,7 +23,7 @@ parameter Real C=rho_default*Modelica.Constants.pi*( dh/2)^2*cp_default "Thermal capacity per unit length of water in pipe"; - parameter Modelica.SIunits.Density rho_default=Medium.density_pTX( + parameter Modelica.Units.SI.Density rho_default=Medium.density_pTX( p=Medium.p_default, T=Medium.T_default, X=Medium.X_default) @@ -35,7 +35,7 @@ p=Medium.p_default, X=Medium.X_default) "Default medium state"; - parameter Modelica.SIunits.SpecificHeatCapacity cp_default= + parameter Modelica.Units.SI.SpecificHeatCapacity cp_default= Medium.specificHeatCapacityCp(state=sta_default) "Heat capacity of medium"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/CheckValve.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/CheckValve.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/CheckValve.mo" 2021-11-24 08:09:20.979366516 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/CheckValve.mo" 2021-11-24 08:10:42.671121001 +0000 @@ -10,12 +10,12 @@ extends BuildingSystems.Fluid.Actuators.BaseClasses.ValveParameters( rhoStd=Medium.density_pTX(101325, 273.15 + 4, Medium.X_default)); - parameter Modelica.SIunits.PressureDifference dpFixed_nominal( + parameter Modelica.Units.SI.PressureDifference dpFixed_nominal( displayUnit="Pa", min=0) = 0 "Pressure drop of pipe and other resistances that are in series" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.PressureDifference dpValve_closing = dpValve_nominal/2 + parameter Modelica.Units.SI.PressureDifference dpValve_closing = dpValve_nominal/2 "Pressure drop when the check valve starts to close" annotation(Dialog(group="Nominal condition")); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/HydraulicDiameter.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/HydraulicDiameter.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/HydraulicDiameter.mo" 2021-11-24 08:09:20.979366516 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/HydraulicDiameter.mo" 2021-11-24 08:10:42.579121277 +0000 @@ -4,25 +4,25 @@ final deltaM = eta_default*dh/4*Modelica.Constants.pi*ReC/m_flow_nominal_pos, final dp_nominal=fac*dpStraightPipe_nominal); - parameter Modelica.SIunits.Length dh=sqrt(4*m_flow_nominal/rho_default/v_nominal/Modelica.Constants.pi) + parameter Modelica.Units.SI.Length dh=sqrt(4*m_flow_nominal/rho_default/v_nominal/Modelica.Constants.pi) "Hydraulic diameter (assuming a round cross section area)"; - parameter Modelica.SIunits.Length length "Length of the pipe"; + parameter Modelica.Units.SI.Length length "Length of the pipe"; parameter Real ReC(min=0)=4000 "Reynolds number where transition to turbulent starts"; - parameter Modelica.SIunits.Velocity v_nominal = if rho_default < 500 then 1.5 else 0.15 + parameter Modelica.Units.SI.Velocity v_nominal = if rho_default < 500 then 1.5 else 0.15 "Velocity at m_flow_nominal (used to compute default value for hydraulic diameter dh)" annotation(Dialog(group="Nominal condition")); - parameter Modelica.SIunits.Length roughness(min=0) = 2.5e-5 + parameter Modelica.Units.SI.Length roughness(min=0) = 2.5e-5 "Absolute roughness of pipe, with a default for a smooth steel pipe (dummy if use_roughness = false)"; parameter Real fac(min=1) = 2 "Factor to take into account resistance of bends etc., fac=dp_nominal/dpStraightPipe_nominal"; - final parameter Modelica.SIunits.PressureDifference dpStraightPipe_nominal(displayUnit="Pa")= + final parameter Modelica.Units.SI.PressureDifference dpStraightPipe_nominal(displayUnit="Pa")= Modelica.Fluid.Pipes.BaseClasses.WallFriction.Detailed.pressureLoss_m_flow( m_flow=m_flow_nominal, rho_a=rho_default, @@ -35,11 +35,11 @@ m_flow_small=m_flow_small) "Pressure loss of a straight pipe at m_flow_nominal"; - Modelica.SIunits.Velocity v = m_flow/(rho_default*ARound) + Modelica.Units.SI.Velocity v = m_flow/(rho_default*ARound) "Flow velocity (assuming a round cross section area)"; protected - parameter Modelica.SIunits.Area ARound = dh^2*Modelica.Constants.pi/4 + parameter Modelica.Units.SI.Area ARound = dh^2*Modelica.Constants.pi/4 "Cross sectional area (assuming a round cross section area)"; parameter Medium.ThermodynamicState state_default= @@ -48,10 +48,10 @@ p=Medium.p_default, X=Medium.X_default[1:Medium.nXi]) "Default state"; - parameter Modelica.SIunits.Density rho_default = Medium.density(state_default) + parameter Modelica.Units.SI.Density rho_default = Medium.density(state_default) "Density at nominal condition"; - parameter Modelica.SIunits.DynamicViscosity mu_default = Medium.dynamicViscosity( + parameter Modelica.Units.SI.DynamicViscosity mu_default = Medium.dynamicViscosity( state_default) "Dynamic viscosity at nominal condition"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/Junction.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/Junction.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/Junction.mo" 2021-11-24 08:09:20.979366516 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/Junction.mo" 2021-11-24 08:10:42.567121313 +0000 @@ -29,11 +29,11 @@ constant Boolean homotopyInitialization = true "= true, use homotopy method" annotation(HideResult=true); - parameter Modelica.SIunits.MassFlowRate[3] m_flow_nominal + parameter Modelica.Units.SI.MassFlowRate[3] m_flow_nominal "Mass flow rate. Set negative at outflowing ports." annotation(Dialog(group = "Nominal condition")); - parameter Modelica.SIunits.Pressure[3] dp_nominal(each displayUnit = "Pa") + parameter Modelica.Units.SI.Pressure[3] dp_nominal(each displayUnit = "Pa") "Pressure drop at nominal mass flow rate, set to zero or negative number at outflowing ports." annotation(Dialog(group = "Nominal condition")); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/Pipe.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/Pipe.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/Pipe.mo" 2021-11-24 08:09:20.979366516 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/Pipe.mo" 2021-11-24 08:10:42.547121373 +0000 @@ -9,19 +9,19 @@ dp_nominal=2*dpStraightPipe_nominal); parameter Integer nNodes(min=1) = 1 "Number of volume segments"; - parameter Modelica.SIunits.Length length + parameter Modelica.Units.SI.Length length "Length of the pipe" annotation(Dialog(group = "Geometry")); - parameter Modelica.SIunits.Length diameter = sqrt(4*m_flow_nominal/rho_default/v_nominal/Modelica.Constants.pi) + parameter Modelica.Units.SI.Length diameter = sqrt(4*m_flow_nominal/rho_default/v_nominal/Modelica.Constants.pi) "Pipe diameter (without insulation)" annotation(Dialog(group = "Geometry")); - parameter Modelica.SIunits.Length thicknessIns + parameter Modelica.Units.SI.Length thicknessIns "Thickness of insulation" annotation(Dialog(group = "Geometry")); - parameter Modelica.SIunits.ThermalConductivity lambdaIns + parameter Modelica.Units.SI.ThermalConductivity lambdaIns "Heat conductivity of insulation" annotation(Dialog(group = "Material")); - parameter Modelica.SIunits.ReynoldsNumber ReC=4000 + parameter Modelica.Units.SI.ReynoldsNumber ReC=4000 "Reynolds number where transition to turbulent starts" annotation (Dialog(tab="Flow resistance")); parameter Boolean useMultipleHeatPorts=false @@ -29,10 +29,10 @@ parameter Boolean useExternalHeatSource=false "= true to transfer the volume temperature to the outer interface (heatPort)" annotation (Dialog(tab="Advanced")); - parameter Modelica.SIunits.SurfaceCoefficientOfHeatTransfer alpha_in = 1000.0 + parameter Modelica.Units.SI.SurfaceCoefficientOfHeatTransfer alpha_in = 1000.0 "Heat transfer coefficient pipe inside" annotation (Dialog(group="Heat transfer")); - parameter Modelica.SIunits.SurfaceCoefficientOfHeatTransfer alpha_out = 3.0 + parameter Modelica.Units.SI.SurfaceCoefficientOfHeatTransfer alpha_out = 3.0 "Heat transfer coefficient pipe outside" annotation (Dialog(group="Heat transfer")); BuildingSystems.Fluid.FixedResistances.HydraulicDiameter res( @@ -82,21 +82,21 @@ "Multiple heat ports that connect to outside of pipe wall (enabled if useMultipleHeatPorts=true)" annotation (Placement(transformation(extent={{-10,-70},{11,-50}}), iconTransformation(extent={{-30,-60},{30,-40}}))); protected - parameter Modelica.SIunits.Volume VPipe=Modelica.Constants.pi*(diameter/2.0)^2*length + parameter Modelica.Units.SI.Volume VPipe=Modelica.Constants.pi*(diameter/2.0)^2*length "Pipe volume"; parameter Medium.ThermodynamicState state_default = Medium.setState_pTX( T=Medium.T_default, p=Medium.p_default, X=Medium.X_default[1:Medium.nXi]) "Default state"; - parameter Modelica.SIunits.Density rho_default = Medium.density(state_default); - parameter Modelica.SIunits.DynamicViscosity mu_default = Medium.dynamicViscosity(state_default) + parameter Modelica.Units.SI.Density rho_default = Medium.density(state_default); + parameter Modelica.Units.SI.DynamicViscosity mu_default = Medium.dynamicViscosity(state_default) "Dynamic viscosity at nominal condition"; - parameter Modelica.SIunits.Velocity v_nominal = 0.15 + parameter Modelica.Units.SI.Velocity v_nominal = 0.15 "Velocity at m_flow_nominal (used to compute default diameter)"; - parameter Modelica.SIunits.Length roughness(min=0) = 2.5e-5 + parameter Modelica.Units.SI.Length roughness(min=0) = 2.5e-5 "Absolute roughness of pipe, with a default for a smooth steel pipe (dummy if use_roughness = false)"; - final parameter Modelica.SIunits.Pressure dpStraightPipe_nominal= + final parameter Modelica.Units.SI.Pressure dpStraightPipe_nominal= Modelica.Fluid.Pipes.BaseClasses.WallFriction.Detailed.pressureLoss_m_flow( m_flow=m_flow_nominal, rho_a=rho_default, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/PlugFlowPipe.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/PlugFlowPipe.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/PlugFlowPipe.mo" 2021-11-24 08:09:20.979366516 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/PlugFlowPipe.mo" 2021-11-24 08:10:42.523121445 +0000 @@ -10,61 +10,61 @@ "= true, use m_flow = f(dp) else dp = f(m_flow)" annotation (Dialog(tab="Advanced")); - parameter Modelica.SIunits.Length dh=sqrt(4*m_flow_nominal/rho_default/v_nominal/Modelica.Constants.pi) + parameter Modelica.Units.SI.Length dh=sqrt(4*m_flow_nominal/rho_default/v_nominal/Modelica.Constants.pi) "Hydraulic diameter (assuming a round cross section area)" annotation (Dialog(group="Material")); - parameter Modelica.SIunits.Velocity v_nominal = 1.5 + parameter Modelica.Units.SI.Velocity v_nominal = 1.5 "Velocity at m_flow_nominal (used to compute default value for hydraulic diameter dh)" annotation(Dialog(group="Nominal condition")); parameter Real ReC=4000 "Reynolds number where transition to turbulent starts"; - parameter Modelica.SIunits.Height roughness=2.5e-5 + parameter Modelica.Units.SI.Height roughness=2.5e-5 "Average height of surface asperities (default: smooth steel pipe)" annotation (Dialog(group="Material")); - parameter Modelica.SIunits.Length length "Pipe length" + parameter Modelica.Units.SI.Length length "Pipe length" annotation (Dialog(group="Material")); - parameter Modelica.SIunits.MassFlowRate m_flow_nominal + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal "Nominal mass flow rate" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.MassFlowRate m_flow_small = 1E-4*abs( + parameter Modelica.Units.SI.MassFlowRate m_flow_small = 1E-4*abs( m_flow_nominal) "Small mass flow rate for regularization of zero flow" annotation (Dialog(tab="Advanced")); - parameter Modelica.SIunits.Length dIns + parameter Modelica.Units.SI.Length dIns "Thickness of pipe insulation, used to compute R" annotation (Dialog(group="Thermal resistance")); - parameter Modelica.SIunits.ThermalConductivity kIns + parameter Modelica.Units.SI.ThermalConductivity kIns "Heat conductivity of pipe insulation, used to compute R" annotation (Dialog(group="Thermal resistance")); - parameter Modelica.SIunits.SpecificHeatCapacity cPip=2300 + parameter Modelica.Units.SI.SpecificHeatCapacity cPip=2300 "Specific heat of pipe wall material. 2300 for PE, 500 for steel" annotation (Dialog(group="Material")); - parameter Modelica.SIunits.Density rhoPip(displayUnit="kg/m3")=930 + parameter Modelica.Units.SI.Density rhoPip(displayUnit="kg/m3")=930 "Density of pipe wall material. 930 for PE, 8000 for steel" annotation (Dialog(group="Material")); - parameter Modelica.SIunits.Length thickness = 0.0035 + parameter Modelica.Units.SI.Length thickness = 0.0035 "Pipe wall thickness" annotation (Dialog(group="Material")); - parameter Modelica.SIunits.Temperature T_start_in(start=Medium.T_default)= + parameter Modelica.Units.SI.Temperature T_start_in(start=Medium.T_default)= Medium.T_default "Initialization temperature at pipe inlet" annotation (Dialog(tab="Initialization")); - parameter Modelica.SIunits.Temperature T_start_out(start=Medium.T_default)= + parameter Modelica.Units.SI.Temperature T_start_out(start=Medium.T_default)= T_start_in "Initialization temperature at pipe outlet" annotation (Dialog(tab="Initialization")); parameter Boolean initDelay(start=false) = false "Initialize delay for a constant mass flow rate if true, otherwise start from 0" annotation (Dialog(tab="Initialization")); - parameter Modelica.SIunits.MassFlowRate m_flow_start=0 "Initial value of mass flow rate through pipe" + parameter Modelica.Units.SI.MassFlowRate m_flow_start=0 "Initial value of mass flow rate through pipe" annotation (Dialog(tab="Initialization", enable=initDelay)); parameter Real R(unit="(m.K)/W")=1/(kIns*2*Modelica.Constants.pi/ @@ -125,10 +125,10 @@ annotation (Placement(transformation(extent={{60,20},{80,40}}))); protected - parameter Modelica.SIunits.HeatCapacity CPip= + parameter Modelica.Units.SI.HeatCapacity CPip= length*((dh + 2*thickness)^2 - dh^2)*Modelica.Constants.pi/4*cPip*rhoPip "Heat capacity of pipe wall"; - final parameter Modelica.SIunits.Volume VEqu=CPip/(rho_default*cp_default) + final parameter Modelica.Units.SI.Volume VEqu=CPip/(rho_default*cp_default) "Equivalent water volume to represent pipe wall thermal inertia"; parameter Medium.ThermodynamicState sta_default=Medium.setState_pTX( @@ -136,7 +136,7 @@ p=Medium.p_default, X=Medium.X_default) "Default medium state"; - parameter Modelica.SIunits.SpecificHeatCapacity cp_default= + parameter Modelica.Units.SI.SpecificHeatCapacity cp_default= Medium.specificHeatCapacityCp(state=sta_default) "Heat capacity of medium"; @@ -144,13 +144,13 @@ rho_default*Modelica.Constants.pi*(dh/2)^2*cp_default "Thermal capacity per unit length of water in pipe"; - parameter Modelica.SIunits.Density rho_default=Medium.density_pTX( + + parameter Modelica.Units.SI.Density rho_default=Medium.density_pTX( p=Medium.p_default, T=Medium.T_default, X=Medium.X_default) "Default density (e.g., rho_liquidWater = 995, rho_air = 1.2)" annotation (Dialog(group="Advanced")); - initial equation assert(homotopyInitialization, "In " + getInstanceName() + ": The constant homotopyInitialization has been modified from its default value. This constant will be removed in future releases.", diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/BaseClasses/PipeDataULg.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/BaseClasses/PipeDataULg.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/BaseClasses/PipeDataULg.mo" 2021-11-24 08:09:20.979366516 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/BaseClasses/PipeDataULg.mo" 2021-11-24 08:10:42.395121829 +0000 @@ -1,11 +1,11 @@ within BuildingSystems.Fluid.FixedResistances.Validation.PlugFlowPipes.Data.BaseClasses; partial record PipeDataULg "Base class for ULg experimental data" extends PipeDataBaseDefinition; - parameter Modelica.SIunits.Temp_C T_start_in = 20 + parameter Modelica.Units.NonSI.Temperature_degC T_start_in = 20 "Initial temperature at inlet"; - parameter Modelica.SIunits.Temp_C T_start_out = 20 + parameter Modelica.Units.NonSI.Temperature_degC T_start_out = 20 "Initial temperature at outlet"; - parameter Modelica.SIunits.MassFlowRate m_flowIni = 0 + parameter Modelica.Units.SI.MassFlowRate m_flowIni = 0 "Mass flow initialization"; annotation (Documentation(info="
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/Validation/PlugFlowPipes/MSLAIT.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/Validation/PlugFlowPipes/MSLAIT.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/Validation/PlugFlowPipes/MSLAIT.mo" 2021-11-24 08:09:20.979366516 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/Validation/PlugFlowPipes/MSLAIT.mo" 2021-11-24 08:10:42.335122010 +0000 @@ -87,10 +87,10 @@ origin={124,-8}))); inner Modelica.Fluid.System system annotation (Placement(transformation(extent={{-140,140},{-120,160}}))); - parameter Modelica.SIunits.ThermalResistance R= + parameter Modelica.Units.SI.ThermalResistance R= 1/(2*kIns*Modelica.Constants.pi)*log(0.18/0.0899) + 1/(2*2.4*Modelica.Constants.pi)*log(2/0.18) "Thermal resistance of main pipes"; - parameter Modelica.SIunits.ThermalResistance R80= + parameter Modelica.Units.SI.ThermalResistance R80= 1/(2*0.024*Modelica.Constants.pi)*log(0.07/0.0337) + 1/(2*2.4*Modelica.Constants.pi)*log(2/0.07) "Thermal resistance of service pipes"; @@ -250,11 +250,11 @@ extent={{-10,-10},{10,10}}, rotation=90, origin={-22,62}))); - parameter Modelica.SIunits.ThermalConductivity kIns=0.024 + parameter Modelica.Units.SI.ThermalConductivity kIns=0.024 "Heat conductivity of pipe insulation material"; - parameter Modelica.SIunits.Length dIns=0.045 + parameter Modelica.Units.SI.Length dIns=0.045 "Thickness of pipe insulation"; - parameter Modelica.SIunits.Diameter diameter=0.089 + parameter Modelica.Units.SI.Diameter diameter=0.089 "Outer diameter of pipe"; Fluid.Sensors.TemperatureTwoPort senTem_p2(redeclare package Medium = Medium, @@ -295,9 +295,9 @@ rotation=90, origin={42,80}))); - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=1 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1 "Nominal mass flow rate, used for regularization near zero flow"; - parameter Modelica.SIunits.Time tauHeaTra=6500 + parameter Modelica.Units.SI.Time tauHeaTra=6500 "Time constant for heat transfer, default 20 minutes"; Fluid.Sources.MassFlowSource_T Point5( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/Validation/PlugFlowPipes/MSLAIT2Nodes.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/Validation/PlugFlowPipes/MSLAIT2Nodes.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/Validation/PlugFlowPipes/MSLAIT2Nodes.mo" 2021-11-24 08:09:20.979366516 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/Validation/PlugFlowPipes/MSLAIT2Nodes.mo" 2021-11-24 08:10:42.219122358 +0000 @@ -249,11 +249,11 @@ extent={{-10,-10},{10,10}}, rotation=90, origin={-28,68}))); - parameter Modelica.SIunits.ThermalConductivity kIns=0.024 + parameter Modelica.Units.SI.ThermalConductivity kIns=0.024 "Heat conductivity"; - parameter Modelica.SIunits.Length dIns=0.045 + parameter Modelica.Units.SI.Length dIns=0.045 "Thickness of pipe insulation"; - parameter Modelica.SIunits.Diameter diameter=0.089 + parameter Modelica.Units.SI.Diameter diameter=0.089 "Outer diameter of pipe"; Fluid.Sensors.TemperatureTwoPort senTem_p2(redeclare package Medium = Medium, @@ -294,9 +294,9 @@ rotation=90, origin={18,112}))); - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=1 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1 "Nominal mass flow rate, used for regularization near zero flow"; - parameter Modelica.SIunits.Time tauHeaTra=6500 + parameter Modelica.Units.SI.Time tauHeaTra=6500 "Time constant for heat transfer, default 20 minutes"; Modelica.Blocks.Logical.Switch switch diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowAIT.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowAIT.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowAIT.mo" 2021-11-24 08:09:20.979366516 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowAIT.mo" 2021-11-24 08:10:42.135122610 +0000 @@ -3,7 +3,7 @@ "Validation pipe against data from Austrian Institute of Technology" extends Modelica.Icons.Example; package Medium = BuildingSystems.Media.Water; - parameter Modelica.SIunits.Length Lcap=1 + parameter Modelica.Units.SI.Length Lcap=1 "Length over which transient effects typically take place"; parameter Real R80(unit="(m.K)/W")=1/(2*0.024*Modelica.Constants.pi) *log(0.07/0.0337) + 1/(2*2.4*Modelica.Constants.pi)*log(2/0.07) "Thermal resistance per unit length of service pipes"; @@ -12,12 +12,12 @@ "Flag to decide whether volumes are included at the end points of the pipe"; parameter Boolean allowFlowReversal=true "= true to allow flow reversal, false restricts to design direction (port_a -> port_b)"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=1 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1 "Nominal mass flow rate, used for regularization near zero flow"; - parameter Modelica.SIunits.Time tauHeaTra=6500 + parameter Modelica.Units.SI.Time tauHeaTra=6500 "Time constant for heat transfer, default 20 minutes"; - parameter Modelica.SIunits.Length thickness=0.0032 "Pipe wall thickness"; + parameter Modelica.Units.SI.Length thickness=0.0032 "Pipe wall thickness"; Fluid.Sources.MassFlowSource_T Point1( redeclare package Medium = Medium, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowULg.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowULg.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowULg.mo" 2021-11-24 08:09:20.979366516 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowULg.mo" 2021-11-24 08:10:42.087122754 +0000 @@ -3,13 +3,13 @@ extends Modelica.Icons.Example; package Medium = BuildingSystems.Media.Water; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=1 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1 "Nominal mass flow rate, used for regularization near zero flow"; - parameter Modelica.SIunits.Temperature T_start_in=pipeDataULg.T_start_in + 273.15 + parameter Modelica.Units.SI.Temperature T_start_in=pipeDataULg.T_start_in + 273.15 "Initial temperature at pipe inlet"; - parameter Modelica.SIunits.Temperature T_start_out=pipeDataULg.T_start_out + 273.15 + parameter Modelica.Units.SI.Temperature T_start_out=pipeDataULg.T_start_out + 273.15 "Initial temperature at pipe outlet"; - parameter Modelica.SIunits.SpecificHeatCapacity cp_default= + parameter Modelica.Units.SI.SpecificHeatCapacity cp_default= Medium.specificHeatCapacityCp(state=sta_default) "Heat capacity of medium"; parameter Medium.ThermodynamicState sta_default=Medium.setState_pTX( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/Validation/PlugFlowPipes/TransportWaterAir.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/Validation/PlugFlowPipes/TransportWaterAir.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/Validation/PlugFlowPipes/TransportWaterAir.mo" 2021-11-24 08:09:20.979366516 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/Validation/PlugFlowPipes/TransportWaterAir.mo" 2021-11-24 08:10:42.063122826 +0000 @@ -6,7 +6,7 @@ package MediumA = BuildingSystems.Media.Air(extraPropertiesNames={"CO2"}) "Medium in the duct"; - parameter Modelica.SIunits.Length length=20 "Pipe length"; + parameter Modelica.Units.SI.Length length=20 "Pipe length"; Modelica.Blocks.Sources.Step Tin( startTime=100, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/Validation/PressureDropsSeries.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/Validation/PressureDropsSeries.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/Validation/PressureDropsSeries.mo" 2021-11-24 08:09:20.979366516 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/FixedResistances/Validation/PressureDropsSeries.mo" 2021-11-24 08:10:42.023122946 +0000 @@ -6,7 +6,7 @@ parameter Integer nRes(min=2) = 10 "Number of resistances"; - parameter Modelica.SIunits.PressureDifference dp_nominal = 5 + parameter Modelica.Units.SI.PressureDifference dp_nominal = 5 "Nominal pressure drop for each resistance"; Modelica.Blocks.Sources.Ramp P( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalHEXOneUTube.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalHEXOneUTube.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalHEXOneUTube.mo" 2021-11-24 08:09:20.979366516 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalHEXOneUTube.mo" 2021-11-24 08:10:41.943123187 +0000 @@ -5,7 +5,7 @@ parameter Integer nSeg(min=1) = 10 "Number of segments to use in vertical discretization of the boreholes"; - parameter Modelica.SIunits.Length hSeg = borFieDat.conDat.hBor/nSeg + parameter Modelica.Units.SI.Length hSeg = borFieDat.conDat.hBor/nSeg "Length of the internal heat exchanger"; package Medium = Modelica.Media.Water.ConstantPropertyLiquidWater; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalHEXTwoUTube.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalHEXTwoUTube.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalHEXTwoUTube.mo" 2021-11-24 08:09:20.979366516 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalHEXTwoUTube.mo" 2021-11-24 08:10:41.927123235 +0000 @@ -5,7 +5,7 @@ parameter Integer nSeg(min=1) = 10 "Number of segments to use in vertical discretization of the boreholes"; - parameter Modelica.SIunits.Length hSeg = borFieDat.conDat.hBor/nSeg + parameter Modelica.Units.SI.Length hSeg = borFieDat.conDat.hBor/nSeg "Length of the internal heat exchanger"; package Medium = Modelica.Media.Water.ConstantPropertyLiquidWater; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalResistancesOneUTube.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalResistancesOneUTube.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalResistancesOneUTube.mo" 2021-11-24 08:09:20.979366516 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalResistancesOneUTube.mo" 2021-11-24 08:10:41.911123283 +0000 @@ -4,12 +4,12 @@ parameter Integer nSeg(min=1) = 10 "Number of segments to use in vertical discretization of the boreholes"; - parameter Modelica.SIunits.Length hSeg = borFieDat.conDat.hBor/nSeg + parameter Modelica.Units.SI.Length hSeg = borFieDat.conDat.hBor/nSeg "Length of the internal heat exchanger"; - parameter Modelica.SIunits.ThermalResistance Rgb_val=0.0430511 "Grout node to borehole wall thermal resistance"; - parameter Modelica.SIunits.ThermalResistance Rgg_val=0.00605573 "Grout node to grout node thermal resistance"; - parameter Modelica.SIunits.ThermalResistance RCondGro_val=0.14285 "Pipe to grout node thermal resistance"; - parameter Modelica.SIunits.Temperature T_start=298.15 "Initial temperature"; + parameter Modelica.Units.SI.ThermalResistance Rgb_val=0.0430511 "Grout node to borehole wall thermal resistance"; + parameter Modelica.Units.SI.ThermalResistance Rgg_val=0.00605573 "Grout node to grout node thermal resistance"; + parameter Modelica.Units.SI.ThermalResistance RCondGro_val=0.14285 "Pipe to grout node thermal resistance"; + parameter Modelica.Units.SI.Temperature T_start=298.15 "Initial temperature"; BuildingSystems.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.InternalResistancesOneUTube intRes1UTub( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalResistancesTwoUTube.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalResistancesTwoUTube.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalResistancesTwoUTube.mo" 2021-11-24 08:09:20.979366516 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalResistancesTwoUTube.mo" 2021-11-24 08:10:41.903123307 +0000 @@ -4,14 +4,14 @@ parameter Integer nSeg(min=1) = 10 "Number of segments to use in vertical discretization of the boreholes"; - parameter Modelica.SIunits.Length hSeg = borFieDat.conDat.hBor/nSeg + parameter Modelica.Units.SI.Length hSeg = borFieDat.conDat.hBor/nSeg "Length of the internal heat exchanger"; - parameter Modelica.SIunits.ThermalResistance Rgb_val=0.572601 "Grout node to borehole wall thermal resistance"; - parameter Modelica.SIunits.ThermalResistance Rgg1_val=0.0406121 "Grout node to grout node thermal resistance"; - parameter Modelica.SIunits.ThermalResistance Rgg2_val=0.216904 + parameter Modelica.Units.SI.ThermalResistance Rgb_val=0.572601 "Grout node to borehole wall thermal resistance"; + parameter Modelica.Units.SI.ThermalResistance Rgg1_val=0.0406121 "Grout node to grout node thermal resistance"; + parameter Modelica.Units.SI.ThermalResistance Rgg2_val=0.216904 "Thermal resistance between two grout nodes opposite to each other"; - parameter Modelica.SIunits.ThermalResistance RCondGro_val=0.195099 "Pipe to grout node thermal resistance"; - parameter Modelica.SIunits.Temperature T_start=298.15 "Initial temperature"; + parameter Modelica.Units.SI.ThermalResistance RCondGro_val=0.195099 "Pipe to grout node thermal resistance"; + parameter Modelica.Units.SI.Temperature T_start=298.15 "Initial temperature"; Modelica.Thermal.HeatTransfer.Sources.FixedTemperature TWal(T=T_start) "Borehole wall temperature" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/ConvectionResistanceCircularPipe.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/ConvectionResistanceCircularPipe.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/ConvectionResistanceCircularPipe.mo" 2021-11-24 08:09:20.979366516 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/ConvectionResistanceCircularPipe.mo" 2021-11-24 08:10:41.883123367 +0000 @@ -3,24 +3,24 @@ "Validation of the correlation used to evaluate the convection resistance in circular pipes" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Height hSeg = 1.0 "Height of the element"; - parameter Modelica.SIunits.Radius rTub = 0.02 "Tube radius"; - parameter Modelica.SIunits.Length eTub = 0.002 "Tube thickness"; + parameter Modelica.Units.SI.Height hSeg = 1.0 "Height of the element"; + parameter Modelica.Units.SI.Radius rTub = 0.02 "Tube radius"; + parameter Modelica.Units.SI.Length eTub = 0.002 "Tube thickness"; // thermal properties - parameter Modelica.SIunits.ThermalConductivity kMed = 0.6 + parameter Modelica.Units.SI.ThermalConductivity kMed = 0.6 "Thermal conductivity of the fluid"; - parameter Modelica.SIunits.DynamicViscosity muMed = 1.002e-3 + parameter Modelica.Units.SI.DynamicViscosity muMed = 1.002e-3 "Dynamic viscosity of the fluid"; - parameter Modelica.SIunits.SpecificHeatCapacity cpMed = 4182 + parameter Modelica.Units.SI.SpecificHeatCapacity cpMed = 4182 "Specific heat capacity of the fluid"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 1 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 1 "Nominal mass flow rate"; Real Re "Reynolds number"; Real Nu "Reynolds number"; - Modelica.SIunits.MassFlowRate m_flow "Mass flow rate"; - Modelica.SIunits.ThermalResistance RConv "Convection resistance"; + Modelica.Units.SI.MassFlowRate m_flow "Mass flow rate"; + Modelica.Units.SI.ThermalResistance RConv "Convection resistance"; equation Re = time; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesOneUTube.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesOneUTube.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesOneUTube.mo" 2021-11-24 08:09:20.979366516 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesOneUTube.mo" 2021-11-24 08:10:41.875123390 +0000 @@ -7,41 +7,41 @@ // Geometry of the borehole parameter Real Rb(unit="(m.K)/W") = 0.0 "Borehole thermal resistance (Not used)"; - parameter Modelica.SIunits.Height hSeg = 1.0 "Height of the element"; - parameter Modelica.SIunits.Radius rBor = 0.07 "Radius of the borehole"; + parameter Modelica.Units.SI.Height hSeg = 1.0 "Height of the element"; + parameter Modelica.Units.SI.Radius rBor = 0.07 "Radius of the borehole"; // Geometry of the pipe - parameter Modelica.SIunits.Radius rTub = 0.02 "Radius of the tube"; - parameter Modelica.SIunits.Length eTub = 0.002 "Thickness of the tubes"; - parameter Modelica.SIunits.Length sha = 0.03 + parameter Modelica.Units.SI.Radius rTub = 0.02 "Radius of the tube"; + parameter Modelica.Units.SI.Length eTub = 0.002 "Thickness of the tubes"; + parameter Modelica.Units.SI.Length sha = 0.03 "Shank spacing, defined as the distance between the center of a pipe and the center of the borehole"; // Thermal properties (Solids) - parameter Modelica.SIunits.ThermalConductivity kFil = 1.5 + parameter Modelica.Units.SI.ThermalConductivity kFil = 1.5 "Thermal conductivity of the grout"; - parameter Modelica.SIunits.ThermalConductivity kSoi = 2.5 + parameter Modelica.Units.SI.ThermalConductivity kSoi = 2.5 "Thermal conductivity of the soi"; - parameter Modelica.SIunits.ThermalConductivity kTub = 0.4 + parameter Modelica.Units.SI.ThermalConductivity kTub = 0.4 "Thermal conductivity of the tube"; // Thermal properties (Fluid) - parameter Modelica.SIunits.ThermalConductivity kMed = 0.6 + parameter Modelica.Units.SI.ThermalConductivity kMed = 0.6 "Thermal conductivity of the fluid"; - parameter Modelica.SIunits.DynamicViscosity muMed = 1.0e-3 + parameter Modelica.Units.SI.DynamicViscosity muMed = 1.0e-3 "Dynamic viscosity of the fluid"; - parameter Modelica.SIunits.SpecificHeatCapacity cpMed = 4180.0 + parameter Modelica.Units.SI.SpecificHeatCapacity cpMed = 4180.0 "Specific heat capacity of the fluid"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 0.25 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 0.25 "Nominal mass flow rate"; // Outputs parameter Real x(fixed=false) "Capacity location"; - parameter Modelica.SIunits.ThermalResistance Rgb(fixed=false) + + parameter Modelica.Units.SI.ThermalResistance Rgb(fixed=false) "Thermal resistance between grout zone and borehole wall"; - parameter Modelica.SIunits.ThermalResistance Rgg(fixed=false) + parameter Modelica.Units.SI.ThermalResistance Rgg(fixed=false) "Thermal resistance between the two grout zones"; - parameter Modelica.SIunits.ThermalResistance RCondGro(fixed=false) + parameter Modelica.Units.SI.ThermalResistance RCondGro(fixed=false) "Thermal resistance between: pipe wall to capacity in grout"; - initial equation (x, Rgb, Rgg, RCondGro) = BuildingSystems.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Functions.internalResistancesOneUTube( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesOneUTubeNegative.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesOneUTubeNegative.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesOneUTubeNegative.mo" 2021-11-24 08:09:20.979366516 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesOneUTubeNegative.mo" 2021-11-24 08:10:41.867123415 +0000 @@ -6,41 +6,41 @@ // Geometry of the borehole parameter Real Rb(unit="(m.K)/W") = 0.0 "Borehole thermal resistance (Not used)"; - parameter Modelica.SIunits.Height hSeg = 1.0 "Height of the element"; - parameter Modelica.SIunits.Radius rBor = 0.07 "Radius of the borehole"; + parameter Modelica.Units.SI.Height hSeg = 1.0 "Height of the element"; + parameter Modelica.Units.SI.Radius rBor = 0.07 "Radius of the borehole"; // Geometry of the pipe - parameter Modelica.SIunits.Radius rTub = 0.02 "Radius of the tube"; - parameter Modelica.SIunits.Length eTub = 0.002 "Thickness of the tubes"; - parameter Modelica.SIunits.Length sha = 0.05 + parameter Modelica.Units.SI.Radius rTub = 0.02 "Radius of the tube"; + parameter Modelica.Units.SI.Length eTub = 0.002 "Thickness of the tubes"; + parameter Modelica.Units.SI.Length sha = 0.05 "Shank spacing, defined as the distance between the center of a pipe and the center of the borehole"; // Thermal properties (Solids) - parameter Modelica.SIunits.ThermalConductivity kFil = 1.5 + parameter Modelica.Units.SI.ThermalConductivity kFil = 1.5 "Thermal conductivity of the grout"; - parameter Modelica.SIunits.ThermalConductivity kSoi = 2.5 + parameter Modelica.Units.SI.ThermalConductivity kSoi = 2.5 "Thermal conductivity of the soi"; - parameter Modelica.SIunits.ThermalConductivity kTub = 0.4 + parameter Modelica.Units.SI.ThermalConductivity kTub = 0.4 "Thermal conductivity of the tube"; // Thermal properties (Fluid) - parameter Modelica.SIunits.ThermalConductivity kMed = 0.6 + parameter Modelica.Units.SI.ThermalConductivity kMed = 0.6 "Thermal conductivity of the fluid"; - parameter Modelica.SIunits.DynamicViscosity muMed = 1.0e-3 + parameter Modelica.Units.SI.DynamicViscosity muMed = 1.0e-3 "Dynamic viscosity of the fluid"; - parameter Modelica.SIunits.SpecificHeatCapacity cpMed = 4180.0 + parameter Modelica.Units.SI.SpecificHeatCapacity cpMed = 4180.0 "Specific heat capacity of the fluid"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 0.25 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 0.25 "Nominal mass flow rate"; // Outputs parameter Real x(fixed=false) "Capacity location"; - parameter Modelica.SIunits.ThermalResistance Rgb(fixed=false) + + parameter Modelica.Units.SI.ThermalResistance Rgb(fixed=false) "Thermal resistance between grout zone and borehole wall"; - parameter Modelica.SIunits.ThermalResistance Rgg(fixed=false) + parameter Modelica.Units.SI.ThermalResistance Rgg(fixed=false) "Thermal resistance between the two grout zones"; - parameter Modelica.SIunits.ThermalResistance RCondGro(fixed=false) + parameter Modelica.Units.SI.ThermalResistance RCondGro(fixed=false) "Thermal resistance between: pipe wall to capacity in grout"; - initial equation (x, Rgb, Rgg, RCondGro) = BuildingSystems.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Functions.internalResistancesOneUTube( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesTwoUTube.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesTwoUTube.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesTwoUTube.mo" 2021-11-24 08:09:20.979366516 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesTwoUTube.mo" 2021-11-24 08:10:41.851123463 +0000 @@ -6,43 +6,43 @@ // Geometry of the borehole parameter Real Rb(unit="(m.K)/W") = 0.0 "Borehole thermal resistance (Not used)"; - parameter Modelica.SIunits.Height hSeg = 1.0 "Height of the element"; - parameter Modelica.SIunits.Radius rBor = 0.07 "Radius of the borehole"; + parameter Modelica.Units.SI.Height hSeg = 1.0 "Height of the element"; + parameter Modelica.Units.SI.Radius rBor = 0.07 "Radius of the borehole"; // Geometry of the pipe - parameter Modelica.SIunits.Radius rTub = 0.02 "Radius of the tube"; - parameter Modelica.SIunits.Length eTub = 0.002 "Thickness of the tubes"; - parameter Modelica.SIunits.Length sha = 0.025 + parameter Modelica.Units.SI.Radius rTub = 0.02 "Radius of the tube"; + parameter Modelica.Units.SI.Length eTub = 0.002 "Thickness of the tubes"; + parameter Modelica.Units.SI.Length sha = 0.025 "Shank spacing, defined as the distance between the center of a pipe and the center of the borehole"; // Thermal properties (Solids) - parameter Modelica.SIunits.ThermalConductivity kFil = 0.5 + parameter Modelica.Units.SI.ThermalConductivity kFil = 0.5 "Thermal conductivity of the grout"; - parameter Modelica.SIunits.ThermalConductivity kSoi = 2.5 + parameter Modelica.Units.SI.ThermalConductivity kSoi = 2.5 "Thermal conductivity of the soi"; - parameter Modelica.SIunits.ThermalConductivity kTub = 0.4 + parameter Modelica.Units.SI.ThermalConductivity kTub = 0.4 "Thermal conductivity of the tube"; // Thermal properties (Fluid) - parameter Modelica.SIunits.ThermalConductivity kMed = 0.6 + parameter Modelica.Units.SI.ThermalConductivity kMed = 0.6 "Thermal conductivity of the fluid"; - parameter Modelica.SIunits.DynamicViscosity muMed = 1.0e-3 + parameter Modelica.Units.SI.DynamicViscosity muMed = 1.0e-3 "Dynamic viscosity of the fluid"; - parameter Modelica.SIunits.SpecificHeatCapacity cpMed = 4180.0 + parameter Modelica.Units.SI.SpecificHeatCapacity cpMed = 4180.0 "Specific heat capacity of the fluid"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 0.25 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 0.25 "Nominal mass flow rate"; // Outputs parameter Real x(fixed=false) "Capacity location"; - parameter Modelica.SIunits.ThermalResistance Rgb(fixed=false) + + parameter Modelica.Units.SI.ThermalResistance Rgb(fixed=false) "Thermal resistance between grout zone and borehole wall"; - parameter Modelica.SIunits.ThermalResistance Rgg1(fixed=false) + parameter Modelica.Units.SI.ThermalResistance Rgg1(fixed=false) "Thermal resistance between the two adjacent grout zones"; - parameter Modelica.SIunits.ThermalResistance Rgg2(fixed=false) + parameter Modelica.Units.SI.ThermalResistance Rgg2(fixed=false) "Thermal resistance between the two opposite grout zones"; - parameter Modelica.SIunits.ThermalResistance RCondGro(fixed=false) + parameter Modelica.Units.SI.ThermalResistance RCondGro(fixed=false) "Thermal resistance between: pipe wall to capacity in grout"; - initial equation (x, Rgb, Rgg1, Rgg2, RCondGro) = BuildingSystems.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Functions.internalResistancesTwoUTube( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesTwoUTubeNegative.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesTwoUTubeNegative.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesTwoUTubeNegative.mo" 2021-11-24 08:09:20.979366516 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesTwoUTubeNegative.mo" 2021-11-24 08:10:41.831123523 +0000 @@ -6,43 +6,43 @@ // Geometry of the borehole parameter Real Rb(unit="(m.K)/W") = 0.0 "Borehole thermal resistance (Not used)"; - parameter Modelica.SIunits.Height hSeg = 1.0 "Height of the element"; - parameter Modelica.SIunits.Radius rBor = 0.07 "Radius of the borehole"; + parameter Modelica.Units.SI.Height hSeg = 1.0 "Height of the element"; + parameter Modelica.Units.SI.Radius rBor = 0.07 "Radius of the borehole"; // Geometry of the pipe - parameter Modelica.SIunits.Radius rTub = 0.02 "Radius of the tube"; - parameter Modelica.SIunits.Length eTub = 0.002 "Thickness of the tubes"; - parameter Modelica.SIunits.Length sha = 0.05 + parameter Modelica.Units.SI.Radius rTub = 0.02 "Radius of the tube"; + parameter Modelica.Units.SI.Length eTub = 0.002 "Thickness of the tubes"; + parameter Modelica.Units.SI.Length sha = 0.05 "Shank spacing, defined as the distance between the center of a pipe and the center of the borehole"; // Thermal properties (Solids) - parameter Modelica.SIunits.ThermalConductivity kFil = 1.5 + parameter Modelica.Units.SI.ThermalConductivity kFil = 1.5 "Thermal conductivity of the grout"; - parameter Modelica.SIunits.ThermalConductivity kSoi = 2.5 + parameter Modelica.Units.SI.ThermalConductivity kSoi = 2.5 "Thermal conductivity of the soi"; - parameter Modelica.SIunits.ThermalConductivity kTub = 0.4 + parameter Modelica.Units.SI.ThermalConductivity kTub = 0.4 "Thermal conductivity of the tube"; // Thermal properties (Fluid) - parameter Modelica.SIunits.ThermalConductivity kMed = 0.6 + parameter Modelica.Units.SI.ThermalConductivity kMed = 0.6 "Thermal conductivity of the fluid"; - parameter Modelica.SIunits.DynamicViscosity muMed = 1.0e-3 + parameter Modelica.Units.SI.DynamicViscosity muMed = 1.0e-3 "Dynamic viscosity of the fluid"; - parameter Modelica.SIunits.SpecificHeatCapacity cpMed = 4180.0 + parameter Modelica.Units.SI.SpecificHeatCapacity cpMed = 4180.0 "Specific heat capacity of the fluid"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 0.25 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 0.25 "Nominal mass flow rate"; // Outputs parameter Real x(fixed=false) "Capacity location"; - parameter Modelica.SIunits.ThermalResistance Rgb(fixed=false) + + parameter Modelica.Units.SI.ThermalResistance Rgb(fixed=false) "Thermal resistance between grout zone and borehole wall"; - parameter Modelica.SIunits.ThermalResistance Rgg1(fixed=false) + parameter Modelica.Units.SI.ThermalResistance Rgg1(fixed=false) "Thermal resistance between the two adjacent grout zones"; - parameter Modelica.SIunits.ThermalResistance Rgg2(fixed=false) + parameter Modelica.Units.SI.ThermalResistance Rgg2(fixed=false) "Thermal resistance between the two opposite grout zones"; - parameter Modelica.SIunits.ThermalResistance RCondGro(fixed=false) + parameter Modelica.Units.SI.ThermalResistance RCondGro(fixed=false) "Thermal resistance between: pipe wall to capacity in grout"; - initial equation (x, Rgb, Rgg1, Rgg2, RCondGro) = BuildingSystems.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Functions.internalResistancesTwoUTube( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/MultipoleThermalResistances_OneUTube.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/MultipoleThermalResistances_OneUTube.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/MultipoleThermalResistances_OneUTube.mo" 2021-11-24 08:09:20.979366516 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/MultipoleThermalResistances_OneUTube.mo" 2021-11-24 08:10:41.823123547 +0000 @@ -5,21 +5,21 @@ parameter Integer nPip=2 "Number of pipes"; parameter Integer J=3 "Number of multipoles"; - parameter Modelica.SIunits.Position[nPip] xPip={0.03, -0.03} + parameter Modelica.Units.SI.Position[nPip] xPip={0.03, -0.03} "x-Coordinates of pipes"; - parameter Modelica.SIunits.Position[nPip] yPip={0.00, 0.02} + parameter Modelica.Units.SI.Position[nPip] yPip={0.00, 0.02} "y-Coordinates of pipes"; - parameter Modelica.SIunits.Radius rBor=0.07 "Borehole radius"; - parameter Modelica.SIunits.Radius[nPip] rPip=fill(0.02, nPip) + parameter Modelica.Units.SI.Radius rBor=0.07 "Borehole radius"; + parameter Modelica.Units.SI.Radius[nPip] rPip=fill(0.02, nPip) "Outter radius of pipes"; - parameter Modelica.SIunits.ThermalConductivity kFil=1.5 + parameter Modelica.Units.SI.ThermalConductivity kFil=1.5 "Thermal conductivity of grouting material"; - parameter Modelica.SIunits.ThermalConductivity kSoi=2.5 + parameter Modelica.Units.SI.ThermalConductivity kSoi=2.5 "Thermal conductivity of soil material"; parameter Real[nPip] RFluPip(each unit="(m.K)/W")= fill(1.2/(2*Modelica.Constants.pi*kFil), nPip) "Fluid to pipe wall thermal resistances"; - parameter Modelica.SIunits.Temperature TBor=0 + parameter Modelica.Units.SI.Temperature TBor=0 "Average borehole wall temperature"; parameter Real[nPip,nPip] RDelta_Ref(each unit="(m.K)/W")= diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/MultipoleThermalResistances_TwoUTube.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/MultipoleThermalResistances_TwoUTube.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/MultipoleThermalResistances_TwoUTube.mo" 2021-11-24 08:09:20.979366516 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/MultipoleThermalResistances_TwoUTube.mo" 2021-11-24 08:10:41.811123583 +0000 @@ -5,21 +5,21 @@ parameter Integer nPip=4 "Number of pipes"; parameter Integer J=3 "Number of multipoles"; - parameter Modelica.SIunits.Position[nPip] xPip={0.03, -0.03, -0.03, 0.03} + parameter Modelica.Units.SI.Position[nPip] xPip={0.03, -0.03, -0.03, 0.03} "x-Coordinates of pipes"; - parameter Modelica.SIunits.Position[nPip] yPip={0.03, 0.03, -0.03, -0.03} + parameter Modelica.Units.SI.Position[nPip] yPip={0.03, 0.03, -0.03, -0.03} "y-Coordinates of pipes"; - parameter Modelica.SIunits.Radius rBor=0.07 "Borehole radius"; - parameter Modelica.SIunits.Radius[nPip] rPip=fill(0.02, nPip) + parameter Modelica.Units.SI.Radius rBor=0.07 "Borehole radius"; + parameter Modelica.Units.SI.Radius[nPip] rPip=fill(0.02, nPip) "Outter radius of pipes"; - parameter Modelica.SIunits.ThermalConductivity kFil=1.5 + parameter Modelica.Units.SI.ThermalConductivity kFil=1.5 "Thermal conductivity of grouting material"; - parameter Modelica.SIunits.ThermalConductivity kSoi=2.5 + parameter Modelica.Units.SI.ThermalConductivity kSoi=2.5 "Thermal conductivity of soil material"; parameter Real[nPip] RFluPip(each unit="(m.K)/W")= fill(1.2/(2*Modelica.Constants.pi*kFil), nPip) "Fluid to pipe wall thermal resistances"; - parameter Modelica.SIunits.Temperature TBor=0 + parameter Modelica.Units.SI.Temperature TBor=0 "Average borehole wall temperature"; parameter Real[nPip,nPip] RDelta_Ref(each unit="(m.K)/W")= diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/convectionResistanceCircularPipe.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/convectionResistanceCircularPipe.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/convectionResistanceCircularPipe.mo" 2021-11-24 08:09:20.979366516 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/convectionResistanceCircularPipe.mo" 2021-11-24 08:10:41.799123619 +0000 @@ -3,32 +3,32 @@ "Thermal resistance from the fluid in pipes and the grout zones (Bauer et al. 2011)" // Geometry of the borehole - input Modelica.SIunits.Height hSeg "Height of the element"; - input Modelica.SIunits.Radius rTub "Tube radius"; - input Modelica.SIunits.Length eTub "Tube thickness"; + input Modelica.Units.SI.Height hSeg "Height of the element"; + input Modelica.Units.SI.Radius rTub "Tube radius"; + input Modelica.Units.SI.Length eTub "Tube thickness"; // thermal properties - input Modelica.SIunits.ThermalConductivity kMed + input Modelica.Units.SI.ThermalConductivity kMed "Thermal conductivity of the fluid"; - input Modelica.SIunits.DynamicViscosity muMed + input Modelica.Units.SI.DynamicViscosity muMed "Dynamic viscosity of the fluid"; - input Modelica.SIunits.SpecificHeatCapacity cpMed + input Modelica.Units.SI.SpecificHeatCapacity cpMed "Specific heat capacity of the fluid"; - input Modelica.SIunits.MassFlowRate m_flow "Mass flow rate"; - input Modelica.SIunits.MassFlowRate m_flow_nominal "Nominal mass flow rate"; + input Modelica.Units.SI.MassFlowRate m_flow "Mass flow rate"; + input Modelica.Units.SI.MassFlowRate m_flow_nominal "Nominal mass flow rate"; // Outputs - output Modelica.SIunits.ThermalResistance RFluPip + output Modelica.Units.SI.ThermalResistance RFluPip "Convection resistance (or conduction in fluid if no mass flow)"; protected - parameter Modelica.SIunits.Radius rTub_in = rTub - eTub + parameter Modelica.Units.SI.Radius rTub_in = rTub - eTub "Pipe inner radius"; - Modelica.SIunits.CoefficientOfHeatTransfer h + Modelica.Units.SI.CoefficientOfHeatTransfer h "Convective heat transfer coefficient of the fluid"; Real k(unit="s/kg") "Coefficient used in the computation of the convective heat transfer coefficient"; - Modelica.SIunits.MassFlowRate m_flow_abs = BuildingSystems.Utilities.Math.Functions.spliceFunction(m_flow,-m_flow,m_flow,m_flow_nominal/30); + Modelica.Units.SI.MassFlowRate m_flow_abs = BuildingSystems.Utilities.Math.Functions.spliceFunction(m_flow,-m_flow,m_flow,m_flow_nominal/30); Real Re "Reynolds number"; Real NuTurb "Nusselt at Re=2400"; Real Nu "Nusselt"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/internalResistancesOneUTube.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/internalResistancesOneUTube.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/internalResistancesOneUTube.mo" 2021-11-24 08:09:20.979366516 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/internalResistancesOneUTube.mo" 2021-11-24 08:10:41.783123667 +0000 @@ -5,22 +5,22 @@ BuildingSystems.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Functions.partialInternalResistances; // Outputs - output Modelica.SIunits.ThermalResistance Rgb + output Modelica.Units.SI.ThermalResistance Rgb "Thermal resistance between grout zone and borehole wall"; - output Modelica.SIunits.ThermalResistance Rgg + output Modelica.Units.SI.ThermalResistance Rgg "Thermal resistance between the two grout zones"; - output Modelica.SIunits.ThermalResistance RCondGro + output Modelica.Units.SI.ThermalResistance RCondGro "Thermal resistance between: pipe wall to capacity in grout"; protected Real[2,2] RDelta(each unit="(m.K)/W") "Delta-circuit thermal resistances"; Real[2,2] R(each unit="(m.K)/W") "Internal thermal resistances"; - Modelica.SIunits.Position[2] xPip = {-sha, sha} "x-Coordinates of pipes"; - Modelica.SIunits.Position[2] yPip = {0., 0.} "y-Coordinates of pipes"; - Modelica.SIunits.Radius[2] rPip = {rTub, rTub} "Outer radius of pipes"; + Modelica.Units.SI.Position[2] xPip = {-sha, sha} "x-Coordinates of pipes"; + Modelica.Units.SI.Position[2] yPip = {0., 0.} "y-Coordinates of pipes"; + Modelica.Units.SI.Radius[2] rPip = {rTub, rTub} "Outer radius of pipes"; Real[2] RFluPip(each unit="(m.K)/W") = {RCondPipe+RConv, RCondPipe+RConv} "Fluid to pipe wall thermal resistances"; - Modelica.SIunits.ThermalResistance Rg + Modelica.Units.SI.ThermalResistance Rg "Thermal resistance between outer borehole wall and one tube"; - Modelica.SIunits.ThermalResistance Rar + Modelica.Units.SI.ThermalResistance Rar "Thermal resistance between the two pipe outer walls"; Real Ra(unit="(m.K)/W") diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/internalResistancesTwoUTube.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/internalResistancesTwoUTube.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/internalResistancesTwoUTube.mo" 2021-11-24 08:09:20.979366516 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/internalResistancesTwoUTube.mo" 2021-11-24 08:10:41.739123799 +0000 @@ -5,32 +5,32 @@ BuildingSystems.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Functions.partialInternalResistances; // Outputs - output Modelica.SIunits.ThermalResistance Rgb + output Modelica.Units.SI.ThermalResistance Rgb "Thermal resistance between a grout capacity and the borehole wall, as defined by Bauer et al (2010)"; - output Modelica.SIunits.ThermalResistance Rgg1 + output Modelica.Units.SI.ThermalResistance Rgg1 "Thermal resistance between two neightbouring grout capacities, as defined by Bauer et al (2010)"; - output Modelica.SIunits.ThermalResistance Rgg2 + output Modelica.Units.SI.ThermalResistance Rgg2 "Thermal resistance between two grout capacities opposite to each other, as defined by Bauer et al (2010)"; - output Modelica.SIunits.ThermalResistance RCondGro + output Modelica.Units.SI.ThermalResistance RCondGro "Thermal resistance between a pipe wall and the grout capacity, as defined by Bauer et al (2010)"; protected Real[4,4] RDelta(each unit="(m.K)/W") "Delta-circuit thermal resistances"; Real[4,4] R(each unit="(m.K)/W") "Internal thermal resistances"; - Modelica.SIunits.Position[4] xPip = {-sha, sha, 0., 0.} "x-Coordinates of pipes"; - Modelica.SIunits.Position[4] yPip = {0., 0., -sha, sha} "y-Coordinates of pipes"; - Modelica.SIunits.Radius[4] rPip = {rTub, rTub, rTub, rTub} "Outer radius of pipes"; + Modelica.Units.SI.Position[4] xPip = {-sha, sha, 0., 0.} "x-Coordinates of pipes"; + Modelica.Units.SI.Position[4] yPip = {0., 0., -sha, sha} "y-Coordinates of pipes"; + Modelica.Units.SI.Radius[4] rPip = {rTub, rTub, rTub, rTub} "Outer radius of pipes"; Real[4] RFluPip(each unit="(m.K)/W") = {RCondPipe+RConv, RCondPipe+RConv, RCondPipe+RConv, RCondPipe+RConv} "Fluid to pipe wall thermal resistances"; Real Ra( unit="(m.K)/W") "Grout-to-grout resistance (2D) as defined by Hellstrom. Interaction between the different grout parts"; - Modelica.SIunits.ThermalResistance Rg + + Modelica.Units.SI.ThermalResistance Rg "Thermal resistance between outer borehole wall and one tube"; - Modelica.SIunits.ThermalResistance Rar1 + Modelica.Units.SI.ThermalResistance Rar1 "Thermal resistance between the two closest pipe outer walls"; - Modelica.SIunits.ThermalResistance Rar2 + Modelica.Units.SI.ThermalResistance Rar2 "Thermal resistance between the two farthest pipe outer walls"; - algorithm // Internal thermal resistances (RDelta, R) := diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/multipoleFluidTemperature.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/multipoleFluidTemperature.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/multipoleFluidTemperature.mo" 2021-11-24 08:09:20.979366516 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/multipoleFluidTemperature.mo" 2021-11-24 08:10:41.719123859 +0000 @@ -4,19 +4,19 @@ input Integer nPip "Number of pipes"; input Integer J "Number of multipoles"; - input Modelica.SIunits.Position xPip[nPip] "x-Coordinates of pipes"; - input Modelica.SIunits.Position yPip[nPip] "y-Coordinates of pipes"; + input Modelica.Units.SI.Position xPip[nPip] "x-Coordinates of pipes"; + input Modelica.Units.SI.Position yPip[nPip] "y-Coordinates of pipes"; input Real QPip_flow[nPip](each unit="W/m") "Heat flow in pipes"; - input Modelica.SIunits.Temperature TBor "Average borehole wall temperature"; - input Modelica.SIunits.Radius rBor "Borehole radius"; - input Modelica.SIunits.Radius rPip[nPip] "Outter radius of pipes"; - input Modelica.SIunits.ThermalConductivity kFil "Thermal conductivity of grouting material"; - input Modelica.SIunits.ThermalConductivity kSoi "Thermal conductivity of soil material"; + input Modelica.Units.SI.Temperature TBor "Average borehole wall temperature"; + input Modelica.Units.SI.Radius rBor "Borehole radius"; + input Modelica.Units.SI.Radius rPip[nPip] "Outter radius of pipes"; + input Modelica.Units.SI.ThermalConductivity kFil "Thermal conductivity of grouting material"; + input Modelica.Units.SI.ThermalConductivity kSoi "Thermal conductivity of soil material"; input Real RFluPip[nPip](each unit="(m.K)/W") "Fluid to pipe wall thermal resistances"; input Real eps=1.0e-5 "Iteration relative accuracy"; input Integer it_max=100 "Maximum number of iterations"; - output Modelica.SIunits.Temperature TFlu[nPip] "Fluid temperature in pipes"; + output Modelica.Units.SI.Temperature TFlu[nPip] "Fluid temperature in pipes"; protected Real pikFil(unit="(m.K)/W")=1/(2*Modelica.Constants.pi*kFil) "Coefficient based on grout thermal conductivity"; @@ -36,7 +36,7 @@ Real R0[nPip,nPip](each unit="(m.K)/W") "Line source approximation of thermal resistances"; Complex deltaTFlu "Fluid temperature difference with line source approximation"; Real rbm "Intermediate coefficient"; - Modelica.SIunits.Distance dz "Pipe to pipe distance"; + Modelica.Units.SI.Distance dz "Pipe to pipe distance"; Real coeff[nPip,J] "Coefficient for multiplication with matrix F_mk"; Real diff "Difference in subsequent multipole evaluations"; Real diff_max "Maximum difference in subsequent multipole evaluations"; @@ -46,18 +46,17 @@ Real eps_max "Convergence variable"; algorithm - // Thermal resistance matrix from 0th order multipole +// Thermal resistance matrix from 0th order multipole for i in 1:nPip loop zPip_i := Complex(xPip[i], yPip[i]); - rbm := rBor^2/(rBor^2 - Modelica.ComplexMath.'abs'(zPip_i)^2); - R0[i, i] := pikFil*(log(rBor/rPip[i]) + betaPip[i] + sigma*log(rbm)); + rbm := rBor ^ 2 / (rBor ^ 2 - Modelica.ComplexMath.abs(zPip_i) ^ 2); + R0[i, i] := pikFil * (log(rBor / rPip[i]) + betaPip[i] + sigma * log(rbm)); for j in 1:nPip loop zPip_j := Complex(xPip[j], yPip[j]); if i <> j then - dz := Modelica.ComplexMath.'abs'(zPip_i - zPip_j); - rbm := rBor^2/Modelica.ComplexMath.'abs'(rBor^2 - zPip_j* - Modelica.ComplexMath.conj(zPip_i)); - R0[i, j] := pikFil*(log(rBor/dz) + sigma*log(rbm)); + dz := Modelica.ComplexMath.abs(zPip_i - zPip_j); + rbm := rBor ^ 2 / Modelica.ComplexMath.abs(rBor ^ 2 - zPip_j * Modelica.ComplexMath.conj(zPip_i)); + R0[i, j] := pikFil * (log(rBor / dz) + sigma * log(rbm)); end if; end for; end for; @@ -65,34 +64,22 @@ // Initialize maximum error and iteration counter eps_max := 1.0e99; it := 0; - // Multipoles +// Multipoles if J > 0 then for m in 1:nPip loop for k in 1:J loop - coeff[m, k] := -(1 - k*betaPip[m])/(1 + k*betaPip[m]); + coeff[m, k] := -(1 - k * betaPip[m]) / (1 + k * betaPip[m]); PRea[m, k] := 0; PIma[m, k] := 0; end for; end for; while eps_max > eps and it < it_max loop it := it + 1; - (FRea, FIma) := - BuildingSystems.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Functions.multipoleFmk( - nPip, - J, - QPip_flow, - PRea, - PIma, - rBor, - rPip, - xPip, - yPip, - kFil, - kSoi); + (FRea, FIma) := BuildingSystems.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Functions.multipoleFmk(nPip, J, QPip_flow, PRea, PIma, rBor, rPip, xPip, yPip, kFil, kSoi); for m in 1:nPip loop for k in 1:J loop F_mk := Complex(FRea[m, k], FIma[m, k]); - P_nj_new := coeff[m, k]*Modelica.ComplexMath.conj(F_mk); + P_nj_new := coeff[m, k] * Modelica.ComplexMath.conj(F_mk); PRea_new[m, k] := Modelica.ComplexMath.real(P_nj_new); PIma_new[m, k] := Modelica.ComplexMath.imag(P_nj_new); end for; @@ -103,17 +90,15 @@ for k in 1:J loop P_nj := Complex(PRea[m, k], PIma[m, k]); P_nj_new := Complex(PRea_new[m, k], PIma_new[m, k]); - diff_max := max(diff_max, - Modelica.ComplexMath.'abs'(P_nj_new - P_nj)); - diff_min := min(diff_min, - Modelica.ComplexMath.'abs'(P_nj_new - P_nj)); + diff_max := max(diff_max, Modelica.ComplexMath.abs(P_nj_new - P_nj)); + diff_min := min(diff_min, Modelica.ComplexMath.abs(P_nj_new - P_nj)); end for; end for; diff := diff_max - diff_min; if it == 1 then - diff0 :=diff; + diff0 := diff; end if; - eps_max := diff/diff0; + eps_max := diff / diff0; PRea := PRea_new; PIma := PIma_new; end while; @@ -123,26 +108,23 @@ TFlu := TBor .+ R0*QPip_flow; if J > 0 then for m in 1:nPip loop - zPip_i :=Complex(xPip[m], yPip[m]); + zPip_i := Complex(xPip[m], yPip[m]); deltaTFlu := Complex(0, 0); for n in 1:nPip loop - zPip_j :=Complex(xPip[n], yPip[n]); + zPip_j := Complex(xPip[n], yPip[n]); for j in 1:J loop P_nj := Complex(PRea[n, j], PIma[n, j]); if n <> m then - // Second term - deltaTFlu := deltaTFlu + P_nj*(rPip[n]/(zPip_i - zPip_j))^j; + deltaTFlu := deltaTFlu + P_nj * (rPip[n] / (zPip_i - zPip_j)) ^ j; end if; - // Third term - deltaTFlu := deltaTFlu + sigma*P_nj*(rPip[n]* - Modelica.ComplexMath.conj(zPip_i)/(rBor^2 - zPip_j* - Modelica.ComplexMath.conj(zPip_i)))^j; + deltaTFlu := deltaTFlu + sigma * P_nj * (rPip[n] * Modelica.ComplexMath.conj(zPip_i) / (rBor ^ 2 - zPip_j * Modelica.ComplexMath.conj(zPip_i))) ^ j; end for; end for; TFlu[m] := TFlu[m] + Modelica.ComplexMath.real(deltaTFlu); end for; end if; - +// Second term +// Third term annotation (Documentation(info="
This model evaluates the fluid temperatures using the multipole method of Claesson and Hellstrom (2011).
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/multipoleFmk.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/multipoleFmk.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/multipoleFmk.mo" 2021-11-24 08:09:20.979366516 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/multipoleFmk.mo" 2021-11-24 08:10:41.691123943 +0000 @@ -7,12 +7,12 @@ input Real QPip_flow[nPip](each unit="W/m") "Heat flow in pipes"; input Real PRea[nPip,J] "Multipoles (Real part)"; input Real PIma[nPip,J] "Multipoles (Imaginary part)"; - input Modelica.SIunits.Radius rBor "Borehole radius"; - input Modelica.SIunits.Radius rPip[nPip] "Outter radius of pipes"; - input Modelica.SIunits.Position xPip[nPip] "x-Coordinates of pipes"; - input Modelica.SIunits.Position yPip[nPip] "y-Coordinates of pipes"; - input Modelica.SIunits.ThermalConductivity kFil "Thermal conductivity of grouting material"; - input Modelica.SIunits.ThermalConductivity kSoi "Thermal conductivity of soil material"; + input Modelica.Units.SI.Radius rBor "Borehole radius"; + input Modelica.Units.SI.Radius rPip[nPip] "Outter radius of pipes"; + input Modelica.Units.SI.Position xPip[nPip] "x-Coordinates of pipes"; + input Modelica.Units.SI.Position yPip[nPip] "y-Coordinates of pipes"; + input Modelica.Units.SI.ThermalConductivity kFil "Thermal conductivity of grouting material"; + input Modelica.Units.SI.ThermalConductivity kSoi "Thermal conductivity of soil material"; output Real FRea[nPip,J] "Multipole coefficients"; output Real FIma[nPip,J] "Multipole coefficients"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/multipoleThermalResistances.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/multipoleThermalResistances.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/multipoleThermalResistances.mo" 2021-11-24 08:09:20.979366516 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/multipoleThermalResistances.mo" 2021-11-24 08:10:41.679123980 +0000 @@ -5,21 +5,21 @@ input Integer nPip "Number of pipes"; input Integer J "Number of multipoles"; - input Modelica.SIunits.Position xPip[nPip] "x-Coordinates of pipes"; - input Modelica.SIunits.Position yPip[nPip] "y-Coordinates of pipes"; - input Modelica.SIunits.Radius rBor "Borehole radius"; - input Modelica.SIunits.Radius rPip[nPip] "Outter radius of pipes"; - input Modelica.SIunits.ThermalConductivity kFil "Thermal conductivity of grouting material"; - input Modelica.SIunits.ThermalConductivity kSoi "Thermal conductivity of soil material"; + input Modelica.Units.SI.Position xPip[nPip] "x-Coordinates of pipes"; + input Modelica.Units.SI.Position yPip[nPip] "y-Coordinates of pipes"; + input Modelica.Units.SI.Radius rBor "Borehole radius"; + input Modelica.Units.SI.Radius rPip[nPip] "Outter radius of pipes"; + input Modelica.Units.SI.ThermalConductivity kFil "Thermal conductivity of grouting material"; + input Modelica.Units.SI.ThermalConductivity kSoi "Thermal conductivity of soil material"; input Real RFluPip[nPip](each unit="(m.K)/W") "Fluid to pipe wall thermal resistances"; - input Modelica.SIunits.Temperature TBor=0 "Average borehole wall temperature"; + input Modelica.Units.SI.Temperature TBor=0 "Average borehole wall temperature"; output Real RDelta[nPip,nPip](each unit="(m.K)/W") "Delta-circuit thermal resistances"; output Real R[nPip,nPip](each unit="(m.K)/W") "Internal thermal resistances"; protected Real QPip_flow[nPip](each unit="W/m") "Pipe heat transfer rates"; - Modelica.SIunits.Temperature TFlu[nPip] "Fluid temperatures"; + Modelica.Units.SI.Temperature TFlu[nPip] "Fluid temperatures"; Real K[nPip,nPip](each unit="W/(m.K)") "Internal thermal conductances"; algorithm diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/partialInternalResistances.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/partialInternalResistances.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/partialInternalResistances.mo" 2021-11-24 08:09:20.979366516 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/partialInternalResistances.mo" 2021-11-24 08:10:41.671124003 +0000 @@ -7,28 +7,28 @@ input Boolean use_Rb = false "True if the value Rb should be used instead of calculated"; input Real Rb(unit="(m.K)/W") "Borehole thermal resistance"; - input Modelica.SIunits.Height hSeg "Height of the element"; - input Modelica.SIunits.Radius rBor "Radius of the borehole"; + input Modelica.Units.SI.Height hSeg "Height of the element"; + input Modelica.Units.SI.Radius rBor "Radius of the borehole"; // Geometry of the pipe - input Modelica.SIunits.Radius rTub "Radius of the tube"; - input Modelica.SIunits.Length eTub "Thickness of the tubes"; - input Modelica.SIunits.Length sha + input Modelica.Units.SI.Radius rTub "Radius of the tube"; + input Modelica.Units.SI.Length eTub "Thickness of the tubes"; + input Modelica.Units.SI.Length sha "Shank spacing, defined as the distance between the center of a pipe and the center of the borehole"; // Thermal properties - input Modelica.SIunits.ThermalConductivity kFil + input Modelica.Units.SI.ThermalConductivity kFil "Thermal conductivity of the grout"; - input Modelica.SIunits.ThermalConductivity kSoi + input Modelica.Units.SI.ThermalConductivity kSoi "Thermal conductivity of the soi"; - input Modelica.SIunits.ThermalConductivity kTub + input Modelica.Units.SI.ThermalConductivity kTub "Thermal conductivity of the tube"; - input Modelica.SIunits.ThermalConductivity kMed + input Modelica.Units.SI.ThermalConductivity kMed "Thermal conductivity of the fluid"; - input Modelica.SIunits.DynamicViscosity muMed + input Modelica.Units.SI.DynamicViscosity muMed "Dynamic viscosity of the fluid"; - input Modelica.SIunits.SpecificHeatCapacity cpMed + input Modelica.Units.SI.SpecificHeatCapacity cpMed "Specific heat capacity of the fluid"; - input Modelica.SIunits.MassFlowRate m_flow_nominal "Nominal mass flow rate"; + input Modelica.Units.SI.MassFlowRate m_flow_nominal "Nominal mass flow rate"; input Boolean printDebug=false "Print resistances values in log for debug purposes."; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalResistancesOneUTube.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalResistancesOneUTube.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalResistancesOneUTube.mo" 2021-11-24 08:09:20.979366516 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalResistancesOneUTube.mo" 2021-11-24 08:10:41.639124100 +0000 @@ -4,8 +4,8 @@ extends BuildingSystems.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.PartialInternalResistances; - parameter Modelica.SIunits.ThermalResistance Rgg_val "Thermal resistance between the two grout zones"; - parameter Modelica.SIunits.HeatCapacity Co_fil=borFieDat.filDat.dFil*borFieDat.filDat.cFil*hSeg*Modelica.Constants.pi + parameter Modelica.Units.SI.ThermalResistance Rgg_val "Thermal resistance between the two grout zones"; + parameter Modelica.Units.SI.HeatCapacity Co_fil=borFieDat.filDat.dFil*borFieDat.filDat.cFil*hSeg*Modelica.Constants.pi *(borFieDat.conDat.rBor^2 - 2*borFieDat.conDat.rTub^2) "Heat capacity of the whole filling material"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalResistancesTwoUTube.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalResistancesTwoUTube.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalResistancesTwoUTube.mo" 2021-11-24 08:09:20.979366516 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalResistancesTwoUTube.mo" 2021-11-24 08:10:41.627124135 +0000 @@ -4,11 +4,11 @@ extends BuildingSystems.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.PartialInternalResistances; - parameter Modelica.SIunits.ThermalResistance Rgg1_val + parameter Modelica.Units.SI.ThermalResistance Rgg1_val "Thermal resistance between two neightbouring grout capacities, as defined by Bauer et al (2010)"; - parameter Modelica.SIunits.ThermalResistance Rgg2_val + parameter Modelica.Units.SI.ThermalResistance Rgg2_val "Thermal resistance between two grout capacities opposite to each other, as defined by Bauer et al (2010)"; - parameter Modelica.SIunits.HeatCapacity Co_fil=borFieDat.filDat.dFil*borFieDat.filDat.cFil*hSeg*Modelica.Constants.pi + parameter Modelica.Units.SI.HeatCapacity Co_fil=borFieDat.filDat.dFil*borFieDat.filDat.cFil*hSeg*Modelica.Constants.pi *(borFieDat.conDat.rBor^2 - 4*borFieDat.conDat.rTub^2) "Heat capacity of the whole filling material"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialBorehole.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialBorehole.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialBorehole.mo" 2021-11-24 08:09:20.979366516 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialBorehole.mo" 2021-11-24 08:10:41.599124219 +0000 @@ -21,11 +21,11 @@ parameter Integer nSeg(min=1) = 10 "Number of segments to use in vertical discretization of the boreholes"; - parameter Modelica.SIunits.Temperature TGro_start[nSeg] + parameter Modelica.Units.SI.Temperature TGro_start[nSeg] "Start value of grout temperature" annotation (Dialog(tab="Initialization")); - parameter Modelica.SIunits.Temperature TFlu_start[nSeg] = TGro_start + parameter Modelica.Units.SI.Temperature TFlu_start[nSeg] = TGro_start "Start value of fluid temperature" annotation (Dialog(tab="Initialization")); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialInternalHEX.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialInternalHEX.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialInternalHEX.mo" 2021-11-24 08:09:20.979366516 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialInternalHEX.mo" 2021-11-24 08:10:41.587124256 +0000 @@ -18,31 +18,31 @@ parameter Boolean dynFil=true "Set to false to remove the dynamics of the filling material" annotation (Dialog(tab="Dynamics")); - parameter Modelica.SIunits.Length hSeg + parameter Modelica.Units.SI.Length hSeg "Length of the internal heat exchanger"; - parameter Modelica.SIunits.Volume VTubSeg = hSeg*Modelica.Constants.pi*(borFieDat.conDat.rTub-borFieDat.conDat.eTub)^2 + parameter Modelica.Units.SI.Volume VTubSeg = hSeg*Modelica.Constants.pi*(borFieDat.conDat.rTub-borFieDat.conDat.eTub)^2 "Fluid volume in each tube"; - parameter Modelica.SIunits.Temperature TFlu_start + parameter Modelica.Units.SI.Temperature TFlu_start "Start value of fluid temperature" annotation (Dialog(tab="Initialization")); - parameter Modelica.SIunits.Temperature TGro_start + parameter Modelica.Units.SI.Temperature TGro_start "Start value of grout temperature" annotation (Dialog(tab="Initialization")); Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a port_wall "Thermal connection for borehole wall" annotation (Placement(transformation(extent={{-10,90},{10,110}}))); protected - parameter Modelica.SIunits.SpecificHeatCapacity cpMed= + parameter Modelica.Units.SI.SpecificHeatCapacity cpMed= Medium.specificHeatCapacityCp(Medium.setState_pTX( Medium.p_default, Medium.T_default, Medium.X_default)) "Specific heat capacity of the fluid"; - parameter Modelica.SIunits.ThermalConductivity kMed= + parameter Modelica.Units.SI.ThermalConductivity kMed= Medium.thermalConductivity(Medium.setState_pTX( Medium.p_default, Medium.T_default, Medium.X_default)) "Thermal conductivity of the fluid"; - parameter Modelica.SIunits.DynamicViscosity muMed=Medium.dynamicViscosity( + parameter Modelica.Units.SI.DynamicViscosity muMed=Medium.dynamicViscosity( Medium.setState_pTX( Medium.p_default, Medium.T_default, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialInternalResistances.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialInternalResistances.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialInternalResistances.mo" 2021-11-24 08:09:20.979366516 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialInternalResistances.mo" 2021-11-24 08:10:41.575124291 +0000 @@ -1,15 +1,15 @@ within BuildingSystems.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses; partial model PartialInternalResistances "Partial model to implement borehole segment internal resistance models" - parameter Modelica.SIunits.Length hSeg + parameter Modelica.Units.SI.Length hSeg "Length of the internal heat exchanger"; - parameter Modelica.SIunits.Temperature T_start + parameter Modelica.Units.SI.Temperature T_start "Initial temperature of the filling material"; parameter Data.Borefield.Template borFieDat "Borefield data" annotation (Placement(transformation(extent={{-100,-100},{-80,-80}}))); - parameter Modelica.SIunits.ThermalResistance Rgb_val + parameter Modelica.Units.SI.ThermalResistance Rgb_val "Thermal resistance between grout zone and borehole wall"; - parameter Modelica.SIunits.ThermalResistance RCondGro_val + parameter Modelica.Units.SI.ThermalResistance RCondGro_val "Thermal resistance between: pipe wall to capacity in grout"; parameter Modelica.Fluid.Types.Dynamics energyDynamics=Modelica.Fluid.Types.Dynamics.DynamicFreeInitial "Type of energy balance: dynamic (3 initialization options) or steady state" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/Examples/BaseClasses/PartialBorehole.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/Examples/BaseClasses/PartialBorehole.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/Examples/BaseClasses/PartialBorehole.mo" 2021-11-24 08:09:20.979366516 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/Examples/BaseClasses/PartialBorehole.mo" 2021-11-24 08:10:41.531124424 +0000 @@ -4,7 +4,7 @@ parameter Integer nSeg(min=1) = 10 "Number of segments to use in vertical discretization of the boreholes"; - parameter Modelica.SIunits.Temperature T_start = 273.15 + 22 + parameter Modelica.Units.SI.Temperature T_start = 273.15 + 22 "Initial soil temperature"; parameter BuildingSystems.Fluid.Geothermal.Borefields.Data.Borefield.Example diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/Examples/BoreholeDynamics.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/Examples/BoreholeDynamics.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/Examples/BoreholeDynamics.mo" 2021-11-24 08:09:20.979366516 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/Examples/BoreholeDynamics.mo" 2021-11-24 08:10:41.523124448 +0000 @@ -5,7 +5,7 @@ parameter Integer nSeg(min=1) = 10 "Number of segments to use in vertical discretization of the boreholes"; - parameter Modelica.SIunits.Temperature T_start = 273.15 + 22 + parameter Modelica.Units.SI.Temperature T_start = 273.15 + 22 "Initial soil temperature"; BuildingSystems.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.OneUTube diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Cylindrical.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Cylindrical.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Cylindrical.mo" 2021-11-24 08:09:20.983366504 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Cylindrical.mo" 2021-11-24 08:10:41.439124700 +0000 @@ -4,14 +4,14 @@ parameter BuildingSystems.Fluid.Geothermal.Borefields.Data.Soil.Template soiDat annotation (Placement(transformation(extent={{-100,-100},{-80,-80}}))); - parameter Modelica.SIunits.Height h "Height of the cylinder"; - parameter Modelica.SIunits.Radius r_a "Internal radius"; - parameter Modelica.SIunits.Radius r_b "External radius"; + parameter Modelica.Units.SI.Height h "Height of the cylinder"; + parameter Modelica.Units.SI.Radius r_a "Internal radius"; + parameter Modelica.Units.SI.Radius r_b "External radius"; parameter Integer nSta(min=1) = 10 "Number of state variables"; - parameter Modelica.SIunits.Temperature TInt_start + parameter Modelica.Units.SI.Temperature TInt_start "Initial temperature at port_a, used if steadyStateInitial = false" annotation (Dialog(group="Initialization", enable=not steadyStateInitial)); - parameter Modelica.SIunits.Temperature TExt_start + parameter Modelica.Units.SI.Temperature TExt_start "Initial temperature at port_b, used if steadyStateInitial = false" annotation (Dialog(group="Initialization", enable=not steadyStateInitial)); parameter Boolean steadyStateInitial=false @@ -20,7 +20,7 @@ parameter Real gridFac(min=1) = 2 "Grid factor for spacing"; - parameter Modelica.SIunits.Radius r[nSta + 1](each fixed=false) + parameter Modelica.Units.SI.Radius r[nSta + 1](each fixed=false) "Radius to the boundary of the i-th domain"; Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a port_a(T(start=TInt_start)) @@ -30,31 +30,31 @@ "Heat port at surface b" annotation (Placement(transformation(extent={{90,-10}, {110,10}},rotation=0))); - Modelica.SIunits.Temperature T[nSta]( + Modelica.Units.SI.Temperature T[nSta]( start={TInt_start + (TExt_start - TInt_start)/Modelica.Math.log(r_b/r_a)* Modelica.Math.log((r_a + (r_b - r_a)/(nSta)*(i - 0.5))/r_a) for i in 1:nSta}) "Temperature of the states"; - Modelica.SIunits.TemperatureDifference dT "port_a.T - port_b.T"; + Modelica.Units.SI.TemperatureDifference dT "port_a.T - port_b.T"; - Modelica.SIunits.HeatFlowRate Q_flow[nSta + 1] + Modelica.Units.SI.HeatFlowRate Q_flow[nSta + 1] "Heat flow rate from state i to i+1"; protected - parameter Modelica.SIunits.Radius rC[nSta](each fixed=false) + parameter Modelica.Units.SI.Radius rC[nSta](each fixed=false) "Radius to the center of the i-th domain"; - final parameter Modelica.SIunits.SpecificHeatCapacity c=soiDat.cSoi + final parameter Modelica.Units.SI.SpecificHeatCapacity c=soiDat.cSoi "Specific heat capacity"; - final parameter Modelica.SIunits.ThermalConductivity k=soiDat.kSoi + final parameter Modelica.Units.SI.ThermalConductivity k=soiDat.kSoi "Thermal conductivity of the material"; - final parameter Modelica.SIunits.Density d=soiDat.dSoi + final parameter Modelica.Units.SI.Density d=soiDat.dSoi "Density of the material"; - parameter Modelica.SIunits.ThermalConductance G[nSta + 1](each fixed=false) + parameter Modelica.Units.SI.ThermalConductance G[nSta + 1](each fixed=false) "Heat conductance between the temperature nodes"; - parameter Modelica.SIunits.HeatCapacity C[nSta](each fixed=false) + parameter Modelica.Units.SI.HeatCapacity C[nSta](each fixed=false) "Heat capacity of each state"; parameter Real gridFac_sum(fixed=false); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/GroundTemperatureResponse.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/GroundTemperatureResponse.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/GroundTemperatureResponse.mo" 2021-11-24 08:09:20.983366504 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/GroundTemperatureResponse.mo" 2021-11-24 08:10:41.415124772 +0000 @@ -1,6 +1,6 @@ within BuildingSystems.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer; model GroundTemperatureResponse "Model calculating discrete load aggregation" - parameter Modelica.SIunits.Time tLoaAgg(final min = Modelica.Constants.eps)=3600 + parameter Modelica.Units.SI.Time tLoaAgg(final min = Modelica.Constants.eps)=3600 "Time resolution of load aggregation"; parameter Integer nCel(min=1)=5 "Number of cells per aggregation level"; parameter Boolean forceGFunCalc = false @@ -41,7 +41,7 @@ nTimSho=nTimSho, nTimLon=nTimLon, ttsMax=ttsMax) "String with encrypted g-function arguments"; - parameter Modelica.SIunits.Time timFin= + parameter Modelica.Units.SI.Time timFin= (borFieDat.conDat.hBor^2/(9*borFieDat.soiDat.aSoi))*ttsMax "Final time for g-function calculation"; parameter Integer i(min=1)= @@ -53,29 +53,29 @@ "Number of aggregation cells"; final parameter Real[nTimTot,2] timSer(each fixed=false) "g-function input from matrix, with the second column as temperature Tstep"; - final parameter Modelica.SIunits.Time t_start(fixed=false) "Simulation start time"; - final parameter Modelica.SIunits.Time[i] nu(each fixed=false) + final parameter Modelica.Units.SI.Time t_start(fixed=false) "Simulation start time"; + final parameter Modelica.Units.SI.Time[i] nu(each fixed=false) "Time vector for load aggregation"; final parameter Real[i] kappa(each fixed=false) "Weight factor for each aggregation cell"; final parameter Real[i] rCel(each fixed=false) "Cell widths"; - discrete Modelica.SIunits.HeatFlowRate[i] QAgg_flow + discrete Modelica.Units.SI.HeatFlowRate[i] QAgg_flow "Vector of aggregated loads"; - discrete Modelica.SIunits.HeatFlowRate[i] QAggShi_flow + discrete Modelica.Units.SI.HeatFlowRate[i] QAggShi_flow "Shifted vector of aggregated loads"; discrete Integer curCel "Current occupied cell"; - discrete Modelica.SIunits.TemperatureDifference delTBor0 + discrete Modelica.Units.SI.TemperatureDifference delTBor0 "Previous time step's temperature difference current borehole wall temperature minus initial borehole temperature"; discrete Real derDelTBor0(unit="K/s") "Derivative of wall temperature change from previous time steps"; final parameter Real dTStepdt(fixed=false) "Time derivative of g/(2*pi*H*Nb*ks) within most recent cell"; - Modelica.SIunits.Heat U "Accumulated heat flow from all boreholes"; - discrete Modelica.SIunits.Heat U_old "Accumulated heat flow from all boreholes at last aggregation step"; + Modelica.Units.SI.Heat U "Accumulated heat flow from all boreholes"; + discrete Modelica.Units.SI.Heat U_old "Accumulated heat flow from all boreholes at last aggregation step"; initial equation QAgg_flow = zeros(i); curCel = 1; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/AggregationCellTimes.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/AggregationCellTimes.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/AggregationCellTimes.mo" 2021-11-24 08:09:20.983366504 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/AggregationCellTimes.mo" 2021-11-24 08:10:41.387124856 +0000 @@ -4,13 +4,13 @@ extends Modelica.Icons.Example; parameter Integer i = 6 "Number of aggregation cells"; - parameter Modelica.SIunits.Time tLoaAgg=10 "Time resolution of load aggregation"; - final parameter Modelica.SIunits.Time[i] nu(each fixed=false) - "Time vector for load aggregation"; - final parameter Modelica.SIunits.Time[i] rCel(each fixed=false) "Cell widths"; - Modelica.SIunits.Time nu_error,rCel_error "Error on chosen values"; + parameter Modelica.Units.SI.Time tLoaAgg=10 "Time resolution of load aggregation"; + final parameter Modelica.Units.SI.Time[i] nu(each fixed=false) + "Time vector for load aggregation"; + final parameter Modelica.Units.SI.Time[i] rCel(each fixed=false) "Cell widths"; + Modelica.Units.SI.Time nu_error,rCel_error "Error on chosen values"; initial equation (nu,rCel) = BuildingSystems.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.LoadAggregation.aggregationCellTimes( i=i, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/AggregationWeightingFactors.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/AggregationWeightingFactors.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/AggregationWeightingFactors.mo" 2021-11-24 08:09:20.983366504 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/AggregationWeightingFactors.mo" 2021-11-24 08:10:41.379124880 +0000 @@ -11,7 +11,7 @@ 6.27297603019976, 2.43435015306157e-05; 9.21672932384307, 3.00295537091117e-05] "Complete time matrix with TStep"; - Modelica.SIunits.ThermalResistance[10] kappa + Modelica.Units.SI.ThermalResistance[10] kappa "Weight factor for each aggregation cell"; equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/ShiftAggregationCells.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/ShiftAggregationCells.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/ShiftAggregationCells.mo" 2021-11-24 08:09:20.983366504 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/ShiftAggregationCells.mo" 2021-11-24 08:10:41.339125001 +0000 @@ -3,7 +3,7 @@ extends Modelica.Icons.Example; discrete Integer curCel "Current occupied cell"; - discrete Modelica.SIunits.HeatFlowRate[5] QAggShi_flow + discrete Modelica.Units.SI.HeatFlowRate[5] QAggShi_flow "Shifted vector of aggregated loads"; initial equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/TemperatureResponseMatrix.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/TemperatureResponseMatrix.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/TemperatureResponseMatrix.mo" 2021-11-24 08:09:20.983366504 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/TemperatureResponseMatrix.mo" 2021-11-24 08:10:41.335125013 +0000 @@ -3,7 +3,8 @@ "This validation case test the calculation, writing and reading of the temperature step response" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Time timSer[26+50,2]= + + parameter Modelica.Units.SI.Time timSer[26+50,2]= BuildingSystems.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.LoadAggregation.temperatureResponseMatrix( nBor=1, cooBor={{0,0}}, @@ -19,8 +20,7 @@ ttsMax=exp(5), sha="TemperatureResponseMatrix_validation", forceGFunCalc=true) "Resulting temperature response matrix"; - Modelica.SIunits.ThermalResistance TStep "Temperature step response"; - + Modelica.Units.SI.ThermalResistance TStep "Temperature step response"; equation TStep = Modelica.Math.Vectors.interpolate(timSer[:,1],timSer[:,2],time); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/TemporalSuperposition.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/TemporalSuperposition.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/TemporalSuperposition.mo" 2021-11-24 08:09:20.983366504 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/TemporalSuperposition.mo" 2021-11-24 08:10:41.327125036 +0000 @@ -2,13 +2,13 @@ model TemporalSuperposition "This validation case applies temporal superposition with truncated vectors" extends Modelica.Icons.Example; - parameter Modelica.SIunits.TemperatureDifference supPos = BuildingSystems.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.LoadAggregation.temporalSuperposition( + + parameter Modelica.Units.SI.TemperatureDifference supPos = BuildingSystems.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.LoadAggregation.temporalSuperposition( i=6, QAgg_flow={2,1e6,3,1e6,1e6}, kappa={0.4,0,0.2,1,0}, curCel=3) "Temporal superposition"; - Modelica.SIunits.TemperatureDifference supPosErr; - + Modelica.Units.SI.TemperatureDifference supPosErr; equation supPosErr = abs((2*0.4+3*0.2)-supPos); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/aggregationCellTimes.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/aggregationCellTimes.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/aggregationCellTimes.mo" 2021-11-24 08:09:20.983366504 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/aggregationCellTimes.mo" 2021-11-24 08:10:41.319125060 +0000 @@ -6,10 +6,10 @@ input Integer i "Size of time vector"; input Real lvlBas "Base for growth between each level, e.g. 2"; input Integer nCel "Number of cells of same size per level"; - input Modelica.SIunits.Time tLoaAgg(final min=Modelica.Constants.small) "Time resolution of load aggregation"; - input Modelica.SIunits.Time timFin "Total simulation max length"; + input Modelica.Units.SI.Time tLoaAgg(final min=Modelica.Constants.small) "Time resolution of load aggregation"; + input Modelica.Units.SI.Time timFin "Total simulation max length"; - output Modelica.SIunits.Time nu[i] "Time vector nu of size i"; + output Modelica.Units.SI.Time nu[i] "Time vector nu of size i"; output Real rCel[i](each unit="1") "Cell width vector of size i"; protected diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/aggregationWeightingFactors.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/aggregationWeightingFactors.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/aggregationWeightingFactors.mo" 2021-11-24 08:09:20.983366504 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/aggregationWeightingFactors.mo" 2021-11-24 08:10:41.307125096 +0000 @@ -5,14 +5,14 @@ input Integer i "Size of aggregation vector"; input Integer nTimTot "Size of g-function time table"; - input Modelica.SIunits.ThermalResistance TStep[nTimTot,2] "Time matrix with TStep"; - input Modelica.SIunits.Time nu[i] "Aggregation time vector nu"; + input Modelica.Units.SI.ThermalResistance TStep[nTimTot,2] "Time matrix with TStep"; + input Modelica.Units.SI.Time nu[i] "Aggregation time vector nu"; - output Modelica.SIunits.ThermalResistance kappa[i] "Weighting factors vector"; + output Modelica.Units.SI.ThermalResistance kappa[i] "Weighting factors vector"; protected - Modelica.SIunits.ThermalResistance prevT "Interpolated value of TStep at previous cell"; - Modelica.SIunits.ThermalResistance curT "Interpolated value of TStep at current cell"; + Modelica.Units.SI.ThermalResistance prevT "Interpolated value of TStep at previous cell"; + Modelica.Units.SI.ThermalResistance curT "Interpolated value of TStep at current cell"; Integer curInt "Integer to select data interval"; Real[size(TStep[:,1], 1)] d(each unit="K/J") "Derivatives at the support points"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/countAggregationCells.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/countAggregationCells.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/countAggregationCells.mo" 2021-11-24 08:09:20.983366504 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/countAggregationCells.mo" 2021-11-24 08:10:41.295125133 +0000 @@ -5,15 +5,15 @@ input Real lvlBas "Base for growth between each level, e.g. 2"; input Integer nCel(min=1) "Number of cells of same size per level"; - input Modelica.SIunits.Time timFin "Total simulation max length"; - input Modelica.SIunits.Time tLoaAgg "Time resolution of load aggregation"; + input Modelica.Units.SI.Time timFin "Total simulation max length"; + input Modelica.Units.SI.Time tLoaAgg "Time resolution of load aggregation"; output Integer i(min=1) "Size of aggregation vectors"; protected - Modelica.SIunits.Duration width_i "Width of current aggregation cell"; - Modelica.SIunits.Time nu_i "End time of current aggregation cell"; + Modelica.Units.SI.Duration width_i "Width of current aggregation cell"; + Modelica.Units.SI.Time nu_i "End time of current aggregation cell"; algorithm assert(timFin > 0, "Total simulation time must be bigger than 0."); width_i := 0; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/shiftAggregationCells.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/shiftAggregationCells.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/shiftAggregationCells.mo" 2021-11-24 08:09:20.983366504 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/shiftAggregationCells.mo" 2021-11-24 08:10:41.283125169 +0000 @@ -4,14 +4,14 @@ extends Modelica.Icons.Function; input Integer i "Number of aggregation cells"; - input Modelica.SIunits.HeatFlowRate QAgg_flow[i] "Vector of aggregated loads"; + input Modelica.Units.SI.HeatFlowRate QAgg_flow[i] "Vector of aggregated loads"; input Real rCel[i](each min=Modelica.Constants.small) "Aggregation cell widths"; - input Modelica.SIunits.Time nu[i] "Cell aggregation times"; - input Modelica.SIunits.Time curTim "Current simulation time"; + input Modelica.Units.SI.Time nu[i] "Cell aggregation times"; + input Modelica.Units.SI.Time curTim "Current simulation time"; output Integer curCel "Current occupied aggregation cell"; - output Modelica.SIunits.HeatFlowRate QAggShi_flow[i] "Shifted vector of aggregated loads"; + output Modelica.Units.SI.HeatFlowRate QAggShi_flow[i] "Shifted vector of aggregated loads"; algorithm curCel := 1; for j in (i-1):-1:1 loop diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/temperatureResponseMatrix.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/temperatureResponseMatrix.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/temperatureResponseMatrix.mo" 2021-11-24 08:09:20.983366504 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/temperatureResponseMatrix.mo" 2021-11-24 08:10:41.271125205 +0000 @@ -5,12 +5,12 @@ input Integer nBor "Number of boreholes"; input Real cooBor[nBor, 2] "Borehole coordinates"; - input Modelica.SIunits.Height hBor "Borehole length"; - input Modelica.SIunits.Height dBor "Borehole buried depth"; - input Modelica.SIunits.Radius rBor "Borehole radius"; - input Modelica.SIunits.ThermalDiffusivity aSoi + input Modelica.Units.SI.Height hBor "Borehole length"; + input Modelica.Units.SI.Height dBor "Borehole buried depth"; + input Modelica.Units.SI.Radius rBor "Borehole radius"; + input Modelica.Units.SI.ThermalDiffusivity aSoi "Thermal diffusivity of soil"; - input Modelica.SIunits.ThermalConductivity kSoi + input Modelica.Units.SI.ThermalConductivity kSoi "Thermal conductivity of soil"; input Integer nSeg "Number of line source segments per borehole"; input Integer nTimSho "Number of time steps in short time region"; @@ -21,11 +21,11 @@ input Boolean forceGFunCalc "Set to true to force the thermal response to be calculated at the start"; - output Modelica.SIunits.ThermalResistance TStep[nTimTot, 2] "Temperature step-response time series"; + output Modelica.Units.SI.ThermalResistance TStep[nTimTot, 2] "Temperature step-response time series"; protected String pathSave "Path of the folder used to save the g-function"; - Modelica.SIunits.Time[nTimTot] tGFun "g-function evaluation times"; + Modelica.Units.SI.Time[nTimTot] tGFun "g-function evaluation times"; Real[nTimTot] gFun "g-function vector"; Boolean writegFun = false "True if g-function was succesfully written to file"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/temporalSuperposition.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/temporalSuperposition.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/temporalSuperposition.mo" 2021-11-24 08:09:20.983366504 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/temporalSuperposition.mo" 2021-11-24 08:10:41.263125229 +0000 @@ -4,14 +4,14 @@ extends Modelica.Icons.Function; input Integer i "Number of aggregation cells"; - input Modelica.SIunits.HeatFlowRate QAgg_flow[i] + input Modelica.Units.SI.HeatFlowRate QAgg_flow[i] "Vector of aggregated loads"; - input Modelica.SIunits.ThermalResistance kappa[i] + input Modelica.Units.SI.ThermalResistance kappa[i] "Weighting factors for each aggregation cell"; input Integer curCel "Current occupied aggregation cell"; - output Modelica.SIunits.TemperatureDifference deltaTb "Delta T at wall"; + output Modelica.Units.SI.TemperatureDifference deltaTb "Delta T at wall"; algorithm deltaTb := QAgg_flow[1:curCel]*kappa[1:curCel]; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/CylindricalHeatSource.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/CylindricalHeatSource.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/CylindricalHeatSource.mo" 2021-11-24 08:09:20.983366504 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/CylindricalHeatSource.mo" 2021-11-24 08:10:41.247125277 +0000 @@ -2,11 +2,11 @@ model CylindricalHeatSource "Test case for cylindrical heat source" extends Modelica.Icons.Example; - parameter Modelica.SIunits.ThermalDiffusivity aSoi = 1.0e-6 "Ground thermal diffusivity"; - parameter Modelica.SIunits.Radius rSource = 0.075 "Radius of cylinder source"; - parameter Modelica.SIunits.Radius[5] r = {rSource, 2*rSource, 5*rSource, 10*rSource, 20*rSource} + parameter Modelica.Units.SI.ThermalDiffusivity aSoi = 1.0e-6 "Ground thermal diffusivity"; + parameter Modelica.Units.SI.Radius rSource = 0.075 "Radius of cylinder source"; + parameter Modelica.Units.SI.Radius[5] r = {rSource, 2*rSource, 5*rSource, 10*rSource, 20*rSource} "Radial position of evaluation of the solution"; - Modelica.SIunits.Time t "Time"; + Modelica.Units.SI.Time t "Time"; Real[5] G "Cylindrical heat source solution"; equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/FiniteLineSource.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/FiniteLineSource.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/FiniteLineSource.mo" 2021-11-24 08:09:20.983366504 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/FiniteLineSource.mo" 2021-11-24 08:10:41.235125313 +0000 @@ -2,17 +2,17 @@ model FiniteLineSource "Test case for finite line source" extends Modelica.Icons.Example; - parameter Modelica.SIunits.ThermalDiffusivity aSoi = 1.0e-6 "Ground thermal diffusivity"; - parameter Modelica.SIunits.Distance[2] r = {0.075, 7.0} + parameter Modelica.Units.SI.ThermalDiffusivity aSoi = 1.0e-6 "Ground thermal diffusivity"; + parameter Modelica.Units.SI.Distance[2] r = {0.075, 7.0} "Radial position of evaluation of the solution"; - parameter Modelica.SIunits.Height len1 = 12.5 "Length of emitting source"; - parameter Modelica.SIunits.Height burDep1 = 29.0 + parameter Modelica.Units.SI.Height len1 = 12.5 "Length of emitting source"; + parameter Modelica.Units.SI.Height burDep1 = 29.0 "Buried depth of emitting source"; - parameter Modelica.SIunits.Height[7] len2 = {12.5, 8.0, 15.0, 14.0, 6.0, 20.0, 3.0} + parameter Modelica.Units.SI.Height[7] len2 = {12.5, 8.0, 15.0, 14.0, 6.0, 20.0, 3.0} "Length of receiving line"; - parameter Modelica.SIunits.Height[7] burDep2 = {29.0, 25.0, 34.0, 2.0, 32.0, 27.0, 44.0} + parameter Modelica.Units.SI.Height[7] burDep2 = {29.0, 25.0, 34.0, 2.0, 32.0, 27.0, 44.0} "Buried depth of receiving line"; - Modelica.SIunits.Time t "Time"; + Modelica.Units.SI.Time t "Time"; Real[2,7] hRea "Finite line source solution (Real part)"; Real[2,7] hMir "Finite line source solution (Mirror part)"; Real[2,7] h "Finite line source solution"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/FiniteLineSource_Integrand.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/FiniteLineSource_Integrand.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/FiniteLineSource_Integrand.mo" 2021-11-24 08:09:20.983366504 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/FiniteLineSource_Integrand.mo" 2021-11-24 08:10:41.219125361 +0000 @@ -3,11 +3,11 @@ "Test case for finite line source integrand function" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Distance dis = 0.075 "Radial distance between borehole axes"; - parameter Modelica.SIunits.Height len1 = 150.0 "Length of emitting borehole"; - parameter Modelica.SIunits.Height burDep1 = 4.0 "Buried depth of emitting borehole"; - parameter Modelica.SIunits.Height len2 = 150.0 "Length of receiving borehole"; - parameter Modelica.SIunits.Height burDep2 = 4.0 "Buried depth of receiving borehole"; + parameter Modelica.Units.SI.Distance dis = 0.075 "Radial distance between borehole axes"; + parameter Modelica.Units.SI.Height len1 = 150.0 "Length of emitting borehole"; + parameter Modelica.Units.SI.Height burDep1 = 4.0 "Buried depth of emitting borehole"; + parameter Modelica.Units.SI.Height len2 = 150.0 "Length of receiving borehole"; + parameter Modelica.Units.SI.Height burDep2 = 4.0 "Buried depth of receiving borehole"; Real u "Integration variable"; Real y "Finite line source integrand"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/FiniteLineSource_Integrand_Length.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/FiniteLineSource_Integrand_Length.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/FiniteLineSource_Integrand_Length.mo" 2021-11-24 08:09:20.983366504 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/FiniteLineSource_Integrand_Length.mo" 2021-11-24 08:10:41.211125385 +0000 @@ -4,12 +4,12 @@ extends Modelica.Icons.Example; parameter Real dis_over_len = 0.0005 "Radial distance between borehole axes"; - parameter Modelica.SIunits.Height len150 = 150.0 "Length of emitting borehole"; - parameter Modelica.SIunits.Height len75 = 75.0 "Length of emitting borehole"; - parameter Modelica.SIunits.Height len25 = 25.0 "Length of emitting borehole"; - parameter Modelica.SIunits.Height len5 = 5.0 "Length of emitting borehole"; - parameter Modelica.SIunits.Height len1 = 1.0 "Length of emitting borehole"; - parameter Modelica.SIunits.Height burDep = 4. "Buried depth of emitting borehole"; + parameter Modelica.Units.SI.Height len150 = 150.0 "Length of emitting borehole"; + parameter Modelica.Units.SI.Height len75 = 75.0 "Length of emitting borehole"; + parameter Modelica.Units.SI.Height len25 = 25.0 "Length of emitting borehole"; + parameter Modelica.Units.SI.Height len5 = 5.0 "Length of emitting borehole"; + parameter Modelica.Units.SI.Height len1 = 1.0 "Length of emitting borehole"; + parameter Modelica.Units.SI.Height burDep = 4. "Buried depth of emitting borehole"; Real u "Integration variable"; Real logy150 "Logarithm of finite line source integrand"; Real logy75 "Logarithm of finite line source integrand"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/GFunction_100boreholes.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/GFunction_100boreholes.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/GFunction_100boreholes.mo" 2021-11-24 08:09:20.983366504 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/GFunction_100boreholes.mo" 2021-11-24 08:10:41.203125409 +0000 @@ -4,12 +4,12 @@ extends Modelica.Icons.Example; parameter Integer nBor = 100 "Number of boreholes"; - parameter Modelica.SIunits.Position cooBor[nBor, 2] = {{7.5*mod(i-1,10), 7.5*floor((i-1)/10)} for i in 1:nBor} + parameter Modelica.Units.SI.Position cooBor[nBor, 2] = {{7.5*mod(i-1,10), 7.5*floor((i-1)/10)} for i in 1:nBor} "Coordinates of boreholes"; - parameter Modelica.SIunits.Height hBor = 150 "Borehole length"; - parameter Modelica.SIunits.Height dBor = 4 "Borehole buried depth"; - parameter Modelica.SIunits.Radius rBor = 0.075 "Borehole radius"; - parameter Modelica.SIunits.ThermalDiffusivity aSoi = 1e-6 "Ground thermal diffusivity used in g-function evaluation"; + parameter Modelica.Units.SI.Height hBor = 150 "Borehole length"; + parameter Modelica.Units.SI.Height dBor = 4 "Borehole buried depth"; + parameter Modelica.Units.SI.Radius rBor = 0.075 "Borehole radius"; + parameter Modelica.Units.SI.ThermalDiffusivity aSoi = 1e-6 "Ground thermal diffusivity used in g-function evaluation"; parameter Integer nSeg = 12 "Number of line source segments per borehole"; parameter Integer nTimSho = 26 "Number of time steps in short time region"; parameter Integer nTimLon = 50 "Number of time steps in long time region"; @@ -18,19 +18,19 @@ final parameter Integer nTimTot=nTimSho+nTimLon; final parameter Real[nTimTot] gFun(each fixed=false); final parameter Real[nTimTot] lntts(each fixed=false); - final parameter Modelica.SIunits.Time[nTimTot] tGFun(each fixed=false); + final parameter Modelica.Units.SI.Time[nTimTot] tGFun(each fixed=false); final parameter Real[nTimTot] dspline(each fixed=false); Real gFun_int "Interpolated value of g-function"; Real lntts_int "Non-dimensional logarithmic time for interpolation"; discrete Integer k "Current interpolation interval"; - discrete Modelica.SIunits.Time t1 "Previous value of time for interpolation"; - discrete Modelica.SIunits.Time t2 "Next value of time for interpolation"; + discrete Modelica.Units.SI.Time t1 "Previous value of time for interpolation"; + discrete Modelica.Units.SI.Time t2 "Next value of time for interpolation"; discrete Real gFun1 "Previous g-function value for interpolation"; discrete Real gFun2 "Next g-function value for interpolation"; - parameter Modelica.SIunits.Time ts = hBor^2/(9*aSoi) "Bore field characteristic time"; + parameter Modelica.Units.SI.Time ts = hBor^2/(9*aSoi) "Bore field characteristic time"; initial equation // Evaluate g-function for the specified bore field configuration (tGFun,gFun) = diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/GFunction_1borehole_5meters.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/GFunction_1borehole_5meters.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/GFunction_1borehole_5meters.mo" 2021-11-24 08:09:20.983366504 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/GFunction_1borehole_5meters.mo" 2021-11-24 08:10:41.163125529 +0000 @@ -4,12 +4,12 @@ extends Modelica.Icons.Example; parameter Integer nBor = 1 "Number of boreholes"; - parameter Modelica.SIunits.Position cooBor[nBor, 2] = {{5.*mod(i-1,3), 5.*floor((i-1)/3)} for i in 1:nBor} + parameter Modelica.Units.SI.Position cooBor[nBor, 2] = {{5.*mod(i-1,3), 5.*floor((i-1)/3)} for i in 1:nBor} "Coordinates of boreholes"; - parameter Modelica.SIunits.Height hBor = 5 "Borehole length"; - parameter Modelica.SIunits.Height dBor = 1 "Borehole buried depth"; - parameter Modelica.SIunits.Radius rBor = 0.075 "Borehole radius"; - parameter Modelica.SIunits.ThermalDiffusivity aSoi = 1e-6 "Ground thermal diffusivity used in g-function evaluation"; + parameter Modelica.Units.SI.Height hBor = 5 "Borehole length"; + parameter Modelica.Units.SI.Height dBor = 1 "Borehole buried depth"; + parameter Modelica.Units.SI.Radius rBor = 0.075 "Borehole radius"; + parameter Modelica.Units.SI.ThermalDiffusivity aSoi = 1e-6 "Ground thermal diffusivity used in g-function evaluation"; parameter Integer nSeg = 12 "Number of line source segments per borehole"; parameter Integer nTimSho = 26 "Number of time steps in short time region"; parameter Integer nTimLon = 50 "Number of time steps in long time region"; @@ -18,19 +18,19 @@ final parameter Integer nTimTot=nTimSho+nTimLon; final parameter Real[nTimTot] gFun(each fixed=false); final parameter Real[nTimTot] lntts(each fixed=false); - final parameter Modelica.SIunits.Time[nTimTot] tGFun(each fixed=false); + final parameter Modelica.Units.SI.Time[nTimTot] tGFun(each fixed=false); final parameter Real[nTimTot] dspline(each fixed=false); Real gFun_int "Interpolated value of g-function"; Real lntts_int "Non-dimensional logarithmic time for interpolation"; discrete Integer k "Current interpolation interval"; - discrete Modelica.SIunits.Time t1 "Previous value of time for interpolation"; - discrete Modelica.SIunits.Time t2 "Next value of time for interpolation"; + discrete Modelica.Units.SI.Time t1 "Previous value of time for interpolation"; + discrete Modelica.Units.SI.Time t2 "Next value of time for interpolation"; discrete Real gFun1 "Previous g-function value for interpolation"; discrete Real gFun2 "Next g-function value for interpolation"; - parameter Modelica.SIunits.Time ts = hBor^2/(9*aSoi) "Bore field characteristic time"; + parameter Modelica.Units.SI.Time ts = hBor^2/(9*aSoi) "Bore field characteristic time"; initial equation // Evaluate g-function for the specified bore field configuration (tGFun,gFun) = diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/GFunction_SmallScaleValidation.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/GFunction_SmallScaleValidation.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/GFunction_SmallScaleValidation.mo" 2021-11-24 08:09:20.983366504 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/GFunction_SmallScaleValidation.mo" 2021-11-24 08:10:41.155125553 +0000 @@ -6,12 +6,12 @@ parameter BuildingSystems.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.Validation.BaseClasses.SmallScale_Borefield borFieDat "Record of borehole configuration data"; parameter Integer nBor = borFieDat.conDat.nBor "Number of boreholes"; - parameter Modelica.SIunits.Position cooBor[nBor, 2] = borFieDat.conDat.cooBor + parameter Modelica.Units.SI.Position cooBor[nBor, 2] = borFieDat.conDat.cooBor "Coordinates of boreholes"; - parameter Modelica.SIunits.Height hBor = borFieDat.conDat.hBor "Borehole length"; - parameter Modelica.SIunits.Height dBor = borFieDat.conDat.dBor "Borehole buried depth"; - parameter Modelica.SIunits.Radius rBor = borFieDat.conDat.rBor "Borehole radius"; - parameter Modelica.SIunits.ThermalDiffusivity aSoi = borFieDat.soiDat.kSoi/(borFieDat.soiDat.dSoi*borFieDat.soiDat.cSoi) + parameter Modelica.Units.SI.Height hBor = borFieDat.conDat.hBor "Borehole length"; + parameter Modelica.Units.SI.Height dBor = borFieDat.conDat.dBor "Borehole buried depth"; + parameter Modelica.Units.SI.Radius rBor = borFieDat.conDat.rBor "Borehole radius"; + parameter Modelica.Units.SI.ThermalDiffusivity aSoi = borFieDat.soiDat.kSoi/(borFieDat.soiDat.dSoi*borFieDat.soiDat.cSoi) "Ground thermal diffusivity used in g-function evaluation"; parameter Integer nSeg = 12 "Number of line source segments per borehole"; parameter Integer nTimSho = 26 "Number of time steps in short time region"; @@ -21,19 +21,19 @@ final parameter Integer nTimTot=nTimSho+nTimLon; final parameter Real[nTimTot] gFun(each fixed=false); final parameter Real[nTimTot] lntts(each fixed=false); - final parameter Modelica.SIunits.Time[nTimTot] tGFun(each fixed=false); + final parameter Modelica.Units.SI.Time[nTimTot] tGFun(each fixed=false); final parameter Real[nTimTot] dspline(each fixed=false); Real gFun_int "Interpolated value of g-function"; Real lntts_int "Non-dimensional logarithmic time for interpolation"; discrete Integer k "Current interpolation interval"; - discrete Modelica.SIunits.Time t1 "Previous value of time for interpolation"; - discrete Modelica.SIunits.Time t2 "Next value of time for interpolation"; + discrete Modelica.Units.SI.Time t1 "Previous value of time for interpolation"; + discrete Modelica.Units.SI.Time t2 "Next value of time for interpolation"; discrete Real gFun1 "Previous g-function value for interpolation"; discrete Real gFun2 "Next g-function value for interpolation"; - parameter Modelica.SIunits.Time ts = hBor^2/(9*aSoi) "Bore field characteristic time"; + parameter Modelica.Units.SI.Time ts = hBor^2/(9*aSoi) "Bore field characteristic time"; initial equation // Evaluate g-function for the specified bore field configuration (tGFun,gFun) = diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/InfiniteLineSource.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/InfiniteLineSource.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/InfiniteLineSource.mo" 2021-11-24 08:09:20.983366504 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/InfiniteLineSource.mo" 2021-11-24 08:10:41.135125613 +0000 @@ -2,11 +2,11 @@ model InfiniteLineSource "Test case for infinite line source" extends Modelica.Icons.Example; - parameter Modelica.SIunits.ThermalDiffusivity aSoi = 1.0e-6 "Ground thermal diffusivity"; - parameter Modelica.SIunits.Radius rSource = 0.075 "Minimum radius"; - parameter Modelica.SIunits.Radius[5] r = {rSource, 2*rSource, 5*rSource, 10*rSource, 20*rSource} + parameter Modelica.Units.SI.ThermalDiffusivity aSoi = 1.0e-6 "Ground thermal diffusivity"; + parameter Modelica.Units.SI.Radius rSource = 0.075 "Minimum radius"; + parameter Modelica.Units.SI.Radius[5] r = {rSource, 2*rSource, 5*rSource, 10*rSource, 20*rSource} "Radial position of evaluation of the solution"; - Modelica.SIunits.Time t "Time"; + Modelica.Units.SI.Time t "Time"; Real[5] E "Infinite line source solution"; equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/TimeGeometric.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/TimeGeometric.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/TimeGeometric.mo" 2021-11-24 08:09:20.983366504 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/TimeGeometric.mo" 2021-11-24 08:10:41.119125661 +0000 @@ -3,12 +3,12 @@ "Test case for geometric expansion of time vector" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Duration dt = 2.0 "Minimum time step"; - parameter Modelica.SIunits.Time t_max = 20.0 "Maximum value of time"; + parameter Modelica.Units.SI.Duration dt = 2.0 "Minimum time step"; + parameter Modelica.Units.SI.Time t_max = 20.0 "Maximum value of time"; parameter Integer nTim = 5 "Number of time values"; - final parameter Modelica.SIunits.Time[nTim] t(each fixed=false) "Time vector"; + final parameter Modelica.Units.SI.Time[nTim] t(each fixed=false) "Time vector"; initial equation t = BuildingSystems.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.ThermalResponseFactors.timeGeometric( dt=dt, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/cylindricalHeatSource.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/cylindricalHeatSource.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/cylindricalHeatSource.mo" 2021-11-24 08:09:20.983366504 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/cylindricalHeatSource.mo" 2021-11-24 08:10:41.111125685 +0000 @@ -3,10 +3,10 @@ "Cylindrical heat source solution from Carslaw and Jaeger" extends Modelica.Icons.Function; - input Modelica.SIunits.Time t "Time"; - input Modelica.SIunits.ThermalDiffusivity aSoi "Ground thermal diffusivity"; - input Modelica.SIunits.Distance dis "Radial distance between borehole axes"; - input Modelica.SIunits.Radius rBor "Radius of emitting borehole"; + input Modelica.Units.SI.Time t "Time"; + input Modelica.Units.SI.ThermalDiffusivity aSoi "Ground thermal diffusivity"; + input Modelica.Units.SI.Distance dis "Radial distance between borehole axes"; + input Modelica.Units.SI.Radius rBor "Radius of emitting borehole"; output Real G "Thermal response factor of borehole 1 on borehole 2"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/finiteLineSource.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/finiteLineSource.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/finiteLineSource.mo" 2021-11-24 08:09:20.983366504 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/finiteLineSource.mo" 2021-11-24 08:10:41.103125709 +0000 @@ -3,13 +3,13 @@ "Finite line source solution of Claesson and Javed" extends Modelica.Icons.Function; - input Modelica.SIunits.Time t "Time"; - input Modelica.SIunits.ThermalDiffusivity aSoi "Ground thermal diffusivity"; - input Modelica.SIunits.Distance dis "Radial distance between borehole axes"; - input Modelica.SIunits.Height len1 "Length of emitting borehole"; - input Modelica.SIunits.Height burDep1 "Buried depth of emitting borehole"; - input Modelica.SIunits.Height len2 "Length of receiving borehole"; - input Modelica.SIunits.Height burDep2 "Buried depth of receiving borehole"; + input Modelica.Units.SI.Time t "Time"; + input Modelica.Units.SI.ThermalDiffusivity aSoi "Ground thermal diffusivity"; + input Modelica.Units.SI.Distance dis "Radial distance between borehole axes"; + input Modelica.Units.SI.Height len1 "Length of emitting borehole"; + input Modelica.Units.SI.Height burDep1 "Buried depth of emitting borehole"; + input Modelica.Units.SI.Height len2 "Length of receiving borehole"; + input Modelica.Units.SI.Height burDep2 "Buried depth of receiving borehole"; input Boolean includeRealSource = true "True if contribution of real source is included"; input Boolean includeMirrorSource = true "True if contribution of mirror source is included"; @@ -19,10 +19,10 @@ Real lowBou(unit="m-1") "Lower bound of integration"; // Upper bound is infinite Real uppBou(unit="m-1") = max(100.0, 10.0/dis) "Upper bound of integration"; - Modelica.SIunits.Distance disMin - "Minimum distance between sources and receiving line"; - Modelica.SIunits.Time timTre "Time treshold for evaluation of the solution"; + Modelica.Units.SI.Distance disMin + "Minimum distance between sources and receiving line"; + Modelica.Units.SI.Time timTre "Time treshold for evaluation of the solution"; algorithm h_21 := 0; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/finiteLineSource_Integrand.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/finiteLineSource_Integrand.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/finiteLineSource_Integrand.mo" 2021-11-24 08:09:20.983366504 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/finiteLineSource_Integrand.mo" 2021-11-24 08:10:41.087125757 +0000 @@ -4,11 +4,11 @@ extends Modelica.Icons.Function; input Real u(unit="1/m") "Integration variable"; - input Modelica.SIunits.Distance dis "Radial distance between borehole axes"; - input Modelica.SIunits.Height len1 "Length of emitting borehole"; - input Modelica.SIunits.Height burDep1 "Buried depth of emitting borehole"; - input Modelica.SIunits.Height len2 "Length of receiving borehole"; - input Modelica.SIunits.Height burDep2 "Buried depth of receiving borehole"; + input Modelica.Units.SI.Distance dis "Radial distance between borehole axes"; + input Modelica.Units.SI.Height len1 "Length of emitting borehole"; + input Modelica.Units.SI.Height burDep1 "Buried depth of emitting borehole"; + input Modelica.Units.SI.Height len2 "Length of receiving borehole"; + input Modelica.Units.SI.Height burDep2 "Buried depth of receiving borehole"; input Boolean includeRealSource = true "true if contribution of real source is included"; input Boolean includeMirrorSource = true "true if contribution of mirror source is included"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/gFunction.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/gFunction.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/gFunction.mo" 2021-11-24 08:09:20.983366504 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/gFunction.mo" 2021-11-24 08:10:41.079125781 +0000 @@ -3,34 +3,34 @@ extends Modelica.Icons.Function; input Integer nBor "Number of boreholes"; - input Modelica.SIunits.Position cooBor[nBor, 2] "Coordinates of boreholes"; - input Modelica.SIunits.Height hBor "Borehole length"; - input Modelica.SIunits.Height dBor "Borehole buried depth"; - input Modelica.SIunits.Radius rBor "Borehole radius"; - input Modelica.SIunits.ThermalDiffusivity aSoi "Ground thermal diffusivity used in g-function evaluation"; + input Modelica.Units.SI.Position cooBor[nBor, 2] "Coordinates of boreholes"; + input Modelica.Units.SI.Height hBor "Borehole length"; + input Modelica.Units.SI.Height dBor "Borehole buried depth"; + input Modelica.Units.SI.Radius rBor "Borehole radius"; + input Modelica.Units.SI.ThermalDiffusivity aSoi "Ground thermal diffusivity used in g-function evaluation"; input Integer nSeg "Number of line source segments per borehole"; input Integer nTimSho "Number of time steps in short time region"; input Integer nTimLon "Number of time steps in long time region"; input Real ttsMax "Maximum adimensional time for gfunc calculation"; input Real relTol = 0.02 "Relative tolerance on distance between boreholes"; - output Modelica.SIunits.Time tGFun[nTimSho+nTimLon] "Time of g-function evaluation"; + output Modelica.Units.SI.Time tGFun[nTimSho+nTimLon] "Time of g-function evaluation"; output Real g[nTimSho+nTimLon] "g-function"; protected - Modelica.SIunits.Time ts = hBor^2/(9*aSoi) "Characteristic time"; - Modelica.SIunits.Time tSho_min = 1 "Minimum time for short time calculations"; - Modelica.SIunits.Time tSho_max = 3600 "Maximum time for short time calculations"; - Modelica.SIunits.Time tLon_min = tSho_max "Minimum time for long time calculations"; - Modelica.SIunits.Time tLon_max = ts*ttsMax "Maximum time for long time calculations"; - Modelica.SIunits.Time tSho[nTimSho] "Time vector for short time calculations"; - Modelica.SIunits.Time tLon[nTimLon] "Time vector for long time calculations"; - Modelica.SIunits.Distance dis "Separation distance between boreholes"; - Modelica.SIunits.Distance dis_mn "Separation distance for comparison"; - Modelica.SIunits.Radius rLin=0.0005*hBor "Radius for evaluation of same-borehole line source solutions"; + Modelica.Units.SI.Time ts = hBor^2/(9*aSoi) "Characteristic time"; + Modelica.Units.SI.Time tSho_min = 1 "Minimum time for short time calculations"; + Modelica.Units.SI.Time tSho_max = 3600 "Maximum time for short time calculations"; + Modelica.Units.SI.Time tLon_min = tSho_max "Minimum time for long time calculations"; + Modelica.Units.SI.Time tLon_max = ts*ttsMax "Maximum time for long time calculations"; + Modelica.Units.SI.Time tSho[nTimSho] "Time vector for short time calculations"; + Modelica.Units.SI.Time tLon[nTimLon] "Time vector for long time calculations"; + Modelica.Units.SI.Distance dis "Separation distance between boreholes"; + Modelica.Units.SI.Distance dis_mn "Separation distance for comparison"; + Modelica.Units.SI.Radius rLin=0.0005*hBor "Radius for evaluation of same-borehole line source solutions"; Real hSegRea[nSeg] "Real part of the FLS solution"; Real hSegMir[2*nSeg-1] "Mirror part of the FLS solution"; - Modelica.SIunits.Height dSeg "Buried depth of borehole segment"; + Modelica.Units.SI.Height dSeg "Buried depth of borehole segment"; Integer Done[nBor, nBor] "Matrix for tracking of FLS evaluations"; Real A[nSeg*nBor+1, nSeg*nBor+1] "Coefficient matrix for system of equations"; Real B[nSeg*nBor+1] "Coefficient vector for system of equations"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/shaGFunction.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/shaGFunction.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/shaGFunction.mo" 2021-11-24 08:09:20.983366504 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/shaGFunction.mo" 2021-11-24 08:10:41.043125889 +0000 @@ -3,11 +3,11 @@ "Returns a SHA1 encryption of the formatted arguments for the g-function generation" extends Modelica.Icons.Function; input Integer nBor "Number of boreholes"; - input Modelica.SIunits.Position cooBor[nBor, 2] "Coordinates of boreholes"; - input Modelica.SIunits.Height hBor "Borehole length"; - input Modelica.SIunits.Height dBor "Borehole buried depth"; - input Modelica.SIunits.Radius rBor "Borehole radius"; - input Modelica.SIunits.ThermalDiffusivity aSoi "Ground thermal diffusivity used in g-function evaluation"; + input Modelica.Units.SI.Position cooBor[nBor, 2] "Coordinates of boreholes"; + input Modelica.Units.SI.Height hBor "Borehole length"; + input Modelica.Units.SI.Height dBor "Borehole buried depth"; + input Modelica.Units.SI.Radius rBor "Borehole radius"; + input Modelica.Units.SI.ThermalDiffusivity aSoi "Ground thermal diffusivity used in g-function evaluation"; input Integer nSeg "Number of line source segments per borehole"; input Integer nTimSho "Number of time steps in short time region"; input Integer nTimLon "Number of time steps in long time region"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/timeGeometric.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/timeGeometric.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/timeGeometric.mo" 2021-11-24 08:09:20.983366504 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/timeGeometric.mo" 2021-11-24 08:10:41.031125925 +0000 @@ -2,8 +2,8 @@ function timeGeometric "Geometric expansion of time steps" extends Modelica.Icons.Function; - input Modelica.SIunits.Duration dt "Minimum time step"; - input Modelica.SIunits.Time t_max "Maximum value of time"; + input Modelica.Units.SI.Duration dt "Minimum time step"; + input Modelica.Units.SI.Time t_max "Maximum value of time"; input Integer nTim "Number of time values"; output Real t[nTim] "Time vector"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Validation/Cylindrical.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Validation/Cylindrical.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Validation/Cylindrical.mo" 2021-11-24 08:09:20.983366504 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Validation/Cylindrical.mo" 2021-11-24 08:10:40.943126190 +0000 @@ -3,7 +3,7 @@ "Comparison of the Cylindrical with the GroundTemperatureResponse" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Temperature T_start = 295.15 + parameter Modelica.Units.SI.Temperature T_start = 295.15 "Initial soil temperature"; parameter BuildingSystems.Fluid.Geothermal.Borefields.Data.Borefield.Template borFieDat= BuildingSystems.Fluid.Geothermal.Borefields.Validation.BaseClasses.SandBox_Borefield() diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Validation/FiniteDifference_1Week.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Validation/FiniteDifference_1Week.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Validation/FiniteDifference_1Week.mo" 2021-11-24 08:09:20.983366504 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Validation/FiniteDifference_1Week.mo" 2021-11-24 08:10:40.931126225 +0000 @@ -3,7 +3,7 @@ "Short term validation of ground temperature response model" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Temperature T_start = 283.15 + parameter Modelica.Units.SI.Temperature T_start = 283.15 "Initial soil temperature"; BuildingSystems.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.Cylindrical soi( final steadyStateInitial=false, @@ -47,7 +47,7 @@ annotation (Placement(transformation(extent={{-90,-88},{-70,-68}}))); Modelica.Blocks.Sources.Sine sine( - freqHz=1/(24*3600), + f =1/(24*3600), startTime=21600, amplitude=1e8) "Heat flow signal" annotation (Placement(transformation(extent={{-92,-10},{-72,10}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/PartialBorefield.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/PartialBorefield.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/PartialBorefield.mo" 2021-11-24 08:09:20.983366504 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/BaseClasses/PartialBorefield.mo" 2021-11-24 08:10:40.903126310 +0000 @@ -32,7 +32,7 @@ annotation(Dialog(tab = "Initialization")); // Simulation parameters - parameter Modelica.SIunits.Time tLoaAgg=300 "Time resolution of load aggregation"; + parameter Modelica.Units.SI.Time tLoaAgg=300 "Time resolution of load aggregation"; parameter Integer nCel(min=1)=5 "Number of cells per aggregation level"; parameter Integer nSeg(min=1)=10 "Number of segments to use in vertical discretization of the boreholes"; @@ -45,23 +45,23 @@ annotation (choicesAllMatching=true,Placement(transformation(extent={{-80,-80},{-60,-60}}))); // Temperature gradient in undisturbed soil - parameter Modelica.SIunits.Temperature TExt0_start=283.15 + parameter Modelica.Units.SI.Temperature TExt0_start=283.15 "Initial far field temperature" annotation (Dialog(tab="Initialization", group="Soil")); - parameter Modelica.SIunits.Temperature TExt_start[nSeg]= + parameter Modelica.Units.SI.Temperature TExt_start[nSeg]= {if z[i] >= z0 then TExt0_start + (z[i] - z0)*dT_dz else TExt0_start for i in 1:nSeg} "Temperature of the undisturbed ground" annotation (Dialog(tab="Initialization", group="Soil")); - parameter Modelica.SIunits.Temperature TGro_start[nSeg]=TExt_start + parameter Modelica.Units.SI.Temperature TGro_start[nSeg]=TExt_start "Start value of grout temperature" annotation (Dialog(tab="Initialization", group="Filling material")); - parameter Modelica.SIunits.Temperature TFlu_start[nSeg]=TGro_start + parameter Modelica.Units.SI.Temperature TFlu_start[nSeg]=TGro_start "Start value of fluid temperature" annotation (Dialog(tab="Initialization")); - parameter Modelica.SIunits.Height z0=10 + parameter Modelica.Units.SI.Height z0=10 "Depth below which the temperature gradient starts" annotation (Dialog(tab="Initialization", group="Temperature profile")); parameter Real dT_dz(final unit="K/m", min=0) = 0.01 @@ -111,7 +111,7 @@ annotation (Placement(transformation(extent={{-10,-50},{10,-30}}))); protected - parameter Modelica.SIunits.Height z[nSeg]={borFieDat.conDat.hBor/nSeg*(i - 0.5) for i in 1:nSeg} + parameter Modelica.Units.SI.Height z[nSeg]={borFieDat.conDat.hBor/nSeg*(i - 0.5) for i in 1:nSeg} "Distance from the surface to the considered segment"; BuildingSystems.Fluid.BaseClasses.MassFlowRateMultiplier masFloDiv( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/Data/Configuration/Template.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/Data/Configuration/Template.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/Data/Configuration/Template.mo" 2021-11-24 08:09:20.983366504 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/Data/Configuration/Template.mo" 2021-11-24 08:10:40.847126478 +0000 @@ -11,50 +11,50 @@ parameter Real Rb(unit="(m.K)/W") = 0.0 "Borehole thermal resistance Rb. Only to fill in if known" annotation(Dialog(enable=use_Rb)); - parameter Modelica.SIunits.MassFlowRate mBor_flow_nominal + parameter Modelica.Units.SI.MassFlowRate mBor_flow_nominal "Nominal mass flow rate per borehole" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.MassFlowRate mBorFie_flow_nominal = mBor_flow_nominal*nBor + parameter Modelica.Units.SI.MassFlowRate mBorFie_flow_nominal = mBor_flow_nominal*nBor "Nominal mass flow of borefield" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.Pressure dp_nominal(displayUnit="Pa") + parameter Modelica.Units.SI.Pressure dp_nominal(displayUnit="Pa") "Pressure losses for the entire borefield" annotation (Dialog(group="Nominal condition")); //------------------------- Geometrical parameters --------------------------- - parameter Modelica.SIunits.Height hBor "Total height of the borehole" + parameter Modelica.Units.SI.Height hBor "Total height of the borehole" annotation (Dialog(group="Borehole")); - parameter Modelica.SIunits.Radius rBor "Radius of the borehole" + parameter Modelica.Units.SI.Radius rBor "Radius of the borehole" annotation (Dialog(group="Borehole")); - parameter Modelica.SIunits.Height dBor "Borehole buried depth" + parameter Modelica.Units.SI.Height dBor "Borehole buried depth" annotation (Dialog(group="Borehole")); parameter Integer nBor = size(cooBor, 1) "Total number of boreholes" annotation (Dialog(group="Borehole")); - parameter Modelica.SIunits.Length[:,2] cooBor + + parameter Modelica.Units.SI.Length[:,2] cooBor "Cartesian coordinates of the boreholes in meters" annotation (Dialog(group="Borehole")); // -- Tube - parameter Modelica.SIunits.Radius rTub "Outer radius of the tubes" + parameter Modelica.Units.SI.Radius rTub "Outer radius of the tubes" annotation (Dialog(group="Tubes")); - parameter Modelica.SIunits.ThermalConductivity kTub "Thermal conductivity of the tube" + parameter Modelica.Units.SI.ThermalConductivity kTub "Thermal conductivity of the tube" annotation (Dialog(group="Tubes")); - parameter Modelica.SIunits.Length eTub "Thickness of a tube" + parameter Modelica.Units.SI.Length eTub "Thickness of a tube" annotation (Dialog(group="Tubes")); - parameter Modelica.SIunits.Length xC + parameter Modelica.Units.SI.Length xC "Shank spacing, defined as the distance between the center of a pipe and the center of the borehole" annotation (Dialog(group="Tubes")); //------------------------- Advanced parameters ------------------------------ /*--------Flow: */ - parameter Modelica.SIunits.MassFlowRate mBor_flow_small(min=0) = 1E-4*abs(mBor_flow_nominal) + parameter Modelica.Units.SI.MassFlowRate mBor_flow_small(min=0) = 1E-4*abs(mBor_flow_nominal) "Small mass flow rate for regularization of zero flow" annotation (Dialog(tab="Advanced")); - annotation ( defaultComponentPrefixes="parameter", defaultComponentName="conDat", diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/Data/Filling/Template.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/Data/Filling/Template.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/Data/Filling/Template.mo" 2021-11-24 08:09:20.983366504 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/Data/Filling/Template.mo" 2021-11-24 08:10:40.827126538 +0000 @@ -2,16 +2,16 @@ record Template "Template for filling data records" extends Modelica.Icons.Record; - parameter Modelica.SIunits.ThermalConductivity kFil + parameter Modelica.Units.SI.ThermalConductivity kFil "Thermal conductivity of the borehole filling material"; - parameter Modelica.SIunits.SpecificHeatCapacity cFil + parameter Modelica.Units.SI.SpecificHeatCapacity cFil "Specific heat capacity of the borehole filling material"; - parameter Modelica.SIunits.Density dFil(displayUnit="kg/m3") + parameter Modelica.Units.SI.Density dFil(displayUnit="kg/m3") "Density of the borehole filling material"; parameter Boolean steadyState = (cFil < Modelica.Constants.eps or dFil < Modelica.Constants.eps) "Flag, if true, then material is computed using steady-state heat conduction" annotation(Evaluate=true); - final parameter Modelica.SIunits.ThermalDiffusivity aFil = kFil/(dFil*cFil) + final parameter Modelica.Units.SI.ThermalDiffusivity aFil = kFil/(dFil*cFil) "Heat diffusion coefficient of the borehole filling material"; annotation ( defaultComponentPrefixes="parameter", diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/Data/Soil/Template.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/Data/Soil/Template.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/Data/Soil/Template.mo" 2021-11-24 08:09:20.983366504 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/Data/Soil/Template.mo" 2021-11-24 08:10:40.787126658 +0000 @@ -2,16 +2,16 @@ record Template "Template for soil data records" extends Modelica.Icons.Record; - parameter Modelica.SIunits.ThermalConductivity kSoi + parameter Modelica.Units.SI.ThermalConductivity kSoi "Thermal conductivity of the soil material"; - parameter Modelica.SIunits.SpecificHeatCapacity cSoi + parameter Modelica.Units.SI.SpecificHeatCapacity cSoi "Specific heat capacity of the soil material"; - parameter Modelica.SIunits.Density dSoi(displayUnit="kg/m3") + parameter Modelica.Units.SI.Density dSoi(displayUnit="kg/m3") "Density of the soil material"; parameter Boolean steadyState = (cSoi < Modelica.Constants.eps or dSoi < Modelica.Constants.eps) "Flag, if true, then material is computed using steady-state heat conduction" annotation(Evaluate=true); - final parameter Modelica.SIunits.ThermalDiffusivity aSoi=kSoi/(dSoi*cSoi) + final parameter Modelica.Units.SI.ThermalDiffusivity aSoi=kSoi/(dSoi*cSoi) "Heat diffusion coefficient of the soil material"; annotation ( defaultComponentPrefixes="parameter", diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/Examples/Borefields.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/Examples/Borefields.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/Examples/Borefields.mo" 2021-11-24 08:09:20.983366504 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/Examples/Borefields.mo" 2021-11-24 08:10:40.779126682 +0000 @@ -5,10 +5,10 @@ package Medium = BuildingSystems.Media.Water; - parameter Modelica.SIunits.Time tLoaAgg=300 + parameter Modelica.Units.SI.Time tLoaAgg=300 "Time resolution of load aggregation"; - parameter Modelica.SIunits.Temperature TGro = 283.15 + parameter Modelica.Units.SI.Temperature TGro = 283.15 "Ground temperature"; BuildingSystems.Fluid.Geothermal.Borefields.TwoUTubes borFie2UTubPar( redeclare package Medium = Medium, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/Examples/RectangularBorefield.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/Examples/RectangularBorefield.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/Examples/RectangularBorefield.mo" 2021-11-24 08:09:20.983366504 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/Examples/RectangularBorefield.mo" 2021-11-24 08:10:40.759126742 +0000 @@ -4,25 +4,25 @@ package Medium = BuildingSystems.Media.Water "Medium model"; - parameter Modelica.SIunits.Time tLoaAgg=300 + parameter Modelica.Units.SI.Time tLoaAgg=300 "Time resolution of load aggregation"; - parameter Modelica.SIunits.Temperature TGro = 283.15 + parameter Modelica.Units.SI.Temperature TGro = 283.15 "Ground temperature"; - parameter Modelica.SIunits.Velocity v_nominal = 1 "Nominal velocity"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = nBorHol*v_nominal*rTub^2*3.14*1000 + parameter Modelica.Units.SI.Velocity v_nominal = 1 "Nominal velocity"; + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = nBorHol*v_nominal*rTub^2*3.14*1000 "Nominal mass flow rate"; - parameter Modelica.SIunits.Pressure dpBorFie_nominal = (hBor+(xBorFie+yBorFie)/2)*2 + parameter Modelica.Units.SI.Pressure dpBorFie_nominal = (hBor+(xBorFie+yBorFie)/2)*2 "Pressure losses for the entire borefield"; - parameter Modelica.SIunits.Pressure dpHex_nominal = 10000 "Pressure drop heat exchanger"; - parameter Modelica.SIunits.Pressure dp_nominal = dpBorFie_nominal + dpHex_nominal + parameter Modelica.Units.SI.Pressure dpHex_nominal = 10000 "Pressure drop heat exchanger"; + parameter Modelica.Units.SI.Pressure dp_nominal = dpBorFie_nominal + dpHex_nominal "Total pressure drop"; - parameter Modelica.SIunits.Height hBor = 100 "Total height of the borehole"; - parameter Modelica.SIunits.Radius rTub = 0.02 "Outer radius of the tubes"; - parameter Modelica.SIunits.Length xBorFie = 10 "Borefield length"; - parameter Modelica.SIunits.Length yBorFie = 30 "Borefield width"; - parameter Modelica.SIunits.Length dBorHol = 5 "Distance between two boreholes"; + parameter Modelica.Units.SI.Height hBor = 100 "Total height of the borehole"; + parameter Modelica.Units.SI.Radius rTub = 0.02 "Outer radius of the tubes"; + parameter Modelica.Units.SI.Length xBorFie = 10 "Borefield length"; + parameter Modelica.Units.SI.Length yBorFie = 30 "Borefield width"; + parameter Modelica.Units.SI.Length dBorHol = 5 "Distance between two boreholes"; final parameter Integer nXBorHol = integer((xBorFie+dBorHol)/dBorHol) "Number of boreholes in x-direction"; final parameter Integer nYBorHol = integer((yBorFie+dBorHol)/dBorHol) "Number of boreholes in y-direction"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/Validation/ConstantHeatInjection_100Boreholes.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/Validation/ConstantHeatInjection_100Boreholes.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/Validation/ConstantHeatInjection_100Boreholes.mo" 2021-11-24 08:09:20.983366504 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/Validation/ConstantHeatInjection_100Boreholes.mo" 2021-11-24 08:10:40.611127186 +0000 @@ -4,7 +4,7 @@ extends Modelica.Icons.Example; package Medium = BuildingSystems.Media.Water; - parameter Modelica.SIunits.Temperature T_start = 273.15 + parameter Modelica.Units.SI.Temperature T_start = 273.15 "Initial temperature of the soil"; BuildingSystems.Fluid.Geothermal.Borefields.OneUTube borHol( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/Validation/Sandbox.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/Validation/Sandbox.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/Validation/Sandbox.mo" 2021-11-24 08:09:20.983366504 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Geothermal/Borefields/Validation/Sandbox.mo" 2021-11-24 08:10:40.599127223 +0000 @@ -3,7 +3,7 @@ extends Modelica.Icons.Example; package Medium = BuildingSystems.Media.Water; - parameter Modelica.SIunits.Temperature T_start = 273.15 + 22.09 + parameter Modelica.Units.SI.Temperature T_start = 273.15 + 22.09 "Initial temperature of the sandbox"; // mSenFac is set to its numerical value because it is a constant in the borehole model. diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Convector.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Convector.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Convector.mo" 2021-11-24 08:09:20.983366504 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Convector.mo" 2021-11-24 08:10:40.567127319 +0000 @@ -15,7 +15,7 @@ parameter Integer nBeams(min=1) "Number of beams in parallel"; - parameter Modelica.SIunits.Time tau = 30 + parameter Modelica.Units.SI.Time tau = 30 "Time constant at nominal flow (if energyDynamics <> SteadyState)" annotation (Dialog(tab = "Dynamics", group="Nominal condition")); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Examples/DerivateCubicSpline.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Examples/DerivateCubicSpline.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Examples/DerivateCubicSpline.mo" 2021-11-24 08:09:20.983366504 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Examples/DerivateCubicSpline.mo" 2021-11-24 08:10:40.527127439 +0000 @@ -2,7 +2,7 @@ model DerivateCubicSpline extends Modelica.Icons.Example; - Modelica.Blocks.Sources.Clock clock "Clock" + Modelica.Blocks.Sources.ContinuousClock clock "Clock" annotation (Placement(transformation(extent={{-60,-10},{-40,10}}))); BuildingSystems.Fluid.HeatExchangers.ActiveBeams.BaseClasses.DerivativesCubicSpline cubSpl "Derivatives of cubic spline" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/HeatExchangers/ActiveBeams/Cooling.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/HeatExchangers/ActiveBeams/Cooling.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/HeatExchangers/ActiveBeams/Cooling.mo" 2021-11-24 08:09:20.983366504 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/HeatExchangers/ActiveBeams/Cooling.mo" 2021-11-24 08:10:40.503127511 +0000 @@ -28,7 +28,7 @@ "= true to allow flow reversal in air circuit, false restricts to design direction (port_a -> port_b)" annotation(Dialog(tab="Assumptions"), Evaluate=true); - parameter Modelica.SIunits.Time tau = 30 + parameter Modelica.Units.SI.Time tau = 30 "Time constant at nominal flow (if energyDynamics <> SteadyState)" annotation (Dialog(tab = "Dynamics", group="Nominal condition")); @@ -135,10 +135,10 @@ origin={0,-36}))); // Pressure drop - Modelica.SIunits.PressureDifference dpWatCoo(displayUnit="Pa") = watCoo_a.p - watCoo_b.p + Modelica.Units.SI.PressureDifference dpWatCoo(displayUnit="Pa") = watCoo_a.p - watCoo_b.p "Pressure difference watCoo_a minus watCoo_b"; - Modelica.SIunits.PressureDifference dpAir(displayUnit="Pa") = air_a.p - air_b.p + Modelica.Units.SI.PressureDifference dpAir(displayUnit="Pa") = air_a.p - air_b.p "Pressure difference air_a minus air_b"; FixedResistances.PressureDrop res( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/HeatExchangers/ActiveBeams/CoolingAndHeating.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/HeatExchangers/ActiveBeams/CoolingAndHeating.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/HeatExchangers/ActiveBeams/CoolingAndHeating.mo" 2021-11-24 08:09:20.983366504 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/HeatExchangers/ActiveBeams/CoolingAndHeating.mo" 2021-11-24 08:10:40.475127595 +0000 @@ -42,7 +42,7 @@ noEvent(actualStream(watHea_b.Xi_outflow))) if show_T "Medium properties in port watHea_b"; - Modelica.SIunits.PressureDifference dpWatHea(displayUnit="Pa") = watHea_a.p - watHea_b.p + Modelica.Units.SI.PressureDifference dpWatHea(displayUnit="Pa") = watHea_a.p - watHea_b.p "Pressure difference between watHea_a and watHea_b"; protected diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/HeatExchangers/ActiveBeams/Data/Generic.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/HeatExchangers/ActiveBeams/Data/Generic.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/HeatExchangers/ActiveBeams/Data/Generic.mo" 2021-11-24 08:09:20.983366504 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/HeatExchangers/ActiveBeams/Data/Generic.mo" 2021-11-24 08:10:40.395127835 +0000 @@ -15,28 +15,28 @@ f={0,0.5,1}) "Performance data for normalized temperature difference room minus water inlet"; - parameter Modelica.SIunits.MassFlowRate mAir_flow_nominal + + parameter Modelica.Units.SI.MassFlowRate mAir_flow_nominal "Nominal air mass flow rate per beam" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.MassFlowRate mWat_flow_nominal + parameter Modelica.Units.SI.MassFlowRate mWat_flow_nominal "Nominal water mass flow rate per beam" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.PressureDifference dpWat_nominal(displayUnit="Pa") + parameter Modelica.Units.SI.PressureDifference dpWat_nominal(displayUnit="Pa") "Water-side nominal pressure drop per beam" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.PressureDifference dpAir_nominal(displayUnit="Pa") + parameter Modelica.Units.SI.PressureDifference dpAir_nominal(displayUnit="Pa") "Air-side nominal pressure drop" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.TemperatureDifference dT_nominal + parameter Modelica.Units.SI.TemperatureDifference dT_nominal "Nominal temperature difference water inlet minus room air" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal + parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal "Nominal capacity per beam" annotation (Dialog(group="Nominal condition")); - annotation (defaultComponentName="per", Documentation(revisions="diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/BaseClasses/Characteristics/flowParameters.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/BaseClasses/Characteristics/flowParameters.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/BaseClasses/Characteristics/flowParameters.mo" 2021-11-24 08:09:20.991366479 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/BaseClasses/Characteristics/flowParameters.mo" 2021-11-24 08:10:37.179137492 +0000 @@ -2,12 +2,12 @@ record flowParameters "Record for flow parameters" extends Modelica.Icons.Record; - parameter Modelica.SIunits.VolumeFlowRate V_flow[:](each min=0) + + parameter Modelica.Units.SI.VolumeFlowRate V_flow[:](each min=0) "Volume flow rate at user-selected operating points"; - parameter Modelica.SIunits.PressureDifference dp[size(V_flow,1)]( + parameter Modelica.Units.SI.PressureDifference dp[size(V_flow,1)]( each min=0, each displayUnit="Pa") "Fan or pump total pressure at these flow rates"; - annotation (Documentation(info="
Data record for performance data that describe volume flow rate versus diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/BaseClasses/Characteristics/flowParametersInternal.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/BaseClasses/Characteristics/flowParametersInternal.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/BaseClasses/Characteristics/flowParametersInternal.mo" 2021-11-24 08:09:20.991366479 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/BaseClasses/Characteristics/flowParametersInternal.mo" 2021-11-24 08:10:37.175137505 +0000 @@ -3,9 +3,9 @@ extends Modelica.Icons.Record; parameter Integer n "Number of elements in each array" annotation(Evaluate=true); - parameter Modelica.SIunits.VolumeFlowRate V_flow[n](each min=0) + parameter Modelica.Units.SI.VolumeFlowRate V_flow[n](each min=0) "Volume flow rate at user-selected operating points"; - parameter Modelica.SIunits.PressureDifference dp[n]( + parameter Modelica.Units.SI.PressureDifference dp[n]( each min=0, each displayUnit="Pa") "Fan or pump total pressure at these flow rates"; annotation (Documentation(info=" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/BaseClasses/Characteristics/power.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/BaseClasses/Characteristics/power.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/BaseClasses/Characteristics/power.mo" 2021-11-24 08:09:20.991366479 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/BaseClasses/Characteristics/power.mo" 2021-11-24 08:10:37.167137529 +0000 @@ -3,16 +3,16 @@ extends Modelica.Icons.Function; input BuildingSystems.Fluid.Movers.BaseClasses.Characteristics.powerParameters per "Pressure performance data"; - input Modelica.SIunits.VolumeFlowRate V_flow "Volumetric flow rate"; + input Modelica.Units.SI.VolumeFlowRate V_flow "Volumetric flow rate"; input Real r_N(unit="1") "Relative revolution, r_N=N/N_nominal"; input Real d[:] "Derivatives at support points for spline interpolation"; input Real delta "Small value for switching implementation around zero rpm"; - output Modelica.SIunits.Power P "Power consumption"; + output Modelica.Units.SI.Power P "Power consumption"; protected Integer n=size(per.V_flow, 1) "Dimension of data vector"; - Modelica.SIunits.VolumeFlowRate rat "Ratio of V_flow/r_N"; + Modelica.Units.SI.VolumeFlowRate rat "Ratio of V_flow/r_N"; Integer i "Integer to select data interval"; algorithm diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/BaseClasses/Characteristics/powerParameters.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/BaseClasses/Characteristics/powerParameters.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/BaseClasses/Characteristics/powerParameters.mo" 2021-11-24 08:09:20.991366479 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/BaseClasses/Characteristics/powerParameters.mo" 2021-11-24 08:10:37.163137541 +0000 @@ -1,9 +1,9 @@ within BuildingSystems.Fluid.Movers.BaseClasses.Characteristics; record powerParameters "Record for electrical power parameters" extends Modelica.Icons.Record; - parameter Modelica.SIunits.VolumeFlowRate V_flow[:](each min=0) + parameter Modelica.Units.SI.VolumeFlowRate V_flow[:](each min=0) "Volume flow rate at user-selected operating points"; - parameter Modelica.SIunits.Power P[size(V_flow,1)](each min=0) + parameter Modelica.Units.SI.Power P[size(V_flow,1)](each min=0) "Fan or pump electrical power at these flow rates"; annotation (Documentation(info="
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/BaseClasses/Characteristics/pressure.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/BaseClasses/Characteristics/pressure.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/BaseClasses/Characteristics/pressure.mo" 2021-11-24 08:09:20.991366479 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/BaseClasses/Characteristics/pressure.mo" 2021-11-24 08:10:37.159137553 +0000 @@ -3,17 +3,17 @@ "Pump or fan head away from the origin without correction for mover flow resistance" extends Modelica.Icons.Function; - input Modelica.SIunits.VolumeFlowRate V_flow "Volumetric flow rate"; + input Modelica.Units.SI.VolumeFlowRate V_flow "Volumetric flow rate"; input Real r_N(unit="1") "Relative revolution, r_N=N/N_nominal"; input Real d[:] "Derivatives of flow rate vs. pressure at the support points"; - input Modelica.SIunits.PressureDifference dpMax(displayUnit="Pa") + input Modelica.Units.SI.PressureDifference dpMax(displayUnit="Pa") "Maximum pressure drop at nominal speed, for regularisation"; - input Modelica.SIunits.VolumeFlowRate V_flow_max + input Modelica.Units.SI.VolumeFlowRate V_flow_max "Maximum flow rate at nominal speed, for regularisation"; input BuildingSystems.Fluid.Movers.BaseClasses.Characteristics.flowParametersInternal per "Pressure performance data"; - output Modelica.SIunits.PressureDifference dp(displayUnit="Pa") "Pressure raise"; + output Modelica.Units.SI.PressureDifference dp(displayUnit="Pa") "Pressure raise"; protected constant Real delta = 0.05 @@ -21,8 +21,8 @@ constant Real delta2 = delta/2 "= delta/2"; Real r_R(unit="1") "Relative revolution, bounded below by delta"; Integer i "Integer to select data interval"; - Modelica.SIunits.VolumeFlowRate rat "Ratio of V_flow/r_R"; + Modelica.Units.SI.VolumeFlowRate rat "Ratio of V_flow/r_R"; algorithm // For r_N < delta, we restrict r_N in the term V_flow/r_N. // This is done using a cubic spline in a region 0.75*delta < r_N < 1.25*r_N diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/BaseClasses/FlowMachineInterface.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/BaseClasses/FlowMachineInterface.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/BaseClasses/FlowMachineInterface.mo" 2021-11-24 08:09:20.991366479 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/BaseClasses/FlowMachineInterface.mo" 2021-11-24 08:10:37.147137589 +0000 @@ -18,16 +18,16 @@ parameter Boolean computePowerUsingSimilarityLaws "= true, compute power exactly, using similarity laws. Otherwise approximate."; - final parameter Modelica.SIunits.VolumeFlowRate V_flow_nominal= + final parameter Modelica.Units.SI.VolumeFlowRate V_flow_nominal= per.pressure.V_flow[nOri] "Nominal volume flow rate, used for homotopy"; - parameter Modelica.SIunits.Density rho_default + parameter Modelica.Units.SI.Density rho_default "Fluid density at medium default state"; parameter Boolean haveVMax "Flag, true if user specified data that contain V_flow_max"; - parameter Modelica.SIunits.VolumeFlowRate V_flow_max + parameter Modelica.Units.SI.VolumeFlowRate V_flow_max "Maximum volume flow rate, used for smoothing"; parameter Integer nOri(min=1) "Number of data points for pressure curve" @@ -124,7 +124,7 @@ final parameter Real hydDer[size(per.hydraulicEfficiency.V_flow,1)](each fixed=false) "Coefficients for polynomial of hydraulic efficiency vs. volume flow rate"; - parameter Modelica.SIunits.PressureDifference dpMax(displayUnit="Pa")= + parameter Modelica.Units.SI.PressureDifference dpMax(displayUnit="Pa")= if haveDPMax then per.pressure.dp[1] else diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/BaseClasses/PartialFlowMachine.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/BaseClasses/PartialFlowMachine.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/BaseClasses/PartialFlowMachine.mo" 2021-11-24 08:09:20.991366479 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/BaseClasses/PartialFlowMachine.mo" 2021-11-24 08:10:37.095137745 +0000 @@ -42,7 +42,7 @@ parameter Boolean nominalValuesDefineDefaultPressureCurve = false "Set to true to avoid warning if m_flow_nominal and dp_nominal are used to construct the default pressure curve"; - parameter Modelica.SIunits.Time tau=1 + parameter Modelica.Units.SI.Time tau=1 "Time constant of fluid volume for nominal flow, used if energy or mass balance is dynamic" annotation (Dialog(tab="Dynamics", group="Nominal condition", @@ -53,7 +53,7 @@ parameter Boolean use_inputFilter=true "= true, if speed is filtered with a 2nd order CriticalDamping filter" annotation(Dialog(tab="Dynamics", group="Filtered speed")); - parameter Modelica.SIunits.Time riseTime=30 + parameter Modelica.Units.SI.Time riseTime=30 "Rise time of the filter (time to reach 99.6 % of the speed)" annotation(Dialog(tab="Dynamics", group="Filtered speed",enable=use_inputFilter)); parameter Modelica.Blocks.Types.Init init=Modelica.Blocks.Types.Init.InitialOutput @@ -90,8 +90,8 @@ iconTransformation(extent={{-10,-78},{10,-58}}))); // Variables - Modelica.SIunits.VolumeFlowRate VMachine_flow(start=_VMachine_flow) = eff.V_flow "Volume flow rate"; - Modelica.SIunits.PressureDifference dpMachine(displayUnit="Pa")= + Modelica.Units.SI.VolumeFlowRate VMachine_flow(start=_VMachine_flow) = eff.V_flow "Volume flow rate"; + Modelica.Units.SI.PressureDifference dpMachine(displayUnit="Pa")= -preSou.dp "Pressure difference"; Real eta(unit="1", final quantity="Efficiency") = eff.eta "Global efficiency"; @@ -100,7 +100,7 @@ // Quantity to control protected - final parameter Modelica.SIunits.VolumeFlowRate _VMachine_flow = 0 + final parameter Modelica.Units.SI.VolumeFlowRate _VMachine_flow = 0 "Start value for VMachine_flow, used to avoid a warning if not specified"; parameter Types.PrescribedVariable preVar "Type of prescribed variable"; @@ -123,7 +123,7 @@ final parameter Boolean haveVMax = (abs(per.pressure.dp[nOri]) < Modelica.Constants.eps) "Flag, true if user specified data that contain V_flow_max"; - final parameter Modelica.SIunits.VolumeFlowRate V_flow_max= + final parameter Modelica.Units.SI.VolumeFlowRate V_flow_max= if per.havePressureCurve then (if haveVMax then per.pressure.V_flow[nOri] @@ -132,7 +132,7 @@ nOri - 1])/((per.pressure.dp[nOri] - per.pressure.dp[nOri - 1]))*per.pressure.dp[nOri]) else m_flow_nominal/rho_default "Maximum volume flow rate, used for smoothing"; - final parameter Modelica.SIunits.Density rho_default= + final parameter Modelica.Units.SI.Density rho_default= Medium.density_pTX( p=Medium.p_default, T=Medium.T_default, @@ -143,7 +143,7 @@ p=p_start, X=X_start) "Medium state at start values"; - final parameter Modelica.SIunits.SpecificEnthalpy h_outflow_start = Medium.specificEnthalpy(sta_start) + final parameter Modelica.Units.SI.SpecificEnthalpy h_outflow_start = Medium.specificEnthalpy(sta_start) "Start value for outflowing enthalpy"; Modelica.Blocks.Sources.Constant[size(stageInputs, 1)] stageValues( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/BaseClasses/PowerInterface.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/BaseClasses/PowerInterface.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/BaseClasses/PowerInterface.mo" 2021-11-24 08:09:20.991366479 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/BaseClasses/PowerInterface.mo" 2021-11-24 08:10:37.039137913 +0000 @@ -9,7 +9,7 @@ parameter Boolean motorCooledByFluid "Flag, true if the motor is cooled by the fluid stream"; - parameter Modelica.SIunits.VolumeFlowRate delta_V_flow + parameter Modelica.Units.SI.VolumeFlowRate delta_V_flow "Factor used for setting heat input into medium to zero at very small flows"; Modelica.Blocks.Interfaces.RealInput etaHyd( @@ -40,13 +40,13 @@ final unit="W") "Heat input from fan or pump to medium" annotation (Placement(transformation(extent={{100,-10},{120,10}}))); - Modelica.SIunits.Power WHyd + Modelica.Units.SI.Power WHyd "Hydraulic power input (converted to flow work and heat)"; protected - Modelica.SIunits.HeatFlowRate QThe_flow - "Heat input from fan or pump to medium"; + Modelica.Units.SI.HeatFlowRate QThe_flow + "Heat input from fan or pump to medium"; initial equation assert(homotopyInitialization, "In " + getInstanceName() + ": The constant homotopyInitialization has been modified from its default value. This constant will be removed in future releases.", diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/Data/Generic.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/Data/Generic.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/Data/Generic.mo" 2021-11-24 08:09:20.991366479 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/Data/Generic.mo" 2021-11-24 08:10:36.955138165 +0000 @@ -56,15 +56,15 @@ "Vector of normalized speed set points, used if inputType = BuildingSystems.Fluid.Types.InputType.Stages" annotation (Dialog(group="Normalized speeds (used in model, default values assigned from speeds in rpm)")); - parameter Modelica.SIunits.Conversions.NonSIunits.AngularVelocity_rpm speed_rpm_nominal=1500 + parameter Modelica.Units.NonSI.AngularVelocity_rpm speed_rpm_nominal=1500 "Nominal rotational speed for flow characteristic" annotation (Dialog(group="Speeds in RPM")); - parameter Modelica.SIunits.Conversions.NonSIunits.AngularVelocity_rpm constantSpeed_rpm=speed_rpm_nominal + parameter Modelica.Units.NonSI.AngularVelocity_rpm constantSpeed_rpm=speed_rpm_nominal "Speed set point, used if inputType = BuildingSystems.Fluid.Types.InputType.Constant" annotation (Dialog(group="Speeds in RPM")); - parameter Modelica.SIunits.Conversions.NonSIunits.AngularVelocity_rpm[:] speeds_rpm = {speed_rpm_nominal} + parameter Modelica.Units.NonSI.AngularVelocity_rpm[:] speeds_rpm = {speed_rpm_nominal} "Vector of speed set points, used if inputType = BuildingSystems.Fluid.Types.InputType.Stages" annotation (Dialog(group="Speeds in RPM")); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/Examples/ClosedLoop_y.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/Examples/ClosedLoop_y.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/Examples/ClosedLoop_y.mo" 2021-11-24 08:09:20.991366479 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/Examples/ClosedLoop_y.mo" 2021-11-24 08:10:36.783138682 +0000 @@ -4,9 +4,9 @@ package Medium = BuildingSystems.Media.Air; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal= 0.1 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal= 0.1 "Nominal mass flow rate"; - parameter Modelica.SIunits.PressureDifference dp_nominal = 500 + parameter Modelica.Units.SI.PressureDifference dp_nominal = 500 "Nominal pressure difference"; Modelica.Blocks.Sources.Pulse y( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/Examples/MoverParameter.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/Examples/MoverParameter.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/Examples/MoverParameter.mo" 2021-11-24 08:09:20.991366479 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/Examples/MoverParameter.mo" 2021-11-24 08:10:36.763138742 +0000 @@ -4,7 +4,7 @@ extends Modelica.Icons.Example; package Medium = BuildingSystems.Media.Water; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=2 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=2 "Nominal mass flow rate"; FlowControlled_m_flow pump_m_flow( @@ -60,7 +60,7 @@ energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState) "Pump with speed input" annotation (Placement(transformation(extent={{-10,30},{10,50}}))); - parameter Modelica.SIunits.PressureDifference dp_nominal=10000 + parameter Modelica.Units.SI.PressureDifference dp_nominal=10000 "Nominal pressure raise"; equation connect(sou.ports[1], pump_m_flow.port_a) annotation (Line( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/Examples/MoverStages.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/Examples/MoverStages.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/Examples/MoverStages.mo" 2021-11-24 08:09:20.991366479 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/Examples/MoverStages.mo" 2021-11-24 08:10:36.751138778 +0000 @@ -8,13 +8,13 @@ pump_dp(inputType=BuildingSystems.Fluid.Types.InputType.Stages)); package Medium = BuildingSystems.Media.Water; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=2 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=2 "Nominal mass flow rate"; Modelica.Blocks.Sources.IntegerTable integerTable(table=[0,1; 0.3,2; 0.6,3]) "Integer step input, 1 is off, 2 is on" annotation (Placement(transformation(extent={{-60,70},{-40,90}}))); - parameter Modelica.SIunits.PressureDifference dp_nominal=10000 "Nominal pressure raise"; + parameter Modelica.Units.SI.PressureDifference dp_nominal=10000 "Nominal pressure raise"; equation connect(integerTable.y, pump_Nrpm.stage) annotation (Line(points={{-39,80},{0,80},{0,52}}, color={255,127,0})); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/Examples/PumpsParallel.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/Examples/PumpsParallel.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/Examples/PumpsParallel.mo" 2021-11-24 08:09:20.991366479 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/Examples/PumpsParallel.mo" 2021-11-24 08:10:36.743138802 +0000 @@ -4,10 +4,10 @@ package Medium = BuildingSystems.Media.Water "Medium model"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal= 1 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal= 1 "Nominal mass flow rate"; - parameter Modelica.SIunits.Density rho_nominal=1000 + parameter Modelica.Units.SI.Density rho_nominal=1000 "Density, used to compute fluid mass"; BuildingSystems.Fluid.FixedResistances.PressureDrop dpIn1( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/Examples/PumpsSeries.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/Examples/PumpsSeries.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/Examples/PumpsSeries.mo" 2021-11-24 08:09:20.991366479 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/Examples/PumpsSeries.mo" 2021-11-24 08:10:36.727138850 +0000 @@ -3,7 +3,7 @@ extends Modelica.Icons.Example; package Medium = BuildingSystems.Media.Water; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=1 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1 "Nominal mass flow rate"; BuildingSystems.Fluid.Movers.SpeedControlled_y floMac1( @@ -24,7 +24,7 @@ T=Medium.T_default, p=Medium.p_default, X=Medium.X_default) "Start state"; - parameter Modelica.SIunits.Density rho_nominal=Medium.density( + parameter Modelica.Units.SI.Density rho_nominal=Medium.density( state_start) "Density, used to compute fluid mass"; BuildingSystems.Fluid.Movers.SpeedControlled_y floMac2( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/Examples/SpeedControlled_y_pumpCurves.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/Examples/SpeedControlled_y_pumpCurves.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/Examples/SpeedControlled_y_pumpCurves.mo" 2021-11-24 08:09:20.991366479 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/Examples/SpeedControlled_y_pumpCurves.mo" 2021-11-24 08:10:36.715138886 +0000 @@ -6,11 +6,11 @@ // For OpenModelica, changed m_flow_nominal to a constant. Otherwise // the translation fails with "Error: Cyclically dependent parameters found" - constant Modelica.SIunits.MassFlowRate m_flow_nominal = 0.5 + constant Modelica.Units.SI.MassFlowRate m_flow_nominal = 0.5 "Nominal mass flow rate"; // For OpenModelica, changed dp_nominal to a constant. Otherwise // the compilation fails. - constant Modelica.SIunits.PressureDifference dp_nominal = 10000 + constant Modelica.Units.SI.PressureDifference dp_nominal = 10000 "Nominal pressure"; model pumpModel = BuildingSystems.Fluid.Movers.SpeedControlled_y ( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/FlowControlled_dp.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/FlowControlled_dp.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/FlowControlled_dp.mo" 2021-11-24 08:09:20.991366479 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/FlowControlled_dp.mo" 2021-11-24 08:10:36.691138958 +0000 @@ -22,13 +22,13 @@ dp = {i/(nOri-1)*2.0*dp_nominal for i in (nOri-1):-1:0}), final use_powerCharacteristic = if per.havePressureCurve then per.use_powerCharacteristic else false))); - parameter Modelica.SIunits.PressureDifference dp_start( + parameter Modelica.Units.SI.PressureDifference dp_start( min=0, displayUnit="Pa")=0 "Initial value of pressure raise" annotation(Dialog(tab="Dynamics", group="Filtered speed")); // For air, we set dp_nominal = 600 as default, for water we set 10000 - parameter Modelica.SIunits.PressureDifference dp_nominal( + parameter Modelica.Units.SI.PressureDifference dp_nominal( min=0, displayUnit="Pa")= if rho_default < 500 then 500 else 10000 "Nominal pressure raise, used to normalized the filter if use_inputFilter=true, @@ -36,14 +36,14 @@ and for default pressure curve if not specified in record per" annotation(Dialog(group="Nominal condition")); - parameter Modelica.SIunits.PressureDifference constantHead( + parameter Modelica.Units.SI.PressureDifference constantHead( min=0, displayUnit="Pa")=dp_nominal "Constant pump head, used when inputType=Constant" annotation(Dialog(enable=inputType == BuildingSystems.Fluid.Types.InputType.Constant)); // By default, set heads proportional to sqrt(speed/speed_nominal) - parameter Modelica.SIunits.PressureDifference[:] heads( + parameter Modelica.Units.SI.PressureDifference[:] heads( each min=0, each displayUnit="Pa")= dp_nominal*{(per.speeds[i]/per.speeds[end])^2 for i in 1:size(per.speeds, 1)} diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/FlowControlled_m_flow.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/FlowControlled_m_flow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/FlowControlled_m_flow.mo" 2021-11-24 08:09:20.991366479 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/FlowControlled_m_flow.mo" 2021-11-24 08:10:36.643139103 +0000 @@ -23,21 +23,21 @@ preSou(m_flow_start=m_flow_start)); // For air, we set dp_nominal = 600 as default, for water we set 10000 - parameter Modelica.SIunits.PressureDifference dp_nominal(min=0, displayUnit="Pa")= + parameter Modelica.Units.SI.PressureDifference dp_nominal(min=0, displayUnit="Pa")= if rho_default < 500 then 500 else 10000 "Nominal pressure raise, used for default pressure curve if not specified in record per" annotation(Dialog(group="Nominal condition")); - parameter Modelica.SIunits.MassFlowRate m_flow_start(min=0)=0 + parameter Modelica.Units.SI.MassFlowRate m_flow_start(min=0)=0 "Initial value of mass flow rate" annotation(Dialog(tab="Dynamics", group="Filtered speed")); - parameter Modelica.SIunits.MassFlowRate constantMassFlowRate=m_flow_nominal + parameter Modelica.Units.SI.MassFlowRate constantMassFlowRate=m_flow_nominal "Constant pump mass flow rate, used when inputType=Constant" annotation(Dialog(enable=inputType == BuildingSystems.Fluid.Types.InputType.Constant)); // By default, set massFlowRates proportional to (speed/speed_nominal) - parameter Modelica.SIunits.MassFlowRate[:] massFlowRates= + parameter Modelica.Units.SI.MassFlowRate[:] massFlowRates= m_flow_nominal*{per.speeds[i]/per.speeds[end] for i in 1:size(per.speeds, 1)} "Vector of mass flow rate set points, used when inputType=Stage" annotation(Dialog(enable=inputType == BuildingSystems.Fluid.Types.InputType.Stages)); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/Validation/BaseClasses/FlowMachine_ZeroFlow.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/Validation/BaseClasses/FlowMachine_ZeroFlow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/Validation/BaseClasses/FlowMachine_ZeroFlow.mo" 2021-11-24 08:09:20.991366479 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/Validation/BaseClasses/FlowMachine_ZeroFlow.mo" 2021-11-24 08:10:36.575139307 +0000 @@ -5,9 +5,9 @@ replaceable package Medium = BuildingSystems.Media.Air constrainedby Modelica.Media.Interfaces.PartialMedium "Medium model"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal= 1 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal= 1 "Nominal mass flow rate"; - parameter Modelica.SIunits.PressureDifference dp_nominal = 500 + parameter Modelica.Units.SI.PressureDifference dp_nominal = 500 "Nominal pressure difference"; Modelica.Blocks.Sources.Ramp y( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/Validation/FlowControlled_dpSystem.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/Validation/FlowControlled_dpSystem.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/Validation/FlowControlled_dpSystem.mo" 2021-11-24 08:09:20.991366479 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/Validation/FlowControlled_dpSystem.mo" 2021-11-24 08:10:36.535139427 +0000 @@ -3,9 +3,9 @@ "Demonstration of the use of prescribedPressure" extends Modelica.Icons.Example; package Medium = BuildingSystems.Media.Air; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal= 0.1 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal= 0.1 "Nominal mass flow rate"; - parameter Modelica.SIunits.PressureDifference dp_nominal = 100 + parameter Modelica.Units.SI.PressureDifference dp_nominal = 100 "Nominal pressure difference"; Modelica.Blocks.Sources.Ramp y( duration=0.5, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/Validation/PowerSimplified.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/Validation/PowerSimplified.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/Validation/PowerSimplified.mo" 2021-11-24 08:09:20.991366479 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/Validation/PowerSimplified.mo" 2021-11-24 08:10:36.495139547 +0000 @@ -5,7 +5,7 @@ package Medium = BuildingSystems.Media.Water "Medium model"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=3 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=3 "Nominal mass flow rate"; parameter Data.Pumps.Wilo.Stratos30slash1to8 per "Pump performance data" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/Validation/PumpCurveConstruction.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/Validation/PumpCurveConstruction.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/Validation/PumpCurveConstruction.mo" 2021-11-24 08:09:20.991366479 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/Validation/PumpCurveConstruction.mo" 2021-11-24 08:10:36.423139763 +0000 @@ -5,12 +5,12 @@ package Medium = BuildingSystems.Media.Water "Medium model"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 1 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 1 "Nominal mass flow rate at zero pump head"; - parameter Modelica.SIunits.VolumeFlowRate V_flow_nominal = m_flow_nominal/1000 + parameter Modelica.Units.SI.VolumeFlowRate V_flow_nominal = m_flow_nominal/1000 "Nominal mass flow rate at zero pump head"; - parameter Modelica.SIunits.PressureDifference dp_nominal = 10000 + parameter Modelica.Units.SI.PressureDifference dp_nominal = 10000 "Nominal pump head at zero mass flow rate"; Actuators.Valves.TwoWayLinear val1( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/Validation/SpeedControlled_y_linear.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/Validation/SpeedControlled_y_linear.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/Validation/SpeedControlled_y_linear.mo" 2021-11-24 08:09:20.991366479 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Movers/Validation/SpeedControlled_y_linear.mo" 2021-11-24 08:10:36.327140051 +0000 @@ -4,9 +4,9 @@ extends Modelica.Icons.Example; package Medium = BuildingSystems.Media.Water "Medium model"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 0.5 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 0.5 "Nominal mass flow rate"; - parameter Modelica.SIunits.PressureDifference dp_nominal = 10000 + parameter Modelica.Units.SI.PressureDifference dp_nominal = 10000 "Nominal pressure"; Modelica.Blocks.Sources.Ramp y( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/BaseClasses/PartialDynamicFlowSensor.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/BaseClasses/PartialDynamicFlowSensor.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/BaseClasses/PartialDynamicFlowSensor.mo" 2021-11-24 08:09:20.991366479 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/BaseClasses/PartialDynamicFlowSensor.mo" 2021-11-24 08:10:36.275140207 +0000 @@ -3,7 +3,7 @@ "Partial component to model sensors that measure flow properties using a dynamic model" extends PartialFlowSensor; - parameter Modelica.SIunits.Time tau(min=0) = 1 + parameter Modelica.Units.SI.Time tau(min=0) = 1 "Time constant at nominal flow rate (use tau=0 for steady-state sensor, but see user guide for potential problems)"; parameter Modelica.Blocks.Types.Init initType = Modelica.Blocks.Types.Init.InitialState "Type of initialization (InitialState and InitialOutput are identical)" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/BaseClasses/PartialFlowSensor.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/BaseClasses/PartialFlowSensor.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/BaseClasses/PartialFlowSensor.mo" 2021-11-24 08:09:20.991366479 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/BaseClasses/PartialFlowSensor.mo" 2021-11-24 08:10:36.263140244 +0000 @@ -2,10 +2,10 @@ partial model PartialFlowSensor "Partial component to model sensors that measure flow properties" extends BuildingSystems.Fluid.Interfaces.PartialTwoPort; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal(min=0) + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal(min=0) "Nominal mass flow rate, used for regularization near zero flow" annotation(Dialog(group = "Nominal condition")); - parameter Modelica.SIunits.MassFlowRate m_flow_small(min=0) = 1E-4*m_flow_nominal + parameter Modelica.Units.SI.MassFlowRate m_flow_small(min=0) = 1E-4*m_flow_nominal "For bi-directional flow, temperature is regularized in the region |m_flow| < m_flow_small (m_flow_small > 0 required)" annotation(Dialog(tab="Advanced")); equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/Conversions/To_VolumeFraction.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/Conversions/To_VolumeFraction.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/Conversions/To_VolumeFraction.mo" 2021-11-24 08:09:20.991366479 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/Conversions/To_VolumeFraction.mo" 2021-11-24 08:10:36.199140436 +0000 @@ -1,8 +1,8 @@ within BuildingSystems.Fluid.Sensors.Conversions; model To_VolumeFraction "Conversion from mass fraction to volume fraction" - parameter Modelica.SIunits.MolarMass MMMea "Molar mass of measured substance"; - parameter Modelica.SIunits.MolarMass MMBul=Modelica.Media.IdealGases.Common.SingleGasesData.Air.MM + parameter Modelica.Units.SI.MolarMass MMMea "Molar mass of measured substance"; + parameter Modelica.Units.SI.MolarMass MMBul=Modelica.Media.IdealGases.Common.SingleGasesData.Air.MM "Molar mass of bulk medium"; Modelica.Blocks.Interfaces.RealInput m "Mass fraction" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/Density.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/Density.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/Density.mo" 2021-11-24 08:09:20.991366479 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/Density.mo" 2021-11-24 08:10:36.191140460 +0000 @@ -1,7 +1,7 @@ within BuildingSystems.Fluid.Sensors; model Density "Ideal one port density sensor" extends BuildingSystems.Fluid.Sensors.BaseClasses.PartialAbsoluteSensor; - extends Modelica.Icons.RotationalSensor; + extends Modelica.Icons.RoundSensor; Modelica.Blocks.Interfaces.RealOutput d(final quantity="Density", final unit="kg/m3", min=0) "Density in port medium" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/DensityTwoPort.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/DensityTwoPort.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/DensityTwoPort.mo" 2021-11-24 08:09:20.991366479 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/DensityTwoPort.mo" 2021-11-24 08:10:36.183140483 +0000 @@ -1,7 +1,7 @@ within BuildingSystems.Fluid.Sensors; model DensityTwoPort "Ideal two port density sensor" extends BuildingSystems.Fluid.Sensors.BaseClasses.PartialDynamicFlowSensor; - extends Modelica.Icons.RotationalSensor; + extends Modelica.Icons.RoundSensor; Modelica.Blocks.Interfaces.RealOutput d(final quantity="Density", final unit="kg/m3", min=0) "Density of the passing fluid" @@ -14,13 +14,13 @@ p=p_start, T=T_start, X=X_start)) "Initial or guess value of output (=state)" annotation (Dialog(group="Initialization")); - parameter Modelica.SIunits.Temperature T_start=Medium.T_default + parameter Modelica.Units.SI.Temperature T_start=Medium.T_default "Temperature used to compute d_start" annotation (Dialog(group="Initialization")); - parameter Modelica.SIunits.Pressure p_start=Medium.p_default + parameter Modelica.Units.SI.Pressure p_start=Medium.p_default "Pressure used to compute d_start" annotation (Dialog(group="Initialization")); - parameter Modelica.SIunits.MassFraction X_start[Medium.nX]=Medium.X_default + parameter Modelica.Units.SI.MassFraction X_start[Medium.nX]=Medium.X_default "Mass fraction used to compute d_start" annotation (Dialog(group="Initialization")); protected diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/EnthalpyFlowRate.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/EnthalpyFlowRate.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/EnthalpyFlowRate.mo" 2021-11-24 08:09:20.995366467 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/EnthalpyFlowRate.mo" 2021-11-24 08:10:36.171140520 +0000 @@ -2,14 +2,14 @@ model EnthalpyFlowRate "Ideal enthalphy flow rate sensor" extends BuildingSystems.Fluid.Sensors.BaseClasses.PartialDynamicFlowSensor( tau=0); - extends Modelica.Icons.RotationalSensor; + extends Modelica.Icons.RoundSensor; Modelica.Blocks.Interfaces.RealOutput H_flow(final unit="W") "Enthalpy flow rate, positive if from port_a to port_b" annotation (Placement(transformation( origin={0,110}, extent={{-10,-10},{10,10}}, rotation=90))); - parameter Modelica.SIunits.SpecificEnthalpy h_out_start= + parameter Modelica.Units.SI.SpecificEnthalpy h_out_start= Medium.specificEnthalpy_pTX( p=Medium.p_default, T=Medium.T_default, @@ -17,9 +17,9 @@ "Initial or guess value of measured specific enthalpy" annotation (Dialog(group="Initialization")); protected - Modelica.SIunits.SpecificEnthalpy hMed_out(start=h_out_start) + Modelica.Units.SI.SpecificEnthalpy hMed_out(start=h_out_start) "Medium enthalpy to which the sensor is exposed"; - Modelica.SIunits.SpecificEnthalpy h_out(start=h_out_start) + Modelica.Units.SI.SpecificEnthalpy h_out(start=h_out_start) "Medium enthalpy that is used to compute the enthalpy flow rate"; initial equation if dynamic then diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/EntropyFlowRate.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/EntropyFlowRate.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/EntropyFlowRate.mo" 2021-11-24 08:09:20.995366467 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/EntropyFlowRate.mo" 2021-11-24 08:10:36.163140544 +0000 @@ -2,25 +2,25 @@ model EntropyFlowRate "Ideal entropy flow rate sensor" extends BuildingSystems.Fluid.Sensors.BaseClasses.PartialDynamicFlowSensor( tau=0); - extends Modelica.Icons.RotationalSensor; + extends Modelica.Icons.RoundSensor; Modelica.Blocks.Interfaces.RealOutput S_flow(final unit="W/K") "Entropy flow rate, positive if from port_a to port_b" annotation (Placement(transformation( origin={0,110}, extent={{-10,-10},{10,10}}, rotation=90))); - parameter Modelica.SIunits.SpecificEntropy s_out_start= + parameter Modelica.Units.SI.SpecificEntropy s_out_start= Medium.specificEntropy_pTX( p=Medium.p_default, T=Medium.T_default, X=Medium.X_default) "Initial or guess value of measured specific entropy" annotation (Dialog(group="Initialization")); protected - Modelica.SIunits.SpecificEntropy sMed_out(start=s_out_start) + Modelica.Units.SI.SpecificEntropy sMed_out(start=s_out_start) "Medium entropy to which the sensor is exposed"; - Modelica.SIunits.SpecificEntropy s_out(start=s_out_start) + Modelica.Units.SI.SpecificEntropy s_out(start=s_out_start) "Medium entropy that is used to compute the entropy flow rate"; - Modelica.SIunits.SpecificEntropy port_b_s_outflow(start=s_out_start) + Modelica.Units.SI.SpecificEntropy port_b_s_outflow(start=s_out_start) "Medium entropy outflowing at port_b if mass flow were from port_a to port_b"; initial equation if dynamic then diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/Examples/PPM.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/Examples/PPM.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/Examples/PPM.mo" 2021-11-24 08:09:20.995366467 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/Examples/PPM.mo" 2021-11-24 08:10:36.087140773 +0000 @@ -4,7 +4,7 @@ package Medium = BuildingSystems.Media.Air(extraPropertiesNames={"CO2"}) "Medium model"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = volDyn.V*senPPMTwoPort.tau*3*rho_default + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = volDyn.V*senPPMTwoPort.tau*3*rho_default "Mass flow rate into and out of the volume"; BuildingSystems.Fluid.MixingVolumes.MixingVolume volDyn( @@ -93,10 +93,10 @@ T=Medium.T_default, p=Medium.p_default, X=Medium.X_default[1:Medium.nXi]) "Medium state at default values"; + // Density at medium default values, used to compute the size of control volumes - final parameter Modelica.SIunits.Density rho_default=Medium.density( + final parameter Modelica.Units.SI.Density rho_default=Medium.density( state=state_default) "Density, used to compute fluid mass"; - equation connect(mSou.ports[1], volDyn.ports[1]) annotation (Line(points={{-20,42},{ 77.3333,42},{77.3333,50}}, color={0,127,255})); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/Examples/TraceSubstances.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/Examples/TraceSubstances.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/Examples/TraceSubstances.mo" 2021-11-24 08:09:20.995366467 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/Examples/TraceSubstances.mo" 2021-11-24 08:10:35.995141049 +0000 @@ -4,7 +4,7 @@ package Medium = BuildingSystems.Media.Air(extraPropertiesNames={"CO2"}) "Medium model"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 15*1.2/3600 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 15*1.2/3600 "Mass flow rate into and out of the volume"; MixingVolumes.MixingVolume vol( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/Examples/Velocity.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/Examples/Velocity.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/Examples/Velocity.mo" 2021-11-24 08:09:20.995366467 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/Examples/Velocity.mo" 2021-11-24 08:10:35.979141096 +0000 @@ -4,7 +4,7 @@ package Medium = BuildingSystems.Media.Air "Medium model"; - parameter Modelica.SIunits.Area A = 0.1*0.1/4*Modelica.Constants.pi + parameter Modelica.Units.SI.Area A = 0.1*0.1/4*Modelica.Constants.pi "Cross sectional area of flow channel"; BuildingSystems.Fluid.Sources.Boundary_pT sin( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/LatentEnthalpyFlowRate.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/LatentEnthalpyFlowRate.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/LatentEnthalpyFlowRate.mo" 2021-11-24 08:09:20.995366467 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/LatentEnthalpyFlowRate.mo" 2021-11-24 08:10:35.963141145 +0000 @@ -6,14 +6,14 @@ Modelica.Media.Interfaces.PartialCondensingGases, tau=0); extends BuildingSystems.Fluid.BaseClasses.IndexMassFraction(final substanceName="water"); - extends Modelica.Icons.RotationalSensor; + extends Modelica.Icons.RoundSensor; Modelica.Blocks.Interfaces.RealOutput H_flow(final unit="W") "Latent enthalpy flow rate, positive if from port_a to port_b" annotation (Placement(transformation( origin={0,110}, extent={{-10,-10},{10,10}}, rotation=90))); - parameter Modelica.SIunits.SpecificEnthalpy h_out_start= + parameter Modelica.Units.SI.SpecificEnthalpy h_out_start= Medium.specificEnthalpy_pTX( p=Medium.p_default, T=Medium.T_default, X=Medium.X_default) -Medium.enthalpyOfNonCondensingGas(T=Medium.T_default) @@ -21,9 +21,9 @@ annotation (Dialog(group="Initialization")); protected - Modelica.SIunits.SpecificEnthalpy hMed_out(start=h_out_start) + Modelica.Units.SI.SpecificEnthalpy hMed_out(start=h_out_start) "Medium latent enthalpy to which the sensor is exposed"; - Modelica.SIunits.SpecificEnthalpy h_out(start=h_out_start) + Modelica.Units.SI.SpecificEnthalpy h_out(start=h_out_start) "Medium latent enthalpy that is used to compute the enthalpy flow rate"; Medium.MassFraction XiActual[Medium.nXi] diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/MassFlowRate.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/MassFlowRate.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/MassFlowRate.mo" 2021-11-24 08:09:20.995366467 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/MassFlowRate.mo" 2021-11-24 08:10:35.951141180 +0000 @@ -3,7 +3,7 @@ extends BuildingSystems.Fluid.Sensors.BaseClasses.PartialFlowSensor( final m_flow_nominal = 0, final m_flow_small = 0); -extends Modelica.Icons.RotationalSensor; +extends Modelica.Icons.RoundSensor; Modelica.Blocks.Interfaces.RealOutput m_flow(quantity="MassFlowRate", final unit="kg/s") "Mass flow rate from port_a to port_b" annotation (Placement( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/MassFraction.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/MassFraction.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/MassFraction.mo" 2021-11-24 08:09:20.995366467 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/MassFraction.mo" 2021-11-24 08:10:35.943141205 +0000 @@ -4,7 +4,7 @@ redeclare replaceable package Medium = Modelica.Media.Interfaces.PartialCondensingGases); extends BuildingSystems.Fluid.BaseClasses.IndexMassFraction(substanceName = "water"); - extends Modelica.Icons.RotationalSensor; + extends Modelica.Icons.RoundSensor; Modelica.Blocks.Interfaces.RealOutput X(min=-1e-3, max=1.001, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/MassFractionTwoPort.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/MassFractionTwoPort.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/MassFractionTwoPort.mo" 2021-11-24 08:09:20.995366467 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/MassFractionTwoPort.mo" 2021-11-24 08:10:35.935141229 +0000 @@ -4,7 +4,7 @@ redeclare replaceable package Medium = Modelica.Media.Interfaces.PartialCondensingGases); extends BuildingSystems.Fluid.BaseClasses.IndexMassFraction(substanceName = "water"); - extends Modelica.Icons.RotationalSensor; + extends Modelica.Icons.RoundSensor; parameter Medium.MassFraction X_start=Medium.X_default[i_x] "Initial or guess value of output (= state)" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/PPM.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/PPM.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/PPM.mo" 2021-11-24 08:09:20.995366467 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/PPM.mo" 2021-11-24 08:10:35.923141265 +0000 @@ -6,11 +6,11 @@ each final unit="1", each min=0, each max=1))); - extends Modelica.Icons.RotationalSensor; + extends Modelica.Icons.RoundSensor; parameter String substanceName = "CO2" "Name of trace substance"; - parameter Modelica.SIunits.MolarMass MM= + parameter Modelica.Units.SI.MolarMass MM= Modelica.Media.IdealGases.Common.SingleGasesData.CO2.MM "Molar mass of the trace substance"; @@ -26,7 +26,7 @@ then 1 else 0 for i in 1:Medium.nC} "Vector with zero everywhere except where species is"; - final parameter Modelica.SIunits.MolarMass MMBul=Medium.molarMass( + final parameter Modelica.Units.SI.MolarMass MMBul=Medium.molarMass( Medium.setState_phX( p=Medium.p_default, h=Medium.h_default, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/PPMTwoPort.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/PPMTwoPort.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/PPMTwoPort.mo" 2021-11-24 08:09:20.995366467 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/PPMTwoPort.mo" 2021-11-24 08:10:35.915141289 +0000 @@ -10,13 +10,13 @@ each final unit="1", each min=0, each max=1))); - extends Modelica.Icons.RotationalSensor; + extends Modelica.Icons.RoundSensor; parameter String substanceName = "CO2" "Name of trace substance"; parameter Real C_start(min=0) = 0 "Initial or guess value of output (= state)" annotation (Dialog(group="Initialization")); - parameter Modelica.SIunits.MolarMass MM= + parameter Modelica.Units.SI.MolarMass MM= Modelica.Media.IdealGases.Common.SingleGasesData.CO2.MM "Molar mass of the trace substance"; Modelica.Blocks.Interfaces.RealOutput ppm(min=0) @@ -35,7 +35,7 @@ then 1 else 0 for i in 1:Medium.nC} "Vector with zero everywhere except where species is"; - final parameter Modelica.SIunits.MolarMass MMBul=Medium.molarMass( + final parameter Modelica.Units.SI.MolarMass MMBul=Medium.molarMass( Medium.setState_phX( p=Medium.p_default, h=Medium.h_default, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/Pressure.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/Pressure.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/Pressure.mo" 2021-11-24 08:09:20.995366467 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/Pressure.mo" 2021-11-24 08:10:35.899141337 +0000 @@ -2,7 +2,7 @@ model Pressure "Ideal pressure sensor" extends BuildingSystems.Fluid.Sensors.BaseClasses.PartialAbsoluteSensor( final warnAboutOnePortConnection = false); - extends Modelica.Icons.RotationalSensor; + extends Modelica.Icons.RoundSensor; Modelica.Blocks.Interfaces.RealOutput p(final quantity="AbsolutePressure", final unit="Pa", min=0) "Pressure at port" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/RelativeHumidity.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/RelativeHumidity.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/RelativeHumidity.mo" 2021-11-24 08:09:20.995366467 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/RelativeHumidity.mo" 2021-11-24 08:10:35.895141349 +0000 @@ -1,14 +1,14 @@ within BuildingSystems.Fluid.Sensors; model RelativeHumidity "Ideal one port relative humidity sensor" extends BuildingSystems.Fluid.Sensors.BaseClasses.PartialAbsoluteSensor; - extends Modelica.Icons.RotationalSensor; + extends Modelica.Icons.RoundSensor; Modelica.Blocks.Interfaces.RealOutput phi(final unit="1", min=0) "Relative humidity in port medium" annotation (Placement(transformation(extent={{100,-10},{120,10}}))); protected - Modelica.SIunits.Temperature T "Temperature of the medium"; + Modelica.Units.SI.Temperature T "Temperature of the medium"; Medium.MassFraction Xi[Medium.nXi]( quantity=Medium.substanceNames[1:Medium.nXi]) "Mass fraction of the medium"; equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/RelativeHumidityTwoPort.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/RelativeHumidityTwoPort.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/RelativeHumidityTwoPort.mo" 2021-11-24 08:09:20.995366467 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/RelativeHumidityTwoPort.mo" 2021-11-24 08:10:35.883141384 +0000 @@ -1,7 +1,7 @@ within BuildingSystems.Fluid.Sensors; model RelativeHumidityTwoPort "Ideal two port relative humidity sensor" extends BuildingSystems.Fluid.Sensors.BaseClasses.PartialDynamicFlowSensor; - extends Modelica.Icons.RotationalSensor; + extends Modelica.Icons.RoundSensor; Modelica.Blocks.Interfaces.RealOutput phi(final unit="1", min=0, start=phi_start) @@ -18,14 +18,14 @@ "Relative humidity to which the sensor is exposed to"; protected - Modelica.SIunits.Temperature T_a + Modelica.Units.SI.Temperature T_a "Temperature of the medium flowing from port_a to port_b"; Medium.MassFraction Xi_a[Medium.nXi]( quantity=Medium.substanceNames[1:Medium.nXi]) "Mass fraction of the medium flowing from port_a to port_b"; Real phi_a(final unit="1") "Relative humidity of the medium flowing from port_a to port_b"; - Modelica.SIunits.Temperature T_b + Modelica.Units.SI.Temperature T_b "Temperature of the medium flowing from port_b to port_a"; Medium.MassFraction Xi_b[Medium.nXi]( quantity=Medium.substanceNames[1:Medium.nXi]) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/RelativePressure.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/RelativePressure.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/RelativePressure.mo" 2021-11-24 08:09:20.995366467 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/RelativePressure.mo" 2021-11-24 08:10:35.839141517 +0000 @@ -1,6 +1,6 @@ within BuildingSystems.Fluid.Sensors; model RelativePressure "Ideal relative pressure sensor" - extends Modelica.Icons.TranslationalSensor; + extends Modelica.Icons.RectangularSensor; replaceable package Medium = Modelica.Media.Interfaces.PartialMedium "Medium in the sensor" annotation (choices( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/RelativeTemperature.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/RelativeTemperature.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/RelativeTemperature.mo" 2021-11-24 08:09:20.995366467 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/RelativeTemperature.mo" 2021-11-24 08:10:35.827141553 +0000 @@ -1,6 +1,6 @@ within BuildingSystems.Fluid.Sensors; model RelativeTemperature "Ideal relative temperature sensor" - extends Modelica.Icons.TranslationalSensor; + extends Modelica.Icons.RectangularSensor; replaceable package Medium = Modelica.Media.Interfaces.PartialMedium "Medium in the sensor" annotation (choices( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/SensibleEnthalpyFlowRate.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/SensibleEnthalpyFlowRate.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/SensibleEnthalpyFlowRate.mo" 2021-11-24 08:09:20.995366467 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/SensibleEnthalpyFlowRate.mo" 2021-11-24 08:10:35.815141589 +0000 @@ -6,21 +6,21 @@ Modelica.Media.Interfaces.PartialCondensingGases, tau=0); extends BuildingSystems.Fluid.BaseClasses.IndexMassFraction(final substanceName="water"); - extends Modelica.Icons.RotationalSensor; + extends Modelica.Icons.RoundSensor; Modelica.Blocks.Interfaces.RealOutput H_flow(final unit="W") "Sensible enthalpy flow rate, positive if from port_a to port_b" annotation (Placement(transformation( origin={0,110}, extent={{-10,-10},{10,10}}, rotation=90))); - parameter Modelica.SIunits.SpecificEnthalpy h_out_start= + parameter Modelica.Units.SI.SpecificEnthalpy h_out_start= Medium.enthalpyOfNonCondensingGas(T=Medium.T_default) "Initial or guess value of measured specific sensible enthalpy" annotation (Dialog(group="Initialization")); protected - Modelica.SIunits.SpecificEnthalpy hMed_out(start=h_out_start) + Modelica.Units.SI.SpecificEnthalpy hMed_out(start=h_out_start) "Medium sensible enthalpy to which the sensor is exposed"; - Modelica.SIunits.SpecificEnthalpy h_out(start=h_out_start) + Modelica.Units.SI.SpecificEnthalpy h_out(start=h_out_start) "Medium sensible enthalpy that is used to compute the enthalpy flow rate"; Medium.MassFraction XiActual[Medium.nXi] "Medium mass fraction to which sensor is exposed to"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/SpecificEnthalpy.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/SpecificEnthalpy.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/SpecificEnthalpy.mo" 2021-11-24 08:09:20.995366467 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/SpecificEnthalpy.mo" 2021-11-24 08:10:35.795141649 +0000 @@ -1,7 +1,7 @@ within BuildingSystems.Fluid.Sensors; model SpecificEnthalpy "Ideal one port specific enthalpy sensor" extends BuildingSystems.Fluid.Sensors.BaseClasses.PartialAbsoluteSensor; - extends Modelica.Icons.RotationalSensor; + extends Modelica.Icons.RoundSensor; Modelica.Blocks.Interfaces.RealOutput h_out(final quantity="SpecificEnergy", final unit="J/kg") "Specific enthalpy in port medium" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/SpecificEnthalpyTwoPort.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/SpecificEnthalpyTwoPort.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/SpecificEnthalpyTwoPort.mo" 2021-11-24 08:09:20.995366467 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/SpecificEnthalpyTwoPort.mo" 2021-11-24 08:10:35.783141685 +0000 @@ -1,8 +1,8 @@ within BuildingSystems.Fluid.Sensors; model SpecificEnthalpyTwoPort "Ideal two port sensor for the specific enthalpy" extends BuildingSystems.Fluid.Sensors.BaseClasses.PartialDynamicFlowSensor; - extends Modelica.Icons.RotationalSensor; - parameter Modelica.SIunits.SpecificEnthalpy h_out_start= + extends Modelica.Icons.RoundSensor; + parameter Modelica.Units.SI.SpecificEnthalpy h_out_start= Medium.specificEnthalpy_pTX(p=Medium.p_default, T=Medium.T_default, X=Medium.X_default) "Initial or guess value of output (= state)" annotation (Dialog(group="Initialization")); @@ -15,7 +15,7 @@ extent={{10,-10},{-10,10}}, rotation=270))); protected - Modelica.SIunits.SpecificEnthalpy hMed_out(start=h_out_start) + Modelica.Units.SI.SpecificEnthalpy hMed_out(start=h_out_start) "Medium enthalpy to which the sensor is exposed"; initial equation if dynamic then diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/SpecificEntropy.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/SpecificEntropy.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/SpecificEntropy.mo" 2021-11-24 08:09:20.995366467 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/SpecificEntropy.mo" 2021-11-24 08:10:35.767141733 +0000 @@ -1,7 +1,7 @@ within BuildingSystems.Fluid.Sensors; model SpecificEntropy "Ideal one port specific entropy sensor" extends BuildingSystems.Fluid.Sensors.BaseClasses.PartialAbsoluteSensor; - extends Modelica.Icons.RotationalSensor; + extends Modelica.Icons.RoundSensor; Modelica.Blocks.Interfaces.RealOutput s(final quantity="SpecificEntropy", final unit="J/(kg.K)") "Specific entropy in port medium" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/SpecificEntropyTwoPort.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/SpecificEntropyTwoPort.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/SpecificEntropyTwoPort.mo" 2021-11-24 08:09:20.995366467 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/SpecificEntropyTwoPort.mo" 2021-11-24 08:10:35.755141769 +0000 @@ -1,8 +1,8 @@ within BuildingSystems.Fluid.Sensors; model SpecificEntropyTwoPort "Ideal two port sensor for the specific entropy" extends BuildingSystems.Fluid.Sensors.BaseClasses.PartialDynamicFlowSensor; - extends Modelica.Icons.RotationalSensor; - parameter Modelica.SIunits.SpecificEntropy s_start= + extends Modelica.Icons.RoundSensor; + parameter Modelica.Units.SI.SpecificEntropy s_start= Medium.specificEntropy_pTX(p=Medium.p_default, T=Medium.T_default, X=Medium.X_default) "Initial or guess value of output (= state)" annotation (Dialog(group="Initialization")); @@ -15,7 +15,7 @@ extent={{10,-10},{-10,10}}, rotation=270))); protected - Modelica.SIunits.SpecificEntropy sMed(start=s_start) + Modelica.Units.SI.SpecificEntropy sMed(start=s_start) "Medium entropy to which the sensor is exposed"; Medium.SpecificEntropy s_a_inflow "Specific entropy of inflowing fluid at port_a"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/TemperatureTwoPort.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/TemperatureTwoPort.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/TemperatureTwoPort.mo" 2021-11-24 08:09:20.995366467 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/TemperatureTwoPort.mo" 2021-11-24 08:10:35.739141818 +0000 @@ -11,20 +11,20 @@ origin={0,110}, extent={{10,-10},{-10,10}}, rotation=270))); - parameter Modelica.SIunits.Temperature T_start=Medium.T_default + parameter Modelica.Units.SI.Temperature T_start=Medium.T_default "Initial or guess value of output (= state)" annotation (Dialog(group="Initialization")); parameter Boolean transferHeat = false "if true, temperature T converges towards TAmb when no flow" annotation(Evaluate=true, Dialog(group="Heat transfer")); - parameter Modelica.SIunits.Temperature TAmb=Medium.T_default + + parameter Modelica.Units.SI.Temperature TAmb=Medium.T_default "Fixed ambient temperature for heat transfer" annotation(Dialog(enable=transferHeat, group="Heat transfer")); - parameter Modelica.SIunits.Time tauHeaTra(min=1)=1200 + parameter Modelica.Units.SI.Time tauHeaTra(min=1)=1200 "Time constant for heat transfer, default 20 minutes" annotation(Dialog(enable=transferHeat, group="Heat transfer")); - protected parameter Real tauHeaTraInv(final unit = "1/s")= if tauHeaTra<1E-10 then 0 else 1/tauHeaTra diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/TemperatureWetBulbTwoPort.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/TemperatureWetBulbTwoPort.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/TemperatureWetBulbTwoPort.mo" 2021-11-24 08:09:20.995366467 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/TemperatureWetBulbTwoPort.mo" 2021-11-24 08:10:35.715141890 +0000 @@ -13,7 +13,7 @@ extent={{-10,-10},{10,10}}, rotation=90, origin={0,110}))); - parameter Modelica.SIunits.Temperature TWetBul_start = Medium.T_default + parameter Modelica.Units.SI.Temperature TWetBul_start = Medium.T_default "Initial or guess value of wet bulb temperature (used to compute initial output signal))" annotation (Dialog(group="Initialization")); @@ -23,7 +23,7 @@ BuildingSystems.Utilities.Psychrometrics.TWetBul_TDryBulXi wetBulMod( redeclare package Medium = Medium, TWetBul(start=TWetBul_start)) "Block for wet bulb temperature"; - Modelica.SIunits.SpecificEnthalpy h "Specific enthalpy"; + Modelica.Units.SI.SpecificEnthalpy h "Specific enthalpy"; Medium.MassFraction Xi[Medium.nXi] "Species vector, needed because indexed argument for the operator inStream is not supported"; initial equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/TraceSubstances.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/TraceSubstances.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/TraceSubstances.mo" 2021-11-24 08:09:20.995366467 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/TraceSubstances.mo" 2021-11-24 08:10:35.699141937 +0000 @@ -1,7 +1,7 @@ within BuildingSystems.Fluid.Sensors; model TraceSubstances "Ideal one port trace substances sensor" extends BuildingSystems.Fluid.Sensors.BaseClasses.PartialAbsoluteSensor; - extends Modelica.Icons.RotationalSensor; + extends Modelica.Icons.RoundSensor; parameter String substanceName = "CO2" "Name of trace substance"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/TraceSubstancesTwoPort.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/TraceSubstancesTwoPort.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/TraceSubstancesTwoPort.mo" 2021-11-24 08:09:20.995366467 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/TraceSubstancesTwoPort.mo" 2021-11-24 08:10:35.687141974 +0000 @@ -1,7 +1,7 @@ within BuildingSystems.Fluid.Sensors; model TraceSubstancesTwoPort "Ideal two port sensor for trace substance" extends BuildingSystems.Fluid.Sensors.BaseClasses.PartialDynamicFlowSensor; - extends Modelica.Icons.RotationalSensor; + extends Modelica.Icons.RoundSensor; Modelica.Blocks.Interfaces.RealOutput C(min=0, start=C_start) "Trace substance of the passing fluid" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/Velocity.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/Velocity.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/Velocity.mo" 2021-11-24 08:09:20.995366467 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/Velocity.mo" 2021-11-24 08:10:35.671142022 +0000 @@ -1,23 +1,23 @@ within BuildingSystems.Fluid.Sensors; model Velocity "Ideal sensor for flow velocity" extends BuildingSystems.Fluid.Sensors.BaseClasses.PartialDynamicFlowSensor; - extends Modelica.Icons.RotationalSensor; + extends Modelica.Icons.RoundSensor; parameter Medium.Density d_start=Medium.density(Medium.setState_pTX(p_start, T_start, X_start)) "Initial or guess value of density" annotation (Dialog(group="Initialization")); - parameter Modelica.SIunits.Temperature T_start=Medium.T_default + parameter Modelica.Units.SI.Temperature T_start=Medium.T_default "Temperature used to compute d_start" annotation (Dialog(group="Initialization")); - parameter Modelica.SIunits.Pressure p_start=Medium.p_default + parameter Modelica.Units.SI.Pressure p_start=Medium.p_default "Pressure used to compute d_start" annotation (Dialog(group="Initialization")); - parameter Modelica.SIunits.MassFraction X_start[Medium.nX]=Medium.X_default + parameter Modelica.Units.SI.MassFraction X_start[Medium.nX]=Medium.X_default "Mass fraction used to compute d_start" annotation (Dialog(group="Initialization")); - parameter Modelica.SIunits.Area A "Cross sectional area of flow channel"; - Modelica.SIunits.VolumeFlowRate V_flow + parameter Modelica.Units.SI.Area A "Cross sectional area of flow channel"; + Modelica.Units.SI.VolumeFlowRate V_flow "Volume flow rate from port_a to port_b"; Modelica.Blocks.Interfaces.RealOutput v(final quantity="Velocity", final unit="m/s") diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/VolumeFlowRate.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/VolumeFlowRate.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/VolumeFlowRate.mo" 2021-11-24 08:09:20.995366467 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sensors/VolumeFlowRate.mo" 2021-11-24 08:10:35.655142069 +0000 @@ -2,18 +2,18 @@ model VolumeFlowRate "Ideal sensor for volume flow rate" extends BuildingSystems.Fluid.Sensors.BaseClasses.PartialDynamicFlowSensor( tau=0); - extends Modelica.Icons.RotationalSensor; + extends Modelica.Icons.RoundSensor; parameter Medium.Density d_start=Medium.density(Medium.setState_pTX(p_start, T_start, X_start)) "Initial or guess value of density" annotation (Dialog(group="Initialization")); - parameter Modelica.SIunits.Temperature T_start=Medium.T_default + parameter Modelica.Units.SI.Temperature T_start=Medium.T_default "Temperature used to compute d_start" annotation (Dialog(group="Initialization")); - parameter Modelica.SIunits.Pressure p_start=Medium.p_default + parameter Modelica.Units.SI.Pressure p_start=Medium.p_default "Pressure used to compute d_start" annotation (Dialog(group="Initialization")); - parameter Modelica.SIunits.MassFraction X_start[Medium.nX]=Medium.X_default + parameter Modelica.Units.SI.MassFraction X_start[Medium.nX]=Medium.X_default "Mass fraction used to compute d_start" annotation (Dialog(group="Initialization")); Modelica.Blocks.Interfaces.RealOutput V_flow(final quantity="VolumeFlowRate", diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sources/MassFlowSource_T.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sources/MassFlowSource_T.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sources/MassFlowSource_T.mo" 2021-11-24 08:09:20.995366467 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sources/MassFlowSource_T.mo" 2021-11-24 08:10:35.451142682 +0000 @@ -6,7 +6,7 @@ parameter Boolean use_m_flow_in = false "Get the mass flow rate from the input connector" annotation(Evaluate=true, HideResult=true, Dialog(group="Conditional inputs")); - parameter Modelica.SIunits.MassFlowRate m_flow = 0 + parameter Modelica.Units.SI.MassFlowRate m_flow = 0 "Fixed mass flow rate going out of the fluid port" annotation (Dialog(enable = not use_m_flow_in,group="Fixed inputs")); parameter Boolean use_T_in= false diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sources/MassFlowSource_WeatherData.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sources/MassFlowSource_WeatherData.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sources/MassFlowSource_WeatherData.mo" 2021-11-24 08:09:20.995366467 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sources/MassFlowSource_WeatherData.mo" 2021-11-24 08:10:35.439142718 +0000 @@ -9,7 +9,7 @@ parameter Boolean use_C_in = false "Get the trace substances from the input connector" annotation(Evaluate=true, HideResult=true); - parameter Modelica.SIunits.MassFlowRate m_flow = 0 + parameter Modelica.Units.SI.MassFlowRate m_flow = 0 "Fixed mass flow rate going out of the fluid port" annotation (Dialog(enable = not use_m_flow_in)); parameter Medium.ExtraProperty C[Medium.nC]( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sources/MassFlowSource_h.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sources/MassFlowSource_h.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sources/MassFlowSource_h.mo" 2021-11-24 08:09:20.995366467 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sources/MassFlowSource_h.mo" 2021-11-24 08:10:35.427142754 +0000 @@ -6,7 +6,7 @@ parameter Boolean use_m_flow_in = false "Get the mass flow rate from the input connector" annotation(Evaluate=true, HideResult=true, Dialog(group="Conditional inputs")); - parameter Modelica.SIunits.MassFlowRate m_flow = 0 + parameter Modelica.Units.SI.MassFlowRate m_flow = 0 "Fixed mass flow rate going out of the fluid port" annotation (Dialog(enable = not use_m_flow_in,group="Fixed inputs")); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sources/Outside_CpLowRise.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sources/Outside_CpLowRise.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sources/Outside_CpLowRise.mo" 2021-11-24 08:09:20.995366467 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sources/Outside_CpLowRise.mo" 2021-11-24 08:10:35.411142803 +0000 @@ -7,12 +7,12 @@ "Wind pressure coefficient for wind normal to wall"; parameter Real s(final min=0, final unit="1") "Side ratio, s=length of this wall/length of adjacent wall"; - parameter Modelica.SIunits.Angle azi "Surface azimuth (South:0, West:pi/2)" + parameter Modelica.Units.SI.Angle azi "Surface azimuth (South:0, West:pi/2)" annotation (choicesAllMatching=true); - Modelica.SIunits.Angle alpha "Wind incidence angle (0: normal to wall)"; + Modelica.Units.SI.Angle alpha "Wind incidence angle (0: normal to wall)"; Real CpAct(min=0, final unit="1") "Actual wind pressure coefficient"; - Modelica.SIunits.Pressure pWin(displayUnit="Pa") + Modelica.Units.SI.Pressure pWin(displayUnit="Pa") "Change in pressure due to wind force"; protected Modelica.Blocks.Interfaces.RealInput pWea(min=0, nominal=1E5, final unit="Pa") @@ -27,7 +27,7 @@ Modelica.Blocks.Interfaces.RealInput winDir(final unit="rad", displayUnit="deg") "Wind direction from weather bus"; - Modelica.SIunits.Angle surOut = azi-Modelica.Constants.pi + Modelica.Units.SI.Angle surOut = azi-Modelica.Constants.pi "Angle of surface that is used to compute angle of attack of wind"; Modelica.Blocks.Interfaces.RealInput d = Medium.density( Medium.setState_pTX(p_in_internal, T_in_internal, X_in_internal)); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sources/TraceSubstancesFlowSource.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sources/TraceSubstancesFlowSource.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sources/TraceSubstancesFlowSource.mo" 2021-11-24 08:09:20.995366467 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sources/TraceSubstancesFlowSource.mo" 2021-11-24 08:10:35.391142863 +0000 @@ -15,7 +15,7 @@ "Get the trace substance mass flow rate from the input connector" annotation(Evaluate=true, HideResult=true); - parameter Modelica.SIunits.MassFlowRate m_flow = 0 + parameter Modelica.Units.SI.MassFlowRate m_flow = 0 "Fixed mass flow rate going out of the fluid port" annotation (Dialog(enable = not use_m_flow_in)); Modelica.Blocks.Interfaces.RealInput m_flow_in(final unit="kg/s") if @@ -39,13 +39,13 @@ Modelica.Blocks.Interfaces.RealInput m_flow_in_internal(final unit="kg/s") "Needed to connect to conditional connector"; - Modelica.SIunits.SpecificEnthalpy h_default= + + Modelica.Units.SI.SpecificEnthalpy h_default= Medium.specificEnthalpy(Medium.setState_pTX( Medium.p_default, Medium.T_default, Medium.X_default)) "Enthalpy of outstreaming medium"; - initial equation assert(sum(C_in_internal) > 1E-4, "Trace substance '" + substanceName + "' is not present in medium '" + Medium.mediumName + "'.\n" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sources/Validation/BaseClasses/BoundarySystem.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sources/Validation/BaseClasses/BoundarySystem.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sources/Validation/BaseClasses/BoundarySystem.mo" 2021-11-24 08:09:20.995366467 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Sources/Validation/BaseClasses/BoundarySystem.mo" 2021-11-24 08:10:35.363142947 +0000 @@ -11,10 +11,10 @@ m_flow=-1, nPorts=1) "Mass flow source" annotation (Placement(transformation(extent={{60,-10},{40,10}}))); - Modelica.SIunits.Temperature T = senTem.T "Temperature coming out of the source"; - Modelica.SIunits.MassFraction Xi[Medium.nXi]=sou.ports[1].Xi_outflow + Modelica.Units.SI.Temperature T = senTem.T "Temperature coming out of the source"; + Modelica.Units.SI.MassFraction Xi[Medium.nXi]=sou.ports[1].Xi_outflow "Mass fraction coming out of the source"; - Modelica.SIunits.Pressure p = sou.ports[1].p "Pressure in the source"; + Modelica.Units.SI.Pressure p = sou.ports[1].p "Pressure in the source"; Modelica.Fluid.Sensors.TemperatureTwoPort senTem( redeclare package Medium = Medium, allowFlowReversal=false, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Storage/BaseClasses/Buoyancy.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Storage/BaseClasses/Buoyancy.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Storage/BaseClasses/Buoyancy.mo" 2021-11-24 08:09:20.995366467 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Storage/BaseClasses/Buoyancy.mo" 2021-11-24 08:10:35.287143175 +0000 @@ -5,27 +5,27 @@ replaceable package Medium = Modelica.Media.Interfaces.PartialMedium "Medium model" annotation ( choicesAllMatching = true); - parameter Modelica.SIunits.Volume V "Volume"; + parameter Modelica.Units.SI.Volume V "Volume"; parameter Integer nSeg(min=2) = 2 "Number of volume segments"; - parameter Modelica.SIunits.Time tau(min=0) "Time constant for mixing"; + parameter Modelica.Units.SI.Time tau(min=0) "Time constant for mixing"; Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a[nSeg] heatPort "Heat input into the volumes" annotation (Placement(transformation(extent={{90,-10},{110,10}}))); - Modelica.SIunits.HeatFlowRate[nSeg-1] Q_flow + Modelica.Units.SI.HeatFlowRate[nSeg-1] Q_flow "Heat flow rate from segment i+1 to i"; protected parameter Medium.ThermodynamicState sta_default = Medium.setState_pTX(T=Medium.T_default, p=Medium.p_default, X=Medium.X_default[1:Medium.nXi]) "Medium state at default properties"; - parameter Modelica.SIunits.Density rho_default=Medium.density(sta_default) + parameter Modelica.Units.SI.Density rho_default=Medium.density(sta_default) "Density, used to compute fluid mass"; - parameter Modelica.SIunits.SpecificHeatCapacity cp_default=Medium.specificHeatCapacityCp(sta_default) + parameter Modelica.Units.SI.SpecificHeatCapacity cp_default=Medium.specificHeatCapacityCp(sta_default) "Specific heat capacity"; parameter Real k(unit="W/K") = V*rho_default*cp_default/tau/nSeg "Proportionality constant, since we use dT instead of dH"; - Modelica.SIunits.TemperatureDifference dT[nSeg-1] + Modelica.Units.SI.TemperatureDifference dT[nSeg-1] "Temperature difference between adjoining volumes"; equation for i in 1:nSeg-1 loop diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Storage/BaseClasses/IndirectTankHeatExchanger.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Storage/BaseClasses/IndirectTankHeatExchanger.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Storage/BaseClasses/IndirectTankHeatExchanger.mo" 2021-11-24 08:09:20.995366467 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Storage/BaseClasses/IndirectTankHeatExchanger.mo" 2021-11-24 08:10:35.263143247 +0000 @@ -18,28 +18,28 @@ annotation(HideResult=true); parameter Integer nSeg(min=2) "Number of segments in the heat exchanger"; - parameter Modelica.SIunits.HeatCapacity CHex + parameter Modelica.Units.SI.HeatCapacity CHex "Capacitance of the heat exchanger"; - parameter Modelica.SIunits.Volume volHexFlu + parameter Modelica.Units.SI.Volume volHexFlu "Volume of heat transfer fluid in the heat exchanger"; - parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal + parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal "Heat transfer at nominal conditions" annotation(Dialog(tab="General", group="Nominal condition")); - final parameter Modelica.SIunits.ThermalConductance UA_nominal= + final parameter Modelica.Units.SI.ThermalConductance UA_nominal= abs(Q_flow_nominal/(THex_nominal-TTan_nominal)) "Nominal UA value for the heat exchanger"; - parameter Modelica.SIunits.Temperature TTan_nominal + parameter Modelica.Units.SI.Temperature TTan_nominal "Temperature of fluid inside the tank at UA_nominal" annotation(Dialog(tab="General", group="Nominal condition")); - parameter Modelica.SIunits.Temperature THex_nominal + parameter Modelica.Units.SI.Temperature THex_nominal "Temperature of fluid inside the heat exchanger at UA_nominal" annotation(Dialog(tab="General", group="Nominal condition")); parameter Real r_nominal(min=0, max=1)=0.5 "Ratio between coil inside and outside convective heat transfer" annotation(Dialog(tab="General", group="Nominal condition")); - parameter Modelica.SIunits.Diameter dExtHex + parameter Modelica.Units.SI.Diameter dExtHex "Exterior diameter of the heat exchanger pipe"; parameter Modelica.Fluid.Types.Dynamics energyDynamics=Modelica.Fluid.Types.Dynamics.DynamicFreeInitial diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Storage/BaseClasses/PartialStratified.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Storage/BaseClasses/PartialStratified.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Storage/BaseClasses/PartialStratified.mo" 2021-11-24 08:09:20.995366467 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Storage/BaseClasses/PartialStratified.mo" 2021-11-24 08:10:35.235143331 +0000 @@ -5,10 +5,10 @@ import Modelica.Fluid.Types; import Modelica.Fluid.Types.Dynamics; - parameter Modelica.SIunits.Volume VTan "Tank volume"; - parameter Modelica.SIunits.Length hTan "Height of tank (without insulation)"; - parameter Modelica.SIunits.Length dIns "Thickness of insulation"; - parameter Modelica.SIunits.ThermalConductivity kIns = 0.04 + parameter Modelica.Units.SI.Volume VTan "Tank volume"; + parameter Modelica.Units.SI.Length hTan "Height of tank (without insulation)"; + parameter Modelica.Units.SI.Length dIns "Thickness of insulation"; + parameter Modelica.Units.SI.ThermalConductivity kIns = 0.04 "Specific heat conductivity of insulation"; parameter Integer nSeg(min=2) = 2 "Number of volume segments"; @@ -28,7 +28,7 @@ parameter Medium.Temperature T_start=Medium.T_default "Start value of temperature" annotation(Dialog(tab = "Initialization")); - parameter Modelica.SIunits.Temperature TFlu_start[nSeg]=T_start*ones(nSeg) + parameter Modelica.Units.SI.Temperature TFlu_start[nSeg]=T_start*ones(nSeg) "Initial temperature of the tank segments, with TFlu_start[1] being the top segment" annotation(Dialog(tab = "Initialization")); parameter Medium.MassFraction X_start[Medium.nX] = Medium.X_default @@ -40,7 +40,7 @@ annotation (Dialog(tab="Initialization", enable=Medium.nC > 0)); // Dynamics - parameter Modelica.SIunits.Time tau=1 "Time constant for mixing"; + parameter Modelica.Units.SI.Time tau=1 "Time constant for mixing"; //////////////////////////////////////////////////////////////////// // Connectors @@ -84,15 +84,15 @@ T=Medium.T_default, p=Medium.p_default, X=Medium.X_default[1:Medium.nXi]) "Medium state at default properties"; - parameter Modelica.SIunits.Length hSeg = hTan / nSeg + parameter Modelica.Units.SI.Length hSeg = hTan / nSeg "Height of a tank segment"; - parameter Modelica.SIunits.Area ATan = VTan/hTan + parameter Modelica.Units.SI.Area ATan = VTan/hTan "Tank cross-sectional area (without insulation)"; - parameter Modelica.SIunits.Length rTan = sqrt(ATan/Modelica.Constants.pi) + parameter Modelica.Units.SI.Length rTan = sqrt(ATan/Modelica.Constants.pi) "Tank diameter (without insulation)"; - parameter Modelica.SIunits.ThermalConductance conFluSeg = ATan*Medium.thermalConductivity(sta_default)/hSeg + parameter Modelica.Units.SI.ThermalConductance conFluSeg = ATan*Medium.thermalConductivity(sta_default)/hSeg "Thermal conductance between fluid volumes"; - parameter Modelica.SIunits.ThermalConductance conTopSeg = ATan*kIns/dIns + parameter Modelica.Units.SI.ThermalConductance conTopSeg = ATan*kIns/dIns "Thermal conductance from center of top (or bottom) volume through tank insulation at top (or bottom)"; BaseClasses.Buoyancy buo( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Storage/BaseClasses/ThirdOrderStratifier.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Storage/BaseClasses/ThirdOrderStratifier.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Storage/BaseClasses/ThirdOrderStratifier.mo" 2021-11-24 08:09:20.995366467 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Storage/BaseClasses/ThirdOrderStratifier.mo" 2021-11-24 08:10:35.207143415 +0000 @@ -6,7 +6,7 @@ replaceable package Medium = Modelica.Media.Interfaces.PartialMedium "Medium model" annotation (choicesAllMatching=true); - parameter Modelica.SIunits.MassFlowRate m_flow_small(min=0) + parameter Modelica.Units.SI.MassFlowRate m_flow_small(min=0) "Small mass flow rate for regularization of zero flow"; parameter Integer nSeg(min=4) "Number of volume segments"; @@ -32,11 +32,11 @@ annotation (Placement(transformation(extent={{-110,-10},{-90,10}}))); protected - Modelica.SIunits.SpecificEnthalpy[nSeg + 1] hOut + Modelica.Units.SI.SpecificEnthalpy[nSeg + 1] hOut "Extended vector with new outlet enthalpies to reduce numerical dissipation (at the boundary between two volumes)"; - Modelica.SIunits.SpecificEnthalpy[nSeg + 2] h + Modelica.Units.SI.SpecificEnthalpy[nSeg + 2] h "Extended vector with port enthalpies, needed to simplify loop"; - Modelica.SIunits.HeatFlowRate Q_flow[nSeg] + Modelica.Units.SI.HeatFlowRate Q_flow[nSeg] "Heat exchange computed using upwind third order discretization scheme"; // Modelica.SIunits.HeatFlowRate Q_flow_upWind // "Heat exchange computed using upwind third order discretization scheme"; //Used to test the energy conservation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Storage/Examples/Stratified.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Storage/Examples/Stratified.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Storage/Examples/Stratified.mo" 2021-11-24 08:09:20.995366467 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Storage/Examples/Stratified.mo" 2021-11-24 08:10:35.179143499 +0000 @@ -67,7 +67,7 @@ "Pressure boundary condition" annotation (Placement(transformation(extent={{20,60},{40,80}}))); Modelica.Blocks.Sources.Sine sine( - freqHz=1/86400, + f =1/86400, amplitude=10, offset=273.15 + 20) annotation (Placement(transformation(extent={{-90,62},{ -70,82}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Storage/Examples/StratifiedEnhancedInternalHex.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Storage/Examples/StratifiedEnhancedInternalHex.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Storage/Examples/StratifiedEnhancedInternalHex.mo" 2021-11-24 08:09:20.995366467 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Storage/Examples/StratifiedEnhancedInternalHex.mo" 2021-11-24 08:10:35.155143571 +0000 @@ -6,10 +6,10 @@ package MediumTan = BuildingSystems.Media.Water "Medium in the tank"; package MediumHex = BuildingSystems.Media.Water "Medium in the heat exchanger"; - parameter Modelica.SIunits.PressureDifference dpHex_nominal=2500 + parameter Modelica.Units.SI.PressureDifference dpHex_nominal=2500 "Pressure drop across the heat exchanger at nominal conditions"; - parameter Modelica.SIunits.MassFlowRate mHex_flow_nominal = 0.278 + parameter Modelica.Units.SI.MassFlowRate mHex_flow_nominal = 0.278 "Mass flow rate of heat exchanger"; BuildingSystems.Fluid.Sources.Boundary_pT bouWat(redeclare package Medium = diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Storage/Examples/StratifiedUnloadAtMinimumTemperature.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Storage/Examples/StratifiedUnloadAtMinimumTemperature.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Storage/Examples/StratifiedUnloadAtMinimumTemperature.mo" 2021-11-24 08:09:20.995366467 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Storage/Examples/StratifiedUnloadAtMinimumTemperature.mo" 2021-11-24 08:10:35.135143632 +0000 @@ -4,9 +4,9 @@ extends Modelica.Icons.Example; package Medium = BuildingSystems.Media.Water "Medium model"; - parameter Modelica.SIunits.Volume VTan=3 "Tank volume"; + parameter Modelica.Units.SI.Volume VTan=3 "Tank volume"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 3*1000/3600 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 3*1000/3600 "Nominal mass flow rate"; constant Integer nSeg=5 "Number of volume segments"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Storage/ExpansionVessel.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Storage/ExpansionVessel.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Storage/ExpansionVessel.mo" 2021-11-24 08:09:20.995366467 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Storage/ExpansionVessel.mo" 2021-11-24 08:10:35.039143920 +0000 @@ -4,28 +4,28 @@ final energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial, final massDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial, final mSenFac=1); - parameter Modelica.SIunits.Volume V_start(start=1) + parameter Modelica.Units.SI.Volume V_start(start=1) "Volume of liquid stored in the vessel at the start of the simulation"; - parameter Modelica.SIunits.Pressure p = Medium.p_default + parameter Modelica.Units.SI.Pressure p = Medium.p_default "Constant pressure of the expansion vessel"; Modelica.Fluid.Interfaces.FluidPort_a port_a( redeclare package Medium = Medium) "Fluid port" annotation (Placement(transformation(extent={{-10,-110},{10,-90}}))); - Modelica.SIunits.Mass m "Mass of liquid in the vessel"; + Modelica.Units.SI.Mass m "Mass of liquid in the vessel"; protected final parameter Medium.ThermodynamicState state_start = Medium.setState_pTX( T=T_start, p=p_start, X=X_start[1:Medium.nXi]) "Medium state at start values"; - final parameter Modelica.SIunits.Density rho_start=Medium.density( + final parameter Modelica.Units.SI.Density rho_start=Medium.density( state=state_start) "Density, used to compute start and guess values"; - Modelica.SIunits.Energy H "Internal energy of fluid"; - Modelica.SIunits.Mass[Medium.nXi] mXi + Modelica.Units.SI.Energy H "Internal energy of fluid"; + Modelica.Units.SI.Mass[Medium.nXi] mXi "Masses of independent components in the fluid"; - Modelica.SIunits.Mass[Medium.nC] mC "Masses of trace substances in the fluid"; + Modelica.Units.SI.Mass[Medium.nC] mC "Masses of trace substances in the fluid"; Medium.ExtraProperty C[Medium.nC](nominal=C_nominal) "Trace substance mixture content"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Storage/StratifiedEnhancedInternalHex.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Storage/StratifiedEnhancedInternalHex.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Storage/StratifiedEnhancedInternalHex.mo" 2021-11-24 08:09:20.995366467 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Storage/StratifiedEnhancedInternalHex.mo" 2021-11-24 08:10:35.007144015 +0000 @@ -7,11 +7,11 @@ Modelica.Media.Interfaces.PartialMedium "Medium in the heat exchanger" annotation(Dialog(tab="General", group="Heat exchanger")); - parameter Modelica.SIunits.Height hHex_a + parameter Modelica.Units.SI.Height hHex_a "Height of portHex_a of the heat exchanger, measured from tank bottom" annotation(Dialog(tab="General", group="Heat exchanger")); - parameter Modelica.SIunits.Height hHex_b + parameter Modelica.Units.SI.Height hHex_b "Height of portHex_b of the heat exchanger, measured from tank bottom" annotation(Dialog(tab="General", group="Heat exchanger")); @@ -19,28 +19,28 @@ "Number of heat exchanger segments in each tank segment" annotation(Dialog(tab="General", group="Heat exchanger")); - parameter Modelica.SIunits.Diameter dExtHex = 0.025 + parameter Modelica.Units.SI.Diameter dExtHex = 0.025 "Exterior diameter of the heat exchanger pipe" annotation(Dialog(group="Heat exchanger")); - parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal + parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal "Heat transfer at nominal conditions" annotation(Dialog(tab="General", group="Heat exchanger")); - parameter Modelica.SIunits.Temperature TTan_nominal + parameter Modelica.Units.SI.Temperature TTan_nominal "Temperature of fluid inside the tank at nominal heat transfer conditions" annotation(Dialog(tab="General", group="Heat exchanger")); - parameter Modelica.SIunits.Temperature THex_nominal + parameter Modelica.Units.SI.Temperature THex_nominal "Temperature of fluid inside the heat exchanger at nominal heat transfer conditions" annotation(Dialog(tab="General", group="Heat exchanger")); parameter Real r_nominal(min=0, max=1)=0.5 "Ratio between coil inside and outside convective heat transfer at nominal heat transfer conditions" annotation(Dialog(tab="General", group="Heat exchanger")); - parameter Modelica.SIunits.MassFlowRate mHex_flow_nominal + parameter Modelica.Units.SI.MassFlowRate mHex_flow_nominal "Nominal mass flow rate through the heat exchanger" annotation(Dialog(group="Heat exchanger")); - parameter Modelica.SIunits.PressureDifference dpHex_nominal(displayUnit="Pa") = 2500 + parameter Modelica.Units.SI.PressureDifference dpHex_nominal(displayUnit="Pa") = 2500 "Pressure drop across the heat exchanger at nominal conditions" annotation(Dialog(group="Heat exchanger")); @@ -71,25 +71,25 @@ "Formulation of energy balance for heat exchanger solid mass" annotation(Evaluate=true, Dialog(tab = "Dynamics heat exchanger", group="Equations")); - parameter Modelica.SIunits.Length lHex= + parameter Modelica.Units.SI.Length lHex= rTan*abs(segHex_a-segHex_b)*Modelica.Constants.pi "Approximate length of the heat exchanger" annotation(Dialog(tab = "Dynamics heat exchanger", group="Equations")); - parameter Modelica.SIunits.Area ACroHex= + parameter Modelica.Units.SI.Area ACroHex= (dExtHex^2-(0.8*dExtHex)^2)*Modelica.Constants.pi/4 "Cross sectional area of the heat exchanger" annotation(Dialog(tab = "Dynamics heat exchanger", group="Equations")); - parameter Modelica.SIunits.SpecificHeatCapacity cHex=490 + parameter Modelica.Units.SI.SpecificHeatCapacity cHex=490 "Specific heat capacity of the heat exchanger material" annotation(Dialog(tab = "Dynamics heat exchanger", group="Equations")); - parameter Modelica.SIunits.Density dHex=8000 + parameter Modelica.Units.SI.Density dHex=8000 "Density of the heat exchanger material" annotation(Dialog(tab = "Dynamics heat exchanger", group="Equations")); - parameter Modelica.SIunits.HeatCapacity CHex= + parameter Modelica.Units.SI.HeatCapacity CHex= ACroHex*lHex*dHex*cHex "Capacitance of the heat exchanger without the fluid" annotation(Dialog(tab = "Dynamics heat exchanger", group="Equations")); @@ -138,7 +138,7 @@ rotation=180, origin={-87,32}))); - Modelica.SIunits.HeatFlowRate QHex_flow = -sum(indTanHex.port.Q_flow) + Modelica.Units.SI.HeatFlowRate QHex_flow = -sum(indTanHex.port.Q_flow) "Heat transferred from the heat exchanger to the tank"; protected final parameter Integer segHex_a = nSeg-integer(hHex_a/segHeight) @@ -149,13 +149,13 @@ "Tank segment in which port b1 of the heat exchanger is located in" annotation(Evaluate=true, Dialog(group="Heat exchanger")); - final parameter Modelica.SIunits.Height segHeight = hTan/nSeg + final parameter Modelica.Units.SI.Height segHeight = hTan/nSeg "Height of each tank segment (relative to bottom of same segment)"; - final parameter Modelica.SIunits.Length dHHex = abs(hHex_a-hHex_b) + final parameter Modelica.Units.SI.Length dHHex = abs(hHex_a-hHex_b) "Vertical distance between the heat exchanger inlet and outlet"; - final parameter Modelica.SIunits.Volume volHexFlu= + final parameter Modelica.Units.SI.Volume volHexFlu= Modelica.Constants.pi * (0.8*dExtHex)^2/4 *lHex "Volume of the heat exchanger"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Storage/Validation/HeatExchangerDynamics.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Storage/Validation/HeatExchangerDynamics.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Storage/Validation/HeatExchangerDynamics.mo" 2021-11-24 08:09:20.995366467 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Storage/Validation/HeatExchangerDynamics.mo" 2021-11-24 08:10:34.971144124 +0000 @@ -7,9 +7,9 @@ constant Integer nSeg = 7 "Number of segments in tank"; - parameter Modelica.SIunits.HeatFlowRate QHex_flow_nominal = 2000 + parameter Modelica.Units.SI.HeatFlowRate QHex_flow_nominal = 2000 "Design heat flow rate of heat exchanger"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal= QHex_flow_nominal/4200/4; + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal= QHex_flow_nominal/4200/4; BuildingSystems.Fluid.Sources.Boundary_pT watInTan( redeclare package Medium = Medium, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Storage/Validation/HeatExchangerLocation.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Storage/Validation/HeatExchangerLocation.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Storage/Validation/HeatExchangerLocation.mo" 2021-11-24 08:09:20.995366467 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Storage/Validation/HeatExchangerLocation.mo" 2021-11-24 08:10:34.955144171 +0000 @@ -5,9 +5,9 @@ package Medium = BuildingSystems.Media.Water "Medium model"; - parameter Modelica.SIunits.HeatFlowRate QHex_flow_nominal = 6000 + parameter Modelica.Units.SI.HeatFlowRate QHex_flow_nominal = 6000 "Design heat flow rate of heat exchanger"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal= QHex_flow_nominal/4200/4; + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal= QHex_flow_nominal/4200/4; BuildingSystems.Fluid.Sources.Boundary_pT watInTan( redeclare package Medium = Medium, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Storage/Validation/StratifiedLoadingUnloading.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Storage/Validation/StratifiedLoadingUnloading.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Storage/Validation/StratifiedLoadingUnloading.mo" 2021-11-24 08:09:20.995366467 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Storage/Validation/StratifiedLoadingUnloading.mo" 2021-11-24 08:10:34.943144208 +0000 @@ -5,7 +5,7 @@ package Medium = BuildingSystems.Media.Water "Medium model"; constant Integer nSeg = 7 "Number of segments in tank"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal= 1*1000/3600/4; + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal= 1*1000/3600/4; BuildingSystems.Fluid.Sources.Boundary_pT sou_1( p=300000 + 5000, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Storage/Validation/StratifiedNonUniformInitial.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Storage/Validation/StratifiedNonUniformInitial.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Storage/Validation/StratifiedNonUniformInitial.mo" 2021-11-24 08:09:20.995366467 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Fluid/Storage/Validation/StratifiedNonUniformInitial.mo" 2021-11-24 08:10:34.923144268 +0000 @@ -6,7 +6,7 @@ package Medium = BuildingSystems.Media.Water "Medium model"; constant Integer nSeg = 7 "Number of segments in tank"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal= 1*1000/3600/4; + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal= 1*1000/3600/4; BuildingSystems.Fluid.Sources.Boundary_pT sou_1( p=300000 + 5000, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/ConvectiveHeatTransfer/Examples/AlphaGap.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/ConvectiveHeatTransfer/Examples/AlphaGap.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/ConvectiveHeatTransfer/Examples/AlphaGap.mo" 2021-11-24 08:09:20.995366467 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/ConvectiveHeatTransfer/Examples/AlphaGap.mo" 2021-11-24 08:10:34.847144496 +0000 @@ -2,19 +2,19 @@ model AlphaGap "Test problem for free convection within a gap" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Length width = 0.02 + parameter Modelica.Units.SI.Length width = 0.02 "Width of the gap"; - parameter Modelica.SIunits.Length height = 1.0 + parameter Modelica.Units.SI.Length height = 1.0 "Height of the gap"; - Modelica.SIunits.SurfaceCoefficientOfHeatTransfer alphaAir + Modelica.Units.SI.SurfaceCoefficientOfHeatTransfer alphaAir "Coefficient of heat transfer for convection within a gap filled with air"; - Modelica.SIunits.SurfaceCoefficientOfHeatTransfer alphaArgon + Modelica.Units.SI.SurfaceCoefficientOfHeatTransfer alphaArgon "Coefficient of heat transfer for convection within a gap filled with argon"; - Modelica.SIunits.SurfaceCoefficientOfHeatTransfer alphaKrypton + Modelica.Units.SI.SurfaceCoefficientOfHeatTransfer alphaKrypton "Coefficient of heat transfer for convection within a gap filled with krypton"; - Modelica.SIunits.SurfaceCoefficientOfHeatTransfer alphaXenon + Modelica.Units.SI.SurfaceCoefficientOfHeatTransfer alphaXenon "Coefficient of heat transfer for convection within a gap filled with xenon"; - Modelica.SIunits.TemperatureDifference deltaT "Temperature difference"; + Modelica.Units.SI.TemperatureDifference deltaT "Temperature difference"; equation deltaT = 2.0 * Modelica.Math.sin(2.0*Modelica.Constants.pi*time/3600); alphaAir = BuildingSystems.HAM.ConvectiveHeatTransfer.Gaps.alphaGap(293.15,293.15-deltaT,width,height,1); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/ConvectiveHeatTransfer/Examples/AlphaPlateFree.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/ConvectiveHeatTransfer/Examples/AlphaPlateFree.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/ConvectiveHeatTransfer/Examples/AlphaPlateFree.mo" 2021-11-24 08:09:20.995366467 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/ConvectiveHeatTransfer/Examples/AlphaPlateFree.mo" 2021-11-24 08:10:34.839144520 +0000 @@ -2,20 +2,20 @@ model AlphaPlateFree "Test problem for free convection on plate surfaces" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Length height = 2.8 + + parameter Modelica.Units.SI.Length height = 2.8 "Height of the surface"; - parameter Modelica.SIunits.Length width = 1.0 + parameter Modelica.Units.SI.Length width = 1.0 "Width of the surface"; - Modelica.SIunits.SurfaceCoefficientOfHeatTransfer alpha0 + Modelica.Units.SI.SurfaceCoefficientOfHeatTransfer alpha0 "Coefficient of heat transfer for convection (surface with an tilt angle of 0 degree)"; - Modelica.SIunits.SurfaceCoefficientOfHeatTransfer alpha90 + Modelica.Units.SI.SurfaceCoefficientOfHeatTransfer alpha90 "Coefficient of heat transfer for convection (surface with an tilt angle of 90 degree)"; - Modelica.SIunits.SurfaceCoefficientOfHeatTransfer alpha180 + Modelica.Units.SI.SurfaceCoefficientOfHeatTransfer alpha180 "Coefficient of heat transfer for convection (surface with an tilt angle of 180 degree)"; - Modelica.SIunits.SurfaceCoefficientOfHeatTransfer alpha45 + Modelica.Units.SI.SurfaceCoefficientOfHeatTransfer alpha45 "Coefficient of heat transfer for convection (surface with an tilt angle of 45 degree)"; - Modelica.SIunits.TemperatureDifference deltaT "Temperature difference"; - + Modelica.Units.SI.TemperatureDifference deltaT "Temperature difference"; equation deltaT = 2.0 * Modelica.Math.sin(2.0*Modelica.Constants.pi*time/3600); alpha0 = BuildingSystems.HAM.ConvectiveHeatTransfer.Surfaces.alphaPlateFree(deltaT,height,width, 0.0); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/ConvectiveHeatTransfer/Gaps/Pr.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/ConvectiveHeatTransfer/Gaps/Pr.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/ConvectiveHeatTransfer/Gaps/Pr.mo" 2021-11-24 08:09:20.995366467 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/ConvectiveHeatTransfer/Gaps/Pr.mo" 2021-11-24 08:10:34.831144544 +0000 @@ -3,9 +3,9 @@ "Prandtl number of gases as function of the temperature" input Integer gas "Gas: 1:air, 2:argon, 3:krypton, 4:xenon, 5:SF6"; - input Modelica.SIunits.Temp_K T + input Modelica.Units.SI.Temperature T "Gas temperature"; - output Modelica.SIunits.PrandtlNumber value + output Modelica.Units.SI.PrandtlNumber value "Prandtl number"; algorithm if gas == 1 then // air diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/ConvectiveHeatTransfer/Gaps/alphaGap.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/ConvectiveHeatTransfer/Gaps/alphaGap.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/ConvectiveHeatTransfer/Gaps/alphaGap.mo" 2021-11-24 08:09:20.995366467 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/ConvectiveHeatTransfer/Gaps/alphaGap.mo" 2021-11-24 08:10:34.823144568 +0000 @@ -1,33 +1,33 @@ within BuildingSystems.HAM.ConvectiveHeatTransfer.Gaps; function alphaGap "Empirical equation for convective heat transfer coefficient for a parallel gap" - input Modelica.SIunits.Temp_K T1 + input Modelica.Units.SI.Temperature T1 "Surface temperature 1"; - input Modelica.SIunits.Temp_K T2 + input Modelica.Units.SI.Temperature T2 "Surface temperature 2"; - input Modelica.SIunits.Length d + input Modelica.Units.SI.Length d "Gap distance"; - input Modelica.SIunits.Length h + input Modelica.Units.SI.Length h "Gap height"; input Integer gas "Gas within the gap: 1:air, 2:argon or 3:krypton, 4:xenon, 5:SF6"; - output Modelica.SIunits.CoefficientOfHeatTransfer value; + output Modelica.Units.SI.CoefficientOfHeatTransfer value; protected - Modelica.SIunits.Temp_K TMean + + Modelica.Units.SI.Temperature TMean "mean temperature"; - Modelica.SIunits.TemperatureDifference deltaT + Modelica.Units.SI.TemperatureDifference deltaT "positive temperature difference"; - Modelica.SIunits.PrandtlNumber Pr + Modelica.Units.SI.PrandtlNumber Pr "Prandtl number of the gas"; - Modelica.SIunits.GrashofNumber Gr + Modelica.Units.SI.GrashofNumber Gr "Grashof number of the gas"; - Modelica.SIunits.RayleighNumber Ra + Modelica.Units.SI.RayleighNumber Ra "Rayleigh number of the gas"; - Modelica.SIunits.CoefficientOfHeatTransfer alpha1, alpha2, alpha3, alpha12 + Modelica.Units.SI.CoefficientOfHeatTransfer alpha1, alpha2, alpha3, alpha12 "Helping variables"; - Modelica.SIunits.Acceleration g = 9.81 + Modelica.Units.SI.Acceleration g = 9.81 "accelaration of gravity"; - algorithm TMean := abs((T1 + T2)/2.0); deltaT := abs(T2 - T1); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/ConvectiveHeatTransfer/Gaps/lambda.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/ConvectiveHeatTransfer/Gaps/lambda.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/ConvectiveHeatTransfer/Gaps/lambda.mo" 2021-11-24 08:09:20.995366467 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/ConvectiveHeatTransfer/Gaps/lambda.mo" 2021-11-24 08:10:34.815144592 +0000 @@ -3,9 +3,9 @@ "Thermal conductivity of gases as function of the temperature" input Integer gas "Gas: 1:air, 2:argon, 3:krypton, 4:xenon, 5:SF6"; - input Modelica.SIunits.Temp_K T + input Modelica.Units.SI.Temperature T "TGas temperature"; - output Modelica.SIunits.ThermalConductivity value + output Modelica.Units.SI.ThermalConductivity value "Thermal conductivity"; algorithm if gas == 1 then // air diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/ConvectiveHeatTransfer/Gaps/ny.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/ConvectiveHeatTransfer/Gaps/ny.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/ConvectiveHeatTransfer/Gaps/ny.mo" 2021-11-24 08:09:20.995366467 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/ConvectiveHeatTransfer/Gaps/ny.mo" 2021-11-24 08:10:34.811144605 +0000 @@ -3,9 +3,9 @@ "Kinematic viscosity of gases as function of the temperature" input Integer gas "Gas: 1:air, 2:argon, 3:krypton, 4:xenon, 5:SF6"; - input Modelica.SIunits.Temp_K T + input Modelica.Units.SI.Temperature T "Gas temperature"; - output Modelica.SIunits.KinematicViscosity value + output Modelica.Units.SI.KinematicViscosity value "Kinematic viscosity"; algorithm if gas == 1 then // air diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/ConvectiveHeatTransfer/Surfaces/alphaPlateForced.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/ConvectiveHeatTransfer/Surfaces/alphaPlateForced.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/ConvectiveHeatTransfer/Surfaces/alphaPlateForced.mo" 2021-11-24 08:09:20.995366467 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/ConvectiveHeatTransfer/Surfaces/alphaPlateForced.mo" 2021-11-24 08:10:34.799144640 +0000 @@ -1,7 +1,7 @@ within BuildingSystems.HAM.ConvectiveHeatTransfer.Surfaces; function alphaPlateForced "Heat transfer by forced convection for plates" - input Modelica.SIunits.Velocity vAir; - output Modelica.SIunits.SurfaceCoefficientOfHeatTransfer value; + input Modelica.Units.SI.Velocity vAir; + output Modelica.Units.SI.SurfaceCoefficientOfHeatTransfer value; algorithm value := 1.8 + 4.8 * vAir; end alphaPlateForced; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/ConvectiveHeatTransfer/Surfaces/alphaPlateFree.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/ConvectiveHeatTransfer/Surfaces/alphaPlateFree.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/ConvectiveHeatTransfer/Surfaces/alphaPlateFree.mo" 2021-11-24 08:09:20.995366467 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/ConvectiveHeatTransfer/Surfaces/alphaPlateFree.mo" 2021-11-24 08:10:34.795144652 +0000 @@ -3,16 +3,16 @@ "Heat transfer by free convection for plates with any direction and any heatflow" // Heat transfer coefficient for free convection on tilted surfaces" // Approach afte TAS Version 7.96, for deltaT -> 0.0 modified for numerical reasons" - input Modelica.SIunits.TemperatureDifference deltaT; - input Modelica.SIunits.Length height; - input Modelica.SIunits.Length width; - input Modelica.SIunits.Conversions.NonSIunits.Angle_deg angle; - output Modelica.SIunits.SurfaceCoefficientOfHeatTransfer value; + input Modelica.Units.SI.TemperatureDifference deltaT; + input Modelica.Units.SI.Length height; + input Modelica.Units.SI.Length width; + input Modelica.Units.NonSI.Angle_deg angle; + output Modelica.Units.SI.SurfaceCoefficientOfHeatTransfer value; protected Real DELTAT_RAD = 0.00000005 "Radius for deltaT->0 used by softpow()"; Real SWITCH_FAK = 0.0000000001 "Smoothing for softswitch()"; - Modelica.SIunits.SurfaceCoefficientOfHeatTransfer alphaVer, alphaHor; + Modelica.Units.SI.SurfaceCoefficientOfHeatTransfer alphaVer, alphaHor; algorithm if angle == 90.0 then // vertical: e.g. wall value := BuildingSystems.Utilities.SmoothFunctions.softswitch(deltaT, 0.0, 1.0 / (670.656 * height^6 + 120.43 * height^8.7)^(1/6) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/Data/MaterialProperties/BaseClasses/MaterialHygroThermalGeneral.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/Data/MaterialProperties/BaseClasses/MaterialHygroThermalGeneral.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/Data/MaterialProperties/BaseClasses/MaterialHygroThermalGeneral.mo" 2021-11-24 08:09:20.995366467 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/Data/MaterialProperties/BaseClasses/MaterialHygroThermalGeneral.mo" 2021-11-24 08:10:34.747144796 +0000 @@ -1,37 +1,37 @@ within BuildingSystems.HAM.Data.MaterialProperties.BaseClasses; record MaterialHygroThermalGeneral extends MaterialGeneral; - parameter Modelica.SIunits.Density rho + parameter Modelica.Units.SI.Density rho "Density"; - parameter Modelica.SIunits.SpecificHeatCapacity c + parameter Modelica.Units.SI.SpecificHeatCapacity c "Specific heat capacity"; parameter BuildingSystems.Types.RelativeHumidity sorTabX[:] "Relative humidity of the porous material(table)"; - parameter Modelica.SIunits.MassConcentration sorTabY[:] + parameter Modelica.Units.SI.MassConcentration sorTabY[:] "Water content of the porous material (table)"; parameter BuildingSystems.Types.RelativeHumidity myTabX[:] "Relative humdity of the porous material (table)"; parameter BuildingSystems.Types.WaterVapourDiffusionResistance myTabY[:] "Water vapour diffusion of the porous material (table)"; - parameter Modelica.SIunits.MassConcentration lambdaTabX[:] + parameter Modelica.Units.SI.MassConcentration lambdaTabX[:] "Water content of the porous material (table)"; - parameter Modelica.SIunits.ThermalConductivity lambdaTabY[:] + parameter Modelica.Units.SI.ThermalConductivity lambdaTabY[:] "Heat conductivity of the porous material (table)"; - parameter Modelica.SIunits.MassConcentration dwwTabX[:] + parameter Modelica.Units.SI.MassConcentration dwwTabX[:] "Water content of the porous material (table)"; parameter BuildingSystems.Types.CoefficientOfLiquidTransport dwwTabY[:] "Liquid transport coefficient for redistribution of the porous material (table)"; - parameter Modelica.SIunits.MassConcentration dwsTabX[:] + parameter Modelica.Units.SI.MassConcentration dwsTabX[:] "Water content of the porous material (table)"; parameter BuildingSystems.Types.CoefficientOfLiquidTransport dwsTabY[:] "Liquid transport coefficient for suction of the porous material (table)"; - parameter Modelica.SIunits.ThermalConductivity lambdaDry + parameter Modelica.Units.SI.ThermalConductivity lambdaDry "Heat conductivity of the dry porous material"; - parameter Modelica.SIunits.MassConcentration w80 + parameter Modelica.Units.SI.MassConcentration w80 "Water content by 80 %"; - parameter Modelica.SIunits.MassConcentration w95 + parameter Modelica.Units.SI.MassConcentration w95 "Water content by 95 %"; - parameter Modelica.SIunits.MassConcentration wF + parameter Modelica.Units.SI.MassConcentration wF "Free water saturation"; parameter BuildingSystems.Types.Porosity porosity "Porosity of the layer [-]"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/Data/MaterialProperties/BaseClasses/MaterialThermalGeneral.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/Data/MaterialProperties/BaseClasses/MaterialThermalGeneral.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/Data/MaterialProperties/BaseClasses/MaterialThermalGeneral.mo" 2021-11-24 08:09:20.995366467 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/Data/MaterialProperties/BaseClasses/MaterialThermalGeneral.mo" 2021-11-24 08:10:34.739144821 +0000 @@ -1,10 +1,10 @@ within BuildingSystems.HAM.Data.MaterialProperties.BaseClasses; record MaterialThermalGeneral extends MaterialGeneral; - parameter Modelica.SIunits.ThermalConductivity lambda = 1.0 + parameter Modelica.Units.SI.ThermalConductivity lambda = 1.0 "Heat conductivity"; - parameter Modelica.SIunits.SpecificHeatCapacity c = 1000.0 + parameter Modelica.Units.SI.SpecificHeatCapacity c = 1000.0 "Specific heat capacity"; - parameter Modelica.SIunits.Density rho = 1000.0 + parameter Modelica.Units.SI.Density rho = 1000.0 "Density"; end MaterialThermalGeneral; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/Data/MaterialProperties/HygroThermal/Masea/PolyamidFoil.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/Data/MaterialProperties/HygroThermal/Masea/PolyamidFoil.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/Data/MaterialProperties/HygroThermal/Masea/PolyamidFoil.mo" 2021-11-24 08:09:20.995366467 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/Data/MaterialProperties/HygroThermal/Masea/PolyamidFoil.mo" 2021-11-24 08:10:34.595145253 +0000 @@ -21,8 +21,7 @@ w95=-999, wF=0.618, porosity=0.001, - A=0.3, // guess value, not from MASEA data - myDry=4380.0, + A=0.3, myDry=4380.0, myMoistF=-999, moistSup=-999) "Polyamid foil (PA-Folie)" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/Data/MaterialProperties/HygroThermal/Masea/Softwood.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/Data/MaterialProperties/HygroThermal/Masea/Softwood.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/Data/MaterialProperties/HygroThermal/Masea/Softwood.mo" 2021-11-24 08:09:20.995366467 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/Data/MaterialProperties/HygroThermal/Masea/Softwood.mo" 2021-11-24 08:10:34.575145313 +0000 @@ -20,8 +20,7 @@ w95=-999, wF=575.0, porosity=-999, - A=0.0017, // value of BuildingSystems.HAM.Data.HygroThermal.Masea.OakWood - myDry=200.0, + A=0.0017, myDry=200.0, myMoistF=-999, moistSup=-999) "Softwood (Weichholz)" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/Data/MaterialProperties/HygroThermal/Masea/WeatherResistantLayer.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/Data/MaterialProperties/HygroThermal/Masea/WeatherResistantLayer.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/Data/MaterialProperties/HygroThermal/Masea/WeatherResistantLayer.mo" 2021-11-24 08:09:20.995366467 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/Data/MaterialProperties/HygroThermal/Masea/WeatherResistantLayer.mo" 2021-11-24 08:10:34.539145421 +0000 @@ -21,8 +21,7 @@ w95=0.0, wF=0.0, porosity=0.001, - A=1e-5, // guess value - myDry=100.0, + A=1e-5, myDry=100.0, myMoistF=-999, moistSup=-999) "Weather resistant layer (Witterungsschutzbahn (sd=0,1m))" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/Examples/GasGapClosed.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/Examples/GasGapClosed.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/Examples/GasGapClosed.mo" 2021-11-24 08:09:20.999366455 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/Examples/GasGapClosed.mo" 2021-11-24 08:10:34.167146538 +0000 @@ -15,7 +15,7 @@ Modelica.Blocks.Sources.Sine sine( offset=273.15 + 20.0, amplitude=20.0, - freqHz=1/3600, +f =1/3600, phase=62.831853071796) annotation (Placement(transformation(extent={{-26,-4},{-18,4}}))); equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/GasGapClosed.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/GasGapClosed.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/GasGapClosed.mo" 2021-11-24 08:09:20.999366455 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/GasGapClosed.mo" 2021-11-24 08:10:34.155146575 +0000 @@ -5,37 +5,37 @@ annotation(Placement(transformation(extent={{-8,-8},{8,8}},rotation=270,origin={-20,0}), iconTransformation(extent={{-8,-8},{8,8}},rotation=270,origin={-20,0}))); BuildingSystems.Interfaces.HeatPort heatPort_x2 annotation(Placement(transformation(extent={{-8,-8},{8,8}},rotation=270,origin={20,0}), iconTransformation(extent={{-8,-8},{8,8}},rotation=270,origin={20,0}))); - parameter Modelica.SIunits.Length width + parameter Modelica.Units.SI.Length width "Width of the gap" annotation(Dialog(tab = "General", group = "Geometry")); - parameter Modelica.SIunits.Length height + parameter Modelica.Units.SI.Length height "Height of the gap" annotation(Dialog(tab = "General", group = "Geometry")); - parameter Modelica.SIunits.Length distance + parameter Modelica.Units.SI.Length distance "Distance of the gap" annotation(Dialog(tab = "General", group = "Geometry")); parameter Integer gas = 1 "Gas within the gap: 1:air, 2:argon, 3:krypton, 4:xenon, 5:SF6" annotation(Dialog(tab = "General", group = "Convection")); - parameter Modelica.SIunits.Area A = width * height + parameter Modelica.Units.SI.Area A = width * height "Area of one side of the gap" annotation(Dialog(enable = false, tab = "General", group = "Geometry")); - parameter Modelica.SIunits.Emissivity eps1 = 0.9 + parameter Modelica.Units.SI.Emissivity eps1 = 0.9 "Long-wave emission coefficient of surface 1" annotation(Dialog(tab = "General", group = "Heat Radiation")); - parameter Modelica.SIunits.Emissivity eps2 = 0.9 + parameter Modelica.Units.SI.Emissivity eps2 = 0.9 "Long-wave emission coefficient of surface 2" annotation(Dialog(tab = "General", group = "Heat Radiation")); parameter Boolean calcNominal = false "True: heat transfer calculation under nominal conditions"; - parameter Modelica.SIunits.SurfaceCoefficientOfHeatTransfer alpha_nominal = 1.0 + parameter Modelica.Units.SI.SurfaceCoefficientOfHeatTransfer alpha_nominal = 1.0 "Convective heat transfer coefficient of the air gap under nominal conditions" annotation(Dialog(tab = "General", group = "Convection")); - parameter Modelica.SIunits.Temp_K T1_nominal = 283.15 - 5.0 + parameter Modelica.Units.SI.Temperature T1_nominal = 283.15 - 5.0 "Temperature on surface 1 under nominal conditions"; - parameter Modelica.SIunits.Temp_K T2_nominal = 283.15 + 5.0 + parameter Modelica.Units.SI.Temperature T2_nominal = 283.15 + 5.0 "Temperature on surface 2 under nominal conditions"; - Modelica.SIunits.SurfaceCoefficientOfHeatTransfer alpha + Modelica.Units.SI.SurfaceCoefficientOfHeatTransfer alpha "Convective heat transfer coefficient of the air gap"; equation if calcNominal then diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/BaseClasses/HeatAndMoistureTransportGeneral.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/BaseClasses/HeatAndMoistureTransportGeneral.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/BaseClasses/HeatAndMoistureTransportGeneral.mo" 2021-11-24 08:09:20.999366455 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/BaseClasses/HeatAndMoistureTransportGeneral.mo" 2021-11-24 08:10:34.127146658 +0000 @@ -10,23 +10,23 @@ Real sorTabY[nRowsSor+1] "Sorption isotherm of the physical layer (table)" annotation(HideResult=true); - parameter Modelica.SIunits.Length lengthX + parameter Modelica.Units.SI.Length lengthX "Length in x dimension"; - parameter Modelica.SIunits.Length lengthY + parameter Modelica.Units.SI.Length lengthY "Length in y dimension"; - parameter Modelica.SIunits.Length lengthZ + parameter Modelica.Units.SI.Length lengthZ "Length in z dimension"; protected parameter Integer nRowsSor = size(material.sorTabX,1); - parameter Modelica.SIunits.MassConcentration wMax = rhoH2O * material.porosity + parameter Modelica.Units.SI.MassConcentration wMax = rhoH2O * material.porosity "Maximum value of water content of the material"; - constant Modelica.SIunits.Density rhoH2O = 1000.0 + constant Modelica.Units.SI.Density rhoH2O = 1000.0 "Density of water"; constant BuildingSystems.Types.RelativeHumidity phiMax = 1.01 "Maximum value of relative humidity"; - constant Modelica.SIunits.SpecificEnergy Hv = 2.47e6 + constant Modelica.Units.SI.SpecificEnergy Hv = 2.47e6 "Evaporation heat of water"; - constant Modelica.SIunits.SpecificHeatCapacity cH2O = 4185.0 + constant Modelica.Units.SI.SpecificHeatCapacity cH2O = 4185.0 "Specific heat capacity of water"; equation for i in 1:size(material.sorTabX,1) loop diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/Examples/HeatAndMoistureTransport1DNodes.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/Examples/HeatAndMoistureTransport1DNodes.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/Examples/HeatAndMoistureTransport1DNodes.mo" 2021-11-24 08:09:20.999366455 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/Examples/HeatAndMoistureTransport1DNodes.mo" 2021-11-24 08:10:34.115146695 +0000 @@ -14,7 +14,7 @@ annotation (Placement(transformation(extent={{-10,-10},{10,10}}))); Modelica.Blocks.Sources.Sine climate1( amplitude=10.0, - freqHz=1.0/86400.0, +f =1.0/86400.0, offset=273.15 + 20.0, phase=6.2831853071796) annotation (Placement(transformation(extent={{-58,-16},{-46,-4}}))); @@ -33,7 +33,7 @@ k=0.008) annotation (Placement(transformation(extent={{58,4},{46,16}}))); Modelica.Blocks.Sources.Sine climate2( - freqHz=1.0/86400.0, + f =1.0/86400.0, amplitude=0.004, phase=6.2831853071796, offset=0.008) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/Examples/HeatAndMoistureTransport3D.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/Examples/HeatAndMoistureTransport3D.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/Examples/HeatAndMoistureTransport3D.mo" 2021-11-24 08:09:20.999366455 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/Examples/HeatAndMoistureTransport3D.mo" 2021-11-24 08:10:34.099146742 +0000 @@ -21,7 +21,7 @@ annotation (Placement(transformation(extent={{-10,-4},{10,16}}))); Modelica.Blocks.Sources.Sine climate1( amplitude=10.0, - freqHz=1.0/86400.0, +f =1.0/86400.0, offset=273.15 + 20.0, phase=6.2831853071796) annotation (Placement(transformation(extent={{-68,-10},{-56,2}}))); @@ -40,7 +40,7 @@ k=0.008) annotation (Placement(transformation(extent={{70,10},{58,22}}))); Modelica.Blocks.Sources.Sine climate2( - freqHz=1.0/86400.0, + f =1.0/86400.0, amplitude=0.004, phase=6.2831853071796, offset=0.008) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/Functions/Examples/dPhi.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/Functions/Examples/dPhi.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/Functions/Examples/dPhi.mo" 2021-11-24 08:09:20.999366455 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/Functions/Examples/dPhi.mo" 2021-11-24 08:10:34.027146959 +0000 @@ -2,7 +2,7 @@ model dPhi "Test function wDerPhi" extends Modelica.Icons.Example; BuildingSystems.HAM.Data.MaterialProperties.HygroThermal.Beton material; - parameter Modelica.SIunits.MassConcentration w = 50.0 + parameter Modelica.Units.SI.MassConcentration w = 50.0 "Water content of the material"; BuildingSystems.Types.RelativeHumidity phi "Relative Humidity of the material"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/Functions/Examples/phiSor.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/Functions/Examples/phiSor.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/Functions/Examples/phiSor.mo" 2021-11-24 08:09:20.999366455 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/Functions/Examples/phiSor.mo" 2021-11-24 08:10:34.015146995 +0000 @@ -2,7 +2,7 @@ model phiSor "Test function phiSor" extends Modelica.Icons.Example; BuildingSystems.HAM.Data.MaterialProperties.HygroThermal.Beton material; - Modelica.SIunits.MassConcentration w "Water content of the material"; + Modelica.Units.SI.MassConcentration w "Water content of the material"; BuildingSystems.Types.RelativeHumidity phiSor "Relative Humidity of the material"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/Functions/Examples/wDerPhi.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/Functions/Examples/wDerPhi.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/Functions/Examples/wDerPhi.mo" 2021-11-24 08:09:20.999366455 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/Functions/Examples/wDerPhi.mo" 2021-11-24 08:10:34.011147007 +0000 @@ -2,11 +2,11 @@ model wDerPhi "Test function wDerPhi" extends Modelica.Icons.Example; BuildingSystems.HAM.Data.MaterialProperties.HygroThermal.Beton material; - parameter Modelica.SIunits.MassConcentration w = 50.0 + parameter Modelica.Units.SI.MassConcentration w = 50.0 "Water content of the material"; BuildingSystems.Types.RelativeHumidity phi "Relative Humidity of the material"; - Modelica.SIunits.MassConcentration wDerPhi "Derivative of the water content"; + Modelica.Units.SI.MassConcentration wDerPhi "Derivative of the water content"; Modelica.Blocks.Sources.Ramp ramp( height=1.1, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/Functions/Examples/wSor.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/Functions/Examples/wSor.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/Functions/Examples/wSor.mo" 2021-11-24 08:09:20.999366455 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/Functions/Examples/wSor.mo" 2021-11-24 08:10:34.007147019 +0000 @@ -2,7 +2,7 @@ model wSor "Test function wSor" extends Modelica.Icons.Example; BuildingSystems.HAM.Data.MaterialProperties.HygroThermal.Beton material; - Modelica.SIunits.MassConcentration wSor "Water content of the material"; + Modelica.Units.SI.MassConcentration wSor "Water content of the material"; BuildingSystems.Types.RelativeHumidity phi "Relative Humidity of the material"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/Functions/dPhi.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/Functions/dPhi.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/Functions/dPhi.mo" 2021-11-24 08:09:20.999366455 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/Functions/dPhi.mo" 2021-11-24 08:10:33.999147043 +0000 @@ -2,14 +2,14 @@ function dPhi "Calculates the liquid conduction coefficient" - input Modelica.SIunits.MassConcentration dwsTabX[:]; + input Modelica.Units.SI.MassConcentration dwsTabX[:]; input BuildingSystems.Types.CoefficientOfLiquidTransport dwsTabY[:]; - input Modelica.SIunits.MassConcentration dwwTabX[:]; + input Modelica.Units.SI.MassConcentration dwwTabX[:]; input BuildingSystems.Types.CoefficientOfLiquidTransport dwwTabY[:]; - input Modelica.SIunits.MassConcentration wF; - input Modelica.SIunits.MassConcentration w; - input Modelica.SIunits.MassFlowRate m_flow_wdr; - input Modelica.SIunits.MassConcentration wDerPhi; + input Modelica.Units.SI.MassConcentration wF; + input Modelica.Units.SI.MassConcentration w; + input Modelica.Units.SI.MassFlowRate m_flow_wdr; + input Modelica.Units.SI.MassConcentration wDerPhi; output Real value "[kg/ms]"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/Functions/deltaL.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/Functions/deltaL.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/Functions/deltaL.mo" 2021-11-24 08:09:20.999366455 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/Functions/deltaL.mo" 2021-11-24 08:10:33.991147067 +0000 @@ -2,11 +2,11 @@ function deltaL "Calculates the water vapour permeability" - input Modelica.SIunits.Temp_K T; + input Modelica.Units.SI.Temperature T; output BuildingSystems.Types.WaterVapourPermeability value; protected - Modelica.SIunits.Pressure pL=101300; + Modelica.Units.SI.Pressure pL=101300; algorithm value := 2.0e-7 * T^0.81 / pL; end deltaL; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/Functions/lambdaMoist.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/Functions/lambdaMoist.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/Functions/lambdaMoist.mo" 2021-11-24 08:09:20.999366455 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/Functions/lambdaMoist.mo" 2021-11-24 08:10:33.979147103 +0000 @@ -2,12 +2,12 @@ function lambdaMoist "Calculates the thermal conductivity dependent on the moisture content" - input Modelica.SIunits.MassConcentration lambdaTabX[:]; - input Modelica.SIunits.ThermalConductivity lambdaTabY[:]; - input Modelica.SIunits.ThermalConductivity lambdaDry; - input Modelica.SIunits.MassConcentration w; - output Modelica.SIunits.ThermalConductivity value; - algorithm + + input Modelica.Units.SI.MassConcentration lambdaTabX[:]; + input Modelica.Units.SI.ThermalConductivity lambdaTabY[:]; + input Modelica.Units.SI.ThermalConductivity lambdaDry; + input Modelica.Units.SI.MassConcentration w; + output Modelica.Units.SI.ThermalConductivity value; algorithm if w < 0.0 then value := lambdaDry; else diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/Functions/phiSor.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/Functions/phiSor.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/Functions/phiSor.mo" 2021-11-24 08:09:20.999366455 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/Functions/phiSor.mo" 2021-11-24 08:10:33.971147127 +0000 @@ -2,20 +2,20 @@ function phiSor "Calculation of the relative humdity of a porous material" - input Modelica.SIunits.MassConcentration sorTabX[:]; + input Modelica.Units.SI.MassConcentration sorTabX[:]; input BuildingSystems.Types.RelativeHumidity sorTabY[:]; - input Modelica.SIunits.MassConcentration w + input Modelica.Units.SI.MassConcentration w "Water content"; - input Modelica.SIunits.MassConcentration wF + input Modelica.Units.SI.MassConcentration wF "Free water saturation"; input BuildingSystems.Types.Porosity por "Porosity"; output BuildingSystems.Types.RelativeHumidity value; protected - Modelica.SIunits.Density rhoH2O = 1000.0; + Modelica.Units.SI.Density rhoH2O = 1000.0; BuildingSystems.Types.RelativeHumidity phiMax = 1.01; - Modelica.SIunits.MassConcentration wMax = por * rhoH2O; + Modelica.Units.SI.MassConcentration wMax = por * rhoH2O; algorithm if w < 0.0 then value := 0.0; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/Functions/wDerPhi.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/Functions/wDerPhi.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/Functions/wDerPhi.mo" 2021-11-24 08:09:20.999366455 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/Functions/wDerPhi.mo" 2021-11-24 08:10:33.963147151 +0000 @@ -2,15 +2,15 @@ function wDerPhi "Calculates the derivative of the water content" - input Modelica.SIunits.MassConcentration w; - input Modelica.SIunits.MassConcentration sorTabX[:]; + input Modelica.Units.SI.MassConcentration w; + input Modelica.Units.SI.MassConcentration sorTabX[:]; input BuildingSystems.Types.RelativeHumidity sorTabY[:]; - input Modelica.SIunits.MassConcentration wF; + input Modelica.Units.SI.MassConcentration wF; input BuildingSystems.Types.RelativeHumidity phi; input BuildingSystems.Types.Porosity por; - output Modelica.SIunits.MassConcentration value; + output Modelica.Units.SI.MassConcentration value; protected - Modelica.SIunits.Density rhoH2O=1000.0; + Modelica.Units.SI.Density rhoH2O=1000.0; BuildingSystems.Types.RelativeHumidity phiMax=1.01; Real wMax = por * rhoH2O; Real phiNext; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/Functions/wSor.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/Functions/wSor.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/Functions/wSor.mo" 2021-11-24 08:09:20.999366455 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/Functions/wSor.mo" 2021-11-24 08:10:33.955147175 +0000 @@ -2,17 +2,17 @@ function wSor "Calculates the water content of a porous material" - input Modelica.SIunits.MassConcentration sorTabX[:]; + input Modelica.Units.SI.MassConcentration sorTabX[:]; input BuildingSystems.Types.RelativeHumidity sorTabY[:]; - input Modelica.SIunits.MassConcentration phi; - input Modelica.SIunits.MassConcentration wF; + input Modelica.Units.SI.MassConcentration phi; + input Modelica.Units.SI.MassConcentration wF; input BuildingSystems.Types.Porosity por; - output Modelica.SIunits.MassConcentration value; + output Modelica.Units.SI.MassConcentration value; protected - Modelica.SIunits.Density rhoH2O=1000.0; + Modelica.Units.SI.Density rhoH2O=1000.0; BuildingSystems.Types.RelativeHumidity phiMax=1.01; - Modelica.SIunits.MassConcentration wMax = por * rhoH2O; + Modelica.Units.SI.MassConcentration wMax = por * rhoH2O; algorithm if phi < 0.0 then value := 0.0; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/HeatAndMoistureTransport1D.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/HeatAndMoistureTransport1D.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/HeatAndMoistureTransport1D.mo" 2021-11-24 08:09:20.999366455 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/HeatAndMoistureTransport1D.mo" 2021-11-24 08:10:33.951147187 +0000 @@ -13,32 +13,32 @@ BuildingSystems.Interfaces.HeatPort heatPort_source "Optional heat source at the hygro-thermal node" annotation(Placement(transformation(extent={{-10,-12},{10,8}}), iconTransformation(extent={{-10,-12},{10,8}}))); - Modelica.SIunits.Temp_K T(start = T_start) + Modelica.Units.SI.Temperature T(start = T_start) "Temperature of the hygro-thermal node"; BuildingSystems.Types.RelativeHumidity phi "Relative humidity of numerical node"; - Modelica.SIunits.MassConcentration w( + Modelica.Units.SI.MassConcentration w( start=BuildingSystems.HAM.HeatAndMoistureTransport.Functions.wSor(material.sorTabX,material.sorTabY,phi_start,material.wF,material.porosity)) "Water content of the hygro-thermal node"; - Modelica.SIunits.MassConcentration wDerPhi1 + Modelica.Units.SI.MassConcentration wDerPhi1 "Derivative of the water content by phi of the hygro-thermal node"; - Modelica.SIunits.MassConcentration w_x1 + Modelica.Units.SI.MassConcentration w_x1 "Water content on the surface at side x1"; - Modelica.SIunits.MassConcentration w_x2 + Modelica.Units.SI.MassConcentration w_x2 "Water content on the surface at side x2"; BuildingSystems.Types.RelativeHumidity phi_x1 "Relative humidity on the surface at side x1"; BuildingSystems.Types.RelativeHumidity phi_x2 "Relative humidity on the surface at side x2"; - Modelica.SIunits.ThermalConductance CTh(fixed=false) + Modelica.Units.SI.ThermalConductance CTh(fixed=false) "Thermal conductance of the hygro-thermal node"; BuildingSystems.Types.CoefficientOfMoistureDiffusion CMd "Moisture diffusion coefficient of the hygro-thermal node"; BuildingSystems.Types.CoefficientOfLiquidTransport CLt "Liquid transport coefficient of the hygro-thermal node"; - Modelica.SIunits.MassFlowRate m_flow_wdr + Modelica.Units.SI.MassFlowRate m_flow_wdr "Wind driven rain"; - parameter Modelica.SIunits.Temp_K T_start = 293.15 + parameter Modelica.Units.SI.Temperature T_start = 293.15 "Start temperature of the hygro-thermal node" annotation (Dialog(tab="Initialization")); parameter BuildingSystems.Types.RelativeHumidity phi_start = 0.5 diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/HeatAndMoistureTransport1DNodes.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/HeatAndMoistureTransport1DNodes.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/HeatAndMoistureTransport1DNodes.mo" 2021-11-24 08:09:20.999366455 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/HeatAndMoistureTransport1DNodes.mo" 2021-11-24 08:10:33.927147259 +0000 @@ -13,37 +13,37 @@ BuildingSystems.Interfaces.HeatPort heatPort_source[nNodesX] "Optional heat source at the numerical node" annotation(Placement(transformation(extent={{-10,-12},{10,8}}), iconTransformation(extent={{-10,-12},{10,8}}))); - Modelica.SIunits.Temp_K T[nNodesX](each start = T_start) + Modelica.Units.SI.Temperature T[nNodesX](each start = T_start) "Temperature of the numerical node"; BuildingSystems.Types.RelativeHumidity phi[nNodesX] "Relative humidity of numerical node"; - Modelica.SIunits.MassConcentration w[nNodesX]( + Modelica.Units.SI.MassConcentration w[nNodesX]( each start = BuildingSystems.HAM.HeatAndMoistureTransport.Functions.wSor(material.sorTabX,material.sorTabY,phi_start,material.wF,material.porosity)) "Water content of the numerical node"; - Modelica.SIunits.MassConcentration wDerPhi1[nNodesX] + Modelica.Units.SI.MassConcentration wDerPhi1[nNodesX] "Derivative of the water content by phi of the numerical node"; BuildingSystems.Types.RelativeHumidity phi_x1 "Relative humidity on the surface at side x1"; BuildingSystems.Types.RelativeHumidity phi_x2 "Relative humidity on the surface at side x2"; - Modelica.SIunits.ThermalConductance CTh[nNodesX+1](each fixed=false) + Modelica.Units.SI.ThermalConductance CTh[nNodesX+1](each fixed=false) "Thermal conductance of the numerical node"; BuildingSystems.Types.CoefficientOfMoistureDiffusion CMd[nNodesX+1] "Moisture diffusion coefficient of the numerical node"; BuildingSystems.Types.CoefficientOfLiquidTransport CLt[nNodesX+1] "Liquid transport coefficient of the numerical node"; - Modelica.SIunits.MassFlowRate m_flow_wdr = 0.0 + Modelica.Units.SI.MassFlowRate m_flow_wdr = 0.0 "Wind driven rain"; parameter Integer nNodesX = 1 "Number of numerical nodes in the x dimension"; - parameter Modelica.SIunits.Temp_K T_start = 293.15 + parameter Modelica.Units.SI.Temperature T_start = 293.15 "Start temperature of the numerical nodes" annotation (Dialog(tab="Initialization")); parameter BuildingSystems.Types.RelativeHumidity phi_start = 0.5 "Start relative humidity of the numerical nodes" annotation (Dialog(tab="Initialization")); protected - parameter Modelica.SIunits.Length dx[nNodesX]( + parameter Modelica.Units.SI.Length dx[nNodesX]( each fixed = false); parameter BuildingSystems.Types.VolumeHeatCapacity C = material.c * material.rho "Volume related heat capacity"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/HeatAndMoistureTransport3D.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/HeatAndMoistureTransport3D.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/HeatAndMoistureTransport3D.mo" 2021-11-24 08:09:20.999366455 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/HeatAndMoistureTransport3D.mo" 2021-11-24 08:10:33.851147487 +0000 @@ -29,14 +29,14 @@ BuildingSystems.Interfaces.HeatPort heatPort_source "Optional heat source at the hygro-thermal node" annotation(Placement(transformation(extent={{-10,-12},{10,8}}), iconTransformation(extent={{-10,-12},{10,8}}))); - Modelica.SIunits.Temp_K T(start = T_start) + Modelica.Units.SI.Temperature T(start = T_start) "Temperature of the hygro-thermal node"; BuildingSystems.Types.RelativeHumidity phi "Relative humidity of numerical node"; - Modelica.SIunits.MassConcentration w( + Modelica.Units.SI.MassConcentration w( start=BuildingSystems.HAM.HeatAndMoistureTransport.Functions.wSor(material.sorTabX,material.sorTabY,phi_start,material.wF,material.porosity)) "Water content of the hygro-thermal node"; - Modelica.SIunits.MassConcentration wDerPhi1 + Modelica.Units.SI.MassConcentration wDerPhi1 "Derivative of the water content by phi of the hygro-thermal node"; BuildingSystems.Types.RelativeHumidity phi_x1 "Relative humidity on the surface at side x1"; @@ -50,15 +50,15 @@ "Relative humidity on the surface at side z1"; BuildingSystems.Types.RelativeHumidity phi_z2 "Relative humidity on the surface at side z2"; - Modelica.SIunits.ThermalConductance CTh(fixed=false) + Modelica.Units.SI.ThermalConductance CTh(fixed=false) "Thermal conductance of the hygro-thermal node"; BuildingSystems.Types.CoefficientOfMoistureDiffusion CMd "Moisture diffusion coefficient of the hygro-thermal node"; BuildingSystems.Types.CoefficientOfLiquidTransport CLt "Liquid transport coefficient of the hygro-thermal node"; - Modelica.SIunits.MassFlowRate m_flow_wdr + Modelica.Units.SI.MassFlowRate m_flow_wdr "Wind driven rain"; - parameter Modelica.SIunits.Temp_K T_start = 293.15 + parameter Modelica.Units.SI.Temperature T_start = 293.15 "Start temperature of the hygro-thermal node" annotation (Dialog(tab="Initialization")); parameter BuildingSystems.Types.RelativeHumidity phi_start = 0.5 diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/MultiLayerHeatAndMoistureTransfer1DNodes.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/MultiLayerHeatAndMoistureTransfer1DNodes.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/MultiLayerHeatAndMoistureTransfer1DNodes.mo" 2021-11-24 08:09:20.999366455 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/MultiLayerHeatAndMoistureTransfer1DNodes.mo" 2021-11-24 08:10:33.811147608 +0000 @@ -33,18 +33,18 @@ parameter BuildingSystems.HAM.Data.MaterialProperties.BaseClasses.MaterialHygroThermalGeneral material[nLayers] annotation (HideResult=true); - parameter Modelica.SIunits.Length lengthY + parameter Modelica.Units.SI.Length lengthY "Length in y dimension"; - parameter Modelica.SIunits.Length lengthZ + parameter Modelica.Units.SI.Length lengthZ "Length in z dimension"; parameter Integer nLayers = 1 "Number of material layers in the x dimension"; parameter Integer nNodes[nLayers] = {1} "Number of numerical nodes of layer i" annotation(Evaluate=true, Dialog(connectorSizing=true, tab="General",group="Ports")); - parameter Modelica.SIunits.Length thickness[nLayers] + parameter Modelica.Units.SI.Length thickness[nLayers] "Thickness of each layer"; - parameter Modelica.SIunits.Temp_K T_start[nLayers]={293.15 for i in 1:nLayers} + parameter Modelica.Units.SI.Temperature T_start[nLayers]={293.15 for i in 1:nLayers} "Start temperature of each layer" annotation (Dialog(tab="Initialization")); parameter BuildingSystems.Types.RelativeHumidity phi_start[nLayers]={0.5 for i in 1:nLayers} diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/Sources/FixedAbsoluteMoisture.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/Sources/FixedAbsoluteMoisture.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/Sources/FixedAbsoluteMoisture.mo" 2021-11-24 08:09:20.999366455 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/Sources/FixedAbsoluteMoisture.mo" 2021-11-24 08:10:33.791147668 +0000 @@ -2,7 +2,7 @@ model FixedAbsoluteMoisture "Boundary condition of a constant absolute moisture" extends MoistureSourceGeneral(moisturePort(x = x_constant)); - parameter Modelica.SIunits.MassFraction x_constant = 0.05 + parameter Modelica.Units.SI.MassFraction x_constant = 0.05 "Constant absolute moisture"; annotation (Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,100}}), graphics={ diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/Sources/FixedMoistureFlow.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/Sources/FixedMoistureFlow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/Sources/FixedMoistureFlow.mo" 2021-11-24 08:09:20.999366455 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatAndMoistureTransport/Sources/FixedMoistureFlow.mo" 2021-11-24 08:10:33.787147680 +0000 @@ -1,7 +1,7 @@ within BuildingSystems.HAM.HeatAndMoistureTransport.Sources; model FixedMoistureFlow "Boundary condition of a constant moisture flow" extends MoistureSourceGeneral(moisturePort(m_flow = - m_flow_constant)); - parameter Modelica.SIunits.MassFlowRate m_flow_constant = 0.0 + parameter Modelica.Units.SI.MassFlowRate m_flow_constant = 0.0 "Constant moisture flow rate of water vapour"; annotation (Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,100}}), graphics={ diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatConduction/BaseClasses/HeatConductionGeneral.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatConduction/BaseClasses/HeatConductionGeneral.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatConduction/BaseClasses/HeatConductionGeneral.mo" 2021-11-24 08:09:20.999366455 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatConduction/BaseClasses/HeatConductionGeneral.mo" 2021-11-24 08:10:33.755147776 +0000 @@ -6,16 +6,16 @@ "Material of the body" annotation(Dialog(tab = "General"),Evaluate=true, choicesAllMatching=true); - parameter Modelica.SIunits.Length lengthX = 1.0 + + parameter Modelica.Units.SI.Length lengthX = 1.0 "Length in x dimension" annotation(Dialog(tab = "General", group = "Geometry")); - Modelica.SIunits.Length lengthY = 1.0 + Modelica.Units.SI.Length lengthY = 1.0 "Length in y dimension" annotation(Dialog(tab = "General", group = "Geometry")); - Modelica.SIunits.Length lengthZ = 1.0 + Modelica.Units.SI.Length lengthZ = 1.0 "Length in z dimension" annotation(Dialog(tab = "General", group = "Geometry")); - annotation (Icon(graphics={Rectangle(extent={{-80,80},{80,-80}},lineColor={230,230,230}, fillColor={230,230,230},fillPattern=FillPattern.Solid), Text(extent={{8,-76},{100,-104}},lineColor={0,0,255},fillColor={230,230,230}, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatConduction/Examples/HeatConduction1D.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatConduction/Examples/HeatConduction1D.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatConduction/Examples/HeatConduction1D.mo" 2021-11-24 08:09:20.999366455 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatConduction/Examples/HeatConduction1D.mo" 2021-11-24 08:10:33.731147848 +0000 @@ -41,7 +41,7 @@ Modelica.Thermal.HeatTransfer.Sources.PrescribedTemperature TAmb annotation (Placement(transformation(extent={{-68,-8},{-52,8}}))); Modelica.Blocks.Sources.Sine climate( - amplitude=10.0,freqHz=1.0/86400.0, + amplitude=10.0, f =1.0/86400.0, phase=6.2831853071796, offset=273.15+20.0) annotation (Placement(transformation(extent={{-92,-8},{-76,8}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatConduction/Examples/HeatConduction1DArray.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatConduction/Examples/HeatConduction1DArray.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatConduction/Examples/HeatConduction1DArray.mo" 2021-11-24 08:09:20.999366455 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatConduction/Examples/HeatConduction1DArray.mo" 2021-11-24 08:10:33.719147884 +0000 @@ -11,7 +11,7 @@ end Body; parameter Integer nBodies = 1000; - parameter Modelica.SIunits.Length thickness = 1.0; + parameter Modelica.Units.SI.Length thickness = 1.0; Body body[nBodies]( each T_start = 293.15, each lengthX=thickness/nBodies) @@ -20,7 +20,7 @@ annotation (Placement(transformation(extent={{-30,-8},{-14,8}}))); Modelica.Blocks.Sources.Sine climate( amplitude=10.0, - freqHz=1.0/86400.0, +f =1.0/86400.0, phase=6.2831853071796, offset=293.15) annotation (Placement(transformation(extent={{-54,-8},{-38,8}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatConduction/Examples/HeatConduction1DNodes.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatConduction/Examples/HeatConduction1DNodes.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatConduction/Examples/HeatConduction1DNodes.mo" 2021-11-24 08:09:20.999366455 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatConduction/Examples/HeatConduction1DNodes.mo" 2021-11-24 08:10:33.707147920 +0000 @@ -18,7 +18,7 @@ annotation (Placement(transformation(extent={{-30,-8},{-14,8}}))); Modelica.Blocks.Sources.Sine climate( amplitude=10.0, - freqHz=1/86400.0, +f =1/86400.0, phase=6.2831853071796, offset=293.15) annotation (Placement(transformation(extent={{-54,-8},{-38,8}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatConduction/Examples/MultiLayerHeatConduction1DNodes.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatConduction/Examples/MultiLayerHeatConduction1DNodes.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatConduction/Examples/MultiLayerHeatConduction1DNodes.mo" 2021-11-24 08:09:20.999366455 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatConduction/Examples/MultiLayerHeatConduction1DNodes.mo" 2021-11-24 08:10:33.643148112 +0000 @@ -22,7 +22,7 @@ annotation (Placement(transformation(extent={{-30,-8},{-14,8}}))); Modelica.Blocks.Sources.Sine climate( amplitude=10.0, - freqHz=1/86400.0, +f =1/86400.0, phase=6.2831853071796, offset=293.15) annotation (Placement(transformation(extent={{-54,-8},{-38,8}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatConduction/HeatConduction1D.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatConduction/HeatConduction1D.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatConduction/HeatConduction1D.mo" 2021-11-24 08:09:20.999366455 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatConduction/HeatConduction1D.mo" 2021-11-24 08:10:33.631148148 +0000 @@ -12,15 +12,15 @@ BuildingSystems.Interfaces.HeatPort heatPort_source "Optional heat source at the thermal node" annotation(Placement(transformation(extent={{-10,-12},{10,8}}), iconTransformation(extent={{-10,-12},{10,8}}))); - parameter Modelica.SIunits.Temp_K T_start = 293.15 + parameter Modelica.Units.SI.Temperature T_start = 293.15 "Start temperature of the thermal node" annotation (Dialog(tab="Initialization")); - Modelica.SIunits.Temp_K T(start = T_start) + Modelica.Units.SI.Temperature T(start = T_start) "Temperature of the thermal node"; protected - Modelica.SIunits.HeatCapacity C = material.c * material.rho * lengthX * lengthY * lengthZ + Modelica.Units.SI.HeatCapacity C = material.c * material.rho * lengthX * lengthY * lengthZ "Heat capacity of the thermal node"; - Modelica.SIunits.ThermalConductance kX = 2.0 * material.lambda / lengthX * lengthY * lengthZ + Modelica.Units.SI.ThermalConductance kX = 2.0 * material.lambda / lengthX * lengthY * lengthZ "Thermal conductance in the x dimension"; equation heatPort_x1.Q_flow = kX * (heatPort_x1.T - T); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatConduction/HeatConduction1DNodes.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatConduction/HeatConduction1DNodes.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatConduction/HeatConduction1DNodes.mo" 2021-11-24 08:09:20.999366455 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatConduction/HeatConduction1DNodes.mo" 2021-11-24 08:10:33.623148172 +0000 @@ -17,24 +17,24 @@ parameter Integer nNodesX = 1 "Number of numerical nodes in the x dimension"; - parameter Modelica.SIunits.Temp_K T_start = 293.15 + parameter Modelica.Units.SI.Temperature T_start = 293.15 "Start temperature of the thermal nodes" annotation (Dialog(tab="Initialization")); - Modelica.SIunits.Temp_K T[nNodesX]( + Modelica.Units.SI.Temperature T[nNodesX]( each start = T_start) "Temperature of the numerical node"; protected - parameter Modelica.SIunits.Length dx[nNodesX]( + + parameter Modelica.Units.SI.Length dx[nNodesX]( each fixed = false) "Thickness of the discretized numerical layer"; - parameter Modelica.SIunits.ThermalConductance CTh[nNodesX+1]( + parameter Modelica.Units.SI.ThermalConductance CTh[nNodesX+1]( each fixed=false) "Thermal conductance of the numerical node"; - parameter Modelica.SIunits.HeatCapacity C[nNodesX]( + parameter Modelica.Units.SI.HeatCapacity C[nNodesX]( each fixed = false) "Heat capacity of the numerical node"; - initial algorithm for i in 1:nNodesX loop dx[i]:= lengthX / nNodesX; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatConduction/HeatConduction3D.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatConduction/HeatConduction3D.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatConduction/HeatConduction3D.mo" 2021-11-24 08:09:20.999366455 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatConduction/HeatConduction3D.mo" 2021-11-24 08:10:33.607148221 +0000 @@ -24,16 +24,16 @@ BuildingSystems.Interfaces.HeatPort heatPort_source "Optional heat source at the thermal node" annotation(Placement(transformation(extent={{-10,-12},{10,8}}), iconTransformation(extent={{-10,-12},{10,8}}))); - parameter Modelica.SIunits.Area ARedXY = 0.0 + parameter Modelica.Units.SI.Area ARedXY = 0.0 "Reduction area for heat conduction caused by inner hollow spaces in the xy plane" annotation(Dialog(tab = "Advanced", group = "Inner hollow spaces")); - parameter Modelica.SIunits.Area ARedXZ = 0.0 + parameter Modelica.Units.SI.Area ARedXZ = 0.0 "Reduction area for heat conduction caused by inner hollow spaces in the xz plane" annotation(Dialog(tab = "Advanced", group = "Inner hollow spaces")); - parameter Modelica.SIunits.Area ARedYZ = 0.0 + parameter Modelica.Units.SI.Area ARedYZ = 0.0 "Reduction area for heat conduction caused by inner hollow spaces in the yz plane" annotation(Dialog(tab = "Advanced", group = "Inner hollow spaces")); - parameter Modelica.SIunits.Volume VRed = 0.0 + parameter Modelica.Units.SI.Volume VRed = 0.0 "Reduction volume for the thermal heat capacity caused by inner hollow spaces" annotation(Dialog(tab = "Advanced", group = "Inner hollow spaces")); parameter Real geoFacX(unit = "1", min = 0.0, max = 1.0) = 1.0 @@ -45,20 +45,20 @@ parameter Real geoFacZ(unit = "1", min = 0.0, max = 1.0) = 1.0 "Geometry factor for heat conduction caused by inner spaces in z dimension" annotation(Dialog(tab = "Advanced", group = "Inner hollow spaces")); - parameter Modelica.SIunits.Temp_K T_start = 293.15 + parameter Modelica.Units.SI.Temperature T_start = 293.15 "Start temperature of the thermal node" annotation (Dialog(tab="Initialization")); - Modelica.SIunits.Temp_K T(start = T_start) "Temperature of the thermal node"; + Modelica.Units.SI.Temperature T(start = T_start) "Temperature of the thermal node"; protected - Modelica.SIunits.HeatCapacity C = material.c * material.rho * (lengthX * lengthY * lengthZ - VRed) + + Modelica.Units.SI.HeatCapacity C = material.c * material.rho * (lengthX * lengthY * lengthZ - VRed) "Heat capacity of the thermal node"; - Modelica.SIunits.ThermalConductance CThX = 2.0 * material.lambda / (lengthX * geoFacX) * (lengthY * lengthZ - ARedYZ) + Modelica.Units.SI.ThermalConductance CThX = 2.0 * material.lambda / (lengthX * geoFacX) * (lengthY * lengthZ - ARedYZ) "Thermal conductance in the x dimension"; - Modelica.SIunits.ThermalConductance CThY = 2.0 * material.lambda / (lengthY* geoFacY) * (lengthX * lengthZ - ARedXZ) + Modelica.Units.SI.ThermalConductance CThY = 2.0 * material.lambda / (lengthY* geoFacY) * (lengthX * lengthZ - ARedXZ) "Thermal conductance in the y dimension"; - Modelica.SIunits.ThermalConductance CThZ = 2.0 * material.lambda / (lengthZ* geoFacZ) * (lengthY * lengthX - ARedXY) + Modelica.Units.SI.ThermalConductance CThZ = 2.0 * material.lambda / (lengthZ* geoFacZ) * (lengthY * lengthX - ARedXY) "Thermal conductance in the z dimension"; - equation heatPort_x1.Q_flow = CThX * (heatPort_x1.T - T); heatPort_x2.Q_flow = CThX * (heatPort_x2.T - T); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatConduction/MultiLayerHeatConduction1DNodes.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatConduction/MultiLayerHeatConduction1DNodes.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatConduction/MultiLayerHeatConduction1DNodes.mo" 2021-11-24 08:09:20.999366455 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatConduction/MultiLayerHeatConduction1DNodes.mo" 2021-11-24 08:10:33.591148268 +0000 @@ -30,17 +30,17 @@ "Thermal properties for each material layer" annotation (HideResult=true); - Modelica.SIunits.Length lengthY = 1.0 + Modelica.Units.SI.Length lengthY = 1.0 "Length in y dimension"; - Modelica.SIunits.Length lengthZ = 1.0 + Modelica.Units.SI.Length lengthZ = 1.0 "Length in z dimension"; parameter Integer nLayers = 1 "Number of material layers in the x dimension"; parameter Integer nNodes[nLayers] = {1} "Number of numerical nodes of layer i"; - parameter Modelica.SIunits.Length thickness[nLayers] = {1.0} + parameter Modelica.Units.SI.Length thickness[nLayers] = {1.0} "Thickness of layer i"; - parameter Modelica.SIunits.Temp_K T_start[nLayers]={293.15 for i in 1:nLayers} + parameter Modelica.Units.SI.Temperature T_start[nLayers]={293.15 for i in 1:nLayers} "Start temperature of the layer i" annotation (Dialog(tab="Initialization")); parameter Integer layerWithHeatSource = 1 diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatRadiation/BaseClasses/HeatRadiationTwoSurfaces.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatRadiation/BaseClasses/HeatRadiationTwoSurfaces.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatRadiation/BaseClasses/HeatRadiationTwoSurfaces.mo" 2021-11-24 08:09:20.999366455 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatRadiation/BaseClasses/HeatRadiationTwoSurfaces.mo" 2021-11-24 08:10:33.571148328 +0000 @@ -1,10 +1,10 @@ within BuildingSystems.HAM.HeatRadiation.BaseClasses; partial function HeatRadiationTwoSurfaces "General heat radiation exchange between two surfaces." - input Modelica.SIunits.Temp_K T1 + input Modelica.Units.SI.Temperature T1 "Temperature of surface 1"; - input Modelica.SIunits.Temp_K T2 + input Modelica.Units.SI.Temperature T2 "Temperature of surface 2"; - output Modelica.SIunits.HeatFlux q_flow + output Modelica.Units.SI.HeatFlux q_flow "Specific net long-wave radiation flow between surface 1 and 2"; end HeatRadiationTwoSurfaces; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatRadiation/Examples/HeatRadiationParallelSurfaces.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatRadiation/Examples/HeatRadiationParallelSurfaces.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatRadiation/Examples/HeatRadiationParallelSurfaces.mo" 2021-11-24 08:09:20.999366455 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatRadiation/Examples/HeatRadiationParallelSurfaces.mo" 2021-11-24 08:10:33.559148365 +0000 @@ -2,15 +2,15 @@ model HeatRadiationParallelSurfaces "Test problem for heat radiation between two parallel surfaces" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Emissivity epsilon1 = 0.9 + parameter Modelica.Units.SI.Emissivity epsilon1 = 0.9 "Long-wave emission coefficient of surface 1"; - parameter Modelica.SIunits.Emissivity epsilon2 = 0.9 + parameter Modelica.Units.SI.Emissivity epsilon2 = 0.9 "Long-wave emission coefficient of surface 2"; - parameter Modelica.SIunits.Temp_K T1 = 273.15 + 20.0 + parameter Modelica.Units.SI.Temperature T1 = 273.15 + 20.0 "Temperature surface 1"; - Modelica.SIunits.Temp_K T2 + Modelica.Units.SI.Temperature T2 "Temperature surface 2"; - Modelica.SIunits.HeatFlux q_flow + Modelica.Units.SI.HeatFlux q_flow "Heat flux between surface 1 and surface 2"; equation T2 = 293.15 + 20.0 * Modelica.Math.sin(2.0*Modelica.Constants.pi*time/3600); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatRadiation/HeatRadiationTwoEnclosedSurfaces.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatRadiation/HeatRadiationTwoEnclosedSurfaces.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatRadiation/HeatRadiationTwoEnclosedSurfaces.mo" 2021-11-24 08:09:20.999366455 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatRadiation/HeatRadiationTwoEnclosedSurfaces.mo" 2021-11-24 08:10:33.555148377 +0000 @@ -3,7 +3,7 @@ "Calculates the heat radiation exchange between surface 1 enclosed by surface 2." extends BuildingSystems.HAM.HeatRadiation.BaseClasses.HeatRadiationTwoSurfaces; - input Modelica.SIunits.Emissivity epsilon1 + input Modelica.Units.SI.Emissivity epsilon1 "Long-wave emission coefficient of surface 1"; algorithm q_flow := Modelica.Constants.sigma * epsilon1 * (T1*T1*T1*T1 - T2*T2*T2*T2); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatRadiation/HeatRadiationTwoParallelSurfaces.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatRadiation/HeatRadiationTwoParallelSurfaces.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatRadiation/HeatRadiationTwoParallelSurfaces.mo" 2021-11-24 08:09:20.999366455 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/HAM/HeatRadiation/HeatRadiationTwoParallelSurfaces.mo" 2021-11-24 08:10:33.547148400 +0000 @@ -2,9 +2,9 @@ function HeatRadiationTwoParallelSurfaces "Calculates the heat radiation exchange between he parallel surface 1 and surface 2." extends BuildingSystems.HAM.HeatRadiation.BaseClasses.HeatRadiationTwoSurfaces; - input Modelica.SIunits.Emissivity epsilon1 + input Modelica.Units.SI.Emissivity epsilon1 "Long-wave emission coefficient of surface 1"; - input Modelica.SIunits.Emissivity epsilon2 + input Modelica.Units.SI.Emissivity epsilon2 "Long-wave emission coefficient of surface 2"; algorithm q_flow := Modelica.Constants.sigma * (T1*T1*T1*T1 - T2*T2*T2*T2) / (1.0 / epsilon1 + 1.0 / epsilon2 - 1.0); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Interfaces/MoisturePortGeneral.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Interfaces/MoisturePortGeneral.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Interfaces/MoisturePortGeneral.mo" 2021-11-24 08:09:20.999366455 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Interfaces/MoisturePortGeneral.mo" 2021-11-24 08:10:33.419148785 +0000 @@ -1,9 +1,9 @@ within BuildingSystems.Interfaces; connector MoisturePortGeneral "Port for moisture transfer (base connector type)" - Modelica.SIunits.MassFraction x(start = 0.01) "Absolute moisture"; + Modelica.Units.SI.MassFraction x(start = 0.01) "Absolute moisture"; // start value is necessary for numerical reasons - flow Modelica.SIunits.MassFlowRate m_flow "Mass flow rate water vapor"; + flow Modelica.Units.SI.MassFlowRate m_flow "Mass flow rate water vapor"; annotation(Documentation(info="
This connector is used for the moisture flow between components. The variables in the connector are:
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Interfaces/RadiationPortGeneral.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Interfaces/RadiationPortGeneral.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Interfaces/RadiationPortGeneral.mo" 2021-11-24 08:09:20.999366455 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Interfaces/RadiationPortGeneral.mo" 2021-11-24 08:10:33.335149037 +0000 @@ -1,15 +1,15 @@ within BuildingSystems.Interfaces; connector RadiationPortGeneral "Port for solar radiation transport (base connector type)" - Modelica.SIunits.RadiantEnergyFluenceRate IrrDir + Modelica.Units.SI.RadiantEnergyFluenceRate IrrDir "Area specific direct solar radiation"; - Modelica.SIunits.RadiantEnergyFluenceRate IrrDif + Modelica.Units.SI.RadiantEnergyFluenceRate IrrDif "Area specific diffuse solar radiation"; - Modelica.SIunits.Conversions.NonSIunits.Angle_deg angleDegInc + Modelica.Units.NonSI.Angle_deg angleDegInc "Incident angle of the direct solar radiation"; - Modelica.SIunits.Conversions.NonSIunits.Angle_deg angleDegAziSun + Modelica.Units.NonSI.Angle_deg angleDegAziSun "Azimuth angle of the sun"; - Modelica.SIunits.Conversions.NonSIunits.Angle_deg angleDegHeightSun + Modelica.Units.NonSI.Angle_deg angleDegHeightSun "Height angle of the sun"; annotation(Documentation(info="This connector is used for the solar radiation transport between components. diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Media/Air.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Media/Air.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Media/Air.mo" 2021-11-24 08:09:20.999366455 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Media/Air.mo" 2021-11-24 08:10:33.275149217 +0000 @@ -74,24 +74,24 @@ ThermodynamicState state "Thermodynamic state record for optional functions"; - Modelica.SIunits.Conversions.NonSIunits.Temperature_degC T_degC= - Modelica.SIunits.Conversions.to_degC(T) "Temperature of medium in [degC]"; - Modelica.SIunits.Conversions.NonSIunits.Pressure_bar p_bar= - Modelica.SIunits.Conversions.to_bar(p) "Absolute pressure of medium in [bar]"; + Modelica.Units.NonSI.Temperature_degC T_degC= + Modelica.Units.Conversions.to_degC(T) "Temperature of medium in [degC]"; + 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"; // Declarations for Air only protected - Modelica.SIunits.TemperatureDifference dT(start=T_default-reference_T) - "Temperature difference used to compute enthalpy"; + Modelica.Units.SI.TemperatureDifference dT(start=T_default-reference_T) + "Temperature difference used to compute enthalpy"; equation MM = 1/(X[1]/steam.MM+(X[2])/dryair.MM); @@ -291,13 +291,14 @@ "Return ideal gas constant as a function from thermodynamic state, only valid for phi<1" algorithm - R := dryair.R*(1 - state.X[Water]) + steam.R*state.X[Water]; + R_s := dryair.R*(1 - state.X[Water]) + steam.R*state.X[Water]; annotation ( smoothOrder=2, Inline=true, Documentation(info=" The ideal gas constant for moist air is computed from thermodynamic state assuming that all water is in the gas phase. ")); + end gasConstant; redeclare function extends pressure @@ -393,7 +394,8 @@ "Return the specific entropy, only valid for phi<1" protected - Modelica.SIunits.MoleFraction[2] Y "Molar fraction"; + Modelica.Units.SI.MoleFraction[2] Y "Molar fraction"; + algorithm Y := massToMoleFractions( state.X, {steam.MM,dryair.MM}); @@ -466,6 +468,7 @@
@@ -133,8 +133,8 @@ function enthalpyOfLiquid "Return the specific enthalpy of liquid" extends Modelica.Icons.Function; - input Modelica.SIunits.Temperature T "Temperature"; - output Modelica.SIunits.SpecificEnthalpy h "Specific enthalpy"; + input Modelica.Units.SI.Temperature T "Temperature"; + output Modelica.Units.SI.SpecificEnthalpy h "Specific enthalpy"; algorithm h := (T - reference_T)*cp_const; annotation ( @@ -154,6 +154,7 @@ ")); + end enthalpyOfLiquid; redeclare function extends specificInternalEnergy @@ -671,12 +672,12 @@ // medium model with another medium model that does not provide an // implementation of these classes. protected - final constant Modelica.SIunits.SpecificHeatCapacity cv_const = cp_const + final constant Modelica.Units.SI.SpecificHeatCapacity cv_const = cp_const "Specific heat capacity at constant volume"; - constant Modelica.SIunits.VelocityOfSound a_const=1484 + constant Modelica.Units.SI.VelocityOfSound a_const=1484 "Constant velocity of sound"; - constant Modelica.SIunits.MolarMass MM_const=0.018015268 "Molar mass"; + constant Modelica.Units.SI.MolarMass MM_const=0.018015268 "Molar mass"; replaceable function der_specificHeatCapacityCp "Return the derivative of the specific heat capacity at constant pressure" @@ -734,8 +735,8 @@ function kinematicViscosity "Return the kinematic viscosity" extends Modelica.Icons.Function; - input Modelica.SIunits.Temperature T "Temperature"; - output Modelica.SIunits.KinematicViscosity kinVis "Kinematic viscosity"; + input Modelica.Units.SI.Temperature T "Temperature"; + output Modelica.Units.SI.KinematicViscosity kinVis "Kinematic viscosity"; algorithm kinVis := smooth(1, if T < 278.15 then @@ -785,6 +786,7 @@ ")); + end kinematicViscosity; annotation(preferredView="info", Documentation(info=" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Media/Steam.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Media/Steam.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Media/Steam.mo" 2021-11-24 08:09:21.003366442 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Media/Steam.mo" 2021-11-24 08:10:32.459151668 +0000 @@ -15,7 +15,7 @@ Temperature(start=T_default), SpecificEnthalpy(start=2.7e6, nominal=2.7e6), Density(start=0.6, nominal=1), - T_default=Modelica.SIunits.Conversions.from_degC(100), + T_default=Modelica.Units.Conversions.from_degC(100), p_default=100000); extends Modelica.Icons.Package; @@ -34,7 +34,7 @@ h = specificEnthalpy(state); d = density(state); u = h - p/d; - R = steam.R; + R_s = steam.R; state.p = p; state.T = T; end BaseProperties; @@ -474,18 +474,19 @@ record GasProperties "Coefficient data record for properties of perfect gases" extends Modelica.Icons.Record; - Modelica.SIunits.MolarMass MM "Molar mass"; - Modelica.SIunits.SpecificHeatCapacity R "Gas constant"; + Modelica.Units.SI.MolarMass MM "Molar mass"; + Modelica.Units.SI.SpecificHeatCapacity R "Gas constant"; + end GasProperties; constant GasProperties steam( - R = Modelica.Media.IdealGases.Common.SingleGasesData.H2O.R, + R = Modelica.Media.IdealGases.Common.SingleGasesData.H2O.R_s, MM = Modelica.Media.IdealGases.Common.SingleGasesData.H2O.MM) "Steam properties"; function g2 "Gibbs function for region 2: g(p,T)" extends Modelica.Icons.Function; - input Modelica.SIunits.Pressure p "Pressure"; - input Modelica.SIunits.Temperature T "Temperature (K)"; + input Modelica.Units.SI.Pressure p "Pressure"; + input Modelica.Units.SI.Temperature T "Temperature (K)"; output Modelica.Media.Common.GibbsDerivs g "Dimensionless Gibbs function and derivatives w.r.t. pi and tau"; protected @@ -494,7 +495,7 @@ algorithm g.p := p; g.T := T; - g.R := Modelica.Media.Water.IF97_Utilities.BaseIF97.data.RH2O; + g.R_s := Modelica.Media.Water.IF97_Utilities.BaseIF97.data.RH2O; // assert(p > 0.0, // "IF97 medium function g2 called with too low pressure\n" + "p = " + // String(p) + " Pa <= 0.0 Pa"); @@ -715,6 +716,7 @@ ")); + end g2; function temperature_ph diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Media/Water.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Media/Water.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Media/Water.mo" 2021-11-24 08:09:21.003366442 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Media/Water.mo" 2021-11-24 08:10:32.347152005 +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/BuildingSystems 2.0.0-master/Technologies/Chillers/Data/CompressionChillers/CompressionChillerGeneral.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Chillers/Data/CompressionChillers/CompressionChillerGeneral.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Chillers/Data/CompressionChillers/CompressionChillerGeneral.mo" 2021-11-24 08:09:21.151365997 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Chillers/Data/CompressionChillers/CompressionChillerGeneral.mo" 2021-11-24 08:10:32.271152233 +0000 @@ -1,10 +1,10 @@ within BuildingSystems.Technologies.Chillers.Data.CompressionChillers; record CompressionChillerGeneral - parameter Modelica.SIunits.Power P_nominal + parameter Modelica.Units.SI.Power P_nominal "Electrical power demand of the chiller under nominal conditions"; - parameter Modelica.SIunits.Temp_K TCon_nominal + parameter Modelica.Units.SI.Temperature TCon_nominal "Temperature of the condensor under nominal conditions"; - parameter Modelica.SIunits.Temp_K TEva_nominal + parameter Modelica.Units.SI.Temperature TEva_nominal "Temperature of the evaporator under nominal conditions"; parameter Real COP_nominal[:,2] "Part load charateristic of the chiller under nominal conditions"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Chillers/Data/CompressionChillers/StandardChiller1000W.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Chillers/Data/CompressionChillers/StandardChiller1000W.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Chillers/Data/CompressionChillers/StandardChiller1000W.mo" 2021-11-24 08:09:21.151365997 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Chillers/Data/CompressionChillers/StandardChiller1000W.mo" 2021-11-24 08:10:32.263152257 +0000 @@ -4,5 +4,4 @@ TCon_nominal = 273.15 + 35.0, TEva_nominal = 273.15 + 7.0, COP_nominal={{0.0,3.0},{1.0,3.0}}) - "Generic chiller: Q_flow_eva = 3 kW"; - // Q_flow_chiller = Q_flow_eva = 3 kW, nominal conditions for water/water systems according to DIN EN 14511-2:2013-12, Table 11, discharge temperatures + "Generic chiller: Q_flow_eva = 3 kW"; \ No newline at end of file diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Chillers/Data/CompressionChillers/StandardChiller2000W.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Chillers/Data/CompressionChillers/StandardChiller2000W.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Chillers/Data/CompressionChillers/StandardChiller2000W.mo" 2021-11-24 08:09:21.151365997 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Chillers/Data/CompressionChillers/StandardChiller2000W.mo" 2021-11-24 08:10:32.231152353 +0000 @@ -4,5 +4,4 @@ TCon_nominal = 273.15 + 35.0, TEva_nominal = 273.15 + 7.0, COP_nominal={{0.0,3.0},{1.0,3.0}}) - "Generic chiller: Q_flow_eva = 6 kW"; - // Q_flow_chiller = Q_flow_eva = 6 kW, nominal conditions for water/water systems according to DIN EN 14511-2:2013-12, Table 11, discharge temperatures + "Generic chiller: Q_flow_eva = 6 kW"; \ No newline at end of file diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Chillers/Data/CompressionChillers/StandardChiller3000W.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Chillers/Data/CompressionChillers/StandardChiller3000W.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Chillers/Data/CompressionChillers/StandardChiller3000W.mo" 2021-11-24 08:09:21.151365997 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Chillers/Data/CompressionChillers/StandardChiller3000W.mo" 2021-11-24 08:10:32.227152365 +0000 @@ -4,5 +4,4 @@ TCon_nominal = 273.15 + 35.0, TEva_nominal = 273.15 + 7.0, COP_nominal={{0.0,3.0},{1.0,3.0}}) - "Generic chiller: Q_flow_eva = 9 kW"; - // Q_flow_chiller = Q_flow_eva = 9 kW, nominal conditions for water/water systems according to DIN EN 14511-2:2013-12, Table 11, discharge temperatures + "Generic chiller: Q_flow_eva = 9 kW"; \ No newline at end of file diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Chillers/Data/CompressionChillers/TurboCoreTT300.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Chillers/Data/CompressionChillers/TurboCoreTT300.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Chillers/Data/CompressionChillers/TurboCoreTT300.mo" 2021-11-24 08:09:21.151365997 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Chillers/Data/CompressionChillers/TurboCoreTT300.mo" 2021-11-24 08:10:32.223152377 +0000 @@ -4,5 +4,4 @@ TCon_nominal = 273.15 + 35.0, TEva_nominal = 273.15 + 7.0, COP_nominal={{0.0,0.0},{0.1,0.0},{0.2,0.0},{0.249,0.0},{0.25,10.1},{0.3,10.2},{0.4,10.5},{0.45,10.6},{0.5,10.4},{0.6,9.4},{0.7,8.0},{0.8,7.0},{0.9,6.2},{1.0,5.5}}) - "TurboCoreTT300: Q_flow_eva = 265 kW"; - // Q_flow_chiller=Q_flow_eva=265kW, nominal conditions for water/water systems according to DIN EN 14511-2:2013-12, Table 11, discharge temperatures + "TurboCoreTT300: Q_flow_eva = 265 kW"; \ No newline at end of file diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Chillers/Data/CompressionChillers/TurboCoreTT350.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Chillers/Data/CompressionChillers/TurboCoreTT350.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Chillers/Data/CompressionChillers/TurboCoreTT350.mo" 2021-11-24 08:09:21.151365997 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Chillers/Data/CompressionChillers/TurboCoreTT350.mo" 2021-11-24 08:10:32.219152389 +0000 @@ -4,5 +4,4 @@ TCon_nominal = 273.15 + 35.0, TEva_nominal = 273.15 + 7.0, COP_nominal={{0.0,0.0},{0.1,0.0},{0.2,0.0},{0.249,0.0},{0.25,10.0},{0.3,10.1},{0.4,10.3},{0.45,10.4},{0.5,10.2},{0.6,9.2},{0.7,7.9},{0.8,6.9},{0.9,6.2},{1.0,5.5}}) - "TurboCoreTT350: Q_flow_eva = 350 kW"; - // Q_flow_chiller=Q_flow_eva=350kW, nominal conditions for water/water systems according to DIN EN 14511-2:2013-12, Table 11, discharge temperatures + "TurboCoreTT350: Q_flow_eva = 350 kW"; \ No newline at end of file diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Chillers/Data/CompressionChillers/TurboCoreTT400.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Chillers/Data/CompressionChillers/TurboCoreTT400.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Chillers/Data/CompressionChillers/TurboCoreTT400.mo" 2021-11-24 08:09:21.151365997 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Chillers/Data/CompressionChillers/TurboCoreTT400.mo" 2021-11-24 08:10:32.215152401 +0000 @@ -4,5 +4,4 @@ TCon_nominal = 273.15 + 35.0, TEva_nominal = 273.15 + 7.0, COP_nominal={{0.0,0.0},{0.1,0.0},{0.2,0.0},{0.249,0.0},{0.25,10.2},{0.3,10.3},{0.4,10.5},{0.45,10.6},{0.5,10.4},{0.6,9.4},{0.7,8.0},{0.8,6.9},{0.9,6.2},{1.0,5.5}}) - "TurboCoreTT400: Q_flow_eva = 460 kW"; - // Q_flow_chiller=Q_flow_eva=460kW, nominal conditions for water/water systems according to DIN EN 14511-2:2013-12, Table 11, discharge temperatures + "TurboCoreTT400: Q_flow_eva = 460 kW"; \ No newline at end of file diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Chillers/Data/CompressionChillers/TurboCoreTT500.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Chillers/Data/CompressionChillers/TurboCoreTT500.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Chillers/Data/CompressionChillers/TurboCoreTT500.mo" 2021-11-24 08:09:21.151365997 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Chillers/Data/CompressionChillers/TurboCoreTT500.mo" 2021-11-24 08:10:32.211152413 +0000 @@ -4,5 +4,4 @@ TCon_nominal = 273.15 + 35.0, TEva_nominal = 273.15 + 7.0, COP_nominal={{0.0,0.0},{0.1,0.0},{0.2,0.0},{0.249,0.0},{0.25,10.8},{0.3,10.8},{0.4,10.9},{0.45,10.8},{0.5,10.6},{0.6,9.6},{0.7,8.3},{0.8,7.2},{0.9,6.4},{1.0,5.6}}) - "TurboCoreTT500: Q_flow_eva = 635 kW"; - //Q_chiller=Q_flow_eva=635kW, nominal conditions for water/water systems according to DIN EN 14511-2:2013-12, Table 11, discharge temperatures + "TurboCoreTT500: Q_flow_eva = 635 kW"; \ No newline at end of file diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Chillers/Examples/CompressionChiller.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Chillers/Examples/CompressionChiller.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Chillers/Examples/CompressionChiller.mo" 2021-11-24 08:09:21.151365997 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Chillers/Examples/CompressionChiller.mo" 2021-11-24 08:10:32.203152437 +0000 @@ -3,10 +3,10 @@ "Example of a compression chiller" extends Modelica.Icons.Example; package Medium = BuildingSystems.Media.Water; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 10.0 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 10.0 "Nominal mass flow rate" annotation(Dialog(group = "Nominal condition")); - parameter Modelica.SIunits.MassFlowRate m_flow = 10.0; + parameter Modelica.Units.SI.MassFlowRate m_flow = 10.0; BuildingSystems.Fluid.Sources.Boundary_pT bou_con( redeclare package Medium = Medium, nPorts=1, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Chillers/Examples/CompressionChillerWithStorage.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Chillers/Examples/CompressionChillerWithStorage.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Chillers/Examples/CompressionChillerWithStorage.mo" 2021-11-24 08:09:21.151365997 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Chillers/Examples/CompressionChillerWithStorage.mo" 2021-11-24 08:10:32.187152485 +0000 @@ -3,10 +3,10 @@ "Example of a compression chiller with cold water storage" extends Modelica.Icons.Example; package Medium = BuildingSystems.Media.Water; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 1.0 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 1.0 "Nominal mass flow rate" annotation(Dialog(group = "Nominal condition")); - parameter Modelica.SIunits.MassFlowRate m_flow = 1.0; + parameter Modelica.Units.SI.MassFlowRate m_flow = 1.0; BuildingSystems.Fluid.Sources.Boundary_pT bou_con( redeclare package Medium = Medium, nPorts=1, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Cogeneration/CogenerationUnit.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Cogeneration/CogenerationUnit.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Cogeneration/CogenerationUnit.mo" 2021-11-24 08:09:21.151365997 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Cogeneration/CogenerationUnit.mo" 2021-11-24 08:10:32.159152569 +0000 @@ -7,9 +7,9 @@ replaceable parameter BuildingSystems.Technologies.Cogeneration.Data.BaseClasses.CogenerationUnitGeneral cogenerationUnitData "Characteristic data of the Cogeneration unit" annotation(Dialog(tab = "General"),Evaluate=true, choicesAllMatching=true); - final parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal = cogenerationUnitData.Q_flow_nominal + final parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal = cogenerationUnitData.Q_flow_nominal "Nominal heat flow rate (at full load)"; - final parameter Modelica.SIunits.HeatFlowRate P_nominal = cogenerationUnitData.P_nominal + final parameter Modelica.Units.SI.HeatFlowRate P_nominal = cogenerationUnitData.P_nominal "Nominal electrical power (at full load)"; Modelica.Blocks.Interfaces.RealInput u( min = 0.0, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Cogeneration/Data/BaseClasses/CogenerationUnitGeneral.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Cogeneration/Data/BaseClasses/CogenerationUnitGeneral.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Cogeneration/Data/BaseClasses/CogenerationUnitGeneral.mo" 2021-11-24 08:09:21.151365997 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Cogeneration/Data/BaseClasses/CogenerationUnitGeneral.mo" 2021-11-24 08:10:32.131152653 +0000 @@ -1,21 +1,21 @@ within BuildingSystems.Technologies.Cogeneration.Data.BaseClasses; record CogenerationUnitGeneral - parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal + parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal "Nominal heat flow rate (at full load)"; - parameter Modelica.SIunits.HeatFlowRate QCon_flow_nominal + parameter Modelica.Units.SI.HeatFlowRate QCon_flow_nominal "Nominal heat flow rate (at full load with condensing energy)"; - parameter Modelica.SIunits.HeatFlowRate P_nominal + parameter Modelica.Units.SI.HeatFlowRate P_nominal "Nominal electrical power (at full load)"; parameter Real etaEl[:,2] "Electrical efficieny dependent on the partial load"; parameter Real etaTh[:,2] "Thermal efficieny dependent on the partial load"; - parameter Modelica.SIunits.Length length + parameter Modelica.Units.SI.Length length "Length of the cogeneration unit"; - parameter Modelica.SIunits.Length width + parameter Modelica.Units.SI.Length width "Width of the cogeneration unit"; - parameter Modelica.SIunits.Length height + parameter Modelica.Units.SI.Length height "Height of the cogeneration unit"; - parameter Modelica.SIunits.Mass m + parameter Modelica.Units.SI.Mass m "Mass of the cogeneration unit"; end CogenerationUnitGeneral; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Cogeneration/Examples/CogenerationUnit.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Cogeneration/Examples/CogenerationUnit.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Cogeneration/Examples/CogenerationUnit.mo" 2021-11-24 08:09:21.151365997 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Cogeneration/Examples/CogenerationUnit.mo" 2021-11-24 08:10:32.027152966 +0000 @@ -3,10 +3,10 @@ "Example of a cogeneration unit" extends Modelica.Icons.Example; package Medium = BuildingSystems.Media.Water; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 0.1 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 0.1 "Nominal mass flow rate" annotation(Dialog(group = "Nominal condition")); - parameter Modelica.SIunits.MassFlowRate m_flow = 0.1 + parameter Modelica.Units.SI.MassFlowRate m_flow = 0.1 "Current mass flow rate"; BuildingSystems.Fluid.Sources.Boundary_pT bou_con( redeclare package Medium = Medium, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Cogeneration/Examples/CogenerationUnitWithStorage.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Cogeneration/Examples/CogenerationUnitWithStorage.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Cogeneration/Examples/CogenerationUnitWithStorage.mo" 2021-11-24 08:09:21.151365997 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Cogeneration/Examples/CogenerationUnitWithStorage.mo" 2021-11-24 08:10:32.015153001 +0000 @@ -3,10 +3,10 @@ "Example of a cogeneration unit with warm water storage" extends Modelica.Icons.Example; package Medium = BuildingSystems.Media.Water; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 0.1 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 0.1 "Nominal mass flow rate" annotation(Dialog(group = "Nominal condition")); - parameter Modelica.SIunits.MassFlowRate m_flow = 0.1; + parameter Modelica.Units.SI.MassFlowRate m_flow = 0.1; BuildingSystems.Fluid.Sensors.TemperatureTwoPort senTemIn( redeclare package Medium = Medium, m_flow_nominal=m_flow_nominal) annotation (Placement(transformation(extent={{18,-24},{38,-4}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/DistrictHeatingNetworks/BaseClasses/DHN_Detailed.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/DistrictHeatingNetworks/BaseClasses/DHN_Detailed.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/DistrictHeatingNetworks/BaseClasses/DHN_Detailed.mo" 2021-11-24 08:09:21.151365997 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/DistrictHeatingNetworks/BaseClasses/DHN_Detailed.mo" 2021-11-24 08:10:31.991153073 +0000 @@ -5,10 +5,10 @@ parameter Modelica.Media.Interfaces.Types.Temperature T_start = 273.15 + 90.0 "Initial conditions of the supply side"; // Different Variables uses to facilitate results check - Modelica.SIunits.Heat Q_DHN_I "Energy loss in DHN part I"; - Modelica.SIunits.Heat Q_DHN_II "Energy loss in DHN part II"; - Modelica.SIunits.Heat Q_DHN_III "Energy loss in DHN part III"; - Modelica.SIunits.Heat Q_DHN "Total energy loss in DHN"; + Modelica.Units.SI.Heat Q_DHN_I "Energy loss in DHN part I"; + Modelica.Units.SI.Heat Q_DHN_II "Energy loss in DHN part II"; + Modelica.Units.SI.Heat Q_DHN_III "Energy loss in DHN part III"; + Modelica.Units.SI.Heat Q_DHN "Total energy loss in DHN"; //Boundary: Modelica.Thermal.HeatTransfer.Components.ThermalCollector thermalCollectorDHN(m=71) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/DistrictHeatingNetworks/BoundaryConditions/GroundTemperature0D.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/DistrictHeatingNetworks/BoundaryConditions/GroundTemperature0D.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/DistrictHeatingNetworks/BoundaryConditions/GroundTemperature0D.mo" 2021-11-24 08:09:21.151365997 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/DistrictHeatingNetworks/BoundaryConditions/GroundTemperature0D.mo" 2021-11-24 08:10:31.411154815 +0000 @@ -2,12 +2,12 @@ model GroundTemperature0D "Model that computes the ground temperature at a choosen depth " - parameter Modelica.SIunits.Temperature Tmean "Mean annual temperature"; - parameter Modelica.SIunits.TemperatureDifference A + parameter Modelica.Units.SI.Temperature Tmean "Mean annual temperature"; + parameter Modelica.Units.SI.TemperatureDifference A "Annual temperature amplitude"; - parameter Modelica.SIunits.Length z "Depth"; - parameter Modelica.SIunits.Time t0 "Time shift"; - parameter Modelica.SIunits.ThermalDiffusivity alpha = 8.2e-7 + parameter Modelica.Units.SI.Length z "Depth"; + parameter Modelica.Units.SI.Time t0 "Time shift"; + parameter Modelica.Units.SI.ThermalDiffusivity alpha = 8.2e-7 "Ground thermal diffusivity"; parameter Boolean use_geo = false "Set to true to use geothermal grade, false geo = 0"; parameter Real geo( unit="K/m") = 0.03 "Geothermal grade" annotation(Dialog(enable=use_geo)); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/DistrictHeatingNetworks/EnergyProductionUnits/BaseClasses/PartialCentral.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/DistrictHeatingNetworks/EnergyProductionUnits/BaseClasses/PartialCentral.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/DistrictHeatingNetworks/EnergyProductionUnits/BaseClasses/PartialCentral.mo" 2021-11-24 08:09:21.151365997 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/DistrictHeatingNetworks/EnergyProductionUnits/BaseClasses/PartialCentral.mo" 2021-11-24 08:10:31.395154864 +0000 @@ -12,12 +12,12 @@ allowFlowReversal1=false, allowFlowReversal2=false) annotation (Placement(transformation(extent={{10,-4},{-10,16}}))); - parameter Modelica.SIunits.MassFlowRate mProduction_flow_nominal + parameter Modelica.Units.SI.MassFlowRate mProduction_flow_nominal "Nominal mass flow rate"; - parameter Modelica.SIunits.MassFlowRate mDHN_flow_nominal + parameter Modelica.Units.SI.MassFlowRate mDHN_flow_nominal "Nominal mass flow rate"; - parameter Modelica.SIunits.Pressure dpProduction_nominal; - parameter Modelica.SIunits.Pressure dpDHN_nominal; + parameter Modelica.Units.SI.Pressure dpProduction_nominal; + parameter Modelica.Units.SI.Pressure dpDHN_nominal; parameter Real eps=0.8 "Heat exchanger effectiveness"; equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/DistrictHeatingNetworks/EnergyTransferStations/BaseClasses/PartialStation.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/DistrictHeatingNetworks/EnergyTransferStations/BaseClasses/PartialStation.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/DistrictHeatingNetworks/EnergyTransferStations/BaseClasses/PartialStation.mo" 2021-11-24 08:09:21.151365997 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/DistrictHeatingNetworks/EnergyTransferStations/BaseClasses/PartialStation.mo" 2021-11-24 08:10:31.363154960 +0000 @@ -10,7 +10,7 @@ redeclare package Medium2 = Medium, eps=eps) annotation (Placement(transformation(extent={{-40,-80},{-20,-100}}))); - parameter Modelica.SIunits.Efficiency eps=0.9 + parameter Modelica.Units.SI.Efficiency eps=0.9 "Heat exchanger effectiveness"; Modelica.Blocks.Interfaces.RealInput Tset "Heating set temperature" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/DistrictHeatingNetworks/EnergyTransferStations/Station_dp.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/DistrictHeatingNetworks/EnergyTransferStations/Station_dp.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/DistrictHeatingNetworks/EnergyTransferStations/Station_dp.mo" 2021-11-24 08:09:21.151365997 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/DistrictHeatingNetworks/EnergyTransferStations/Station_dp.mo" 2021-11-24 08:10:31.351154996 +0000 @@ -10,9 +10,9 @@ allowFlowReversal2=false, show_T=show_T, from_dp1=from_dp)); - parameter Modelica.SIunits.Temperature TminDHN = 273.15 + 30 + parameter Modelica.Units.SI.Temperature TminDHN = 273.15 + 30 "Minimum return temperature in building's installation"; - parameter Modelica.SIunits.TemperatureDifference Tdrop = 25 + parameter Modelica.Units.SI.TemperatureDifference Tdrop = 25 "Desired Temperature drop in building's installation"; BuildingSystems.Technologies.DistrictHeatingNetworks.Utilities.Tanh tanhAmbience( @@ -53,18 +53,18 @@ p_start=300000, V_start=1) annotation (Placement(transformation(extent={{-36,6},{-16,26}}))); - parameter Modelica.SIunits.HeatFlowRate Q_nominal + parameter Modelica.Units.SI.HeatFlowRate Q_nominal "Nominal Heat power in the Heat Transfer Station" annotation(Dialog(group = "Nominal condition")); - parameter Modelica.SIunits.MassFlowRate m_flow_nominalDHN = 1.05*m_flow_nominalHeating + parameter Modelica.Units.SI.MassFlowRate m_flow_nominalDHN = 1.05*m_flow_nominalHeating "Nominal mass flow rate" annotation(Dialog(group = "Nominal condition")); - parameter Modelica.SIunits.Pressure dp_nominalDHN = 40000 + parameter Modelica.Units.SI.Pressure dp_nominalDHN = 40000 "Nominal pressure drop at the Heat Exchanger DHN loop"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominalHeating = Q_nominal/4182/Tdrop + parameter Modelica.Units.SI.MassFlowRate m_flow_nominalHeating = Q_nominal/4182/Tdrop "Nominal mass flow rate" annotation(Dialog(group = "Nominal condition")); - parameter Modelica.SIunits.Pressure dp_nominalHeating = 40000 + parameter Modelica.Units.SI.Pressure dp_nominalHeating = 40000 "Nominal pressure drop at the Heat Exchanger heating installation loop" annotation(Dialog(group = "Nominal condition")); Modelica.Blocks.Sources.RealExpression m_flow_signal( @@ -81,9 +81,9 @@ Modelica.Blocks.Sources.RealExpression Tmin( y=TminDHN) annotation (Placement(transformation(extent={{-52,-50},{28,-30}}))); - parameter Modelica.SIunits.Temperature Tsupply_max + parameter Modelica.Units.SI.Temperature Tsupply_max "Maximum supply temperature in building"; - parameter Modelica.SIunits.Temperature Tsupply_min + parameter Modelica.Units.SI.Temperature Tsupply_min "Minimum supply temperature in building"; parameter Real factor_Tsupply = 7 "Un- or smooth changes of the supply set temperature. tanh((InSignal-SetValue)/factor) (notice, tanh(1)=0.7616 tanh(3)=0.9951)"; @@ -91,9 +91,9 @@ "Un- or smooth changes of mass flow rate of the heating system. tanh((InSignal-SetValue)/factor) (notice, tanh(1)=0.7616 tanh(3)=0.9951)"; parameter Boolean addPowerToMedium=false "Set to false to avoid any power in the pump model (=heat and flow work) being added to medium (may give simpler equations)"; - parameter Modelica.SIunits.Pressure dpValve_nominal + parameter Modelica.Units.SI.Pressure dpValve_nominal annotation(Dialog(group = "Nominal condition")); - parameter Modelica.SIunits.Pressure dpFixed_nominal=0 + parameter Modelica.Units.SI.Pressure dpFixed_nominal=0 annotation(Dialog(group = "Nominal condition")); Buildings.BaseClasses.RelationRadiationConvection relationRadiationConvection(radiationportion=0.5) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/DistrictHeatingNetworks/EnergyTransferStations/Station_m_flow.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/DistrictHeatingNetworks/EnergyTransferStations/Station_m_flow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/DistrictHeatingNetworks/EnergyTransferStations/Station_m_flow.mo" 2021-11-24 08:09:21.151365997 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/DistrictHeatingNetworks/EnergyTransferStations/Station_m_flow.mo" 2021-11-24 08:10:31.315155104 +0000 @@ -6,9 +6,9 @@ m2_flow_nominal=m_flow_nominalHeating, dp2_nominal=dp_nominalHeating, show_T=show_T)); - parameter Modelica.SIunits.Temperature TminDHN = 273.15 + 30 + parameter Modelica.Units.SI.Temperature TminDHN = 273.15 + 30 "Minimum return temperature in building's installation"; - parameter Modelica.SIunits.TemperatureDifference Tdrop = 25 + parameter Modelica.Units.SI.TemperatureDifference Tdrop = 25 "Desired Temperature drop in building's installation"; parameter Real eps_inst = 1 "Factor accountig per inneficiency of installation. Increase heat to be delivered"; BuildingSystems.Technologies.DistrictHeatingNetworks.Utilities.Tanh tanhAmbience( @@ -46,15 +46,15 @@ p_start=300000, V_start=1) annotation (Placement(transformation(extent={{-40,2},{-20,22}}))); - parameter Modelica.SIunits.HeatFlowRate Q_nominal + parameter Modelica.Units.SI.HeatFlowRate Q_nominal "Nominal Heat power in the Heat Transfer Station" annotation(Dialog(group = "Nominal condition")); - parameter Modelica.SIunits.MassFlowRate m_flow_nominalDHN = 1.05*m_flow_nominalHeating + parameter Modelica.Units.SI.MassFlowRate m_flow_nominalDHN = 1.05*m_flow_nominalHeating "Nominal mass flow rate" annotation(Dialog(group = "Nominal condition")); - parameter Modelica.SIunits.Pressure dp_nominalDHN = 40000 + parameter Modelica.Units.SI.Pressure dp_nominalDHN = 40000 "Nominal pressure drop at the Heat Exchanger DHN loop" annotation(Dialog(group = "Nominal condition")); - parameter Modelica.SIunits.MassFlowRate m_flow_nominalHeating = Q_nominal/4182/Tdrop + parameter Modelica.Units.SI.MassFlowRate m_flow_nominalHeating = Q_nominal/4182/Tdrop "Nominal mass flow rate" annotation(Dialog(group = "Nominal condition")); - parameter Modelica.SIunits.Pressure dp_nominalHeating = 40000 + parameter Modelica.Units.SI.Pressure dp_nominalHeating = 40000 "Nominal pressure drop at the Heat Exchanger heating installation loop" annotation(Dialog(group = "Nominal condition")); Modelica.Blocks.Sources.RealExpression m_flow_signal( y=m_flow_nominalHeating*tanhZone.y) @@ -70,9 +70,9 @@ Modelica.Blocks.Sources.RealExpression Tmin( y=TminDHN) annotation (Placement(transformation(extent={{-40,-60},{40,-40}}))); - parameter Modelica.SIunits.Temperature Tsupply_max = 273.15 +90 + parameter Modelica.Units.SI.Temperature Tsupply_max = 273.15 +90 "Maximum supply temperature in building"; - parameter Modelica.SIunits.Temperature Tsupply_min = 273.15+70 + parameter Modelica.Units.SI.Temperature Tsupply_min = 273.15+70 "Minimum supply temperature in building"; parameter Real factor_Tsupply = 7 "Un- or smooth changes of the supply set temperature. tanh((InSignal-SetValue)/factor) (notice, tanh(1)=0.7616 tanh(3)=0.9951)"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/DistrictHeatingNetworks/UndergroundPipes/BaseClasses/DHN_Umodels/UConcreteWoolInsulation.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/DistrictHeatingNetworks/UndergroundPipes/BaseClasses/DHN_Umodels/UConcreteWoolInsulation.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/DistrictHeatingNetworks/UndergroundPipes/BaseClasses/DHN_Umodels/UConcreteWoolInsulation.mo" 2021-11-24 08:09:21.151365997 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/DistrictHeatingNetworks/UndergroundPipes/BaseClasses/DHN_Umodels/UConcreteWoolInsulation.mo" 2021-11-24 08:10:31.175155524 +0000 @@ -6,37 +6,37 @@ final th_c=(d_ins - 2.2*A*B/(A + B)/2), final SPip=(Modelica.Constants.pi*d_o*d_o/4) - SWat, final SWat=Modelica.Constants.pi*d_i*d_i/4); - parameter Modelica.SIunits.Length H_real + parameter Modelica.Units.SI.Length H_real "Depth of the pipe center" annotation(Dialog(tab="General", group="Laying")); - parameter Modelica.SIunits.Length A + parameter Modelica.Units.SI.Length A "Width case" annotation(Dialog(tab="General", group="Laying")); - parameter Modelica.SIunits.Length B + parameter Modelica.Units.SI.Length B "Height case" annotation(Dialog(tab="General", group="Laying")); - parameter Modelica.SIunits.CoefficientOfHeatTransfer h_gs = 14.6 + parameter Modelica.Units.SI.CoefficientOfHeatTransfer h_gs = 14.6 "Heat transfer coefficient at the ground surface" annotation(Dialog(tab="Assumptions")); - parameter Modelica.SIunits.Diameter d_g = 1.313 + parameter Modelica.Units.SI.Diameter d_g = 1.313 "Diameter of the undisturbed ground" annotation(Dialog(tab="General", group="Geometry")); - parameter Modelica.SIunits.ThermalConductivity lam_g = 1.2 + parameter Modelica.Units.SI.ThermalConductivity lam_g = 1.2 "Heat conductivity of the undisturbed ground" annotation(Dialog(tab="General", group="Thermal properties")); protected - parameter Modelica.SIunits.Length H = H_real+(lam_g/h_gs) + parameter Modelica.Units.SI.Length H = H_real+(lam_g/h_gs) "Equivalent deph of the pipe center"; - parameter Modelica.SIunits.ThermalResistance R_hi = 1/(Modelica.Constants.pi*d_ins*h_s); - parameter Modelica.SIunits.ThermalResistance R_hg = 1/(2*(A+B)*h_s) + parameter Modelica.Units.SI.ThermalResistance R_hi = 1/(Modelica.Constants.pi*d_ins*h_s); + parameter Modelica.Units.SI.ThermalResistance R_hg = 1/(2*(A+B)*h_s) "Thermal resistance at the concrete surface"; - parameter Modelica.SIunits.CoefficientOfHeatTransfer h_s = 7.7 + parameter Modelica.Units.SI.CoefficientOfHeatTransfer h_s = 7.7 "Heat transfer coefficient of the air duct between concrete surface and ground"; - parameter Modelica.SIunits.ThermalResistance R_g = (1/(2*Modelica.Constants.pi*lam_g))*log(4*H/d_c) + parameter Modelica.Units.SI.ThermalResistance R_g = (1/(2*Modelica.Constants.pi*lam_g))*log(4*H/d_c) "Ground thermal resistance"; - parameter Modelica.SIunits.ThermalResistance R_i = R_hi + (1/Modelica.Constants.pi)*(0.5/lam_ins*log(d_ins/d_o)+0.5/lam_c*log(d_c/d_ins) + 0.5/lam_g*log(d_g/d_c)) + parameter Modelica.Units.SI.ThermalResistance R_i = R_hi + (1/Modelica.Constants.pi)*(0.5/lam_ins*log(d_ins/d_o)+0.5/lam_c*log(d_c/d_ins) + 0.5/lam_g*log(d_g/d_c)) "Pipe's thermal resistance"; - parameter Modelica.SIunits.ThermalResistance R_m = R_g + parameter Modelica.Units.SI.ThermalResistance R_m = R_g "Thermal resistance between pipes"; equation U[1] = (R_g+R_i)/((R_g+R_i)^2-R_m^2); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/DistrictHeatingNetworks/UndergroundPipes/BaseClasses/DHN_Umodels/UPartialClass.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/DistrictHeatingNetworks/UndergroundPipes/BaseClasses/DHN_Umodels/UPartialClass.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/DistrictHeatingNetworks/UndergroundPipes/BaseClasses/DHN_Umodels/UPartialClass.mo" 2021-11-24 08:09:21.151365997 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/DistrictHeatingNetworks/UndergroundPipes/BaseClasses/DHN_Umodels/UPartialClass.mo" 2021-11-24 08:10:31.163155561 +0000 @@ -1,13 +1,13 @@ within BuildingSystems.Technologies.DistrictHeatingNetworks.UndergroundPipes.BaseClasses.DHN_Umodels; partial model UPartialClass - parameter Modelica.SIunits.Area SPip = (Modelica.Constants.pi*d_o*d_o/4) - SWat + parameter Modelica.Units.SI.Area SPip = (Modelica.Constants.pi*d_o*d_o/4) - SWat "Cross-sectional wall area of the pipe (area of piping material)" annotation(Dialog(tab="General", group="Geometry")); - parameter Modelica.SIunits.Area SWat = (Modelica.Constants.pi*d_i*d_i/4) + parameter Modelica.Units.SI.Area SWat = (Modelica.Constants.pi*d_i*d_i/4) "Cross-sectional inside area of the pipe" annotation(Dialog(tab="General", group="Geometry")); - parameter Modelica.SIunits.Density den_p = 8 + parameter Modelica.Units.SI.Density den_p = 8 "Density of the pipe material" annotation(Dialog(tab="General", group="Thermal properties")); - parameter Modelica.SIunits.SpecificHeatCapacity cp_p = 0.49 + parameter Modelica.Units.SI.SpecificHeatCapacity cp_p = 0.49 "Specific heat capacity of the pipe material" annotation(Dialog(tab="General", group="Thermal properties")); extends diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/DistrictHeatingNetworks/UndergroundPipes/BaseClasses/DHN_Umodels/UPreinsulated.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/DistrictHeatingNetworks/UndergroundPipes/BaseClasses/DHN_Umodels/UPreinsulated.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/DistrictHeatingNetworks/UndergroundPipes/BaseClasses/DHN_Umodels/UPreinsulated.mo" 2021-11-24 08:09:21.151365997 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/DistrictHeatingNetworks/UndergroundPipes/BaseClasses/DHN_Umodels/UPreinsulated.mo" 2021-11-24 08:10:31.155155584 +0000 @@ -5,24 +5,24 @@ final nPipes=2, final SPip=(Modelica.Constants.pi*d_o*d_o/4) - SWat, final SWat=Modelica.Constants.pi*d_i*d_i/4); - parameter Modelica.SIunits.Length H_real + parameter Modelica.Units.SI.Length H_real "Depth of the pipe center" annotation(Dialog(tab="General", group="Laying")); - parameter Modelica.SIunits.Length E + parameter Modelica.Units.SI.Length E "Distance between pipes' centers" annotation(Dialog(tab="General", group="Laying")); - parameter Modelica.SIunits.Diameter d_g = 1.313 + parameter Modelica.Units.SI.Diameter d_g = 1.313 "Diameter of the undisturbed ground" annotation(Dialog(tab="General", group="Geometry")); - parameter Modelica.SIunits.ThermalConductivity lam_g = 1.2 + parameter Modelica.Units.SI.ThermalConductivity lam_g = 1.2 "Heat conductivity of the undisturbed ground" annotation(Dialog(tab="General", group="Thermal properties")); - parameter Modelica.SIunits.CoefficientOfHeatTransfer h_gs = 14.6 + parameter Modelica.Units.SI.CoefficientOfHeatTransfer h_gs = 14.6 "Heat transfer coefficient at the ground surface" annotation(Dialog(tab="Assumptions")); protected - parameter Modelica.SIunits.Length H = H_real+(lam_g/h_gs) + parameter Modelica.Units.SI.Length H = H_real+(lam_g/h_gs) "Equivalent deph of the pipe center"; - parameter Modelica.SIunits.ThermalResistance R_g = (1/(2*Modelica.Constants.pi*lam_g))*log(4*H/d_c) + parameter Modelica.Units.SI.ThermalResistance R_g = (1/(2*Modelica.Constants.pi*lam_g))*log(4*H/d_c) "Ground thermal resistance"; - parameter Modelica.SIunits.ThermalResistance R_i = 0.5/Modelica.Constants.pi/lam_ins*log(d_ins/d_o)+0.5/Modelica.Constants.pi/lam_c*log(d_c/d_ins) + 0.5/Modelica.Constants.pi/lam_g*log(d_g/d_c) + parameter Modelica.Units.SI.ThermalResistance R_i = 0.5/Modelica.Constants.pi/lam_ins*log(d_ins/d_o)+0.5/Modelica.Constants.pi/lam_c*log(d_c/d_ins) + 0.5/Modelica.Constants.pi/lam_g*log(d_g/d_c) "Pipe's thermal resistance"; - parameter Modelica.SIunits.ThermalResistance R_m = (1/(4*Modelica.Constants.pi*lam_g))*log(1+(2*H/E)^2) + parameter Modelica.Units.SI.ThermalResistance R_m = (1/(4*Modelica.Constants.pi*lam_g))*log(1+(2*H/E)^2) "Thermal resistance between pipes"; equation U[1] = (R_g+R_i)/(((R_g+R_i)^2)-(R_m^2)); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/DistrictHeatingNetworks/UndergroundPipes/BaseClasses/DHN_Umodels/UPrescribed.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/DistrictHeatingNetworks/UndergroundPipes/BaseClasses/DHN_Umodels/UPrescribed.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/DistrictHeatingNetworks/UndergroundPipes/BaseClasses/DHN_Umodels/UPrescribed.mo" 2021-11-24 08:09:21.151365997 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/DistrictHeatingNetworks/UndergroundPipes/BaseClasses/DHN_Umodels/UPrescribed.mo" 2021-11-24 08:10:31.147155609 +0000 @@ -2,9 +2,9 @@ model UPrescribed extends BuildingSystems.Technologies.DistrictHeatingNetworks.UndergroundPipes.BaseClasses.DHN_Umodels.UPartialClass( final nPipes=2); - parameter Modelica.SIunits.ThermalConductivity U1_constant + parameter Modelica.Units.SI.ThermalConductivity U1_constant "Thermal conductivity specific to length"; - parameter Modelica.SIunits.ThermalConductivity U2_constant = U1_constant + parameter Modelica.Units.SI.ThermalConductivity U2_constant = U1_constant "Thermal conductivity specific to length"; equation U[1] = U1_constant; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/DistrictHeatingNetworks/UndergroundPipes/BaseClasses/PipeInfo.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/DistrictHeatingNetworks/UndergroundPipes/BaseClasses/PipeInfo.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/DistrictHeatingNetworks/UndergroundPipes/BaseClasses/PipeInfo.mo" 2021-11-24 08:09:21.151365997 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/DistrictHeatingNetworks/UndergroundPipes/BaseClasses/PipeInfo.mo" 2021-11-24 08:10:31.143155621 +0000 @@ -1,27 +1,27 @@ within BuildingSystems.Technologies.DistrictHeatingNetworks.UndergroundPipes.BaseClasses; model PipeInfo - parameter Modelica.SIunits.Diameter d_i + parameter Modelica.Units.SI.Diameter d_i "Pipe's inner diameter" annotation(Dialog(tab="General", group="Geometry")); - parameter Modelica.SIunits.Diameter d_o = d_i/(0.0366*Modelica.Math.log(d_i)+0.769) + parameter Modelica.Units.SI.Diameter d_o = d_i/(0.0366*Modelica.Math.log(d_i)+0.769) "Pipe's outter diameter" annotation(Dialog(tab="General", group="Geometry")); - parameter Modelica.SIunits.Thickness th_ins = 0.05 + parameter Modelica.Units.SI.Thickness th_ins = 0.05 "Insulation's thickness" annotation(Dialog(tab="General", group="Geometry")); - parameter Modelica.SIunits.Thickness th_c = 0.005 + parameter Modelica.Units.SI.Thickness th_c = 0.005 "Cover's thickness" annotation(Dialog(tab="General", group="Geometry")); - parameter Modelica.SIunits.ThermalConductivity lam_ins(min=1E-4) = 0.032 + parameter Modelica.Units.SI.ThermalConductivity lam_ins(min=1E-4) = 0.032 "Heat conductivity of the pipe's insulation" annotation(Dialog(tab="General", group="Thermal properties")); - parameter Modelica.SIunits.ThermalConductivity lam_c(min=1E-4) = 0.43 + parameter Modelica.Units.SI.ThermalConductivity lam_c(min=1E-4) = 0.43 "Heat conductivity of the covers material" annotation(Dialog(tab="General", group="Thermal properties")); protected - parameter Modelica.SIunits.Diameter d_ins = d_o + 2*th_ins + parameter Modelica.Units.SI.Diameter d_ins = d_o + 2*th_ins "Insulation's thickness"; - parameter Modelica.SIunits.Diameter d_c = d_ins + 2*th_c + parameter Modelica.Units.SI.Diameter d_c = d_ins + 2*th_c "Cover's outter diameter"; equation assert(d_o > d_i, " Outter's pipe diameter d_o, " + String(d_o) +" , diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/DistrictHeatingNetworks/UndergroundPipes/BaseClasses/Qmodel.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/DistrictHeatingNetworks/UndergroundPipes/BaseClasses/Qmodel.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/DistrictHeatingNetworks/UndergroundPipes/BaseClasses/Qmodel.mo" 2021-11-24 08:09:21.151365997 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/DistrictHeatingNetworks/UndergroundPipes/BaseClasses/Qmodel.mo" 2021-11-24 08:10:31.135155645 +0000 @@ -2,15 +2,15 @@ model Qmodel parameter Boolean InteractionBetweenPipes = true "Set false to avoid modelling interaction between pipes"; - Modelica.SIunits.ThermalConductivity U1 + Modelica.Units.SI.ThermalConductivity U1 "Thermal conductivity specific to length"; - Modelica.SIunits.ThermalConductivity U2 + Modelica.Units.SI.ThermalConductivity U2 "Thermal conductivity specific to length"; final parameter Integer nPipes=2 "Number of pipes"; parameter Integer nEle= 2 "Number of elements used in the discretization"; - parameter Modelica.SIunits.Length len + parameter Modelica.Units.SI.Length len "Pipe's length"; Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow[nEle] ThermalCollectorQ1S "Heat input into radiator from convective heat transfer" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/DistrictHeatingNetworks/UndergroundPipes/ParallelPipes.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/DistrictHeatingNetworks/UndergroundPipes/ParallelPipes.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/DistrictHeatingNetworks/UndergroundPipes/ParallelPipes.mo" 2021-11-24 08:09:21.151365997 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/DistrictHeatingNetworks/UndergroundPipes/ParallelPipes.mo" 2021-11-24 08:10:31.083155800 +0000 @@ -45,9 +45,9 @@ annotation (Placement(transformation(extent={{10,-50},{-10,-70}}))); parameter Integer nNodes = integer(ceil(length/100)) "Number of volume segments"; - parameter Modelica.SIunits.Length length( min=Modelica.Constants.eps) + parameter Modelica.Units.SI.Length length( min=Modelica.Constants.eps) "Length of the pipe"; - 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.Media.Interfaces.Types.AbsolutePressure p_start=Medium.p_default @@ -70,7 +70,7 @@ parameter Real deltaM=0.1 "Fraction of nominal flow rate where flow transitions to laminar" annotation (Dialog(tab="Flow resistance")); - parameter Modelica.SIunits.ReynoldsNumber ReC=4000 + parameter Modelica.Units.SI.ReynoldsNumber ReC=4000 "Reynolds number where transition to turbulent starts" annotation (Dialog(tab="Flow resistance")); Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a port_a annotation (Placement(transformation(extent={{-10,88},{10,108}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/ElectricalStorages/BaseClasses/Battery.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/ElectricalStorages/BaseClasses/Battery.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/ElectricalStorages/BaseClasses/Battery.mo" 2021-11-24 08:09:21.151365997 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/ElectricalStorages/BaseClasses/Battery.mo" 2021-11-24 08:10:30.987156090 +0000 @@ -18,17 +18,17 @@ parameter Integer nBat(min = 1) = 1 "Number of batteries" annotation(Dialog(tab = "General")); - final parameter Modelica.SIunits.Energy E_nominal(displayUnit="kWh") = nBat*batteryData.E_nominal + final parameter Modelica.Units.SI.Energy E_nominal(displayUnit="kWh") = nBat*batteryData.E_nominal "Nominal capacity of all batteries"; - final parameter Modelica.SIunits.Efficiency etaCharge = batteryData.etaCharge + final parameter Modelica.Units.SI.Efficiency etaCharge = batteryData.etaCharge "Charge efficiency"; - final parameter Modelica.SIunits.Efficiency etaLoad = batteryData.etaLoad + final parameter Modelica.Units.SI.Efficiency etaLoad = batteryData.etaLoad "Load efficiency"; final parameter Real SOC_min = batteryData.SOC_min "Minimal accepted charge level"; - final parameter Modelica.SIunits.Power PLoad_max = nBat*batteryData.PLoad_max + final parameter Modelica.Units.SI.Power PLoad_max = nBat*batteryData.PLoad_max "Maximal discharging power of battery"; - final parameter Modelica.SIunits.Power PCharge_max = nBat*batteryData.PCharge_max + final parameter Modelica.Units.SI.Power PCharge_max = nBat*batteryData.PCharge_max "Maximal charging power of battery"; final parameter Real fDis(unit="1/s") = batteryData.fDis "Loss factor of the battery"; @@ -41,38 +41,38 @@ "Battery rate"; final parameter Real a_mcr(unit="W/J") = batteryData.a_mcr "Maximum charge rate parameter"; - Modelica.SIunits.Power PChargeEff + + Modelica.Units.SI.Power PChargeEff "Effective power of the electrical source"; - Modelica.SIunits.Power PLoadEff + Modelica.Units.SI.Power PLoadEff "Effective power of the electrical load"; - Modelica.SIunits.Energy EAva( + Modelica.Units.SI.Energy EAva( displayUnit="kWh", start = c*SOC_start*E_nominal) "Available charge of the battery"; - Modelica.SIunits.Energy EBou( + Modelica.Units.SI.Energy EBou( displayUnit="kWh", start = (1.0-c)*SOC_start*E_nominal) "Bound charge of the battery"; - Modelica.SIunits.Energy E( + Modelica.Units.SI.Energy E( displayUnit="kWh", start = E_nominal * SOC_start) "Total charge of the battery"; - Modelica.SIunits.Energy h1 + Modelica.Units.SI.Energy h1 "Helping variable 1"; - Modelica.SIunits.Energy h2 + Modelica.Units.SI.Energy h2 "Helping variable 2"; - Modelica.SIunits.Power PNet + Modelica.Units.SI.Power PNet "Net power for charging (> 0.0 W) or discharging (< 0.0 W)"; - Modelica.SIunits.Energy E_charged( + Modelica.Units.SI.Energy E_charged( start = E_start, displayUnit="kWh") "Total energy charged to the battery"; - Modelica.SIunits.Energy E_discharged( + Modelica.Units.SI.Energy E_discharged( start = E_start, displayUnit="kWh") "Total energy taken from the battery"; - constant Modelica.SIunits.Energy E_start = 0; - + constant Modelica.Units.SI.Energy E_start = 0; equation EAva = h1*c; EBou = h2*(1-c); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/ElectricalStorages/BatteryComplex.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/ElectricalStorages/BatteryComplex.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/ElectricalStorages/BatteryComplex.mo" 2021-11-24 08:09:21.151365997 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/ElectricalStorages/BatteryComplex.mo" 2021-11-24 08:10:30.967156149 +0000 @@ -3,21 +3,21 @@ extends BaseClasses.Battery; final parameter Real p(unit="1") = batteryData.p "Peukert coefficient"; - Modelica.SIunits.Power PLoadAva + + Modelica.Units.SI.Power PLoadAva "Discharging power using available electrons in EAva"; - Modelica.SIunits.Power PLoadBou + Modelica.Units.SI.Power PLoadBou "Discharging power forcing electro-chemical reaction in EBou"; - Modelica.SIunits.Energy E_current(displayUnit="kWh") + Modelica.Units.SI.Energy E_current(displayUnit="kWh") "Current energy content at actual discharge rate"; - Modelica.SIunits.Energy E_max(displayUnit="kWh")= + Modelica.Units.SI.Energy E_max(displayUnit="kWh")= t_loadMax/t_loadNominal * (t_loadMax/t_loadNominal)^p * E_nominal "Maximum energy content at 100hr discharge rate"; - constant Modelica.SIunits.Time t_loadNominal = 20.0 * 3600.0 + constant Modelica.Units.SI.Time t_loadNominal = 20.0 * 3600.0 "Nominal discharge time at rated capacity"; - constant Modelica.SIunits.Time t_loadMax = 100.0 * 3600.0 + constant Modelica.Units.SI.Time t_loadMax = 100.0 * 3600.0 "Nominal discharge time at rated capacity"; - equation der(EAva) = PChargeEff - E_nominal/E_current * PLoadAva + k*(h2 - h1); der(EBou) = -k*(h2 - h1) - E_nominal/E_current * PLoadBou; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/ElectricalStorages/Data/BaseClasses/ElectricBatteryGeneral.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/ElectricalStorages/Data/BaseClasses/ElectricBatteryGeneral.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/ElectricalStorages/Data/BaseClasses/ElectricBatteryGeneral.mo" 2021-11-24 08:09:21.151365997 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/ElectricalStorages/Data/BaseClasses/ElectricBatteryGeneral.mo" 2021-11-24 08:10:30.935156246 +0000 @@ -1,8 +1,8 @@ within BuildingSystems.Technologies.ElectricalStorages.Data.BaseClasses; record ElectricBatteryGeneral - parameter Modelica.SIunits.Energy E_nominal + parameter Modelica.Units.SI.Energy E_nominal "Nominal capacity"; - parameter Modelica.SIunits.Voltage U_nominal + parameter Modelica.Units.SI.Voltage U_nominal "Nominal voltage"; parameter Real SOC_min "Minimal accepted charge level (SOC)"; @@ -10,15 +10,15 @@ "Capacity relation available to bound energy"; parameter Real k(unit="1/s") "Battery rate"; - parameter Modelica.SIunits.Efficiency etaCharge + parameter Modelica.Units.SI.Efficiency etaCharge "Charge efficiency"; - parameter Modelica.SIunits.Efficiency etaLoad + parameter Modelica.Units.SI.Efficiency etaLoad "Load efficiency"; parameter Real fDis "Self-discharge factor (percentage per day)"; - parameter Modelica.SIunits.Power PLoad_max + parameter Modelica.Units.SI.Power PLoad_max "Maximal discharging power"; - parameter Modelica.SIunits.Power PCharge_max + parameter Modelica.Units.SI.Power PCharge_max "Maximal charging power"; parameter Real p(unit="1") "Peukert coefficient"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Photovoltaics/BaseClasses/ElectricalModels/ElectricalModelGeneral.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Photovoltaics/BaseClasses/ElectricalModels/ElectricalModelGeneral.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Photovoltaics/BaseClasses/ElectricalModels/ElectricalModelGeneral.mo" 2021-11-24 08:09:21.155365986 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Photovoltaics/BaseClasses/ElectricalModels/ElectricalModelGeneral.mo" 2021-11-24 08:10:30.815156606 +0000 @@ -19,7 +19,7 @@ output Modelica.Blocks.Interfaces.RealOutput I(unit="A", start = 0.0) "Module current" annotation (Placement(transformation(extent={{60,-50},{80,-30}}), iconTransformation(extent={{60,-50},{80,-30}}))); - Modelica.SIunits.Voltage Ut + Modelica.Units.SI.Voltage Ut "Temperature voltage"; protected final constant Real e(unit = "A.s") = Modelica.Constants.F/Modelica.Constants.N_A diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Photovoltaics/BaseClasses/ElectricalModels/ElectricalModelOneDiodeGeneral.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Photovoltaics/BaseClasses/ElectricalModels/ElectricalModelOneDiodeGeneral.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Photovoltaics/BaseClasses/ElectricalModels/ElectricalModelOneDiodeGeneral.mo" 2021-11-24 08:09:21.155365986 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Photovoltaics/BaseClasses/ElectricalModels/ElectricalModelOneDiodeGeneral.mo" 2021-11-24 08:10:30.799156654 +0000 @@ -2,9 +2,9 @@ partial model ElectricalModelOneDiodeGeneral "Basic electrical one diode model of a PV module" extends BuildingSystems.Technologies.Photovoltaics.BaseClasses.ElectricalModels.ElectricalModelGeneral; - parameter Modelica.SIunits.ElectricCurrent Ik0 + parameter Modelica.Units.SI.ElectricCurrent Ik0 "Short circuit current under standard conditions"; - parameter Modelica.SIunits.Voltage Ul0 + parameter Modelica.Units.SI.Voltage Ul0 "Open circuit voltage under standard conditions"; parameter Real tIk0(unit = "mA/K") "Temperature coefficient for the short circuit current"; @@ -12,19 +12,19 @@ "Temperature coefficient for the open circuit voltage"; parameter Real factor "Scaling factor adaptation to the complex PV cell model"; - parameter Modelica.SIunits.LinearTemperatureCoefficient alphaIk = 0.001 * tIk0 / Ik0 + parameter Modelica.Units.SI.LinearTemperatureCoefficient alphaIk = 0.001 * tIk0 / Ik0 "Specific temperature coefficient for the short circuit"; - parameter Modelica.SIunits.LinearTemperatureCoefficient alphaUl = tUl0 / Ul0 + parameter Modelica.Units.SI.LinearTemperatureCoefficient alphaUl = tUl0 / Ul0 "Specific temperature coefficient for the open circuit"; parameter Real c0(unit = "m2/V") = (Ik0 / nCelPar) / 1000.0 "Coefficient for the photo current"; parameter Real m1 = 1.0 "Diode factor"; - Modelica.SIunits.ElectricCurrent IPho + Modelica.Units.SI.ElectricCurrent IPho "Photo current"; Real ISat1 "Saturation current nA"; - Modelica.SIunits.Voltage Ul + Modelica.Units.SI.Voltage Ul "Open circuit voltage"; constant Real NANO = 1.0e-9; equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Photovoltaics/BaseClasses/ElectricalModels/ElectricalModelTwoDiodesGeneral.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Photovoltaics/BaseClasses/ElectricalModels/ElectricalModelTwoDiodesGeneral.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Photovoltaics/BaseClasses/ElectricalModels/ElectricalModelTwoDiodesGeneral.mo" 2021-11-24 08:09:21.155365986 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Photovoltaics/BaseClasses/ElectricalModels/ElectricalModelTwoDiodesGeneral.mo" 2021-11-24 08:10:30.779156714 +0000 @@ -14,13 +14,13 @@ "Parallel resistance"; parameter Real RSer(unit = "V/A") "Serial resistance"; - Modelica.SIunits.ElectricCurrent IPho + + Modelica.Units.SI.ElectricCurrent IPho "Photo current"; - Modelica.SIunits.ElectricCurrent ISat1 + Modelica.Units.SI.ElectricCurrent ISat1 "Saturation current diode 1"; - Modelica.SIunits.ElectricCurrent ISat2 + Modelica.Units.SI.ElectricCurrent ISat2 "Saturation current diode 2"; - equation IPho = (c1 + c2 * 0.001 * T) * ITot; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Photovoltaics/BaseClasses/PVModuleGeneral.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Photovoltaics/BaseClasses/PVModuleGeneral.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Photovoltaics/BaseClasses/PVModuleGeneral.mo" 2021-11-24 08:09:21.155365986 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Photovoltaics/BaseClasses/PVModuleGeneral.mo" 2021-11-24 08:10:30.739156834 +0000 @@ -53,7 +53,7 @@ output Modelica.Blocks.Interfaces.RealOutput IField(unit="A") "Current of the PV field" annotation (Placement(transformation(extent={{-10,-10},{10,10}}, origin={60,40}), iconTransformation(extent={{-10,-10},{10,10}}, origin={60,40}))); - final Modelica.SIunits.Area AField = pvModuleData.height * pvModuleData.width * nModSer * nModPar + final Modelica.Units.SI.Area AField = pvModuleData.height * pvModuleData.width * nModSer * nModPar "Area of the PV field"; input Interfaces.Angle_degInput angleDegTil_in if use_AngleDegTil_in "Controlled tilt angle of the PV module" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Photovoltaics/Data/PhotovoltaicModules.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Photovoltaics/Data/PhotovoltaicModules.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Photovoltaics/Data/PhotovoltaicModules.mo" 2021-11-24 08:09:21.155365986 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Photovoltaics/Data/PhotovoltaicModules.mo" 2021-11-24 08:10:30.659157075 +0000 @@ -12,27 +12,27 @@ "2nd coefficient ISat2"; parameter Real Eg(unit = "eV") "Band gap"; - parameter Modelica.SIunits.Length height + parameter Modelica.Units.SI.Length height "PV module height"; - parameter Modelica.SIunits.ElectricCurrent Ik0 + parameter Modelica.Units.SI.ElectricCurrent Ik0 "Short circuit current under standard conditions"; parameter Integer nCelSer "Number of serial connected cells within the PV module"; parameter Integer nCelPar "Number of parallel connected cells within the PV module"; - parameter Modelica.SIunits.Power PEl_nominal + parameter Modelica.Units.SI.Power PEl_nominal "Module power under standard conditions"; - parameter Modelica.SIunits.Resistance RSer + parameter Modelica.Units.SI.Resistance RSer "Serial resistance"; - parameter Modelica.SIunits.Resistance RPar + parameter Modelica.Units.SI.Resistance RPar "Parallel resistance"; parameter Real tIk0 "Temperature coefficient for the short circuit current in mA/C"; parameter Real tUl0 "Temperature coefficient for the open circuit voltage in V/C"; - parameter Modelica.SIunits.Voltage Ul0 + parameter Modelica.Units.SI.Voltage Ul0 "Open circuit voltage under standard conditions"; - parameter Modelica.SIunits.Length width + parameter Modelica.Units.SI.Length width "Module width"; end DataSetPhotovoltaicModule; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Photovoltaics/Examples/PVModuleControlledTiltAngle.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Photovoltaics/Examples/PVModuleControlledTiltAngle.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Photovoltaics/Examples/PVModuleControlledTiltAngle.mo" 2021-11-24 08:09:21.155365986 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/Photovoltaics/Examples/PVModuleControlledTiltAngle.mo" 2021-11-24 08:10:30.607157231 +0000 @@ -18,7 +18,7 @@ annotation (Placement(transformation(extent={{-74,62},{-54,82}}))); Modelica.Blocks.Sources.Sine sine( amplitude=45, - freqHz=1/86400, +f =1/86400, phase=0, offset=45, startTime=0) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/SolarThermal/Data/Collectors/CollectorPartial.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/SolarThermal/Data/Collectors/CollectorPartial.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/SolarThermal/Data/Collectors/CollectorPartial.mo" 2021-11-24 08:09:21.155365986 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/SolarThermal/Data/Collectors/CollectorPartial.mo" 2021-11-24 08:10:30.439157735 +0000 @@ -10,7 +10,7 @@ parameter Real V_A(unit="m3/m2") "(fluid Volume)/(absorber area) rate" annotation(Dialog(group="Geometry")); - parameter Modelica.SIunits.Area A + parameter Modelica.Units.SI.Area A "Absorber area of the collector" annotation(Dialog(group="Geometry")); parameter Real IAMC diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/SolarThermal/ThermalCollector.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/SolarThermal/ThermalCollector.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/SolarThermal/ThermalCollector.mo" 2021-11-24 08:09:21.155365986 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/SolarThermal/ThermalCollector.mo" 2021-11-24 08:10:30.331158060 +0000 @@ -25,9 +25,9 @@ annotation (Placement(transformation(extent={{-40,20},{-20,40}}))); parameter Integer nEle(min=1) = 10 "Number of elements used in the discretization"; - parameter Modelica.SIunits.Length width = 1.0 "Width of the collector" + parameter Modelica.Units.SI.Length width = 1.0 "Width of the collector" annotation(Dialog(tab = "General", group = "Geometry")); - parameter Modelica.SIunits.Length height = 1.0 "Height of the collector" + parameter Modelica.Units.SI.Length height = 1.0 "Height of the collector" annotation(Dialog(tab = "General", group = "Geometry")); BuildingSystems.Interfaces.Angle_degOutput angleDegTil "Tilt angle of the solar collector" @@ -35,10 +35,10 @@ BuildingSystems.Interfaces.Angle_degOutput angleDegAzi "Azimuth angle of the solar collector: South=0 deg West=90 deg East=-90 deg" annotation (Dialog(group="Geometry"), Placement(transformation(extent={{-10,-10},{10,10}},rotation=270,origin={-70,-90}), iconTransformation(extent={{-10,-10},{10,10}},rotation=270,origin={-70,-90}))); - parameter Modelica.SIunits.MassFlowRate m_flow_nominal + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal "Nominal mass flow rate at nominal conditions" annotation(Dialog(group = "Nominal condition")); - parameter Modelica.SIunits.Pressure dp_nominal(displayUnit="Pa") + parameter Modelica.Units.SI.Pressure dp_nominal(displayUnit="Pa") "Pressure drop at nominal mass flow rate" annotation(Dialog(group = "Nominal condition")); BuildingSystems.Interfaces.RadiationPort radiationPort @@ -68,18 +68,18 @@ "= true, use linear relation between m_flow and dp for any flow rate"; parameter Boolean AColData = true "= true, use A from collector data; false A = height * width"; - final parameter Modelica.SIunits.Volume V = collectorData.V_A * A + final parameter Modelica.Units.SI.Volume V = collectorData.V_A * A "Volume of the fluid"; - final parameter Modelica.SIunits.HeatCapacity C = collectorData.C_A*A; + final parameter Modelica.Units.SI.HeatCapacity C = collectorData.C_A*A; parameter Boolean use_GSC_in = false "= true, use input for geometric shading coefficient GSC" annotation(Dialog(tab="Advanced")); parameter Real GSC_constant = 0.0 "Constant shading coefficient (if use_GSC_in = true)"; - final parameter Modelica.SIunits.Area A = if AColData then collectorData.A else width * height + final parameter Modelica.Units.SI.Area A = if AColData then collectorData.A else width * height "Absorber area of the collector"; Real IAM "IncidenceAngleModifier"; - Modelica.SIunits.RadiantEnergyFluenceRate IrrTot + Modelica.Units.SI.RadiantEnergyFluenceRate IrrTot "Total solar radiation on collector's absorber surfcace"; Modelica.Blocks.Sources.RealExpression QCon[nEle](y=-A/nEle .* (C_1 .* (vol.T .- preSumCon.port.T) .+ C_2 .* (vol.T .- preSumCon.port.T) .* (vol.T .- diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/SolarThermal/ThermalCollectorInParallel.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/SolarThermal/ThermalCollectorInParallel.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/SolarThermal/ThermalCollectorInParallel.mo" 2021-11-24 08:09:21.155365986 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/SolarThermal/ThermalCollectorInParallel.mo" 2021-11-24 08:10:30.267158252 +0000 @@ -9,7 +9,7 @@ "Number of solar thermal collectors in serie"; parameter Integer nArr(min = 1) = 1 "Number of parallel blocks of solar thermal collectors"; - parameter Modelica.SIunits.Pressure dp_nominal + parameter Modelica.Units.SI.Pressure dp_nominal "Pressure drop at nominal conditions total installation" annotation(Dialog(group = "Nominal condition")); BuildingSystems.Interfaces.Angle_degOutput angleDegAzi diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/SolarThermal/ThermalCollectorInSeries.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/SolarThermal/ThermalCollectorInSeries.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/SolarThermal/ThermalCollectorInSeries.mo" 2021-11-24 08:09:21.155365986 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/SolarThermal/ThermalCollectorInSeries.mo" 2021-11-24 08:10:30.247158311 +0000 @@ -31,7 +31,7 @@ annotation (Placement(transformation(extent={{-12,-10},{8,10}}))); parameter Integer nCol(min=1) = 1 "Number of solar thermal collectors in serie"; - parameter Modelica.SIunits.Pressure dp_nominal + parameter Modelica.Units.SI.Pressure dp_nominal "Pressure drop at nominal conditions total installation" annotation(Dialog(group = "Nominal condition")); BuildingSystems.Interfaces.Angle_degOutput angleDegAzi diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/ThermalStorages/BaseClasses/BuoyancyModels/Buoyancy1.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/ThermalStorages/BaseClasses/BuoyancyModels/Buoyancy1.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/ThermalStorages/BaseClasses/BuoyancyModels/Buoyancy1.mo" 2021-11-24 08:09:21.155365986 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/ThermalStorages/BaseClasses/BuoyancyModels/Buoyancy1.mo" 2021-11-24 08:10:30.219158396 +0000 @@ -2,7 +2,7 @@ model Buoyancy1 "Semilinear buoyancy model with fixed (from literature) coefficients" extends BuildingSystems.Technologies.ThermalStorages.BaseClasses.BuoyancyModels.PartialBuoyancy; - final parameter Modelica.SIunits.ThermalConductance G = if nEle <10 then 0.8*nEle+16 else 26-0.2571*nEle + final parameter Modelica.Units.SI.ThermalConductance G = if nEle <10 then 0.8*nEle+16 else 26-0.2571*nEle "Equivalent thermal conductance between layers"; parameter Real exp_nEle = 1.5 "Exponent for nEle"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/ThermalStorages/BaseClasses/BuoyancyModels/Buoyancy2.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/ThermalStorages/BaseClasses/BuoyancyModels/Buoyancy2.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/ThermalStorages/BaseClasses/BuoyancyModels/Buoyancy2.mo" 2021-11-24 08:09:21.155365986 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/ThermalStorages/BaseClasses/BuoyancyModels/Buoyancy2.mo" 2021-11-24 08:10:30.211158420 +0000 @@ -1,6 +1,6 @@ within BuildingSystems.Technologies.ThermalStorages.BaseClasses.BuoyancyModels; model Buoyancy2 "Semilinear buoyancy model with accesible coefficients" - parameter Modelica.SIunits.ThermalConductance G + parameter Modelica.Units.SI.ThermalConductance G "Equivalent thermal conductance between layers"; parameter Real exp_nEle "Exponent for nEle"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/ThermalStorages/BaseClasses/BuoyancyModels/PartialBuoyancy.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/ThermalStorages/BaseClasses/BuoyancyModels/PartialBuoyancy.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/ThermalStorages/BaseClasses/BuoyancyModels/PartialBuoyancy.mo" 2021-11-24 08:09:21.155365986 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/ThermalStorages/BaseClasses/BuoyancyModels/PartialBuoyancy.mo" 2021-11-24 08:10:30.191158480 +0000 @@ -7,9 +7,9 @@ Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_b port_b[nEle - 1] "Heat port of the top volume" annotation (Placement(transformation(extent={{-10,80},{10,100}}), iconTransformation(extent={{-10,80},{10,100}}))); - Modelica.SIunits.TemperatureDifference dT[nEle - 1] + Modelica.Units.SI.TemperatureDifference dT[nEle - 1] "Temperature difference between layers"; - Modelica.SIunits.HeatFlowRate Q_flow[nEle - 1] + Modelica.Units.SI.HeatFlowRate Q_flow[nEle - 1] "Heat flow rate from port_a -> port_b"; equation for i in 1:nEle-1 loop diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/ThermalStorages/BaseClasses/StratificationModel/PartialInletStratification.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/ThermalStorages/BaseClasses/StratificationModel/PartialInletStratification.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/ThermalStorages/BaseClasses/StratificationModel/PartialInletStratification.mo" 2021-11-24 08:09:21.155365986 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/ThermalStorages/BaseClasses/StratificationModel/PartialInletStratification.mo" 2021-11-24 08:10:30.163158564 +0000 @@ -36,10 +36,10 @@ displayUnit = "degC") annotation (Placement(transformation(extent={{-20,-20},{20,20}},rotation=-90,origin={0,100}))); protected - Modelica.SIunits.MassFlowRate m_flow_eq[nEle]; - Modelica.SIunits.TemperatureDifference dT1(start=0); - Modelica.SIunits.TemperatureDifference dT2(start=0); - Modelica.SIunits.TemperatureDifference dTn(start=1); + Modelica.Units.SI.MassFlowRate m_flow_eq[nEle]; + Modelica.Units.SI.TemperatureDifference dT1(start=0); + Modelica.Units.SI.TemperatureDifference dT2(start=0); + Modelica.Units.SI.TemperatureDifference dTn(start=1); Real factor[nEle]; algorithm position := 1; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/ThermalStorages/Examples/FluidStorageChargeDischargeProfile.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/ThermalStorages/Examples/FluidStorageChargeDischargeProfile.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/ThermalStorages/Examples/FluidStorageChargeDischargeProfile.mo" 2021-11-24 08:09:21.155365986 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/ThermalStorages/Examples/FluidStorageChargeDischargeProfile.mo" 2021-11-24 08:10:30.075158829 +0000 @@ -49,10 +49,10 @@ BuildingSystems.Fluid.Sensors.VolumeFlowRate senVolFlo( redeclare package Medium = Medium, m_flow_nominal=1) annotation (Placement(transformation(extent={{-12,14},{8,34}}))); - Modelica.SIunits.Volume V; - Modelica.SIunits.Heat Q_in(start=0) + Modelica.Units.SI.Volume V; + Modelica.Units.SI.Heat Q_in(start=0) "cumulated amount of energy entering into the TES"; - Modelica.SIunits.Heat Q_out(start=0) + Modelica.Units.SI.Heat Q_out(start=0) "cumulated amount of energy leaving into the TES"; Real HRF = noEvent(if Q_in>0 then Q_out/max(1,Q_in) else 0) "heat recovery factor"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/ThermalStorages/FluidStorage.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/ThermalStorages/FluidStorage.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/ThermalStorages/FluidStorage.mo" 2021-11-24 08:09:21.155365986 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Technologies/ThermalStorages/FluidStorage.mo" 2021-11-24 08:10:30.055158889 +0000 @@ -17,27 +17,27 @@ each nPorts = 3, each T_start = T_start) annotation (Placement(transformation(extent={{-10,-10},{10,10}},origin={32,-10}))); - parameter Modelica.SIunits.Length height = 1.0 + parameter Modelica.Units.SI.Length height = 1.0 "Height of the storage" annotation(Dialog(group="Geometry")); - parameter Modelica.SIunits.Volume V = 1.0 + parameter Modelica.Units.SI.Volume V = 1.0 "Fluid volume of the storage" annotation(Dialog(group="Geometry")); parameter Integer nEle(min=3) = 3 "Number of fluid layers"; - parameter Modelica.SIunits.CoefficientOfHeatTransfer alpha_out = 800.0 + parameter Modelica.Units.SI.CoefficientOfHeatTransfer alpha_out = 800.0 "Coefficient of heat transfer outside of the storage" annotation(Dialog(group="Thermal properties")); - parameter Modelica.SIunits.CoefficientOfHeatTransfer alpha_in = 3000.0 + parameter Modelica.Units.SI.CoefficientOfHeatTransfer alpha_in = 3000.0 "Coefficient of heat transfer inside the storage" annotation(Dialog(group="Thermal properties")); - parameter Modelica.SIunits.ThermalConductivity lambda_ins = 0.05 + parameter Modelica.Units.SI.ThermalConductivity lambda_ins = 0.05 "Thermal heat conductivity of insulation material" annotation(Dialog(group="Thermal properties")); - parameter Modelica.SIunits.Thickness thickness_ins = 0.005 + parameter Modelica.Units.SI.Thickness thickness_ins = 0.005 "Insulation thickness" annotation(Dialog(group="Geometry")); - parameter Modelica.SIunits.Thickness thickness_wall = 1 + parameter Modelica.Units.SI.Thickness thickness_wall = 1 "Wall thickness" annotation(Dialog(group="Geometry")); Modelica.Thermal.HeatTransfer.Components.ThermalConductor HeatThroughTop( @@ -84,28 +84,28 @@ parameter Boolean AdditionalFluidPorts = false "Set to true to add aditional fluid ports connected to intermediate layers" annotation(Dialog(group="Storage configuration")); - parameter Modelica.SIunits.ThermalConductance UA_wall = + parameter Modelica.Units.SI.ThermalConductance UA_wall = (Modelica.Constants.pi * height) / (1.0 / (alpha_out * diameter_ext) + log(diameter_ext / diameter_int) / (2 * lambda_ins) + 1/(alpha_in * diameter_int)) "Thermal conductance walls" annotation(Dialog(group="Thermal properties")); - parameter Modelica.SIunits.ThermalConductance UA_top = + parameter Modelica.Units.SI.ThermalConductance UA_top = 1.0 / (thickness_ins / (lambda_ins * ASec) + 1.0 / (alpha_in * ASec) + 1.0 / (alpha_out * ASec)) "Thermal conductance top" annotation(Dialog(group="Thermal properties")); - parameter Modelica.SIunits.ThermalConductance UA_bot = UA_top + parameter Modelica.Units.SI.ThermalConductance UA_bot = UA_top "Thermal conductance bottom" annotation(Dialog(group="Thermal properties")); protected - parameter Modelica.SIunits.Diameter diameter_int = sqrt(ASec * 4 / Modelica.Constants.pi) + parameter Modelica.Units.SI.Diameter diameter_int = sqrt(ASec * 4 / Modelica.Constants.pi) "Inner diameter of the storage" annotation(Dialog(group="Geometry")); - parameter Modelica.SIunits.Diameter diameter_ext = diameter_int + 2 * (thickness_wall + thickness_ins) + parameter Modelica.Units.SI.Diameter diameter_ext = diameter_int + 2 * (thickness_wall + thickness_ins) "Exterior diameter of the storage" annotation(Dialog(group="Geometry")); - parameter Modelica.SIunits.Area ASec = V / height + parameter Modelica.Units.SI.Area ASec = V / height "Inner cross-section area of the storage"; - parameter Modelica.SIunits.Length heightLayer = height / nEle + parameter Modelica.Units.SI.Length heightLayer = height / nEle "Height of tank layer"; parameter Medium.ThermodynamicState sta_default = Medium.setState_pTX( T=Medium.T_default, @@ -149,13 +149,13 @@ Modelica.Thermal.HeatTransfer.Components.ThermalConductor ThermalConductanceHX_2( each G = UA_HX_2) if HX_2 annotation (Placement(transformation(extent={{-10,10},{10,-10}},origin={62,90}))); - parameter Modelica.SIunits.ThermalConductance UA_HX_2 = 100.0 + parameter Modelica.Units.SI.ThermalConductance UA_HX_2 = 100.0 "Constant thermal conductance of material" annotation(Dialog(enable=HX_2,group="HX definition")); parameter Integer Ele_HX_2 = 2 "Layer at which HX_2 is connected" annotation(Dialog(enable = HX_2,group="HX definition")); - parameter Modelica.SIunits.ThermalConductance UA_HX_1 = 100.0 + parameter Modelica.Units.SI.ThermalConductance UA_HX_1 = 100.0 "Constant thermal conductance of material" annotation(Dialog(enable = HX_1,group="HX definition")); parameter Integer Ele_HX_1 = 1 diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/ThermalZones/ReducedOrder/EquivalentAirTemperature/BaseClasses/PartialVDI6007.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/ThermalZones/ReducedOrder/EquivalentAirTemperature/BaseClasses/PartialVDI6007.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/ThermalZones/ReducedOrder/EquivalentAirTemperature/BaseClasses/PartialVDI6007.mo" 2021-11-24 08:09:21.155365986 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/ThermalZones/ReducedOrder/EquivalentAirTemperature/BaseClasses/PartialVDI6007.mo" 2021-11-24 08:10:29.975159129 +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/BuildingSystems 2.0.0-master/ThermalZones/ReducedOrder/EquivalentAirTemperature/VDI6007WithWindow.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/ThermalZones/ReducedOrder/EquivalentAirTemperature/VDI6007WithWindow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/ThermalZones/ReducedOrder/EquivalentAirTemperature/VDI6007WithWindow.mo" 2021-11-24 08:09:21.155365986 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/ThermalZones/ReducedOrder/EquivalentAirTemperature/VDI6007WithWindow.mo" 2021-11-24 08:10:29.915159309 +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/BuildingSystems 2.0.0-master/ThermalZones/ReducedOrder/Examples/SimpleRoomFourElementsTraceSubstance.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/ThermalZones/ReducedOrder/Examples/SimpleRoomFourElementsTraceSubstance.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/ThermalZones/ReducedOrder/Examples/SimpleRoomFourElementsTraceSubstance.mo" 2021-11-24 08:09:21.155365986 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/ThermalZones/ReducedOrder/Examples/SimpleRoomFourElementsTraceSubstance.mo" 2021-11-24 08:10:29.859159477 +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/BuildingSystems 2.0.0-master/ThermalZones/ReducedOrder/RC/BaseClasses/ExteriorWall.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/ThermalZones/ReducedOrder/RC/BaseClasses/ExteriorWall.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/ThermalZones/ReducedOrder/RC/BaseClasses/ExteriorWall.mo" 2021-11-24 08:09:21.155365986 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/ThermalZones/ReducedOrder/RC/BaseClasses/ExteriorWall.mo" 2021-11-24 08:10:29.771159742 +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/BuildingSystems 2.0.0-master/ThermalZones/ReducedOrder/RC/BaseClasses/InteriorWall.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/ThermalZones/ReducedOrder/RC/BaseClasses/InteriorWall.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/ThermalZones/ReducedOrder/RC/BaseClasses/InteriorWall.mo" 2021-11-24 08:09:21.155365986 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/ThermalZones/ReducedOrder/RC/BaseClasses/InteriorWall.mo" 2021-11-24 08:10:29.747159814 +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/BuildingSystems 2.0.0-master/ThermalZones/ReducedOrder/RC/BaseClasses/splitFacVal.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/ThermalZones/ReducedOrder/RC/BaseClasses/splitFacVal.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/ThermalZones/ReducedOrder/RC/BaseClasses/splitFacVal.mo" 2021-11-24 08:09:21.155365986 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/ThermalZones/ReducedOrder/RC/BaseClasses/splitFacVal.mo" 2021-11-24 08:10:29.723159886 +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/BuildingSystems 2.0.0-master/ThermalZones/ReducedOrder/RC/FourElements.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/ThermalZones/ReducedOrder/RC/FourElements.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/ThermalZones/ReducedOrder/RC/FourElements.mo" 2021-11-24 08:09:21.155365986 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/ThermalZones/ReducedOrder/RC/FourElements.mo" 2021-11-24 08:10:29.715159909 +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/BuildingSystems 2.0.0-master/ThermalZones/ReducedOrder/RC/OneElement.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/ThermalZones/ReducedOrder/RC/OneElement.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/ThermalZones/ReducedOrder/RC/OneElement.mo" 2021-11-24 08:09:21.155365986 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/ThermalZones/ReducedOrder/RC/OneElement.mo" 2021-11-24 08:10:29.691159981 +0000 @@ -2,9 +2,9 @@ model OneElement "Thermal Zone with one element for exterior walls" extends BuildingSystems.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= BuildingSystems.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/BuildingSystems 2.0.0-master/ThermalZones/ReducedOrder/RC/ThreeElements.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/ThermalZones/ReducedOrder/RC/ThreeElements.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/ThermalZones/ReducedOrder/RC/ThreeElements.mo" 2021-11-24 08:09:21.155365986 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/ThermalZones/ReducedOrder/RC/ThreeElements.mo" 2021-11-24 08:10:29.455160691 +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/BuildingSystems 2.0.0-master/ThermalZones/ReducedOrder/RC/TwoElements.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/ThermalZones/ReducedOrder/RC/TwoElements.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/ThermalZones/ReducedOrder/RC/TwoElements.mo" 2021-11-24 08:09:21.155365986 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/ThermalZones/ReducedOrder/RC/TwoElements.mo" 2021-11-24 08:10:29.415160810 +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/BuildingSystems 2.0.0-master/ThermalZones/ReducedOrder/SolarGain/BaseClasses/PartialCorrectionG.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/ThermalZones/ReducedOrder/SolarGain/BaseClasses/PartialCorrectionG.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/ThermalZones/ReducedOrder/SolarGain/BaseClasses/PartialCorrectionG.mo" 2021-11-24 08:09:21.155365986 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/ThermalZones/ReducedOrder/SolarGain/BaseClasses/PartialCorrectionG.mo" 2021-11-24 08:10:29.363160967 +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/BuildingSystems 2.0.0-master/ThermalZones/ReducedOrder/SolarGain/CorrectionGDoublePane.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/ThermalZones/ReducedOrder/SolarGain/CorrectionGDoublePane.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/ThermalZones/ReducedOrder/SolarGain/CorrectionGDoublePane.mo" 2021-11-24 08:09:21.155365986 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/ThermalZones/ReducedOrder/SolarGain/CorrectionGDoublePane.mo" 2021-11-24 08:10:29.355160991 +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/BuildingSystems 2.0.0-master/ThermalZones/ReducedOrder/Validation/VDI6007/BaseClasses/VerifyDifferenceThreePeriods.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/ThermalZones/ReducedOrder/Validation/VDI6007/BaseClasses/VerifyDifferenceThreePeriods.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/ThermalZones/ReducedOrder/Validation/VDI6007/BaseClasses/VerifyDifferenceThreePeriods.mo" 2021-11-24 08:09:21.155365986 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/ThermalZones/ReducedOrder/Validation/VDI6007/BaseClasses/VerifyDifferenceThreePeriods.mo" 2021-11-24 08:10:29.299161159 +0000 @@ -2,15 +2,15 @@ block VerifyDifferenceThreePeriods "Assert when condition is violated" extends BuildingSystems.Utilities.Diagnostics.BaseClasses.PartialInputCheck( message="Inputs differ by more than threShold.\n Check output 'satisfied' for when violation(s) happened."); - parameter Modelica.SIunits.Time endTime = 0 + parameter Modelica.Units.SI.Time endTime = 0 "Start time for deactivating the assert (period one)"; - parameter Modelica.SIunits.Time startTime2 = 0 + parameter Modelica.Units.SI.Time startTime2 = 0 "Start time for activating the assert (period two)"; - parameter Modelica.SIunits.Time endTime2 = 0 + parameter Modelica.Units.SI.Time endTime2 = 0 "Start time for deactivating the assert (period two)"; - parameter Modelica.SIunits.Time startTime3 = 0 + parameter Modelica.Units.SI.Time startTime3 = 0 "Start time for activating the assert (period three)"; - parameter Modelica.SIunits.Time endTime3 = 0 + parameter Modelica.Units.SI.Time endTime3 = 0 "Start time for deactivating the assert (period three)"; Modelica.Blocks.Interfaces.BooleanOutput satisfied(start=true, fixed=true) @@ -20,15 +20,15 @@ annotation (Placement(transformation(extent={{100,42},{140,82}}), iconTransformation(extent={{100,42},{140,82}}))); protected - parameter Modelica.SIunits.Time t1(fixed=false) + parameter Modelica.Units.SI.Time t1(fixed=false) "Simulation end time period one"; - parameter Modelica.SIunits.Time t3(fixed=false) + parameter Modelica.Units.SI.Time t3(fixed=false) "Simulation end time period two"; - parameter Modelica.SIunits.Time t5(fixed=false) + parameter Modelica.Units.SI.Time t5(fixed=false) "Simulation end time period three"; - parameter Modelica.SIunits.Time t2(fixed=false) + parameter Modelica.Units.SI.Time t2(fixed=false) "Simulation start time period two"; - parameter Modelica.SIunits.Time t4(fixed=false) + parameter Modelica.Units.SI.Time t4(fixed=false) "Simulation start time period three"; Integer nFai "Number of test violations"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Types/Azimuth/package.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Types/Azimuth/package.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Types/Azimuth/package.mo" 2021-11-24 08:09:21.155365986 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Types/Azimuth/package.mo" 2021-11-24 08:10:28.995162072 +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/BuildingSystems 2.0.0-master/Types/Tilt/package.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Types/Tilt/package.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Types/Tilt/package.mo" 2021-11-24 08:09:21.159365974 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Types/Tilt/package.mo" 2021-11-24 08:10:28.951162204 +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/BuildingSystems 2.0.0-master/Types/WaterVapourEnthalpy.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Types/WaterVapourEnthalpy.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Types/WaterVapourEnthalpy.mo" 2021-11-24 08:09:21.159365974 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Types/WaterVapourEnthalpy.mo" 2021-11-24 08:10:28.899162361 +0000 @@ -1,2 +1,2 @@ within BuildingSystems.Types; -type WaterVapourEnthalpy = Modelica.SIunits.SpecificEnergy; +type WaterVapourEnthalpy = Modelica.Units.SI.SpecificEnergy; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Diagnostics/BaseClasses/PartialInputCheck.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Diagnostics/BaseClasses/PartialInputCheck.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Diagnostics/BaseClasses/PartialInputCheck.mo" 2021-11-24 08:09:21.159365974 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Diagnostics/BaseClasses/PartialInputCheck.mo" 2021-11-24 08:10:28.747162817 +0000 @@ -1,7 +1,7 @@ within BuildingSystems.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/BuildingSystems 2.0.0-master/Utilities/Diagnostics/Validation/CheckEquality.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Diagnostics/Validation/CheckEquality.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Diagnostics/Validation/CheckEquality.mo" 2021-11-24 08:09:21.159365974 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Diagnostics/Validation/CheckEquality.mo" 2021-11-24 08:10:28.731162865 +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/BuildingSystems 2.0.0-master/Utilities/IO/Files/BaseClasses/FileWriter.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/IO/Files/BaseClasses/FileWriter.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/IO/Files/BaseClasses/FileWriter.mo" 2021-11-24 08:09:21.159365974 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/IO/Files/BaseClasses/FileWriter.mo" 2021-11-24 08:10:28.707162938 +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"; BuildingSystems.Utilities.IO.Files.BaseClasses.FileWriterObject filWri= diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/IO/Files/Examples/BaseClasses/PartialCSV.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/IO/Files/Examples/BaseClasses/PartialCSV.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/IO/Files/Examples/BaseClasses/PartialCSV.mo" 2021-11-24 08:09:21.159365974 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/IO/Files/Examples/BaseClasses/PartialCSV.mo" 2021-11-24 08:10:28.615163214 +0000 @@ -1,7 +1,7 @@ within BuildingSystems.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/BuildingSystems 2.0.0-master/Utilities/IO/Files/Examples/JSONWriter.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/IO/Files/Examples/JSONWriter.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/IO/Files/Examples/JSONWriter.mo" 2021-11-24 08:09:21.159365974 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/IO/Files/Examples/JSONWriter.mo" 2021-11-24 08:10:28.595163274 +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}}))); BuildingSystems.Utilities.IO.Files.JSONWriter jsonWriterOneVar(nin=1, fileName="TerminalOutput.json") "Single variable output" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/IO/Files/JSONWriter.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/IO/Files/JSONWriter.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/IO/Files/JSONWriter.mo" 2021-11-24 08:09:21.159365974 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/IO/Files/JSONWriter.mo" 2021-11-24 08:10:28.583163310 +0000 @@ -12,7 +12,7 @@ BuildingSystems.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==BuildingSystems.Utilities.IO.Files.BaseClasses.OutputTime.Custom)); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Math/Examples/SmoothBlocks.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Math/Examples/SmoothBlocks.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Math/Examples/SmoothBlocks.mo" 2021-11-24 08:09:21.159365974 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Math/Examples/SmoothBlocks.mo" 2021-11-24 08:10:28.171164547 +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/BuildingSystems 2.0.0-master/Utilities/Math/Examples/SmoothLimit.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Math/Examples/SmoothLimit.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Math/Examples/SmoothLimit.mo" 2021-11-24 08:09:21.159365974 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Math/Examples/SmoothLimit.mo" 2021-11-24 08:10:28.143164631 +0000 @@ -1,7 +1,7 @@ within BuildingSystems.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}}))); BuildingSystems.Utilities.Math.SmoothLimit smoLim( deltaX=0.001, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Math/Examples/Splice.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Math/Examples/Splice.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Math/Examples/Splice.mo" 2021-11-24 08:09:21.159365974 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Math/Examples/Splice.mo" 2021-11-24 08:10:28.131164668 +0000 @@ -3,7 +3,7 @@ extends Modelica.Icons.Example; BuildingSystems.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/BuildingSystems 2.0.0-master/Utilities/Math/Examples/VectorFunctions.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Math/Examples/VectorFunctions.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Math/Examples/VectorFunctions.mo" 2021-11-24 08:09:21.159365974 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Math/Examples/VectorFunctions.mo" 2021-11-24 08:10:28.123164692 +0000 @@ -5,12 +5,12 @@ BuildingSystems.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}}))); BuildingSystems.Utilities.Math.Max maxVec( nin=3) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/MoistAirFunctions/T_dp.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/MoistAirFunctions/T_dp.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/MoistAirFunctions/T_dp.mo" 2021-11-24 08:09:21.159365974 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/MoistAirFunctions/T_dp.mo" 2021-11-24 08:10:27.419166806 +0000 @@ -6,11 +6,11 @@ Unit steam pressure: Pa, - based on "Reinmuth Lufttechnische Prozesse" - logarithmic fitted in segments: -40 - -20C; -20 - 0C; 0 - 20C; 20 - 40 C and 40 - 70C */ - input Modelica.SIunits.Pressure p; - output Modelica.SIunits.Temp_K value; + input Modelica.Units.SI.Pressure p; + output Modelica.Units.SI.Temperature value; protected - Modelica.SIunits.Pressure p_min = 12.4; - Modelica.SIunits.Pressure p_max[5] = {102.9, 610.7, 2337.0, 7375.0, 31160.0}; + Modelica.Units.SI.Pressure p_min = 12.4; + Modelica.Units.SI.Pressure p_max[5] = {102.9, 610.7, 2337.0, 7375.0, 31160.0}; algorithm if p < p_max[1] then value := (9.531 * Modelica.Math.log(p) - 64.414) + 273.15; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/MoistAirFunctions/T_sat.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/MoistAirFunctions/T_sat.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/MoistAirFunctions/T_sat.mo" 2021-11-24 08:09:21.159365974 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/MoistAirFunctions/T_sat.mo" 2021-11-24 08:10:27.415166818 +0000 @@ -3,8 +3,8 @@ /* Saturation temperature in dependence of enthalpy -30 bis 360 kJ/kg Saturation temperature in [K], enthalpy in [kJ/kg] - based on h-x-diagram and function, fitted by a polynom of 5th order */ - input Modelica.SIunits.SpecificEnthalpy h; - output Modelica.SIunits.Temp_K value; + input Modelica.Units.SI.SpecificEnthalpy h; + output Modelica.Units.SI.Temperature value; protected constant Real h_min = -30.0; constant Real h_max = 360.0; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/MoistAirFunctions/enthalpy.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/MoistAirFunctions/enthalpy.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/MoistAirFunctions/enthalpy.mo" 2021-11-24 08:09:21.159365974 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/MoistAirFunctions/enthalpy.mo" 2021-11-24 08:10:27.407166842 +0000 @@ -5,10 +5,10 @@ Zero position at 0 C > Usage of temperature in computations in C > - 273.15 Enthalpy in [kJ/kg dry air], temperature in [K], x in [kg/kg] x_satt in [kg/kg] for phi = 1.0 */ - input Modelica.SIunits.Temp_K T; - input Modelica.SIunits.MassFraction x; - input Modelica.SIunits.MassFraction x_sat; - output Modelica.SIunits.SpecificEnthalpy value; + input Modelica.Units.SI.Temperature T; + input Modelica.Units.SI.MassFraction x; + input Modelica.Units.SI.MassFraction x_sat; + output Modelica.Units.SI.SpecificEnthalpy value; protected Real theta, y1, y2, y3, y4; algorithm diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/MoistAirFunctions/p.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/MoistAirFunctions/p.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/MoistAirFunctions/p.mo" 2021-11-24 08:09:21.159365974 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/MoistAirFunctions/p.mo" 2021-11-24 08:10:27.403166854 +0000 @@ -4,9 +4,9 @@ /* steam pressure Validity range phi < 1.0, steam pressure in Pa, Absolute moisture x in kg/kg, air pressure p in Pa */ - input Modelica.SIunits.MassFraction x; - input Modelica.SIunits.Pressure p_air; - output Modelica.SIunits.Pressure value; + input Modelica.Units.SI.MassFraction x; + input Modelica.Units.SI.Pressure p_air; + output Modelica.Units.SI.Pressure value; algorithm value := p_air / (0.622 / x + 1.0); end p; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/MoistAirFunctions/p_sat.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/MoistAirFunctions/p_sat.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/MoistAirFunctions/p_sat.mo" 2021-11-24 08:09:21.159365974 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/MoistAirFunctions/p_sat.mo" 2021-11-24 08:10:27.399166866 +0000 @@ -1,7 +1,7 @@ within BuildingSystems.Utilities.MoistAirFunctions; function p_sat "Saturation vapor pressure dependent on temperature" - input Modelica.SIunits.Temp_K T; - output Modelica.SIunits.Pressure value; + input Modelica.Units.SI.Temperature T; + output Modelica.Units.SI.Pressure value; protected Real a; Real theta; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/MoistAirFunctions/x.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/MoistAirFunctions/x.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/MoistAirFunctions/x.mo" 2021-11-24 08:09:21.159365974 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/MoistAirFunctions/x.mo" 2021-11-24 08:10:27.391166890 +0000 @@ -1,10 +1,10 @@ within BuildingSystems.Utilities.MoistAirFunctions; function x "Absolute humidity dependent on air pressure, saturation pressure and relative humidity" - input Modelica.SIunits.Pressure p; - input Modelica.SIunits.Pressure p_sat; + input Modelica.Units.SI.Pressure p; + input Modelica.Units.SI.Pressure p_sat; input BuildingSystems.Types.RelativeHumidity phi; - output Modelica.SIunits.MassFraction value; + output Modelica.Units.SI.MassFraction value; algorithm value := 0.622 * phi * p_sat / (p - phi * p_sat); end x; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/MoistAirFunctions/x_sat.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/MoistAirFunctions/x_sat.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/MoistAirFunctions/x_sat.mo" 2021-11-24 08:09:21.159365974 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/MoistAirFunctions/x_sat.mo" 2021-11-24 08:10:27.387166903 +0000 @@ -1,8 +1,8 @@ within BuildingSystems.Utilities.MoistAirFunctions; function x_sat "Absolute humidity at saturation" - input Modelica.SIunits.Pressure p; - input Modelica.SIunits.Pressure p_sat; - output Modelica.SIunits.MassFraction value; + input Modelica.Units.SI.Pressure p; + input Modelica.Units.SI.Pressure p_sat; + output Modelica.Units.SI.MassFraction value; algorithm value := 0.622 * 1.0 / (p / p_sat - 1.0); end x_sat; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/BaseClasses/HumidityRatioVaporPressure.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/BaseClasses/HumidityRatioVaporPressure.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/BaseClasses/HumidityRatioVaporPressure.mo" 2021-11-24 08:09:21.159365974 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/BaseClasses/HumidityRatioVaporPressure.mo" 2021-11-24 08:10:27.359166986 +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/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Constants.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Constants.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Constants.mo" 2021-11-24 08:09:21.159365974 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Constants.mo" 2021-11-24 08:10:27.351167010 +0000 @@ -1,15 +1,15 @@ within BuildingSystems.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/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Examples/TWetBul_TDryBulPhi.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Examples/TWetBul_TDryBulPhi.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Examples/TWetBul_TDryBulPhi.mo" 2021-11-24 08:09:21.163365962 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Examples/TWetBul_TDryBulPhi.mo" 2021-11-24 08:10:27.251167311 +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/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/BaseClasses/Examples/DewPointTemperatureDerivativeCheck.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/BaseClasses/Examples/DewPointTemperatureDerivativeCheck.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/BaseClasses/Examples/DewPointTemperatureDerivativeCheck.mo" 2021-11-24 08:09:21.163365962 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/BaseClasses/Examples/DewPointTemperatureDerivativeCheck.mo" 2021-11-24 08:10:27.199167467 +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/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/BaseClasses/Examples/DewPointTemperatureDerivativeCheck_amb.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/BaseClasses/Examples/DewPointTemperatureDerivativeCheck_amb.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/BaseClasses/Examples/DewPointTemperatureDerivativeCheck_amb.mo" 2021-11-24 08:09:21.163365962 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/BaseClasses/Examples/DewPointTemperatureDerivativeCheck_amb.mo" 2021-11-24 08:10:27.191167491 +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/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/BaseClasses/Examples/InverseDewPointTemperatureDerivativeCheck_amb.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/BaseClasses/Examples/InverseDewPointTemperatureDerivativeCheck_amb.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/BaseClasses/Examples/InverseDewPointTemperatureDerivativeCheck_amb.mo" 2021-11-24 08:09:21.163365962 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/BaseClasses/Examples/InverseDewPointTemperatureDerivativeCheck_amb.mo" 2021-11-24 08:10:27.183167515 +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/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/BaseClasses/Examples/SaturationPressureDerivativeCheck.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/BaseClasses/Examples/SaturationPressureDerivativeCheck.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/BaseClasses/Examples/SaturationPressureDerivativeCheck.mo" 2021-11-24 08:09:21.163365962 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/BaseClasses/Examples/SaturationPressureDerivativeCheck.mo" 2021-11-24 08:10:27.127167683 +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/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/BaseClasses/Examples/WaterVaporPressureDerivativeCheck.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/BaseClasses/Examples/WaterVaporPressureDerivativeCheck.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/BaseClasses/Examples/WaterVaporPressureDerivativeCheck.mo" 2021-11-24 08:09:21.163365962 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/BaseClasses/Examples/WaterVaporPressureDerivativeCheck.mo" 2021-11-24 08:10:27.115167719 +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/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/BaseClasses/der_TDewPoi_pW_amb.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/BaseClasses/der_TDewPoi_pW_amb.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/BaseClasses/der_TDewPoi_pW_amb.mo" 2021-11-24 08:09:21.163365962 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/BaseClasses/der_TDewPoi_pW_amb.mo" 2021-11-24 08:10:27.107167744 +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/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_TDewPoi.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_TDewPoi.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_TDewPoi.mo" 2021-11-24 08:09:21.163365962 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_TDewPoi.mo" 2021-11-24 08:10:27.103167755 +0000 @@ -1,7 +1,7 @@ within BuildingSystems.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/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_TDewPoi_amb.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_TDewPoi_amb.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_TDewPoi_amb.mo" 2021-11-24 08:09:21.163365962 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_TDewPoi_amb.mo" 2021-11-24 08:10:27.091167791 +0000 @@ -1,14 +1,14 @@ within BuildingSystems.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/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_X.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_X.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_X.mo" 2021-11-24 08:09:21.163365962 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_X.mo" 2021-11-24 08:10:27.083167816 +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/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/BaseClasses/der_saturationPressureLiquid.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/BaseClasses/der_saturationPressureLiquid.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/BaseClasses/der_saturationPressureLiquid.mo" 2021-11-24 08:09:21.163365962 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/BaseClasses/der_saturationPressureLiquid.mo" 2021-11-24 08:10:27.071167851 +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/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/BaseClasses/der_sublimationPressureIce.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/BaseClasses/der_sublimationPressureIce.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/BaseClasses/der_sublimationPressureIce.mo" 2021-11-24 08:09:21.163365962 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/BaseClasses/der_sublimationPressureIce.mo" 2021-11-24 08:10:27.063167876 +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/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/Examples/Density_pTX.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/Examples/Density_pTX.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/Examples/Density_pTX.mo" 2021-11-24 08:09:21.163365962 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/Examples/Density_pTX.mo" 2021-11-24 08:10:27.047167923 +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/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/Examples/SaturationPressure.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/Examples/SaturationPressure.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/Examples/SaturationPressure.mo" 2021-11-24 08:09:21.163365962 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/Examples/SaturationPressure.mo" 2021-11-24 08:10:27.039167948 +0000 @@ -1,10 +1,10 @@ within BuildingSystems.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/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/Examples/X_pSatpphi.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/Examples/X_pSatpphi.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/Examples/X_pSatpphi.mo" 2021-11-24 08:09:21.163365962 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/Examples/X_pSatpphi.mo" 2021-11-24 08:10:27.031167972 +0000 @@ -3,12 +3,12 @@ extends Modelica.Icons.Example; package Medium = BuildingSystems.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/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/Examples/pW_TDewPoi.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/Examples/pW_TDewPoi.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/Examples/pW_TDewPoi.mo" 2021-11-24 08:09:21.163365962 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/Examples/pW_TDewPoi.mo" 2021-11-24 08:10:27.019168007 +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/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/Examples/pW_TDewPoi_comparison.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/Examples/pW_TDewPoi_comparison.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/Examples/pW_TDewPoi_comparison.mo" 2021-11-24 08:09:21.163365962 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/Examples/pW_TDewPoi_comparison.mo" 2021-11-24 08:10:27.011168032 +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/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/Examples/pW_X.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/Examples/pW_X.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/Examples/pW_X.mo" 2021-11-24 08:09:21.163365962 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/Examples/pW_X.mo" 2021-11-24 08:10:27.003168055 +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/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/Examples/phi_pTX.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/Examples/phi_pTX.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/Examples/phi_pTX.mo" 2021-11-24 08:09:21.163365962 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/Examples/phi_pTX.mo" 2021-11-24 08:10:26.995168080 +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/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/TDewPoi_pW.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/TDewPoi_pW.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/TDewPoi_pW.mo" 2021-11-24 08:09:21.163365962 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/TDewPoi_pW.mo" 2021-11-24 08:10:26.987168104 +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 :=BuildingSystems.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/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/TDewPoi_pW_amb.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/TDewPoi_pW_amb.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/TDewPoi_pW_amb.mo" 2021-11-24 08:09:21.163365962 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/TDewPoi_pW_amb.mo" 2021-11-24 08:10:26.979168128 +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/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/X_pSatpphi.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/X_pSatpphi.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/X_pSatpphi.mo" 2021-11-24 08:09:21.163365962 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/X_pSatpphi.mo" 2021-11-24 08:10:26.967168164 +0000 @@ -1,14 +1,14 @@ within BuildingSystems.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/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/X_pTphi.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/X_pTphi.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/X_pTphi.mo" 2021-11-24 08:09:21.163365962 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/X_pTphi.mo" 2021-11-24 08:10:26.959168188 +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) / BuildingSystems.Utilities.Psychrometrics.Constants.k_mair + phi); annotation ( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/X_pW.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/X_pW.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/X_pW.mo" 2021-11-24 08:09:21.163365962 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/X_pW.mo" 2021-11-24 08:10:26.923168296 +0000 @@ -1,17 +1,17 @@ within BuildingSystems.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/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/density_pTX.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/density_pTX.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/density_pTX.mo" 2021-11-24 08:09:21.163365962 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/density_pTX.mo" 2021-11-24 08:10:26.915168320 +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/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/pW_TDewPoi.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/pW_TDewPoi.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/pW_TDewPoi.mo" 2021-11-24 08:09:21.163365962 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/pW_TDewPoi.mo" 2021-11-24 08:10:26.907168344 +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/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/pW_TDewPoi_amb.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/pW_TDewPoi_amb.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/pW_TDewPoi_amb.mo" 2021-11-24 08:09:21.163365962 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/pW_TDewPoi_amb.mo" 2021-11-24 08:10:26.899168368 +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/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/pW_X.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/pW_X.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/pW_X.mo" 2021-11-24 08:09:21.163365962 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/pW_X.mo" 2021-11-24 08:10:26.887168404 +0000 @@ -1,15 +1,15 @@ within BuildingSystems.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/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/partialPressure.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/partialPressure.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/partialPressure.mo" 2021-11-24 08:09:21.163365962 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/partialPressure.mo" 2021-11-24 08:10:26.879168428 +0000 @@ -2,13 +2,13 @@ function partialPressure "Partial pressure of water vapor" extends Modelica.Icons.Function; - input Modelica.SIunits.MassFraction x + + input Modelica.Units.SI.MassFraction x "Absolute moisture"; - input Modelica.SIunits.Pressure pAir + input Modelica.Units.SI.Pressure pAir "Saturation temperature"; - output Modelica.SIunits.AbsolutePressure pVap + output Modelica.Units.SI.AbsolutePressure pVap "Saturation pressure"; - algorithm pVap := pAir / (0.622 / x + 1.0); annotation(Inline=false, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/phi_pTX.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/phi_pTX.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/phi_pTX.mo" 2021-11-24 08:09:21.163365962 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/phi_pTX.mo" 2021-11-24 08:10:26.871168452 +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/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/saturationPressure.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/saturationPressure.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/saturationPressure.mo" 2021-11-24 08:09:21.163365962 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/saturationPressure.mo" 2021-11-24 08:10:26.863168476 +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 := BuildingSystems.Utilities.Math.Functions.regStep( y1=BuildingSystems.Utilities.Psychrometrics.Functions.saturationPressureLiquid(TSat), diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/saturationPressureLiquid.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/saturationPressureLiquid.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/saturationPressureLiquid.mo" 2021-11-24 08:09:21.163365962 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/saturationPressureLiquid.mo" 2021-11-24 08:10:26.855168500 +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/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/sublimationPressureIce.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/sublimationPressureIce.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/sublimationPressureIce.mo" 2021-11-24 08:09:21.163365962 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/Functions/sublimationPressureIce.mo" 2021-11-24 08:10:26.847168524 +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/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/TWetBul_TDryBulPhi.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/TWetBul_TDryBulPhi.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/TWetBul_TDryBulPhi.mo" 2021-11-24 08:09:21.163365962 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/TWetBul_TDryBulPhi.mo" 2021-11-24 08:10:26.791168692 +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/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/TWetBul_TDryBulXi.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/TWetBul_TDryBulXi.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/TWetBul_TDryBulXi.mo" 2021-11-24 08:09:21.163365962 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/TWetBul_TDryBulXi.mo" 2021-11-24 08:10:26.775168741 +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/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/X_pTphi.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/X_pTphi.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/X_pTphi.mo" 2021-11-24 08:09:21.163365962 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/X_pTphi.mo" 2021-11-24 08:10:26.711168933 +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/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/X_pW.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/X_pW.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/X_pW.mo" 2021-11-24 08:09:21.163365962 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/X_pW.mo" 2021-11-24 08:10:26.703168957 +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 = BuildingSystems.Utilities.Psychrometrics.Functions.X_pW(p_w=p_w, p=p_in_internal); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/pW_X.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/pW_X.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/pW_X.mo" 2021-11-24 08:09:21.163365962 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Psychrometrics/pW_X.mo" 2021-11-24 08:10:26.687169005 +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/BuildingSystems 2.0.0-master/Utilities/Time/CalendarTime.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Time/CalendarTime.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Time/CalendarTime.mo" 2021-11-24 08:09:21.163365962 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/Utilities/Time/CalendarTime.mo" 2021-11-24 08:10:26.607169245 +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/BuildingSystems 2.0.0-master/openmodelica.metadata.json" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/openmodelica.metadata.json" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/openmodelica.metadata.json" 2021-11-24 08:09:21.163365962 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/openmodelica.metadata.json" 2021-11-24 08:10:56.511079448 +0000 @@ -1 +1 @@ -{"path":"BuildingSystems", "sha":"8a05412ccf91c24895583bba232dcceb54b40c83", "support":"noSupport", "uses":{"Modelica":"3.2.3", "NcDataReader2":"2.5.0"}, "version":"2.0.0-master", "zipfile":"https://github.com/UdK-VPT/BuildingSystems/archive/8a05412ccf91c24895583bba232dcceb54b40c83.zip"} +{"path": "BuildingSystems", "sha": "8a05412ccf91c24895583bba232dcceb54b40c83", "support": "noSupport", "uses": {"Modelica": "4.0.0", "NcDataReader2": "2.5.0"}, "version": "2.0.0-master", "zipfile": "https://github.com/UdK-VPT/BuildingSystems/archive/8a05412ccf91c24895583bba232dcceb54b40c83.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/BuildingSystems 2.0.0-master/package.mo" "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/package.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/package.mo" 2021-11-24 08:09:21.163365962 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildingSystems 2.0.0-master/package.mo" 2021-11-24 08:10:56.511079448 +0000 @@ -8,7 +8,7 @@ versionBuild=0, versionDate="2017-04-10", dateModified = "2017-04-10", - uses(Modelica(version="3.2.3"),NcDataReader2(version="2.5.0")), + uses(Modelica(version = "4.0.0")), preferredView="info", Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,100}}),graphics={ Polygon(points={{-34,62},{0,88},{30,62},{-34,62}},lineColor={0,0,0},fillColor={135,135,135},fillPattern=FillPattern.Solid),